1776 files changed, 52196 insertions, 53597 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index 97ff872c7acc..0eae9df35b88 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -321,6 +321,7 @@ config HAVE_ARCH_SECCOMP_FILTER
           - secure_computing is called from a ptrace_event()-safe context
           - secure_computing return value is checked and a return value of -1
             results in the system call being skipped immediately.
+          - seccomp syscall wired up
 
 config SECCOMP_FILTER
         def_bool y
diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index 96e54bed5088..e858aa0ad8af 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -6,4 +6,5 @@ generic-y += exec.h
 generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
diff --git a/arch/alpha/include/asm/scatterlist.h b/arch/alpha/include/asm/scatterlist.h
deleted file mode 100644
index 017d7471c3c4..000000000000
--- a/arch/alpha/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ALPHA_SCATTERLIST_H
-#define _ALPHA_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* !(_ALPHA_SCATTERLIST_H) */
diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/angel4.dts
index 5bb2fdaca02f..6b57475967a6 100644
--- a/arch/arc/boot/dts/angel4.dts
+++ b/arch/arc/boot/dts/angel4.dts
@@ -17,7 +17,7 @@
         interrupt-parent = <&intc>;
 
         chosen {
-                bootargs = "console=ttyARC0,115200n8 earlyprintk=ttyARC0";
+                bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8";
         };
 
         aliases {
diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h
index 355cb470c2a4..372466b371bf 100644
--- a/arch/arc/include/asm/arcregs.h
+++ b/arch/arc/include/asm/arcregs.h
@@ -296,7 +296,7 @@ struct cpuinfo_arc_mmu {
 };
 
 struct cpuinfo_arc_cache {
-        unsigned int sz, line_len, assoc, ver;
+        unsigned int sz_k:8, line_len:8, assoc:4, ver:4, alias:1, vipt:1, pad:6;
 };
 
 struct cpuinfo_arc_ccm {
diff --git a/arch/arc/include/asm/irq.h b/arch/arc/include/asm/irq.h
index fb4efb648971..f38652fb2ed7 100644
--- a/arch/arc/include/asm/irq.h
+++ b/arch/arc/include/asm/irq.h
@@ -16,9 +16,13 @@
 #define TIMER0_IRQ      3
 #define TIMER1_IRQ      4
 
+#include <linux/interrupt.h>
 #include <asm-generic/irq.h>
 
 extern void arc_init_IRQ(void);
 void arc_local_timer_setup(void);
+void arc_request_percpu_irq(int irq, int cpu,
+                            irqreturn_t (*isr)(int irq, void *dev),
+                            const char *irq_nm, void *percpu_dev);
 
 #endif
diff --git a/arch/arc/include/asm/irqflags.h b/arch/arc/include/asm/irqflags.h
index cb7efc29f16f..587df8236e8b 100644
--- a/arch/arc/include/asm/irqflags.h
+++ b/arch/arc/include/asm/irqflags.h
@@ -131,24 +131,6 @@ static inline int arch_irqs_disabled(void)
         return arch_irqs_disabled_flags(arch_local_save_flags());
 }
 
-static inline void arch_mask_irq(unsigned int irq)
-{
-        unsigned int ienb;
-
-        ienb = read_aux_reg(AUX_IENABLE);
-        ienb &= ~(1 << irq);
-        write_aux_reg(AUX_IENABLE, ienb);
-}
-
-static inline void arch_unmask_irq(unsigned int irq)
-{
-        unsigned int ienb;
-
-        ienb = read_aux_reg(AUX_IENABLE);
-        ienb |= (1 << irq);
-        write_aux_reg(AUX_IENABLE, ienb);
-}
-
 #else
 
 #ifdef CONFIG_TRACE_IRQFLAGS
diff --git a/arch/arc/kernel/irq.c b/arch/arc/kernel/irq.c
index 7d653c0d0773..620ec2fe32a9 100644
--- a/arch/arc/kernel/irq.c
+++ b/arch/arc/kernel/irq.c
@@ -19,21 +19,16 @@
 
 /*
  * Early Hardware specific Interrupt setup
+ * -Platform independent, needed for each CPU (not foldable into init_IRQ)
  * -Called very early (start_kernel -> setup_arch -> setup_processor)
- * -Platform Independent (must for any ARC700)
- * -Needed for each CPU (hence not foldable into init_IRQ)
  *
  * what it does ?
- * -Disable all IRQs (on CPU side)
  * -Optionally, setup the High priority Interrupts as Level 2 IRQs
  */
 void arc_init_IRQ(void)
 {
         int level_mask = 0;
 
-        /* Disable all IRQs: enable them as devices request */
-        write_aux_reg(AUX_IENABLE, 0);
-
        /* setup any high priority Interrupts (Level2 in ARCompact jargon) */
         level_mask |= IS_ENABLED(CONFIG_ARC_IRQ3_LV2) << 3;
         level_mask |= IS_ENABLED(CONFIG_ARC_IRQ5_LV2) << 5;
@@ -60,20 +55,28 @@ void arc_init_IRQ(void)
  * below, per IRQ.
  */
 
-static void arc_mask_irq(struct irq_data *data)
+static void arc_irq_mask(struct irq_data *data)
 {
-        arch_mask_irq(data->irq);
+        unsigned int ienb;
+
+        ienb = read_aux_reg(AUX_IENABLE);
+        ienb &= ~(1 << data->irq);
+        write_aux_reg(AUX_IENABLE, ienb);
 }
 
-static void arc_unmask_irq(struct irq_data *data)
+static void arc_irq_unmask(struct irq_data *data)
 {
-        arch_unmask_irq(data->irq);
+        unsigned int ienb;
+
+        ienb = read_aux_reg(AUX_IENABLE);
+        ienb |= (1 << data->irq);
+        write_aux_reg(AUX_IENABLE, ienb);
 }
 
 static struct irq_chip onchip_intc = {
         .name           = "ARC In-core Intc",
-        .irq_mask       = arc_mask_irq,
-        .irq_unmask     = arc_unmask_irq,
+        .irq_mask       = arc_irq_mask,
+        .irq_unmask     = arc_irq_unmask,
 };
 
 static int arc_intc_domain_map(struct irq_domain *d, unsigned int irq,
@@ -150,6 +153,32 @@ void arch_do_IRQ(unsigned int irq, struct pt_regs *regs)
         set_irq_regs(old_regs);
 }
 
+void arc_request_percpu_irq(int irq, int cpu,
+                            irqreturn_t (*isr)(int irq, void *dev),
+                            const char *irq_nm,
+                            void *percpu_dev)
+{
+        /* Boot cpu calls request, all call enable */
+        if (!cpu) {
+                int rc;
+
+                /*
+                 * These 2 calls are essential to making percpu IRQ APIs work
+                 * Ideally these details could be hidden in irq chip map function
+                 * but the issue is IPIs IRQs being static (non-DT) and platform
+                 * specific, so we can't identify them there.
+                 */
+                irq_set_percpu_devid(irq);
+                irq_modify_status(irq, IRQ_NOAUTOEN, 0);  /* @irq, @clr, @set */
+
+                rc = request_percpu_irq(irq, isr, irq_nm, percpu_dev);
+                if (rc)
+                        panic("Percpu IRQ request failed for %d\n", irq);
+        }
+
+        enable_percpu_irq(irq, 0);
+}
+
 /*
  * arch_local_irq_enable - Enable interrupts.
  *
diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c
index 7e95e1a86510..cb3142a2d40b 100644
--- a/arch/arc/kernel/signal.c
+++ b/arch/arc/kernel/signal.c
@@ -141,17 +141,13 @@ badframe:
 /*
  * Determine which stack to use..
  */
-static inline void __user *get_sigframe(struct k_sigaction *ka,
+static inline void __user *get_sigframe(struct ksignal *ksig,
                                         struct pt_regs *regs,
                                         unsigned long framesize)
 {
-        unsigned long sp = regs->sp;
+        unsigned long sp = sigsp(regs->sp, ksig);
         void __user *frame;
 
-        /* This is the X/Open sanctioned signal stack switching */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
-                sp = current->sas_ss_sp + current->sas_ss_size;
-
         /* No matter what happens, 'sp' must be word
          * aligned otherwise nasty things could happen
          */
@@ -179,14 +175,13 @@ static inline int map_sig(int sig)
 }
 
 static int
-setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info,
-               sigset_t *set, struct pt_regs *regs)
+setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe __user *sf;
         unsigned int magic = 0;
         int err = 0;
 
-        sf = get_sigframe(ka, regs, sizeof(struct rt_sigframe));
+        sf = get_sigframe(ksig, regs, sizeof(struct rt_sigframe));
         if (!sf)
                 return 1;
 
@@ -205,8 +200,8 @@ setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info,
          *  #2: struct siginfo
          *  #3: struct ucontext (completely populated)
          */
-        if (unlikely(ka->sa.sa_flags & SA_SIGINFO)) {
-                err |= copy_siginfo_to_user(&sf->info, info);
+        if (unlikely(ksig->ka.sa.sa_flags & SA_SIGINFO)) {
+                err |= copy_siginfo_to_user(&sf->info, &ksig->info);
                 err |= __put_user(0, &sf->uc.uc_flags);
                 err |= __put_user(NULL, &sf->uc.uc_link);
                 err |= __save_altstack(&sf->uc.uc_stack, regs->sp);
@@ -227,16 +222,16 @@ setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info,
                 return err;
 
         /* #1 arg to the user Signal handler */
-        regs->r0 = map_sig(signo);
+        regs->r0 = map_sig(ksig->sig);
 
         /* setup PC of user space signal handler */
-        regs->ret = (unsigned long)ka->sa.sa_handler;
+        regs->ret = (unsigned long)ksig->ka.sa.sa_handler;
 
         /*
          * handler returns using sigreturn stub provided already by userpsace
          */
-        BUG_ON(!(ka->sa.sa_flags & SA_RESTORER));
-        regs->blink = (unsigned long)ka->sa.sa_restorer;
+        BUG_ON(!(ksig->ka.sa.sa_flags & SA_RESTORER));
+        regs->blink = (unsigned long)ksig->ka.sa.sa_restorer;
 
         /* User Stack for signal handler will be above the frame just carved */
         regs->sp = (unsigned long)sf;
@@ -298,38 +293,30 @@ static void arc_restart_syscall(struct k_sigaction *ka, struct pt_regs *regs)
  * OK, we're invoking a handler
  */
 static void
-handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
-              struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
 
         /* Set up the stack frame */
-        ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        ret = setup_rt_frame(ksig, oldset, regs);
 
-        if (ret)
-                force_sigsegv(sig, current);
-        else
-                signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 void do_signal(struct pt_regs *regs)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
+        struct ksignal ksig;
         int restart_scall;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-
         restart_scall = in_syscall(regs) && syscall_restartable(regs);
 
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 if (restart_scall) {
-                        arc_restart_syscall(&ka, regs);
+                        arc_restart_syscall(&ksig.ka, regs);
                         syscall_wont_restart(regs);     /* No more restarts */
                 }
-                handle_signal(signr, &ka, &info, regs);
+                handle_signal(&ksig, regs);
                 return;
         }
 
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c
index c802bb500602..dcd317c47d09 100644
--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -12,23 +12,15 @@
  *    -- Initial Write (Borrowed heavily from ARM)
  */
 
-#include <linux/module.h>
-#include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/profile.h>
-#include <linux/errno.h>
-#include <linux/err.h>
 #include <linux/mm.h>
 #include <linux/cpu.h>
-#include <linux/smp.h>
 #include <linux/irq.h>
-#include <linux/delay.h>
 #include <linux/atomic.h>
-#include <linux/percpu.h>
 #include <linux/cpumask.h>
-#include <linux/spinlock_types.h>
 #include <linux/reboot.h>
 #include <asm/processor.h>
 #include <asm/setup.h>
@@ -136,7 +128,7 @@ void start_kernel_secondary(void)
         pr_info("## CPU%u LIVE ##: Executing Code...\n", cpu);
 
         if (machine_desc->init_smp)
-                machine_desc->init_smp(smp_processor_id());
+                machine_desc->init_smp(cpu);
 
         arc_local_timer_setup();
 
@@ -338,18 +330,11 @@ irqreturn_t do_IPI(int irq, void *dev_id)
  */
 static DEFINE_PER_CPU(int, ipi_dev);
 
-static struct irqaction arc_ipi_irq = {
-        .name    = "IPI Interrupt",
-        .flags   = IRQF_PERCPU,
-        .handler = do_IPI,
-};
-
 int smp_ipi_irq_setup(int cpu, int irq)
 {
-        if (!cpu)
-                return setup_irq(irq, &arc_ipi_irq);
-        else
-                arch_unmask_irq(irq);
+        int *dev = per_cpu_ptr(&ipi_dev, cpu);
+
+        arc_request_percpu_irq(irq, cpu, do_IPI, "IPI Interrupt", dev);
 
         return 0;
 }
diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index 36c2aa99436f..dbe74f418019 100644
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -144,12 +144,12 @@ static struct clocksource arc_counter = {
 /********** Clock Event Device *********/
 
 /*
- * Arm the timer to interrupt after @limit cycles
+ * Arm the timer to interrupt after @cycles
  * The distinction for oneshot/periodic is done in arc_event_timer_ack() below
  */
-static void arc_timer_event_setup(unsigned int limit)
+static void arc_timer_event_setup(unsigned int cycles)
 {
-        write_aux_reg(ARC_REG_TIMER0_LIMIT, limit);
+        write_aux_reg(ARC_REG_TIMER0_LIMIT, cycles);
         write_aux_reg(ARC_REG_TIMER0_CNT, 0);   /* start from 0 */
 
         write_aux_reg(ARC_REG_TIMER0_CTRL, TIMER_CTRL_IE | TIMER_CTRL_NH);
@@ -168,6 +168,10 @@ static void arc_clkevent_set_mode(enum clock_event_mode mode,
 {
         switch (mode) {
         case CLOCK_EVT_MODE_PERIODIC:
+                /*
+                 * At X Hz, 1 sec = 1000ms -> X cycles;
+                 *                    10ms -> X / 100 cycles
+                 */
                 arc_timer_event_setup(arc_get_core_freq() / HZ);
                 break;
         case CLOCK_EVT_MODE_ONESHOT:
@@ -210,12 +214,6 @@ static irqreturn_t timer_irq_handler(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static struct irqaction arc_timer_irq = {
-        .name    = "Timer0 (clock-evt-dev)",
-        .flags   = IRQF_TIMER | IRQF_PERCPU,
-        .handler = timer_irq_handler,
-};
-
 /*
  * Setup the local event timer for @cpu
  */
@@ -228,15 +226,9 @@ void arc_local_timer_setup()
         clockevents_config_and_register(evt, arc_get_core_freq(),
                                         0, ARC_TIMER_MAX);
 
-        /*
-         * setup the per-cpu timer IRQ handler - for all cpus
-         * For non boot CPU explicitly unmask at intc
-         * setup_irq() -> .. -> irq_startup() already does this on boot-cpu
-         */
-        if (!cpu)
-                setup_irq(TIMER0_IRQ, &arc_timer_irq);
-        else
-                arch_unmask_irq(TIMER0_IRQ);
+        /* setup the per-cpu timer IRQ handler - for all cpus */
+        arc_request_percpu_irq(TIMER0_IRQ, cpu, timer_irq_handler,
+                               "Timer0 (per-cpu-tick)", evt);
 }
 
 /*
diff --git a/arch/arc/mm/cache_arc700.c b/arch/arc/mm/cache_arc700.c
index 353b202c37c9..4670afc3b971 100644
--- a/arch/arc/mm/cache_arc700.c
+++ b/arch/arc/mm/cache_arc700.c
@@ -77,21 +77,19 @@ char *arc_cache_mumbojumbo(int c, char *buf, int len)
 {
         int n = 0;
 
-#define PR_CACHE(p, enb, str)                                           \
-{                                                                       \
+#define PR_CACHE(p, cfg, str)                                           \
         if (!(p)->ver)                                                  \
                 n += scnprintf(buf + n, len - n, str"\t\t: N/A\n");     \
         else                                                            \
                 n += scnprintf(buf + n, len - n,                        \
-                        str"\t\t: (%uK) VIPT, %dway set-asc, %ub Line %s\n", \
-                        TO_KB((p)->sz), (p)->assoc, (p)->line_len,      \
-                        enb ?  "" : "DISABLED (kernel-build)");         \
-}
+                        str"\t\t: %uK, %dway/set, %uB Line, %s%s%s\n",  \
+                        (p)->sz_k, (p)->assoc, (p)->line_len,           \
+                        (p)->vipt ? "VIPT" : "PIPT",                    \
+                        (p)->alias ? " aliasing" : "",                  \
+                        IS_ENABLED(cfg) ? "" : " (not used)");
 
-        PR_CACHE(&cpuinfo_arc700[c].icache, IS_ENABLED(CONFIG_ARC_HAS_ICACHE),
-                        "I-Cache");
-        PR_CACHE(&cpuinfo_arc700[c].dcache, IS_ENABLED(CONFIG_ARC_HAS_DCACHE),
-                        "D-Cache");
+        PR_CACHE(&cpuinfo_arc700[c].icache, CONFIG_ARC_HAS_ICACHE, "I-Cache");
+        PR_CACHE(&cpuinfo_arc700[c].dcache, CONFIG_ARC_HAS_DCACHE, "D-Cache");
 
         return buf;
 }
@@ -116,20 +114,31 @@ void read_decode_cache_bcr(void)
         p_ic = &cpuinfo_arc700[cpu].icache;
         READ_BCR(ARC_REG_IC_BCR, ibcr);
 
+        if (!ibcr.ver)
+                goto dc_chk;
+
         BUG_ON(ibcr.config != 3);
         p_ic->assoc = 2;                /* Fixed to 2w set assoc */
         p_ic->line_len = 8 << ibcr.line_len;
-        p_ic->sz = 0x200 << ibcr.sz;
+        p_ic->sz_k = 1 << (ibcr.sz - 1);
         p_ic->ver = ibcr.ver;
+        p_ic->vipt = 1;
+        p_ic->alias = p_ic->sz_k/p_ic->assoc/TO_KB(PAGE_SIZE) > 1;
 
+dc_chk:
         p_dc = &cpuinfo_arc700[cpu].dcache;
         READ_BCR(ARC_REG_DC_BCR, dbcr);
 
+        if (!dbcr.ver)
+                return;
+
         BUG_ON(dbcr.config != 2);
         p_dc->assoc = 4;                /* Fixed to 4w set assoc */
         p_dc->line_len = 16 << dbcr.line_len;
-        p_dc->sz = 0x200 << dbcr.sz;
+        p_dc->sz_k = 1 << (dbcr.sz - 1);
         p_dc->ver = dbcr.ver;
+        p_dc->vipt = 1;
+        p_dc->alias = p_dc->sz_k/p_dc->assoc/TO_KB(PAGE_SIZE) > 1;
 }
 
 /*
@@ -142,14 +151,16 @@ void read_decode_cache_bcr(void)
 void arc_cache_init(void)
 {
         unsigned int __maybe_unused cpu = smp_processor_id();
-        struct cpuinfo_arc_cache __maybe_unused *ic, __maybe_unused *dc;
         char str[256];
 
         printk(arc_cache_mumbojumbo(0, str, sizeof(str)));
 
-#ifdef CONFIG_ARC_HAS_ICACHE
-        ic = &cpuinfo_arc700[cpu].icache;
-        if (ic->ver) {
+        if (IS_ENABLED(CONFIG_ARC_HAS_ICACHE)) {
+                struct cpuinfo_arc_cache *ic = &cpuinfo_arc700[cpu].icache;
+
+                if (!ic->ver)
+                        panic("cache support enabled but non-existent cache\n");
+
                 if (ic->line_len != L1_CACHE_BYTES)
                         panic("ICache line [%d] != kernel Config [%d]",
                               ic->line_len, L1_CACHE_BYTES);
@@ -158,26 +169,26 @@ void arc_cache_init(void)
                         panic("Cache ver [%d] doesn't match MMU ver [%d]\n",
                               ic->ver, CONFIG_ARC_MMU_VER);
         }
-#endif
 
-#ifdef CONFIG_ARC_HAS_DCACHE
-        dc = &cpuinfo_arc700[cpu].dcache;
-        if (dc->ver) {
-                unsigned int dcache_does_alias;
+        if (IS_ENABLED(CONFIG_ARC_HAS_DCACHE)) {
+                struct cpuinfo_arc_cache *dc = &cpuinfo_arc700[cpu].dcache;
+                int handled;
+
+                if (!dc->ver)
+                        panic("cache support enabled but non-existent cache\n");
 
                 if (dc->line_len != L1_CACHE_BYTES)
                         panic("DCache line [%d] != kernel Config [%d]",
                               dc->line_len, L1_CACHE_BYTES);
 
                 /* check for D-Cache aliasing */
-                dcache_does_alias = (dc->sz / dc->assoc) > PAGE_SIZE;
+                handled = IS_ENABLED(CONFIG_ARC_CACHE_VIPT_ALIASING);
 
-                if (dcache_does_alias && !cache_is_vipt_aliasing())
+                if (dc->alias && !handled)
                         panic("Enable CONFIG_ARC_CACHE_VIPT_ALIASING\n");
-                else if (!dcache_does_alias && cache_is_vipt_aliasing())
+                else if (!dc->alias && handled)
                         panic("Don't need CONFIG_ARC_CACHE_VIPT_ALIASING\n");
         }
-#endif
 }
 
 #define OP_INV          0x1
@@ -255,10 +266,32 @@ static inline void __cache_line_loop(unsigned long paddr, unsigned long vaddr,
  * Machine specific helpers for Entire D-Cache or Per Line ops
  */
 
-static inline void wait_for_flush(void)
+static unsigned int __before_dc_op(const int op)
+{
+        unsigned int reg = reg;
+
+        if (op == OP_FLUSH_N_INV) {
+                /* Dcache provides 2 cmd: FLUSH or INV
+                 * INV inturn has sub-modes: DISCARD or FLUSH-BEFORE
+                 * flush-n-inv is achieved by INV cmd but with IM=1
+                 * So toggle INV sub-mode depending on op request and default
+                 */
+                reg = read_aux_reg(ARC_REG_DC_CTRL);
+                write_aux_reg(ARC_REG_DC_CTRL, reg | DC_CTRL_INV_MODE_FLUSH)
+                        ;
+        }
+
+        return reg;
+}
+
+static void __after_dc_op(const int op, unsigned int reg)
 {
-        while (read_aux_reg(ARC_REG_DC_CTRL) & DC_CTRL_FLUSH_STATUS)
-                ;
+        if (op & OP_FLUSH)      /* flush / flush-n-inv both wait */
+                while (read_aux_reg(ARC_REG_DC_CTRL) & DC_CTRL_FLUSH_STATUS);
+
+        /* Switch back to default Invalidate mode */
+        if (op == OP_FLUSH_N_INV)
+                write_aux_reg(ARC_REG_DC_CTRL, reg & ~DC_CTRL_INV_MODE_FLUSH);
 }
 
 /*
@@ -269,18 +302,10 @@ static inline void wait_for_flush(void)
  */
 static inline void __dc_entire_op(const int cacheop)
 {
-        unsigned int tmp = tmp;
+        unsigned int ctrl_reg;
         int aux;
 
-        if (cacheop == OP_FLUSH_N_INV) {
-                /* Dcache provides 2 cmd: FLUSH or INV
-                 * INV inturn has sub-modes: DISCARD or FLUSH-BEFORE
-                 * flush-n-inv is achieved by INV cmd but with IM=1
-                 * Default INV sub-mode is DISCARD, which needs to be toggled
-                 */
-                tmp = read_aux_reg(ARC_REG_DC_CTRL);
-                write_aux_reg(ARC_REG_DC_CTRL, tmp | DC_CTRL_INV_MODE_FLUSH);
-        }
+        ctrl_reg = __before_dc_op(cacheop);
 
         if (cacheop & OP_INV)   /* Inv or flush-n-inv use same cmd reg */
                 aux = ARC_REG_DC_IVDC;
@@ -289,12 +314,7 @@ static inline void __dc_entire_op(const int cacheop)
 
         write_aux_reg(aux, 0x1);
 
-        if (cacheop & OP_FLUSH) /* flush / flush-n-inv both wait */
-                wait_for_flush();
-
-        /* Switch back the DISCARD ONLY Invalidate mode */
-        if (cacheop == OP_FLUSH_N_INV)
-                write_aux_reg(ARC_REG_DC_CTRL, tmp & ~DC_CTRL_INV_MODE_FLUSH);
+        __after_dc_op(cacheop, ctrl_reg);
 }
 
 /* For kernel mappings cache operation: index is same as paddr */
@@ -306,29 +326,16 @@ static inline void __dc_entire_op(const int cacheop)
 static inline void __dc_line_op(unsigned long paddr, unsigned long vaddr,
                                 unsigned long sz, const int cacheop)
 {
-        unsigned long flags, tmp = tmp;
+        unsigned long flags;
+        unsigned int ctrl_reg;
 
         local_irq_save(flags);
 
-        if (cacheop == OP_FLUSH_N_INV) {
-                /*
-                 * Dcache provides 2 cmd: FLUSH or INV
-                 * INV inturn has sub-modes: DISCARD or FLUSH-BEFORE
-                 * flush-n-inv is achieved by INV cmd but with IM=1
-                 * Default INV sub-mode is DISCARD, which needs to be toggled
-                 */
-                tmp = read_aux_reg(ARC_REG_DC_CTRL);
-                write_aux_reg(ARC_REG_DC_CTRL, tmp | DC_CTRL_INV_MODE_FLUSH);
-        }
+        ctrl_reg = __before_dc_op(cacheop);
 
         __cache_line_loop(paddr, vaddr, sz, cacheop);
 
-        if (cacheop & OP_FLUSH) /* flush / flush-n-inv both wait */
-                wait_for_flush();
-
-        /* Switch back the DISCARD ONLY Invalidate mode */
-        if (cacheop == OP_FLUSH_N_INV)
-                write_aux_reg(ARC_REG_DC_CTRL, tmp & ~DC_CTRL_INV_MODE_FLUSH);
+        __after_dc_op(cacheop, ctrl_reg);
 
         local_irq_restore(flags);
 }
@@ -389,8 +396,16 @@ static inline void __dc_line_op(unsigned long paddr, unsigned long vaddr,
 /***********************************************************
  * Machine specific helper for per line I-Cache invalidate.
  */
-static void __ic_line_inv_vaddr_local(unsigned long paddr, unsigned long vaddr,
-                                unsigned long sz)
+
+static inline void __ic_entire_inv(void)
+{
+        write_aux_reg(ARC_REG_IC_IVIC, 1);
+        read_aux_reg(ARC_REG_IC_CTRL);  /* blocks */
+}
+
+static inline void
+__ic_line_inv_vaddr_local(unsigned long paddr, unsigned long vaddr,
+                          unsigned long sz)
 {
         unsigned long flags;
 
@@ -399,30 +414,39 @@ static void __ic_line_inv_vaddr_local(unsigned long paddr, unsigned long vaddr,
         local_irq_restore(flags);
 }
 
-static inline void __ic_entire_inv(void)
-{
-        write_aux_reg(ARC_REG_IC_IVIC, 1);
-        read_aux_reg(ARC_REG_IC_CTRL);  /* blocks */
-}
+#ifndef CONFIG_SMP
+
+#define __ic_line_inv_vaddr(p, v, s)    __ic_line_inv_vaddr_local(p, v, s)
 
-struct ic_line_inv_vaddr_ipi {
+#else
+
+struct ic_inv_args {
         unsigned long paddr, vaddr;
         int sz;
 };
 
 static void __ic_line_inv_vaddr_helper(void *info)
 {
-        struct ic_line_inv_vaddr_ipi *ic_inv = (struct ic_line_inv_vaddr_ipi*) info;
+        struct ic_inv *ic_inv_args = (struct ic_inv_args *) info;
+
         __ic_line_inv_vaddr_local(ic_inv->paddr, ic_inv->vaddr, ic_inv->sz);
 }
 
 static void __ic_line_inv_vaddr(unsigned long paddr, unsigned long vaddr,
                                 unsigned long sz)
 {
-        struct ic_line_inv_vaddr_ipi ic_inv = { paddr, vaddr , sz};
+        struct ic_inv_args ic_inv = {
+                .paddr = paddr,
+                .vaddr = vaddr,
+                .sz    = sz
+        };
+
         on_each_cpu(__ic_line_inv_vaddr_helper, &ic_inv, 1);
 }
-#else
+
+#endif  /* CONFIG_SMP */
+
+#else   /* !CONFIG_ARC_HAS_ICACHE */
 
 #define __ic_entire_inv()
 #define __ic_line_inv_vaddr(pstart, vstart, sz)
diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c
index 9c69552350c4..6f7e3a68803a 100644
--- a/arch/arc/mm/fault.c
+++ b/arch/arc/mm/fault.c
@@ -159,7 +159,6 @@ good_area:
                 return;
         }
 
-        /* TBD: switch to pagefault_out_of_memory() */
         if (fault & VM_FAULT_OOM)
                 goto out_of_memory;
         else if (fault & VM_FAULT_SIGBUS)
diff --git a/arch/arc/mm/tlbex.S b/arch/arc/mm/tlbex.S
index 79bfc81358c9..d572f1c2c724 100644
--- a/arch/arc/mm/tlbex.S
+++ b/arch/arc/mm/tlbex.S
@@ -220,9 +220,9 @@ ex_saved_reg1:
 
 .macro CONV_PTE_TO_TLB
         and    r3, r0, PTE_BITS_RWX     ;       r w x
-        lsl    r2, r3, 3                ; r w x 0 0 0
+        lsl    r2, r3, 3                ; r w x 0 0 0 (GLOBAL, kernel only)
         and.f  0,  r0, _PAGE_GLOBAL
-        or.z   r2, r2, r3               ; r w x r w x
+        or.z   r2, r2, r3               ; r w x r w x (!GLOBAL, user page)
 
         and r3, r0, PTE_BITS_NON_RWX_IN_PD1 ; Extract PFN+cache bits from PTE
         or  r3, r3, r2
diff --git a/arch/arc/plat-arcfpga/Kconfig b/arch/arc/plat-arcfpga/Kconfig
index e27bb5cc3c1e..b9f34cf55acf 100644
--- a/arch/arc/plat-arcfpga/Kconfig
+++ b/arch/arc/plat-arcfpga/Kconfig
@@ -41,11 +41,4 @@ config ISS_SMP_EXTN
           -XTL (To enable CPU start/stop/set-PC for another CPU)
           It doesn't provide coherent Caches and/or Atomic Ops (LLOCK/SCOND)
 
-config ARC_SERIAL_BAUD
-        int "UART Baud rate"
-        default "115200"
-        depends on SERIAL_ARC || SERIAL_ARC_CONSOLE
-        help
-          Baud rate for the ARC UART
-
 endif
diff --git a/arch/arc/plat-arcfpga/Makefile b/arch/arc/plat-arcfpga/Makefile
index 4d1bddc34b5b..66fd0ecd68b3 100644
--- a/arch/arc/plat-arcfpga/Makefile
+++ b/arch/arc/plat-arcfpga/Makefile
@@ -8,5 +8,5 @@
 
 KBUILD_CFLAGS   += -Iarch/arc/plat-arcfpga/include
 
-obj-y := platform.o irq.o
+obj-y := platform.o
 obj-$(CONFIG_ISS_SMP_EXTN)              += smp.o
diff --git a/arch/arc/plat-arcfpga/include/plat/irq.h b/arch/arc/plat-arcfpga/include/plat/irq.h
index 6adbc53c3a5b..2c9dea690ac4 100644
--- a/arch/arc/plat-arcfpga/include/plat/irq.h
+++ b/arch/arc/plat-arcfpga/include/plat/irq.h
@@ -24,6 +24,4 @@
 #define IDU_INTERRUPT_0 16
 #endif
 
-extern void __init plat_fpga_init_IRQ(void);
-
 #endif
diff --git a/arch/arc/plat-arcfpga/irq.c b/arch/arc/plat-arcfpga/irq.c
deleted file mode 100644
index d2215fd889c2..000000000000
--- a/arch/arc/plat-arcfpga/irq.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * ARC FPGA Platform IRQ hookups
- *
- * Copyright (C) 2012 Synopsys, Inc. (www.synopsys.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/interrupt.h>
-#include <plat/irq.h>
-
-void __init plat_fpga_init_IRQ(void)
-{
-        /*
-         * SMP Hack because UART IRQ hardwired to cpu0 (boot-cpu) but if the
-         * request_irq() comes from any other CPU, the low level IRQ unamsking
-         * essential for getting Interrupts won't be enabled on cpu0, locking
-         * up the UART state machine.
-         */
-#ifdef CONFIG_SMP
-        arch_unmask_irq(UART0_IRQ);
-#endif
-}
diff --git a/arch/arc/plat-arcfpga/platform.c b/arch/arc/plat-arcfpga/platform.c
index 61c7e5997387..1038949a99a1 100644
--- a/arch/arc/plat-arcfpga/platform.c
+++ b/arch/arc/plat-arcfpga/platform.c
@@ -22,115 +22,22 @@
 #include <plat/smp.h>
 #include <plat/irq.h>
 
-/*----------------------- Platform Devices -----------------------------*/
-
-#if IS_ENABLED(CONFIG_SERIAL_ARC)
-static unsigned long arc_uart_info[] = {
-        0,      /* uart->is_emulated (runtime @running_on_hw) */
-        0,      /* uart->port.uartclk */
-        0,      /* uart->baud */
-        0
-};
-
-#if defined(CONFIG_SERIAL_ARC_CONSOLE)
-/*
- * static platform data - but only for early serial
- * TBD: derive this from a special DT node
- */
-static struct resource arc_uart0_res[] = {
-        {
-                .start = UART0_BASE,
-                .end   = UART0_BASE + 0xFF,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .start = UART0_IRQ,
-                .end   = UART0_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device arc_uart0_dev = {
-        .name = "arc-uart",
-        .id = 0,
-        .num_resources = ARRAY_SIZE(arc_uart0_res),
-        .resource = arc_uart0_res,
-        .dev = {
-                .platform_data = &arc_uart_info,
-        },
-};
-
-static struct platform_device *fpga_early_devs[] __initdata = {
-        &arc_uart0_dev,
-};
-#endif  /* CONFIG_SERIAL_ARC_CONSOLE */
-
-static void arc_fpga_serial_init(void)
-{
-        /* To let driver workaround ISS bug: baudh Reg can't be set to 0 */
-        arc_uart_info[0] = !running_on_hw;
-
-        arc_uart_info[1] = arc_get_core_freq();
-
-        arc_uart_info[2] = CONFIG_ARC_SERIAL_BAUD;
-
-#if defined(CONFIG_SERIAL_ARC_CONSOLE)
-        early_platform_add_devices(fpga_early_devs,
-                                   ARRAY_SIZE(fpga_early_devs));
-
-        /*
-         * ARC console driver registers (build time) as an early platform driver
-         * of class "earlyprintk". However it needs explicit cmdline toggle
-         * "earlyprintk=ttyARC0" to be successfuly runtime registered.
-         * Otherwise the early probe below fails to find the driver
-         */
-        early_platform_driver_probe("earlyprintk", 1, 0);
-
-        /*
-         * This is to make sure that arc uart would be preferred console
-         * despite one/more of following:
-         *   -command line lacked "console=ttyARC0" or
-         *   -CONFIG_VT_CONSOLE was enabled (for no reason whatsoever)
-         * Note that this needs to be done after above early console is reg,
-         * otherwise the early console never gets a chance to run.
-         */
-        add_preferred_console("ttyARC", 0, "115200");
-#endif  /* CONFIG_SERIAL_ARC_CONSOLE */
-}
-#else   /* !IS_ENABLED(CONFIG_SERIAL_ARC) */
-static void arc_fpga_serial_init(void)
-{
-}
-#endif
-
 static void __init plat_fpga_early_init(void)
 {
         pr_info("[plat-arcfpga]: registering early dev resources\n");
 
-        arc_fpga_serial_init();
-
 #ifdef CONFIG_ISS_SMP_EXTN
         iss_model_init_early_smp();
 #endif
 }
 
-static struct of_dev_auxdata plat_auxdata_lookup[] __initdata = {
-#if IS_ENABLED(CONFIG_SERIAL_ARC)
-        OF_DEV_AUXDATA("snps,arc-uart", UART0_BASE, "arc-uart", arc_uart_info),
-#endif
-        {}
-};
-
 static void __init plat_fpga_populate_dev(void)
 {
-        pr_info("[plat-arcfpga]: registering device resources\n");
-
         /*
          * Traverses flattened DeviceTree - registering platform devices
-         * complete with their resources
+         * (if any) complete with their resources
          */
-        of_platform_populate(NULL, of_default_bus_match_table,
-                             plat_auxdata_lookup, NULL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 /*----------------------- Machine Descriptions ------------------------------
@@ -150,7 +57,6 @@ MACHINE_START(ANGEL4, "angel4")
         .dt_compat      = aa4_compat,
         .init_early     = plat_fpga_early_init,
         .init_machine   = plat_fpga_populate_dev,
-        .init_irq       = plat_fpga_init_IRQ,
 #ifdef CONFIG_ISS_SMP_EXTN
         .init_smp       = iss_model_init_smp,
 #endif
@@ -165,7 +71,6 @@ MACHINE_START(ML509, "ml509")
         .dt_compat      = ml509_compat,
         .init_early     = plat_fpga_early_init,
         .init_machine   = plat_fpga_populate_dev,
-        .init_irq       = plat_fpga_init_IRQ,
 #ifdef CONFIG_SMP
         .init_smp       = iss_model_init_smp,
 #endif
@@ -180,5 +85,4 @@ MACHINE_START(NSIMOSCI, "nsimosci")
         .dt_compat      = nsimosci_compat,
         .init_early     = NULL,
         .init_machine   = plat_fpga_populate_dev,
-        .init_irq       = NULL,
 MACHINE_END
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 290f02ee0157..c49a775937db 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -65,7 +65,6 @@ config ARM
         select HAVE_UID16
         select HAVE_VIRT_CPU_ACCOUNTING_GEN
         select IRQ_FORCED_THREADING
-        select KTIME_SCALAR
         select MODULES_USE_ELF_REL
         select NO_BOOTMEM
         select OLD_SIGACTION
@@ -84,6 +83,7 @@ config ARM
           <http://www.arm.linux.org.uk/>.
 
 config ARM_HAS_SG_CHAIN
+        select ARCH_HAS_SG_CHAIN
         bool
 
 config NEED_SG_DMA_LENGTH
@@ -240,13 +240,6 @@ config ARM_PATCH_PHYS_VIRT
           this feature (eg, building a kernel for a single machine) and
           you need to shrink the kernel to the minimal size.
 
-config NEED_MACH_GPIO_H
-        bool
-        help
-          Select this when mach/gpio.h is required to provide special
-          definitions for this platform. The need for mach/gpio.h should
-          be avoided when possible.
-
 config NEED_MACH_IO_H
         bool
         help
@@ -263,8 +256,22 @@ config NEED_MACH_MEMORY_H
 
 config PHYS_OFFSET
         hex "Physical address of main memory" if MMU
-        depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H
+        depends on !ARM_PATCH_PHYS_VIRT
         default DRAM_BASE if !MMU
+        default 0x00000000 if ARCH_EBSA110 || \
+                        EP93XX_SDCE3_SYNC_PHYS_OFFSET || \
+                        ARCH_FOOTBRIDGE || \
+                        ARCH_INTEGRATOR || \
+                        ARCH_IOP13XX || \
+                        ARCH_KS8695 || \
+                        (ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET)
+        default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
+        default 0x20000000 if ARCH_S5PV210
+        default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET
+        default 0xc0000000 if EP93XX_SDCE0_PHYS_OFFSET || ARCH_SA1100
+        default 0xd0000000 if EP93XX_SDCE1_PHYS_OFFSET
+        default 0xe0000000 if EP93XX_SDCE2_PHYS_OFFSET
+        default 0xf0000000 if EP93XX_SDCE3_ASYNC_PHYS_OFFSET
         help
           Please provide the physical address corresponding to the
           location of main memory in your system.
@@ -321,7 +328,6 @@ config ARCH_INTEGRATOR
         select HAVE_TCM
         select ICST
         select MULTI_IRQ_HANDLER
-        select NEED_MACH_MEMORY_H
         select PLAT_VERSATILE
         select SPARSE_IRQ
         select USE_OF
@@ -341,7 +347,6 @@ config ARCH_REALVIEW
         select ICST
         select NEED_MACH_MEMORY_H
         select PLAT_VERSATILE
-        select PLAT_VERSATILE_CLCD
         help
           This enables support for ARM Ltd RealView boards.
 
@@ -356,7 +361,6 @@ config ARCH_VERSATILE
         select HAVE_MACH_CLKDEV
         select ICST
         select PLAT_VERSATILE
-        select PLAT_VERSATILE_CLCD
         select PLAT_VERSATILE_CLOCK
         select VERSATILE_FPGA_IRQ
         help
@@ -436,7 +440,6 @@ config ARCH_EP93XX
         select ARM_VIC
         select CLKDEV_LOOKUP
         select CPU_ARM920T
-        select NEED_MACH_MEMORY_H
         help
           This enables support for the Cirrus EP93xx series of CPUs.
 
@@ -529,21 +532,6 @@ config ARCH_DOVE
         help
           Support for the Marvell Dove SoC 88AP510
 
-config ARCH_KIRKWOOD
-        bool "Marvell 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
-        help
-          Support for the following Marvell Kirkwood series SoCs:
-          88F6180, 88F6192 and 88F6281.
-
 config ARCH_MV78XX0
         bool "Marvell MV78xx0"
         select ARCH_REQUIRE_GPIOLIB
@@ -635,6 +623,7 @@ config ARCH_PXA
         select AUTO_ZRELADDR
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
+        select CLKSRC_OF
         select GENERIC_CLOCKEVENTS
         select GPIO_PXA
         select HAVE_IDE
@@ -759,61 +748,6 @@ config ARCH_S3C64XX
         help
           Samsung S3C64XX series based systems
 
-config ARCH_S5P64X0
-        bool "Samsung S5P6440 S5P6450"
-        select ATAGS
-        select CLKDEV_LOOKUP
-        select CLKSRC_SAMSUNG_PWM
-        select CPU_V6
-        select GENERIC_CLOCKEVENTS
-        select GPIO_SAMSUNG
-        select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
-        select HAVE_S3C_RTC if RTC_CLASS
-        select NEED_MACH_GPIO_H
-        select SAMSUNG_ATAGS
-        select SAMSUNG_WDT_RESET
-        help
-          Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
-          SMDK6450.
-
-config ARCH_S5PC100
-        bool "Samsung S5PC100"
-        select ARCH_REQUIRE_GPIOLIB
-        select ATAGS
-        select CLKDEV_LOOKUP
-        select CLKSRC_SAMSUNG_PWM
-        select CPU_V7
-        select GENERIC_CLOCKEVENTS
-        select GPIO_SAMSUNG
-        select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
-        select HAVE_S3C_RTC if RTC_CLASS
-        select NEED_MACH_GPIO_H
-        select SAMSUNG_ATAGS
-        select SAMSUNG_WDT_RESET
-        help
-          Samsung S5PC100 series based systems
-
-config ARCH_S5PV210
-        bool "Samsung S5PV210/S5PC110"
-        select ARCH_HAS_HOLES_MEMORYMODEL
-        select ARCH_SPARSEMEM_ENABLE
-        select ATAGS
-        select CLKDEV_LOOKUP
-        select CLKSRC_SAMSUNG_PWM
-        select CPU_V7
-        select GENERIC_CLOCKEVENTS
-        select GPIO_SAMSUNG
-        select HAVE_S3C2410_I2C if I2C
-        select HAVE_S3C2410_WATCHDOG if WATCHDOG
-        select HAVE_S3C_RTC if RTC_CLASS
-        select NEED_MACH_GPIO_H
-        select NEED_MACH_MEMORY_H
-        select SAMSUNG_ATAGS
-        help
-          Samsung S5PV210/S5PC110 series based systems
-
 config ARCH_DAVINCI
         bool "TI DaVinci"
         select ARCH_HAS_HOLES_MEMORYMODEL
@@ -952,8 +886,6 @@ source "arch/arm/mach-ixp4xx/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
 
-source "arch/arm/mach-kirkwood/Kconfig"
-
 source "arch/arm/mach-ks8695/Kconfig"
 
 source "arch/arm/mach-msm/Kconfig"
@@ -964,6 +896,8 @@ source "arch/arm/mach-mv78xx0/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"
 
+source "arch/arm/mach-mediatek/Kconfig"
+
 source "arch/arm/mach-mxs/Kconfig"
 
 source "arch/arm/mach-netx/Kconfig"
@@ -1005,10 +939,6 @@ source "arch/arm/mach-s3c24xx/Kconfig"
 
 source "arch/arm/mach-s3c64xx/Kconfig"
 
-source "arch/arm/mach-s5p64x0/Kconfig"
-
-source "arch/arm/mach-s5pc100/Kconfig"
-
 source "arch/arm/mach-s5pv210/Kconfig"
 
 source "arch/arm/mach-exynos/Kconfig"
@@ -1555,10 +1485,12 @@ config ARM_PSCI
 config ARCH_NR_GPIO
         int
         default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
-        default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX
+        default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \
+                SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210
         default 416 if ARCH_SUNXI
         default 392 if ARCH_U8500
         default 352 if ARCH_VT8500
+        default 288 if ARCH_ROCKCHIP
         default 264 if MACH_H4700
         default 0
         help
@@ -1570,7 +1502,7 @@ source kernel/Kconfig.preempt
 
 config HZ_FIXED
         int
-        default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
+        default 200 if ARCH_EBSA110 || ARCH_S3C24XX || \
                 ARCH_S5PV210 || ARCH_EXYNOS4
         default AT91_TIMER_HZ if ARCH_AT91
         default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY
@@ -2051,6 +1983,8 @@ config XIP_PHYS_ADDR
 config KEXEC
         bool "Kexec system call (EXPERIMENTAL)"
         depends on (!SMP || PM_SLEEP_SMP)
+        select CRYPTO
+        select CRYPTO_SHA256
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
@@ -2195,7 +2129,6 @@ menu "Power management options"
 source "kernel/power/Kconfig"
 
 config ARCH_SUSPEND_POSSIBLE
-        depends on !ARCH_S5PC100
         depends on CPU_ARM920T || CPU_ARM926T || CPU_FEROCEON || CPU_SA1100 || \
                 CPU_V6 || CPU_V6K || CPU_V7 || CPU_V7M || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK
         def_bool y
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 8f90595069a1..b11ad54f8d17 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -223,6 +223,14 @@ choice
                   Say Y here if you want kernel low-level debugging support
                   on HI3716 UART.
 
+        config DEBUG_HIX5HD2_UART
+                bool "Hisilicon Hix5hd2 Debug UART"
+                depends on ARCH_HIX5HD2
+                select DEBUG_UART_PL01X
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Hix5hd2 UART.
+
         config DEBUG_HIGHBANK_UART
                 bool "Kernel low-level debugging messages via Highbank UART"
                 depends on ARCH_HIGHBANK
@@ -582,7 +590,7 @@ choice
                   on Rockchip based platforms.
 
         config DEBUG_RK3X_UART0
-                bool "Kernel low-level debugging messages via Rockchip RK3X UART0"
+                bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART0"
                 depends on ARCH_ROCKCHIP
                 select DEBUG_UART_8250
                 help
@@ -590,7 +598,7 @@ choice
                   on Rockchip based platforms.
 
         config DEBUG_RK3X_UART1
-                bool "Kernel low-level debugging messages via Rockchip RK3X UART1"
+                bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART1"
                 depends on ARCH_ROCKCHIP
                 select DEBUG_UART_8250
                 help
@@ -598,7 +606,7 @@ choice
                   on Rockchip based platforms.
 
         config DEBUG_RK3X_UART2
-                bool "Kernel low-level debugging messages via Rockchip RK3X UART2"
+                bool "Kernel low-level debugging messages via Rockchip RK30/RK31 UART2"
                 depends on ARCH_ROCKCHIP
                 select DEBUG_UART_8250
                 help
@@ -606,64 +614,64 @@ choice
                   on Rockchip based platforms.
 
         config DEBUG_RK3X_UART3
-                bool "Kernel low-level debugging messages via Rockchip RK3X UART3"
+                bool "Kernel low-level debugging messages via Rockchip RK30/RK31 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.
 
+        config DEBUG_RK32_UART2
+                bool "Kernel low-level debugging messages via Rockchip RK32 UART2"
+                depends on ARCH_ROCKCHIP
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Rockchip RK32xx based platforms.
+
         config DEBUG_S3C_UART0
                 depends on PLAT_SAMSUNG
                 select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                 select DEBUG_S3C24XX_UART if ARCH_S3C24XX
-                bool "Use S3C UART 0 for low-level debug"
+                select DEBUG_S5PV210_UART if ARCH_S5PV210
+                bool "Use Samsung S3C UART 0 for low-level debug"
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART 0. The port must have been initialised
                   by the boot-loader before use.
 
-                  The uncompressor code port configuration is now handled
-                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
         config DEBUG_S3C_UART1
                 depends on PLAT_SAMSUNG
                 select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                 select DEBUG_S3C24XX_UART if ARCH_S3C24XX
-                bool "Use S3C UART 1 for low-level debug"
+                select DEBUG_S5PV210_UART if ARCH_S5PV210
+                bool "Use Samsung S3C UART 1 for low-level debug"
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART 1. The port must have been initialised
                   by the boot-loader before use.
 
-                  The uncompressor code port configuration is now handled
-                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
         config DEBUG_S3C_UART2
                 depends on PLAT_SAMSUNG
                 select DEBUG_EXYNOS_UART if ARCH_EXYNOS
                 select DEBUG_S3C24XX_UART if ARCH_S3C24XX
-                bool "Use S3C UART 2 for low-level debug"
+                select DEBUG_S5PV210_UART if ARCH_S5PV210
+                bool "Use Samsung S3C UART 2 for low-level debug"
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART 2. The port must have been initialised
                   by the boot-loader before use.
 
-                  The uncompressor code port configuration is now handled
-                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
         config DEBUG_S3C_UART3
-                depends on PLAT_SAMSUNG && ARCH_EXYNOS
-                select DEBUG_EXYNOS_UART
-                bool "Use S3C UART 3 for low-level debug"
+                depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210)
+                select DEBUG_EXYNOS_UART if ARCH_EXYNOS
+                select DEBUG_S5PV210_UART if ARCH_S5PV210
+                bool "Use Samsung S3C UART 3 for low-level debug"
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART 3. The port must have been initialised
                   by the boot-loader before use.
 
-                  The uncompressor code port configuration is now handled
-                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
-
         config DEBUG_S3C2410_UART0
                 depends on ARCH_S3C24XX
                 select DEBUG_S3C2410_UART
@@ -715,6 +723,14 @@ choice
                   Say Y here if you want kernel low-level debugging support
                   on Allwinner A1X based platforms on the UART1.
 
+        config DEBUG_SUNXI_R_UART
+                bool "Kernel low-level debugging messages via sunXi R_UART"
+                depends on MACH_SUN6I || MACH_SUN8I
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Allwinner A31/A23 based platforms on the R_UART.
+
         config TEGRA_DEBUG_UART_AUTO_ODMDATA
                 bool "Kernel low-level debugging messages via Tegra UART via ODMDATA"
                 depends on ARCH_TEGRA
@@ -949,6 +965,9 @@ config DEBUG_S3C2410_UART
 config DEBUG_S3C24XX_UART
         bool
 
+config DEBUG_S5PV210_UART
+        bool
+
 config DEBUG_OMAP2PLUS_UART
         bool
         depends on ARCH_OMAP2PLUS
@@ -991,6 +1010,7 @@ config DEBUG_STI_UART
 config DEBUG_LL_INCLUDE
         string
         default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
+        default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2
         default "debug/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X
         default "debug/exynos.S" if DEBUG_EXYNOS_UART
         default "debug/efm32.S" if DEBUG_LL_UART_EFM32
@@ -1009,6 +1029,7 @@ config DEBUG_LL_INCLUDE
         default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
         default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
         default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
+        default "debug/s5pv210.S" if DEBUG_S5PV210_UART
         default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
         default "debug/sti.S" if DEBUG_STI_UART
         default "debug/tegra.S" if DEBUG_TEGRA_UART
@@ -1033,7 +1054,7 @@ 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_IOP33X || ARCH_IXP4XX || \
                 ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
 
 config DEBUG_UART_PHYS
@@ -1043,6 +1064,7 @@ config DEBUG_UART_PHYS
         default 0x01c28400 if DEBUG_SUNXI_UART1
         default 0x01d0c000 if DEBUG_DAVINCI_DA8XX_UART1
         default 0x01d0d000 if DEBUG_DAVINCI_DA8XX_UART2
+        default 0x01f02800 if DEBUG_SUNXI_R_UART
         default 0x02530c00 if DEBUG_KEYSTONE_UART0
         default 0x02531000 if DEBUG_KEYSTONE_UART1
         default 0x03010fe0 if ARCH_RPC
@@ -1089,13 +1111,14 @@ config DEBUG_UART_PHYS
         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 || \
+        default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \
                                 ARCH_ORION5X
         default 0xf7fc9000 if DEBUG_BERLIN_UART
-        default 0xf8b00000 if DEBUG_HI3716_UART
+        default 0xf8b00000 if DEBUG_HIX5HD2_UART
         default 0xf991e000 if DEBUG_QCOM_UARTDM
         default 0xfcb00000 if DEBUG_HI3620_UART
         default 0xfe800000 if ARCH_IOP32X
+        default 0xff690000 if DEBUG_RK32_UART2
         default 0xffc02000 if DEBUG_SOCFPGA_UART
         default 0xffd82340 if ARCH_IOP13XX
         default 0xfff36000 if DEBUG_HIGHBANK_UART
@@ -1118,6 +1141,7 @@ config DEBUG_UART_VIRT
         default 0xf1600000 if ARCH_INTEGRATOR
         default 0xf1c28000 if DEBUG_SUNXI_UART0
         default 0xf1c28400 if DEBUG_SUNXI_UART1
+        default 0xf1f02800 if DEBUG_SUNXI_R_UART
         default 0xf2100000 if DEBUG_PXA_UART1
         default 0xf4090000 if ARCH_LPC32XX
         default 0xf4200000 if ARCH_GEMINI
@@ -1144,7 +1168,7 @@ config DEBUG_UART_VIRT
         default 0xfe230000 if DEBUG_PICOXCELL_UART
         default 0xfe300000 if DEBUG_BCM_KONA_UART
         default 0xfe800000 if ARCH_IOP32X
-        default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HI3716_UART
+        default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HIX5HD2_UART
         default 0xfeb24000 if DEBUG_RK3X_UART0
         default 0xfeb26000 if DEBUG_RK3X_UART1
         default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
@@ -1152,9 +1176,9 @@ config DEBUG_UART_VIRT
         default 0xfec02000 if DEBUG_SOCFPGA_UART
         default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
         default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
+        default 0xfec90000 if DEBUG_RK32_UART2
         default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
         default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
-        default 0xfed12000 if ARCH_KIRKWOOD
         default 0xfed60000 if DEBUG_RK29_UART0
         default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
         default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
@@ -1186,7 +1210,7 @@ config DEBUG_UART_8250_WORD
                 ARCH_KEYSTONE || \
                 DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \
                 DEBUG_DAVINCI_DA8XX_UART2 || \
-                DEBUG_BCM_KONA_UART
+                DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2
 
 config DEBUG_UART_8250_FLOW_CONTROL
         bool "Enable flow control for 8250 UART"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6721fab13734..0ce9d0f71f2a 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -127,6 +127,9 @@ CHECKFLAGS	+= -D__arm__
 
 #Default value
 head-y          := arch/arm/kernel/head$(MMUEXT).o
+
+# Text offset. This list is sorted numerically by address in order to
+# provide a means to avoid/resolve conflicts in multi-arch kernels.
 textofs-y       := 0x00008000
 textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
 # We don't want the htc bootloader to corrupt kernel during resume
@@ -156,14 +159,13 @@ machine-$(CONFIG_ARCH_EP93XX)		+= ep93xx
 machine-$(CONFIG_ARCH_EXYNOS)           += exynos
 machine-$(CONFIG_ARCH_GEMINI)           += gemini
 machine-$(CONFIG_ARCH_HIGHBANK)         += highbank
-machine-$(CONFIG_ARCH_HI3xxx)           += hisi
+machine-$(CONFIG_ARCH_HISI)             += hisi
 machine-$(CONFIG_ARCH_INTEGRATOR)       += integrator
 machine-$(CONFIG_ARCH_IOP13XX)          += iop13xx
 machine-$(CONFIG_ARCH_IOP32X)           += iop32x
 machine-$(CONFIG_ARCH_IOP33X)           += iop33x
 machine-$(CONFIG_ARCH_IXP4XX)           += ixp4xx
 machine-$(CONFIG_ARCH_KEYSTONE)         += keystone
-machine-$(CONFIG_ARCH_KIRKWOOD)         += kirkwood
 machine-$(CONFIG_ARCH_KS8695)           += ks8695
 machine-$(CONFIG_ARCH_LPC32XX)          += lpc32xx
 machine-$(CONFIG_ARCH_MMP)              += mmp
@@ -172,6 +174,7 @@ machine-$(CONFIG_ARCH_MSM)		+= msm
 machine-$(CONFIG_ARCH_MV78XX0)          += mv78xx0
 machine-$(CONFIG_ARCH_MVEBU)            += mvebu
 machine-$(CONFIG_ARCH_MXC)              += imx
+machine-$(CONFIG_ARCH_MEDIATEK)         += mediatek
 machine-$(CONFIG_ARCH_MXS)              += mxs
 machine-$(CONFIG_ARCH_NETX)             += netx
 machine-$(CONFIG_ARCH_NOMADIK)          += nomadik
@@ -187,8 +190,6 @@ machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
 machine-$(CONFIG_ARCH_RPC)              += rpc
 machine-$(CONFIG_ARCH_S3C24XX)          += s3c24xx
 machine-$(CONFIG_ARCH_S3C64XX)          += s3c64xx
-machine-$(CONFIG_ARCH_S5P64X0)          += s5p64x0
-machine-$(CONFIG_ARCH_S5PC100)          += s5pc100
 machine-$(CONFIG_ARCH_S5PV210)          += s5pv210
 machine-$(CONFIG_ARCH_SA1100)           += sa1100
 machine-$(CONFIG_ARCH_SHMOBILE)         += shmobile
@@ -212,11 +213,11 @@ machine-$(CONFIG_PLAT_SPEAR)		+= spear
 plat-$(CONFIG_ARCH_EXYNOS)      += samsung
 plat-$(CONFIG_ARCH_OMAP)        += omap
 plat-$(CONFIG_ARCH_S3C64XX)     += samsung
+plat-$(CONFIG_ARCH_S5PV210)     += samsung
 plat-$(CONFIG_PLAT_IOP)         += iop
 plat-$(CONFIG_PLAT_ORION)       += orion
 plat-$(CONFIG_PLAT_PXA)         += pxa
 plat-$(CONFIG_PLAT_S3C24XX)     += samsung
-plat-$(CONFIG_PLAT_S5P)         += samsung
 plat-$(CONFIG_PLAT_VERSATILE)   += versatile
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)
@@ -240,7 +241,7 @@ MACHINE  :=
 endif
 
 machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
-platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y))
+platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y)))
 
 ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)
 ifeq ($(KBUILD_SRC),)
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 68c918362b79..76a50ecae1c3 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -81,7 +81,7 @@ ZTEXTADDR	:= 0
 ZBSSADDR        := ALIGN(8)
 endif
 
-SEDFLAGS        = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
+CPPFLAGS_vmlinux.lds := -DTEXT_START="$(ZTEXTADDR)" -DBSS_START="$(ZBSSADDR)"
 
 suffix_$(CONFIG_KERNEL_GZIP) = gzip
 suffix_$(CONFIG_KERNEL_LZO)  = lzo
@@ -199,8 +199,5 @@ CFLAGS_font.o := -Dstatic=
 $(obj)/font.c: $(FONTC)
         $(call cmd,shipped)
 
-$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile $(KCONFIG_CONFIG)
-        @sed "$(SEDFLAGS)" < $< > $@
-
 $(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S
         $(call cmd,shipped)
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 3a8b32df6b31..413fd94b5301 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -125,9 +125,11 @@ start:
  THUMB(         adr     r12, BSYM(1f)   )
  THUMB(         bx      r12             )
 
-                .word   0x016f2818              @ Magic numbers to help the loader
-                .word   start                   @ absolute load/run zImage address
-                .word   _edata                  @ zImage end address
+                .word   _magic_sig      @ Magic numbers to help the loader
+                .word   _magic_start    @ absolute load/run zImage address
+                .word   _magic_end      @ zImage end address
+                .word   0x04030201      @ endianness flag
+
  THUMB(         .thumb                  )
 1:
  ARM_BE8(       setend  be )                    @ go BE8 if compiled for BE8
diff --git a/arch/arm/boot/compressed/vmlinux.lds.in b/arch/arm/boot/compressed/vmlinux.lds.S
index 4919f2ac8b89..2b60b843ac5e 100644
--- a/arch/arm/boot/compressed/vmlinux.lds.in
+++ b/arch/arm/boot/compressed/vmlinux.lds.S
@@ -1,12 +1,20 @@
 /*
- *  linux/arch/arm/boot/compressed/vmlinux.lds.in
- *
  *  Copyright (C) 2000 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.
  */
+
+#ifdef CONFIG_CPU_ENDIAN_BE8
+#define ZIMAGE_MAGIC(x) ( (((x) >> 24) & 0x000000ff) | \
+                          (((x) >>  8) & 0x0000ff00) | \
+                          (((x) <<  8) & 0x00ff0000) | \
+                          (((x) << 24) & 0xff000000) )
+#else
+#define ZIMAGE_MAGIC(x) (x)
+#endif
+
 OUTPUT_ARCH(arm)
 ENTRY(_start)
 SECTIONS
@@ -57,6 +65,10 @@ SECTIONS
   .pad                  : { BYTE(0); . = ALIGN(8); }
   _edata = .;
 
+  _magic_sig = ZIMAGE_MAGIC(0x016f2818);
+  _magic_start = ZIMAGE_MAGIC(_start);
+  _magic_end = ZIMAGE_MAGIC(_edata);
+
   . = BSS_START;
   __bss_start = .;
   .bss                  : { *(.bss) }
@@ -73,4 +85,3 @@ SECTIONS
   .stab.indexstr 0      : { *(.stab.indexstr) }
   .comment 0            : { *(.comment) }
 }
-
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index adb5ed9e269e..b8c5cd3ddeb9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -59,6 +59,8 @@ dtb-$(CONFIG_ARCH_BERLIN) += \
         berlin2-sony-nsz-gs7.dtb        \
         berlin2cd-google-chromecast.dtb \
         berlin2q-marvell-dmp.dtb
+dtb-$(CONFIG_ARCH_BRCMSTB) += \
+        bcm7445-bcm97445svmb.dtb
 dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
         da850-evm.dtb
 dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
@@ -66,7 +68,9 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
         exynos4210-smdkv310.dtb \
         exynos4210-trats.dtb \
         exynos4210-universal_c210.dtb \
+        exynos4412-odroidu3.dtb \
         exynos4412-odroidx.dtb \
+        exynos4412-odroidx2.dtb \
         exynos4412-origen.dtb \
         exynos4412-smdk4412.dtb \
         exynos4412-tiny4412.dtb \
@@ -83,6 +87,7 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
         exynos5440-ssdk5440.dtb \
         exynos5800-peach-pi.dtb
 dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
+dtb-$(CONFIG_ARCH_HIX5HD2) += hisi-x5hd2-dkb.dtb
 dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
         ecx-2000.dtb
 dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
@@ -90,9 +95,9 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
 dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
         k2l-evm.dtb \
         k2e-evm.dtb
-kirkwood := \
-        kirkwood-b3.dtb \
+dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
         kirkwood-cloudbox.dtb \
+        kirkwood-d2net.dtb \
         kirkwood-db-88f6281.dtb \
         kirkwood-db-88f6282.dtb \
         kirkwood-dns320.dtb \
@@ -123,6 +128,8 @@ kirkwood := \
         kirkwood-lsxhl.dtb \
         kirkwood-mplcec4.dtb \
         kirkwood-mv88f6281gtw-ge.dtb \
+        kirkwood-net2big.dtb \
+        kirkwood-net5big.dtb \
         kirkwood-netgear_readynas_duo_v2.dtb \
         kirkwood-netgear_readynas_nv+_v2.dtb \
         kirkwood-ns2.dtb \
@@ -150,17 +157,19 @@ kirkwood := \
         kirkwood-ts219-6282.dtb \
         kirkwood-ts419-6281.dtb \
         kirkwood-ts419-6282.dtb
-dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood)
-dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood)
 dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
 dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
 dtb-$(CONFIG_ARCH_MXC) += \
         imx25-eukrea-mbimxsd25-baseboard.dtb \
+        imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dtb \
+        imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dtb \
+        imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \
         imx25-karo-tx25.dtb \
         imx25-pdk.dtb \
         imx27-apf27.dtb \
         imx27-apf27dev.dtb \
+        imx27-eukrea-mbimxsd27-baseboard.dtb \
         imx27-pdk.dtb \
         imx27-phytec-phycore-rdk.dtb \
         imx27-phytec-phycard-s-rdk.dtb \
@@ -182,6 +191,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx53-tx53-x03x.dtb \
         imx53-tx53-x13x.dtb \
         imx53-voipac-bsb.dtb \
+        imx6dl-aristainetos_4.dtb \
+        imx6dl-aristainetos_7.dtb \
         imx6dl-cubox-i.dtb \
         imx6dl-dfi-fs700-m60.dtb \
         imx6dl-gw51xx.dtb \
@@ -191,11 +202,16 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx6dl-hummingboard.dtb \
         imx6dl-nitrogen6x.dtb \
         imx6dl-phytec-pbab01.dtb \
+        imx6dl-rex-basic.dtb \
         imx6dl-riotboard.dtb \
         imx6dl-sabreauto.dtb \
         imx6dl-sabrelite.dtb \
         imx6dl-sabresd.dtb \
+        imx6dl-tx6dl-comtft.dtb \
+        imx6dl-tx6u-801x.dtb \
+        imx6dl-tx6u-811x.dtb \
         imx6dl-wandboard.dtb \
+        imx6dl-wandboard-revb1.dtb \
         imx6q-arm2.dtb \
         imx6q-cm-fx6.dtb \
         imx6q-cubox-i.dtb \
@@ -209,13 +225,21 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx6q-gw54xx.dtb \
         imx6q-nitrogen6x.dtb \
         imx6q-phytec-pbab01.dtb \
+        imx6q-rex-pro.dtb \
         imx6q-sabreauto.dtb \
         imx6q-sabrelite.dtb \
         imx6q-sabresd.dtb \
         imx6q-sbc6x.dtb \
         imx6q-udoo.dtb \
         imx6q-wandboard.dtb \
+        imx6q-wandboard-revb1.dtb \
+        imx6q-tx6q-1010.dtb \
+        imx6q-tx6q-1010-comtft.dtb \
+        imx6q-tx6q-1020.dtb \
+        imx6q-tx6q-1020-comtft.dtb \
+        imx6q-tx6q-1110.dtb \
         imx6sl-evk.dtb \
+        imx6sx-sdb.dtb \
         vf610-colibri.dtb \
         vf610-cosmic.dtb \
         vf610-twr.dtb
@@ -291,7 +315,8 @@ dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
         am335x-boneblack.dtb \
         am335x-evm.dtb \
         am335x-evmsk.dtb \
-        am335x-nano.dtb
+        am335x-nano.dtb \
+        am335x-pepper.dtb
 dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
         omap4-panda.dtb \
         omap4-panda-a4.dtb \
@@ -301,6 +326,7 @@ dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
         omap4-var-dvk-om44.dtb \
         omap4-var-stk-om44.dtb
 dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
+        am437x-sk-evm.dtb \
         am437x-gp-evm.dtb
 dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
         omap5-sbc-t54.dtb \
@@ -318,16 +344,25 @@ dtb-$(CONFIG_ARCH_QCOM) += \
         qcom-apq8084-mtp.dtb \
         qcom-msm8660-surf.dtb \
         qcom-msm8960-cdp.dtb
+dtb-$(CONFIG_ARCH_ROCKCHIP) += \
+        rk3066a-bqcurie2.dtb \
+        rk3188-radxarock.dtb \
+        rk3288-evb-act8846.dtb \
+        rk3288-evb-rk808.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
         s3c6410-smdk6410.dtb
+dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-aquila.dtb \
+        s5pv210-goni.dtb \
+        s5pv210-smdkc110.dtb \
+        s5pv210-smdkv210.dtb \
+        s5pv210-torbreck.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
         r8a7740-armadillo800eva.dtb \
         r8a7778-bockw.dtb \
         r8a7778-bockw-reference.dtb \
         r8a7740-armadillo800eva-reference.dtb \
         r8a7779-marzen.dtb \
-        r8a7779-marzen-reference.dtb \
         r8a7791-koelsch.dtb \
         r8a7790-lager.dtb \
         sh73a0-kzm9g.dtb \
@@ -339,7 +374,8 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
         r7s72100-genmai.dtb \
         r8a7791-henninger.dtb \
         r8a7791-koelsch.dtb \
-        r8a7790-lager.dtb
+        r8a7790-lager.dtb \
+        r8a7779-marzen.dtb
 dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
         socfpga_cyclone5_socdk.dtb \
         socfpga_cyclone5_sockit.dtb \
@@ -360,6 +396,7 @@ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
         stih416-b2020e.dtb
 dtb-$(CONFIG_MACH_SUN4I) += \
         sun4i-a10-a1000.dtb \
+        sun4i-a10-ba10-tvbox.dtb \
         sun4i-a10-cubieboard.dtb \
         sun4i-a10-mini-xplus.dtb \
         sun4i-a10-hackberry.dtb \
@@ -374,12 +411,16 @@ dtb-$(CONFIG_MACH_SUN5I) += \
 dtb-$(CONFIG_MACH_SUN6I) += \
         sun6i-a31-app4-evb1.dtb \
         sun6i-a31-colombus.dtb \
+        sun6i-a31-hummingbird.dtb \
         sun6i-a31-m9.dtb
 dtb-$(CONFIG_MACH_SUN7I) += \
         sun7i-a20-cubieboard2.dtb \
         sun7i-a20-cubietruck.dtb \
         sun7i-a20-i12-tvbox.dtb \
-        sun7i-a20-olinuxino-micro.dtb
+        sun7i-a20-olinuxino-micro.dtb \
+        sun7i-a20-pcduino3.dtb
+dtb-$(CONFIG_MACH_SUN8I) += \
+        sun8i-a23-ippo-q8h-v5.dtb
 dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
         tegra20-iris-512.dtb \
         tegra20-medcom-wide.dtb \
@@ -390,6 +431,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
         tegra20-trimslice.dtb \
         tegra20-ventana.dtb \
         tegra20-whistler.dtb \
+        tegra30-apalis-eval.dtb \
         tegra30-beaver.dtb \
         tegra30-cardhu-a02.dtb \
         tegra30-cardhu-a04.dtb \
@@ -419,7 +461,9 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
         wm8650-mid.dtb \
         wm8750-apc8750.dtb \
         wm8850-w70v2.dtb
-dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
+dtb-$(CONFIG_ARCH_ZYNQ) += \
+        zynq-parallella.dtb \
+        zynq-zc702.dtb \
         zynq-zc706.dtb \
         zynq-zed.dtb
 dtb-$(CONFIG_MACH_ARMADA_370) += \
@@ -437,11 +481,13 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
         armada-xp-axpwifiap.dtb \
         armada-xp-db.dtb \
         armada-xp-gp.dtb \
-        armada-xp-netgear-rn2120.dtb \
+        armada-xp-lenovo-ix4-300d.dtb \
         armada-xp-matrix.dtb \
+        armada-xp-netgear-rn2120.dtb \
         armada-xp-openblocks-ax3-4.dtb
 dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
         dove-cubox.dtb \
+        dove-cubox-es.dtb \
         dove-d2plug.dtb \
         dove-d3plug.dtb \
         dove-dove-db.dtb
diff --git a/arch/arm/boot/dts/aks-cdu.dts b/arch/arm/boot/dts/aks-cdu.dts
index 54cb5cf8604a..d9c50fbb49d2 100644
--- a/arch/arm/boot/dts/aks-cdu.dts
+++ b/arch/arm/boot/dts/aks-cdu.dts
@@ -16,6 +16,12 @@
                 bootargs = "console=ttyS0,115200 ubi.mtd=4 root=ubi0:rootfs rootfstype=ubifs";
         };
 
+        clocks {
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+        };
+
         ahb {
                 apb {
                         usart0: serial@fffb0000 {
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 80a3b215e7d6..df5fee6b6b4b 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -149,12 +149,113 @@
                         "Headphone Jack",       "HPLOUT",
                         "Headphone Jack",       "HPROUT";
         };
+
+        panel {
+                compatible = "ti,tilcdc,panel";
+                pinctrl-names = "default", "sleep";
+                pinctrl-0 = <&lcd_pins_default>;
+                pinctrl-1 = <&lcd_pins_sleep>;
+                status = "okay";
+                panel-info {
+                        ac-bias           = <255>;
+                        ac-bias-intrpt    = <0>;
+                        dma-burst-sz      = <16>;
+                        bpp               = <32>;
+                        fdd               = <0x80>;
+                        sync-edge         = <0>;
+                        sync-ctrl         = <1>;
+                        raster-order      = <0>;
+                        fifo-th           = <0>;
+                };
+                display-timings {
+                        480x272 {
+                                hactive         = <480>;
+                                vactive         = <272>;
+                                hback-porch     = <43>;
+                                hfront-porch    = <8>;
+                                hsync-len       = <4>;
+                                vback-porch     = <12>;
+                                vfront-porch    = <4>;
+                                vsync-len       = <10>;
+                                clock-frequency = <9000000>;
+                                hsync-active    = <0>;
+                                vsync-active    = <0>;
+                        };
+                };
+        };
 };
 
 &am33xx_pinmux {
         pinctrl-names = "default";
         pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
 
+        lcd_pins_default: lcd_pins_default {
+                pinctrl-single,pins = <
+                        0x20 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad8.lcd_data23 */
+                        0x24 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad9.lcd_data22 */
+                        0x28 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad10.lcd_data21 */
+                        0x2c (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad11.lcd_data20 */
+                        0x30 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad12.lcd_data19 */
+                        0x34 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad13.lcd_data18 */
+                        0x38 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad14.lcd_data17 */
+                        0x3c (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad15.lcd_data16 */
+                        0xa0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data0.lcd_data0 */
+                        0xa4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data1.lcd_data1 */
+                        0xa8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data2.lcd_data2 */
+                        0xac (PIN_OUTPUT | MUX_MODE0)   /* lcd_data3.lcd_data3 */
+                        0xb0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data4.lcd_data4 */
+                        0xb4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data5.lcd_data5 */
+                        0xb8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data6.lcd_data6 */
+                        0xbc (PIN_OUTPUT | MUX_MODE0)   /* lcd_data7.lcd_data7 */
+                        0xc0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data8.lcd_data8 */
+                        0xc4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data9.lcd_data9 */
+                        0xc8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data10.lcd_data10 */
+                        0xcc (PIN_OUTPUT | MUX_MODE0)   /* lcd_data11.lcd_data11 */
+                        0xd0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data12.lcd_data12 */
+                        0xd4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data13.lcd_data13 */
+                        0xd8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data14.lcd_data14 */
+                        0xdc (PIN_OUTPUT | MUX_MODE0)   /* lcd_data15.lcd_data15 */
+                        0xe0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_vsync.lcd_vsync */
+                        0xe4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_hsync.lcd_hsync */
+                        0xe8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_pclk.lcd_pclk */
+                        0xec (PIN_OUTPUT | MUX_MODE0)   /* lcd_ac_bias_en.lcd_ac_bias_en */
+                >;
+        };
+
+        lcd_pins_sleep: lcd_pins_sleep {
+                pinctrl-single,pins = <
+                        0x20 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ad8.lcd_data23 */
+                        0x24 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ad9.lcd_data22 */
+                        0x28 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ad10.lcd_data21 */
+                        0x2c (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ad11.lcd_data20 */
+                        0x30 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ad12.lcd_data19 */
+                        0x34 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ad13.lcd_data18 */
+                        0x38 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ad14.lcd_data17 */
+                        0x3c (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* gpmc_ad15.lcd_data16 */
+                        0xa0 (PULL_DISABLE | MUX_MODE7) /* lcd_data0.lcd_data0 */
+                        0xa4 (PULL_DISABLE | MUX_MODE7) /* lcd_data1.lcd_data1 */
+                        0xa8 (PULL_DISABLE | MUX_MODE7) /* lcd_data2.lcd_data2 */
+                        0xac (PULL_DISABLE | MUX_MODE7) /* lcd_data3.lcd_data3 */
+                        0xb0 (PULL_DISABLE | MUX_MODE7) /* lcd_data4.lcd_data4 */
+                        0xb4 (PULL_DISABLE | MUX_MODE7) /* lcd_data5.lcd_data5 */
+                        0xb8 (PULL_DISABLE | MUX_MODE7) /* lcd_data6.lcd_data6 */
+                        0xbc (PULL_DISABLE | MUX_MODE7) /* lcd_data7.lcd_data7 */
+                        0xc0 (PULL_DISABLE | MUX_MODE7) /* lcd_data8.lcd_data8 */
+                        0xc4 (PULL_DISABLE | MUX_MODE7) /* lcd_data9.lcd_data9 */
+                        0xc8 (PULL_DISABLE | MUX_MODE7) /* lcd_data10.lcd_data10 */
+                        0xcc (PULL_DISABLE | MUX_MODE7) /* lcd_data11.lcd_data11 */
+                        0xd0 (PULL_DISABLE | MUX_MODE7) /* lcd_data12.lcd_data12 */
+                        0xd4 (PULL_DISABLE | MUX_MODE7) /* lcd_data13.lcd_data13 */
+                        0xd8 (PULL_DISABLE | MUX_MODE7) /* lcd_data14.lcd_data14 */
+                        0xdc (PULL_DISABLE | MUX_MODE7) /* lcd_data15.lcd_data15 */
+                        0xe0 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* lcd_vsync.lcd_vsync */
+                        0xe4 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* lcd_hsync.lcd_hsync */
+                        0xe8 (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* lcd_pclk.lcd_pclk */
+                        0xec (PIN_INPUT_PULLDOWN | MUX_MODE7)   /* lcd_ac_bias_en.lcd_ac_bias_en */
+                >;
+        };
+
+
         user_leds_s0: user_leds_s0 {
                 pinctrl-single,pins = <
                         0x10 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_ad4.gpio1_4 */
@@ -573,3 +674,7 @@
                 ti,wire-config = <0x00 0x11 0x22 0x33>;
         };
 };
+
+&lcdc {
+      status = "okay";
+};
diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
new file mode 100644
index 000000000000..0d35ab64641c
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-pepper.dts
@@ -0,0 +1,653 @@
+/*
+ * Copyright (C) 2014 Gumstix, Inc. - https://www.gumstix.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 <dt-bindings/input/input.h>
+#include "am33xx.dtsi"
+
+/ {
+        model = "Gumstix Pepper";
+        compatible = "gumstix,am335x-pepper", "ti,am33xx";
+
+        cpus {
+                cpu@0 {
+                        cpu0-supply = <&dcdc3_reg>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x80000000 0x20000000>; /* 512 MB */
+        };
+
+        buttons: user_buttons {
+                compatible = "gpio-keys";
+        };
+
+        leds: user_leds {
+                compatible = "gpio-leds";
+        };
+
+        panel: lcd_panel {
+                compatible = "ti,tilcdc,panel";
+        };
+
+        sound: sound_iface {
+                compatible = "ti,da830-evm-audio";
+        };
+
+        vbat: fixedregulator@0 {
+                compatible = "regulator-fixed";
+        };
+
+        v3v3c_reg: fixedregulator@1 {
+                compatible = "regulator-fixed";
+        };
+
+        vdd5_reg: fixedregulator@2 {
+                compatible = "regulator-fixed";
+        };
+};
+
+/* I2C Busses */
+&i2c0 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c0_pins>;
+
+        clock-frequency = <400000>;
+
+        tps: tps@24 {
+                reg = <0x24>;
+        };
+
+        eeprom: eeprom@50 {
+                compatible = "at,24c256";
+                reg = <0x50>;
+        };
+
+        audio_codec: tlv320aic3106@1b {
+                compatible = "ti,tlv320aic3106";
+                reg = <0x1b>;
+        };
+
+        accel: lis331dlh@1d {
+                compatible = "st,lis3lv02d";
+                reg = <0x1d>;
+        };
+};
+
+&i2c1 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c1_pins>;
+        clock-frequency = <400000>;
+};
+
+&am33xx_pinmux {
+        i2c0_pins: pinmux_i2c0 {
+                pinctrl-single,pins = <
+                        0x188 (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_sda.i2c0_sda */
+                        0x18c (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_scl.i2c0_scl */
+                >;
+        };
+        i2c1_pins: pinmux_i2c1 {
+                pinctrl-single,pins = <
+                        0x10C (PIN_INPUT_PULLUP | MUX_MODE3)    /* mii1_crs,i2c1_sda */
+                        0x110 (PIN_INPUT_PULLUP | MUX_MODE3)    /* mii1_rxerr,i2c1_scl */
+                >;
+        };
+};
+
+/* Accelerometer */
+&accel {
+        pinctrl-names = "default";
+        pinctrl-0 = <&accel_pins>;
+
+        Vdd-supply = <&ldo3_reg>;
+        Vdd_IO-supply = <&ldo3_reg>;
+        st,irq1-click;
+        st,wakeup-x-lo;
+        st,wakeup-x-hi;
+        st,wakeup-y-lo;
+        st,wakeup-y-hi;
+        st,wakeup-z-lo;
+        st,wakeup-z-hi;
+        st,min-limit-x = <92>;
+        st,max-limit-x = <14>;
+        st,min-limit-y = <14>;
+        st,max-limit-y = <92>;
+        st,min-limit-z = <92>;
+        st,max-limit-z = <14>;
+};
+
+&am33xx_pinmux {
+        accel_pins: pinmux_accel {
+                pinctrl-single,pins = <
+                        0x98 (PIN_INPUT | MUX_MODE7)   /* gpmc_wen.gpio2_4 */
+                >;
+        };
+};
+
+/* Audio */
+&audio_codec {
+        status = "okay";
+
+        gpio-reset = <&gpio1 16 GPIO_ACTIVE_LOW>;
+        AVDD-supply = <&ldo3_reg>;
+        IOVDD-supply = <&ldo3_reg>;
+        DRVDD-supply = <&ldo3_reg>;
+        DVDD-supply = <&dcdc1_reg>;
+};
+
+&sound {
+        ti,model = "AM335x-EVM";
+        ti,audio-codec = <&audio_codec>;
+        ti,mcasp-controller = <&mcasp0>;
+        ti,codec-clock-rate = <12000000>;
+        ti,audio-routing =
+                "Headphone Jack",       "HPLOUT",
+                "Headphone Jack",       "HPROUT",
+                "LINE1L",               "Line In";
+};
+
+&mcasp0 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&audio_pins>;
+
+        op-mode = <0>;  /* MCASP_ISS_MODE */
+        tdm-slots = <2>;
+        serial-dir = <
+                1 2 0 0
+                0 0 0 0
+                0 0 0 0
+                0 0 0 0
+        >;
+        tx-num-evt = <1>;
+        rx-num-evt = <1>;
+};
+
+&am33xx_pinmux {
+        audio_pins: pinmux_audio {
+                pinctrl-single,pins = <
+                        0x1AC (PIN_INPUT_PULLDOWN | MUX_MODE0)  /* mcasp0_ahcklx.mcasp0_ahclkx */
+                        0x194 (PIN_INPUT_PULLDOWN | MUX_MODE0)  /* mcasp0_fsx.mcasp0_fsx */
+                        0x190 (PIN_INPUT_PULLDOWN | MUX_MODE0)  /* mcasp0_aclkx.mcasp0_aclkx */
+                        0x198 (PIN_INPUT_PULLDOWN | MUX_MODE0)  /* mcasp0_axr0.mcasp0_axr0 */
+                        0x1A8 (PIN_INPUT_PULLDOWN | MUX_MODE0)  /* mcasp0_axr1.mcasp0_axr1 */
+                        0x40 (PIN_OUTPUT | MUX_MODE7)   /* gpmc_a0.gpio1_16 */
+                >;
+        };
+};
+
+/* Display: 24-bit LCD Screen */
+&panel {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&lcd_pins>;
+        panel-info {
+                ac-bias = <255>;
+                ac-bias-intrpt = <0>;
+                dma-burst-sz = <16>;
+                bpp = <32>;
+                fdd = <0x80>;
+                sync-edge = <0>;
+                sync-ctrl = <1>;
+                raster-order = <0>;
+                fifo-th = <0>;
+        };
+        display-timings {
+                native-mode = <&timing0>;
+                timing0: 480x272 {
+                        clock-frequency = <18400000>;
+                        hactive = <480>;
+                        vactive = <272>;
+                        hfront-porch = <8>;
+                        hback-porch = <4>;
+                        hsync-len = <41>;
+                        vfront-porch = <4>;
+                        vback-porch = <2>;
+                        vsync-len = <10>;
+                        hsync-active = <1>;
+                        vsync-active = <1>;
+                };
+        };
+};
+
+&lcdc {
+        status = "okay";
+};
+
+&am33xx_pinmux {
+        lcd_pins: pinmux_lcd {
+                pinctrl-single,pins = <
+                        0xa0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data0.lcd_data0 */
+                        0xa4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data1.lcd_data1 */
+                        0xa8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data2.lcd_data2 */
+                        0xac (PIN_OUTPUT | MUX_MODE0)   /* lcd_data3.lcd_data3 */
+                        0xb0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data4.lcd_data4 */
+                        0xb4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data5.lcd_data5 */
+                        0xb8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data6.lcd_data6 */
+                        0xbc (PIN_OUTPUT | MUX_MODE0)   /* lcd_data7.lcd_data7 */
+                        0xc0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data8.lcd_data8 */
+                        0xc4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data9.lcd_data9 */
+                        0xc8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data10.lcd_data10 */
+                        0xcc (PIN_OUTPUT | MUX_MODE0)   /* lcd_data11.lcd_data11 */
+                        0xd0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data12.lcd_data12 */
+                        0xd4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data13.lcd_data13 */
+                        0xd8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_data14.lcd_data14 */
+                        0xdc (PIN_OUTPUT | MUX_MODE0)   /* lcd_data15.lcd_data15 */
+                        0x20 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad8.lcd_data16 */
+                        0x24 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad9.lcd_data17 */
+                        0x28 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad10.lcd_data18 */
+                        0x2c (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad11.lcd_data19 */
+                        0x30 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad12.lcd_data20 */
+                        0x34 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad13.lcd_data21 */
+                        0x38 (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad14.lcd_data22 */
+                        0x3c (PIN_OUTPUT | MUX_MODE1)   /* gpmc_ad15.lcd_data23 */
+                        0xe0 (PIN_OUTPUT | MUX_MODE0)   /* lcd_vsync.lcd_vsync */
+                        0xe4 (PIN_OUTPUT | MUX_MODE0)   /* lcd_hsync.lcd_hsync */
+                        0xe8 (PIN_OUTPUT | MUX_MODE0)   /* lcd_pclk.lcd_pclk */
+                        0xec (PIN_OUTPUT | MUX_MODE0)   /* lcd_ac_bias_en.lcd_ac_bias_en */
+                        /* Display Enable */
+                        0x6c (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_a11.gpio1_27 */
+                >;
+        };
+};
+
+/* Ethernet */
+&cpsw_emac0 {
+        status = "okay";
+        phy_id = <&davinci_mdio>, <0>;
+        phy-mode = "rgmii";
+};
+
+&cpsw_emac1 {
+        status = "okay";
+        phy_id = <&davinci_mdio>, <1>;
+        phy-mode = "rgmii";
+};
+
+&davinci_mdio {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&mdio_pins>;
+};
+
+&mac {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&ethernet_pins>;
+};
+
+
+&am33xx_pinmux {
+        ethernet_pins: pinmux_ethernet {
+                pinctrl-single,pins = <
+                        0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
+                        0x118 (PIN_INPUT_PULLUP | MUX_MODE2)    /* mii1_rxdv.rgmii1_rctl */
+                        0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
+                        0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
+                        0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
+                        0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
+                        0x12c (PIN_INPUT_PULLUP | MUX_MODE2)    /* mii1_txclk.rgmii1_tclk */
+                        0x130 (PIN_INPUT_PULLUP | MUX_MODE2)    /* mii1_rxclk.rgmii1_rclk */
+                        0x134 (PIN_INPUT_PULLUP | MUX_MODE2)    /* mii1_rxd3.rgmii1_rxd3 */
+                        0x138 (PIN_INPUT_PULLUP | MUX_MODE2)    /* mii1_rxd2.rgmii1_rxd2 */
+                        0x13c (PIN_INPUT_PULLUP | MUX_MODE2)    /* mii1_rxd1.rgmii1_rxd1 */
+                        0x140 (PIN_INPUT_PULLUP | MUX_MODE2)    /* mii1_rxd0.rgmii1_rxd0 */
+                        /* ethernet interrupt */
+                        0x144 (PIN_INPUT_PULLUP | MUX_MODE7)    /* rmii2_refclk.gpio0_29 */
+                        /* ethernet PHY nReset */
+                        0x108 (PIN_OUTPUT_PULLUP | MUX_MODE7)   /* mii1_col.gpio3_0 */
+                >;
+        };
+
+        mdio_pins: pinmux_mdio {
+                pinctrl-single,pins = <
+                        0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)    /* mdio_data.mdio_data */
+                        0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)                   /* mdio_clk.mdio_clk */
+                >;
+        };
+};
+
+/* MMC */
+&mmc1 {
+        /* Bootable SD card slot */
+        status = "okay";
+        vmmc-supply = <&ldo3_reg>;
+        bus-width = <4>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&sd_pins>;
+        cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+};
+
+&mmc2 {
+        /* eMMC (not populated) on MMC #2 */
+        status = "disabled";
+        pinctrl-names = "default";
+        pinctrl-0 = <&emmc_pins>;
+        vmmc-supply = <&ldo3_reg>;
+        bus-width = <8>;
+        ti,non-removable;
+};
+
+&edma {
+        /* Map eDMA MMC2 Events from Crossbar */
+        ti,edma-xbar-event-map = /bits/ 16 <1 12
+                                            2 13>;
+};
+
+
+&mmc3 {
+        /* Wifi & Bluetooth on MMC #3 */
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&wireless_pins>;
+        vmmmc-supply = <&v3v3c_reg>;
+        bus-width = <4>;
+        ti,non-removable;
+        dmas = <&edma 12
+                &edma 13>;
+        dma-names = "tx", "rx";
+};
+
+
+&am33xx_pinmux {
+        sd_pins: pinmux_sd_card {
+                pinctrl-single,pins = <
+                        0xf0 (PIN_INPUT_PULLUP | MUX_MODE0)     /* mmc0_dat0.mmc0_dat0 */
+                        0xf4 (PIN_INPUT_PULLUP | MUX_MODE0)     /* mmc0_dat1.mmc0_dat1 */
+                        0xf8 (PIN_INPUT_PULLUP | MUX_MODE0)     /* mmc0_dat2.mmc0_dat2 */
+                        0xfc (PIN_INPUT_PULLUP | MUX_MODE0)     /* mmc0_dat3.mmc0_dat3 */
+                        0x100 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mmc0_clk.mmc0_clk */
+                        0x104 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mmc0_cmd.mmc0_cmd */
+                        0x160 (PIN_INPUT | MUX_MODE7)           /* spi0_cs1.gpio0_6 */
+                >;
+        };
+        emmc_pins: pinmux_emmc {
+                pinctrl-single,pins = <
+                        0x80 (PIN_INPUT_PULLUP | MUX_MODE2)     /* gpmc_csn1.mmc1_clk */
+                        0x84 (PIN_INPUT_PULLUP | MUX_MODE2)     /* gpmc_csn2.mmc1_cmd */
+                        0x00 (PIN_INPUT_PULLUP | MUX_MODE1)     /* gpmc_ad0.mmc1_dat0 */
+                        0x04 (PIN_INPUT_PULLUP | MUX_MODE1)     /* gpmc_ad1.mmc1_dat1 */
+                        0x08 (PIN_INPUT_PULLUP | MUX_MODE1)     /* gpmc_ad2.mmc1_dat2 */
+                        0x0c (PIN_INPUT_PULLUP | MUX_MODE1)     /* gpmc_ad3.mmc1_dat3 */
+                        0x10 (PIN_INPUT_PULLUP | MUX_MODE1)     /* gpmc_ad4.mmc1_dat4 */
+                        0x14 (PIN_INPUT_PULLUP | MUX_MODE1)     /* gpmc_ad5.mmc1_dat5 */
+                        0x18 (PIN_INPUT_PULLUP | MUX_MODE1)     /* gpmc_ad6.mmc1_dat6 */
+                        0x1c (PIN_INPUT_PULLUP | MUX_MODE1)     /* gpmc_ad7.mmc1_dat7 */
+                        /* EMMC nReset */
+                        0x74 (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_wpn.gpio0_31 */
+                >;
+        };
+        wireless_pins: pinmux_wireless {
+                pinctrl-single,pins = <
+                        0x44 (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_a1.mmc2_dat0 */
+                        0x48 (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_a2.mmc2_dat1 */
+                        0x4c (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_a3.mmc2_dat2 */
+                        0x78 (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_ben1.mmc2_dat3 */
+                        0x88 (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_csn3.mmc2_cmd */
+                        0x8c (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_clk.mmc1_clk */
+                        /* WLAN nReset */
+                        0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_a8.gpio1_24 */
+                        /* WLAN nPower down */
+                        0x70 (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_wait0.gpio0_30 */
+                        /* 32kHz Clock */
+                        0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
+                >;
+        };
+};
+
+/* Power */
+&vbat {
+        regulator-name = "vbat";
+        regulator-min-microvolt = <5000000>;
+        regulator-max-microvolt = <5000000>;
+};
+
+&v3v3c_reg {
+        regulator-name = "v3v3c_reg";
+        regulator-min-microvolt = <3300000>;
+        regulator-max-microvolt = <3300000>;
+        vin-supply = <&vbat>;
+};
+
+&vdd5_reg {
+        regulator-name = "vdd5_reg";
+        regulator-min-microvolt = <5000000>;
+        regulator-max-microvolt = <5000000>;
+        vin-supply = <&vbat>;
+};
+
+/include/ "tps65217.dtsi"
+
+&tps {
+        backlight {
+                isel = <1>; /* ISET1 */
+                fdim = <200>; /* TPS65217_BL_FDIM_200HZ */
+                default-brightness = <80>;
+        };
+
+        regulators {
+                dcdc1_reg: regulator@0 {
+                        /* VDD_1V8 system supply */
+                };
+
+                dcdc2_reg: regulator@1 {
+                        /* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */
+                        regulator-name = "vdd_core";
+                        regulator-min-microvolt = <925000>;
+                        regulator-max-microvolt = <1325000>;
+                        regulator-boot-on;
+                };
+
+                dcdc3_reg: regulator@2 {
+                        /* VDD_MPU voltage limits 0.95V - 1.1V with +/-4% tolerance */
+                        regulator-name = "vdd_mpu";
+                        regulator-min-microvolt = <925000>;
+                        regulator-max-microvolt = <1150000>;
+                        regulator-boot-on;
+                };
+
+                ldo1_reg: regulator@3 {
+                        /* VRTC 1.8V always-on supply */
+                        regulator-always-on;
+                };
+
+                ldo2_reg: regulator@4 {
+                        /* 3.3V rail */
+                };
+
+                ldo3_reg: regulator@5 {
+                        /* VDD_3V3A 3.3V rail */
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                };
+
+                ldo4_reg: regulator@6 {
+                        /* VDD_3V3B 3.3V rail */
+                };
+        };
+};
+
+/* SPI Busses */
+&spi0 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&spi0_pins>;
+};
+
+&am33xx_pinmux {
+        spi0_pins: pinmux_spi0 {
+                pinctrl-single,pins = <
+                        0x150 (PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_sclk.spi0_sclk */
+                        0x15C (PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_cs0.spi0_cs0 */
+                        0x154 (PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_d0.spi0_d0 */
+                        0x158 (PIN_INPUT_PULLUP | MUX_MODE0) /* spi0_d1.spi0_d1 */
+                >;
+        };
+};
+
+/* Touch Screen */
+&tscadc {
+        status = "okay";
+        tsc {
+                ti,wires = <4>;
+                ti,x-plate-resistance = <200>;
+                ti,coordinate-readouts = <5>;
+                ti,wire-config = <0x00 0x11 0x22 0x33>;
+        };
+
+        adc {
+                ti,adc-channels = <4 5 6 7>;
+        };
+};
+
+/* UARTs */
+&uart0 {
+        /* Serial Console */
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_pins>;
+};
+
+&uart1 {
+        /* Broken out to J6 header */
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart1_pins>;
+};
+
+&am33xx_pinmux {
+        uart0_pins: pinmux_uart0 {
+                pinctrl-single,pins = <
+                        0x170 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart0_rxd.uart0_rxd */
+                        0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
+                >;
+        };
+        uart1_pins: pinmux_uart1 {
+                pinctrl-single,pins = <
+                        0x178 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart1_ctsn.uart1_ctsn */
+                        0x17C (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart1_rtsn.uart1_rtsn */
+                        0x180 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart1_rxd.uart1_rxd */
+                        0x184 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart1_txd.uart1_txd */
+                >;
+        };
+};
+
+/* USB */
+&usb {
+        status = "okay";
+
+        pinctrl-names = "default";
+        pinctrl-0 = <&usb_pins>;
+};
+
+&usb_ctrl_mod {
+        status = "okay";
+};
+
+&usb0_phy {
+        status = "okay";
+};
+
+&usb1_phy {
+        status = "okay";
+};
+
+&usb0 {
+        status = "okay";
+        dr_mode = "host";
+};
+
+&usb1 {
+        status = "okay";
+        dr_mode = "host";
+};
+
+&cppi41dma {
+        status = "okay";
+};
+
+&am33xx_pinmux {
+        usb_pins: pinmux_usb {
+                pinctrl-single,pins = <
+                        /* USB0 Over-Current (active low) */
+                        0x64 (PIN_INPUT | MUX_MODE7)    /* gpmc_a9.gpio1_25 */
+                        /* USB1 Over-Current (active low) */
+                        0x68 (PIN_INPUT | MUX_MODE7)    /* gpmc_a10.gpio1_26 */
+                >;
+        };
+};
+
+/* User IO */
+&leds {
+        pinctrl-names = "default";
+        pinctrl-0 = <&user_leds_pins>;
+
+        led@0 {
+                label = "pepper:user0:blue";
+                gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;
+                linux,default-trigger = "none";
+                default-state = "off";
+        };
+
+        led@1 {
+                label = "pepper:user1:red";
+                gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+                linux,default-trigger = "none";
+                default-state = "off";
+        };
+};
+
+&buttons {
+        pinctrl-names = "default";
+        pinctrl-0 = <&user_buttons_pins>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        button@0 {
+                label = "home";
+                linux,code = <KEY_HOME>;
+                gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
+                gpio-key,wakeup;
+        };
+
+        button@1 {
+                label = "menu";
+                linux,code = <KEY_MENU>;
+                gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
+                gpio-key,wakeup;
+        };
+
+        buttons@2 {
+                label = "power";
+                linux,code = <KEY_POWER>;
+                gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+                gpio-key,wakeup;
+        };
+};
+
+&am33xx_pinmux {
+        user_leds_pins: pinmux_user_leds {
+                pinctrl-single,pins = <
+                        0x50 (PIN_OUTPUT | MUX_MODE7)   /* gpmc_a4.gpio1_20 */
+                        0x54 (PIN_OUTPUT | MUX_MODE7)   /* gpmc_a5.gpio1_21 */
+                >;
+        };
+
+        user_buttons_pins: pinmux_user_buttons {
+                pinctrl-single,pins = <
+                        0x58 (PIN_INPUT_PULLUP | MUX_MODE7)     /* gpmc_a6.gpio1_22 */
+                        0x5C (PIN_INPUT_PULLUP | MUX_MODE7)     /* gpmc_a7.gpio1_21 */
+                        0x164 (PIN_INPUT_PULLUP | MUX_MODE7)    /* gpmc_a8.gpio0_7 */
+                >;
+        };
+};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 4a4e02d0ce9e..3a0a161342ba 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -347,6 +347,15 @@
                         status = "disabled";
                 };
 
+                mailbox: mailbox@480C8000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x480C8000 0x200>;
+                        interrupts = <77>;
+                        ti,hwmods = "mailbox";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <8>;
+                };
+
                 timer1: timer@44e31000 {
                         compatible = "ti,am335x-timer-1ms";
                         reg = <0x44e31000 0x400>;
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 49fa59622254..9b3d2ba82f13 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -30,7 +30,7 @@
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
-                cpu@0 {
+                cpu: cpu@0 {
                         compatible = "arm,cortex-a9";
                         device_type = "cpu";
                         reg = <0>;
@@ -168,9 +168,6 @@
                         ti,hwmods = "mailbox";
                         ti,mbox-num-users = <4>;
                         ti,mbox-num-fifos = <8>;
-                        ti,mbox-names = "wkup_m3";
-                        ti,mbox-data = <0 0 0 0>;
-                        status = "disabled";
                 };
 
                 timer1: timer@44e31000 {
@@ -270,7 +267,7 @@
                         ti,hwmods = "counter_32k";
                 };
 
-                rtc@44e3e000 {
+                rtc: rtc@44e3e000 {
                         compatible = "ti,am4372-rtc","ti,da830-rtc";
                         reg = <0x44e3e000 0x1000>;
                         interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH
@@ -279,7 +276,7 @@
                         status = "disabled";
                 };
 
-                wdt@44e35000 {
+                wdt: wdt@44e35000 {
                         compatible = "ti,am4372-wdt","ti,omap3-wdt";
                         reg = <0x44e35000 0x1000>;
                         interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
@@ -871,7 +868,7 @@
                         #size-cells = <1>;
                         ranges;
 
-                        dispc@4832a400 {
+                        dispc: dispc@4832a400 {
                                 compatible = "ti,omap3-dispc";
                                 reg = <0x4832a400 0x400>;
                                 interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index 003766c47bbf..646a6eade788 100644
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -257,16 +257,73 @@
 };
 
 &i2c0 {
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&i2c0_pins>;
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c0_pins>;
+        clock-frequency = <400000>;
+
+        tps65218: tps65218@24 {
+                reg = <0x24>;
+                compatible = "ti,tps65218";
+                interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>; /* NMIn */
+                interrupt-parent = <&gic>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+
+                dcdc1: regulator-dcdc1 {
+                        compatible = "ti,tps65218-dcdc1";
+                        regulator-name = "vdd_core";
+                        regulator-min-microvolt = <912000>;
+                        regulator-max-microvolt = <1144000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                dcdc2: regulator-dcdc2 {
+                        compatible = "ti,tps65218-dcdc2";
+                        regulator-name = "vdd_mpu";
+                        regulator-min-microvolt = <912000>;
+                        regulator-max-microvolt = <1378000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                dcdc3: regulator-dcdc3 {
+                        compatible = "ti,tps65218-dcdc3";
+                        regulator-name = "vdcdc3";
+                        regulator-min-microvolt = <1350000>;
+                        regulator-max-microvolt = <1350000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+                dcdc5: regulator-dcdc5 {
+                        compatible = "ti,tps65218-dcdc5";
+                        regulator-name = "v1_0bat";
+                        regulator-min-microvolt = <1000000>;
+                        regulator-max-microvolt = <1000000>;
+                };
+
+                dcdc6: regulator-dcdc6 {
+                        compatible = "ti,tps65218-dcdc6";
+                        regulator-name = "v1_8bat";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                };
+
+                ldo1: regulator-ldo1 {
+                        compatible = "ti,tps65218-ldo1";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+        };
 };
 
 &i2c1 {
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&i2c1_pins>;
-
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c1_pins>;
         pixcir_ts@5c {
                 compatible = "pixcir,pixcir_tangoc";
                 pinctrl-names = "default";
@@ -277,8 +334,8 @@
 
                 attb-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
 
-                x-size = <1024>;
-                y-size = <600>;
+                touchscreen-size-x = <1024>;
+                touchscreen-size-y = <600>;
         };
 };
 
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
new file mode 100644
index 000000000000..859ff3d620ee
--- /dev/null
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -0,0 +1,613 @@
+/*
+ * Copyright (C) 2014 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.
+ */
+
+/* AM437x SK EVM */
+
+/dts-v1/;
+
+#include "am4372.dtsi"
+#include <dt-bindings/pinctrl/am43xx.h>
+#include <dt-bindings/pwm/pwm.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+        model = "TI AM437x SK EVM";
+        compatible = "ti,am437x-sk-evm","ti,am4372","ti,am43";
+
+        aliases {
+                display0 = &lcd0;
+        };
+
+        backlight {
+                compatible = "pwm-backlight";
+                pwms = <&ecap0 0 50000 PWM_POLARITY_INVERTED>;
+                brightness-levels = <0 51 53 56 62 75 101 152 255>;
+                default-brightness-level = <8>;
+        };
+
+        sound {
+                compatible = "ti,da830-evm-audio";
+                ti,model = "AM437x-SK-EVM";
+                ti,audio-codec = <&tlv320aic3106>;
+                ti,mcasp-controller = <&mcasp1>;
+                ti,codec-clock-rate = <24000000>;
+                ti,audio-routing =
+                        "Headphone Jack",       "HPLOUT",
+                        "Headphone Jack",       "HPROUT";
+        };
+
+        matrix_keypad: matrix_keypad@0 {
+                compatible = "gpio-matrix-keypad";
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&matrix_keypad_pins>;
+
+                debounce-delay-ms = <5>;
+                col-scan-delay-us = <1500>;
+
+                row-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH          /* Bank5, pin5 */
+                                &gpio5 6 GPIO_ACTIVE_HIGH>;     /* Bank5, pin6 */
+
+                col-gpios = <&gpio5 13 GPIO_ACTIVE_HIGH         /* Bank5, pin13 */
+                                &gpio5 4 GPIO_ACTIVE_HIGH>;     /* Bank5, pin4 */
+
+                linux,keymap = <
+                                MATRIX_KEY(0, 0, KEY_DOWN)
+                                MATRIX_KEY(0, 1, KEY_RIGHT)
+                                MATRIX_KEY(1, 0, KEY_LEFT)
+                                MATRIX_KEY(1, 1, KEY_UP)
+                        >;
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&leds_pins>;
+
+                led@0 {
+                        label = "am437x-sk:red:heartbeat";
+                        gpios = <&gpio5 0 GPIO_ACTIVE_HIGH>;    /* Bank 5, pin 0 */
+                        linux,default-trigger = "heartbeat";
+                        default-state = "off";
+                };
+
+                led@1 {
+                        label = "am437x-sk:green:mmc1";
+                        gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;    /* Bank 5, pin 1 */
+                        linux,default-trigger = "mmc0";
+                        default-state = "off";
+                };
+
+                led@2 {
+                        label = "am437x-sk:blue:cpu0";
+                        gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;    /* Bank 5, pin 2 */
+                        linux,default-trigger = "cpu0";
+                        default-state = "off";
+                };
+
+                led@3 {
+                        label = "am437x-sk:blue:usr3";
+                        gpios = <&gpio5 3 GPIO_ACTIVE_HIGH>;    /* Bank 5, pin 3 */
+                        default-state = "off";
+                };
+        };
+
+        lcd0: display {
+                compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
+                label = "lcd";
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&lcd_pins>;
+
+                enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+
+                panel-timing {
+                        clock-frequency = <9000000>;
+                        hactive = <480>;
+                        vactive = <272>;
+                        hfront-porch = <8>;
+                        hback-porch = <43>;
+                        hsync-len = <4>;
+                        vback-porch = <12>;
+                        vfront-porch = <4>;
+                        vsync-len = <10>;
+                        hsync-active = <0>;
+                        vsync-active = <0>;
+                        de-active = <1>;
+                        pixelclk-active = <1>;
+                };
+
+                port {
+                        lcd_in: endpoint {
+                                remote-endpoint = <&dpi_out>;
+                        };
+                };
+        };
+};
+
+&am43xx_pinmux {
+        matrix_keypad_pins: matrix_keypad_pins {
+                pinctrl-single,pins = <
+                        0x24c (PIN_OUTPUT | MUX_MODE7)  /* gpio5_13.gpio5_13 */
+                        0x250 (PIN_OUTPUT | MUX_MODE7)  /* spi4_sclk.gpio5_4 */
+                        0x254 (PIN_INPUT | MUX_MODE7)   /* spi4_d0.gpio5_5 */
+                        0x258 (PIN_INPUT | MUX_MODE7)   /* spi4_d1.gpio5_5 */
+                >;
+        };
+
+        leds_pins: leds_pins {
+                pinctrl-single,pins = <
+                        0x228 (PIN_OUTPUT | MUX_MODE7)  /* uart3_rxd.gpio5_2 */
+                        0x22c (PIN_OUTPUT | MUX_MODE7)  /* uart3_txd.gpio5_3 */
+                        0x230 (PIN_OUTPUT | MUX_MODE7)  /* uart3_ctsn.gpio5_0 */
+                        0x234 (PIN_OUTPUT | MUX_MODE7)  /* uart3_rtsn.gpio5_1 */
+                >;
+        };
+
+        i2c0_pins: i2c0_pins {
+                pinctrl-single,pins = <
+                        0x188 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)  /* i2c0_sda.i2c0_sda */
+                        0x18c (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)  /* i2c0_scl.i2c0_scl */
+                >;
+        };
+
+        i2c1_pins: i2c1_pins {
+                pinctrl-single,pins = <
+                        0x15c (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE2)  /* spi0_cs0.i2c1_scl */
+                        0x158 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE2)  /* spi0_d1.i2c1_sda  */
+                >;
+        };
+
+        mmc1_pins: pinmux_mmc1_pins {
+                pinctrl-single,pins = <
+                        0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
+                >;
+        };
+
+        ecap0_pins: backlight_pins {
+                pinctrl-single,pins = <
+                        0x164 (PIN_OUTPUT | MUX_MODE0) /* eCAP0_in_PWM0_out.eCAP0_in_PWM0_out */
+                >;
+        };
+
+        edt_ft5306_ts_pins: edt_ft5306_ts_pins {
+                pinctrl-single,pins = <
+                        0x74 (PIN_INPUT | MUX_MODE7)    /* gpmc_wpn.gpio0_31 */
+                        0x78 (PIN_OUTPUT | MUX_MODE7)   /* gpmc_be1n.gpio1_28 */
+                >;
+        };
+
+        cpsw_default: cpsw_default {
+                pinctrl-single,pins = <
+                        /* Slave 1 */
+                        0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rmii1_tclk */
+                        0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
+                        0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
+                        0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
+                        0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td2 */
+                        0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td3 */
+                        0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxclk.rmii1_rclk */
+                        0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxdv.rgmii1_rctl */
+                        0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd0.rgmii1_rd0 */
+                        0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd1.rgmii1_rd1 */
+                        0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd0.rgmii1_rd2 */
+                        0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2)  /* mii1_rxd1.rgmii1_rd3 */
+
+                        /* Slave 2 */
+                        0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a6.rgmii2_tclk */
+                        0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a0.rgmii2_tctl */
+                        0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a5.rgmii2_td0 */
+                        0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a4.rgmii2_td1 */
+                        0x4c (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a3.rgmii2_td2 */
+                        0x48 (PIN_OUTPUT_PULLDOWN | MUX_MODE2)  /* gpmc_a2.rgmii2_td3 */
+                        0x5c (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a7.rgmii2_rclk */
+                        0x44 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a1.rgmii2_rtcl */
+                        0x6c (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a11.rgmii2_rd0 */
+                        0x68 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a10.rgmii2_rd1 */
+                        0x64 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a9.rgmii2_rd2 */
+                        0x60 (PIN_INPUT_PULLDOWN | MUX_MODE2)   /* gpmc_a8.rgmii2_rd3 */
+                >;
+        };
+
+        cpsw_sleep: cpsw_sleep {
+                pinctrl-single,pins = <
+                        /* Slave 1 reset value */
+                        0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+
+                        /* Slave 2 reset value */
+                        0x58 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x4c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x48 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x5c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x44 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        0x60 (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)
+                >;
+        };
+
+        dss_pins: dss_pins {
+                pinctrl-single,pins = <
+                        0x020 (PIN_OUTPUT_PULLUP | MUX_MODE1)   /* gpmc ad 8 -> DSS DATA 23 */
+                        0x024 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                        0x028 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                        0x02c (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                        0x030 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                        0x034 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                        0x038 (PIN_OUTPUT_PULLUP | MUX_MODE1)
+                        0x03c (PIN_OUTPUT_PULLUP | MUX_MODE1)   /* gpmc ad 15 -> DSS DATA 16 */
+                        0x0a0 (PIN_OUTPUT_PULLUP | MUX_MODE0)   /* DSS DATA 0 */
+                        0x0a4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0a8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0ac (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0b0 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0b4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0b8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0bc (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0c0 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0c4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0c8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0cc (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0d0 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0d4 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0d8 (PIN_OUTPUT_PULLUP | MUX_MODE0)
+                        0x0dc (PIN_OUTPUT_PULLUP | MUX_MODE0)   /* DSS DATA 15 */
+                        0x0e0 (PIN_OUTPUT_PULLUP | MUX_MODE0)   /* DSS VSYNC */
+                        0x0e4 (PIN_OUTPUT_PULLUP | MUX_MODE0)   /* DSS HSYNC */
+                        0x0e8 (PIN_OUTPUT_PULLUP | MUX_MODE0)   /* DSS PCLK */
+                        0x0ec (PIN_OUTPUT_PULLUP | MUX_MODE0)   /* DSS AC BIAS EN */
+
+                >;
+        };
+
+        qspi_pins: qspi_pins {
+                pinctrl-single,pins = <
+                        0x7c (PIN_OUTPUT_PULLUP | MUX_MODE3)    /* gpmc_csn0.qspi_csn */
+                        0x88 (PIN_OUTPUT | MUX_MODE2)           /* gpmc_csn3.qspi_clk */
+                        0x90 (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_advn_ale.qspi_d0 */
+                        0x94 (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_oen_ren.qspi_d1 */
+                        0x98 (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_wen.qspi_d2 */
+                        0x9c (PIN_INPUT_PULLUP | MUX_MODE3)     /* gpmc_be0n_cle.qspi_d3 */
+                >;
+        };
+
+        mcasp1_pins: mcasp1_pins {
+                pinctrl-single,pins = <
+                        0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4)  /* mii1_crs.mcasp1_aclkx */
+                        0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4)  /* mii1_rxerr.mcasp1_fsx */
+                        0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */
+                        0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4)  /* rmii1_ref_clk.mcasp1_axr3 */
+                >;
+        };
+
+        lcd_pins: lcd_pins {
+                pinctrl-single,pins = <
+                        /* GPIO 5_8 to select LCD / HDMI */
+                        0x238 (PIN_OUTPUT_PULLUP | MUX_MODE7)
+                >;
+        };
+};
+
+&i2c0 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c0_pins>;
+        clock-frequency = <400000>;
+
+        tps@24 {
+                compatible = "ti,tps65218";
+                reg = <0x24>;
+                interrupt-parent = <&gic>;
+                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+
+                dcdc1: regulator-dcdc1 {
+                        compatible = "ti,tps65218-dcdc1";
+                        /* VDD_CORE limits min of OPP50 and max of OPP100 */
+                        regulator-name = "vdd_core";
+                        regulator-min-microvolt = <912000>;
+                        regulator-max-microvolt = <1144000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                dcdc2: regulator-dcdc2 {
+                        compatible = "ti,tps65218-dcdc2";
+                        /* VDD_MPU limits min of OPP50 and max of OPP_NITRO */
+                        regulator-name = "vdd_mpu";
+                        regulator-min-microvolt = <912000>;
+                        regulator-max-microvolt = <1378000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                dcdc3: regulator-dcdc3 {
+                        compatible = "ti,tps65218-dcdc3";
+                        regulator-name = "vdds_ddr";
+                        regulator-min-microvolt = <1350000>;
+                        regulator-max-microvolt = <1350000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                dcdc4: regulator-dcdc4 {
+                        compatible = "ti,tps65218-dcdc4";
+                        regulator-name = "v3_3d";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                ldo1: regulator-ldo1 {
+                        compatible = "ti,tps65218-ldo1";
+                        regulator-name = "v1_8d";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+        };
+
+        at24@50 {
+                compatible = "at24,24c256";
+                pagesize = <64>;
+                reg = <0x50>;
+        };
+};
+
+&i2c1 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c1_pins>;
+        clock-frequency = <400000>;
+
+        edt-ft5306@38 {
+                status = "okay";
+                compatible = "edt,edt-ft5306", "edt,edt-ft5x06";
+                pinctrl-names = "default";
+                pinctrl-0 = <&edt_ft5306_ts_pins>;
+
+                reg = <0x38>;
+                interrupt-parent = <&gpio0>;
+                interrupts = <31 0>;
+
+                wake-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+
+                touchscreen-size-x = <480>;
+                touchscreen-size-y = <272>;
+        };
+
+        tlv320aic3106: tlv320aic3106@1b {
+                compatible = "ti,tlv320aic3106";
+                reg = <0x1b>;
+                status = "okay";
+
+                /* Regulators */
+                AVDD-supply = <&dcdc4>;
+                IOVDD-supply = <&dcdc4>;
+                DRVDD-supply = <&dcdc4>;
+                DVDD-supply = <&ldo1>;
+        };
+
+        lis331dlh@18 {
+                compatible = "st,lis331dlh";
+                reg = <0x18>;
+                status = "okay";
+
+                Vdd-supply = <&dcdc4>;
+                Vdd_IO-supply = <&dcdc4>;
+                interrupts-extended = <&gpio1 6 0>, <&gpio2 1 0>;
+        };
+};
+
+&epwmss0 {
+        status = "okay";
+};
+
+&ecap0 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&ecap0_pins>;
+};
+
+&gpio0 {
+        status = "okay";
+};
+
+&gpio1 {
+        status = "okay";
+};
+
+&gpio5 {
+        status = "okay";
+};
+
+&mmc1 {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&mmc1_pins>;
+
+        vmmc-supply = <&dcdc4>;
+        bus-width = <4>;
+        cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+};
+
+&usb2_phy1 {
+        status = "okay";
+};
+
+&usb1 {
+        dr_mode = "peripheral";
+        status = "okay";
+};
+
+&usb2_phy2 {
+        status = "okay";
+};
+
+&usb2 {
+        dr_mode = "host";
+        status = "okay";
+};
+
+&qspi {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&qspi_pins>;
+
+        spi-max-frequency = <48000000>;
+        m25p80@0 {
+                compatible = "mx66l51235l";
+                spi-max-frequency = <48000000>;
+                reg = <0>;
+                spi-cpol;
+                spi-cpha;
+                spi-tx-bus-width = <1>;
+                spi-rx-bus-width = <4>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                /* MTD partition table.
+                 * The ROM checks the first 512KiB
+                 * for a valid file to boot(XIP).
+                 */
+                partition@0 {
+                        label = "QSPI.U_BOOT";
+                        reg = <0x00000000 0x000080000>;
+                };
+                partition@1 {
+                        label = "QSPI.U_BOOT.backup";
+                        reg = <0x00080000 0x00080000>;
+                };
+                partition@2 {
+                        label = "QSPI.U-BOOT-SPL_OS";
+                        reg = <0x00100000 0x00010000>;
+                };
+                partition@3 {
+                        label = "QSPI.U_BOOT_ENV";
+                        reg = <0x00110000 0x00010000>;
+                };
+                partition@4 {
+                        label = "QSPI.U-BOOT-ENV.backup";
+                        reg = <0x00120000 0x00010000>;
+                };
+                partition@5 {
+                        label = "QSPI.KERNEL";
+                        reg = <0x00130000 0x0800000>;
+                };
+                partition@6 {
+                        label = "QSPI.FILESYSTEM";
+                        reg = <0x00930000 0x36D0000>;
+                };
+        };
+};
+
+&mac {
+        pinctrl-names = "default", "sleep";
+        pinctrl-0 = <&cpsw_default>;
+        pinctrl-1 = <&cpsw_sleep>;
+        dual_emac = <1>;
+        status = "okay";
+};
+
+&davinci_mdio {
+        pinctrl-names = "default", "sleep";
+        pinctrl-0 = <&davinci_mdio_default>;
+        pinctrl-1 = <&davinci_mdio_sleep>;
+        status = "okay";
+};
+
+&cpsw_emac0 {
+        phy_id = <&davinci_mdio>, <4>;
+        phy-mode = "rgmii";
+        dual_emac_res_vlan = <1>;
+};
+
+&cpsw_emac1 {
+        phy_id = <&davinci_mdio>, <5>;
+        phy-mode = "rgmii";
+        dual_emac_res_vlan = <2>;
+};
+
+&elm {
+        status = "okay";
+};
+
+&mcasp1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcasp1_pins>;
+
+        status = "okay";
+
+        op-mode = <0>;
+        tdm-slots = <2>;
+        serial-dir = <
+                0 0 1 2
+        >;
+
+        tx-num-evt = <1>;
+        rx-num-evt = <1>;
+};
+
+&dss {
+        status = "okay";
+
+        pinctrl-names = "default";
+        pinctrl-0 = <&dss_pins>;
+
+        port {
+                dpi_out: endpoint@0 {
+                        remote-endpoint = <&lcd_in>;
+                        data-lines = <24>;
+                };
+        };
+};
+
+&rtc {
+        status = "okay";
+};
+
+&wdt {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 90098f98a5c8..ed7dd2395915 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -327,6 +327,65 @@
         status = "okay";
         pinctrl-names = "default";
         pinctrl-0 = <&i2c0_pins>;
+        clock-frequency = <400000>;
+
+        tps65218: tps65218@24 {
+                reg = <0x24>;
+                compatible = "ti,tps65218";
+                interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>; /* NMIn */
+                interrupt-parent = <&gic>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+
+                dcdc1: regulator-dcdc1 {
+                        compatible = "ti,tps65218-dcdc1";
+                        regulator-name = "vdd_core";
+                        regulator-min-microvolt = <912000>;
+                        regulator-max-microvolt = <1144000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                dcdc2: regulator-dcdc2 {
+                        compatible = "ti,tps65218-dcdc2";
+                        regulator-name = "vdd_mpu";
+                        regulator-min-microvolt = <912000>;
+                        regulator-max-microvolt = <1378000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                dcdc3: regulator-dcdc3 {
+                        compatible = "ti,tps65218-dcdc3";
+                        regulator-name = "vdcdc3";
+                        regulator-min-microvolt = <1350000>;
+                        regulator-max-microvolt = <1350000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                dcdc5: regulator-dcdc5 {
+                        compatible = "ti,tps65218-dcdc5";
+                        regulator-name = "v1_0bat";
+                        regulator-min-microvolt = <1000000>;
+                        regulator-max-microvolt = <1000000>;
+                };
+
+                dcdc6: regulator-dcdc6 {
+                        compatible = "ti,tps65218-dcdc6";
+                        regulator-name = "v1_8bat";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                };
+
+                ldo1: regulator-ldo1 {
+                        compatible = "ti,tps65218-ldo1";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+        };
 
         at24@50 {
                 compatible = "at24,24c256";
@@ -344,8 +403,8 @@
 
                 attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>;
 
-                x-size = <1024>;
-                y-size = <600>;
+                touchscreen-size-x = <1024>;
+                touchscreen-size-y = <600>;
         };
 };
 
diff --git a/arch/arm/boot/dts/animeo_ip.dts b/arch/arm/boot/dts/animeo_ip.dts
index 3c4f6d983cbd..4e0ad3b82796 100644
--- a/arch/arm/boot/dts/animeo_ip.dts
+++ b/arch/arm/boot/dts/animeo_ip.dts
@@ -40,6 +40,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <18432000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <18432000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/armada-375-db.dts b/arch/arm/boot/dts/armada-375-db.dts
index 1e2919d43d78..929ae00b4063 100644
--- a/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@ -123,6 +123,32 @@
                                 cd-gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
                                 wp-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
                         };
+
+                        mdio {
+                                phy0: ethernet-phy@0 {
+                                        reg = <0>;
+                                };
+
+                                phy3: ethernet-phy@3 {
+                                        reg = <3>;
+                                };
+                        };
+
+                        ethernet@f0000 {
+                                status = "okay";
+
+                                eth0@c4000 {
+                                        status = "okay";
+                                        phy = <&phy0>;
+                                        phy-mode = "rgmii-id";
+                                };
+
+                                eth1@c5000 {
+                                        status = "okay";
+                                        phy = <&phy3>;
+                                        phy-mode = "gmii";
+                                };
+                        };
                 };
 
                 pcie-controller {
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index fb92551a1e71..c1e49e7bf0fa 100644
--- a/arch/arm/boot/dts/armada-375.dtsi
+++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -25,6 +25,8 @@
                 gpio0 = &gpio0;
                 gpio1 = &gpio1;
                 gpio2 = &gpio2;
+                ethernet0 = &eth0;
+                ethernet1 = &eth1;
         };
 
         clocks {
@@ -151,6 +153,38 @@
                                       <0xc100 0x100>;
                         };
 
+                        mdio {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "marvell,orion-mdio";
+                                reg = <0xc0054 0x4>;
+                                clocks = <&gateclk 19>;
+                        };
+
+                        /* Network controller */
+                        ethernet@f0000 {
+                                compatible = "marvell,armada-375-pp2";
+                                reg = <0xf0000 0xa000>, /* Packet Processor regs */
+                                      <0xc0000 0x3060>, /* LMS regs */
+                                      <0xc4000 0x100>,  /* eth0 regs */
+                                      <0xc5000 0x100>;  /* eth1 regs */
+                                clocks = <&gateclk 3>, <&gateclk 19>;
+                                clock-names = "pp_clk", "gop_clk";
+                                status = "disabled";
+
+                                eth0: eth0@c4000 {
+                                        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+                                        port-id = <0>;
+                                        status = "disabled";
+                                };
+
+                                eth1: eth1@c5000 {
+                                        interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+                                        port-id = <1>;
+                                        status = "disabled";
+                                };
+                        };
+
                         spi0: spi@10600 {
                                 compatible = "marvell,orion-spi";
                                 reg = <0x10600 0x50>;
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 689fa1a46728..242d0ecc99f3 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -286,6 +286,11 @@
                                 reg = <0x20800 0x10>;
                         };
 
+                        mpcore-soc-ctrl@20d20 {
+                                compatible = "marvell,armada-380-mpcore-soc-ctrl";
+                                reg = <0x20d20 0x6c>;
+                        };
+
                         coherency-fabric@21010 {
                                 compatible = "marvell,armada-380-coherency-fabric";
                                 reg = <0x21010 0x1c>;
diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
new file mode 100644
index 000000000000..469cf7137595
--- /dev/null
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -0,0 +1,284 @@
+/*
+ * Device Tree file for Lenovo Iomega ix4-300d
+ *
+ * Copyright (C) 2014, Benoit Masson <yahoo@perenite.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.
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "armada-xp-mv78230.dtsi"
+
+/ {
+        model = "Lenovo Iomega ix4-300d";
+        compatible = "lenovo,ix4-300d", "marvell,armadaxp-mv78230",
+                     "marvell,armadaxp", "marvell,armada-370-xp";
+
+        chosen {
+                bootargs = "console=ttyS0,115200 earlyprintk";
+                stdout-path = "/soc/internal-regs/serial@12000";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0x00000000 0 0x20000000>; /* 512MB */
+        };
+
+        soc {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
+                        MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
+
+                pcie-controller {
+                        status = "okay";
+
+                        /* Quad port sata: Marvell 88SX7042 */
+                        pcie@1,0 {
+                                /* Port 0, Lane 0 */
+                                status = "okay";
+                        };
+
+                        /* USB 3.0 xHCI controller: NEC D720200F1 */
+                        pcie@5,0 {
+                                /* Port 1, Lane 0 */
+                                status = "okay";
+                        };
+                };
+
+                internal-regs {
+                        pinctrl {
+                                poweroff_pin: poweroff-pin {
+                                        marvell,pins = "mpp24";
+                                        marvell,function = "gpio";
+                                };
+
+                                power_button_pin: power-button-pin {
+                                        marvell,pins = "mpp44";
+                                        marvell,function = "gpio";
+                                };
+
+                                reset_button_pin: reset-button-pin {
+                                        marvell,pins = "mpp45";
+                                        marvell,function = "gpio";
+                                };
+                                select_button_pin: select-button-pin {
+                                        marvell,pins = "mpp41";
+                                        marvell,function = "gpio";
+                                };
+
+                                scroll_button_pin: scroll-button-pin {
+                                        marvell,pins = "mpp42";
+                                        marvell,function = "gpio";
+                                };
+
+                                hdd_led_pin: hdd-led-pin {
+                                        marvell,pins = "mpp26";
+                                        marvell,function = "gpio";
+                                };
+                        };
+
+                        serial@12000 {
+                                status = "okay";
+                        };
+
+                        mdio {
+                                phy0: ethernet-phy@0 { /* Marvell 88E1318 */
+                                        reg = <0>;
+                                };
+
+                                phy1: ethernet-phy@1 { /* Marvell 88E1318 */
+                                        reg = <1>;
+                                };
+                        };
+
+                        ethernet@70000 {
+                                status = "okay";
+                                phy = <&phy0>;
+                                phy-mode = "rgmii-id";
+                        };
+
+                        ethernet@74000 {
+                                status = "okay";
+                                phy = <&phy1>;
+                                phy-mode = "rgmii-id";
+                        };
+
+                        usb@50000 {
+                                status = "okay";
+                        };
+
+                        usb@51000 {
+                                status = "okay";
+                        };
+
+                        i2c@11000 {
+                                clock-frequency = <400000>;
+                                status = "okay";
+
+                                adt7473@2e {
+                                        compatible = "adi,adt7473";
+                                        reg = <0x2e>;
+                                };
+
+                                pcf8563@51 {
+                                        compatible = "nxp,pcf8563";
+                                        reg = <0x51>;
+                                };
+
+                        };
+
+                        nand@d0000 {
+                                status = "okay";
+                                num-cs = <1>;
+                                marvell,nand-keep-config;
+                                marvell,nand-enable-arbiter;
+                                nand-on-flash-bbt;
+
+                                partition@0 {
+                                        label = "u-boot";
+                                        reg = <0x0000000 0xe0000>;
+                                        read-only;
+                                };
+
+                                partition@e0000 {
+                                        label = "u-boot-env";
+                                        reg = <0xe0000 0x20000>;
+                                        read-only;
+                                };
+
+                                partition@100000 {
+                                        label = "u-boot-env2";
+                                        reg = <0x100000 0x20000>;
+                                        read-only;
+                                };
+
+                                partition@120000 {
+                                        label = "zImage";
+                                        reg = <0x120000 0x400000>;
+                                };
+
+                                partition@520000 {
+                                        label = "initrd";
+                                        reg = <0x520000 0x400000>;
+                                };
+
+                                partition@xE00000 {
+                                        label = "boot";
+                                        reg = <0xE00000 0x3F200000>;
+                                };
+
+                                partition@flash {
+                                        label = "flash";
+                                        reg = <0x0 0x40000000>;
+                                };
+                        };
+                };
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                pinctrl-0 = <&power_button_pin &reset_button_pin
+                        &select_button_pin &scroll_button_pin>;
+                pinctrl-names = "default";
+
+                power-button {
+                        label = "Power Button";
+                        linux,code = <KEY_POWER>;
+                        gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+                };
+
+                reset-button {
+                        label = "Reset Button";
+                        linux,code = <KEY_RESTART>;
+                        gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
+                };
+
+                select-button {
+                        label = "Select Button";
+                        linux,code = <BTN_SELECT>;
+                        gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+                };
+
+                scroll-button {
+                        label = "Scroll Button";
+                        linux,code = <KEY_SCROLLDOWN>;
+                        gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
+                };
+        };
+
+        spi3 {
+                compatible = "spi-gpio";
+                status = "okay";
+                gpio-sck = <&gpio0 25 GPIO_ACTIVE_LOW>;
+                gpio-mosi = <&gpio1 15 GPIO_ACTIVE_LOW>; /*gpio 47*/
+                cs-gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
+                num-chipselects = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                gpio_spi: gpio_spi@0 {
+                        compatible = "fairchild,74hc595";
+                        gpio-controller;
+                        #gpio-cells = <2>;
+                        reg = <0>;
+                        registers-number = <2>;
+                        spi-max-frequency = <100000>;
+                };
+        };
+
+        gpio-leds {
+                compatible = "gpio-leds";
+                pinctrl-0 = <&hdd_led_pin>;
+                pinctrl-names = "default";
+
+                hdd-led {
+                        label = "ix4-300d:hdd:blue";
+                        gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                power-led {
+                        label = "ix4-300d:power:white";
+                        gpios = <&gpio_spi 1 GPIO_ACTIVE_LOW>;
+                        /* init blinking while booting */
+                        linux,default-trigger = "timer";
+                        default-state = "on";
+                };
+
+                sysfail-led {
+                        label = "ix4-300d:sysfail:red";
+                        gpios = <&gpio_spi 2 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                sys-led {
+                        label = "ix4-300d:sys:blue";
+                        gpios = <&gpio_spi 3 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                hddfail-led {
+                        label = "ix4-300d:hddfail:red";
+                        gpios = <&gpio_spi 4 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+        };
+
+        /*
+         * Warning: you need both eth1 & 0 PHY initialized (i.e having
+         * them up does the tweak) for poweroff to shutdown otherwise it
+         * reboots
+         */
+        gpio-poweroff {
+                compatible = "gpio-poweroff";
+                pinctrl-0 = <&poweroff_pin>;
+                pinctrl-names = "default";
+                gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
+        };
+};
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index 1257ff1ed278..2592e1c13560 100644
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -34,6 +34,7 @@
                         compatible = "marvell,sheeva-v7";
                         reg = <0>;
                         clocks = <&cpuclk 0>;
+                        clock-latency = <1000000>;
                 };
 
                 cpu@1 {
@@ -41,6 +42,7 @@
                         compatible = "marvell,sheeva-v7";
                         reg = <1>;
                         clocks = <&cpuclk 1>;
+                        clock-latency = <1000000>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index 3396b25b39e1..480e237a870f 100644
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -36,6 +36,7 @@
                         compatible = "marvell,sheeva-v7";
                         reg = <0>;
                         clocks = <&cpuclk 0>;
+                        clock-latency = <1000000>;
                 };
 
                 cpu@1 {
@@ -43,6 +44,7 @@
                         compatible = "marvell,sheeva-v7";
                         reg = <1>;
                         clocks = <&cpuclk 1>;
+                        clock-latency = <1000000>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 6da84bf40aaf..2c7b1fef4703 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -37,6 +37,7 @@
                         compatible = "marvell,sheeva-v7";
                         reg = <0>;
                         clocks = <&cpuclk 0>;
+                        clock-latency = <1000000>;
                 };
 
                 cpu@1 {
@@ -44,6 +45,7 @@
                         compatible = "marvell,sheeva-v7";
                         reg = <1>;
                         clocks = <&cpuclk 1>;
+                        clock-latency = <1000000>;
                 };
 
                 cpu@2 {
@@ -51,6 +53,7 @@
                         compatible = "marvell,sheeva-v7";
                         reg = <2>;
                         clocks = <&cpuclk 2>;
+                        clock-latency = <1000000>;
                 };
 
                 cpu@3 {
@@ -58,6 +61,7 @@
                         compatible = "marvell,sheeva-v7";
                         reg = <3>;
                         clocks = <&cpuclk 3>;
+                        clock-latency = <1000000>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 5902e8359c91..bff9f6c18db1 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -99,7 +99,7 @@
                         cpuclk: clock-complex@18700 {
                                 #clock-cells = <1>;
                                 compatible = "marvell,armada-xp-cpu-clock";
-                                reg = <0x18700 0xA0>;
+                                reg = <0x18700 0xA0>, <0x1c054 0x10>;
                                 clocks = <&coreclk 1>;
                         };
 
diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
index 55ab6180e350..e9ced30159a7 100644
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/arch/arm/boot/dts/at91-ariag25.dts
@@ -42,6 +42,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91-cosino.dtsi b/arch/arm/boot/dts/at91-cosino.dtsi
index df4b78695695..b6ea3f4a7206 100644
--- a/arch/arm/boot/dts/at91-cosino.dtsi
+++ b/arch/arm/boot/dts/at91-cosino.dtsi
@@ -34,6 +34,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91-foxg20.dts b/arch/arm/boot/dts/at91-foxg20.dts
index cbe967343997..f89598af4c2b 100644
--- a/arch/arm/boot/dts/at91-foxg20.dts
+++ b/arch/arm/boot/dts/at91-foxg20.dts
@@ -31,6 +31,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <18432000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <18432000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91-qil_a9260.dts b/arch/arm/boot/dts/at91-qil_a9260.dts
index 5576ae8786c0..a9aef53ab764 100644
--- a/arch/arm/boot/dts/at91-qil_a9260.dts
+++ b/arch/arm/boot/dts/at91-qil_a9260.dts
@@ -28,6 +28,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 5b8e40400bec..fec1fca2ad66 100644
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -21,12 +21,14 @@
                 reg = <0x20000000 0x10000000>;
         };
 
-        slow_xtal {
-                clock-frequency = <32768>;
-        };
+        clocks {
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
 
-        main_xtal {
-                clock-frequency = <12000000>;
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index c61b16fba79b..65ccf564b9a5 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -14,6 +14,7 @@
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
         model = "Atmel AT91RM9200 family SoC";
@@ -51,6 +52,20 @@
                 reg = <0x20000000 0x04000000>;
         };
 
+        clocks {
+                slow_xtal: slow_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
+
+                main_xtal: main_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
         ahb {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -79,6 +94,260 @@
                         pmc: pmc@fffffc00 {
                                 compatible = "atmel,at91rm9200-pmc";
                                 reg = <0xfffffc00 0x100>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                interrupt-controller;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                #interrupt-cells = <1>;
+
+                                main_osc: main_osc {
+                                        compatible = "atmel,at91rm9200-clk-main-osc";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_MOSCS>;
+                                        clocks = <&main_xtal>;
+                                };
+
+                                main: mainck {
+                                        compatible = "atmel,at91rm9200-clk-main";
+                                        #clock-cells = <0>;
+                                        clocks = <&main_osc>;
+                                };
+
+                                plla: pllack {
+                                        compatible = "atmel,at91rm9200-clk-pll";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_LOCKA>;
+                                        clocks = <&main>;
+                                        reg = <0>;
+                                        atmel,clk-input-range = <1000000 32000000>;
+                                        #atmel,pll-clk-output-range-cells = <3>;
+                                        atmel,pll-clk-output-ranges = <80000000 160000000 0>,
+                                                                <150000000 180000000 2>;
+                                };
+
+                                pllb: pllbck {
+                                        compatible = "atmel,at91rm9200-clk-pll";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_LOCKB>;
+                                        clocks = <&main>;
+                                        reg = <1>;
+                                        atmel,clk-input-range = <1000000 32000000>;
+                                        #atmel,pll-clk-output-range-cells = <3>;
+                                        atmel,pll-clk-output-ranges = <80000000 160000000 0>,
+                                                                <150000000 180000000 2>;
+                                };
+
+                                mck: masterck {
+                                        compatible = "atmel,at91rm9200-clk-master";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
+                                        clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
+                                        atmel,clk-output-range = <0 80000000>;
+                                        atmel,clk-divisors = <1 2 3 4>;
+                                };
+
+                                usb: usbck {
+                                        compatible = "atmel,at91rm9200-clk-usb";
+                                        #clock-cells = <0>;
+                                        atmel,clk-divisors = <1 2>;
+                                        clocks = <&pllb>;
+                                };
+
+                                prog: progck {
+                                        compatible = "atmel,at91rm9200-clk-programmable";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        interrupt-parent = <&pmc>;
+                                        clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
+
+                                        prog0: prog0 {
+                                                #clock-cells = <0>;
+                                                reg = <0>;
+                                                interrupts = <AT91_PMC_PCKRDY(0)>;
+                                        };
+
+                                        prog1: prog1 {
+                                                #clock-cells = <0>;
+                                                reg = <1>;
+                                                interrupts = <AT91_PMC_PCKRDY(1)>;
+                                        };
+
+                                        prog2: prog2 {
+                                                #clock-cells = <0>;
+                                                reg = <2>;
+                                                interrupts = <AT91_PMC_PCKRDY(2)>;
+                                        };
+
+                                        prog3: prog3 {
+                                                #clock-cells = <0>;
+                                                reg = <3>;
+                                                interrupts = <AT91_PMC_PCKRDY(3)>;
+                                        };
+                                };
+
+                                systemck {
+                                        compatible = "atmel,at91rm9200-clk-system";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        udpck: udpck {
+                                                #clock-cells = <0>;
+                                                reg = <2>;
+                                                clocks = <&usb>;
+                                        };
+
+                                        uhpck: uhpck {
+                                                #clock-cells = <0>;
+                                                reg = <4>;
+                                                clocks = <&usb>;
+                                        };
+
+                                        pck0: pck0 {
+                                                #clock-cells = <0>;
+                                                reg = <8>;
+                                                clocks = <&prog0>;
+                                        };
+
+                                        pck1: pck1 {
+                                                #clock-cells = <0>;
+                                                reg = <9>;
+                                                clocks = <&prog1>;
+                                        };
+
+                                        pck2: pck2 {
+                                                #clock-cells = <0>;
+                                                reg = <10>;
+                                                clocks = <&prog2>;
+                                        };
+
+                                        pck3: pck3 {
+                                                #clock-cells = <0>;
+                                                reg = <11>;
+                                                clocks = <&prog3>;
+                                        };
+                                };
+
+                                periphck {
+                                        compatible = "atmel,at91rm9200-clk-peripheral";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        clocks = <&mck>;
+
+                                        pioA_clk: pioA_clk {
+                                                #clock-cells = <0>;
+                                                reg = <2>;
+                                        };
+
+                                        pioB_clk: pioB_clk {
+                                                #clock-cells = <0>;
+                                                reg = <3>;
+                                        };
+
+                                        pioC_clk: pioC_clk {
+                                                #clock-cells = <0>;
+                                                reg = <4>;
+                                        };
+
+                                        pioD_clk: pioD_clk {
+                                                #clock-cells = <0>;
+                                                reg = <5>;
+                                        };
+
+                                        usart0_clk: usart0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <6>;
+                                        };
+
+                                        usart1_clk: usart1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <7>;
+                                        };
+
+                                        usart2_clk: usart2_clk {
+                                                #clock-cells = <0>;
+                                                reg = <8>;
+                                        };
+
+                                        usart3_clk: usart3_clk {
+                                                #clock-cells = <0>;
+                                                reg = <9>;
+                                        };
+
+                                        mci0_clk: mci0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <10>;
+                                        };
+
+                                        udc_clk: udc_clk {
+                                                #clock-cells = <0>;
+                                                reg = <11>;
+                                        };
+
+                                        twi0_clk: twi0_clk {
+                                                reg = <12>;
+                                                #clock-cells = <0>;
+                                        };
+
+                                        spi0_clk: spi0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <13>;
+                                        };
+
+                                        ssc0_clk: ssc0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <14>;
+                                        };
+
+                                        ssc1_clk: ssc1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <15>;
+                                        };
+
+                                        ssc2_clk: ssc2_clk {
+                                                #clock-cells = <0>;
+                                                reg = <16>;
+                                        };
+
+                                        tc0_clk: tc0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <17>;
+                                        };
+
+                                        tc1_clk: tc1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <18>;
+                                        };
+
+                                        tc2_clk: tc2_clk {
+                                                #clock-cells = <0>;
+                                                reg = <19>;
+                                        };
+
+                                        tc3_clk: tc3_clk {
+                                                #clock-cells = <0>;
+                                                reg = <20>;
+                                        };
+
+                                        tc4_clk: tc4_clk {
+                                                #clock-cells = <0>;
+                                                reg = <21>;
+                                        };
+
+                                        tc5_clk: tc5_clk {
+                                                #clock-cells = <0>;
+                                                reg = <22>;
+                                        };
+
+                                        ohci_clk: ohci_clk {
+                                                #clock-cells = <0>;
+                                                reg = <23>;
+                                        };
+
+                                        macb0_clk: macb0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <24>;
+                                        };
+                                };
                         };
 
                         st: timer@fffffd00 {
@@ -93,6 +362,8 @@
                                 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
                                               18 IRQ_TYPE_LEVEL_HIGH 0
                                               19 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&tc0_clk>, <&tc1_clk>, <&tc2_clk>;
+                                clock-names = "t0_clk", "t1_clk", "t2_clk";
                         };
 
                         tcb1: timer@fffa4000 {
@@ -101,6 +372,8 @@
                                 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0
                                               21 IRQ_TYPE_LEVEL_HIGH 0
                                               22 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&tc3_clk>, <&tc4_clk>, <&tc5_clk>;
+                                clock-names = "t0_clk", "t1_clk", "t2_clk";
                         };
 
                         i2c0: i2c@fffb8000 {
@@ -109,6 +382,7 @@
                                 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_twi>;
+                                clocks = <&twi0_clk>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 status = "disabled";
@@ -118,6 +392,8 @@
                                 compatible = "atmel,hsmci";
                                 reg = <0xfffb4000 0x4000>;
                                 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&mci0_clk>;
+                                clock-names = "mci_clk";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 pinctrl-names = "default";
@@ -130,6 +406,8 @@
                                 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
+                                clocks = <&ssc0_clk>;
+                                clock-names = "pclk";
                                 status = "disable";
                         };
 
@@ -139,6 +417,8 @@
                                 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
+                                clocks = <&ssc1_clk>;
+                                clock-names = "pclk";
                                 status = "disable";
                         };
 
@@ -148,6 +428,8 @@
                                 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;
+                                clocks = <&ssc2_clk>;
+                                clock-names = "pclk";
                                 status = "disable";
                         };
 
@@ -158,6 +440,8 @@
                                 phy-mode = "rmii";
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_macb_rmii>;
+                                clocks = <&macb0_clk>;
+                                clock-names = "ether_clk";
                                 status = "disabled";
                         };
 
@@ -496,6 +780,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioA_clk>;
                                 };
 
                                 pioB: gpio@fffff600 {
@@ -506,6 +791,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioB_clk>;
                                 };
 
                                 pioC: gpio@fffff800 {
@@ -516,6 +802,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioC_clk>;
                                 };
 
                                 pioD: gpio@fffffa00 {
@@ -526,6 +813,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioD_clk>;
                                 };
                         };
 
@@ -535,6 +823,8 @@
                                 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_dbgu>;
+                                clocks = <&mck>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -546,6 +836,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_uart0>;
+                                clocks = <&usart0_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -557,6 +849,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_uart1>;
+                                clocks = <&usart1_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -568,6 +862,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_uart2>;
+                                clocks = <&usart2_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -579,6 +875,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_uart3>;
+                                clocks = <&usart3_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -586,6 +884,8 @@
                                 compatible = "atmel,at91rm9200-udc";
                                 reg = <0xfffb0000 0x4000>;
                                 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
+                                clocks = <&udc_clk>, <&udpck>;
+                                clock-names = "pclk", "hclk";
                                 status = "disabled";
                         };
 
@@ -597,6 +897,8 @@
                                 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_spi0>;
+                                clocks = <&spi0_clk>;
+                                clock-names = "spi_clk";
                                 status = "disabled";
                         };
                 };
@@ -622,6 +924,8 @@
                         compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                         reg = <0x00300000 0x100000>;
                         interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
+                        clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
+                        clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
                         status = "disabled";
                 };
         };
diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts
index df6b0aa0e4dd..43eb779dd6f6 100644
--- a/arch/arm/boot/dts/at91rm9200ek.dts
+++ b/arch/arm/boot/dts/at91rm9200ek.dts
@@ -25,6 +25,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <18432000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <18432000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index c0e0eae16a27..cb100b03a362 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -12,6 +12,7 @@
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
         model = "Atmel AT91SAM9260 family SoC";
@@ -48,6 +49,26 @@
                 reg = <0x20000000 0x04000000>;
         };
 
+        clocks {
+                slow_xtal: slow_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
+
+                main_xtal: main_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
+
+                adc_op_clk: adc_op_clk{
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <5000000>;
+                };
+        };
+
         ahb {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -74,8 +95,260 @@
                         };
 
                         pmc: pmc@fffffc00 {
-                                compatible = "atmel,at91rm9200-pmc";
+                                compatible = "atmel,at91sam9260-pmc";
                                 reg = <0xfffffc00 0x100>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                interrupt-controller;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                #interrupt-cells = <1>;
+
+                                main_osc: main_osc {
+                                        compatible = "atmel,at91rm9200-clk-main-osc";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_MOSCS>;
+                                        clocks = <&main_xtal>;
+                                };
+
+                                main: mainck {
+                                        compatible = "atmel,at91rm9200-clk-main";
+                                        #clock-cells = <0>;
+                                        clocks = <&main_osc>;
+                                };
+
+                                slow_rc_osc: slow_rc_osc {
+                                        compatible = "fixed-clock";
+                                        #clock-cells = <0>;
+                                        clock-frequency = <32768>;
+                                        clock-accuracy = <50000000>;
+                                };
+
+                                clk32k: slck {
+                                        compatible = "atmel,at91sam9260-clk-slow";
+                                        #clock-cells = <0>;
+                                        clocks = <&slow_rc_osc>, <&slow_xtal>;
+                                };
+
+                                plla: pllack {
+                                        compatible = "atmel,at91rm9200-clk-pll";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_LOCKA>;
+                                        clocks = <&main>;
+                                        reg = <0>;
+                                        atmel,clk-input-range = <1000000 32000000>;
+                                        #atmel,pll-clk-output-range-cells = <4>;
+                                        atmel,pll-clk-output-ranges = <80000000 160000000 0 1>,
+                                                                <150000000 240000000 2 1>;
+                                };
+
+                                pllb: pllbck {
+                                        compatible = "atmel,at91rm9200-clk-pll";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_LOCKB>;
+                                        clocks = <&main>;
+                                        reg = <1>;
+                                        atmel,clk-input-range = <1000000 5000000>;
+                                        #atmel,pll-clk-output-range-cells = <4>;
+                                        atmel,pll-clk-output-ranges = <70000000 130000000 1 1>;
+                                };
+
+                                mck: masterck {
+                                        compatible = "atmel,at91rm9200-clk-master";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
+                                        clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;
+                                        atmel,clk-output-range = <0 105000000>;
+                                        atmel,clk-divisors = <1 2 4 0>;
+                                };
+
+                                usb: usbck {
+                                        compatible = "atmel,at91rm9200-clk-usb";
+                                        #clock-cells = <0>;
+                                        atmel,clk-divisors = <1 2 4 0>;
+                                        clocks = <&pllb>;
+                                };
+
+                                prog: progck {
+                                        compatible = "atmel,at91rm9200-clk-programmable";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        interrupt-parent = <&pmc>;
+                                        clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;
+
+                                        prog0: prog0 {
+                                                #clock-cells = <0>;
+                                                reg = <0>;
+                                                interrupts = <AT91_PMC_PCKRDY(0)>;
+                                        };
+
+                                        prog1: prog1 {
+                                                #clock-cells = <0>;
+                                                reg = <1>;
+                                                interrupts = <AT91_PMC_PCKRDY(1)>;
+                                        };
+                                };
+
+                                systemck {
+                                        compatible = "atmel,at91rm9200-clk-system";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        uhpck: uhpck {
+                                                #clock-cells = <0>;
+                                                reg = <6>;
+                                                clocks = <&usb>;
+                                        };
+
+                                        udpck: udpck {
+                                                #clock-cells = <0>;
+                                                reg = <7>;
+                                                clocks = <&usb>;
+                                        };
+
+                                        pck0: pck0 {
+                                                #clock-cells = <0>;
+                                                reg = <8>;
+                                                clocks = <&prog0>;
+                                        };
+
+                                        pck1: pck1 {
+                                                #clock-cells = <0>;
+                                                reg = <9>;
+                                                clocks = <&prog1>;
+                                        };
+                                };
+
+                                periphck {
+                                        compatible = "atmel,at91rm9200-clk-peripheral";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        clocks = <&mck>;
+
+                                        pioA_clk: pioA_clk {
+                                                #clock-cells = <0>;
+                                                reg = <2>;
+                                        };
+
+                                        pioB_clk: pioB_clk {
+                                                #clock-cells = <0>;
+                                                reg = <3>;
+                                        };
+
+                                        pioC_clk: pioC_clk {
+                                                #clock-cells = <0>;
+                                                reg = <4>;
+                                        };
+
+                                        adc_clk: adc_clk {
+                                                #clock-cells = <0>;
+                                                reg = <5>;
+                                        };
+
+                                        usart0_clk: usart0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <6>;
+                                        };
+
+                                        usart1_clk: usart1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <7>;
+                                        };
+
+                                        usart2_clk: usart2_clk {
+                                                #clock-cells = <0>;
+                                                reg = <8>;
+                                        };
+
+                                        mci0_clk: mci0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <9>;
+                                        };
+
+                                        udc_clk: udc_clk {
+                                                #clock-cells = <0>;
+                                                reg = <10>;
+                                        };
+
+                                        twi0_clk: twi0_clk {
+                                                reg = <11>;
+                                                #clock-cells = <0>;
+                                        };
+
+                                        spi0_clk: spi0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <12>;
+                                        };
+
+                                        spi1_clk: spi1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <13>;
+                                        };
+
+                                        ssc0_clk: ssc0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <14>;
+                                        };
+
+                                        tc0_clk: tc0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <17>;
+                                        };
+
+                                        tc1_clk: tc1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <18>;
+                                        };
+
+                                        tc2_clk: tc2_clk {
+                                                #clock-cells = <0>;
+                                                reg = <19>;
+                                        };
+
+                                        ohci_clk: ohci_clk {
+                                                #clock-cells = <0>;
+                                                reg = <20>;
+                                        };
+
+                                        macb0_clk: macb0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <21>;
+                                        };
+
+                                        isi_clk: isi_clk {
+                                                #clock-cells = <0>;
+                                                reg = <22>;
+                                        };
+
+                                        usart3_clk: usart3_clk {
+                                                #clock-cells = <0>;
+                                                reg = <23>;
+                                        };
+
+                                        uart0_clk: uart0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <24>;
+                                        };
+
+                                        uart1_clk: uart1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <25>;
+                                        };
+
+                                        tc3_clk: tc3_clk {
+                                                #clock-cells = <0>;
+                                                reg = <26>;
+                                        };
+
+                                        tc4_clk: tc4_clk {
+                                                #clock-cells = <0>;
+                                                reg = <27>;
+                                        };
+
+                                        tc5_clk: tc5_clk {
+                                                #clock-cells = <0>;
+                                                reg = <28>;
+                                        };
+                                };
                         };
 
                         rstc@fffffd00 {
@@ -92,6 +365,7 @@
                                 compatible = "atmel,at91sam9260-pit";
                                 reg = <0xfffffd30 0xf>;
                                 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                clocks = <&mck>;
                         };
 
                         tcb0: timer@fffa0000 {
@@ -100,6 +374,8 @@
                                 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
                                               18 IRQ_TYPE_LEVEL_HIGH 0
                                               19 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&tc0_clk>, <&tc1_clk>, <&tc2_clk>;
+                                clock-names = "t0_clk", "t1_clk", "t2_clk";
                         };
 
                         tcb1: timer@fffdc000 {
@@ -108,6 +384,8 @@
                                 interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0
                                               27 IRQ_TYPE_LEVEL_HIGH 0
                                               28 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&tc3_clk>, <&tc4_clk>, <&tc5_clk>;
+                                clock-names = "t0_clk", "t1_clk", "t2_clk";
                         };
 
                         pinctrl@fffff400 {
@@ -443,6 +721,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioA_clk>;
                                 };
 
                                 pioB: gpio@fffff600 {
@@ -453,6 +732,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioB_clk>;
                                 };
 
                                 pioC: gpio@fffff800 {
@@ -463,6 +743,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioC_clk>;
                                 };
                         };
 
@@ -472,6 +753,8 @@
                                 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_dbgu>;
+                                clocks = <&mck>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -483,6 +766,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart0>;
+                                clocks = <&usart0_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -494,6 +779,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart1>;
+                                clocks = <&usart1_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -505,6 +792,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart2>;
+                                clocks = <&usart2_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -516,6 +805,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart3>;
+                                clocks = <&usart3_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -527,6 +818,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_uart0>;
+                                clocks = <&uart0_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -538,6 +831,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_uart1>;
+                                clocks = <&uart1_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -547,6 +842,8 @@
                                 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_macb_rmii>;
+                                clocks = <&macb0_clk>, <&macb0_clk>;
+                                clock-names = "hclk", "pclk";
                                 status = "disabled";
                         };
 
@@ -554,6 +851,8 @@
                                 compatible = "atmel,at91rm9200-udc";
                                 reg = <0xfffa4000 0x4000>;
                                 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;
+                                clocks = <&udc_clk>, <&udpck>;
+                                clock-names = "pclk", "hclk";
                                 status = "disabled";
                         };
 
@@ -563,6 +862,7 @@
                                 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                clocks = <&twi0_clk>;
                                 status = "disabled";
                         };
 
@@ -573,6 +873,8 @@
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 pinctrl-names = "default";
+                                clocks = <&mci0_clk>;
+                                clock-names = "mci_clk";
                                 status = "disabled";
                         };
 
@@ -582,6 +884,8 @@
                                 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
+                                clocks = <&ssc0_clk>;
+                                clock-names = "pclk";
                                 status = "disabled";
                         };
 
@@ -593,6 +897,8 @@
                                 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_spi0>;
+                                clocks = <&spi0_clk>;
+                                clock-names = "spi_clk";
                                 status = "disabled";
                         };
 
@@ -604,6 +910,8 @@
                                 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_spi1>;
+                                clocks = <&spi1_clk>;
+                                clock-names = "spi_clk";
                                 status = "disabled";
                         };
 
@@ -613,6 +921,8 @@
                                 compatible = "atmel,at91sam9260-adc";
                                 reg = <0xfffe0000 0x100>;
                                 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&adc_clk>, <&adc_op_clk>;
+                                clock-names = "adc_clk", "adc_op_clk";
                                 atmel,adc-use-external-triggers;
                                 atmel,adc-channels-used = <0xf>;
                                 atmel,adc-vref = <3300>;
@@ -680,6 +990,8 @@
                         compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                         reg = <0x00500000 0x100000>;
                         interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
+                        clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
+                        clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
                         status = "disabled";
                 };
         };
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index 04927db1d6bf..a81aab4281a7 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -46,16 +46,18 @@
                 reg = <0x20000000 0x08000000>;
         };
 
-        main_xtal: main_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+        clocks {
+                main_xtal: main_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
 
-        slow_xtal: slow_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
+                slow_xtal: slow_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts
index aa35a7aec9a8..f4a765729c7a 100644
--- a/arch/arm/boot/dts/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/at91sam9261ek.dts
@@ -20,14 +20,6 @@
                 reg = <0x20000000 0x4000000>;
         };
 
-        slow_xtal {
-                clock-frequency = <32768>;
-        };
-
-        main_xtal {
-                clock-frequency = <18432000>;
-        };
-
         clocks {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -37,6 +29,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <18432000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <18432000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index fece8665fb63..bb23c2d33cf8 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -10,6 +10,7 @@
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
         model = "Atmel AT91SAM9263 family SoC";
@@ -32,6 +33,7 @@
                 ssc1 = &ssc1;
                 pwm0 = &pwm0;
         };
+
         cpus {
                 #address-cells = <0>;
                 #size-cells = <0>;
@@ -46,6 +48,20 @@
                 reg = <0x20000000 0x08000000>;
         };
 
+        clocks {
+                main_xtal: main_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
+
+                slow_xtal: slow_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
         ahb {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -69,6 +85,264 @@
                         pmc: pmc@fffffc00 {
                                 compatible = "atmel,at91rm9200-pmc";
                                 reg = <0xfffffc00 0x100>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                interrupt-controller;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                #interrupt-cells = <1>;
+
+                                main_osc: main_osc {
+                                        compatible = "atmel,at91rm9200-clk-main-osc";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_MOSCS>;
+                                        clocks = <&main_xtal>;
+                                };
+
+                                main: mainck {
+                                        compatible = "atmel,at91rm9200-clk-main";
+                                        #clock-cells = <0>;
+                                        clocks = <&main_osc>;
+                                };
+
+                                plla: pllack {
+                                        compatible = "atmel,at91rm9200-clk-pll";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_LOCKA>;
+                                        clocks = <&main>;
+                                        reg = <0>;
+                                        atmel,clk-input-range = <1000000 32000000>;
+                                        #atmel,pll-clk-output-range-cells = <4>;
+                                        atmel,pll-clk-output-ranges = <80000000 200000000 0 1>,
+                                                                <190000000 240000000 2 1>;
+                                };
+
+                                pllb: pllbck {
+                                        compatible = "atmel,at91rm9200-clk-pll";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_LOCKB>;
+                                        clocks = <&main>;
+                                        reg = <1>;
+                                        atmel,clk-input-range = <1000000 5000000>;
+                                        #atmel,pll-clk-output-range-cells = <4>;
+                                        atmel,pll-clk-output-ranges = <70000000 130000000 1 1>;
+                                };
+
+                                mck: masterck {
+                                        compatible = "atmel,at91rm9200-clk-master";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
+                                        clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
+                                        atmel,clk-output-range = <0 120000000>;
+                                        atmel,clk-divisors = <1 2 4 0>;
+                                };
+
+                                usb: usbck {
+                                        compatible = "atmel,at91rm9200-clk-usb";
+                                        #clock-cells = <0>;
+                                        atmel,clk-divisors = <1 2 4 0>;
+                                        clocks = <&pllb>;
+                                };
+
+                                prog: progck {
+                                        compatible = "atmel,at91rm9200-clk-programmable";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        interrupt-parent = <&pmc>;
+                                        clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
+
+                                        prog0: prog0 {
+                                                #clock-cells = <0>;
+                                                reg = <0>;
+                                                interrupts = <AT91_PMC_PCKRDY(0)>;
+                                        };
+
+                                        prog1: prog1 {
+                                                #clock-cells = <0>;
+                                                reg = <1>;
+                                                interrupts = <AT91_PMC_PCKRDY(1)>;
+                                        };
+
+                                        prog2: prog2 {
+                                                #clock-cells = <0>;
+                                                reg = <2>;
+                                                interrupts = <AT91_PMC_PCKRDY(2)>;
+                                        };
+
+                                        prog3: prog3 {
+                                                #clock-cells = <0>;
+                                                reg = <3>;
+                                                interrupts = <AT91_PMC_PCKRDY(3)>;
+                                        };
+                                };
+
+                                systemck {
+                                        compatible = "atmel,at91rm9200-clk-system";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        uhpck: uhpck {
+                                                #clock-cells = <0>;
+                                                reg = <6>;
+                                                clocks = <&usb>;
+                                        };
+
+                                        udpck: udpck {
+                                                #clock-cells = <0>;
+                                                reg = <7>;
+                                                clocks = <&usb>;
+                                        };
+
+                                        pck0: pck0 {
+                                                #clock-cells = <0>;
+                                                reg = <8>;
+                                                clocks = <&prog0>;
+                                        };
+
+                                        pck1: pck1 {
+                                                #clock-cells = <0>;
+                                                reg = <9>;
+                                                clocks = <&prog1>;
+                                        };
+
+                                        pck2: pck2 {
+                                                #clock-cells = <0>;
+                                                reg = <10>;
+                                                clocks = <&prog2>;
+                                        };
+
+                                        pck3: pck3 {
+                                                #clock-cells = <0>;
+                                                reg = <11>;
+                                                clocks = <&prog3>;
+                                        };
+                                };
+
+                                periphck {
+                                        compatible = "atmel,at91rm9200-clk-peripheral";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        clocks = <&mck>;
+
+                                        pioA_clk: pioA_clk {
+                                                #clock-cells = <0>;
+                                                reg = <2>;
+                                        };
+
+                                        pioB_clk: pioB_clk {
+                                                #clock-cells = <0>;
+                                                reg = <3>;
+                                        };
+
+                                        pioCDE_clk: pioCDE_clk {
+                                                #clock-cells = <0>;
+                                                reg = <4>;
+                                        };
+
+                                        usart0_clk: usart0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <7>;
+                                        };
+
+                                        usart1_clk: usart1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <8>;
+                                        };
+
+                                        usart2_clk: usart2_clk {
+                                                #clock-cells = <0>;
+                                                reg = <9>;
+                                        };
+
+                                        mci0_clk: mci0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <10>;
+                                        };
+
+                                        mci1_clk: mci1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <11>;
+                                        };
+
+                                        can_clk: can_clk {
+                                                #clock-cells = <0>;
+                                                reg = <12>;
+                                        };
+
+                                        twi0_clk: twi0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <13>;
+                                        };
+
+                                        spi0_clk: spi0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <14>;
+                                        };
+
+                                        spi1_clk: spi1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <15>;
+                                        };
+
+                                        ssc0_clk: ssc0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <16>;
+                                        };
+
+                                        ssc1_clk: ssc1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <17>;
+                                        };
+
+                                        ac91_clk: ac97_clk {
+                                                #clock-cells = <0>;
+                                                reg = <18>;
+                                        };
+
+                                        tcb_clk: tcb_clk {
+                                                #clock-cells = <0>;
+                                                reg = <19>;
+                                        };
+
+                                        pwm_clk: pwm_clk {
+                                                #clock-cells = <0>;
+                                                reg = <20>;
+                                        };
+
+                                        macb0_clk: macb0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <21>;
+                                        };
+
+                                        g2de_clk: g2de_clk {
+                                                #clock-cells = <0>;
+                                                reg = <23>;
+                                        };
+
+                                        udc_clk: udc_clk {
+                                                #clock-cells = <0>;
+                                                reg = <24>;
+                                        };
+
+                                        isi_clk: isi_clk {
+                                                #clock-cells = <0>;
+                                                reg = <25>;
+                                        };
+
+                                        lcd_clk: lcd_clk {
+                                                #clock-cells = <0>;
+                                                reg = <26>;
+                                        };
+
+                                        dma_clk: dma_clk {
+                                                #clock-cells = <0>;
+                                                reg = <27>;
+                                        };
+
+                                        ohci_clk: ohci_clk {
+                                                #clock-cells = <0>;
+                                                reg = <29>;
+                                        };
+                                };
                         };
 
                         ramc: ramc@ffffe200 {
@@ -81,12 +355,15 @@
                                 compatible = "atmel,at91sam9260-pit";
                                 reg = <0xfffffd30 0xf>;
                                 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                clocks = <&mck>;
                         };
 
                         tcb0: timer@fff7c000 {
                                 compatible = "atmel,at91rm9200-tcb";
                                 reg = <0xfff7c000 0x100>;
                                 interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&tcb_clk>;
+                                clock-names = "t0_clk";
                         };
 
                         rstc@fffffd00 {
@@ -403,6 +680,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioA_clk>;
                                 };
 
                                 pioB: gpio@fffff400 {
@@ -413,6 +691,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioB_clk>;
                                 };
 
                                 pioC: gpio@fffff600 {
@@ -423,6 +702,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioCDE_clk>;
                                 };
 
                                 pioD: gpio@fffff800 {
@@ -433,6 +713,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioCDE_clk>;
                                 };
 
                                 pioE: gpio@fffffa00 {
@@ -443,6 +724,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioCDE_clk>;
                                 };
                         };
 
@@ -452,6 +734,8 @@
                                 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_dbgu>;
+                                clocks = <&mck>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -463,6 +747,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart0>;
+                                clocks = <&usart0_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -474,6 +760,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart1>;
+                                clocks = <&usart1_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -485,6 +773,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart2>;
+                                clocks = <&usart2_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -494,6 +784,8 @@
                                 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
+                                clocks = <&ssc0_clk>;
+                                clock-names = "pclk";
                                 status = "disabled";
                         };
 
@@ -503,6 +795,8 @@
                                 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
+                                clocks = <&ssc1_clk>;
+                                clock-names = "pclk";
                                 status = "disabled";
                         };
 
@@ -512,6 +806,8 @@
                                 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_macb_rmii>;
+                                clocks = <&macb0_clk>, <&macb0_clk>;
+                                clock-names = "hclk", "pclk";
                                 status = "disabled";
                         };
 
@@ -519,6 +815,8 @@
                                 compatible = "atmel,at91rm9200-udc";
                                 reg = <0xfff78000 0x4000>;
                                 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>;
+                                clocks = <&udc_clk>, <&udpck>;
+                                clock-names = "pclk", "hclk";
                                 status = "disabled";
                         };
 
@@ -528,6 +826,7 @@
                                 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 6>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                clocks = <&twi0_clk>;
                                 status = "disabled";
                         };
 
@@ -537,6 +836,8 @@
                                 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                clocks = <&mci0_clk>;
+                                clock-names = "mci_clk";
                                 status = "disabled";
                         };
 
@@ -546,6 +847,8 @@
                                 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                clocks = <&mci1_clk>;
+                                clock-names = "mci_clk";
                                 status = "disabled";
                         };
 
@@ -568,6 +871,8 @@
                                 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_spi0>;
+                                clocks = <&spi0_clk>;
+                                clock-names = "spi_clk";
                                 status = "disabled";
                         };
 
@@ -579,6 +884,8 @@
                                 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_spi1>;
+                                clocks = <&spi1_clk>;
+                                clock-names = "spi_clk";
                                 status = "disabled";
                         };
 
@@ -587,6 +894,8 @@
                                 reg = <0xfffb8000 0x300>;
                                 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 4>;
                                 #pwm-cells = <3>;
+                                clocks = <&pwm_clk>;
+                                clock-names = "pwm_clk";
                                 status = "disabled";
                         };
                 };
@@ -622,6 +931,8 @@
                         compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                         reg = <0x00a00000 0x100000>;
                         interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;
+                        clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
+                        clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
                         status = "disabled";
                 };
         };
diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 15009c9f2293..5cf93eecd8f1 100644
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -29,6 +29,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <16367660>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <16367660>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index b8e79466014f..31f7652612fc 100644
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -25,6 +25,30 @@
                         adc0: adc@fffe0000 {
                                 atmel,adc-startup-time = <40>;
                         };
+
+                        pmc: pmc@fffffc00 {
+                                plla: pllack {
+                                        atmel,clk-input-range = <2000000 32000000>;
+                                        atmel,pll-clk-output-ranges = <745000000 800000000 0 0>,
+                                                                <695000000 750000000 1 0>,
+                                                                <645000000 700000000 2 0>,
+                                                                <595000000 650000000 3 0>,
+                                                                <545000000 600000000 0 1>,
+                                                                <495000000 550000000 1 1>,
+                                                                <445000000 500000000 2 1>,
+                                                                <400000000 450000000 3 1>;
+                                };
+
+                                pllb: pllbck {
+                                        atmel,clk-input-range = <2000000 32000000>;
+                                        atmel,pll-clk-output-ranges = <30000000 100000000 0 0>;
+                                };
+
+                                mck: masterck {
+                                        atmel,clk-output-range = <0 133000000>;
+                                        atmel,clk-divisors = <1 2 4 6>;
+                                };
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index cb2c010e08e2..d2919108e92d 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -26,6 +26,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <18432000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <18432000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index ace6bf197b70..932a669156af 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -14,6 +14,7 @@
 #include <dt-bindings/pinctrl/at91.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/clock/at91.h>
 
 / {
         model = "Atmel AT91SAM9G45 family SoC";
@@ -53,6 +54,26 @@
                 reg = <0x70000000 0x10000000>;
         };
 
+        clocks {
+                slow_xtal: slow_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
+
+                main_xtal: main_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
+
+                adc_op_clk: adc_op_clk{
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <300000>;
+                };
+        };
+
         ahb {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -77,11 +98,279 @@
                                 compatible = "atmel,at91sam9g45-ddramc";
                                 reg = <0xffffe400 0x200
                                        0xffffe600 0x200>;
+                                clocks = <&ddrck>;
+                                clock-names = "ddrck";
                         };
 
                         pmc: pmc@fffffc00 {
-                                compatible = "atmel,at91rm9200-pmc";
+                                compatible = "atmel,at91sam9g45-pmc";
                                 reg = <0xfffffc00 0x100>;
+                                interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                interrupt-controller;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                #interrupt-cells = <1>;
+
+                                main_osc: main_osc {
+                                        compatible = "atmel,at91rm9200-clk-main-osc";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_MOSCS>;
+                                        clocks = <&main_xtal>;
+                                };
+
+                                main: mainck {
+                                        compatible = "atmel,at91rm9200-clk-main";
+                                        #clock-cells = <0>;
+                                        clocks = <&main_osc>;
+                                };
+
+                                plla: pllack {
+                                        compatible = "atmel,at91rm9200-clk-pll";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_LOCKA>;
+                                        clocks = <&main>;
+                                        reg = <0>;
+                                        atmel,clk-input-range = <2000000 32000000>;
+                                        #atmel,pll-clk-output-range-cells = <4>;
+                                        atmel,pll-clk-output-ranges = <745000000 800000000 0 0
+                                                                       695000000 750000000 1 0
+                                                                       645000000 700000000 2 0
+                                                                       595000000 650000000 3 0
+                                                                       545000000 600000000 0 1
+                                                                       495000000 555000000 1 1
+                                                                       445000000 500000000 2 1
+                                                                       400000000 450000000 3 1>;
+                                };
+
+                                plladiv: plladivck {
+                                        compatible = "atmel,at91sam9x5-clk-plldiv";
+                                        #clock-cells = <0>;
+                                        clocks = <&plla>;
+                                };
+
+                                utmi: utmick {
+                                        compatible = "atmel,at91sam9x5-clk-utmi";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_LOCKU>;
+                                        clocks = <&main>;
+                                };
+
+                                mck: masterck {
+                                        compatible = "atmel,at91rm9200-clk-master";
+                                        #clock-cells = <0>;
+                                        interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
+                                        clocks = <&slow_xtal>, <&main>, <&plladiv>, <&utmi>;
+                                        atmel,clk-output-range = <0 133333333>;
+                                        atmel,clk-divisors = <1 2 4 3>;
+                                };
+
+                                usb: usbck {
+                                        compatible = "atmel,at91sam9x5-clk-usb";
+                                        #clock-cells = <0>;
+                                        clocks = <&plladiv>, <&utmi>;
+                                };
+
+                                prog: progck {
+                                        compatible = "atmel,at91sam9g45-clk-programmable";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        interrupt-parent = <&pmc>;
+                                        clocks = <&slow_xtal>, <&main>, <&plladiv>, <&utmi>, <&mck>;
+
+                                        prog0: prog0 {
+                                                #clock-cells = <0>;
+                                                reg = <0>;
+                                                interrupts = <AT91_PMC_PCKRDY(0)>;
+                                        };
+
+                                        prog1: prog1 {
+                                                #clock-cells = <0>;
+                                                reg = <1>;
+                                                interrupts = <AT91_PMC_PCKRDY(1)>;
+                                        };
+                                };
+
+                                systemck {
+                                        compatible = "atmel,at91rm9200-clk-system";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+
+                                        ddrck: ddrck {
+                                                #clock-cells = <0>;
+                                                reg = <2>;
+                                                clocks = <&mck>;
+                                        };
+
+                                        uhpck: uhpck {
+                                                #clock-cells = <0>;
+                                                reg = <6>;
+                                                clocks = <&usb>;
+                                        };
+
+                                        pck0: pck0 {
+                                                #clock-cells = <0>;
+                                                reg = <8>;
+                                                clocks = <&prog0>;
+                                        };
+
+                                        pck1: pck1 {
+                                                #clock-cells = <0>;
+                                                reg = <9>;
+                                                clocks = <&prog1>;
+                                        };
+                                };
+
+                                periphck {
+                                        compatible = "atmel,at91rm9200-clk-peripheral";
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        clocks = <&mck>;
+
+                                        pioA_clk: pioA_clk {
+                                                #clock-cells = <0>;
+                                                reg = <2>;
+                                        };
+
+                                        pioB_clk: pioB_clk {
+                                                #clock-cells = <0>;
+                                                reg = <3>;
+                                        };
+
+                                        pioC_clk: pioC_clk {
+                                                #clock-cells = <0>;
+                                                reg = <4>;
+                                        };
+
+                                        pioDE_clk: pioDE_clk {
+                                                #clock-cells = <0>;
+                                                reg = <5>;
+                                        };
+
+                                        trng_clk: trng_clk {
+                                                #clock-cells = <0>;
+                                                reg = <6>;
+                                        };
+
+                                        usart0_clk: usart0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <7>;
+                                        };
+
+                                        usart1_clk: usart1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <8>;
+                                        };
+
+                                        usart2_clk: usart2_clk {
+                                                #clock-cells = <0>;
+                                                reg = <9>;
+                                        };
+
+                                        usart3_clk: usart3_clk {
+                                                #clock-cells = <0>;
+                                                reg = <10>;
+                                        };
+
+                                        mci0_clk: mci0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <11>;
+                                        };
+
+                                        twi0_clk: twi0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <12>;
+                                        };
+
+                                        twi1_clk: twi1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <13>;
+                                        };
+
+                                        spi0_clk: spi0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <14>;
+                                        };
+
+                                        spi1_clk: spi1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <15>;
+                                        };
+
+                                        ssc0_clk: ssc0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <16>;
+                                        };
+
+                                        ssc1_clk: ssc1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <17>;
+                                        };
+
+                                        tcb0_clk: tcb0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <18>;
+                                        };
+
+                                        pwm_clk: pwm_clk {
+                                                #clock-cells = <0>;
+                                                reg = <19>;
+                                        };
+
+                                        adc_clk: adc_clk {
+                                                #clock-cells = <0>;
+                                                reg = <20>;
+                                        };
+
+                                        dma0_clk: dma0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <21>;
+                                        };
+
+                                        uhphs_clk: uhphs_clk {
+                                                #clock-cells = <0>;
+                                                reg = <22>;
+                                        };
+
+                                        lcd_clk: lcd_clk {
+                                                #clock-cells = <0>;
+                                                reg = <23>;
+                                        };
+
+                                        ac97_clk: ac97_clk {
+                                                #clock-cells = <0>;
+                                                reg = <24>;
+                                        };
+
+                                        macb0_clk: macb0_clk {
+                                                #clock-cells = <0>;
+                                                reg = <25>;
+                                        };
+
+                                        isi_clk: isi_clk {
+                                                #clock-cells = <0>;
+                                                reg = <26>;
+                                        };
+
+                                        udphs_clk: udphs_clk {
+                                                #clock-cells = <0>;
+                                                reg = <27>;
+                                        };
+
+                                        aestdessha_clk: aestdessha_clk {
+                                                #clock-cells = <0>;
+                                                reg = <28>;
+                                        };
+
+                                        mci1_clk: mci1_clk {
+                                                #clock-cells = <0>;
+                                                reg = <29>;
+                                        };
+
+                                        vdec_clk: vdec_clk {
+                                                #clock-cells = <0>;
+                                                reg = <30>;
+                                        };
+                                };
                         };
 
                         rstc@fffffd00 {
@@ -93,6 +382,7 @@
                                 compatible = "atmel,at91sam9260-pit";
                                 reg = <0xfffffd30 0xf>;
                                 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+                                clocks = <&mck>;
                         };
 
 
@@ -105,12 +395,16 @@
                                 compatible = "atmel,at91rm9200-tcb";
                                 reg = <0xfff7c000 0x100>;
                                 interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&tcb0_clk>, <&tcb0_clk>, <&tcb0_clk>;
+                                clock-names = "t0_clk", "t1_clk", "t2_clk";
                         };
 
                         tcb1: timer@fffd4000 {
                                 compatible = "atmel,at91rm9200-tcb";
                                 reg = <0xfffd4000 0x100>;
                                 interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&tcb0_clk>, <&tcb0_clk>, <&tcb0_clk>;
+                                clock-names = "t0_clk", "t1_clk", "t2_clk";
                         };
 
                         dma: dma-controller@ffffec00 {
@@ -118,6 +412,8 @@
                                 reg = <0xffffec00 0x200>;
                                 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
                                 #dma-cells = <2>;
+                                clocks = <&dma0_clk>;
+                                clock-names = "dma_clk";
                         };
 
                         pinctrl@fffff200 {
@@ -516,6 +812,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioA_clk>;
                                 };
 
                                 pioB: gpio@fffff400 {
@@ -526,6 +823,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioB_clk>;
                                 };
 
                                 pioC: gpio@fffff600 {
@@ -536,6 +834,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioC_clk>;
                                 };
 
                                 pioD: gpio@fffff800 {
@@ -546,6 +845,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioDE_clk>;
                                 };
 
                                 pioE: gpio@fffffa00 {
@@ -556,6 +856,7 @@
                                         gpio-controller;
                                         interrupt-controller;
                                         #interrupt-cells = <2>;
+                                        clocks = <&pioDE_clk>;
                                 };
                         };
 
@@ -565,6 +866,8 @@
                                 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_dbgu>;
+                                clocks = <&mck>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -576,6 +879,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart0>;
+                                clocks = <&usart0_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -587,6 +892,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart1>;
+                                clocks = <&usart1_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -598,6 +905,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart2>;
+                                clocks = <&usart2_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -609,6 +918,8 @@
                                 atmel,use-dma-tx;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_usart3>;
+                                clocks = <&usart3_clk>;
+                                clock-names = "usart";
                                 status = "disabled";
                         };
 
@@ -618,6 +929,8 @@
                                 interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_macb_rmii>;
+                                clocks = <&macb0_clk>, <&macb0_clk>;
+                                clock-names = "hclk", "pclk";
                                 status = "disabled";
                         };
 
@@ -629,6 +942,7 @@
                                 pinctrl-0 = <&pinctrl_i2c0>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                clocks = <&twi0_clk>;
                                 status = "disabled";
                         };
 
@@ -640,6 +954,7 @@
                                 pinctrl-0 = <&pinctrl_i2c1>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                clocks = <&twi1_clk>;
                                 status = "disabled";
                         };
 
@@ -649,6 +964,8 @@
                                 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
+                                clocks = <&ssc0_clk>;
+                                clock-names = "pclk";
                                 status = "disabled";
                         };
 
@@ -658,6 +975,8 @@
                                 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
+                                clocks = <&ssc1_clk>;
+                                clock-names = "pclk";
                                 status = "disabled";
                         };
 
@@ -667,6 +986,8 @@
                                 compatible = "atmel,at91sam9g45-adc";
                                 reg = <0xfffb0000 0x100>;
                                 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&adc_clk>, <&adc_op_clk>;
+                                clock-names = "adc_clk", "adc_op_clk";
                                 atmel,adc-channels-used = <0xff>;
                                 atmel,adc-vref = <3300>;
                                 atmel,adc-startup-time = <40>;
@@ -706,6 +1027,7 @@
                                 reg = <0xfffb8000 0x300>;
                                 interrupts = <19 IRQ_TYPE_LEVEL_HIGH 4>;
                                 #pwm-cells = <3>;
+                                clocks = <&pwm_clk>;
                                 status = "disabled";
                         };
 
@@ -718,6 +1040,8 @@
                                 dma-names = "rxtx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                clocks = <&mci0_clk>;
+                                clock-names = "mci_clk";
                                 status = "disabled";
                         };
 
@@ -730,6 +1054,8 @@
                                 dma-names = "rxtx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                clocks = <&mci1_clk>;
+                                clock-names = "mci_clk";
                                 status = "disabled";
                         };
 
@@ -752,6 +1078,8 @@
                                 interrupts = <14 4 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_spi0>;
+                                clocks = <&spi0_clk>;
+                                clock-names = "spi_clk";
                                 status = "disabled";
                         };
 
@@ -763,6 +1091,8 @@
                                 interrupts = <15 4 3>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_spi1>;
+                                clocks = <&spi1_clk>;
+                                clock-names = "spi_clk";
                                 status = "disabled";
                         };
 
@@ -773,6 +1103,8 @@
                                 reg = <0x00600000 0x80000
                                        0xfff78000 0x400>;
                                 interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;
+                                clocks = <&udphs_clk>, <&utmi>;
+                                clock-names = "pclk", "hclk";
                                 status = "disabled";
 
                                 ep0 {
@@ -835,6 +1167,8 @@
                         interrupts = <23 IRQ_TYPE_LEVEL_HIGH 3>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_fb>;
+                        clocks = <&lcd_clk>, <&lcd_clk>;
+                        clock-names = "hclk", "lcdc_clk";
                         status = "disabled";
                 };
 
@@ -861,6 +1195,9 @@
                         compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                         reg = <0x00700000 0x100000>;
                         interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
+                        //TODO
+                        clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+                        clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
                         status = "disabled";
                 };
 
@@ -868,6 +1205,9 @@
                         compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                         reg = <0x00800000 0x100000>;
                         interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
+                        //TODO
+                        clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+                        clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";
                         status = "disabled";
                 };
         };
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 9f5b0a674995..96ccc7de4f0a 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -31,6 +31,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                      clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                      clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index b84bac5bada4..2bfac310dbec 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -50,16 +50,18 @@
                 reg = <0x20000000 0x10000000>;
         };
 
-        slow_xtal: slow_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+        clocks {
+                slow_xtal: slow_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
 
-        main_xtal: main_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
+                main_xtal: main_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 64bbe46e4f90..83d723711ae1 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -21,14 +21,6 @@
                 reg = <0x20000000 0x8000000>;
         };
 
-        slow_xtal {
-                clock-frequency = <32768>;
-        };
-
-        main_xtal {
-                clock-frequency = <16000000>;
-        };
-
         clocks {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -38,6 +30,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <16000000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <16000000>;
+                };
         };
 
         ahb {
@@ -56,6 +56,8 @@
                                 wm8904: codec@1a {
                                         compatible = "wm8904";
                                         reg = <0x1a>;
+                                        clocks = <&pck0>;
+                                        clock-names = "mclk";
                                 };
 
                                 qt1070: keyboard@1b {
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 1da183155eee..ab56c8b81dfa 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -50,19 +50,19 @@
                 reg = <0x20000000 0x04000000>;
         };
 
-        slow_xtal: slow_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+        clocks {
+                slow_xtal: slow_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
 
-        main_xtal: main_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+                main_xtal: main_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
 
-        clocks {
                 adc_op_clk: adc_op_clk{
                         compatible = "fixed-clock";
                         #clock-cells = <0>;
@@ -95,6 +95,7 @@
                               <0xffffe800 0x200>;
                         atmel,nand-addr-offset = <21>;
                         atmel,nand-cmd-offset = <22>;
+                        atmel,nand-has-dma;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_nand>;
                         gpios = <&pioD 17 GPIO_ACTIVE_HIGH>,
@@ -348,6 +349,15 @@
                                 };
                         };
 
+                        dma0: dma-controller@ffffe600 {
+                                compatible = "atmel,at91sam9rl-dma";
+                                reg = <0xffffe600 0x200>;
+                                interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
+                                #dma-cells = <2>;
+                                clocks = <&dma0_clk>;
+                                clock-names = "dma_clk";
+                        };
+
                         ramc0: ramc@ffffea00 {
                                 compatible = "atmel,at91sam9260-sdramc";
                                 reg = <0xffffea00 0x200>;
diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index d4a010e40fe3..9be5b540eebf 100644
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -20,15 +20,6 @@
                 reg = <0x20000000 0x4000000>;
         };
 
-
-        slow_xtal {
-                clock-frequency = <32768>;
-        };
-
-        main_xtal {
-                clock-frequency = <12000000>;
-        };
-
         clocks {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -38,6 +29,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 2c0d6ea3ab41..e1a5c70b885c 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -52,22 +52,24 @@
                 reg = <0x20000000 0x10000000>;
         };
 
-        slow_xtal: slow_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+        clocks {
+                slow_xtal: slow_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
 
-        main_xtal: main_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+                main_xtal: main_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
 
-        adc_op_clk: adc_op_clk{
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <5000000>;
+                adc_op_clk: adc_op_clk{
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <5000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi b/arch/arm/boot/dts/at91sam9x5cm.dtsi
index 8413e21192eb..229d6c24a9c4 100644
--- a/arch/arm/boot/dts/at91sam9x5cm.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi
@@ -23,12 +23,14 @@
                 };
         };
 
-        slow_xtal {
-                clock-frequency = <32768>;
-        };
+        clocks {
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
 
-        main_xtal {
-                clock-frequency = <12000000>;
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
index 6b05ae6d476f..2ddaa5136611 100644
--- a/arch/arm/boot/dts/bcm11351.dtsi
+++ b/arch/arm/boot/dts/bcm11351.dtsi
@@ -27,6 +27,25 @@
                 bootargs = "console=ttyS0,115200n8";
         };
 
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                enable-method = "brcm,bcm11351-cpu-method";
+                secondary-boot-reg = <0x3500417c>;
+
+                cpu0: cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        reg = <0>;
+                };
+
+                cpu1: cpu@1 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        reg = <1>;
+                };
+        };
+
         gic: interrupt-controller@3ff00100 {
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
diff --git a/arch/arm/boot/dts/bcm21664.dtsi b/arch/arm/boot/dts/bcm21664.dtsi
index 8b366822bb43..2016b72a8fb7 100644
--- a/arch/arm/boot/dts/bcm21664.dtsi
+++ b/arch/arm/boot/dts/bcm21664.dtsi
@@ -27,6 +27,25 @@
                 bootargs = "console=ttyS0,115200n8";
         };
 
+       cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                enable-method = "brcm,bcm11351-cpu-method";
+                secondary-boot-reg = <0x35004178>;
+
+                cpu0: cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        reg = <0>;
+                };
+
+                cpu1: cpu@1 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a9";
+                        reg = <1>;
+                };
+        };
+
         gic: interrupt-controller@3ff00100 {
                 compatible = "arm,cortex-a9-gic";
                 #interrupt-cells = <3>;
diff --git a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
new file mode 100644
index 000000000000..9eec2ac1112f
--- /dev/null
+++ b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
@@ -0,0 +1,14 @@
+/dts-v1/;
+#include "bcm7445.dtsi"
+
+/ {
+        model = "Broadcom STB (bcm7445), SVMB reference board";
+        compatible = "brcm,bcm7445", "brcm,brcmstb";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00 0x00000000 0x00 0x40000000>,
+                      <0x00 0x40000000 0x00 0x40000000>,
+                      <0x00 0x80000000 0x00 0x40000000>;
+        };
+};
diff --git a/arch/arm/boot/dts/bcm7445.dtsi b/arch/arm/boot/dts/bcm7445.dtsi
new file mode 100644
index 000000000000..0ca0f4e523d0
--- /dev/null
+++ b/arch/arm/boot/dts/bcm7445.dtsi
@@ -0,0 +1,111 @@
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+#include "skeleton.dtsi"
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <2>;
+        model = "Broadcom STB (bcm7445)";
+        compatible = "brcm,bcm7445", "brcm,brcmstb";
+        interrupt-parent = <&gic>;
+
+        chosen {
+                bootargs = "console=ttyS0,115200 earlyprintk";
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        compatible = "brcm,brahma-b15";
+                        device_type = "cpu";
+                        enable-method = "brcm,brahma-b15";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "brcm,brahma-b15";
+                        device_type = "cpu";
+                        enable-method = "brcm,brahma-b15";
+                        reg = <1>;
+                };
+
+                cpu@2 {
+                        compatible = "brcm,brahma-b15";
+                        device_type = "cpu";
+                        enable-method = "brcm,brahma-b15";
+                        reg = <2>;
+                };
+
+                cpu@3 {
+                        compatible = "brcm,brahma-b15";
+                        device_type = "cpu";
+                        enable-method = "brcm,brahma-b15";
+                        reg = <3>;
+                };
+        };
+
+        gic: interrupt-controller@ffd00000 {
+                compatible = "brcm,brahma-b15-gic", "arm,cortex-a15-gic";
+                reg = <0x00 0xffd01000 0x00 0x1000>,
+                      <0x00 0xffd02000 0x00 0x2000>,
+                      <0x00 0xffd04000 0x00 0x2000>,
+                      <0x00 0xffd06000 0x00 0x2000>;
+                interrupt-controller;
+                #interrupt-cells = <3>;
+        };
+
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(15) | IRQ_TYPE_LEVEL_LOW)>,
+                             <GIC_PPI 14 (GIC_CPU_MASK_RAW(15) | IRQ_TYPE_LEVEL_LOW)>,
+                             <GIC_PPI 11 (GIC_CPU_MASK_RAW(15) | IRQ_TYPE_LEVEL_LOW)>,
+                             <GIC_PPI 10 (GIC_CPU_MASK_RAW(15) | IRQ_TYPE_LEVEL_LOW)>;
+        };
+
+        rdb {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                ranges = <0 0x00 0xf0000000 0x1000000>;
+
+                serial@40ab00 {
+                        compatible = "ns16550a";
+                        reg = <0x40ab00 0x20>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+                        clock-frequency = <0x4d3f640>;
+                };
+
+                sun_top_ctrl: syscon@404000 {
+                        compatible = "brcm,bcm7445-sun-top-ctrl",
+                                     "syscon";
+                        reg = <0x404000 0x51c>;
+                };
+
+                hif_cpubiuctrl: syscon@3e2400 {
+                        compatible = "brcm,bcm7445-hif-cpubiuctrl",
+                                     "syscon";
+                        reg = <0x3e2400 0x5b4>;
+                };
+
+                hif_continuation: syscon@452000 {
+                        compatible = "brcm,bcm7445-hif-continuation",
+                                     "syscon";
+                        reg = <0x452000 0x100>;
+                };
+        };
+
+        smpboot {
+                compatible = "brcm,brcmstb-smpboot";
+                syscon-cpu = <&hif_cpubiuctrl 0x88 0x178>;
+                syscon-cont = <&hif_continuation>;
+        };
+
+        reboot {
+                compatible = "brcm,brcmstb-reboot";
+                syscon = <&sun_top_ctrl 0x304 0x308>;
+        };
+};
diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
index 2477dac4d643..9d7c810ebd0b 100644
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -22,6 +22,7 @@
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
+                enable-method = "marvell,berlin-smp";
 
                 cpu@0 {
                         compatible = "marvell,pj4b";
@@ -78,6 +79,11 @@
                         clocks = <&chip CLKID_TWD>;
                 };
 
+                cpu-ctrl@dd0000 {
+                        compatible = "marvell,berlin-cpu-ctrl";
+                        reg = <0xdd0000 0x10000>;
+                };
+
                 apb@e80000 {
                         compatible = "simple-bus";
                         #address-cells = <1>;
diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
index 995150f93795..a357ce02a64e 100644
--- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts
@@ -34,6 +34,14 @@
         status = "okay";
 };
 
+&i2c0 {
+        status = "okay";
+};
+
+&i2c2 {
+        status = "okay";
+};
+
 &uart0 {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 635a16a64cb4..400c40fceccc 100644
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -18,6 +18,7 @@
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
+                enable-method = "marvell,berlin-smp";
 
                 cpu@0 {
                         compatible = "arm,cortex-a9";
@@ -90,6 +91,8 @@
                         compatible = "arm,pl310-cache";
                         reg = <0xac0000 0x1000>;
                         cache-level = <2>;
+                        arm,data-latency = <2 2 2>;
+                        arm,tag-latency = <2 2 2>;
                 };
 
                 scu: snoop-control-unit@ad0000 {
@@ -111,6 +114,11 @@
                         #interrupt-cells = <3>;
                 };
 
+                cpu-ctrl@dd0000 {
+                        compatible = "marvell,berlin-cpu-ctrl";
+                        reg = <0xdd0000 0x10000>;
+                };
+
                 apb@e80000 {
                         compatible = "simple-bus";
                         #address-cells = <1>;
@@ -191,6 +199,32 @@
                                 };
                         };
 
+                        i2c0: i2c@1400 {
+                                compatible = "snps,designware-i2c";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <0x1400 0x100>;
+                                interrupt-parent = <&aic>;
+                                interrupts = <4>;
+                                clocks = <&chip CLKID_CFG>;
+                                pinctrl-0 = <&twsi0_pmux>;
+                                pinctrl-names = "default";
+                                status = "disabled";
+                        };
+
+                        i2c1: i2c@1800 {
+                                compatible = "snps,designware-i2c";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <0x1800 0x100>;
+                                interrupt-parent = <&aic>;
+                                interrupts = <5>;
+                                clocks = <&chip CLKID_CFG>;
+                                pinctrl-0 = <&twsi1_pmux>;
+                                pinctrl-names = "default";
+                                status = "disabled";
+                        };
+
                         timer0: timer@2c00 {
                                 compatible = "snps,dw-apb-timer";
                                 reg = <0x2c00 0x14>;
@@ -301,6 +335,16 @@
                         reg = <0xea0000 0x400>, <0xdd0170 0x10>;
                         clocks = <&refclk>;
                         clock-names = "refclk";
+
+                        twsi0_pmux: twsi0-pmux {
+                                groups = "G6";
+                                function = "twsi0";
+                        };
+
+                        twsi1_pmux: twsi1-pmux {
+                                groups = "G7";
+                                function = "twsi1";
+                        };
                 };
 
                 apb@fc0000 {
@@ -311,6 +355,32 @@
                         ranges = <0 0xfc0000 0x10000>;
                         interrupt-parent = <&sic>;
 
+                        i2c2: i2c@7000 {
+                                compatible = "snps,designware-i2c";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <0x7000 0x100>;
+                                interrupt-parent = <&sic>;
+                                interrupts = <6>;
+                                clocks = <&refclk>;
+                                pinctrl-0 = <&twsi2_pmux>;
+                                pinctrl-names = "default";
+                                status = "disabled";
+                        };
+
+                        i2c3: i2c@8000 {
+                                compatible = "snps,designware-i2c";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <0x8000 0x100>;
+                                interrupt-parent = <&sic>;
+                                interrupts = <7>;
+                                clocks = <&refclk>;
+                                pinctrl-0 = <&twsi3_pmux>;
+                                pinctrl-names = "default";
+                                status = "disabled";
+                        };
+
                         uart0: uart@9000 {
                                 compatible = "snps,dw-apb-uart";
                                 reg = <0x9000 0x100>;
@@ -348,6 +418,16 @@
                                         groups = "GSM14";
                                         function = "uart1";
                                 };
+
+                                twsi2_pmux: twsi2-pmux {
+                                        groups = "GSM13";
+                                        function = "twsi2";
+                                };
+
+                                twsi3_pmux: twsi3-pmux {
+                                        groups = "GSM14";
+                                        function = "twsi3";
+                                };
                         };
 
                         sic: interrupt-controller@e000 {
diff --git a/arch/arm/boot/dts/cros-ec-keyboard.dtsi b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
new file mode 100644
index 000000000000..9c7fb0acae79
--- /dev/null
+++ b/arch/arm/boot/dts/cros-ec-keyboard.dtsi
@@ -0,0 +1,105 @@
+/*
+ * Keyboard dts fragment for devices that use cros-ec-keyboard
+ *
+ * Copyright (c) 2014 Google, Inc
+ *
+ * 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 <dt-bindings/input/input.h>
+
+&cros_ec {
+        keyboard-controller {
+                compatible = "google,cros-ec-keyb";
+                keypad,num-rows = <8>;
+                keypad,num-columns = <13>;
+                google,needs-ghost-filter;
+
+                linux,keymap = <
+                        MATRIX_KEY(0x00, 0x01, KEY_LEFTMETA)
+                        MATRIX_KEY(0x00, 0x02, KEY_F1)
+                        MATRIX_KEY(0x00, 0x03, KEY_B)
+                        MATRIX_KEY(0x00, 0x04, KEY_F10)
+                        MATRIX_KEY(0x00, 0x06, KEY_N)
+                        MATRIX_KEY(0x00, 0x08, KEY_EQUAL)
+                        MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT)
+
+                        MATRIX_KEY(0x01, 0x01, KEY_ESC)
+                        MATRIX_KEY(0x01, 0x02, KEY_F4)
+                        MATRIX_KEY(0x01, 0x03, KEY_G)
+                        MATRIX_KEY(0x01, 0x04, KEY_F7)
+                        MATRIX_KEY(0x01, 0x06, KEY_H)
+                        MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE)
+                        MATRIX_KEY(0x01, 0x09, KEY_F9)
+                        MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE)
+
+                        MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL)
+                        MATRIX_KEY(0x02, 0x01, KEY_TAB)
+                        MATRIX_KEY(0x02, 0x02, KEY_F3)
+                        MATRIX_KEY(0x02, 0x03, KEY_T)
+                        MATRIX_KEY(0x02, 0x04, KEY_F6)
+                        MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE)
+                        MATRIX_KEY(0x02, 0x06, KEY_Y)
+                        MATRIX_KEY(0x02, 0x07, KEY_102ND)
+                        MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)
+                        MATRIX_KEY(0x02, 0x09, KEY_F8)
+
+                        MATRIX_KEY(0x03, 0x01, KEY_GRAVE)
+                        MATRIX_KEY(0x03, 0x02, KEY_F2)
+                        MATRIX_KEY(0x03, 0x03, KEY_5)
+                        MATRIX_KEY(0x03, 0x04, KEY_F5)
+                        MATRIX_KEY(0x03, 0x06, KEY_6)
+                        MATRIX_KEY(0x03, 0x08, KEY_MINUS)
+                        MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH)
+
+                        MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL)
+                        MATRIX_KEY(0x04, 0x01, KEY_A)
+                        MATRIX_KEY(0x04, 0x02, KEY_D)
+                        MATRIX_KEY(0x04, 0x03, KEY_F)
+                        MATRIX_KEY(0x04, 0x04, KEY_S)
+                        MATRIX_KEY(0x04, 0x05, KEY_K)
+                        MATRIX_KEY(0x04, 0x06, KEY_J)
+                        MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON)
+                        MATRIX_KEY(0x04, 0x09, KEY_L)
+                        MATRIX_KEY(0x04, 0x0a, KEY_BACKSLASH)
+                        MATRIX_KEY(0x04, 0x0b, KEY_ENTER)
+
+                        MATRIX_KEY(0x05, 0x01, KEY_Z)
+                        MATRIX_KEY(0x05, 0x02, KEY_C)
+                        MATRIX_KEY(0x05, 0x03, KEY_V)
+                        MATRIX_KEY(0x05, 0x04, KEY_X)
+                        MATRIX_KEY(0x05, 0x05, KEY_COMMA)
+                        MATRIX_KEY(0x05, 0x06, KEY_M)
+                        MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT)
+                        MATRIX_KEY(0x05, 0x08, KEY_SLASH)
+                        MATRIX_KEY(0x05, 0x09, KEY_DOT)
+                        MATRIX_KEY(0x05, 0x0b, KEY_SPACE)
+
+                        MATRIX_KEY(0x06, 0x01, KEY_1)
+                        MATRIX_KEY(0x06, 0x02, KEY_3)
+                        MATRIX_KEY(0x06, 0x03, KEY_4)
+                        MATRIX_KEY(0x06, 0x04, KEY_2)
+                        MATRIX_KEY(0x06, 0x05, KEY_8)
+                        MATRIX_KEY(0x06, 0x06, KEY_7)
+                        MATRIX_KEY(0x06, 0x08, KEY_0)
+                        MATRIX_KEY(0x06, 0x09, KEY_9)
+                        MATRIX_KEY(0x06, 0x0a, KEY_LEFTALT)
+                        MATRIX_KEY(0x06, 0x0b, KEY_DOWN)
+                        MATRIX_KEY(0x06, 0x0c, KEY_RIGHT)
+
+                        MATRIX_KEY(0x07, 0x01, KEY_Q)
+                        MATRIX_KEY(0x07, 0x02, KEY_E)
+                        MATRIX_KEY(0x07, 0x03, KEY_R)
+                        MATRIX_KEY(0x07, 0x04, KEY_W)
+                        MATRIX_KEY(0x07, 0x05, KEY_I)
+                        MATRIX_KEY(0x07, 0x06, KEY_U)
+                        MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT)
+                        MATRIX_KEY(0x07, 0x08, KEY_P)
+                        MATRIX_KEY(0x07, 0x09, KEY_O)
+                        MATRIX_KEY(0x07, 0x0b, KEY_UP)
+                        MATRIX_KEY(0x07, 0x0c, KEY_LEFT)
+                >;
+        };
+};
diff --git a/arch/arm/boot/dts/dove-cubox-es.dts b/arch/arm/boot/dts/dove-cubox-es.dts
new file mode 100644
index 000000000000..e28ef056dd17
--- /dev/null
+++ b/arch/arm/boot/dts/dove-cubox-es.dts
@@ -0,0 +1,12 @@
+#include "dove-cubox.dts"
+
+/ {
+        model = "SolidRun CuBox (Engineering Sample)";
+        compatible = "solidrun,cubox-es", "solidrun,cubox", "marvell,dove";
+};
+
+&sdio0 {
+        /* sdio0 card detect is connected to wrong pin on CuBox ES */
+        cd-gpios = <&gpio0 12 1>;
+        pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;
+};
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index 7a70f4ca502a..aae7efc09b0b 100644
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -111,9 +111,6 @@
 
 &sdio0 {
         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 {
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 3b891dd20993..a5441d5482a6 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -630,6 +630,20 @@
                                 reg = <0xe8400 0x0c>;
                                 ngpios = <8>;
                         };
+
+                        lcd1: lcd-controller@810000 {
+                                compatible = "marvell,dove-lcd";
+                                reg = <0x810000 0x1000>;
+                                interrupts = <46>;
+                                status = "disabled";
+                        };
+
+                        lcd0: lcd-controller@820000 {
+                                compatible = "marvell,dove-lcd";
+                                reg = <0x820000 0x1000>;
+                                interrupts = <47>;
+                                status = "disabled";
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 83089540e324..50f8022905a1 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -496,3 +496,11 @@
                 };
         };
 };
+
+&usb2_phy1 {
+        phy-supply = <&ldousb_reg>;
+};
+
+&usb2_phy2 {
+        phy-supply = <&ldousb_reg>;
+};
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 80127638b379..97f603c4483d 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -12,6 +12,9 @@
 
 #include "skeleton.dtsi"
 
+#define MAX_SOURCES 400
+#define DIRECT_IRQ(irq) (MAX_SOURCES + irq)
+
 / {
         #address-cells = <1>;
         #size-cells = <1>;
@@ -45,6 +48,7 @@
                 compatible = "arm,cortex-a15-gic";
                 interrupt-controller;
                 #interrupt-cells = <3>;
+                arm,routable-irqs = <192>;
                 reg = <0x48211000 0x1000>,
                       <0x48212000 0x1000>,
                       <0x48214000 0x2000>,
@@ -79,8 +83,8 @@
                 ti,hwmods = "l3_main_1", "l3_main_2";
                 reg = <0x44000000 0x1000000>,
                       <0x45000000 0x1000>;
-                interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
-                             <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI DIRECT_IRQ(10) IRQ_TYPE_LEVEL_HIGH>;
 
                 prm: prm@4ae06000 {
                         compatible = "ti,dra7-prm";
@@ -95,6 +99,75 @@
                         };
                 };
 
+                axi@0 {
+                        compatible = "simple-bus";
+                        #size-cells = <1>;
+                        #address-cells = <1>;
+                        ranges = <0x51000000 0x51000000 0x3000
+                                  0x0        0x20000000 0x10000000>;
+                        pcie@51000000 {
+                                compatible = "ti,dra7-pcie";
+                                reg = <0x51000000 0x2000>, <0x51002000 0x14c>, <0x1000 0x2000>;
+                                reg-names = "rc_dbics", "ti_conf", "config";
+                                interrupts = <0 232 0x4>, <0 233 0x4>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                device_type = "pci";
+                                ranges = <0x81000000 0 0          0x03000 0 0x00010000
+                                          0x82000000 0 0x20013000 0x13000 0 0xffed000>;
+                                #interrupt-cells = <1>;
+                                num-lanes = <1>;
+                                ti,hwmods = "pcie1";
+                                phys = <&pcie1_phy>;
+                                phy-names = "pcie-phy0";
+                                interrupt-map-mask = <0 0 0 7>;
+                                interrupt-map = <0 0 0 1 &pcie1_intc 1>,
+                                                <0 0 0 2 &pcie1_intc 2>,
+                                                <0 0 0 3 &pcie1_intc 3>,
+                                                <0 0 0 4 &pcie1_intc 4>;
+                                pcie1_intc: interrupt-controller {
+                                        interrupt-controller;
+                                        #address-cells = <0>;
+                                        #interrupt-cells = <1>;
+                                };
+                        };
+                };
+
+                axi@1 {
+                        compatible = "simple-bus";
+                        #size-cells = <1>;
+                        #address-cells = <1>;
+                        ranges = <0x51800000 0x51800000 0x3000
+                                  0x0        0x30000000 0x10000000>;
+                        status = "disabled";
+                        pcie@51000000 {
+                                compatible = "ti,dra7-pcie";
+                                reg = <0x51800000 0x2000>, <0x51802000 0x14c>, <0x1000 0x2000>;
+                                reg-names = "rc_dbics", "ti_conf", "config";
+                                interrupts = <0 355 0x4>, <0 356 0x4>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                device_type = "pci";
+                                ranges = <0x81000000 0 0          0x03000 0 0x00010000
+                                          0x82000000 0 0x30013000 0x13000 0 0xffed000>;
+                                #interrupt-cells = <1>;
+                                num-lanes = <1>;
+                                ti,hwmods = "pcie2";
+                                phys = <&pcie2_phy>;
+                                phy-names = "pcie-phy0";
+                                interrupt-map-mask = <0 0 0 7>;
+                                interrupt-map = <0 0 0 1 &pcie2_intc 1>,
+                                                <0 0 0 2 &pcie2_intc 2>,
+                                                <0 0 0 3 &pcie2_intc 3>,
+                                                <0 0 0 4 &pcie2_intc 4>;
+                                pcie2_intc: interrupt-controller {
+                                        interrupt-controller;
+                                        #address-cells = <0>;
+                                        #interrupt-cells = <1>;
+                                };
+                        };
+                };
+
                 cm_core_aon: cm_core_aon@4a005000 {
                         compatible = "ti,dra7-cm-core-aon";
                         reg = <0x4a005000 0x2000>;
@@ -155,10 +228,10 @@
                 sdma: dma-controller@4a056000 {
                         compatible = "ti,omap4430-sdma";
                         reg = <0x4a056000 0x1000>;
-                        interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
-                                     <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
                         #dma-cells = <1>;
                         #dma-channels = <32>;
                         #dma-requests = <127>;
@@ -167,7 +240,7 @@
                 gpio1: gpio@4ae10000 {
                         compatible = "ti,omap4-gpio";
                         reg = <0x4ae10000 0x200>;
-                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "gpio1";
                         gpio-controller;
                         #gpio-cells = <2>;
@@ -178,7 +251,7 @@
                 gpio2: gpio@48055000 {
                         compatible = "ti,omap4-gpio";
                         reg = <0x48055000 0x200>;
-                        interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "gpio2";
                         gpio-controller;
                         #gpio-cells = <2>;
@@ -189,7 +262,7 @@
                 gpio3: gpio@48057000 {
                         compatible = "ti,omap4-gpio";
                         reg = <0x48057000 0x200>;
-                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "gpio3";
                         gpio-controller;
                         #gpio-cells = <2>;
@@ -200,7 +273,7 @@
                 gpio4: gpio@48059000 {
                         compatible = "ti,omap4-gpio";
                         reg = <0x48059000 0x200>;
-                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "gpio4";
                         gpio-controller;
                         #gpio-cells = <2>;
@@ -211,7 +284,7 @@
                 gpio5: gpio@4805b000 {
                         compatible = "ti,omap4-gpio";
                         reg = <0x4805b000 0x200>;
-                        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "gpio5";
                         gpio-controller;
                         #gpio-cells = <2>;
@@ -222,7 +295,7 @@
                 gpio6: gpio@4805d000 {
                         compatible = "ti,omap4-gpio";
                         reg = <0x4805d000 0x200>;
-                        interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "gpio6";
                         gpio-controller;
                         #gpio-cells = <2>;
@@ -233,7 +306,7 @@
                 gpio7: gpio@48051000 {
                         compatible = "ti,omap4-gpio";
                         reg = <0x48051000 0x200>;
-                        interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "gpio7";
                         gpio-controller;
                         #gpio-cells = <2>;
@@ -244,7 +317,7 @@
                 gpio8: gpio@48053000 {
                         compatible = "ti,omap4-gpio";
                         reg = <0x48053000 0x200>;
-                        interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "gpio8";
                         gpio-controller;
                         #gpio-cells = <2>;
@@ -255,7 +328,7 @@
                 uart1: serial@4806a000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x4806a000 0x100>;
-                        interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart1";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -264,7 +337,7 @@
                 uart2: serial@4806c000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x4806c000 0x100>;
-                        interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart2";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -273,7 +346,7 @@
                 uart3: serial@48020000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48020000 0x100>;
-                        interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart3";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -282,7 +355,7 @@
                 uart4: serial@4806e000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x4806e000 0x100>;
-                        interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart4";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -291,7 +364,7 @@
                 uart5: serial@48066000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48066000 0x100>;
-                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart5";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -300,7 +373,7 @@
                 uart6: serial@48068000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48068000 0x100>;
-                        interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart6";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -309,6 +382,7 @@
                 uart7: serial@48420000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48420000 0x100>;
+                        interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart7";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -317,6 +391,7 @@
                 uart8: serial@48422000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48422000 0x100>;
+                        interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart8";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -325,6 +400,7 @@
                 uart9: serial@48424000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x48424000 0x100>;
+                        interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart9";
                         clock-frequency = <48000000>;
                         status = "disabled";
@@ -333,15 +409,133 @@
                 uart10: serial@4ae2b000 {
                         compatible = "ti,omap4-uart";
                         reg = <0x4ae2b000 0x100>;
+                        interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "uart10";
                         clock-frequency = <48000000>;
                         status = "disabled";
                 };
 
+                mailbox1: mailbox@4a0f4000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x4a0f4000 0x200>;
+                        ti,hwmods = "mailbox1";
+                        ti,mbox-num-users = <3>;
+                        ti,mbox-num-fifos = <8>;
+                        status = "disabled";
+                };
+
+                mailbox2: mailbox@4883a000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x4883a000 0x200>;
+                        ti,hwmods = "mailbox2";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox3: mailbox@4883c000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x4883c000 0x200>;
+                        ti,hwmods = "mailbox3";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox4: mailbox@4883e000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x4883e000 0x200>;
+                        ti,hwmods = "mailbox4";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox5: mailbox@48840000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x48840000 0x200>;
+                        ti,hwmods = "mailbox5";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox6: mailbox@48842000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x48842000 0x200>;
+                        ti,hwmods = "mailbox6";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox7: mailbox@48844000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x48844000 0x200>;
+                        ti,hwmods = "mailbox7";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox8: mailbox@48846000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x48846000 0x200>;
+                        ti,hwmods = "mailbox8";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox9: mailbox@4885e000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x4885e000 0x200>;
+                        ti,hwmods = "mailbox9";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox10: mailbox@48860000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x48860000 0x200>;
+                        ti,hwmods = "mailbox10";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox11: mailbox@48862000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x48862000 0x200>;
+                        ti,hwmods = "mailbox11";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox12: mailbox@48864000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x48864000 0x200>;
+                        ti,hwmods = "mailbox12";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
+                mailbox13: mailbox@48802000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x48802000 0x200>;
+                        ti,hwmods = "mailbox13";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <12>;
+                        status = "disabled";
+                };
+
                 timer1: timer@4ae18000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x4ae18000 0x80>;
-                        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer1";
                         ti,timer-alwon;
                 };
@@ -349,28 +543,28 @@
                 timer2: timer@48032000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48032000 0x80>;
-                        interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer2";
                 };
 
                 timer3: timer@48034000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48034000 0x80>;
-                        interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer3";
                 };
 
                 timer4: timer@48036000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48036000 0x80>;
-                        interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer4";
                 };
 
                 timer5: timer@48820000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48820000 0x80>;
-                        interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer5";
                         ti,timer-dsp;
                 };
@@ -378,7 +572,7 @@
                 timer6: timer@48822000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48822000 0x80>;
-                        interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer6";
                         ti,timer-dsp;
                         ti,timer-pwm;
@@ -387,7 +581,7 @@
                 timer7: timer@48824000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48824000 0x80>;
-                        interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer7";
                         ti,timer-dsp;
                 };
@@ -395,7 +589,7 @@
                 timer8: timer@48826000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48826000 0x80>;
-                        interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer8";
                         ti,timer-dsp;
                         ti,timer-pwm;
@@ -404,21 +598,21 @@
                 timer9: timer@4803e000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x4803e000 0x80>;
-                        interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer9";
                 };
 
                 timer10: timer@48086000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48086000 0x80>;
-                        interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer10";
                 };
 
                 timer11: timer@48088000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48088000 0x80>;
-                        interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer11";
                         ti,timer-pwm;
                 };
@@ -426,6 +620,7 @@
                 timer13: timer@48828000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x48828000 0x80>;
+                        interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer13";
                         status = "disabled";
                 };
@@ -433,6 +628,7 @@
                 timer14: timer@4882a000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x4882a000 0x80>;
+                        interrupts = <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer14";
                         status = "disabled";
                 };
@@ -440,6 +636,7 @@
                 timer15: timer@4882c000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x4882c000 0x80>;
+                        interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer15";
                         status = "disabled";
                 };
@@ -447,6 +644,7 @@
                 timer16: timer@4882e000 {
                         compatible = "ti,omap5430-timer";
                         reg = <0x4882e000 0x80>;
+                        interrupts = <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "timer16";
                         status = "disabled";
                 };
@@ -454,7 +652,7 @@
                 wdt2: wdt@4ae14000 {
                         compatible = "ti,omap4-wdt";
                         reg = <0x4ae14000 0x80>;
-                        interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "wd_timer2";
                 };
 
@@ -468,14 +666,14 @@
                 dmm@4e000000 {
                         compatible = "ti,omap5-dmm";
                         reg = <0x4e000000 0x800>;
-                        interrupts = <0 113 0x4>;
+                        interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "dmm";
                 };
 
                 i2c1: i2c@48070000 {
                         compatible = "ti,omap4-i2c";
                         reg = <0x48070000 0x100>;
-                        interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "i2c1";
@@ -485,7 +683,7 @@
                 i2c2: i2c@48072000 {
                         compatible = "ti,omap4-i2c";
                         reg = <0x48072000 0x100>;
-                        interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "i2c2";
@@ -495,7 +693,7 @@
                 i2c3: i2c@48060000 {
                         compatible = "ti,omap4-i2c";
                         reg = <0x48060000 0x100>;
-                        interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "i2c3";
@@ -505,7 +703,7 @@
                 i2c4: i2c@4807a000 {
                         compatible = "ti,omap4-i2c";
                         reg = <0x4807a000 0x100>;
-                        interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "i2c4";
@@ -515,7 +713,7 @@
                 i2c5: i2c@4807c000 {
                         compatible = "ti,omap4-i2c";
                         reg = <0x4807c000 0x100>;
-                        interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "i2c5";
@@ -525,7 +723,7 @@
                 mmc1: mmc@4809c000 {
                         compatible = "ti,omap4-hsmmc";
                         reg = <0x4809c000 0x400>;
-                        interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "mmc1";
                         ti,dual-volt;
                         ti,needs-special-reset;
@@ -538,7 +736,7 @@
                 mmc2: mmc@480b4000 {
                         compatible = "ti,omap4-hsmmc";
                         reg = <0x480b4000 0x400>;
-                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "mmc2";
                         ti,needs-special-reset;
                         dmas = <&sdma 47>, <&sdma 48>;
@@ -549,7 +747,7 @@
                 mmc3: mmc@480ad000 {
                         compatible = "ti,omap4-hsmmc";
                         reg = <0x480ad000 0x400>;
-                        interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "mmc3";
                         ti,needs-special-reset;
                         dmas = <&sdma 77>, <&sdma 78>;
@@ -560,7 +758,7 @@
                 mmc4: mmc@480d1000 {
                         compatible = "ti,omap4-hsmmc";
                         reg = <0x480d1000 0x400>;
-                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "mmc4";
                         ti,needs-special-reset;
                         dmas = <&sdma 57>, <&sdma 58>;
@@ -703,7 +901,7 @@
                 mcspi1: spi@48098000 {
                         compatible = "ti,omap4-mcspi";
                         reg = <0x48098000 0x200>;
-                        interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "mcspi1";
@@ -724,7 +922,7 @@
                 mcspi2: spi@4809a000 {
                         compatible = "ti,omap4-mcspi";
                         reg = <0x4809a000 0x200>;
-                        interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "mcspi2";
@@ -740,7 +938,7 @@
                 mcspi3: spi@480b8000 {
                         compatible = "ti,omap4-mcspi";
                         reg = <0x480b8000 0x200>;
-                        interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "mcspi3";
@@ -753,7 +951,7 @@
                 mcspi4: spi@480ba000 {
                         compatible = "ti,omap4-mcspi";
                         reg = <0x480ba000 0x200>;
-                        interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         ti,hwmods = "mcspi4";
@@ -773,6 +971,7 @@
                         clocks = <&qspi_gfclk_div>;
                         clock-names = "fck";
                         num-cs = <4>;
+                        interrupts = <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH>;
                         status = "disabled";
                 };
 
@@ -803,18 +1002,76 @@
                                 clock-names = "sysclk";
                                 #phy-cells = <0>;
                         };
+
+                        pcie1_phy: pciephy@4a094000 {
+                                compatible = "ti,phy-pipe3-pcie";
+                                reg = <0x4a094000 0x80>, /* phy_rx */
+                                      <0x4a094400 0x64>; /* phy_tx */
+                                reg-names = "phy_rx", "phy_tx";
+                                ctrl-module = <&omap_control_pcie1phy>;
+                                clocks = <&dpll_pcie_ref_ck>,
+                                         <&dpll_pcie_ref_m2ldo_ck>,
+                                         <&optfclk_pciephy1_32khz>,
+                                         <&optfclk_pciephy1_clk>,
+                                         <&optfclk_pciephy1_div_clk>,
+                                         <&optfclk_pciephy_div>;
+                                clock-names = "dpll_ref", "dpll_ref_m2",
+                                              "wkupclk", "refclk",
+                                              "div-clk", "phy-div";
+                                #phy-cells = <0>;
+                                id = <1>;
+                                ti,hwmods = "pcie1-phy";
+                        };
+
+                        pcie2_phy: pciephy@4a095000 {
+                                compatible = "ti,phy-pipe3-pcie";
+                                reg = <0x4a095000 0x80>, /* phy_rx */
+                                      <0x4a095400 0x64>; /* phy_tx */
+                                reg-names = "phy_rx", "phy_tx";
+                                ctrl-module = <&omap_control_pcie2phy>;
+                                clocks = <&dpll_pcie_ref_ck>,
+                                         <&dpll_pcie_ref_m2ldo_ck>,
+                                         <&optfclk_pciephy2_32khz>,
+                                         <&optfclk_pciephy2_clk>,
+                                         <&optfclk_pciephy2_div_clk>,
+                                         <&optfclk_pciephy_div>;
+                                clock-names = "dpll_ref", "dpll_ref_m2",
+                                              "wkupclk", "refclk",
+                                              "div-clk", "phy-div";
+                                #phy-cells = <0>;
+                                ti,hwmods = "pcie2-phy";
+                                id = <2>;
+                                status = "disabled";
+                        };
                 };
 
                 sata: sata@4a141100 {
                         compatible = "snps,dwc-ahci";
                         reg = <0x4a140000 0x1100>, <0x4a141100 0x7>;
-                        interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
                         phys = <&sata_phy>;
                         phy-names = "sata-phy";
                         clocks = <&sata_ref_clk>;
                         ti,hwmods = "sata";
                 };
 
+                omap_control_pcie1phy: control-phy@0x4a003c40 {
+                        compatible = "ti,control-phy-pcie";
+                        reg = <0x4a003c40 0x4>, <0x4a003c14 0x4>, <0x4a003c34 0x4>;
+                        reg-names = "power", "control_sma", "pcie_pcs";
+                        clocks = <&sys_clkin1>;
+                        clock-names = "sysclk";
+                };
+
+                omap_control_pcie2phy: control-pcie@0x4a003c44 {
+                        compatible = "ti,control-phy-pcie";
+                        reg = <0x4a003c44 0x4>, <0x4a003c14 0x4>, <0x4a003c34 0x4>;
+                        reg-names = "power", "control_sma", "pcie_pcs";
+                        clocks = <&sys_clkin1>;
+                        clock-names = "sysclk";
+                        status = "disabled";
+                };
+
                 omap_control_usb2phy1: control-phy@4a002300 {
                         compatible = "ti,control-phy-usb2";
                         reg = <0x4a002300 0x4>;
@@ -885,7 +1142,7 @@
                         compatible = "ti,dwc3";
                         ti,hwmods = "usb_otg_ss1";
                         reg = <0x48880000 0x10000>;
-                        interrupts = <0 77 4>;
+                        interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <1>;
                         utmi-mode = <2>;
@@ -893,7 +1150,7 @@
                         usb1: usb@48890000 {
                                 compatible = "snps,dwc3";
                                 reg = <0x48890000 0x17000>;
-                                interrupts = <0 76 4>;
+                                interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
                                 phys = <&usb2_phy1>, <&usb3_phy1>;
                                 phy-names = "usb2-phy", "usb3-phy";
                                 tx-fifo-resize;
@@ -906,7 +1163,7 @@
                         compatible = "ti,dwc3";
                         ti,hwmods = "usb_otg_ss2";
                         reg = <0x488c0000 0x10000>;
-                        interrupts = <0 92 4>;
+                        interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <1>;
                         utmi-mode = <2>;
@@ -914,7 +1171,7 @@
                         usb2: usb@488d0000 {
                                 compatible = "snps,dwc3";
                                 reg = <0x488d0000 0x17000>;
-                                interrupts = <0 78 4>;
+                                interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
                                 phys = <&usb2_phy2>;
                                 phy-names = "usb2-phy";
                                 tx-fifo-resize;
@@ -928,7 +1185,7 @@
                         compatible = "ti,dwc3";
                         ti,hwmods = "usb_otg_ss3";
                         reg = <0x48900000 0x10000>;
-                /*      interrupts = <0 TBD 4>; */
+                        interrupts = <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <1>;
                         utmi-mode = <2>;
@@ -937,7 +1194,7 @@
                         usb3: usb@48910000 {
                                 compatible = "snps,dwc3";
                                 reg = <0x48910000 0x17000>;
-                /*              interrupts = <0 93 4>; */
+                                interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
                                 tx-fifo-resize;
                                 maximum-speed = "high-speed";
                                 dr_mode = "otg";
@@ -948,7 +1205,7 @@
                         compatible = "ti,dwc3";
                         ti,hwmods = "usb_otg_ss4";
                         reg = <0x48940000 0x10000>;
-                /*      interrupts = <0 TBD 4>; */
+                        interrupts = <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <1>;
                         utmi-mode = <2>;
@@ -957,7 +1214,7 @@
                         usb4: usb@48950000 {
                                 compatible = "snps,dwc3";
                                 reg = <0x48950000 0x17000>;
-                /*              interrupts = <0 TBD 4>; */
+                                interrupts = <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>;
                                 tx-fifo-resize;
                                 maximum-speed = "high-speed";
                                 dr_mode = "otg";
@@ -967,7 +1224,7 @@
                 elm: elm@48078000 {
                         compatible = "ti,am3352-elm";
                         reg = <0x48078000 0xfc0>;      /* device IO registers */
-                        interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "elm";
                         status = "disabled";
                 };
@@ -976,7 +1233,7 @@
                         compatible = "ti,am3352-gpmc";
                         ti,hwmods = "gpmc";
                         reg = <0x50000000 0x37c>;      /* device IO registers */
-                        interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
                         gpmc,num-cs = <8>;
                         gpmc,num-waitpins = <2>;
                         #address-cells = <2>;
@@ -994,6 +1251,17 @@
                         clock-names = "fck";
                         status = "disabled";
                 };
+
+                crossbar_mpu: crossbar@4a020000 {
+                        compatible = "ti,irq-crossbar";
+                        reg = <0x4a002a48 0x130>;
+                        ti,max-irqs = <160>;
+                        ti,max-crossbar-sources = <MAX_SOURCES>;
+                        ti,reg-size = <2>;
+                        ti,irqs-reserved = <0 1 2 3 5 6 131 132>;
+                        ti,irqs-skip = <10 133 139 140>;
+                        ti,irqs-safe-map = <0>;
+                };
         };
 };
 
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index dc7a292fe939..2c05b3f017fa 100644
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -1154,7 +1154,7 @@
 
         apll_pcie_in_clk_mux: apll_pcie_in_clk_mux@4ae06118 {
                 compatible = "ti,mux-clock";
-                clocks = <&dpll_pcie_ref_ck>, <&pciesref_acs_clk_ck>;
+                clocks = <&dpll_pcie_ref_m2ldo_ck>, <&pciesref_acs_clk_ck>;
                 #clock-cells = <0>;
                 reg = <0x021c 0x4>;
                 ti,bit-shift = <7>;
@@ -1167,16 +1167,33 @@
                 reg = <0x021c>, <0x0220>;
         };
 
+        optfclk_pciephy1_32khz: optfclk_pciephy1_32khz@4a0093b0 {
+                compatible = "ti,gate-clock";
+                clocks = <&sys_32k_ck>;
+                #clock-cells = <0>;
+                reg = <0x13b0>;
+                ti,bit-shift = <8>;
+        };
+
+        optfclk_pciephy2_32khz: optfclk_pciephy2_32khz@4a0093b8 {
+                compatible = "ti,gate-clock";
+                clocks = <&sys_32k_ck>;
+                #clock-cells = <0>;
+                reg = <0x13b8>;
+                ti,bit-shift = <8>;
+        };
+
         optfclk_pciephy_div: optfclk_pciephy_div@4a00821c {
                 compatible = "ti,divider-clock";
                 clocks = <&apll_pcie_ck>;
                 #clock-cells = <0>;
                 reg = <0x021c>;
+                ti,dividers = <2>, <1>;
                 ti,bit-shift = <8>;
                 ti,max-div = <2>;
         };
 
-        optfclk_pciephy_clk: optfclk_pciephy_clk@4a0093b0 {
+        optfclk_pciephy1_clk: optfclk_pciephy1_clk@4a0093b0 {
                 compatible = "ti,gate-clock";
                 clocks = <&apll_pcie_ck>;
                 #clock-cells = <0>;
@@ -1184,7 +1201,15 @@
                 ti,bit-shift = <9>;
         };
 
-        optfclk_pciephy_div_clk: optfclk_pciephy_div_clk@4a0093b0 {
+        optfclk_pciephy2_clk: optfclk_pciephy2_clk@4a0093b8 {
+                compatible = "ti,gate-clock";
+                clocks = <&apll_pcie_ck>;
+                #clock-cells = <0>;
+                reg = <0x13b8>;
+                ti,bit-shift = <9>;
+        };
+
+        optfclk_pciephy1_div_clk: optfclk_pciephy1_div_clk@4a0093b0 {
                 compatible = "ti,gate-clock";
                 clocks = <&optfclk_pciephy_div>;
                 #clock-cells = <0>;
@@ -1192,6 +1217,14 @@
                 ti,bit-shift = <10>;
         };
 
+        optfclk_pciephy2_div_clk: optfclk_pciephy2_div_clk@4a0093b8 {
+                compatible = "ti,gate-clock";
+                clocks = <&optfclk_pciephy_div>;
+                #clock-cells = <0>;
+                reg = <0x13b8>;
+                ti,bit-shift = <10>;
+        };
+
         apll_pcie_clkvcoldo: apll_pcie_clkvcoldo {
                 #clock-cells = <0>;
                 compatible = "fixed-factor-clock";
diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi
index e37985fa10e2..00eeed3721b6 100644
--- a/arch/arm/boot/dts/emev2.dtsi
+++ b/arch/arm/boot/dts/emev2.dtsi
@@ -31,11 +31,13 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a9";
                         reg = <0>;
+                        clock-frequency = <533000000>;
                 };
                 cpu@1 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a9";
                         reg = <1>;
+                        clock-frequency = <533000000>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/ethernut5.dts b/arch/arm/boot/dts/ethernut5.dts
index 143b6d25bc80..8f941c2db7c6 100644
--- a/arch/arm/boot/dts/ethernut5.dts
+++ b/arch/arm/boot/dts/ethernut5.dts
@@ -20,6 +20,16 @@
                 reg = <0x20000000 0x08000000>;
         };
 
+        clocks {
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <18432000>;
+                };
+        };
+
         ahb {
                 apb {
                         dbgu: serial@fffff200 {
diff --git a/arch/arm/boot/dts/evk-pro3.dts b/arch/arm/boot/dts/evk-pro3.dts
index 4d829685fdfb..f72969efe6d7 100644
--- a/arch/arm/boot/dts/evk-pro3.dts
+++ b/arch/arm/boot/dts/evk-pro3.dts
@@ -15,6 +15,12 @@
         model = "Telit EVK-PRO3 for Telit GE863-PRO3";
         compatible = "telit,evk-pro3", "atmel,at91sam9260", "atmel,at91sam9";
 
+        clocks {
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+        };
+
         ahb {
                 apb {
                         macb0: ethernet@fffc4000 {
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 3e678fa335bf..1d52de6370d5 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -39,6 +39,8 @@
                 i2c5 = &i2c_5;
                 i2c6 = &i2c_6;
                 i2c7 = &i2c_7;
+                serial0 = &serial_0;
+                serial1 = &serial_1;
         };
 
         cpus {
@@ -168,6 +170,15 @@
                         status = "disabled";
                 };
 
+                tmu: tmu@100C0000 {
+                        compatible = "samsung,exynos3250-tmu";
+                        reg = <0x100C0000 0x100>;
+                        interrupts = <0 216 0>;
+                        clocks = <&cmu CLK_TMU_APBIF>;
+                        clock-names = "tmu_apbif";
+                        status = "disabled";
+                };
+
                 gic: interrupt-controller@10481000 {
                         compatible = "arm,cortex-a15-gic";
                         #interrupt-cells = <3>;
@@ -195,7 +206,6 @@
 
                         wakeup-interrupt-controller {
                                 compatible = "samsung,exynos4210-wakeup-eint";
-                                interrupt-parent = <&gic>;
                                 interrupts = <0 48 0>;
                         };
                 };
@@ -234,7 +244,6 @@
                         compatible = "arm,amba-bus";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        interrupt-parent = <&gic>;
                         ranges;
 
                         pdma0: pdma@12680000 {
@@ -261,10 +270,11 @@
                 };
 
                 adc: adc@126C0000 {
-                        compatible = "samsung,exynos-adc-v3";
+                        compatible = "samsung,exynos3250-adc",
+                                     "samsung,exynos-adc-v2";
                         reg = <0x126C0000 0x100>, <0x10020718 0x4>;
                         interrupts = <0 137 0>;
-                        clock-names = "adc", "sclk_tsadc";
+                        clock-names = "adc", "sclk";
                         clocks = <&cmu CLK_TSADC>, <&cmu CLK_SCLK_TSADC>;
                         #io-channel-cells = <1>;
                         io-channel-ranges;
@@ -277,6 +287,8 @@
                         interrupts = <0 109 0>;
                         clocks = <&cmu CLK_UART0>, <&cmu CLK_SCLK_UART0>;
                         clock-names = "uart", "clk_uart_baud0";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart0_data &uart0_fctl>;
                         status = "disabled";
                 };
 
@@ -286,6 +298,8 @@
                         interrupts = <0 110 0>;
                         clocks = <&cmu CLK_UART1>, <&cmu CLK_SCLK_UART1>;
                         clock-names = "uart", "clk_uart_baud0";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart1_data>;
                         status = "disabled";
                 };
 
@@ -425,6 +439,19 @@
                         status = "disabled";
                 };
 
+                i2s2: i2s@13970000 {
+                        compatible = "samsung,s3c6410-i2s";
+                        reg = <0x13970000 0x100>;
+                        interrupts = <0 126 0>;
+                        clocks = <&cmu CLK_I2S>, <&cmu CLK_SCLK_I2S>;
+                        clock-names = "iis", "i2s_opclk0";
+                        dmas = <&pdma0 14>, <&pdma0 13>;
+                        dma-names = "tx", "rx";
+                        pinctrl-0 = <&i2s2_bus>;
+                        pinctrl-names = "default";
+                        status = "disabled";
+                };
+
                 pwm: pwm@139D0000 {
                         compatible = "samsung,exynos4210-pwm";
                         reg = <0x139D0000 0x1000>;
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 17b22e9cc2aa..e0278ecbc816 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -44,6 +44,10 @@
                 fimc1 = &fimc_1;
                 fimc2 = &fimc_2;
                 fimc3 = &fimc_3;
+                serial0 = &serial_0;
+                serial1 = &serial_1;
+                serial2 = &serial_2;
+                serial3 = &serial_3;
         };
 
         clock_audss: clock-controller@03810000 {
@@ -123,6 +127,12 @@
                 reg = <0x10440000 0x1000>;
         };
 
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupt-parent = <&combiner>;
+                interrupts = <2 2>, <3 2>;
+        };
+
         sys_reg: syscon@10010000 {
                 compatible = "samsung,exynos4-sysreg", "syscon";
                 reg = <0x10010000 0x400>;
@@ -322,6 +332,23 @@
                 clocks = <&clock CLK_USB_HOST>;
                 clock-names = "usbhost";
                 status = "disabled";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                port@0 {
+                    reg = <0>;
+                    phys = <&exynos_usbphy 1>;
+                    status = "disabled";
+                };
+                port@1 {
+                    reg = <1>;
+                    phys = <&exynos_usbphy 2>;
+                    status = "disabled";
+                };
+                port@2 {
+                    reg = <2>;
+                    phys = <&exynos_usbphy 3>;
+                    status = "disabled";
+                };
         };
 
         ohci@12590000 {
@@ -331,6 +358,13 @@
                 clocks = <&clock CLK_USB_HOST>;
                 clock-names = "usbhost";
                 status = "disabled";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                port@0 {
+                    reg = <0>;
+                    phys = <&exynos_usbphy 1>;
+                    status = "disabled";
+                };
         };
 
         i2s1: i2s@13960000 {
@@ -363,7 +397,7 @@
                 status = "disabled";
         };
 
-        serial@13800000 {
+        serial_0: serial@13800000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13800000 0x100>;
                 interrupts = <0 52 0>;
@@ -372,7 +406,7 @@
                 status = "disabled";
         };
 
-        serial@13810000 {
+        serial_1: serial@13810000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13810000 0x100>;
                 interrupts = <0 53 0>;
@@ -381,7 +415,7 @@
                 status = "disabled";
         };
 
-        serial@13820000 {
+        serial_2: serial@13820000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13820000 0x100>;
                 interrupts = <0 54 0>;
@@ -390,7 +424,7 @@
                 status = "disabled";
         };
 
-        serial@13830000 {
+        serial_3: serial@13830000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x13830000 0x100>;
                 interrupts = <0 55 0>;
@@ -608,6 +642,7 @@
                 clocks = <&clock CLK_SCLK_FIMD0>, <&clock CLK_FIMD0>;
                 clock-names = "sclk_fimd", "fimd";
                 samsung,power-domain = <&pd_lcd0>;
+                samsung,sysreg = <&sys_reg>;
                 status = "disabled";
         };
 };
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 636d16684750..676e6e0c8cf3 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -168,6 +168,7 @@
         };
 
         spi_2: spi@13940000 {
+                cs-gpios = <&gpc1 2 0>;
                 status = "okay";
 
                 w25x80@0 {
@@ -178,7 +179,6 @@
                         spi-max-frequency = <1000000>;
 
                         controller-data {
-                                cs-gpio = <&gpc1 2 0>;
                                 samsung,spi-feedback-delay = <0>;
                         };
 
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 97ea7a9b1f62..807bb5bf91fc 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -103,12 +103,6 @@
                 #clock-cells = <1>;
         };
 
-        pmu {
-                compatible = "arm,cortex-a9-pmu";
-                interrupt-parent = <&combiner>;
-                interrupts = <2 2>, <3 2>;
-        };
-
         pinctrl_0: pinctrl@11400000 {
                 compatible = "samsung,exynos4210-pinctrl";
                 reg = <0x11400000 0x1000>;
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
new file mode 100644
index 000000000000..6d6d23c83d30
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -0,0 +1,371 @@
+/*
+ * Common definition for Hardkernel's Exynos4412 based ODROID-X/X2/U2/U3 boards
+ * device tree source
+ *
+ * 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 <dt-bindings/input/input.h>
+#include "exynos4412.dtsi"
+
+/ {
+        firmware@0204F000 {
+                compatible = "samsung,secure-firmware";
+                reg = <0x0204F000 0x1000>;
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                pinctrl-names = "default";
+                pinctrl-0 = <&gpio_power_key>;
+
+                power_key {
+                        interrupt-parent = <&gpx1>;
+                        interrupts = <3 0>;
+                        gpios = <&gpx1 3 1>;
+                        linux,code = <KEY_POWER>;
+                        label = "power key";
+                        debounce-interval = <10>;
+                        gpio-key,wakeup;
+                };
+        };
+
+        i2s0: i2s@03830000 {
+                pinctrl-0 = <&i2s0_bus>;
+                pinctrl-names = "default";
+                status = "okay";
+                clocks = <&clock_audss EXYNOS_I2S_BUS>,
+                         <&clock_audss EXYNOS_DOUT_AUD_BUS>;
+                clock-names = "iis", "i2s_opclk0";
+        };
+
+        sound: sound {
+                compatible = "samsung,odroidx2-audio";
+                samsung,i2s-controller = <&i2s0>;
+                samsung,audio-codec = <&max98090>;
+        };
+
+        mmc@12550000 {
+                pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
+                pinctrl-names = "default";
+                vmmc-supply = <&ldo20_reg &buck8_reg>;
+                status = "okay";
+
+                num-slots = <1>;
+                supports-highspeed;
+                broken-cd;
+                card-detect-delay = <200>;
+                samsung,dw-mshc-ciu-div = <3>;
+                samsung,dw-mshc-sdr-timing = <2 3>;
+                samsung,dw-mshc-ddr-timing = <1 2>;
+
+                slot@0 {
+                        reg = <0>;
+                        bus-width = <8>;
+                };
+        };
+
+        watchdog@10060000 {
+                status = "okay";
+        };
+
+        rtc@10070000 {
+                status = "okay";
+        };
+
+        g2d@10800000 {
+                status = "okay";
+        };
+
+        camera {
+                status = "okay";
+                pinctrl-names = "default";
+                pinctrl-0 = <>;
+
+                fimc_0: fimc@11800000 {
+                        status = "okay";
+                };
+
+                fimc_1: fimc@11810000 {
+                        status = "okay";
+                };
+
+                fimc_2: fimc@11820000 {
+                        status = "okay";
+                };
+
+                fimc_3: fimc@11830000 {
+                        status = "okay";
+                };
+        };
+
+        sdhci@12530000 {
+                bus-width = <4>;
+                pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
+                pinctrl-names = "default";
+                vmmc-supply = <&ldo4_reg &ldo21_reg>;
+                cd-gpios = <&gpk2 2 0>;
+                cd-inverted;
+                status = "okay";
+        };
+
+        serial@13800000 {
+                status = "okay";
+        };
+
+        serial@13810000 {
+                status = "okay";
+        };
+
+        fixed-rate-clocks {
+                xxti {
+                        compatible = "samsung,clock-xxti";
+                        clock-frequency = <0>;
+                };
+
+                xusbxti {
+                        compatible = "samsung,clock-xusbxti";
+                        clock-frequency = <24000000>;
+                };
+        };
+
+        i2c@13860000 {
+                pinctrl-0 = <&i2c0_bus>;
+                pinctrl-names = "default";
+                status = "okay";
+
+                usb3503: usb3503@08 {
+                        compatible = "smsc,usb3503";
+                        reg = <0x08>;
+
+                        intn-gpios = <&gpx3 0 0>;
+                        connect-gpios = <&gpx3 4 0>;
+                        reset-gpios = <&gpx3 5 0>;
+                        initial-mode = <1>;
+                };
+
+                max77686: pmic@09 {
+                        compatible = "maxim,max77686";
+                        reg = <0x09>;
+                        #clock-cells = <1>;
+
+                        voltage-regulators {
+                                ldo1_reg: LDO1 {
+                                        regulator-name = "VDD_ALIVE_1.0V";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo2_reg: LDO2 {
+                                        regulator-name = "VDDQ_M1_2_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo3_reg: LDO3 {
+                                        regulator-name = "VDDQ_EXT_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo4_reg: LDO4 {
+                                        regulator-name = "VDDQ_MMC2_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo5_reg: LDO5 {
+                                        regulator-name = "VDDQ_MMC1_3_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo6_reg: LDO6 {
+                                        regulator-name = "VDD10_MPLL_1.0V";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo7_reg: LDO7 {
+                                        regulator-name = "VDD10_XPLL_1.0V";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo11_reg: LDO11 {
+                                        regulator-name = "VDD18_ABB1_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo12_reg: LDO12 {
+                                        regulator-name = "VDD33_USB_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo13_reg: LDO13 {
+                                        regulator-name = "VDDQ_C2C_W_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo14_reg: LDO14 {
+                                        regulator-name = "VDD18_ABB0_2_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo15_reg: LDO15 {
+                                        regulator-name = "VDD10_HSIC_1.0V";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo16_reg: LDO16 {
+                                        regulator-name = "VDD18_HSIC_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo20_reg: LDO20 {
+                                        regulator-name = "LDO20_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-boot-on;
+                                };
+
+                                ldo21_reg: LDO21 {
+                                        regulator-name = "LDO21_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo25_reg: LDO25 {
+                                        regulator-name = "VDDQ_LCD_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck1_reg: BUCK1 {
+                                        regulator-name = "vdd_mif";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck2_reg: BUCK2 {
+                                        regulator-name = "vdd_arm";
+                                        regulator-min-microvolt = <900000>;
+                                        regulator-max-microvolt = <1350000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck3_reg: BUCK3 {
+                                        regulator-name = "vdd_int";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck4_reg: BUCK4 {
+                                        regulator-name = "vdd_g3d";
+                                        regulator-min-microvolt = <900000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-microvolt-offset = <50000>;
+                                };
+
+                                buck5_reg: BUCK5 {
+                                        regulator-name = "VDDQ_CKEM1_2_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck6_reg: BUCK6 {
+                                        regulator-name = "BUCK6_1.35V";
+                                        regulator-min-microvolt = <1350000>;
+                                        regulator-max-microvolt = <1350000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                buck7_reg: BUCK7 {
+                                        regulator-name = "BUCK7_2.0V";
+                                        regulator-min-microvolt = <2000000>;
+                                        regulator-max-microvolt = <2000000>;
+                                        regulator-always-on;
+                                };
+
+                                buck8_reg: BUCK8 {
+                                        regulator-name = "BUCK8_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+                        };
+                };
+        };
+
+        i2c@13870000 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2c1_bus>;
+                status = "okay";
+                max98090: max98090@10 {
+                        compatible = "maxim,max98090";
+                        reg = <0x10>;
+                        interrupt-parent = <&gpx0>;
+                        interrupts = <0 0>;
+                };
+        };
+
+        exynos-usbphy@125B0000 {
+                status = "okay";
+        };
+
+        hsotg@12480000 {
+                status = "okay";
+                vusb_d-supply = <&ldo15_reg>;
+                vusb_a-supply = <&ldo12_reg>;
+        };
+
+        ehci: ehci@12580000 {
+                status = "okay";
+        };
+};
+
+&pinctrl_1 {
+        gpio_power_key: power_key {
+                samsung,pins = "gpx1-3";
+                samsung,pin-pud = <0>;
+        };
+};
diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts
new file mode 100644
index 000000000000..c8a64be55d07
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts
@@ -0,0 +1,61 @@
+/*
+ * Hardkernel's Exynos4412 based ODROID-U3 board device tree source
+ *
+ * Copyright (c) 2014 Marek Szyprowski <m.szyprowski@samsung.com>
+ *
+ * Device tree source file for Hardkernel's ODROID-U3 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-odroid-common.dtsi"
+
+/ {
+        model = "Hardkernel ODROID-U3 board based on Exynos4412";
+        compatible = "hardkernel,odroid-u3", "samsung,exynos4412", "samsung,exynos4";
+
+        memory {
+                reg = <0x40000000 0x7FF00000>;
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                led1 {
+                        label = "led1:heart";
+                        gpios = <&gpc1 0 1>;
+                        default-state = "on";
+                        linux,default-trigger = "heartbeat";
+                };
+        };
+};
+
+&usb3503 {
+        clock-names = "refclk";
+        clocks = <&pmu_system_controller 0>;
+        refclk-frequency = <24000000>;
+};
+
+&ehci {
+        port@1 {
+                status = "okay";
+        };
+        port@2 {
+                status = "okay";
+        };
+};
+
+&sound {
+        compatible = "samsung,odroidu3-audio";
+        samsung,model = "Odroid-U3";
+        samsung,audio-routing =
+                "Headphone Jack", "HPL",
+                "Headphone Jack", "HPR",
+                "Headphone Jack", "MICBIAS",
+                "IN1", "Headphone Jack",
+                "Speakers", "SPKL",
+                "Speakers", "SPKR";
+};
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 31db28a4bb33..cb1cfe7239c4 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -3,8 +3,8 @@
  *
  * Copyright (c) 2012 Dongjin Kim <tobetter@gmail.com>
  *
- * Device tree source file for Hardkernel's ODROID-X board which is based on
- * Samsung's Exynos4412 SoC.
+ * Device tree source file for Hardkernel's ODROID-X 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
@@ -12,14 +12,14 @@
 */
 
 /dts-v1/;
-#include "exynos4412.dtsi"
+#include "exynos4412-odroid-common.dtsi"
 
 / {
         model = "Hardkernel ODROID-X board based on Exynos4412";
         compatible = "hardkernel,odroid-x", "samsung,exynos4412", "samsung,exynos4";
 
         memory {
-                reg = <0x40000000 0x40000000>;
+                reg = <0x40000000 0x3FF00000>;
         };
 
         leds {
@@ -38,23 +38,25 @@
                 };
         };
 
-        mmc@12550000 {
-                pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
-                pinctrl-names = "default";
-                vmmc-supply = <&ldo20_reg &buck8_reg>;
+        serial@13820000 {
                 status = "okay";
+        };
 
-                num-slots = <1>;
-                supports-highspeed;
-                broken-cd;
-                card-detect-delay = <200>;
-                samsung,dw-mshc-ciu-div = <3>;
-                samsung,dw-mshc-sdr-timing = <2 3>;
-                samsung,dw-mshc-ddr-timing = <1 2>;
+        serial@13830000 {
+                status = "okay";
+        };
 
-                slot@0 {
-                        reg = <0>;
-                        bus-width = <8>;
+        gpio_keys {
+                pinctrl-0 = <&gpio_power_key &gpio_home_key>;
+
+                home_key {
+                        interrupt-parent = <&gpx2>;
+                        interrupts = <2 0>;
+                        gpios = <&gpx2 2 0>;
+                        linux,code = <KEY_HOME>;
+                        label = "home key";
+                        debounce-interval = <10>;
+                        gpio-key,wakeup;
                 };
         };
 
@@ -65,242 +67,19 @@
                 regulator-max-microvolt = <3300000>;
                 gpio = <&gpa1 1 1>;
                 enable-active-high;
-                regulator-boot-on;
-        };
-
-        rtc@10070000 {
-                status = "okay";
-        };
-
-        sdhci@12530000 {
-                bus-width = <4>;
-                pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
-                pinctrl-names = "default";
-                vmmc-supply = <&ldo4_reg &ldo21_reg>;
-                status = "okay";
-        };
-
-        serial@13800000 {
-                status = "okay";
-        };
-
-        serial@13810000 {
-                status = "okay";
-        };
-
-        serial@13820000 {
-                status = "okay";
+                regulator-always-on;
         };
+};
 
-        serial@13830000 {
+&ehci {
+        port@1 {
                 status = "okay";
         };
+};
 
-        fixed-rate-clocks {
-                xxti {
-                        compatible = "samsung,clock-xxti";
-                        clock-frequency = <0>;
-                };
-
-                xusbxti {
-                        compatible = "samsung,clock-xusbxti";
-                        clock-frequency = <24000000>;
-                };
-        };
-
-        i2c@13860000 {
-                pinctrl-0 = <&i2c0_bus>;
-                pinctrl-names = "default";
-                status = "okay";
-
-                max77686: pmic@09 {
-                        compatible = "maxim,max77686";
-                        reg = <0x09>;
-                        #clock-cells = <1>;
-
-                        voltage-regulators {
-                                ldo1_reg: LDO1 {
-                                        regulator-name = "VDD_ALIVE_1.0V";
-                                        regulator-min-microvolt = <1000000>;
-                                        regulator-max-microvolt = <1000000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo2_reg: LDO2 {
-                                        regulator-name = "VDDQ_M1_2_1.8V";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo3_reg: LDO3 {
-                                        regulator-name = "VDDQ_EXT_1.8V";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo4_reg: LDO4 {
-                                        regulator-name = "VDDQ_MMC2_2.8V";
-                                        regulator-min-microvolt = <2800000>;
-                                        regulator-max-microvolt = <2800000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                ldo5_reg: LDO5 {
-                                        regulator-name = "VDDQ_MMC1_3_1.8V";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                ldo6_reg: LDO6 {
-                                        regulator-name = "VDD10_MPLL_1.0V";
-                                        regulator-min-microvolt = <1000000>;
-                                        regulator-max-microvolt = <1000000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo7_reg: LDO7 {
-                                        regulator-name = "VDD10_XPLL_1.0V";
-                                        regulator-min-microvolt = <1000000>;
-                                        regulator-max-microvolt = <1000000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo11_reg: LDO11 {
-                                        regulator-name = "VDD18_ABB1_1.8V";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo12_reg: LDO12 {
-                                        regulator-name = "VDD33_USB_3.3V";
-                                        regulator-min-microvolt = <3300000>;
-                                        regulator-max-microvolt = <3300000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                ldo13_reg: LDO13 {
-                                        regulator-name = "VDDQ_C2C_W_1.8V";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                ldo14_reg: LDO14 {
-                                        regulator-name = "VDD18_ABB0_2_1.8V";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                ldo15_reg: LDO15 {
-                                        regulator-name = "VDD10_HSIC_1.0V";
-                                        regulator-min-microvolt = <1000000>;
-                                        regulator-max-microvolt = <1000000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                ldo16_reg: LDO16 {
-                                        regulator-name = "VDD18_HSIC_1.8V";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                ldo20_reg: LDO20 {
-                                        regulator-name = "LDO20_1.8V";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-boot-on;
-                                };
-
-                                ldo21_reg: LDO21 {
-                                        regulator-name = "LDO21_3.3V";
-                                        regulator-min-microvolt = <3300000>;
-                                        regulator-max-microvolt = <3300000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                ldo25_reg: LDO25 {
-                                        regulator-name = "VDDQ_LCD_1.8V";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck1_reg: BUCK1 {
-                                        regulator-name = "vdd_mif";
-                                        regulator-min-microvolt = <1000000>;
-                                        regulator-max-microvolt = <1000000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck2_reg: BUCK2 {
-                                        regulator-name = "vdd_arm";
-                                        regulator-min-microvolt = <900000>;
-                                        regulator-max-microvolt = <1350000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck3_reg: BUCK3 {
-                                        regulator-name = "vdd_int";
-                                        regulator-min-microvolt = <1000000>;
-                                        regulator-max-microvolt = <1000000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck4_reg: BUCK4 {
-                                        regulator-name = "vdd_g3d";
-                                        regulator-min-microvolt = <900000>;
-                                        regulator-max-microvolt = <1100000>;
-                                        regulator-microvolt-offset = <50000>;
-                                };
-
-                                buck5_reg: BUCK5 {
-                                        regulator-name = "VDDQ_CKEM1_2_1.2V";
-                                        regulator-min-microvolt = <1200000>;
-                                        regulator-max-microvolt = <1200000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck6_reg: BUCK6 {
-                                        regulator-name = "BUCK6_1.35V";
-                                        regulator-min-microvolt = <1350000>;
-                                        regulator-max-microvolt = <1350000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck7_reg: BUCK7 {
-                                        regulator-name = "BUCK7_2.0V";
-                                        regulator-min-microvolt = <2000000>;
-                                        regulator-max-microvolt = <2000000>;
-                                        regulator-always-on;
-                                };
-
-                                buck8_reg: BUCK8 {
-                                        regulator-name = "BUCK8_2.8V";
-                                        regulator-min-microvolt = <2800000>;
-                                        regulator-max-microvolt = <2800000>;
-                                        regulator-always-on;
-                                };
-                        };
-                };
+&pinctrl_1 {
+        gpio_home_key: home_key {
+                samsung,pins = "gpx2-2";
+                samsung,pin-pud = <0>;
         };
 };
diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts
new file mode 100644
index 000000000000..96b43f4497cc
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts
@@ -0,0 +1,32 @@
+/*
+ * Hardkernel's Exynos4412 based ODROID-X2 board device tree source
+ *
+ * Copyright (c) 2012 Dongjin Kim <tobetter@gmail.com>
+ *
+ * Device tree source file for Hardkernel's ODROID-X2 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.
+*/
+
+#include "exynos4412-odroidx.dts"
+
+/ {
+        model = "Hardkernel ODROID-X2 board based on Exynos4412";
+        compatible = "hardkernel,odroid-x2", "samsung,exynos4412", "samsung,exynos4";
+
+        memory {
+                reg = <0x40000000 0x7FF00000>;
+        };
+};
+
+&sound {
+        samsung,model = "Odroid-X2";
+        samsung,audio-routing =
+                "Headphone Jack", "HPL",
+                "Headphone Jack", "HPR",
+                "IN1", "Mic Jack",
+                "Mic Jack", "MICBIAS";
+};
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 77878447b312..11967f4561e0 100644
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -589,6 +589,7 @@
         spi_1: spi@13930000 {
                 pinctrl-names = "default";
                 pinctrl-0 = <&spi1_bus>;
+                cs-gpios = <&gpb 5 0>;
                 status = "okay";
 
                 s5c73m3_spi: s5c73m3 {
@@ -596,7 +597,6 @@
                         spi-max-frequency = <50000000>;
                         reg = <0>;
                         controller-data {
-                                cs-gpio = <&gpb 5 0>;
                                 samsung,spi-feedback-delay = <2>;
                         };
                 };
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index c42a3e196cd5..d8bc059e172f 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -26,6 +26,10 @@
                 samsung,combiner-nr = <20>;
         };
 
+        pmu {
+                interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
+        };
+
         gic: interrupt-controller@10490000 {
                 cpu-offset = <0x4000>;
         };
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index de1f9c77b589..861bb919f6d3 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -31,12 +31,6 @@
                 mshc0 = &mshc_0;
         };
 
-        pmu {
-                compatible = "arm,cortex-a9-pmu";
-                interrupt-parent = <&combiner>;
-                interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
-        };
-
         sysram@02020000 {
                 compatible = "mmio-sram";
                 reg = <0x02020000 0x40000>;
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 79d0608d6dcc..a0cc0b6f8f96 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -18,6 +18,13 @@
 / {
         interrupt-parent = <&gic>;
 
+        aliases {
+                serial0 = &serial_0;
+                serial1 = &serial_1;
+                serial2 = &serial_2;
+                serial3 = &serial_3;
+        };
+
         chipid@10000000 {
                 compatible = "samsung,exynos4210-chipid";
                 reg = <0x10000000 0x100>;
@@ -50,25 +57,25 @@
                 interrupts = <1 9 0xf04>;
         };
 
-        serial@12C00000 {
+        serial_0: serial@12C00000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x12C00000 0x100>;
                 interrupts = <0 51 0>;
         };
 
-        serial@12C10000 {
+        serial_1: serial@12C10000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x12C10000 0x100>;
                 interrupts = <0 52 0>;
         };
 
-        serial@12C20000 {
+        serial_2: serial@12C20000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x12C20000 0x100>;
                 interrupts = <0 53 0>;
         };
 
-        serial@12C30000 {
+        serial_3: serial@12C30000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0x12C30000 0x100>;
                 interrupts = <0 54 0>;
@@ -87,6 +94,7 @@
                 reg = <0x14400000 0x40000>;
                 interrupt-names = "fifo", "vsync", "lcd_sys";
                 interrupts = <18 4>, <18 5>, <18 6>;
+                samsung,sysreg = <&sysreg_system_controller>;
                 status = "disabled";
         };
 
diff --git a/arch/arm/boot/dts/exynos5250-cros-common.dtsi b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
index 89ac90f59e2e..e603e9c70142 100644
--- a/arch/arm/boot/dts/exynos5250-cros-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-cros-common.dtsi
@@ -27,177 +27,18 @@
                 i2c2_bus: i2c2-bus {
                         samsung,pin-pud = <0>;
                 };
-
-                max77686_irq: max77686-irq {
-                        samsung,pins = "gpx3-2";
-                        samsung,pin-function = <0>;
-                        samsung,pin-pud = <0>;
-                        samsung,pin-drv = <0>;
-                };
         };
 
         i2c@12C60000 {
                 status = "okay";
                 samsung,i2c-sda-delay = <100>;
                 samsung,i2c-max-bus-freq = <378000>;
-
-                max77686@09 {
-                        compatible = "maxim,max77686";
-                        interrupt-parent = <&gpx3>;
-                        interrupts = <2 0>;
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&max77686_irq>;
-                        wakeup-source;
-                        reg = <0x09>;
-                        #clock-cells = <1>;
-
-                        voltage-regulators {
-                                ldo1_reg: LDO1 {
-                                        regulator-name = "P1.0V_LDO_OUT1";
-                                        regulator-min-microvolt = <1000000>;
-                                        regulator-max-microvolt = <1000000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo2_reg: LDO2 {
-                                        regulator-name = "P1.8V_LDO_OUT2";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo3_reg: LDO3 {
-                                        regulator-name = "P1.8V_LDO_OUT3";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo7_reg: LDO7 {
-                                        regulator-name = "P1.1V_LDO_OUT7";
-                                        regulator-min-microvolt = <1100000>;
-                                        regulator-max-microvolt = <1100000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo8_reg: LDO8 {
-                                        regulator-name = "P1.0V_LDO_OUT8";
-                                        regulator-min-microvolt = <1000000>;
-                                        regulator-max-microvolt = <1000000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo10_reg: LDO10 {
-                                        regulator-name = "P1.8V_LDO_OUT10";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo12_reg: LDO12 {
-                                        regulator-name = "P3.0V_LDO_OUT12";
-                                        regulator-min-microvolt = <3000000>;
-                                        regulator-max-microvolt = <3000000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo14_reg: LDO14 {
-                                        regulator-name = "P1.8V_LDO_OUT14";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo15_reg: LDO15 {
-                                        regulator-name = "P1.0V_LDO_OUT15";
-                                        regulator-min-microvolt = <1000000>;
-                                        regulator-max-microvolt = <1000000>;
-                                        regulator-always-on;
-                                };
-
-                                ldo16_reg: LDO16 {
-                                        regulator-name = "P1.8V_LDO_OUT16";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                };
-
-                                buck1_reg: BUCK1 {
-                                        regulator-name = "vdd_mif";
-                                        regulator-min-microvolt = <950000>;
-                                        regulator-max-microvolt = <1300000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck2_reg: BUCK2 {
-                                        regulator-name = "vdd_arm";
-                                        regulator-min-microvolt = <850000>;
-                                        regulator-max-microvolt = <1350000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck3_reg: BUCK3 {
-                                        regulator-name = "vdd_int";
-                                        regulator-min-microvolt = <900000>;
-                                        regulator-max-microvolt = <1200000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck4_reg: BUCK4 {
-                                        regulator-name = "vdd_g3d";
-                                        regulator-min-microvolt = <850000>;
-                                        regulator-max-microvolt = <1300000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck5_reg: BUCK5 {
-                                        regulator-name = "P1.8V_BUCK_OUT5";
-                                        regulator-min-microvolt = <1800000>;
-                                        regulator-max-microvolt = <1800000>;
-                                        regulator-always-on;
-                                        regulator-boot-on;
-                                };
-
-                                buck6_reg: BUCK6 {
-                                        regulator-name = "P1.35V_BUCK_OUT6";
-                                        regulator-min-microvolt = <1350000>;
-                                        regulator-max-microvolt = <1350000>;
-                                        regulator-always-on;
-                                };
-
-                                buck7_reg: BUCK7 {
-                                        regulator-name = "P2.0V_BUCK_OUT7";
-                                        regulator-min-microvolt = <2000000>;
-                                        regulator-max-microvolt = <2000000>;
-                                        regulator-always-on;
-                                };
-
-                                buck8_reg: BUCK8 {
-                                        regulator-name = "P2.85V_BUCK_OUT8";
-                                        regulator-min-microvolt = <2850000>;
-                                        regulator-max-microvolt = <2850000>;
-                                        regulator-always-on;
-                                };
-                        };
-                };
         };
 
         i2c@12C70000 {
                 status = "okay";
                 samsung,i2c-sda-delay = <100>;
                 samsung,i2c-max-bus-freq = <378000>;
-
-                trackpad {
-                        reg = <0x67>;
-                        compatible = "cypress,cyapa";
-                        interrupts = <2 0>;
-                        interrupt-parent = <&gpx1>;
-                        wakeup-source;
-                };
         };
 
         i2c@12C80000 {
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index a794a705d404..b4b35adae565 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -44,6 +44,8 @@
                 max77686@09 {
                         compatible = "maxim,max77686";
                         reg = <0x09>;
+                        interrupt-parent = <&gpx3>;
+                        interrupts = <2 0>;
 
                         voltage-regulators {
                                 ldo1_reg: LDO1 {
@@ -316,6 +318,7 @@
         };
 
         spi_1: spi@12d30000 {
+                cs-gpios = <&gpa2 5 0>;
                 status = "okay";
 
                 w25q80bw@0 {
@@ -326,7 +329,6 @@
                         spi-max-frequency = <1000000>;
 
                         controller-data {
-                                cs-gpio = <&gpa2 5 0>;
                                 samsung,spi-feedback-delay = <0>;
                         };
 
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 079fdf9e3f18..f2b8c4116541 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -137,7 +137,7 @@
                                 sbs,poll-retry-count = <1>;
                         };
 
-                        ec: embedded-controller {
+                        cros_ec: embedded-controller {
                                 compatible = "google,cros-ec-i2c";
                                 reg = <0x1e>;
                                 interrupts = <6 0>;
@@ -145,95 +145,6 @@
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&ec_irq>;
                                 wakeup-source;
-
-                                keyboard-controller {
-                                        compatible = "google,cros-ec-keyb";
-                                        keypad,num-rows = <8>;
-                                        keypad,num-columns = <13>;
-                                        google,needs-ghost-filter;
-                                        linux,keymap = <0x0001007d      /* L_META */
-                                                        0x0002003b      /* F1 */
-                                                        0x00030030      /* B */
-                                                        0x00040044      /* F10 */
-                                                        0x00060031      /* N */
-                                                        0x0008000d      /* = */
-                                                        0x000a0064      /* R_ALT */
-
-                                                        0x01010001      /* ESC */
-                                                        0x0102003e      /* F4 */
-                                                        0x01030022      /* G */
-                                                        0x01040041      /* F7 */
-                                                        0x01060023      /* H */
-                                                        0x01080028      /* ' */
-                                                        0x01090043      /* F9 */
-                                                        0x010b000e      /* BKSPACE */
-
-                                                        0x0200001d      /* L_CTRL */
-                                                        0x0201000f      /* TAB */
-                                                        0x0202003d      /* F3 */
-                                                        0x02030014      /* T */
-                                                        0x02040040      /* F6 */
-                                                        0x0205001b      /* ] */
-                                                        0x02060015      /* Y */
-                                                        0x02070056      /* 102ND */
-                                                        0x0208001a      /* [ */
-                                                        0x02090042      /* F8 */
-
-                                                        0x03010029      /* GRAVE */
-                                                        0x0302003c      /* F2 */
-                                                        0x03030006      /* 5 */
-                                                        0x0304003f      /* F5 */
-                                                        0x03060007      /* 6 */
-                                                        0x0308000c      /* - */
-                                                        0x030b002b      /* \ */
-
-                                                        0x04000061      /* R_CTRL */
-                                                        0x0401001e      /* A */
-                                                        0x04020020      /* D */
-                                                        0x04030021      /* F */
-                                                        0x0404001f      /* S */
-                                                        0x04050025      /* K */
-                                                        0x04060024      /* J */
-                                                        0x04080027      /* ; */
-                                                        0x04090026      /* L */
-                                                        0x040a002b      /* \ */
-                                                        0x040b001c      /* ENTER */
-
-                                                        0x0501002c      /* Z */
-                                                        0x0502002e      /* C */
-                                                        0x0503002f      /* V */
-                                                        0x0504002d      /* X */
-                                                        0x05050033      /* , */
-                                                        0x05060032      /* M */
-                                                        0x0507002a      /* L_SHIFT */
-                                                        0x05080035      /* / */
-                                                        0x05090034      /* . */
-                                                        0x050B0039      /* SPACE */
-
-                                                        0x06010002      /* 1 */
-                                                        0x06020004      /* 3 */
-                                                        0x06030005      /* 4 */
-                                                        0x06040003      /* 2 */
-                                                        0x06050009      /* 8 */
-                                                        0x06060008      /* 7 */
-                                                        0x0608000b      /* 0 */
-                                                        0x0609000a      /* 9 */
-                                                        0x060a0038      /* L_ALT */
-                                                        0x060b006c      /* DOWN */
-                                                        0x060c006a      /* RIGHT */
-
-                                                        0x07010010      /* Q */
-                                                        0x07020012      /* E */
-                                                        0x07030013      /* R */
-                                                        0x07040011      /* W */
-                                                        0x07050017      /* I */
-                                                        0x07060016      /* U */
-                                                        0x07070036      /* R_SHIFT */
-                                                        0x07080019      /* P */
-                                                        0x07090018      /* O */
-                                                        0x070b0067      /* UP */
-                                                        0x070c0069>;    /* LEFT */
-                                };
                         };
 
                         power-regulator {
@@ -351,6 +262,7 @@
         sound {
                 compatible = "google,snow-audio-max98095";
 
+                samsung,model = "Snow-I2S-MAX98095";
                 samsung,i2s-controller = <&i2s0>;
                 samsung,audio-codec = <&max98095>;
         };
@@ -431,3 +343,170 @@
                 };
         };
 };
+
+&i2c_0 {
+        max77686@09 {
+                compatible = "maxim,max77686";
+                interrupt-parent = <&gpx3>;
+                interrupts = <2 0>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&max77686_irq>;
+                wakeup-source;
+                reg = <0x09>;
+                #clock-cells = <1>;
+
+                voltage-regulators {
+                        ldo1_reg: LDO1 {
+                                regulator-name = "P1.0V_LDO_OUT1";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                        };
+
+                        ldo2_reg: LDO2 {
+                                regulator-name = "P1.8V_LDO_OUT2";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+
+                        ldo3_reg: LDO3 {
+                                regulator-name = "P1.8V_LDO_OUT3";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+
+                        ldo7_reg: LDO7 {
+                                regulator-name = "P1.1V_LDO_OUT7";
+                                regulator-min-microvolt = <1100000>;
+                                regulator-max-microvolt = <1100000>;
+                                regulator-always-on;
+                        };
+
+                        ldo8_reg: LDO8 {
+                                regulator-name = "P1.0V_LDO_OUT8";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                        };
+
+                        ldo10_reg: LDO10 {
+                                regulator-name = "P1.8V_LDO_OUT10";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+
+                        ldo12_reg: LDO12 {
+                                regulator-name = "P3.0V_LDO_OUT12";
+                                regulator-min-microvolt = <3000000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-always-on;
+                        };
+
+                        ldo14_reg: LDO14 {
+                                regulator-name = "P1.8V_LDO_OUT14";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+
+                        ldo15_reg: LDO15 {
+                                regulator-name = "P1.0V_LDO_OUT15";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                        };
+
+                        ldo16_reg: LDO16 {
+                                regulator-name = "P1.8V_LDO_OUT16";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+
+                        buck1_reg: BUCK1 {
+                                regulator-name = "vdd_mif";
+                                regulator-min-microvolt = <950000>;
+                                regulator-max-microvolt = <1300000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        buck2_reg: BUCK2 {
+                                regulator-name = "vdd_arm";
+                                regulator-min-microvolt = <850000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        buck3_reg: BUCK3 {
+                                regulator-name = "vdd_int";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <1200000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        buck4_reg: BUCK4 {
+                                regulator-name = "vdd_g3d";
+                                regulator-min-microvolt = <850000>;
+                                regulator-max-microvolt = <1300000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        buck5_reg: BUCK5 {
+                                regulator-name = "P1.8V_BUCK_OUT5";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+
+                        buck6_reg: BUCK6 {
+                                regulator-name = "P1.35V_BUCK_OUT6";
+                                regulator-min-microvolt = <1350000>;
+                                regulator-max-microvolt = <1350000>;
+                                regulator-always-on;
+                        };
+
+                        buck7_reg: BUCK7 {
+                                regulator-name = "P2.0V_BUCK_OUT7";
+                                regulator-min-microvolt = <2000000>;
+                                regulator-max-microvolt = <2000000>;
+                                regulator-always-on;
+                        };
+
+                        buck8_reg: BUCK8 {
+                                regulator-name = "P2.85V_BUCK_OUT8";
+                                regulator-min-microvolt = <2850000>;
+                                regulator-max-microvolt = <2850000>;
+                                regulator-always-on;
+                        };
+                };
+        };
+};
+
+&i2c_1 {
+        trackpad {
+                reg = <0x67>;
+                compatible = "cypress,cyapa";
+                interrupts = <2 0>;
+                interrupt-parent = <&gpx1>;
+                wakeup-source;
+        };
+};
+
+&pinctrl_0 {
+        max77686_irq: max77686-irq {
+                samsung,pins = "gpx3-2";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+};
+
+#include "cros-ec-keyboard.dtsi"
diff --git a/arch/arm/boot/dts/exynos5260.dtsi b/arch/arm/boot/dts/exynos5260.dtsi
index 5398a60207ca..36da38e29000 100644
--- a/arch/arm/boot/dts/exynos5260.dtsi
+++ b/arch/arm/boot/dts/exynos5260.dtsi
@@ -21,6 +21,10 @@
                 pinctrl0 = &pinctrl_0;
                 pinctrl1 = &pinctrl_1;
                 pinctrl2 = &pinctrl_2;
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &uart2;
+                serial3 = &uart3;
         };
 
         cpus {
@@ -227,6 +231,11 @@
                         interrupts = <0 243 0>;
                 };
 
+                pmu_system_controller: system-controller@10D50000 {
+                        compatible = "samsung,exynos5260-pmu", "syscon";
+                        reg = <0x10D50000 0x10000>;
+                };
+
                 uart0: serial@12C00000 {
                         compatible = "samsung,exynos4210-uart";
                         reg = <0x12C00000 0x100>;
diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi
index 3839c26f467f..731eefd23fa9 100644
--- a/arch/arm/boot/dts/exynos5410.dtsi
+++ b/arch/arm/boot/dts/exynos5410.dtsi
@@ -20,6 +20,12 @@
         compatible = "samsung,exynos5410", "samsung,exynos5";
         interrupt-parent = <&gic>;
 
+        aliases {
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &uart2;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -28,24 +34,28 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a15";
                         reg = <0x0>;
+                        clock-frequency = <1600000000>;
                 };
 
                 CPU1: cpu@1 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a15";
                         reg = <0x1>;
+                        clock-frequency = <1600000000>;
                 };
 
                 CPU2: cpu@2 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a15";
                         reg = <0x2>;
+                        clock-frequency = <1600000000>;
                 };
 
                 CPU3: cpu@3 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a15";
                         reg = <0x3>;
+                        clock-frequency = <1600000000>;
                 };
         };
 
@@ -87,6 +97,11 @@
                         reg = <0x10000000 0x100>;
                 };
 
+                pmu_system_controller: system-controller@10040000 {
+                        compatible = "samsung,exynos5410-pmu", "syscon";
+                        reg = <0x10040000 0x5000>;
+                };
+
                 mct: mct@101C0000 {
                         compatible = "samsung,exynos4210-mct";
                         reg = <0x101C0000 0xB00>;
diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 1c5b8f9f4a36..228a6b1e0aa1 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -25,8 +25,18 @@
                 "google,pit", "google,peach","samsung,exynos5420",
                 "samsung,exynos5";
 
-        memory {
-                reg = <0x20000000 0x80000000>;
+        aliases {
+                /* Assign 20 so we don't get confused w/ builtin ones */
+                i2c20 = "/spi@12d40000/cros-ec@0/i2c-tunnel";
+        };
+
+        backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm 0 1000000 0>;
+                brightness-levels = <0 100 500 1000 1500 2000 2500 2800>;
+                default-brightness-level = <7>;
+                pinctrl-0 = <&pwm0_out>;
+                pinctrl-names = "default";
         };
 
         fixed-rate-clocks {
@@ -50,18 +60,14 @@
                 };
         };
 
-        backlight {
-                compatible = "pwm-backlight";
-                pwms = <&pwm 0 1000000 0>;
-                brightness-levels = <0 100 500 1000 1500 2000 2500 2800>;
-                default-brightness-level = <7>;
-                pinctrl-0 = <&pwm0_out>;
-                pinctrl-names = "default";
+        memory {
+                reg = <0x20000000 0x80000000>;
         };
 
         sound {
                 compatible = "google,snow-audio-max98090";
 
+                samsung,model = "Peach-Pit-I2S-MAX98090";
                 samsung,i2s-controller = <&i2s0>;
                 samsung,audio-codec = <&max98090>;
         };
@@ -87,66 +93,92 @@
                 pinctrl-0 = <&usb301_vbus_en>;
                 enable-active-high;
         };
-};
 
-&pinctrl_0 {
-        max98090_irq: max98090-irq {
-                samsung,pins = "gpx0-2";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <0>;
-                samsung,pin-drv = <0>;
+        vbat: fixed-regulator {
+                compatible = "regulator-fixed";
+                regulator-name = "vbat-supply";
+                regulator-boot-on;
+                regulator-always-on;
         };
+};
 
-        tpm_irq: tpm-irq {
-                samsung,pins = "gpx1-0";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <0>;
-                samsung,pin-drv = <0>;
-        };
+&dp {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&dp_hpd_gpio>;
+        samsung,color-space = <0>;
+        samsung,dynamic-range = <0>;
+        samsung,ycbcr-coeff = <0>;
+        samsung,color-depth = <1>;
+        samsung,link-rate = <0x06>;
+        samsung,lane-count = <2>;
+        samsung,hpd-gpio = <&gpx2 6 0>;
 
-        power_key_irq: power-key-irq {
-                samsung,pins = "gpx1-2";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <0>;
-                samsung,pin-drv = <0>;
-        };
+        display-timings {
+                native-mode = <&timing1>;
 
-        hdmi_hpd_irq: hdmi-hpd-irq {
-                samsung,pins = "gpx3-7";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <1>;
-                samsung,pin-drv = <0>;
+                timing1: timing@1 {
+                        clock-frequency = <70589280>;
+                        hactive = <1366>;
+                        vactive = <768>;
+                        hfront-porch = <40>;
+                        hback-porch = <40>;
+                        hsync-len = <32>;
+                        vback-porch = <10>;
+                        vfront-porch = <12>;
+                        vsync-len = <6>;
+                };
         };
+};
 
-        dp_hpd_gpio: dp_hpd_gpio {
-                samsung,pins = "gpx2-6";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <3>;
-                samsung,pin-drv = <0>;
-        };
+&fimd {
+        status = "okay";
+        samsung,invert-vclk;
 };
 
-&pinctrl_3 {
-        usb300_vbus_en: usb300-vbus-en {
-                samsung,pins = "gph0-0";
-                samsung,pin-function = <1>;
-                samsung,pin-pud = <0>;
-                samsung,pin-drv = <0>;
+&hdmi {
+        status = "okay";
+        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&hdmi_hpd_irq>;
+        ddc = <&i2c_2>;
+};
+
+&hsi2c_7 {
+        status = "okay";
+
+        max98090: codec@10 {
+                compatible = "maxim,max98090";
+                reg = <0x10>;
+                interrupts = <2 0>;
+                interrupt-parent = <&gpx0>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&max98090_irq>;
         };
+};
 
-        usb301_vbus_en: usb301-vbus-en {
-                samsung,pins = "gph0-1";
-                samsung,pin-function = <1>;
-                samsung,pin-pud = <0>;
-                samsung,pin-drv = <0>;
+&hsi2c_9 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        tpm@20 {
+                compatible = "infineon,slb9645tt";
+                reg = <0x20>;
+
+                /* Unused irq; but still need to configure the pins */
+                pinctrl-names = "default";
+                pinctrl-0 = <&tpm_irq>;
         };
 };
 
-&rtc {
+&i2c_2 {
         status = "okay";
+        samsung,i2c-sda-delay = <100>;
+        samsung,i2c-max-bus-freq = <66000>;
+        samsung,i2c-slave-addr = <0x50>;
 };
 
-&uart_3 {
+&i2s0 {
         status = "okay";
 };
 
@@ -189,46 +221,210 @@
         };
 };
 
-&hsi2c_7 {
-        status = "okay";
 
-        max98090: codec@10 {
-                compatible = "maxim,max98090";
-                reg = <0x10>;
-                interrupts = <2 0>;
-                interrupt-parent = <&gpx0>;
-                pinctrl-names = "default";
-                pinctrl-0 = <&max98090_irq>;
+&pinctrl_0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mask_tpm_reset>;
+
+        max98090_irq: max98090-irq {
+                samsung,pins = "gpx0-2";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        /* We need GPX0_6 to be low at sleep time; just keep it low always */
+        mask_tpm_reset: mask-tpm-reset {
+                samsung,pins = "gpx0-6";
+                samsung,pin-function = <1>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+                samsung,pin-val = <0>;
+        };
+
+        tpm_irq: tpm-irq {
+                samsung,pins = "gpx1-0";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        power_key_irq: power-key-irq {
+                samsung,pins = "gpx1-2";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        ec_irq: ec-irq {
+                samsung,pins = "gpx1-5";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        tps65090_irq: tps65090-irq {
+                samsung,pins = "gpx2-5";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        dp_hpd_gpio: dp_hpd_gpio {
+                samsung,pins = "gpx2-6";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <3>;
+                samsung,pin-drv = <0>;
+        };
+
+        hdmi_hpd_irq: hdmi-hpd-irq {
+                samsung,pins = "gpx3-7";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <1>;
+                samsung,pin-drv = <0>;
         };
 };
 
-&hsi2c_9 {
-        status = "okay";
-        clock-frequency = <400000>;
+&pinctrl_3 {
+        /* Drive SPI lines at x2 for better integrity */
+        spi2-bus {
+                samsung,pin-drv = <2>;
+        };
 
-        tpm@20 {
-                compatible = "infineon,slb9645tt";
-                reg = <0x20>;
+        /* Drive SPI chip select at x2 for better integrity */
+        ec_spi_cs: ec-spi-cs {
+                samsung,pins = "gpb1-2";
+                samsung,pin-function = <1>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <2>;
+        };
 
-                /* Unused irq; but still need to configure the pins */
-                pinctrl-names = "default";
-                pinctrl-0 = <&tpm_irq>;
+        usb300_vbus_en: usb300-vbus-en {
+                samsung,pins = "gph0-0";
+                samsung,pin-function = <1>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        usb301_vbus_en: usb301-vbus-en {
+                samsung,pins = "gph0-1";
+                samsung,pin-function = <1>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
         };
 };
 
-&i2c_2  {
+&rtc {
         status = "okay";
-        samsung,i2c-sda-delay = <100>;
-        samsung,i2c-max-bus-freq = <66000>;
-        samsung,i2c-slave-addr = <0x50>;
 };
 
-&hdmi {
+&spi_2 {
+        status = "okay";
+        num-cs = <1>;
+        samsung,spi-src-clk = <0>;
+        cs-gpios = <&gpb1 2 0>;
+
+        cros_ec: cros-ec@0 {
+                compatible = "google,cros-ec-spi";
+                interrupt-parent = <&gpx1>;
+                interrupts = <5 0>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&ec_spi_cs &ec_irq>;
+                reg = <0>;
+                spi-max-frequency = <3125000>;
+
+                controller-data {
+                        samsung,spi-feedback-delay = <1>;
+                };
+
+                i2c-tunnel {
+                        compatible = "google,cros-ec-i2c-tunnel";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        google,remote-bus = <0>;
+
+                        battery: sbs-battery@b {
+                                compatible = "sbs,sbs-battery";
+                                reg = <0xb>;
+                                sbs,poll-retry-count = <1>;
+                                sbs,i2c-retry-count = <2>;
+                        };
+
+                        power-regulator@48 {
+                                compatible = "ti,tps65090";
+                                reg = <0x48>;
+
+                                /*
+                                 * Config irq to disable internal pulls
+                                 * even though we run in polling mode.
+                                 */
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&tps65090_irq>;
+
+                                vsys1-supply = <&vbat>;
+                                vsys2-supply = <&vbat>;
+                                vsys3-supply = <&vbat>;
+                                infet1-supply = <&vbat>;
+                                infet2-supply = <&vbat>;
+                                infet3-supply = <&vbat>;
+                                infet4-supply = <&vbat>;
+                                infet5-supply = <&vbat>;
+                                infet6-supply = <&vbat>;
+                                infet7-supply = <&vbat>;
+                                vsys-l1-supply = <&vbat>;
+                                vsys-l2-supply = <&vbat>;
+
+                                regulators {
+                                        tps65090_dcdc1: dcdc1 {
+                                                ti,enable-ext-control;
+                                        };
+                                        tps65090_dcdc2: dcdc2 {
+                                                ti,enable-ext-control;
+                                        };
+                                        tps65090_dcdc3: dcdc3 {
+                                                ti,enable-ext-control;
+                                        };
+                                        tps65090_fet1: fet1 {
+                                                regulator-name = "vcd_led";
+                                        };
+                                        tps65090_fet2: fet2 {
+                                                regulator-name = "video_mid";
+                                                regulator-always-on;
+                                        };
+                                        tps65090_fet3: fet3 {
+                                                regulator-name = "wwan_r";
+                                                regulator-always-on;
+                                        };
+                                        tps65090_fet4: fet4 {
+                                                regulator-name = "sdcard";
+                                                regulator-always-on;
+                                        };
+                                        tps65090_fet5: fet5 {
+                                                regulator-name = "camout";
+                                        };
+                                        tps65090_fet6: fet6 {
+                                                regulator-name = "lcd_vdd";
+                                        };
+                                        tps65090_fet7: fet7 {
+                                                regulator-name = "video_mid_1a";
+                                                regulator-always-on;
+                                        };
+                                        tps65090_ldo1: ldo1 {
+                                        };
+                                        tps65090_ldo2: ldo2 {
+                                        };
+                                };
+
+                                charger {
+                                        compatible = "ti,tps65090-charger";
+                                };
+                        };
+                };
+        };
+};
+
+&uart_3 {
         status = "okay";
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&hdmi_hpd_irq>;
-        ddc = <&i2c_2>;
 };
 
 &usbdrd_phy0 {
@@ -248,40 +444,4 @@
         timeout-sec = <32>;
 };
 
-&i2s0 {
-        status = "okay";
-};
-
-&fimd {
-        status = "okay";
-        samsung,invert-vclk;
-};
-
-&dp {
-        status = "okay";
-        pinctrl-names = "default";
-        pinctrl-0 = <&dp_hpd_gpio>;
-        samsung,color-space = <0>;
-        samsung,dynamic-range = <0>;
-        samsung,ycbcr-coeff = <0>;
-        samsung,color-depth = <1>;
-        samsung,link-rate = <0x06>;
-        samsung,lane-count = <2>;
-        samsung,hpd-gpio = <&gpx2 6 0>;
-
-        display-timings {
-                native-mode = <&timing1>;
-
-                timing1: timing@1 {
-                        clock-frequency = <70589280>;
-                        hactive = <1366>;
-                        vactive = <768>;
-                        hfront-porch = <40>;
-                        hback-porch = <40>;
-                        hsync-len = <32>;
-                        vback-porch = <10>;
-                        vfront-porch = <12>;
-                        vsync-len = <6>;
-                };
-        };
-};
+#include "cros-ec-keyboard.dtsi"
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index a40a5c2b5a4f..bfe056d9148c 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -265,11 +265,6 @@
                 clock-names = "oscclk", "pclk0", "clk0";
         };
 
-        disp_pd: power-domain@100440C0 {
-                compatible = "samsung,exynos4210-pd";
-                reg = <0x100440C0 0x20>;
-        };
-
         msc_pd: power-domain@10044120 {
                 compatible = "samsung,exynos4210-pd";
                 reg = <0x10044120 0x20>;
@@ -520,8 +515,26 @@
                 phy-names = "dp";
         };
 
+        mipi_phy: video-phy@10040714 {
+                compatible = "samsung,s5pv210-mipi-video-phy";
+                reg = <0x10040714 12>;
+                #phy-cells = <1>;
+        };
+
+        dsi@14500000 {
+                compatible = "samsung,exynos5410-mipi-dsi";
+                reg = <0x14500000 0x10000>;
+                interrupts = <0 82 0>;
+                phys = <&mipi_phy 1>;
+                phy-names = "dsim";
+                clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>;
+                clock-names = "bus_clk", "pll_clk";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
+
         fimd: fimd@14400000 {
-                samsung,power-domain = <&disp_pd>;
                 clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
                 clock-names = "sclk_fimd", "fimd";
         };
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index ae3a17c791f6..8f3373cd7b87 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -18,6 +18,8 @@
         interrupt-parent = <&gic>;
 
         aliases {
+                serial0 = &serial_0;
+                serial1 = &serial_1;
                 spi0 = &spi_0;
                 tmuctrl0 = &tmuctrl_0;
                 tmuctrl1 = &tmuctrl_1;
@@ -102,7 +104,7 @@
                 >;
         };
 
-        serial@B0000 {
+        serial_0: serial@B0000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0xB0000 0x1000>;
                 interrupts = <0 2 0>;
@@ -110,7 +112,7 @@
                 clock-names = "uart", "clk_uart_baud0";
         };
 
-        serial@C0000 {
+        serial_1: serial@C0000 {
                 compatible = "samsung,exynos4210-uart";
                 reg = <0xC0000 0x1000>;
                 interrupts = <0 3 0>;
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index f3af2079a063..f3ee48bbe05f 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -23,8 +23,18 @@
                 "google,pi", "google,peach", "samsung,exynos5800",
                 "samsung,exynos5";
 
-        memory {
-                reg = <0x20000000 0x80000000>;
+        aliases {
+                /* Assign 20 so we don't get confused w/ builtin ones */
+                i2c20 = "/spi@12d40000/cros-ec@0/i2c-tunnel";
+        };
+
+        backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm 0 1000000 0>;
+                brightness-levels = <0 100 500 1000 1500 2000 2500 2800>;
+                default-brightness-level = <7>;
+                pinctrl-0 = <&pwm0_out>;
+                pinctrl-names = "default";
         };
 
         fixed-rate-clocks {
@@ -48,13 +58,16 @@
                 };
         };
 
-        backlight {
-                compatible = "pwm-backlight";
-                pwms = <&pwm 0 1000000 0>;
-                brightness-levels = <0 100 500 1000 1500 2000 2500 2800>;
-                default-brightness-level = <7>;
-                pinctrl-0 = <&pwm0_out>;
-                pinctrl-names = "default";
+        memory {
+                reg = <0x20000000 0x80000000>;
+        };
+
+        sound {
+                compatible = "google,snow-audio-max98091";
+
+                samsung,model = "Peach-Pi-I2S-MAX98091";
+                samsung,i2s-controller = <&i2s0>;
+                samsung,audio-codec = <&max98091>;
         };
 
         usb300_vbus_reg: regulator-usb300 {
@@ -78,59 +91,92 @@
                 pinctrl-0 = <&usb301_vbus_en>;
                 enable-active-high;
         };
-};
 
-&pinctrl_0 {
-        tpm_irq: tpm-irq {
-                samsung,pins = "gpx1-0";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <0>;
-                samsung,pin-drv = <0>;
+        vbat: fixed-regulator {
+                compatible = "regulator-fixed";
+                regulator-name = "vbat-supply";
+                regulator-boot-on;
+                regulator-always-on;
         };
+};
 
-        power_key_irq: power-key-irq {
-                samsung,pins = "gpx1-2";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <0>;
-                samsung,pin-drv = <0>;
-        };
+&dp {
+        status = "okay";
+        pinctrl-names = "default";
+        pinctrl-0 = <&dp_hpd_gpio>;
+        samsung,color-space = <0>;
+        samsung,dynamic-range = <0>;
+        samsung,ycbcr-coeff = <0>;
+        samsung,color-depth = <1>;
+        samsung,link-rate = <0x0a>;
+        samsung,lane-count = <2>;
+        samsung,hpd-gpio = <&gpx2 6 0>;
 
-        dp_hpd_gpio: dp_hpd_gpio {
-                samsung,pins = "gpx2-6";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <3>;
-                samsung,pin-drv = <0>;
-        };
+        display-timings {
+                native-mode = <&timing1>;
 
-        hdmi_hpd_irq: hdmi-hpd-irq {
-                samsung,pins = "gpx3-7";
-                samsung,pin-function = <0>;
-                samsung,pin-pud = <1>;
-                samsung,pin-drv = <0>;
+                timing1: timing@1 {
+                        clock-frequency = <150660000>;
+                        hactive = <1920>;
+                        vactive = <1080>;
+                        hfront-porch = <60>;
+                        hback-porch = <172>;
+                        hsync-len = <80>;
+                        vback-porch = <25>;
+                        vfront-porch = <10>;
+                        vsync-len = <10>;
+                };
         };
 };
 
-&pinctrl_3 {
-        usb300_vbus_en: usb300-vbus-en {
-                samsung,pins = "gph0-0";
-                samsung,pin-function = <1>;
-                samsung,pin-pud = <0>;
-                samsung,pin-drv = <0>;
+&fimd {
+        status = "okay";
+        samsung,invert-vclk;
+};
+
+&hdmi {
+        status = "okay";
+        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&hdmi_hpd_irq>;
+        ddc = <&i2c_2>;
+};
+
+&hsi2c_7 {
+        status = "okay";
+
+        max98091: codec@10 {
+                compatible = "maxim,max98091";
+                reg = <0x10>;
+                interrupts = <2 0>;
+                interrupt-parent = <&gpx0>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&max98091_irq>;
         };
+};
 
-        usb301_vbus_en: usb301-vbus-en {
-                samsung,pins = "gph0-1";
-                samsung,pin-function = <1>;
-                samsung,pin-pud = <0>;
-                samsung,pin-drv = <0>;
+&hsi2c_9 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        tpm@20 {
+                compatible = "infineon,slb9645tt";
+                reg = <0x20>;
+
+                /* Unused irq; but still need to configure the pins */
+                pinctrl-names = "default";
+                pinctrl-0 = <&tpm_irq>;
         };
 };
 
-&rtc {
+&i2c_2 {
         status = "okay";
+        samsung,i2c-sda-delay = <100>;
+        samsung,i2c-max-bus-freq = <66000>;
+        samsung,i2c-slave-addr = <0x50>;
 };
 
-&uart_3 {
+&i2s0 {
         status = "okay";
 };
 
@@ -173,66 +219,210 @@
         };
 };
 
-&dp {
-        status = "okay";
+
+&pinctrl_0 {
         pinctrl-names = "default";
-        pinctrl-0 = <&dp_hpd_gpio>;
-        samsung,color-space = <0>;
-        samsung,dynamic-range = <0>;
-        samsung,ycbcr-coeff = <0>;
-        samsung,color-depth = <1>;
-        samsung,link-rate = <0x0a>;
-        samsung,lane-count = <2>;
-        samsung,hpd-gpio = <&gpx2 6 0>;
+        pinctrl-0 = <&mask_tpm_reset>;
 
-        display-timings {
-                native-mode = <&timing1>;
+        max98091_irq: max98091-irq {
+                samsung,pins = "gpx0-2";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
 
-                timing1: timing@1 {
-                        clock-frequency = <150660000>;
-                        hactive = <1920>;
-                        vactive = <1080>;
-                        hfront-porch = <60>;
-                        hback-porch = <172>;
-                        hsync-len = <80>;
-                        vback-porch = <25>;
-                        vfront-porch = <10>;
-                        vsync-len = <10>;
-                };
+        /* We need GPX0_6 to be low at sleep time; just keep it low always */
+        mask_tpm_reset: mask-tpm-reset {
+                samsung,pins = "gpx0-6";
+                samsung,pin-function = <1>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+                samsung,pin-val = <0>;
         };
-};
 
-&fimd {
-        status = "okay";
-        samsung,invert-vclk;
+        tpm_irq: tpm-irq {
+                samsung,pins = "gpx1-0";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        power_key_irq: power-key-irq {
+                samsung,pins = "gpx1-2";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        ec_irq: ec-irq {
+                samsung,pins = "gpx1-5";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        tps65090_irq: tps65090-irq {
+                samsung,pins = "gpx2-5";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        dp_hpd_gpio: dp_hpd_gpio {
+                samsung,pins = "gpx2-6";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <3>;
+                samsung,pin-drv = <0>;
+        };
+
+        hdmi_hpd_irq: hdmi-hpd-irq {
+                samsung,pins = "gpx3-7";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <1>;
+                samsung,pin-drv = <0>;
+        };
 };
 
-&hsi2c_9 {
-        status = "okay";
-        clock-frequency = <400000>;
+&pinctrl_3 {
+        /* Drive SPI lines at x2 for better integrity */
+        spi2-bus {
+                samsung,pin-drv = <2>;
+        };
 
-        tpm@20 {
-                compatible = "infineon,slb9645tt";
-                reg = <0x20>;
-                /* Unused irq; but still need to configure the pins */
-                pinctrl-names = "default";
-                pinctrl-0 = <&tpm_irq>;
+        /* Drive SPI chip select at x2 for better integrity */
+        ec_spi_cs: ec-spi-cs {
+                samsung,pins = "gpb1-2";
+                samsung,pin-function = <1>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <2>;
+        };
+
+        usb300_vbus_en: usb300-vbus-en {
+                samsung,pins = "gph0-0";
+                samsung,pin-function = <1>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        usb301_vbus_en: usb301-vbus-en {
+                samsung,pins = "gph0-1";
+                samsung,pin-function = <1>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
         };
 };
 
-&i2c_2 {
+&rtc {
         status = "okay";
-        samsung,i2c-sda-delay = <100>;
-        samsung,i2c-max-bus-freq = <66000>;
-        samsung,i2c-slave-addr = <0x50>;
 };
 
-&hdmi {
+&spi_2 {
+        status = "okay";
+        num-cs = <1>;
+        samsung,spi-src-clk = <0>;
+        cs-gpios = <&gpb1 2 0>;
+
+        cros_ec: cros-ec@0 {
+                compatible = "google,cros-ec-spi";
+                interrupt-parent = <&gpx1>;
+                interrupts = <5 0>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&ec_spi_cs &ec_irq>;
+                reg = <0>;
+                spi-max-frequency = <3125000>;
+
+                controller-data {
+                        samsung,spi-feedback-delay = <1>;
+                };
+
+                i2c-tunnel {
+                        compatible = "google,cros-ec-i2c-tunnel";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        google,remote-bus = <0>;
+
+                        battery: sbs-battery@b {
+                                compatible = "sbs,sbs-battery";
+                                reg = <0xb>;
+                                sbs,poll-retry-count = <1>;
+                                sbs,i2c-retry-count = <2>;
+                        };
+
+                        power-regulator@48 {
+                                compatible = "ti,tps65090";
+                                reg = <0x48>;
+
+                                /*
+                                 * Config irq to disable internal pulls
+                                 * even though we run in polling mode.
+                                 */
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&tps65090_irq>;
+
+                                vsys1-supply = <&vbat>;
+                                vsys2-supply = <&vbat>;
+                                vsys3-supply = <&vbat>;
+                                infet1-supply = <&vbat>;
+                                infet2-supply = <&vbat>;
+                                infet3-supply = <&vbat>;
+                                infet4-supply = <&vbat>;
+                                infet5-supply = <&vbat>;
+                                infet6-supply = <&vbat>;
+                                infet7-supply = <&vbat>;
+                                vsys-l1-supply = <&vbat>;
+                                vsys-l2-supply = <&vbat>;
+
+                                regulators {
+                                        tps65090_dcdc1: dcdc1 {
+                                                ti,enable-ext-control;
+                                        };
+                                        tps65090_dcdc2: dcdc2 {
+                                                ti,enable-ext-control;
+                                        };
+                                        tps65090_dcdc3: dcdc3 {
+                                                ti,enable-ext-control;
+                                        };
+                                        tps65090_fet1: fet1 {
+                                                regulator-name = "vcd_led";
+                                        };
+                                        tps65090_fet2: fet2 {
+                                                regulator-name = "video_mid";
+                                                regulator-always-on;
+                                        };
+                                        tps65090_fet3: fet3 {
+                                                regulator-name = "wwan_r";
+                                                regulator-always-on;
+                                        };
+                                        tps65090_fet4: fet4 {
+                                                regulator-name = "sdcard";
+                                                regulator-always-on;
+                                        };
+                                        tps65090_fet5: fet5 {
+                                                regulator-name = "camout";
+                                        };
+                                        tps65090_fet6: fet6 {
+                                                regulator-name = "lcd_vdd";
+                                        };
+                                        tps65090_fet7: fet7 {
+                                                regulator-name = "video_mid_1a";
+                                                regulator-always-on;
+                                        };
+                                        tps65090_ldo1: ldo1 {
+                                        };
+                                        tps65090_ldo2: ldo2 {
+                                        };
+                                };
+
+                                charger {
+                                        compatible = "ti,tps65090-charger";
+                                };
+                        };
+                };
+        };
+};
+
+&uart_3 {
         status = "okay";
-        hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
-        pinctrl-names = "default";
-        pinctrl-0 = <&hdmi_hpd_irq>;
-        ddc = <&i2c_2>;
 };
 
 &usbdrd_phy0 {
@@ -251,3 +441,5 @@
 &watchdog {
         timeout-sec = <32>;
 };
+
+#include "cros-ec-keyboard.dtsi"
diff --git a/arch/arm/boot/dts/ge863-pro3.dtsi b/arch/arm/boot/dts/ge863-pro3.dtsi
index 230099bb31c8..0d0e62489d93 100644
--- a/arch/arm/boot/dts/ge863-pro3.dtsi
+++ b/arch/arm/boot/dts/ge863-pro3.dtsi
@@ -19,6 +19,10 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <6000000>;
                 };
+
+                main_xtal {
+                        clock-frequency = <6000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/hi3620.dtsi b/arch/arm/boot/dts/hi3620.dtsi
index 83a5b8685bd9..6cbb62e5c6a9 100644
--- a/arch/arm/boot/dts/hi3620.dtsi
+++ b/arch/arm/boot/dts/hi3620.dtsi
@@ -33,6 +33,7 @@
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
+                enable-method = "hisilicon,hi3620-smp";
 
                 cpu@0 {
                         device_type = "cpu";
diff --git a/arch/arm/boot/dts/hisi-x5hd2-dkb.dts b/arch/arm/boot/dts/hisi-x5hd2-dkb.dts
new file mode 100644
index 000000000000..05b44c272c9a
--- /dev/null
+++ b/arch/arm/boot/dts/hisi-x5hd2-dkb.dts
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2013-2014 Linaro Ltd.
+ * Copyright (c) 2013-2014 Hisilicon 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
+ *  publishhed by the Free Software Foundation.
+ */
+
+/dts-v1/;
+#include "hisi-x5hd2.dtsi"
+
+/ {
+        model = "Hisilicon HIX5HD2 Development Board";
+        compatible = "hisilicon,hix5hd2";
+
+        chosen {
+                bootargs = "console=ttyAMA0,115200 earlyprintk";
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                enable-method = "hisilicon,hix5hd2-smp";
+
+                cpu@0 {
+                        compatible = "arm,cortex-a9";
+                        device_type = "cpu";
+                        reg = <0>;
+                        next-level-cache = <&l2>;
+                };
+
+                cpu@1 {
+                        compatible = "arm,cortex-a9";
+                        device_type = "cpu";
+                        reg = <1>;
+                        next-level-cache = <&l2>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x80000000>;
+        };
+};
+
+&timer0 {
+        status = "okay";
+};
+
+&uart0 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/hisi-x5hd2.dtsi b/arch/arm/boot/dts/hisi-x5hd2.dtsi
new file mode 100644
index 000000000000..f85ba2924ff7
--- /dev/null
+++ b/arch/arm/boot/dts/hisi-x5hd2.dtsi
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2013-2014 Linaro Ltd.
+ * Copyright (c) 2013-2014 Hisilicon 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
+ * publishhed by the Free Software Foundation.
+ */
+
+#include "skeleton.dtsi"
+#include <dt-bindings/clock/hix5hd2-clock.h>
+
+/ {
+        aliases {
+                serial0 = &uart0;
+        };
+
+        gic: interrupt-controller@f8a01000 {
+                compatible = "arm,cortex-a9-gic";
+                #interrupt-cells = <3>;
+                #address-cells = <0>;
+                interrupt-controller;
+                /* gic dist base, gic cpu base */
+                reg = <0xf8a01000 0x1000>, <0xf8a00100 0x100>;
+        };
+
+        soc {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                interrupt-parent = <&gic>;
+                ranges = <0 0xf8000000 0x8000000>;
+
+                amba {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "arm,amba-bus";
+                        ranges;
+
+                        timer0: timer@00002000 {
+                                compatible = "arm,sp804", "arm,primecell";
+                                reg = <0x00002000 0x1000>;
+                                /* timer00 & timer01 */
+                                interrupts = <0 24 4>;
+                                clocks = <&clock HIX5HD2_FIXED_24M>;
+                                status = "disabled";
+                        };
+
+                        timer1: timer@00a29000 {
+                                /*
+                                 * Only used in NORMAL state, not available ins
+                                 * SLOW or DOZE state.
+                                 * The rate is fixed in 24MHz.
+                                 */
+                                compatible = "arm,sp804", "arm,primecell";
+                                reg = <0x00a29000 0x1000>;
+                                /* timer10 & timer11 */
+                                interrupts = <0 25 4>;
+                                clocks = <&clock HIX5HD2_FIXED_24M>;
+                                status = "disabled";
+                        };
+
+                        timer2: timer@00a2a000 {
+                                compatible = "arm,sp804", "arm,primecell";
+                                reg = <0x00a2a000 0x1000>;
+                                /* timer20 & timer21 */
+                                interrupts = <0 26 4>;
+                                clocks = <&clock HIX5HD2_FIXED_24M>;
+                                status = "disabled";
+                        };
+
+                        timer3: timer@00a2b000 {
+                                compatible = "arm,sp804", "arm,primecell";
+                                reg = <0x00a2b000 0x1000>;
+                                /* timer30 & timer31 */
+                                interrupts = <0 27 4>;
+                                clocks = <&clock HIX5HD2_FIXED_24M>;
+                                status = "disabled";
+                        };
+
+                        timer4: timer@00a81000 {
+                                compatible = "arm,sp804", "arm,primecell";
+                                reg = <0x00a81000 0x1000>;
+                                /* timer30 & timer31 */
+                                interrupts = <0 28 4>;
+                                clocks = <&clock HIX5HD2_FIXED_24M>;
+                                status = "disabled";
+                        };
+
+                        uart0: uart@00b00000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x00b00000 0x1000>;
+                                interrupts = <0 49 4>;
+                                clocks = <&clock HIX5HD2_FIXED_83M>;
+                                clock-names = "apb_pclk";
+                                status = "disabled";
+                        };
+
+                        uart1: uart@00006000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x00006000 0x1000>;
+                                interrupts = <0 50 4>;
+                                clocks = <&clock HIX5HD2_FIXED_83M>;
+                                clock-names = "apb_pclk";
+                                status = "disabled";
+                        };
+
+                        uart2: uart@00b02000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x00b02000 0x1000>;
+                                interrupts = <0 51 4>;
+                                clocks = <&clock HIX5HD2_FIXED_83M>;
+                                clock-names = "apb_pclk";
+                                status = "disabled";
+                        };
+
+                        uart3: uart@00b03000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x00b03000 0x1000>;
+                                interrupts = <0 52 4>;
+                                clocks = <&clock HIX5HD2_FIXED_83M>;
+                                clock-names = "apb_pclk";
+                                status = "disabled";
+                        };
+
+                        uart4: uart@00b04000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0xb04000 0x1000>;
+                                interrupts = <0 53 4>;
+                                clocks = <&clock HIX5HD2_FIXED_83M>;
+                                clock-names = "apb_pclk";
+                                status = "disabled";
+                        };
+                };
+
+                local_timer@00a00600 {
+                        compatible = "arm,cortex-a9-twd-timer";
+                        reg = <0x00a00600 0x20>;
+                        interrupts = <1 13 0xf01>;
+                };
+
+                l2: l2-cache {
+                        compatible = "arm,pl310-cache";
+                        reg = <0x00a10000 0x100000>;
+                        interrupts = <0 15 4>;
+                        cache-unified;
+                        cache-level = <2>;
+                };
+
+                sysctrl: system-controller@00000000 {
+                        compatible = "hisilicon,sysctrl";
+                        reg = <0x00000000 0x1000>;
+                        reboot-offset = <0x4>;
+                };
+
+                cpuctrl@00a22000 {
+                        compatible = "hisilicon,cpuctrl";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x00a22000 0x2000>;
+                        ranges = <0 0x00a22000 0x2000>;
+
+                        clock: clock@0 {
+                                compatible = "hisilicon,hix5hd2-clock";
+                                reg = <0 0x2000>;
+                                #clock-cells = <1>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
new file mode 100644
index 000000000000..68d0834a2d1e
--- /dev/null
+++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.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.
+ */
+
+#include "imx25-eukrea-mbimxsd25-baseboard.dts"
+
+/ {
+        model = "Eukrea MBIMXSD25 with the CMO-QVGA Display";
+        compatible = "eukrea,mbimxsd25-baseboard-cmo-qvga", "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25";
+
+        cmo_qvga: display {
+                model = "CMO-QVGA";
+                bits-per-pixel = <16>;
+                fsl,pcr = <0xcad08b80>;
+                bus-width = <18>;
+                native-mode = <&qvga_timings>;
+                display-timings {
+                        qvga_timings: 320x240 {
+                                clock-frequency = <6500000>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <30>;
+                                hfront-porch = <38>;
+                                vback-porch = <20>;
+                                vfront-porch = <3>;
+                                hsync-len = <15>;
+                                vsync-len = <4>;
+                        };
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                reg_lcd_3v3: regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_reg_lcd_3v3>;
+                        regulator-name = "lcd-3v3";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        gpio = <&gpio1 26 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+        };
+};
+
+&iomuxc {
+        imx25-eukrea-mbimxsd25-baseboard-cmo-qvga {
+                pinctrl_reg_lcd_3v3: reg_lcd_3v3 {
+                        fsl,pins = <MX25_PAD_PWM__GPIO_1_26 0x80000000>;
+                };
+        };
+};
+
+&lcdc {
+        display = <&cmo_qvga>;
+        fsl,lpccr = <0x00a903ff>;
+        lcd-supply = <&reg_lcd_3v3>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts
new file mode 100644
index 000000000000..8eee2f65fe00
--- /dev/null
+++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dts
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.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.
+ */
+
+#include "imx25-eukrea-mbimxsd25-baseboard.dts"
+
+/ {
+        model = "Eukrea MBIMXSD25 with the DVI-SVGA Display";
+        compatible = "eukrea,mbimxsd25-baseboard-dvi-svga", "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25";
+
+        dvi_svga: display {
+                model = "DVI-SVGA";
+                bits-per-pixel = <16>;
+                fsl,pcr = <0xfa208b80>;
+                bus-width = <18>;
+                native-mode = <&dvi_svga_timings>;
+                display-timings {
+                        dvi_svga_timings: 800x600 {
+                                clock-frequency = <40000000>;
+                                hactive = <800>;
+                                vactive = <600>;
+                                hback-porch = <75>;
+                                hfront-porch = <75>;
+                                vback-porch = <7>;
+                                vfront-porch = <75>;
+                                hsync-len = <7>;
+                                vsync-len = <7>;
+                        };
+                };
+        };
+};
+
+&lcdc {
+        display = <&dvi_svga>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts
new file mode 100644
index 000000000000..447da6263169
--- /dev/null
+++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dts
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013 Eukréa Electromatique <denis@eukrea.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.
+ */
+
+#include "imx25-eukrea-mbimxsd25-baseboard.dts"
+
+/ {
+        model = "Eukrea MBIMXSD25 with the DVI-VGA Display";
+        compatible = "eukrea,mbimxsd25-baseboard-dvi-vga", "eukrea,mbimxsd25-baseboard", "eukrea,cpuimx25", "fsl,imx25";
+
+        dvi_vga: display {
+                model = "DVI-VGA";
+                bits-per-pixel = <16>;
+                fsl,pcr = <0xfa208b80>;
+                bus-width = <18>;
+                native-mode = <&dvi_vga_timings>;
+                display-timings {
+                        dvi_vga_timings: 640x480 {
+                                clock-frequency = <31250000>;
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <100>;
+                                hfront-porch = <100>;
+                                vback-porch = <7>;
+                                vfront-porch = <100>;
+                                hsync-len = <7>;
+                                vsync-len = <7>;
+                        };
+                };
+        };
+};
+
+&lcdc {
+        display = <&dvi_vga>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
index ad12da38fc92..ed1d0b4578ef 100644
--- a/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
+++ b/arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
@@ -155,7 +155,6 @@
 
 &ssi1 {
         codec-handle = <&tlv320aic23>;
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx25-pdk.dts b/arch/arm/boot/dts/imx25-pdk.dts
index c608942b8a3b..9c21b1583762 100644
--- a/arch/arm/boot/dts/imx25-pdk.dts
+++ b/arch/arm/boot/dts/imx25-pdk.dts
@@ -233,7 +233,6 @@
 
 &ssi1 {
         codec-handle = <&codec>;
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
@@ -249,3 +248,10 @@
         dr_mode = "host";
         status = "okay";
 };
+
+&usbotg {
+        phy_type = "utmi";
+        dr_mode = "otg";
+        external-vbus-divider;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index bb74d9582b7e..c1740396b2c9 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -312,7 +312,7 @@
                         gpt4: timer@53f84000 {
                                 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
                                 reg = <0x53f84000 0x4000>;
-                                clocks = <&clks 9>, <&clks 45>;
+                                clocks = <&clks 95>, <&clks 47>;
                                 clock-names = "ipg", "per";
                                 interrupts = <1>;
                         };
@@ -320,7 +320,7 @@
                         gpt3: timer@53f88000 {
                                 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
                                 reg = <0x53f88000 0x4000>;
-                                clocks = <&clks 9>, <&clks 47>;
+                                clocks = <&clks 94>, <&clks 47>;
                                 clock-names = "ipg", "per";
                                 interrupts = <29>;
                         };
@@ -328,7 +328,7 @@
                         gpt2: timer@53f8c000 {
                                 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
                                 reg = <0x53f8c000 0x4000>;
-                                clocks = <&clks 9>, <&clks 47>;
+                                clocks = <&clks 93>, <&clks 47>;
                                 clock-names = "ipg", "per";
                                 interrupts = <53>;
                         };
@@ -336,7 +336,7 @@
                         gpt1: timer@53f90000 {
                                 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
                                 reg = <0x53f90000 0x4000>;
-                                clocks = <&clks 9>, <&clks 47>;
+                                clocks = <&clks 92>, <&clks 47>;
                                 clock-names = "ipg", "per";
                                 interrupts = <54>;
                         };
diff --git a/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi b/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
new file mode 100644
index 000000000000..e2242638ea0b
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
@@ -0,0 +1,296 @@
+/*
+ * Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>
+ *
+ * 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 = "Eukrea CPUIMX27";
+        compatible = "eukrea,cpuimx27", "fsl,imx27";
+
+        memory {
+                reg = <0xa0000000 0x04000000>;
+        };
+
+        clocks {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "simple-bus";
+
+                clk14745600: clock@0 {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <14745600>;
+                        reg = <0>;
+                };
+        };
+};
+
+&fec {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_fec>;
+        status = "okay";
+};
+
+&i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        status = "okay";
+
+        pcf8563@51 {
+                compatible = "nxp,pcf8563";
+                reg = <0x51>;
+        };
+};
+
+&nfc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_nfc>;
+        nand-bus-width = <8>;
+        nand-ecc-mode = "hw";
+        nand-on-flash-bbt;
+        status = "okay";
+};
+
+&owire {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_owire>;
+        status = "okay";
+};
+
+&sdhci2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_sdhc2>;
+        bus-width = <4>;
+        non-removable;
+        status = "okay";
+};
+
+&uart4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart4>;
+        fsl,uart-has-rtscts;
+        status = "okay";
+};
+
+&usbh2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbh2>;
+        dr_mode = "host";
+        phy_type = "ulpi";
+        disable-over-current;
+        status = "okay";
+};
+
+&usbotg {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg>;
+        dr_mode = "otg";
+        phy_type = "ulpi";
+        disable-over-current;
+        status = "okay";
+};
+
+&weim {
+        status = "okay";
+
+        nor: nor@0,0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "cfi-flash";
+                reg = <0 0x00000000 0x04000000>;
+                bank-width = <2>;
+                linux,mtd-name = "physmap-flash.0";
+                fsl,weim-cs-timing = <0x00008f03 0xa0330d01 0x002208c0>;
+        };
+
+        uart8250@3,200000 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_uart8250_1>;
+                compatible = "ns8250";
+                clocks = <&clk14745600>;
+                fsl,weim-cs-timing = <0x0000d603 0x0d1d0d01 0x00d20000>;
+                interrupts = <&gpio2 23 IRQ_TYPE_LEVEL_LOW>;
+                reg = <3 0x200000 0x1000>;
+                reg-shift = <1>;
+                reg-io-width = <1>;
+                no-loopback-test;
+        };
+
+        uart8250@3,400000 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_uart8250_2>;
+                compatible = "ns8250";
+                clocks = <&clk14745600>;
+                fsl,weim-cs-timing = <0x0000d603 0x0d1d0d01 0x00d20000>;
+                interrupts = <&gpio2 22 IRQ_TYPE_LEVEL_LOW>;
+                reg = <3 0x400000 0x1000>;
+                reg-shift = <1>;
+                reg-io-width = <1>;
+                no-loopback-test;
+        };
+
+        uart8250@3,800000 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_uart8250_3>;
+                compatible = "ns8250";
+                clocks = <&clk14745600>;
+                fsl,weim-cs-timing = <0x0000d603 0x0d1d0d01 0x00d20000>;
+                interrupts = <&gpio2 27 IRQ_TYPE_LEVEL_LOW>;
+                reg = <3 0x800000 0x1000>;
+                reg-shift = <1>;
+                reg-io-width = <1>;
+                no-loopback-test;
+        };
+
+        uart8250@3,1000000 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_uart8250_4>;
+                compatible = "ns8250";
+                clocks = <&clk14745600>;
+                fsl,weim-cs-timing = <0x0000d603 0x0d1d0d01 0x00d20000>;
+                interrupts = <&gpio2 30 IRQ_TYPE_LEVEL_LOW>;
+                reg = <3 0x1000000 0x1000>;
+                reg-shift = <1>;
+                reg-io-width = <1>;
+                no-loopback-test;
+        };
+};
+
+&iomuxc {
+        imx27-eukrea-cpuimx27 {
+                pinctrl_fec: fecgrp {
+                        fsl,pins = <
+                                MX27_PAD_SD3_CMD__FEC_TXD0              0x0
+                                MX27_PAD_SD3_CLK__FEC_TXD1              0x0
+                                MX27_PAD_ATA_DATA0__FEC_TXD2            0x0
+                                MX27_PAD_ATA_DATA1__FEC_TXD3            0x0
+                                MX27_PAD_ATA_DATA2__FEC_RX_ER           0x0
+                                MX27_PAD_ATA_DATA3__FEC_RXD1            0x0
+                                MX27_PAD_ATA_DATA4__FEC_RXD2            0x0
+                                MX27_PAD_ATA_DATA5__FEC_RXD3            0x0
+                                MX27_PAD_ATA_DATA6__FEC_MDIO            0x0
+                                MX27_PAD_ATA_DATA7__FEC_MDC             0x0
+                                MX27_PAD_ATA_DATA8__FEC_CRS             0x0
+                                MX27_PAD_ATA_DATA9__FEC_TX_CLK          0x0
+                                MX27_PAD_ATA_DATA10__FEC_RXD0           0x0
+                                MX27_PAD_ATA_DATA11__FEC_RX_DV          0x0
+                                MX27_PAD_ATA_DATA12__FEC_RX_CLK         0x0
+                                MX27_PAD_ATA_DATA13__FEC_COL            0x0
+                                MX27_PAD_ATA_DATA14__FEC_TX_ER          0x0
+                                MX27_PAD_ATA_DATA15__FEC_TX_EN          0x0
+                        >;
+                };
+
+                pinctrl_i2c1: i2c1grp {
+                        fsl,pins = <
+                                MX27_PAD_I2C_DATA__I2C_DATA             0x0
+                                MX27_PAD_I2C_CLK__I2C_CLK               0x0
+                        >;
+                };
+
+                pinctrl_nfc: nfcgrp {
+                        fsl,pins = <
+                                MX27_PAD_NFRB__NFRB                     0x0
+                                MX27_PAD_NFCLE__NFCLE                   0x0
+                                MX27_PAD_NFWP_B__NFWP_B                 0x0
+                                MX27_PAD_NFCE_B__NFCE_B                 0x0
+                                MX27_PAD_NFALE__NFALE                   0x0
+                                MX27_PAD_NFRE_B__NFRE_B                 0x0
+                                MX27_PAD_NFWE_B__NFWE_B                 0x0
+                        >;
+                };
+
+                pinctrl_owire: owiregrp {
+                        fsl,pins = <
+                                MX27_PAD_RTCK__OWIRE                    0x0
+                        >;
+                };
+
+                pinctrl_sdhc2: sdhc2grp {
+                        fsl,pins = <
+                                MX27_PAD_SD2_CLK__SD2_CLK               0x0
+                                MX27_PAD_SD2_CMD__SD2_CMD               0x0
+                                MX27_PAD_SD2_D0__SD2_D0                 0x0
+                                MX27_PAD_SD2_D1__SD2_D1                 0x0
+                                MX27_PAD_SD2_D2__SD2_D2                 0x0
+                                MX27_PAD_SD2_D3__SD2_D3                 0x0
+                        >;
+                };
+
+                pinctrl_uart4: uart4grp {
+                        fsl,pins = <
+                                MX27_PAD_USBH1_TXDM__UART4_TXD          0x0
+                                MX27_PAD_USBH1_RXDP__UART4_RXD          0x0
+                                MX27_PAD_USBH1_TXDP__UART4_CTS          0x0
+                                MX27_PAD_USBH1_FS__UART4_RTS            0x0
+                        >;
+                };
+
+                pinctrl_uart8250_1: uart82501grp {
+                        fsl,pins = <
+                                MX27_PAD_USB_PWR__GPIO2_23              0x0
+                        >;
+                };
+
+                pinctrl_uart8250_2: uart82502grp {
+                        fsl,pins = <
+                                MX27_PAD_USBH1_SUSP__GPIO2_22           0x0
+                        >;
+                };
+
+                pinctrl_uart8250_3: uart82503grp {
+                        fsl,pins = <
+                                MX27_PAD_USBH1_OE_B__GPIO2_27           0x0
+                        >;
+                };
+
+                pinctrl_uart8250_4: uart82504grp {
+                        fsl,pins = <
+                                MX27_PAD_USBH1_RXDM__GPIO2_30           0x0
+                        >;
+                };
+
+                pinctrl_usbh2: usbh2grp {
+                        fsl,pins = <
+                                MX27_PAD_USBH2_CLK__USBH2_CLK           0x0
+                                MX27_PAD_USBH2_DIR__USBH2_DIR           0x0
+                                MX27_PAD_USBH2_NXT__USBH2_NXT           0x0
+                                MX27_PAD_USBH2_STP__USBH2_STP           0x0
+                                MX27_PAD_CSPI2_SCLK__USBH2_DATA0        0x0
+                                MX27_PAD_CSPI2_MOSI__USBH2_DATA1        0x0
+                                MX27_PAD_CSPI2_MISO__USBH2_DATA2        0x0
+                                MX27_PAD_CSPI2_SS1__USBH2_DATA3         0x0
+                                MX27_PAD_CSPI2_SS2__USBH2_DATA4         0x0
+                                MX27_PAD_CSPI1_SS2__USBH2_DATA5         0x0
+                                MX27_PAD_CSPI2_SS0__USBH2_DATA6         0x0
+                                MX27_PAD_USBH2_DATA7__USBH2_DATA7       0x0
+                        >;
+                };
+
+                pinctrl_usbotg: usbotggrp {
+                        fsl,pins = <
+                                MX27_PAD_USBOTG_CLK__USBOTG_CLK         0x0
+                                MX27_PAD_USBOTG_DIR__USBOTG_DIR         0x0
+                                MX27_PAD_USBOTG_NXT__USBOTG_NXT         0x0
+                                MX27_PAD_USBOTG_STP__USBOTG_STP         0x0
+                                MX27_PAD_USBOTG_DATA0__USBOTG_DATA0     0x0
+                                MX27_PAD_USBOTG_DATA1__USBOTG_DATA1     0x0
+                                MX27_PAD_USBOTG_DATA2__USBOTG_DATA2     0x0
+                                MX27_PAD_USBOTG_DATA3__USBOTG_DATA3     0x0
+                                MX27_PAD_USBOTG_DATA4__USBOTG_DATA4     0x0
+                                MX27_PAD_USBOTG_DATA5__USBOTG_DATA5     0x0
+                                MX27_PAD_USBOTG_DATA6__USBOTG_DATA6     0x0
+                                MX27_PAD_USBOTG_DATA7__USBOTG_DATA7     0x0
+                        >;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts b/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts
new file mode 100644
index 000000000000..2ab65fc4c1e1
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>
+ *
+ * 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-eukrea-cpuimx27.dtsi"
+
+/ {
+        model = "Eukrea MBIMXSD27";
+        compatible = "eukrea,mbimxsd27-baseboard", "eukrea,cpuimx27", "fsl,imx27";
+
+        display0: CMO-QVGA {
+                model = "CMO-QVGA";
+                native-mode = <&timing0>;
+                bits-per-pixel = <16>;
+                fsl,pcr = <0xfad08b80>;
+
+                display-timings {
+                        timing0: 320x240 {
+                                clock-frequency = <6500000>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <20>;
+                                hsync-len = <30>;
+                                hfront-porch = <38>;
+                                vback-porch = <4>;
+                                vsync-len = <3>;
+                                vfront-porch = <15>;
+                        };
+                };
+        };
+
+        backlight {
+                compatible = "gpio-backlight";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_backlight>;
+                gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_gpioleds>;
+
+                led1 {
+                        label = "system::live";
+                        gpios = <&gpio6 16 GPIO_ACTIVE_LOW>;
+                        linux,default-trigger = "heartbeat";
+                };
+
+                led2 {
+                        label = "system::user";
+                        gpios = <&gpio6 19 GPIO_ACTIVE_LOW>;
+                };
+        };
+
+        regulators {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "simple-bus";
+
+                reg_lcd: regulator@0 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_lcdreg>;
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        regulator-name = "LCD";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio1 25 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+        };
+};
+
+&cspi1 {
+        pinctrl-0 = <&pinctrl_cspi1>;
+        fsl,spi-num-chipselects = <1>;
+        cs-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
+        status = "okay";
+
+        ads7846 {
+                compatible = "ti,ads7846";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_touch>;
+                reg = <0>;
+                interrupts = <&gpio4 25 IRQ_TYPE_LEVEL_LOW>;
+                spi-cpol;
+                spi-max-frequency = <1500000>;
+                ti,keep-vref-on;
+        };
+};
+
+&fb {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_imxfb>;
+        display = <&display0>;
+        lcd-supply = <&reg_lcd>;
+        fsl,dmacr = <0x00040060>;
+        fsl,lscr1 = <0x00120300>;
+        fsl,lpccr = <0x00a903ff>;
+        status = "okay";
+};
+
+&i2c1 {
+        codec: codec@1a {
+                compatible = "ti,tlv320aic23";
+                reg = <0x1a>;
+        };
+};
+
+&kpp {
+        linux,keymap = <
+                MATRIX_KEY(0, 0, KEY_UP)
+                MATRIX_KEY(0, 1, KEY_DOWN)
+                MATRIX_KEY(1, 0, KEY_RIGHT)
+                MATRIX_KEY(1, 1, KEY_LEFT)
+        >;
+        status = "okay";
+};
+
+&sdhci1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_sdhc1>;
+        bus-width = <4>;
+        status = "okay";
+};
+
+&ssi1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ssi1>;
+        codec-handle = <&codec>;
+        status = "okay";
+};
+
+&uart1 {
+        fsl,uart-has-rtscts;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart1>;
+        status = "okay";
+};
+
+&uart2 {
+        fsl,uart-has-rtscts;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart2>;
+        status = "okay";
+};
+
+&uart3 {
+        fsl,uart-has-rtscts;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart3>;
+        status = "okay";
+};
+
+&iomuxc {
+        imx27-eukrea-cpuimx27-baseboard {
+                pinctrl_cspi1: cspi1grp {
+                        fsl,pins = <
+                                MX27_PAD_CSPI1_MISO__CSPI1_MISO 0x0
+                                MX27_PAD_CSPI1_MOSI__CSPI1_MOSI 0x0
+                                MX27_PAD_CSPI1_SCLK__CSPI1_SCLK 0x0
+                                MX27_PAD_CSPI1_SS0__GPIO4_28    0x0 /* CS0 */
+                        >;
+                };
+
+                pinctrl_backlight: backlightgrp {
+                        fsl,pins = <
+                                MX27_PAD_PWMO__GPIO5_5          0x0
+                        >;
+                };
+
+                pinctrl_gpioleds: gpioledsgrp {
+                        fsl,pins = <
+                                MX27_PAD_PC_PWRON__GPIO6_16     0x0
+                                MX27_PAD_PC_CD2_B__GPIO6_19     0x0
+                        >;
+                };
+
+                pinctrl_imxfb: imxfbgrp {
+                        fsl,pins = <
+                                MX27_PAD_LD0__LD0               0x0
+                                MX27_PAD_LD1__LD1               0x0
+                                MX27_PAD_LD2__LD2               0x0
+                                MX27_PAD_LD3__LD3               0x0
+                                MX27_PAD_LD4__LD4               0x0
+                                MX27_PAD_LD5__LD5               0x0
+                                MX27_PAD_LD6__LD6               0x0
+                                MX27_PAD_LD7__LD7               0x0
+                                MX27_PAD_LD8__LD8               0x0
+                                MX27_PAD_LD9__LD9               0x0
+                                MX27_PAD_LD10__LD10             0x0
+                                MX27_PAD_LD11__LD11             0x0
+                                MX27_PAD_LD12__LD12             0x0
+                                MX27_PAD_LD13__LD13             0x0
+                                MX27_PAD_LD14__LD14             0x0
+                                MX27_PAD_LD15__LD15             0x0
+                                MX27_PAD_LD16__LD16             0x0
+                                MX27_PAD_LD17__LD17             0x0
+                                MX27_PAD_CONTRAST__CONTRAST     0x0
+                                MX27_PAD_OE_ACD__OE_ACD         0x0
+                                MX27_PAD_HSYNC__HSYNC           0x0
+                                MX27_PAD_VSYNC__VSYNC           0x0
+                        >;
+                };
+
+                pinctrl_lcdreg: lcdreggrp {
+                        fsl,pins = <
+                                MX27_PAD_CLS__GPIO1_25          0x0
+                        >;
+                };
+
+                pinctrl_sdhc1: sdhc1grp {
+                        fsl,pins = <
+                                MX27_PAD_SD1_CLK__SD1_CLK       0x0
+                                MX27_PAD_SD1_CMD__SD1_CMD       0x0
+                                MX27_PAD_SD1_D0__SD1_D0         0x0
+                                MX27_PAD_SD1_D1__SD1_D1         0x0
+                                MX27_PAD_SD1_D2__SD1_D2         0x0
+                                MX27_PAD_SD1_D3__SD1_D3         0x0
+                        >;
+                };
+
+                pinctrl_ssi1: ssi1grp {
+                        fsl,pins = <
+                                MX27_PAD_SSI4_CLK__SSI4_CLK     0x0
+                                MX27_PAD_SSI4_FS__SSI4_FS       0x0
+                                MX27_PAD_SSI4_RXDAT__SSI4_RXDAT 0x1
+                                MX27_PAD_SSI4_TXDAT__SSI4_TXDAT 0x1
+                        >;
+                };
+
+                pinctrl_touch: touchgrp {
+                        fsl,pins = <
+                                MX27_PAD_CSPI1_RDY__GPIO4_25    0x0 /* IRQ */
+                        >;
+                };
+
+                pinctrl_uart1: uart1grp {
+                        fsl,pins = <
+                                MX27_PAD_UART1_TXD__UART1_TXD   0x0
+                                MX27_PAD_UART1_RXD__UART1_RXD   0x0
+                                MX27_PAD_UART1_CTS__UART1_CTS   0x0
+                                MX27_PAD_UART1_RTS__UART1_RTS   0x0
+                        >;
+                };
+
+                pinctrl_uart2: uart2grp {
+                        fsl,pins = <
+                                MX27_PAD_UART2_TXD__UART2_TXD   0x0
+                                MX27_PAD_UART2_RXD__UART2_RXD   0x0
+                                MX27_PAD_UART2_CTS__UART2_CTS   0x0
+                                MX27_PAD_UART2_RTS__UART2_RTS   0x0
+                        >;
+                };
+
+                pinctrl_uart3: uart3grp {
+                        fsl,pins = <
+                                MX27_PAD_UART3_TXD__UART3_TXD   0x0
+                                MX27_PAD_UART3_RXD__UART3_RXD   0x0
+                                MX27_PAD_UART3_CTS__UART3_CTS   0x0
+                                MX27_PAD_UART3_RTS__UART3_RTS   0x0
+                        >;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx27-pdk.dts b/arch/arm/boot/dts/imx27-pdk.dts
index 4c317716b510..49450dbbcab8 100644
--- a/arch/arm/boot/dts/imx27-pdk.dts
+++ b/arch/arm/boot/dts/imx27-pdk.dts
@@ -28,7 +28,7 @@
                 usbphy0: usbphy@0 {
                         compatible = "usb-nop-xceiv";
                         reg = <0>;
-                        clocks = <&clks 0>;
+                        clocks = <&clks IMX27_CLK_DUMMY>;
                         clock-names = "main_clk";
                 };
         };
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index fe02bc7a24fd..538568b0de26 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -61,7 +61,7 @@
                         compatible = "usb-nop-xceiv";
                         reg = <2>;
                         vcc-supply = <&reg_5v0>;
-                        clocks = <&clks 0>;
+                        clocks = <&clks IMX27_CLK_DUMMY>;
                         clock-names = "main_clk";
                 };
         };
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
index 31e9f7049f73..b4e955e3be8d 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
@@ -51,7 +51,7 @@
                         compatible = "usb-nop-xceiv";
                         reg = <0>;
                         vcc-supply = <&sw3_reg>;
-                        clocks = <&clks 0>;
+                        clocks = <&clks IMX27_CLK_DUMMY>;
                         clock-names = "main_clk";
                 };
         };
@@ -310,7 +310,6 @@
 &ssi1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_ssi1>;
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx27-pinfunc.h b/arch/arm/boot/dts/imx27-pinfunc.h
index f5387b4de577..597bb5f74dcc 100644
--- a/arch/arm/boot/dts/imx27-pinfunc.h
+++ b/arch/arm/boot/dts/imx27-pinfunc.h
@@ -101,14 +101,6 @@
 #define MX27_PAD_CONTRAST__GPIO1_30                        0x1e 0x032
 #define MX27_PAD_OE_ACD__OE_ACD                            0x1f 0x004
 #define MX27_PAD_OE_ACD__GPIO1_31                          0x1f 0x032
-#define MX27_PAD_UNUSED0__UNUSED0                          0x20 0x004
-#define MX27_PAD_UNUSED0__GPIO2_0                          0x20 0x032
-#define MX27_PAD_UNUSED1__UNUSED1                          0x21 0x004
-#define MX27_PAD_UNUSED1__GPIO2_1                          0x21 0x032
-#define MX27_PAD_UNUSED2__UNUSED2                          0x22 0x004
-#define MX27_PAD_UNUSED2__GPIO2_2                          0x22 0x032
-#define MX27_PAD_UNUSED3__UNUSED3                          0x23 0x004
-#define MX27_PAD_UNUSED3__GPIO2_3                          0x23 0x032
 #define MX27_PAD_SD2_D0__SD2_D0                            0x24 0x004
 #define MX27_PAD_SD2_D0__MSHC_DATA0                        0x24 0x005
 #define MX27_PAD_SD2_D0__GPIO2_4                           0x24 0x032
@@ -183,16 +175,6 @@
 #define MX27_PAD_USBH1_RXDP__USBH1_RXDP                    0x3f 0x004
 #define MX27_PAD_USBH1_RXDP__UART4_RXD                     0x3f 0x001
 #define MX27_PAD_USBH1_RXDP__GPIO2_31                      0x3f 0x032
-#define MX27_PAD_UNUSED4__UNUSED4                          0x40 0x004
-#define MX27_PAD_UNUSED4__GPIO3_0                          0x40 0x032
-#define MX27_PAD_UNUSED5__UNUSED5                          0x41 0x004
-#define MX27_PAD_UNUSED5__GPIO3_1                          0x41 0x032
-#define MX27_PAD_UNUSED6__UNUSED6                          0x42 0x004
-#define MX27_PAD_UNUSED6__GPIO3_2                          0x42 0x032
-#define MX27_PAD_UNUSED7__UNUSED7                          0x43 0x004
-#define MX27_PAD_UNUSED7__GPIO3_3                          0x43 0x032
-#define MX27_PAD_UNUSED8__UNUSED8                          0x44 0x004
-#define MX27_PAD_UNUSED8__GPIO3_4                          0x44 0x032
 #define MX27_PAD_I2C2_SDA__I2C2_SDA                        0x45 0x004
 #define MX27_PAD_I2C2_SDA__GPIO3_5                         0x45 0x032
 #define MX27_PAD_I2C2_SCL__I2C2_SCL                        0x46 0x004
@@ -422,18 +404,6 @@
 #define MX27_PAD_USBOTG_CLK__GPIO5_24                      0x98 0x032
 #define MX27_PAD_USBOTG_DATA7__USBOTG_DATA7                0x99 0x004
 #define MX27_PAD_USBOTG_DATA7__GPIO5_25                    0x99 0x032
-#define MX27_PAD_UNUSED9__UNUSED9                          0x9a 0x004
-#define MX27_PAD_UNUSED9__GPIO5_26                         0x9a 0x032
-#define MX27_PAD_UNUSED10__UNUSED10                        0x9b 0x004
-#define MX27_PAD_UNUSED10__GPIO5_27                        0x9b 0x032
-#define MX27_PAD_UNUSED11__UNUSED11                        0x9c 0x004
-#define MX27_PAD_UNUSED11__GPIO5_28                        0x9c 0x032
-#define MX27_PAD_UNUSED12__UNUSED12                        0x9d 0x004
-#define MX27_PAD_UNUSED12__GPIO5_29                        0x9d 0x032
-#define MX27_PAD_UNUSED13__UNUSED13                        0x9e 0x004
-#define MX27_PAD_UNUSED13__GPIO5_30                        0x9e 0x032
-#define MX27_PAD_UNUSED14__UNUSED14                        0x9f 0x004
-#define MX27_PAD_UNUSED14__GPIO5_31                        0x9f 0x032
 #define MX27_PAD_NFRB__NFRB                                0xa0 0x000
 #define MX27_PAD_NFRB__ETMTRACEPKT3                        0xa0 0x005
 #define MX27_PAD_NFRB__GPIO6_0                             0xa0 0x032
@@ -506,21 +476,5 @@
 #define MX27_PAD_ATA_DATA15__ETMTRACEPKT4                  0xb7 0x005
 #define MX27_PAD_ATA_DATA15__FEC_TX_EN                     0xb7 0x006
 #define MX27_PAD_ATA_DATA15__GPIO6_23                      0xb7 0x032
-#define MX27_PAD_UNUSED15__UNUSED15                        0xb8 0x004
-#define MX27_PAD_UNUSED15__GPIO6_24                        0xb8 0x032
-#define MX27_PAD_UNUSED16__UNUSED16                        0xb9 0x004
-#define MX27_PAD_UNUSED16__GPIO6_25                        0xb9 0x032
-#define MX27_PAD_UNUSED17__UNUSED17                        0xba 0x004
-#define MX27_PAD_UNUSED17__GPIO6_26                        0xba 0x032
-#define MX27_PAD_UNUSED18__UNUSED18                        0xbb 0x004
-#define MX27_PAD_UNUSED18__GPIO6_27                        0xbb 0x032
-#define MX27_PAD_UNUSED19__UNUSED19                        0xbc 0x004
-#define MX27_PAD_UNUSED19__GPIO6_28                        0xbc 0x032
-#define MX27_PAD_UNUSED20__UNUSED20                        0xbd 0x004
-#define MX27_PAD_UNUSED20__GPIO6_29                        0xbd 0x032
-#define MX27_PAD_UNUSED21__UNUSED21                        0xbe 0x004
-#define MX27_PAD_UNUSED21__GPIO6_30                        0xbe 0x032
-#define MX27_PAD_UNUSED22__UNUSED22                        0xbf 0x004
-#define MX27_PAD_UNUSED22__GPIO6_31                        0xbf 0x032
 
 #endif /* __DTS_IMX27_PINFUNC_H */
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index a75555c39533..107d713e1cbe 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -11,9 +11,11 @@
 
 #include "skeleton.dtsi"
 #include "imx27-pinfunc.h"
+
+#include <dt-bindings/clock/imx27-clock.h>
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/gpio/gpio.h>
 
 / {
         aliases {
@@ -68,7 +70,7 @@
                                 399000 1450000
                         >;
                         clock-latency = <62500>;
-                        clocks = <&clks 18>;
+                        clocks = <&clks IMX27_CLK_CPU_DIV>;
                         voltage-tolerance = <5>;
                 };
         };
@@ -91,7 +93,8 @@
                                 compatible = "fsl,imx27-dma";
                                 reg = <0x10001000 0x1000>;
                                 interrupts = <32>;
-                                clocks = <&clks 50>, <&clks 70>;
+                                clocks = <&clks IMX27_CLK_DMA_IPG_GATE>,
+                                         <&clks IMX27_CLK_DMA_AHB_GATE>;
                                 clock-names = "ipg", "ahb";
                                 #dma-cells = <1>;
                                 #dma-channels = <16>;
@@ -101,14 +104,15 @@
                                 compatible = "fsl,imx27-wdt", "fsl,imx21-wdt";
                                 reg = <0x10002000 0x1000>;
                                 interrupts = <27>;
-                                clocks = <&clks 74>;
+                                clocks = <&clks IMX27_CLK_WDOG_IPG_GATE>;
                         };
 
                         gpt1: timer@10003000 {
                                 compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
                                 reg = <0x10003000 0x1000>;
                                 interrupts = <26>;
-                                clocks = <&clks 46>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_GPT1_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -116,7 +120,8 @@
                                 compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
                                 reg = <0x10004000 0x1000>;
                                 interrupts = <25>;
-                                clocks = <&clks 45>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_GPT2_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -124,7 +129,8 @@
                                 compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
                                 reg = <0x10005000 0x1000>;
                                 interrupts = <24>;
-                                clocks = <&clks 44>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_GPT3_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -133,7 +139,8 @@
                                 compatible = "fsl,imx27-pwm";
                                 reg = <0x10006000 0x1000>;
                                 interrupts = <23>;
-                                clocks = <&clks 34>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_PWM_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -141,14 +148,14 @@
                                 compatible = "fsl,imx27-kpp", "fsl,imx21-kpp";
                                 reg = <0x10008000 0x1000>;
                                 interrupts = <21>;
-                                clocks = <&clks 37>;
+                                clocks = <&clks IMX27_CLK_KPP_IPG_GATE>;
                                 status = "disabled";
                         };
 
                         owire: owire@10009000 {
                                 compatible = "fsl,imx27-owire", "fsl,imx21-owire";
                                 reg = <0x10009000 0x1000>;
-                                clocks = <&clks 35>;
+                                clocks = <&clks IMX27_CLK_OWIRE_IPG_GATE>;
                                 status = "disabled";
                         };
 
@@ -156,7 +163,8 @@
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1000a000 0x1000>;
                                 interrupts = <20>;
-                                clocks = <&clks 81>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_UART1_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -165,7 +173,8 @@
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1000b000 0x1000>;
                                 interrupts = <19>;
-                                clocks = <&clks 80>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_UART2_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -174,7 +183,8 @@
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1000c000 0x1000>;
                                 interrupts = <18>;
-                                clocks = <&clks 79>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_UART3_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -183,7 +193,8 @@
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1000d000 0x1000>;
                                 interrupts = <17>;
-                                clocks = <&clks 78>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_UART4_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -194,7 +205,8 @@
                                 compatible = "fsl,imx27-cspi";
                                 reg = <0x1000e000 0x1000>;
                                 interrupts = <16>;
-                                clocks = <&clks 53>, <&clks 60>;
+                                clocks = <&clks IMX27_CLK_CSPI1_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER2_GATE>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -205,7 +217,8 @@
                                 compatible = "fsl,imx27-cspi";
                                 reg = <0x1000f000 0x1000>;
                                 interrupts = <15>;
-                                clocks = <&clks 52>, <&clks 60>;
+                                clocks = <&clks IMX27_CLK_CSPI2_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER2_GATE>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -215,7 +228,7 @@
                                 compatible = "fsl,imx27-ssi", "fsl,imx21-ssi";
                                 reg = <0x10010000 0x1000>;
                                 interrupts = <14>;
-                                clocks = <&clks 26>;
+                                clocks = <&clks IMX27_CLK_SSI1_IPG_GATE>;
                                 dmas = <&dma 12>, <&dma 13>, <&dma 14>, <&dma 15>;
                                 dma-names = "rx0", "tx0", "rx1", "tx1";
                                 fsl,fifo-depth = <8>;
@@ -227,7 +240,7 @@
                                 compatible = "fsl,imx27-ssi", "fsl,imx21-ssi";
                                 reg = <0x10011000 0x1000>;
                                 interrupts = <13>;
-                                clocks = <&clks 25>;
+                                clocks = <&clks IMX27_CLK_SSI2_IPG_GATE>;
                                 dmas = <&dma 8>, <&dma 9>, <&dma 10>, <&dma 11>;
                                 dma-names = "rx0", "tx0", "rx1", "tx1";
                                 fsl,fifo-depth = <8>;
@@ -240,7 +253,7 @@
                                 compatible = "fsl,imx27-i2c", "fsl,imx21-i2c";
                                 reg = <0x10012000 0x1000>;
                                 interrupts = <12>;
-                                clocks = <&clks 40>;
+                                clocks = <&clks IMX27_CLK_I2C1_IPG_GATE>;
                                 status = "disabled";
                         };
 
@@ -248,7 +261,8 @@
                                 compatible = "fsl,imx27-mmc", "fsl,imx21-mmc";
                                 reg = <0x10013000 0x1000>;
                                 interrupts = <11>;
-                                clocks = <&clks 30>, <&clks 60>;
+                                clocks = <&clks IMX27_CLK_SDHC1_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER2_GATE>;
                                 clock-names = "ipg", "per";
                                 dmas = <&dma 7>;
                                 dma-names = "rx-tx";
@@ -259,7 +273,8 @@
                                 compatible = "fsl,imx27-mmc", "fsl,imx21-mmc";
                                 reg = <0x10014000 0x1000>;
                                 interrupts = <10>;
-                                clocks = <&clks 29>, <&clks 60>;
+                                clocks = <&clks IMX27_CLK_SDHC2_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER2_GATE>;
                                 clock-names = "ipg", "per";
                                 dmas = <&dma 6>;
                                 dma-names = "rx-tx";
@@ -276,6 +291,7 @@
                                 gpio1: gpio@10015000 {
                                         compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
                                         reg = <0x10015000 0x100>;
+                                        clocks = <&clks IMX27_CLK_GPIO_IPG_GATE>;
                                         interrupts = <8>;
                                         gpio-controller;
                                         #gpio-cells = <2>;
@@ -286,6 +302,7 @@
                                 gpio2: gpio@10015100 {
                                         compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
                                         reg = <0x10015100 0x100>;
+                                        clocks = <&clks IMX27_CLK_GPIO_IPG_GATE>;
                                         interrupts = <8>;
                                         gpio-controller;
                                         #gpio-cells = <2>;
@@ -296,6 +313,7 @@
                                 gpio3: gpio@10015200 {
                                         compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
                                         reg = <0x10015200 0x100>;
+                                        clocks = <&clks IMX27_CLK_GPIO_IPG_GATE>;
                                         interrupts = <8>;
                                         gpio-controller;
                                         #gpio-cells = <2>;
@@ -306,6 +324,7 @@
                                 gpio4: gpio@10015300 {
                                         compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
                                         reg = <0x10015300 0x100>;
+                                        clocks = <&clks IMX27_CLK_GPIO_IPG_GATE>;
                                         interrupts = <8>;
                                         gpio-controller;
                                         #gpio-cells = <2>;
@@ -316,6 +335,7 @@
                                 gpio5: gpio@10015400 {
                                         compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
                                         reg = <0x10015400 0x100>;
+                                        clocks = <&clks IMX27_CLK_GPIO_IPG_GATE>;
                                         interrupts = <8>;
                                         gpio-controller;
                                         #gpio-cells = <2>;
@@ -326,6 +346,7 @@
                                 gpio6: gpio@10015500 {
                                         compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
                                         reg = <0x10015500 0x100>;
+                                        clocks = <&clks IMX27_CLK_GPIO_IPG_GATE>;
                                         interrupts = <8>;
                                         gpio-controller;
                                         #gpio-cells = <2>;
@@ -337,7 +358,7 @@
                         audmux: audmux@10016000 {
                                 compatible = "fsl,imx27-audmux", "fsl,imx21-audmux";
                                 reg = <0x10016000 0x1000>;
-                                clocks = <&clks 0>;
+                                clocks = <&clks IMX27_CLK_DUMMY>;
                                 clock-names = "audmux";
                                 status = "disabled";
                         };
@@ -348,7 +369,8 @@
                                 compatible = "fsl,imx27-cspi";
                                 reg = <0x10017000 0x1000>;
                                 interrupts = <6>;
-                                clocks = <&clks 51>, <&clks 60>;
+                                clocks = <&clks IMX27_CLK_CSPI3_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER2_GATE>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -357,7 +379,8 @@
                                 compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
                                 reg = <0x10019000 0x1000>;
                                 interrupts = <4>;
-                                clocks = <&clks 43>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_GPT4_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -365,7 +388,8 @@
                                 compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
                                 reg = <0x1001a000 0x1000>;
                                 interrupts = <3>;
-                                clocks = <&clks 42>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_GPT5_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -373,7 +397,8 @@
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1001b000 0x1000>;
                                 interrupts = <49>;
-                                clocks = <&clks 77>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_UART5_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -382,7 +407,8 @@
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1001c000 0x1000>;
                                 interrupts = <48>;
-                                clocks = <&clks 78>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_UART6_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -393,7 +419,7 @@
                                 compatible = "fsl,imx27-i2c", "fsl,imx21-i2c";
                                 reg = <0x1001d000 0x1000>;
                                 interrupts = <1>;
-                                clocks = <&clks 39>;
+                                clocks = <&clks IMX27_CLK_I2C2_IPG_GATE>;
                                 status = "disabled";
                         };
 
@@ -401,7 +427,8 @@
                                 compatible = "fsl,imx27-mmc", "fsl,imx21-mmc";
                                 reg = <0x1001e000 0x1000>;
                                 interrupts = <9>;
-                                clocks = <&clks 28>, <&clks 60>;
+                                clocks = <&clks IMX27_CLK_SDHC3_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER2_GATE>;
                                 clock-names = "ipg", "per";
                                 dmas = <&dma 36>;
                                 dma-names = "rx-tx";
@@ -412,7 +439,8 @@
                                 compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
                                 reg = <0x1001f000 0x1000>;
                                 interrupts = <2>;
-                                clocks = <&clks 41>, <&clks 61>;
+                                clocks = <&clks IMX27_CLK_GPT6_IPG_GATE>,
+                                         <&clks IMX27_CLK_PER1_GATE>;
                                 clock-names = "ipg", "per";
                         };
                 };
@@ -428,7 +456,9 @@
                                 compatible = "fsl,imx27-fb", "fsl,imx21-fb";
                                 interrupts = <61>;
                                 reg = <0x10021000 0x1000>;
-                                clocks = <&clks 36>, <&clks 65>, <&clks 59>;
+                                clocks = <&clks IMX27_CLK_LCDC_IPG_GATE>,
+                                         <&clks IMX27_CLK_LCDC_AHB_GATE>,
+                                         <&clks IMX27_CLK_PER3_GATE>;
                                 clock-names = "ipg", "ahb", "per";
                                 status = "disabled";
                         };
@@ -437,7 +467,8 @@
                                 compatible = "fsl,imx27-vpu";
                                 reg = <0x10023000 0x0200>;
                                 interrupts = <53>;
-                                clocks = <&clks 57>, <&clks 66>;
+                                clocks = <&clks IMX27_CLK_VPU_BAUD_GATE>,
+                                         <&clks IMX27_CLK_VPU_AHB_GATE>;
                                 clock-names = "per", "ahb";
                                 iram = <&iram>;
                         };
@@ -446,7 +477,7 @@
                                 compatible = "fsl,imx27-usb";
                                 reg = <0x10024000 0x200>;
                                 interrupts = <56>;
-                                clocks = <&clks 75>;
+                                clocks = <&clks IMX27_CLK_USB_IPG_GATE>;
                                 fsl,usbmisc = <&usbmisc 0>;
                                 status = "disabled";
                         };
@@ -455,7 +486,7 @@
                                 compatible = "fsl,imx27-usb";
                                 reg = <0x10024200 0x200>;
                                 interrupts = <54>;
-                                clocks = <&clks 75>;
+                                clocks = <&clks IMX27_CLK_USB_IPG_GATE>;
                                 fsl,usbmisc = <&usbmisc 1>;
                                 status = "disabled";
                         };
@@ -464,7 +495,7 @@
                                 compatible = "fsl,imx27-usb";
                                 reg = <0x10024400 0x200>;
                                 interrupts = <55>;
-                                clocks = <&clks 75>;
+                                clocks = <&clks IMX27_CLK_USB_IPG_GATE>;
                                 fsl,usbmisc = <&usbmisc 2>;
                                 status = "disabled";
                         };
@@ -473,14 +504,15 @@
                                 #index-cells = <1>;
                                 compatible = "fsl,imx27-usbmisc";
                                 reg = <0x10024600 0x200>;
-                                clocks = <&clks 62>;
+                                clocks = <&clks IMX27_CLK_USB_AHB_GATE>;
                         };
 
                         sahara2: sahara@10025000 {
                                 compatible = "fsl,imx27-sahara";
                                 reg = <0x10025000 0x1000>;
                                 interrupts = <59>;
-                                clocks = <&clks 32>, <&clks 64>;
+                                clocks = <&clks IMX27_CLK_SAHARA_IPG_GATE>,
+                                         <&clks IMX27_CLK_SAHARA_AHB_GATE>;
                                 clock-names = "ipg", "ahb";
                         };
 
@@ -494,14 +526,15 @@
                                 compatible = "fsl,imx27-iim";
                                 reg = <0x10028000 0x1000>;
                                 interrupts = <62>;
-                                clocks = <&clks 38>;
+                                clocks = <&clks IMX27_CLK_IIM_IPG_GATE>;
                         };
 
                         fec: ethernet@1002b000 {
                                 compatible = "fsl,imx27-fec";
                                 reg = <0x1002b000 0x4000>;
                                 interrupts = <50>;
-                                clocks = <&clks 48>, <&clks 67>;
+                                clocks = <&clks IMX27_CLK_FEC_IPG_GATE>,
+                                         <&clks IMX27_CLK_FEC_AHB_GATE>;
                                 clock-names = "ipg", "ahb";
                                 status = "disabled";
                         };
@@ -513,7 +546,7 @@
                         compatible = "fsl,imx27-nand";
                         reg = <0xd8000000 0x1000>;
                         interrupts = <29>;
-                        clocks = <&clks 54>;
+                        clocks = <&clks IMX27_CLK_NFC_BAUD_GATE>;
                         status = "disabled";
                 };
 
@@ -522,7 +555,7 @@
                         #size-cells = <1>;
                         compatible = "fsl,imx27-weim";
                         reg = <0xd8002000 0x1000>;
-                        clocks = <&clks 0>;
+                        clocks = <&clks IMX27_CLK_EMI_AHB_GATE>;
                         ranges = <
                                 0 0 0xc0000000 0x08000000
                                 1 0 0xc8000000 0x08000000
diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts
index ae7c3390e65a..b04b6b8850a7 100644
--- a/arch/arm/boot/dts/imx28-cfa10036.dts
+++ b/arch/arm/boot/dts/imx28-cfa10036.dts
@@ -53,6 +53,17 @@
                                         fsl,pull-up = <MXS_PULL_DISABLE>;
                                 };
 
+                                mmc_pwr_cfa10036: mmc_pwr_cfa10036@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x31c3 /*
+                                                MX28_PAD_PWM3__GPIO_3_28 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
                         };
 
                         ssp0: ssp@80010000 {
@@ -60,6 +71,7 @@
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&mmc0_4bit_pins_a
                                         &mmc0_cd_cfg &mmc0_sck_cfg>;
+                                vmmc-supply = <&reg_vddio_sd0>;
                                 bus-width = <4>;
                                 status = "okay";
                         };
@@ -116,4 +128,14 @@
                         default-state = "on";
                 };
         };
+
+        reg_vddio_sd0: vddio-sd0 {
+                compatible = "regulator-fixed";
+                pinctrl-names = "default";
+                pinctrl-0 = <&mmc_pwr_cfa10036>;
+                regulator-name = "vddio-sd0";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio3 28 0>;
+        };
 };
diff --git a/arch/arm/boot/dts/imx28-m28.dtsi b/arch/arm/boot/dts/imx28-m28.dtsi
new file mode 100644
index 000000000000..759cc56253dd
--- /dev/null
+++ b/arch/arm/boot/dts/imx28-m28.dtsi
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2014 Marek Vasut <marex@denx.de>
+ *
+ * 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 "imx28.dtsi"
+
+/ {
+        model = "DENX M28";
+        compatible = "denx,m28", "fsl,imx28";
+
+        memory {
+                reg = <0x40000000 0x08000000>;
+        };
+
+        apb@80000000 {
+                apbh@80000000 {
+                        gpmi-nand@8000c000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+                                status = "okay";
+
+                                partition@0 {
+                                        label = "bootloader";
+                                        reg = <0x00000000 0x00300000>;
+                                        read-only;
+                                };
+
+                                partition@1 {
+                                        label = "environment";
+                                        reg = <0x00300000 0x00080000>;
+                                };
+
+                                partition@2 {
+                                        label = "redundant-environment";
+                                        reg = <0x00380000 0x00080000>;
+                                };
+
+                                partition@3 {
+                                        label = "kernel";
+                                        reg = <0x00400000 0x00400000>;
+                                };
+
+                                partition@4 {
+                                        label = "filesystem";
+                                        reg = <0x00800000 0x0f800000>;
+                                };
+                        };
+                };
+
+                apbx@80040000 {
+                        i2c0: i2c@80058000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&i2c0_pins_a>;
+                                status = "okay";
+
+                                rtc: rtc@68 {
+                                        compatible = "stm,m41t62";
+                                        reg = <0x68>;
+                                };
+                        };
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                reg_3p3v: regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        regulator-name = "3P3V";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index f0ad7b9b9d9a..b3c09ae3b928 100644
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -10,52 +10,14 @@
  */
 
 /dts-v1/;
-#include "imx28.dtsi"
+#include "imx28-m28.dtsi"
 
 / {
         model = "DENX M28EVK";
         compatible = "denx,m28evk", "fsl,imx28";
 
-        memory {
-                reg = <0x40000000 0x08000000>;
-        };
-
         apb@80000000 {
                 apbh@80000000 {
-                        gpmi-nand@8000c000 {
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                pinctrl-names = "default";
-                                pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
-                                status = "okay";
-
-                                partition@0 {
-                                        label = "bootloader";
-                                        reg = <0x00000000 0x00300000>;
-                                        read-only;
-                                };
-
-                                partition@1 {
-                                        label = "environment";
-                                        reg = <0x00300000 0x00080000>;
-                                };
-
-                                partition@2 {
-                                        label = "redundant-environment";
-                                        reg = <0x00380000 0x00080000>;
-                                };
-
-                                partition@3 {
-                                        label = "kernel";
-                                        reg = <0x00400000 0x00400000>;
-                                };
-
-                                partition@4 {
-                                        label = "filesystem";
-                                        reg = <0x00800000 0x0f800000>;
-                                };
-                        };
-
                         ssp0: ssp@80010000 {
                                 compatible = "fsl,imx28-mmc";
                                 pinctrl-names = "default";
@@ -175,10 +137,6 @@
                         };
 
                         i2c0: i2c@80058000 {
-                                pinctrl-names = "default";
-                                pinctrl-0 = <&i2c0_pins_a>;
-                                status = "okay";
-
                                 sgtl5000: codec@0a {
                                         compatible = "fsl,sgtl5000";
                                         reg = <0x0a>;
@@ -192,11 +150,6 @@
                                         reg = <0x51>;
                                         pagesize = <32>;
                                 };
-
-                                rtc: rtc@68 {
-                                        compatible = "stm,m41t62";
-                                        reg = <0x68>;
-                                };
                         };
 
                         lradc@80050000 {
@@ -284,19 +237,6 @@
         };
 
         regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                reg_3p3v: regulator@0 {
-                        compatible = "regulator-fixed";
-                        reg = <0>;
-                        regulator-name = "3P3V";
-                        regulator-min-microvolt = <3300000>;
-                        regulator-max-microvolt = <3300000>;
-                        regulator-always-on;
-                };
-
                 reg_vddio_sd0: regulator@1 {
                         compatible = "regulator-fixed";
                         reg = <1>;
diff --git a/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts b/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
index f04ae91eea89..75b036700d31 100644
--- a/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
+++ b/arch/arm/boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts
@@ -133,7 +133,6 @@
 
 &ssi1 {
         codec-handle = <&tlv320aic23>;
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index 4759abb49436..442e216ca9d9 100644
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -193,6 +193,14 @@
                                 #clock-cells = <1>;
                         };
 
+                        gpt: timer@53f90000 {
+                                compatible = "fsl,imx35-gpt", "fsl,imx31-gpt";
+                                reg = <0x53f90000 0x4000>;
+                                interrupts = <29>;
+                                clocks = <&clks 9>, <&clks 50>;
+                                clock-names = "ipg", "per";
+                        };
+
                         gpio3: gpio@53fa4000 {
                                 compatible = "fsl,imx35-gpio", "fsl,imx31-gpio";
                                 reg = <0x53fa4000 0x4000>;
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index 6a201cf54366..c0e0f60ab6b2 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -151,8 +151,10 @@
                                         reg = <0x50014000 0x4000>;
                                         interrupts = <30>;
                                         clocks = <&clks IMX5_CLK_SSI2_IPG_GATE>;
+                                        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";
                                 };
 
@@ -457,8 +459,10 @@
                                 reg = <0x63fcc000 0x4000>;
                                 interrupts = <29>;
                                 clocks = <&clks IMX5_CLK_SSI1_IPG_GATE>;
+                                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";
                         };
 
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 181d77fa2fa6..56569cecaa78 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -203,6 +203,7 @@
                 reg = <0>;
                 interrupt-parent = <&gpio1>;
                 interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
+                fsl,mc13xxx-uses-rtc;
 
                 regulators {
                         sw1_reg: sw1 {
@@ -392,7 +393,6 @@
 };
 
 &ssi2 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
index 31cfb7f2b02e..34599c547459 100644
--- a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
+++ b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
@@ -255,7 +255,6 @@
 
 &ssi2 {
         codec-handle = <&tlv320aic23>;
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index bebbf3ba0d5e..17c05a6fa776 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -218,7 +218,6 @@
                                                <&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";
                                 };
 
@@ -508,7 +507,6 @@
                                        <&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";
                         };
 
@@ -564,7 +562,6 @@
                                        <&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";
                         };
 
diff --git a/arch/arm/boot/dts/imx53-m53.dtsi b/arch/arm/boot/dts/imx53-m53.dtsi
new file mode 100644
index 000000000000..87a7fc709c2d
--- /dev/null
+++ b/arch/arm/boot/dts/imx53-m53.dtsi
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2014 Marek Vasut <marex@denx.de>
+ *
+ * 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 "imx53.dtsi"
+
+/ {
+        model = "DENX M53";
+        compatible = "denx,imx53-m53", "fsl,imx53";
+
+        memory {
+                reg = <0x70000000 0x20000000>,
+                      <0xb0000000 0x20000000>;
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                reg_3p2v: regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        regulator-name = "3P2V";
+                        regulator-min-microvolt = <3200000>;
+                        regulator-max-microvolt = <3200000>;
+                        regulator-always-on;
+                };
+
+                reg_backlight: regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "lcd-supply";
+                        regulator-min-microvolt = <3200000>;
+                        regulator-max-microvolt = <3200000>;
+                        regulator-always-on;
+                };
+        };
+};
+
+&i2c2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c2>;
+        clock-frequency = <400000>;
+        status = "okay";
+
+        stmpe610@41 {
+                compatible = "st,stmpe610";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x41>;
+                id = <0>;
+                blocks = <0x5>;
+                interrupts = <6 0x0>;
+                interrupt-parent = <&gpio7>;
+                irq-trigger = <0x1>;
+
+                stmpe_touchscreen {
+                        compatible = "st,stmpe-ts";
+                        reg = <0>;
+                        st,sample-time = <4>;
+                        st,mod-12b = <1>;
+                        st,ref-sel = <0>;
+                        st,adc-freq = <1>;
+                        st,ave-ctrl = <3>;
+                        st,touch-det-delay = <3>;
+                        st,settling = <4>;
+                        st,fraction-z = <7>;
+                        st,i-drive = <1>;
+                };
+        };
+
+        eeprom: eeprom@50 {
+                compatible = "atmel,24c128";
+                reg = <0x50>;
+                pagesize = <32>;
+        };
+
+        rtc: rtc@68 {
+                compatible = "stm,m41t62";
+                reg = <0x68>;
+        };
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hog>;
+
+        imx53-m53evk {
+                pinctrl_hog: hoggrp {
+                        fsl,pins = <
+                                MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK       0x80000000
+                                MX53_PAD_EIM_EB3__GPIO2_31              0x80000000
+                                MX53_PAD_PATA_DA_0__GPIO7_6             0x80000000
+                        >;
+                };
+
+                pinctrl_i2c2: i2c2grp {
+                        fsl,pins = <
+                                MX53_PAD_EIM_D16__I2C2_SDA              0xc0000000
+                                MX53_PAD_EIM_EB2__I2C2_SCL              0xc0000000
+                        >;
+                };
+
+                pinctrl_nand: nandgrp {
+                        fsl,pins = <
+                                MX53_PAD_NANDF_WE_B__EMI_NANDF_WE_B     0x4
+                                MX53_PAD_NANDF_RE_B__EMI_NANDF_RE_B     0x4
+                                MX53_PAD_NANDF_CLE__EMI_NANDF_CLE       0x4
+                                MX53_PAD_NANDF_ALE__EMI_NANDF_ALE       0x4
+                                MX53_PAD_NANDF_WP_B__EMI_NANDF_WP_B     0xe0
+                                MX53_PAD_NANDF_RB0__EMI_NANDF_RB_0      0xe0
+                                MX53_PAD_NANDF_CS0__EMI_NANDF_CS_0      0x4
+                                MX53_PAD_PATA_DATA0__EMI_NANDF_D_0      0xa4
+                                MX53_PAD_PATA_DATA1__EMI_NANDF_D_1      0xa4
+                                MX53_PAD_PATA_DATA2__EMI_NANDF_D_2      0xa4
+                                MX53_PAD_PATA_DATA3__EMI_NANDF_D_3      0xa4
+                                MX53_PAD_PATA_DATA4__EMI_NANDF_D_4      0xa4
+                                MX53_PAD_PATA_DATA5__EMI_NANDF_D_5      0xa4
+                                MX53_PAD_PATA_DATA6__EMI_NANDF_D_6      0xa4
+                                MX53_PAD_PATA_DATA7__EMI_NANDF_D_7      0xa4
+                        >;
+                };
+        };
+};
+
+&nfc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_nand>;
+        nand-bus-width = <8>;
+        nand-ecc-mode = "hw";
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index c4956b0ffb35..d0e0f57eb432 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -10,17 +10,12 @@
  */
 
 /dts-v1/;
-#include "imx53.dtsi"
+#include "imx53-m53.dtsi"
 
 / {
         model = "DENX M53EVK";
         compatible = "denx,imx53-m53evk", "fsl,imx53";
 
-        memory {
-                reg = <0x70000000 0x20000000>,
-                      <0xb0000000 0x20000000>;
-        };
-
         display1: display@di1 {
                 compatible = "fsl,imx-parallel-display";
                 interface-pix-fmt = "bgr666";
@@ -81,25 +76,6 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                reg_3p2v: regulator@0 {
-                        compatible = "regulator-fixed";
-                        reg = <0>;
-                        regulator-name = "3P2V";
-                        regulator-min-microvolt = <3200000>;
-                        regulator-max-microvolt = <3200000>;
-                        regulator-always-on;
-                };
-
-
-                reg_backlight: regulator@1 {
-                        compatible = "regulator-fixed";
-                        reg = <1>;
-                        regulator-name = "lcd-supply";
-                        regulator-min-microvolt = <3200000>;
-                        regulator-max-microvolt = <3200000>;
-                        regulator-always-on;
-                };
-
                 reg_usbh1_vbus: regulator@3 {
                         compatible = "regulator-fixed";
                         reg = <3>;
@@ -174,50 +150,6 @@
         };
 };
 
-&i2c2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_i2c2>;
-        clock-frequency = <400000>;
-        status = "okay";
-
-        stmpe610@41 {
-                compatible = "st,stmpe610";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                reg = <0x41>;
-                id = <0>;
-                blocks = <0x5>;
-                interrupts = <6 0x0>;
-                interrupt-parent = <&gpio7>;
-                irq-trigger = <0x1>;
-
-                stmpe_touchscreen {
-                        compatible = "st,stmpe-ts";
-                        reg = <0>;
-                        st,sample-time = <4>;
-                        st,mod-12b = <1>;
-                        st,ref-sel = <0>;
-                        st,adc-freq = <1>;
-                        st,ave-ctrl = <3>;
-                        st,touch-det-delay = <3>;
-                        st,settling = <4>;
-                        st,fraction-z = <7>;
-                        st,i-drive = <1>;
-                };
-        };
-
-        eeprom: eeprom@50 {
-                compatible = "atmel,24c128";
-                reg = <0x50>;
-                pagesize = <32>;
-        };
-
-        rtc: rtc@68 {
-                compatible = "stm,m41t62";
-                reg = <0x68>;
-        };
-};
-
 &i2c3 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_i2c3>;
@@ -229,11 +161,8 @@
         pinctrl-0 = <&pinctrl_hog>;
 
         imx53-m53evk {
-                pinctrl_hog: hoggrp {
+                pinctrl_usb: usbgrp {
                         fsl,pins = <
-                                MX53_PAD_GPIO_0__CCM_SSI_EXT1_CLK       0x80000000
-                                MX53_PAD_EIM_EB3__GPIO2_31              0x80000000
-                                MX53_PAD_PATA_DA_0__GPIO7_6             0x80000000
                                 MX53_PAD_GPIO_2__GPIO1_2                0x80000000
                                 MX53_PAD_GPIO_3__USBOH3_USBH1_OC        0x80000000
                         >;
@@ -302,13 +231,6 @@
                         >;
                 };
 
-                pinctrl_i2c2: i2c2grp {
-                        fsl,pins = <
-                                MX53_PAD_EIM_D16__I2C2_SDA              0xc0000000
-                                MX53_PAD_EIM_EB2__I2C2_SCL              0xc0000000
-                        >;
-                };
-
                 pinctrl_i2c3: i2c3grp {
                         fsl,pins = <
                                 MX53_PAD_GPIO_6__I2C3_SDA               0xc0000000
@@ -353,26 +275,6 @@
                         >;
                 };
 
-                pinctrl_nand: nandgrp {
-                        fsl,pins = <
-                                MX53_PAD_NANDF_WE_B__EMI_NANDF_WE_B     0x4
-                                MX53_PAD_NANDF_RE_B__EMI_NANDF_RE_B     0x4
-                                MX53_PAD_NANDF_CLE__EMI_NANDF_CLE       0x4
-                                MX53_PAD_NANDF_ALE__EMI_NANDF_ALE       0x4
-                                MX53_PAD_NANDF_WP_B__EMI_NANDF_WP_B     0xe0
-                                MX53_PAD_NANDF_RB0__EMI_NANDF_RB_0      0xe0
-                                MX53_PAD_NANDF_CS0__EMI_NANDF_CS_0      0x4
-                                MX53_PAD_PATA_DATA0__EMI_NANDF_D_0      0xa4
-                                MX53_PAD_PATA_DATA1__EMI_NANDF_D_1      0xa4
-                                MX53_PAD_PATA_DATA2__EMI_NANDF_D_2      0xa4
-                                MX53_PAD_PATA_DATA3__EMI_NANDF_D_3      0xa4
-                                MX53_PAD_PATA_DATA4__EMI_NANDF_D_4      0xa4
-                                MX53_PAD_PATA_DATA5__EMI_NANDF_D_5      0xa4
-                                MX53_PAD_PATA_DATA6__EMI_NANDF_D_6      0xa4
-                                MX53_PAD_PATA_DATA7__EMI_NANDF_D_7      0xa4
-                        >;
-                };
-
                 pinctrl_pwm1: pwm1grp {
                         fsl,pins = <
                                 MX53_PAD_DISP0_DAT8__PWM1_PWMO          0x5
@@ -408,14 +310,6 @@
         remote-endpoint = <&display1_in>;
 };
 
-&nfc {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_nand>;
-        nand-bus-width = <8>;
-        nand-ecc-mode = "hw";
-        status = "okay";
-};
-
 &pwm1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_pwm1>;
@@ -427,7 +321,6 @@
 };
 
 &ssi2 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
@@ -450,6 +343,8 @@
 };
 
 &usbh1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usb>;
         vbus-supply = <&reg_usbh1_vbus>;
         phy_type = "utmi";
         status = "okay";
diff --git a/arch/arm/boot/dts/imx53-mba53.dts b/arch/arm/boot/dts/imx53-mba53.dts
index 3e3f17aa93a1..2e44d2aba14e 100644
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@ -225,7 +225,6 @@
 };
 
 &ssi2 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index fd8c60dde7de..181ae5ebf23f 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -141,7 +141,6 @@
 };
 
 &ssi2 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
index e348796ba689..704bd72cbfec 100644
--- a/arch/arm/boot/dts/imx53-tx53.dtsi
+++ b/arch/arm/boot/dts/imx53-tx53.dtsi
@@ -502,7 +502,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         codec-handle = <&sgtl5000>;
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx53-voipac-bsb.dts b/arch/arm/boot/dts/imx53-voipac-bsb.dts
index 7f6711a48615..c17d3ad6dba5 100644
--- a/arch/arm/boot/dts/imx53-voipac-bsb.dts
+++ b/arch/arm/boot/dts/imx53-voipac-bsb.dts
@@ -154,6 +154,5 @@
 };
 
 &ssi2 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 6456a0084388..64fa27b36be0 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -108,7 +108,7 @@
                         clocks = <&clks IMX5_CLK_SATA_GATE>,
                                  <&clks IMX5_CLK_SATA_REF>,
                                  <&clks IMX5_CLK_AHB>;
-                        clock-names = "sata_gate", "sata_ref", "ahb";
+                        clock-names = "sata", "sata_ref", "ahb";
                         status = "disabled";
                 };
 
@@ -231,7 +231,6 @@
                                                <&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";
                                 };
 
@@ -260,6 +259,11 @@
                                 };
                         };
 
+                        aipstz1: bridge@53f00000 {
+                                compatible = "fsl,imx53-aipstz";
+                                reg = <0x53f00000 0x60>;
+                        };
+
                         usbphy0: usbphy@0 {
                                 compatible = "usb-nop-xceiv";
                                 clocks = <&clks IMX5_CLK_USB_PHY1_GATE>;
@@ -572,6 +576,11 @@
                         reg = <0x60000000 0x10000000>;
                         ranges;
 
+                        aipstz2: bridge@63f00000 {
+                                compatible = "fsl,imx53-aipstz";
+                                reg = <0x63f00000 0x60>;
+                        };
+
                         iim: iim@63f98000 {
                                 compatible = "fsl,imx53-iim", "fsl,imx27-iim";
                                 reg = <0x63f98000 0x4000>;
@@ -661,7 +670,6 @@
                                        <&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";
                         };
 
@@ -689,7 +697,6 @@
                                        <&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";
                         };
 
diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
new file mode 100644
index 000000000000..9cd06e5e59f0
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
@@ -0,0 +1,85 @@
+/*
+ * support fot the imx6 based aristainetos board
+ *
+ * Copyright (C) 2014 Heiko Schocher <hs@denx.de>
+ *
+ * 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 "imx6dl.dtsi"
+#include "imx6qdl-aristainetos.dtsi"
+
+/ {
+        model = "aristainetos i.MX6 Dual Lite Board 4";
+        compatible = "fsl,imx6dl";
+
+        backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm1 0 5000000>;
+                brightness-levels = <0 4 8 16 32 64 128 255>;
+                default-brightness-level = <7>;
+                enable-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_backlight>;
+                status = "okay";
+        };
+
+        memory {
+                reg = <0x10000000 0x40000000>;
+        };
+
+        soc {
+                display0: display@di0 {
+                        compatible = "fsl,imx-parallel-display";
+                        interface-pix-fmt = "rgb24";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ipu_disp>;
+                        status = "okay";
+
+                        display-timings {
+                                480x800p60 {
+                                        native-mode;
+                                        clock-frequency = <30000000>;
+                                        hactive = <480>;
+                                        vactive = <800>;
+                                        hfront-porch = <59>;
+                                        hback-porch = <10>;
+                                        hsync-len = <10>;
+                                        vback-porch = <15>;
+                                        vfront-porch = <15>;
+                                        vsync-len = <15>;
+                                        hsync-active = <1>;
+                                        vsync-active = <1>;
+                                };
+                        };
+
+                        port {
+                                display0_in: endpoint {
+                                        remote-endpoint = <&ipu1_di0_disp0>;
+                                };
+                        };
+                };
+        };
+};
+
+&ecspi2 {
+        fsl,spi-num-chipselects = <1>;
+        cs-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi2>;
+        status = "okay";
+};
+
+&i2c2 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c2>;
+        status = "okay";
+};
+
+&ipu1_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
new file mode 100644
index 000000000000..b413e24288dc
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
@@ -0,0 +1,74 @@
+/*
+ * support fot the imx6 based aristainetos board
+ *
+ * Copyright (C) 2014 Heiko Schocher <hs@denx.de>
+ *
+ * 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 "imx6dl.dtsi"
+#include "imx6qdl-aristainetos.dtsi"
+
+/ {
+        model = "aristainetos i.MX6 Dual Lite Board 7";
+        compatible = "fsl,imx6dl";
+
+        memory {
+                reg = <0x10000000 0x40000000>;
+        };
+
+        soc {
+                display0: display@di0 {
+                        compatible = "fsl,imx-parallel-display";
+                        interface-pix-fmt = "rgb24";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_ipu_disp>;
+                        status = "okay";
+
+                        display-timings {
+                                800x480p60 {
+                                        native-mode;
+                                        clock-frequency = <33246000>;
+                                        hactive = <800>;
+                                        vactive = <480>;
+                                        hfront-porch = <88>;
+                                        hback-porch = <88>;
+                                        hsync-len = <80>;
+                                        vback-porch = <10>;
+                                        vfront-porch = <10>;
+                                        vsync-len = <25>;
+                                        vsync-active = <1>;
+                                };
+                        };
+
+                        port {
+                                display0_in: endpoint {
+                                        remote-endpoint = <&ipu1_di0_disp0>;
+                                };
+                        };
+                };
+        };
+
+        backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm3 0 3000>;
+                brightness-levels = <0 4 8 16 32 64 128 255>;
+                default-brightness-level = <6>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_backlight>;
+        };
+};
+
+&i2c2 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c2>;
+        status = "okay";
+};
+
+&ipu1_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
diff --git a/arch/arm/boot/dts/imx6dl-gw51xx.dts b/arch/arm/boot/dts/imx6dl-gw51xx.dts
index 4bd055f4c930..b2bd022fc6be 100644
--- a/arch/arm/boot/dts/imx6dl-gw51xx.dts
+++ b/arch/arm/boot/dts/imx6dl-gw51xx.dts
@@ -14,6 +14,6 @@
 #include "imx6qdl-gw51xx.dtsi"
 
 / {
-        model = "Gateworks Ventana i.MX6 DualLite GW51XX";
+        model = "Gateworks Ventana i.MX6 DualLite/Solo GW51XX";
         compatible = "gw,imx6dl-gw51xx", "gw,ventana", "fsl,imx6dl";
 };
diff --git a/arch/arm/boot/dts/imx6dl-gw52xx.dts b/arch/arm/boot/dts/imx6dl-gw52xx.dts
index c9136058f15e..a2e0b73fdd4a 100644
--- a/arch/arm/boot/dts/imx6dl-gw52xx.dts
+++ b/arch/arm/boot/dts/imx6dl-gw52xx.dts
@@ -14,6 +14,6 @@
 #include "imx6qdl-gw52xx.dtsi"
 
 / {
-        model = "Gateworks Ventana i.MX6 DualLite GW52XX";
+        model = "Gateworks Ventana i.MX6 DualLite/Solo GW52XX";
         compatible = "gw,imx6dl-gw52xx", "gw,ventana", "fsl,imx6dl";
 };
diff --git a/arch/arm/boot/dts/imx6dl-gw53xx.dts b/arch/arm/boot/dts/imx6dl-gw53xx.dts
index 61818a14fde6..6844b708d2f8 100644
--- a/arch/arm/boot/dts/imx6dl-gw53xx.dts
+++ b/arch/arm/boot/dts/imx6dl-gw53xx.dts
@@ -14,6 +14,6 @@
 #include "imx6qdl-gw53xx.dtsi"
 
 / {
-        model = "Gateworks Ventana i.MX6 DualLite GW53XX";
+        model = "Gateworks Ventana i.MX6 DualLite/Solo GW53XX";
         compatible = "gw,imx6dl-gw53xx", "gw,ventana", "fsl,imx6dl";
 };
diff --git a/arch/arm/boot/dts/imx6dl-gw54xx.dts b/arch/arm/boot/dts/imx6dl-gw54xx.dts
index ab38b6770a06..be915412f852 100644
--- a/arch/arm/boot/dts/imx6dl-gw54xx.dts
+++ b/arch/arm/boot/dts/imx6dl-gw54xx.dts
@@ -14,6 +14,6 @@
 #include "imx6qdl-gw54xx.dtsi"
 
 / {
-        model = "Gateworks Ventana i.MX6 DualLite GW54XX";
+        model = "Gateworks Ventana i.MX6 DualLite/Solo GW54XX";
         compatible = "gw,imx6dl-gw54xx", "gw,ventana", "fsl,imx6dl";
 };
diff --git a/arch/arm/boot/dts/imx6dl-rex-basic.dts b/arch/arm/boot/dts/imx6dl-rex-basic.dts
new file mode 100644
index 000000000000..b13845c2823b
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-rex-basic.dts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 FEDEVEL, Inc.
+ *
+ * Author: Robert Nelson <robertcnelson@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.
+ *
+ */
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-rex.dtsi"
+
+/ {
+        model = "Rex Basic i.MX6 Dual Lite Board";
+        compatible = "rex,imx6dl-rex-basic", "fsl,imx6dl";
+
+        memory {
+                reg = <0x10000000 0x20000000>;
+        };
+};
+
+&ecspi3 {
+        flash: m25p80@0 {
+                compatible = "sst,sst25vf016b";
+                spi-max-frequency = <20000000>;
+                reg = <0>;
+        };
+};
diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts
index 909fafc0b650..43cb3fd76be7 100644
--- a/arch/arm/boot/dts/imx6dl-riotboard.dts
+++ b/arch/arm/boot/dts/imx6dl-riotboard.dts
@@ -254,7 +254,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
@@ -335,10 +334,10 @@
         imx6-riotboard {
                 pinctrl_audmux: audmuxgrp {
                         fsl,pins = <
-                                MX6QDL_PAD_CSI0_DAT7__AUD3_RXD          0x8000000
-                                MX6QDL_PAD_CSI0_DAT4__AUD3_TXC          0x8000000
-                                MX6QDL_PAD_CSI0_DAT5__AUD3_TXD          0x8000000
-                                MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS         0x8000000
+                                MX6QDL_PAD_CSI0_DAT7__AUD3_RXD          0x130b0
+                                MX6QDL_PAD_CSI0_DAT4__AUD3_TXC          0x130b0
+                                MX6QDL_PAD_CSI0_DAT5__AUD3_TXD          0x110b0
+                                MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS         0x130b0
                                 MX6QDL_PAD_GPIO_0__CCM_CLKO1            0x130b0         /* CAM_MCLK */
                         >;
                 };
@@ -376,7 +375,7 @@
                         fsl,pins = <
                                 MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
                                 MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
-                                MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x80000000
+                                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
@@ -389,9 +388,9 @@
                                 MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b0b0         /* AR8035 pin strapping: MODE#1: pull up */
                                 MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b0b0         /* AR8035 pin strapping: MODE#3: pull up */
                                 MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x130b0         /* AR8035 pin strapping: MODE#0: pull down */
-                                MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0xc0000000      /* GPIO16 -> AR8035 25MHz */
+                                MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0x4001b0a8      /* GPIO16 -> AR8035 25MHz */
                                 MX6QDL_PAD_EIM_D31__GPIO3_IO31          0x130b0         /* RGMII_nRST */
-                                MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28       0x80000000      /* AR8035 interrupt */
+                                MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28       0x180b0         /* AR8035 interrupt */
                                 MX6QDL_PAD_GPIO_6__ENET_IRQ             0x000b1
                         >;
                 };
@@ -426,8 +425,8 @@
 
                 pinctrl_led: ledgrp {
                         fsl,pins = <
-                                MX6QDL_PAD_EIM_A25__GPIO5_IO02          0x80000000      /* user led0 */
-                                MX6QDL_PAD_EIM_D28__GPIO3_IO28          0x80000000      /* user led1 */
+                                MX6QDL_PAD_EIM_A25__GPIO5_IO02          0x1b0b1 /* user led0 */
+                                MX6QDL_PAD_EIM_D28__GPIO3_IO28          0x1b0b1 /* user led1 */
                         >;
                 };
 
@@ -493,8 +492,8 @@
                 pinctrl_usbotg: usbotggrp {
                         fsl,pins = <
                                 MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID       0x17059
-                                MX6QDL_PAD_EIM_D22__GPIO3_IO22          0x80000000      /* MX6QDL_PAD_EIM_D22__USB_OTG_PWR */
-                                MX6QDL_PAD_EIM_D21__USB_OTG_OC          0x80000000
+                                MX6QDL_PAD_EIM_D22__GPIO3_IO22          0x000b0 /* MX6QDL_PAD_EIM_D22__USB_OTG_PWR */
+                                MX6QDL_PAD_EIM_D21__USB_OTG_OC          0x1b0b0
                         >;
                 };
 
@@ -506,8 +505,8 @@
                                 MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x17059
                                 MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x17059
                                 MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x17059
-                                MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x80000000      /* SD2 CD */
-                                MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x80000000      /* SD2 WP */
+                                MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x1b0b0 /* SD2 CD */
+                                MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x1f0b0 /* SD2 WP */
                         >;
                 };
 
@@ -519,8 +518,8 @@
                                 MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
                                 MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
                                 MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
-                                MX6QDL_PAD_SD3_DAT5__GPIO7_IO00         0x80000000      /* SD3 CD */
-                                MX6QDL_PAD_SD3_DAT4__GPIO7_IO01         0x80000000      /* SD3 WP */
+                                MX6QDL_PAD_SD3_DAT5__GPIO7_IO00         0x1b0b0 /* SD3 CD */
+                                MX6QDL_PAD_SD3_DAT4__GPIO7_IO01         0x1f0b0 /* SD3 WP */
                         >;
                 };
 
@@ -532,7 +531,7 @@
                                 MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x17059
                                 MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x17059
                                 MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x17059
-                                MX6QDL_PAD_NANDF_ALE__GPIO6_IO08        0x80000000      /* SD4 RST (eMMC) */
+                                MX6QDL_PAD_NANDF_ALE__GPIO6_IO08        0x17059 /* SD4 RST (eMMC) */
                         >;
                 };
         };
diff --git a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
new file mode 100644
index 000000000000..913bb9a0466a
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+        model = "Ka-Ro electronics TX6DL Module on CoMpact TFT";
+        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+
+        aliases {
+                display = &display;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm2 0 500000 0>;
+                power-supply = <&reg_3v3>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+
+        display: display@di0 {
+                compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "rgb24";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_disp0_1>;
+                status = "okay";
+
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu1_di0_disp0>;
+                        };
+                };
+
+                display-timings {
+                        native-mode = <&ET070001DM6>;
+
+                        ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+                };
+        };
+};
+
+&can1 {
+        status = "disabled";
+};
+
+&can2 {
+        xceiver-supply = <&reg_3v3>;
+};
+
+&ipu1_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
+
+&kpp {
+        status = "disabled";
+};
+
+&reg_can_xcvr {
+        status = "disabled";
+};
+
+&touchscreen {
+        status = "disabled";
+};
diff --git a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts
new file mode 100644
index 000000000000..5fe465c2814e
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+        model = "Ka-Ro electronics TX6U-801x Module";
+        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+
+        aliases {
+                display = &display;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+                power-supply = <&reg_3v3>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+
+        display: display@di0 {
+                compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "rgb24";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_disp0_1>;
+                status = "okay";
+
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu1_di0_disp0>;
+                        };
+                };
+
+                display-timings {
+                        VGA {
+                                clock-frequency = <25200000>;
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <48>;
+                                hsync-len = <96>;
+                                hfront-porch = <16>;
+                                vback-porch = <31>;
+                                vsync-len = <2>;
+                                vfront-porch = <12>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ETV570 {
+                                clock-frequency = <25200000>;
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <114>;
+                                hsync-len = <30>;
+                                hfront-porch = <16>;
+                                vback-porch = <32>;
+                                vsync-len = <3>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ET0350 {
+                                clock-frequency = <6413760>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <34>;
+                                hsync-len = <34>;
+                                hfront-porch = <20>;
+                                vback-porch = <15>;
+                                vsync-len = <3>;
+                                vfront-porch = <4>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ET0430 {
+                                clock-frequency = <9009000>;
+                                hactive = <480>;
+                                vactive = <272>;
+                                hback-porch = <2>;
+                                hsync-len = <41>;
+                                hfront-porch = <2>;
+                                vback-porch = <2>;
+                                vsync-len = <10>;
+                                vfront-porch = <2>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+
+                        ET0500 {
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ET0700 { /* same as ET0500 */
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ETQ570 {
+                                clock-frequency = <6596040>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <38>;
+                                hsync-len = <30>;
+                                hfront-porch = <30>;
+                                vback-porch = <16>;
+                                vsync-len = <3>;
+                                vfront-porch = <4>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+                };
+        };
+};
+
+&ipu1_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
diff --git a/arch/arm/boot/dts/imx6dl-tx6u-811x.dts b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
new file mode 100644
index 000000000000..c275eecc9472
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-tx6u-811x.dts
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+        model = "Ka-Ro electronics TX6U-811x Module";
+        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
+
+        aliases {
+                display = &lvds0;
+                lvds0 = &lvds0;
+                lvds1 = &lvds1;
+        };
+
+        backlight0: backlight0 {
+                compatible = "pwm-backlight";
+                pwms = <&pwm2 0 500000 0>;
+                power-supply = <&reg_lcd0_pwr>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+
+        backlight1: backlight1 {
+                compatible = "pwm-backlight";
+                pwms = <&pwm1 0 500000 0>;
+                power-supply = <&reg_lcd1_pwr>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+};
+
+&i2c3 {
+        polytouch2: eeti@04 {
+                compatible = "eeti,egalax_ts";
+                reg = <0x04>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_eeti>;
+                interrupt-parent = <&gpio3>;
+                interrupts = <22 0>;
+                wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+                linux,wakeup;
+        };
+};
+
+&iomuxc {
+        imx6dl-tx6u-811x {
+                pinctrl_eeti: eetigrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
+                        >;
+                };
+        };
+};
+
+&kpp {
+        status = "disabled"; /* pad conflict with backlight1 PWM */
+};
+
+&ldb {
+        status = "okay";
+
+        lvds0: lvds-channel@0 {
+                fsl,data-mapping = "spwg";
+                fsl,data-width = <18>;
+                status = "okay";
+
+                display-timings {
+                        native-mode = <&lvds_timing0>;
+                        lvds_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>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+                };
+        };
+
+        lvds1: lvds-channel@1 {
+                fsl,data-mapping = "spwg";
+                fsl,data-width = <18>;
+                status = "disabled";
+
+                display-timings {
+                        native-mode = <&lvds_timing1>;
+                        lvds_timing1: 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>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+                };
+        };
+};
+
+&pwm1 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
new file mode 100644
index 000000000000..f607d4f1d244
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
@@ -0,0 +1,22 @@
+/*
+ * 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 "imx6dl.dtsi"
+#include "imx6qdl-wandboard-revb1.dtsi"
+
+/ {
+        model = "Wandboard i.MX6 Dual Lite Board";
+        compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
+
+        memory {
+                reg = <0x10000000 0x40000000>;
+        };
+};
diff --git a/arch/arm/boot/dts/imx6dl-wandboard.dts b/arch/arm/boot/dts/imx6dl-wandboard.dts
index e672891c1626..bbb616723097 100644
--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
@@ -10,7 +10,7 @@
  */
 /dts-v1/;
 #include "imx6dl.dtsi"
-#include "imx6qdl-wandboard.dtsi"
+#include "imx6qdl-wandboard-revc1.dtsi"
 
 / {
         model = "Wandboard i.MX6 Dual Lite Board";
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 0a9c49d69d41..b453e0e28aee 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -35,8 +35,11 @@
                                 396000  1175000
                         >;
                         clock-latency = <61036>; /* two CLK32 periods */
-                        clocks = <&clks 104>, <&clks 6>, <&clks 16>,
-                                 <&clks 17>, <&clks 170>;
+                        clocks = <&clks IMX6QDL_CLK_ARM>,
+                                 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
+                                 <&clks IMX6QDL_CLK_STEP>,
+                                 <&clks IMX6QDL_CLK_PLL1_SW>,
+                                 <&clks IMX6QDL_CLK_PLL1_SYS>;
                         clock-names = "arm", "pll2_pfd2_396m", "step",
                                       "pll1_sw", "pll1_sys";
                         arm-supply = <&reg_arm>;
@@ -56,7 +59,7 @@
                 ocram: sram@00900000 {
                         compatible = "mmio-sram";
                         reg = <0x00900000 0x20000>;
-                        clocks = <&clks 142>;
+                        clocks = <&clks IMX6QDL_CLK_OCRAM>;
                 };
 
                 aips1: aips-bus@02000000 {
@@ -87,7 +90,7 @@
                                 compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
                                 reg = <0x021f8000 0x4000>;
                                 interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 116>;
+                                clocks = <&clks IMX6DL_CLK_I2C4>;
                                 status = "disabled";
                         };
                 };
@@ -104,9 +107,9 @@
 };
 
 &ldb {
-        clocks = <&clks 33>, <&clks 34>,
-                 <&clks 39>, <&clks 40>,
-                 <&clks 135>, <&clks 136>;
+        clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>,
+                 <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>,
+                 <&clks IMX6QDL_CLK_LDB_DI0>, <&clks IMX6QDL_CLK_LDB_DI1>;
         clock-names = "di0_pll", "di1_pll",
                       "di0_sel", "di1_sel",
                       "di0", "di1";
diff --git a/arch/arm/boot/dts/imx6q-cubox-i.dts b/arch/arm/boot/dts/imx6q-cubox-i.dts
index bc5f31e3e892..9efd8b0c8011 100644
--- a/arch/arm/boot/dts/imx6q-cubox-i.dts
+++ b/arch/arm/boot/dts/imx6q-cubox-i.dts
@@ -13,4 +13,8 @@
 
 &sata {
         status = "okay";
+        fsl,transmit-level-mV = <1104>;
+        fsl,transmit-boost-mdB = <0>;
+        fsl,transmit-atten-16ths = <9>;
+        fsl,no-spread-spectrum;
 };
diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
index e0302636aff5..8c1cb53464a0 100644
--- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@@ -95,6 +95,12 @@
         };
 };
 
+&can1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_can1>;
+        status = "okay";
+};
+
 &ecspi5 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_ecspi5>;
@@ -118,6 +124,13 @@
         status = "okay";
 };
 
+&i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        status = "okay";
+};
+
 &i2c2 {
         clock-frequency = <100000>;
         pinctrl-names = "default";
@@ -274,6 +287,13 @@
         };
 };
 
+&i2c3 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c3>;
+        status = "okay";
+};
+
 &iomuxc {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_hog>;
@@ -286,6 +306,13 @@
                         >;
                 };
 
+                pinctrl_can1: can1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX        0x1b0b0
+                                MX6QDL_PAD_GPIO_7__FLEXCAN1_TX          0x1b0b0
+                        >;
+                };
+
                 pinctrl_ecspi5: ecspi5rp-1 {
                         fsl,pins = <
                                 MX6QDL_PAD_SD1_DAT0__ECSPI5_MISO        0x80000000
@@ -316,6 +343,13 @@
                         >;
                 };
 
+                pinctrl_i2c1: i2c1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
+                                MX6QDL_PAD_EIM_D28__I2C1_SDA            0x4001b8b1
+                        >;
+                };
+
                 pinctrl_i2c2: i2c2grp {
                         fsl,pins = <
                                 MX6QDL_PAD_EIM_EB2__I2C2_SCL            0x4001b8b1
@@ -323,6 +357,19 @@
                         >;
                 };
 
+                pinctrl_i2c3: i2c3grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D17__I2C3_SCL            0x4001b8b1
+                                MX6QDL_PAD_GPIO_6__I2C3_SDA             0x4001b8b1
+                        >;
+                };
+
+                pinctrl_pcie: pciegrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_KEY_COL1__GPIO4_IO08         0x100b1
+                        >;
+                };
+
                 pinctrl_pfuze: pfuze100grp1 {
                         fsl,pins = <
                                 MX6QDL_PAD_EIM_D20__GPIO3_IO20          0x80000000
@@ -385,6 +432,13 @@
         };
 };
 
+&pcie {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pcie>;
+        reset-gpio = <&gpio4 8 0>;
+        status = "okay";
+};
+
 &sata {
         status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6q-gw51xx.dts b/arch/arm/boot/dts/imx6q-gw51xx.dts
index 0e1406e58eff..8e8bcd8fe0fb 100644
--- a/arch/arm/boot/dts/imx6q-gw51xx.dts
+++ b/arch/arm/boot/dts/imx6q-gw51xx.dts
@@ -14,6 +14,6 @@
 #include "imx6qdl-gw51xx.dtsi"
 
 / {
-        model = "Gateworks Ventana i.MX6 Quad GW51XX";
+        model = "Gateworks Ventana i.MX6 Dual/Quad GW51XX";
         compatible = "gw,imx6q-gw51xx", "gw,ventana", "fsl,imx6q";
 };
diff --git a/arch/arm/boot/dts/imx6q-gw52xx.dts b/arch/arm/boot/dts/imx6q-gw52xx.dts
index 5f71ddbc7f05..a12c47e5ee05 100644
--- a/arch/arm/boot/dts/imx6q-gw52xx.dts
+++ b/arch/arm/boot/dts/imx6q-gw52xx.dts
@@ -14,7 +14,7 @@
 #include "imx6qdl-gw52xx.dtsi"
 
 / {
-        model = "Gateworks Ventana i.MX6 Quad GW52XX";
+        model = "Gateworks Ventana i.MX6 Dual/Quad GW52XX";
         compatible = "gw,imx6q-gw52xx", "gw,ventana", "fsl,imx6q";
 };
 
diff --git a/arch/arm/boot/dts/imx6q-gw53xx.dts b/arch/arm/boot/dts/imx6q-gw53xx.dts
index 360c316b4740..d76aaa83dad0 100644
--- a/arch/arm/boot/dts/imx6q-gw53xx.dts
+++ b/arch/arm/boot/dts/imx6q-gw53xx.dts
@@ -14,7 +14,7 @@
 #include "imx6qdl-gw53xx.dtsi"
 
 / {
-        model = "Gateworks Ventana i.MX6 Quad GW53XX";
+        model = "Gateworks Ventana i.MX6 Dual/Quad GW53XX";
         compatible = "gw,imx6q-gw53xx", "gw,ventana", "fsl,imx6q";
 };
 
diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts
index 3689eaa58826..22e6f8e657d2 100644
--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -115,9 +115,9 @@
         };
 
         sound {
-                compatible = "fsl,imx6q-sabrelite-sgtl5000",
+                compatible = "fsl,imx6q-ventana-sgtl5000",
                              "fsl,imx-audio-sgtl5000";
-                model = "imx6q-sabrelite-sgtl5000";
+                model = "sgtl5000-audio";
                 ssi-controller = <&ssi1>;
                 audio-codec = <&codec>;
                 audio-routing =
@@ -504,7 +504,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6q-gw54xx.dts b/arch/arm/boot/dts/imx6q-gw54xx.dts
index ab518d66a75e..6e8f53e92a2d 100644
--- a/arch/arm/boot/dts/imx6q-gw54xx.dts
+++ b/arch/arm/boot/dts/imx6q-gw54xx.dts
@@ -14,7 +14,7 @@
 #include "imx6qdl-gw54xx.dtsi"
 
 / {
-        model = "Gateworks Ventana i.MX6 Quad GW54XX";
+        model = "Gateworks Ventana i.MX6 Dual/Quad GW54XX";
         compatible = "gw,imx6q-gw54xx", "gw,ventana", "fsl,imx6q";
 };
 
diff --git a/arch/arm/boot/dts/imx6q-rex-pro.dts b/arch/arm/boot/dts/imx6q-rex-pro.dts
new file mode 100644
index 000000000000..3c2852b16f78
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-rex-pro.dts
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 FEDEVEL, Inc.
+ *
+ * Author: Robert Nelson <robertcnelson@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.
+ *
+ */
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-rex.dtsi"
+
+/ {
+        model = "Rex Pro i.MX6 Quad Board";
+        compatible = "rex,imx6q-rex-pro", "fsl,imx6q";
+
+        memory {
+                reg = <0x10000000 0x80000000>;
+        };
+};
+
+&ecspi3 {
+        flash: m25p80@0 {
+                compatible = "sst,sst25vf032b";
+                spi-max-frequency = <20000000>;
+                reg = <0>;
+        };
+};
+
+&sata {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
new file mode 100644
index 000000000000..b18fae10b2e3
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+        model = "Ka-Ro electronics TX6Q-1010 Module on CoMpact TFT";
+        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+
+        aliases {
+                display = &display;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm2 0 500000 0>;
+                power-supply = <&reg_3v3>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+
+        display: display@di0 {
+                compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "rgb24";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_disp0_1>;
+                status = "okay";
+
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu1_di0_disp0>;
+                        };
+                };
+
+                display-timings {
+                        native-mode = <&ET070001DM6>;
+
+                        ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+                };
+        };
+};
+
+&can1 {
+        status = "disabled";
+};
+
+&can2 {
+        xceiver-supply = <&reg_3v3>;
+};
+
+&ipu1_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
+
+&kpp {
+        status = "disabled";
+};
+
+&reg_can_xcvr {
+        status = "disabled";
+};
+
+&touchscreen {
+        status = "disabled";
+};
diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010.dts b/arch/arm/boot/dts/imx6q-tx6q-1010.dts
new file mode 100644
index 000000000000..b58ec9c966c8
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-tx6q-1010.dts
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+        model = "Ka-Ro electronics TX6Q-1010 Module";
+        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+
+        aliases {
+                display = &display;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+                power-supply = <&reg_3v3>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+
+        display: display@di0 {
+                compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "rgb24";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_disp0_1>;
+                status = "okay";
+
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu1_di0_disp0>;
+                        };
+                };
+
+                display-timings {
+                        VGA {
+                                clock-frequency = <25200000>;
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <48>;
+                                hsync-len = <96>;
+                                hfront-porch = <16>;
+                                vback-porch = <31>;
+                                vsync-len = <2>;
+                                vfront-porch = <12>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ETV570 {
+                                clock-frequency = <25200000>;
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <114>;
+                                hsync-len = <30>;
+                                hfront-porch = <16>;
+                                vback-porch = <32>;
+                                vsync-len = <3>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ET0350 {
+                                clock-frequency = <6413760>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <34>;
+                                hsync-len = <34>;
+                                hfront-porch = <20>;
+                                vback-porch = <15>;
+                                vsync-len = <3>;
+                                vfront-porch = <4>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ET0430 {
+                                clock-frequency = <9009000>;
+                                hactive = <480>;
+                                vactive = <272>;
+                                hback-porch = <2>;
+                                hsync-len = <41>;
+                                hfront-porch = <2>;
+                                vback-porch = <2>;
+                                vsync-len = <10>;
+                                vfront-porch = <2>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+
+                        ET0500 {
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ET0700 { /* same as ET0500 */
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ETQ570 {
+                                clock-frequency = <6596040>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <38>;
+                                hsync-len = <30>;
+                                hfront-porch = <30>;
+                                vback-porch = <16>;
+                                vsync-len = <3>;
+                                vfront-porch = <4>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+                };
+        };
+};
+
+&ipu1_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
new file mode 100644
index 000000000000..0bb9a9de62a9
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+        model = "Ka-Ro electronics TX6Q-1020 Module on CoMpact TFT";
+        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+
+        aliases {
+                display = &display;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm2 0 500000 0>;
+                power-supply = <&reg_3v3>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+
+        display: display@di0 {
+                compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "rgb24";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_disp0_1>;
+                status = "okay";
+
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu1_di0_disp0>;
+                        };
+                };
+
+                display-timings {
+                        native-mode = <&ET070001DM6>;
+
+                        ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+                };
+        };
+};
+
+&can1 {
+        status = "disabled";
+};
+
+&can2 {
+        xceiver-supply = <&reg_3v3>;
+};
+
+&ds1339 {
+        status = "disabled";
+};
+
+&gpmi {
+        status = "disabled";
+};
+
+&iomuxc {
+        imx6qdl-tx6 {
+                pinctrl_usdhc4: usdhc4grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_CMD__SD4_CMD             0x070b1
+                                MX6QDL_PAD_SD4_CLK__SD4_CLK             0x070b1
+                                MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x070b1
+                                MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x070b1
+                                MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x070b1
+                                MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x070b1
+                                MX6QDL_PAD_NANDF_ALE__SD4_RESET         0x0b0b1
+                        >;
+                };
+        };
+};
+
+&ipu1_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
+
+&kpp {
+        status = "disabled";
+};
+
+&reg_can_xcvr {
+        status = "disabled";
+};
+
+&touchscreen {
+        status = "disabled";
+};
+
+&usdhc4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc4>;
+        bus-width = <4>;
+        no-1-8-v;
+        fsl,wp-controller;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020.dts b/arch/arm/boot/dts/imx6q-tx6q-1020.dts
new file mode 100644
index 000000000000..b96d80a35d39
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-tx6q-1020.dts
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+        model = "Ka-Ro electronics TX6Q-1020 Module";
+        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+
+        aliases {
+                display = &display;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
+                power-supply = <&reg_3v3>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+
+        display: display@di0 {
+                compatible = "fsl,imx-parallel-display";
+                interface-pix-fmt = "rgb24";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_disp0_1>;
+                status = "okay";
+
+                port {
+                        display0_in: endpoint {
+                                remote-endpoint = <&ipu1_di0_disp0>;
+                        };
+                };
+
+                display-timings {
+                        VGA {
+                                clock-frequency = <25200000>;
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <48>;
+                                hsync-len = <96>;
+                                hfront-porch = <16>;
+                                vback-porch = <31>;
+                                vsync-len = <2>;
+                                vfront-porch = <12>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ETV570 {
+                                clock-frequency = <25200000>;
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <114>;
+                                hsync-len = <30>;
+                                hfront-porch = <16>;
+                                vback-porch = <32>;
+                                vsync-len = <3>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ET0350 {
+                                clock-frequency = <6413760>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <34>;
+                                hsync-len = <34>;
+                                hfront-porch = <20>;
+                                vback-porch = <15>;
+                                vsync-len = <3>;
+                                vfront-porch = <4>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ET0430 {
+                                clock-frequency = <9009000>;
+                                hactive = <480>;
+                                vactive = <272>;
+                                hback-porch = <2>;
+                                hsync-len = <41>;
+                                hfront-porch = <2>;
+                                vback-porch = <2>;
+                                vsync-len = <10>;
+                                vfront-porch = <2>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+
+                        ET0500 {
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ET0700 { /* same as ET0500 */
+                                clock-frequency = <33264000>;
+                                hactive = <800>;
+                                vactive = <480>;
+                                hback-porch = <88>;
+                                hsync-len = <128>;
+                                hfront-porch = <40>;
+                                vback-porch = <33>;
+                                vsync-len = <2>;
+                                vfront-porch = <10>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+
+                        ETQ570 {
+                                clock-frequency = <6596040>;
+                                hactive = <320>;
+                                vactive = <240>;
+                                hback-porch = <38>;
+                                hsync-len = <30>;
+                                hfront-porch = <30>;
+                                vback-porch = <16>;
+                                vsync-len = <3>;
+                                vfront-porch = <4>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <1>;
+                                pixelclk-active = <0>;
+                        };
+                };
+        };
+};
+
+&ds1339 {
+        status = "disabled";
+};
+
+&gpmi {
+        status = "disabled";
+};
+
+&iomuxc {
+        imx6qdl-tx6 {
+                pinctrl_usdhc4: usdhc4grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_CMD__SD4_CMD             0x070b1
+                                MX6QDL_PAD_SD4_CLK__SD4_CLK             0x070b1
+                                MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x070b1
+                                MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x070b1
+                                MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x070b1
+                                MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x070b1
+                                MX6QDL_PAD_NANDF_ALE__SD4_RESET         0x0b0b1
+                        >;
+                };
+        };
+};
+
+&ipu1_di0_disp0 {
+        remote-endpoint = <&display0_in>;
+};
+
+&usdhc4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc4>;
+        bus-width = <4>;
+        no-1-8-v;
+        fsl,wp-controller;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6q-tx6q-1110.dts b/arch/arm/boot/dts/imx6q-tx6q-1110.dts
new file mode 100644
index 000000000000..88aa1e4c792d
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-tx6q-1110.dts
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-tx6.dtsi"
+
+/ {
+        model = "Ka-Ro electronics TX6Q-1110 Module";
+        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
+
+        aliases {
+                display = &lvds0;
+                lvds0 = &lvds0;
+                lvds1 = &lvds1;
+        };
+
+        backlight0: backlight0 {
+                compatible = "pwm-backlight";
+                pwms = <&pwm2 0 500000 0>;
+                power-supply = <&reg_lcd0_pwr>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+
+        backlight1: backlight1 {
+                compatible = "pwm-backlight";
+                pwms = <&pwm1 0 500000 0>;
+                power-supply = <&reg_lcd1_pwr>;
+                /*
+                 * a poor man's way to create a 1:1 relationship between
+                 * the PWM value and the actual duty cycle
+                 */
+                brightness-levels = < 0  1  2  3  4  5  6  7  8  9
+                                     10 11 12 13 14 15 16 17 18 19
+                                     20 21 22 23 24 25 26 27 28 29
+                                     30 31 32 33 34 35 36 37 38 39
+                                     40 41 42 43 44 45 46 47 48 49
+                                     50 51 52 53 54 55 56 57 58 59
+                                     60 61 62 63 64 65 66 67 68 69
+                                     70 71 72 73 74 75 76 77 78 79
+                                     80 81 82 83 84 85 86 87 88 89
+                                     90 91 92 93 94 95 96 97 98 99
+                                    100>;
+                default-brightness-level = <50>;
+        };
+};
+
+&i2c3 {
+        polytouch1: eeti@04 {
+                compatible = "eeti,egalax_ts";
+                reg = <0x04>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_eeti>;
+                interrupt-parent = <&gpio3>;
+                interrupts = <22 0>;
+                wakeup-gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+                linux,wakeup;
+        };
+};
+
+&iomuxc {
+        imx6q-tx6q-1110 {
+                pinctrl_eeti: eetigrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b1 /* Interrupt */
+                        >;
+                };
+        };
+};
+
+&kpp {
+        status = "disabled"; /* pad conflict with backlight1 PWM */
+};
+
+&ldb {
+        status = "okay";
+
+        lvds0: lvds-channel@0 {
+                fsl,data-mapping = "spwg";
+                fsl,data-width = <18>;
+                status = "okay";
+
+                display-timings {
+                        native-mode = <&lvds_timing0>;
+                        lvds_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>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+                };
+        };
+
+        lvds1: lvds-channel@1 {
+                fsl,data-mapping = "spwg";
+                fsl,data-width = <18>;
+                status = "disabled";
+
+                display-timings {
+                        native-mode = <&lvds_timing1>;
+                        lvds_timing1: 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>;
+                                de-active = <1>;
+                                pixelclk-active = <1>;
+                        };
+                };
+        };
+};
+
+&pwm1 {
+        status = "okay";
+};
+
+&sata {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6q-udoo.dts b/arch/arm/boot/dts/imx6q-udoo.dts
index 6c561060bf5c..e3bff2ac00db 100644
--- a/arch/arm/boot/dts/imx6q-udoo.dts
+++ b/arch/arm/boot/dts/imx6q-udoo.dts
@@ -23,6 +23,23 @@
         memory {
                 reg = <0x10000000 0x40000000>;
         };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                reg_usb_h1_vbus: regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        regulator-name = "usb_h1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */
+                        gpio = <&gpio7 12 0>;
+                };
+        };
 };
 
 &fec {
@@ -81,6 +98,13 @@
                         >;
                 };
 
+                pinctrl_usbh: usbhgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
+                                MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0
+                        >;
+                };
+
                 pinctrl_usdhc3: usdhc3grp {
                         fsl,pins = <
                                 MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
@@ -104,6 +128,14 @@
         status = "okay";
 };
 
+&usbh1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbh>;
+        vbus-supply = <&reg_usb_h1_vbus>;
+        clocks = <&clks 201>;
+        status = "okay";
+};
+
 &usdhc3 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_usdhc3>;
diff --git a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
new file mode 100644
index 000000000000..20bf3c282623
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-wandboard-revb1.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-revb1.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-wandboard.dts b/arch/arm/boot/dts/imx6q-wandboard.dts
index 36be17f207b1..4a8a6ee13e9f 100644
--- a/arch/arm/boot/dts/imx6q-wandboard.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard.dts
@@ -10,7 +10,7 @@
  */
 /dts-v1/;
 #include "imx6q.dtsi"
-#include "imx6qdl-wandboard.dtsi"
+#include "imx6qdl-wandboard-revc1.dtsi"
 
 / {
         model = "Wandboard i.MX6 Quad Board";
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index addd3f881ce2..e9f3646d1760 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -43,8 +43,11 @@
                                 396000  1175000
                         >;
                         clock-latency = <61036>; /* two CLK32 periods */
-                        clocks = <&clks 104>, <&clks 6>, <&clks 16>,
-                                 <&clks 17>, <&clks 170>;
+                        clocks = <&clks IMX6QDL_CLK_ARM>,
+                                 <&clks IMX6QDL_CLK_PLL2_PFD2_396M>,
+                                 <&clks IMX6QDL_CLK_STEP>,
+                                 <&clks IMX6QDL_CLK_PLL1_SW>,
+                                 <&clks IMX6QDL_CLK_PLL1_SYS>;
                         clock-names = "arm", "pll2_pfd2_396m", "step",
                                       "pll1_sw", "pll1_sys";
                         arm-supply = <&reg_arm>;
@@ -78,7 +81,7 @@
                 ocram: sram@00900000 {
                         compatible = "mmio-sram";
                         reg = <0x00900000 0x40000>;
-                        clocks = <&clks 142>;
+                        clocks = <&clks IMX6QDL_CLK_OCRAM>;
                 };
 
                 aips-bus@02000000 { /* AIPS1 */
@@ -89,7 +92,8 @@
                                         compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
                                         reg = <0x02018000 0x4000>;
                                         interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>;
-                                        clocks = <&clks 116>, <&clks 116>;
+                                        clocks = <&clks IMX6Q_CLK_ECSPI5>,
+                                                 <&clks IMX6Q_CLK_ECSPI5>;
                                         clock-names = "ipg", "per";
                                         status = "disabled";
                                 };
@@ -140,7 +144,9 @@
                         compatible = "fsl,imx6q-ahci";
                         reg = <0x02200000 0x4000>;
                         interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks =  <&clks 154>, <&clks 187>, <&clks 105>;
+                        clocks = <&clks IMX6QDL_CLK_SATA>,
+                                 <&clks IMX6QDL_CLK_SATA_REF_100M>,
+                                 <&clks IMX6QDL_CLK_AHB>;
                         clock-names = "sata", "sata_ref", "ahb";
                         status = "disabled";
                 };
@@ -152,10 +158,20 @@
                         reg = <0x02800000 0x400000>;
                         interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>,
                                      <0 7 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clks 133>, <&clks 134>, <&clks 137>;
+                        clocks = <&clks IMX6QDL_CLK_IPU2>,
+                                 <&clks IMX6QDL_CLK_IPU2_DI0>,
+                                 <&clks IMX6QDL_CLK_IPU2_DI1>;
                         clock-names = "bus", "di0", "di1";
                         resets = <&src 4>;
 
+                        ipu2_csi0: port@0 {
+                                reg = <0>;
+                        };
+
+                        ipu2_csi1: port@1 {
+                                reg = <1>;
+                        };
+
                         ipu2_di0: port@2 {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
@@ -230,9 +246,10 @@
 };
 
 &ldb {
-        clocks = <&clks 33>, <&clks 34>,
-                 <&clks 39>, <&clks 40>, <&clks 41>, <&clks 42>,
-                 <&clks 135>, <&clks 136>;
+        clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>,
+                 <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>,
+                 <&clks IMX6QDL_CLK_IPU2_DI0_SEL>, <&clks IMX6QDL_CLK_IPU2_DI1_SEL>,
+                 <&clks IMX6QDL_CLK_LDB_DI0>, <&clks IMX6QDL_CLK_LDB_DI1>;
         clock-names = "di0_pll", "di1_pll",
                       "di0_sel", "di1_sel", "di2_sel", "di3_sel",
                       "di0", "di1";
diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
new file mode 100644
index 000000000000..e6d9195a1da7
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
@@ -0,0 +1,418 @@
+/*
+ * support fot the imx6 based aristainetos board
+ *
+ * Copyright (C) 2014 Heiko Schocher <hs@denx.de>
+ *
+ * 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 <dt-bindings/gpio/gpio.h>
+
+/ {
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                reg_2p5v: regulator@0 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "2P5V";
+                        regulator-min-microvolt = <2500000>;
+                        regulator-max-microvolt = <2500000>;
+                        regulator-always-on;
+                };
+
+                reg_3p3v: regulator@1 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "3P3V";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                reg_usbh1_vbus: regulator@2 {
+                        compatible = "regulator-fixed";
+                        enable-active-high;
+                        gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_aristainetos_usbh1_vbus>;
+                        regulator-name = "usb_h1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                };
+
+                reg_usbotg_vbus: regulator@3 {
+                        compatible = "regulator-fixed";
+                        enable-active-high;
+                        gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_aristainetos_usbotg_vbus>;
+                        regulator-name = "usb_otg_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                };
+        };
+};
+
+&audmux {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_audmux>;
+        status = "okay";
+};
+
+&can1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flexcan1>;
+        status = "okay";
+};
+
+&can2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flexcan2>;
+        status = "okay";
+};
+
+&i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        status = "okay";
+
+        tmp103: tmp103@71 {
+                compatible = "ti,tmp103";
+                reg = <0x71>;
+        };
+};
+
+&i2c3 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c3>;
+        status = "okay";
+
+        rtc@68 {
+                compatible = "dallas,m41t00";
+                reg = <0x68>;
+        };
+};
+
+&ecspi4 {
+        fsl,spi-num-chipselects = <1>;
+        cs-gpios = <&gpio3 20 0>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi4>;
+        status = "okay";
+
+        flash: m25p80@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "micron,n25q128a11";
+                spi-max-frequency = <20000000>;
+                reg = <0>;
+        };
+};
+
+&fec {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet>;
+        phy-mode = "rmii";
+        phy-reset-gpios = <&gpio3 29 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&gpmi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_gpmi_nand>;
+        status = "okay";
+};
+
+&pcie {
+        status = "okay";
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart2>;
+        status = "okay";
+};
+
+
+&uart4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart4>;
+        fsl,uart-has-rtscts;
+        status = "okay";
+};
+
+&uart5 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart5>;
+        fsl,uart-has-rtscts;
+        status = "okay";
+};
+
+&usbh1 {
+        vbus-supply = <&reg_usbh1_vbus>;
+        dr_mode = "host";
+        status = "okay";
+};
+
+&usbotg {
+        vbus-supply = <&reg_usbotg_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg>;
+        disable-over-current;
+        dr_mode = "host";
+        status = "okay";
+};
+
+&usdhc1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc1>;
+        vmmc-supply = <&reg_3p3v>;
+        cd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        vmmc-supply = <&reg_3p3v>;
+        cd-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hog &pinctrl_gpio>;
+
+        imx6qdl-aristainetos {
+                pinctrl_aristainetos_usbh1_vbus: aristainetos-usbh1-vbus {
+                        fsl,pins = <MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x130b0>;
+                };
+
+                pinctrl_aristainetos_usbotg_vbus: aristainetos-usbotg-vbus {
+                        fsl,pins = <MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x130b0>;
+                };
+
+                pinctrl_audmux: audmuxgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_CSI0_DAT7__AUD3_RXD  0x1b0b0
+                                MX6QDL_PAD_CSI0_DAT4__AUD3_TXC  0x1b0b0
+                                MX6QDL_PAD_CSI0_DAT5__AUD3_TXD  0x1b0b0
+                                MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x1b0b0
+                        >;
+                };
+
+                pinctrl_backlight: backlightgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_9__PWM1_OUT     0x1b0b0
+                                MX6QDL_PAD_SD4_DAT1__PWM3_OUT   0x1b0b0
+                                MX6QDL_PAD_GPIO_2__GPIO1_IO02   0x1b0b0
+                        >;
+                };
+
+                pinctrl_ecspi2: ecspi2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_OE__ECSPI2_MISO 0x100b1
+                                MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK 0x100b1
+                                MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI 0x100b1
+                                MX6QDL_PAD_EIM_D24__GPIO3_IO24  0x100b1
+                        >;
+                };
+
+                pinctrl_ecspi4: ecspi4grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D21__ECSPI4_SCLK 0x100b1
+                                MX6QDL_PAD_EIM_D22__ECSPI4_MISO 0x100b1
+                                MX6QDL_PAD_EIM_D28__ECSPI4_MOSI 0x100b1
+                                MX6QDL_PAD_EIM_D20__GPIO3_IO20  0x100b1
+                                MX6QDL_PAD_SD4_DAT7__GPIO2_IO15 0x1b0b0 /* WP pin */
+                        >;
+                };
+
+                pinctrl_enet: enetgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
+                                MX6QDL_PAD_ENET_MDIO__ENET_MDIO  0x1b0b0
+                                MX6QDL_PAD_ENET_MDC__ENET_MDC    0x1b0b0
+                                MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0
+                                MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0
+                                MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN   0x1b0b0
+                                MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER   0x1b0b0
+                                MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0
+                                MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0
+                                MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN  0x1b0b0
+                        >;
+                };
+
+                pinctrl_flexcan1: flexcan1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX        0x1b0b0
+                                MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX        0x1b0b0
+                        >;
+                };
+
+                pinctrl_flexcan2: flexcan2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD3_DAT0__FLEXCAN2_TX        0x1b0b0
+                                MX6QDL_PAD_SD3_DAT1__FLEXCAN2_RX        0x1b0b0
+                                >;
+                };
+
+                pinctrl_gpio: gpiogrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0
+                                MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x1b0b0
+                                MX6QDL_PAD_SD4_DAT4__GPIO2_IO12 0x1b0b0
+                                MX6QDL_PAD_SD4_DAT5__GPIO2_IO13 0x1b0b0
+                                MX6QDL_PAD_GPIO_3__GPIO1_IO03   0x1b0b0
+                                MX6QDL_PAD_GPIO_4__GPIO1_IO04   0x1b0b0
+                                MX6QDL_PAD_GPIO_5__GPIO1_IO05   0x1b0b0
+                                MX6QDL_PAD_GPIO_6__GPIO1_IO06   0x1b0b0
+                                MX6QDL_PAD_GPIO_7__GPIO1_IO07   0x1b0b0
+                                MX6QDL_PAD_GPIO_8__GPIO1_IO08   0x1b0b0
+                                MX6QDL_PAD_KEY_COL0__GPIO4_IO06 0x1b0b0
+                        >;
+                };
+
+                pinctrl_gpmi_nand: gpminandgrp {
+                        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
+                        >;
+                };
+
+                pinctrl_hog: hoggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D29__GPIO3_IO29   0x10
+                        >;
+                };
+
+                pinctrl_i2c1: i2c1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
+                                MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
+                        >;
+                };
+
+                pinctrl_i2c2: i2c2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+                                MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+                        >;
+                };
+
+                pinctrl_i2c3: i2c3grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
+                                MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+                        >;
+                };
+
+                pinctrl_ipu_disp: ipudisp1grp {
+                        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__GPIO4_IO20                 0x20000
+                                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_uart2: uart2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
+                                MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
+                        >;
+                };
+
+                pinctrl_uart4: uart4grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
+                                MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
+                                MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B 0x1b0b1
+                                MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B 0x1b0b1
+                        >;
+                };
+
+                pinctrl_uart5: uart5grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_CSI0_DAT14__UART5_TX_DATA 0x1b0b1
+                                MX6QDL_PAD_CSI0_DAT15__UART5_RX_DATA 0x1b0b1
+                        >;
+                };
+
+                pinctrl_usbotg: usbotggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
+                        >;
+                };
+
+                pinctrl_usdhc1: usdhc1grp {
+                        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_KEY_ROW0__GPIO4_IO07 0x1b0b0
+                        >;
+                };
+
+                pinctrl_usdhc2: usdhc2grp {
+                        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_KEY_COL1__GPIO4_IO08 0x1b0b0
+                        >;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index 744c8a2d81f6..234e7b755232 100644
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -121,9 +121,9 @@
         };
 
         sound {
-                compatible = "fsl,imx6q-sabrelite-sgtl5000",
+                compatible = "fsl,imx6q-ventana-sgtl5000",
                              "fsl,imx-audio-sgtl5000";
-                model = "imx6q-sabrelite-sgtl5000";
+                model = "sgtl5000-audio";
                 ssi-controller = <&ssi1>;
                 audio-codec = <&codec>;
                 audio-routing =
@@ -489,7 +489,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index adf150c1be90..143f84f7812c 100644
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -124,9 +124,9 @@
         };
 
         sound {
-                compatible = "fsl,imx6q-sabrelite-sgtl5000",
+                compatible = "fsl,imx6q-ventana-sgtl5000",
                              "fsl,imx-audio-sgtl5000";
-                model = "imx6q-sabrelite-sgtl5000";
+                model = "sgtl5000-audio";
                 ssi-controller = <&ssi1>;
                 audio-codec = <&codec>;
                 audio-routing =
@@ -533,7 +533,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index 698d3063b295..16e7ad3d98ad 100644
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -114,9 +114,9 @@
         };
 
         sound {
-                compatible = "fsl,imx6q-sabrelite-sgtl5000",
+                compatible = "fsl,imx6q-ventana-sgtl5000",
                              "fsl,imx-audio-sgtl5000";
-                model = "imx6q-sabrelite-sgtl5000";
+                model = "sgtl5000-audio";
                 ssi-controller = <&ssi1>;
                 audio-codec = <&codec>;
                 audio-routing =
@@ -555,12 +555,10 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
 &ssi2 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index 4c4b17596c8b..42ff525ebe13 100644
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -381,7 +381,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index faa3494a69d4..2694aa84e187 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -301,6 +301,7 @@
         pinctrl-0 = <&pinctrl_enet>;
         phy-mode = "rgmii";
         phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
+        phy-supply = <&vdd_eth_io_reg>;
         status = "disabled";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-rex.dtsi b/arch/arm/boot/dts/imx6qdl-rex.dtsi
new file mode 100644
index 000000000000..df7bcf86c156
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-rex.dtsi
@@ -0,0 +1,357 @@
+/*
+ * Copyright 2014 FEDEVEL, Inc.
+ *
+ * Author: Robert Nelson <robertcnelson@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 <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+        chosen {
+                stdout-path = &uart1;
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                reg_3p3v: regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        regulator-name = "3P3V";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                reg_usbh1_vbus: regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usbh1>;
+                        regulator-name = "usbh1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+
+                reg_usb_otg_vbus: regulator@2 {
+                        compatible = "regulator-fixed";
+                        reg = <2>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usbotg>;
+                        regulator-name = "usb_otg_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_led>;
+
+                led0: usr {
+                        label = "usr";
+                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
+                        linux,default-trigger = "heartbeat";
+                };
+        };
+
+        sound {
+                compatible = "fsl,imx6-rex-sgtl5000",
+                             "fsl,imx-audio-sgtl5000";
+                model = "imx6-rex-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>;
+        status = "okay";
+};
+
+&ecspi2 {
+        fsl,spi-num-chipselects = <1>;
+        cs-gpios = <&gpio5 12 GPIO_ACTIVE_LOW>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi2>;
+        status = "okay";
+};
+
+&ecspi3 {
+        fsl,spi-num-chipselects = <1>;
+        cs-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi3>;
+        status = "okay";
+};
+
+&fec {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet>;
+        phy-mode = "rgmii";
+        phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
+        status = "okay";
+};
+
+&hdmi {
+        ddc-i2c-bus = <&i2c2>;
+        status = "okay";
+};
+
+&i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        status = "okay";
+
+        codec: sgtl5000@0a {
+                compatible = "fsl,sgtl5000";
+                reg = <0x0a>;
+                clocks = <&clks 201>;
+                VDDA-supply = <&reg_3p3v>;
+                VDDIO-supply = <&reg_3p3v>;
+        };
+};
+
+&i2c2 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c2>;
+        status = "okay";
+
+        eeprom@57 {
+                compatible = "at,24c02";
+                reg = <0x57>;
+        };
+};
+
+&i2c3 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c3>;
+        status = "okay";
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hog>;
+
+        imx6qdl-rex {
+                pinctrl_hog: hoggrp {
+                        fsl,pins = <
+                                /* SGTL5000 sys_mclk */
+                                MX6QDL_PAD_GPIO_0__CCM_CLKO1            0x030b0
+                        >;
+                };
+
+                pinctrl_audmux: audmuxgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_CSI0_DAT7__AUD3_RXD          0x130b0
+                                MX6QDL_PAD_CSI0_DAT4__AUD3_TXC          0x130b0
+                                MX6QDL_PAD_CSI0_DAT5__AUD3_TXD          0x110b0
+                                MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS         0x130b0
+                        >;
+                };
+
+                pinctrl_ecspi2: ecspi2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO      0x100b1
+                                MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI      0x100b1
+                                MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK      0x100b1
+                                /* CS */
+                                MX6QDL_PAD_DISP0_DAT5__GPIO4_IO26       0x000b1
+                        >;
+                };
+
+                pinctrl_ecspi3: ecspi3grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_DISP0_DAT17__ECSPI2_MISO     0x100b1
+                                MX6QDL_PAD_DISP0_DAT16__ECSPI2_MOSI     0x100b1
+                                MX6QDL_PAD_DISP0_DAT19__ECSPI2_SCLK     0x100b1
+                                /* CS */
+                                MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12      0x000b1
+                        >;
+                };
+
+                pinctrl_enet: enetgrp {
+                        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
+                                /* Phy reset */
+                                MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25      0x000b0
+                        >;
+                };
+
+                pinctrl_i2c1: i2c1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_CSI0_DAT8__I2C1_SDA          0x4001b8b1
+                                MX6QDL_PAD_CSI0_DAT9__I2C1_SCL          0x4001b8b1
+                        >;
+                };
+
+                pinctrl_i2c2: i2c2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_KEY_COL3__I2C2_SCL           0x4001b8b1
+                                MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
+                        >;
+                };
+
+                pinctrl_i2c3: i2c3grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D17__I2C3_SCL            0x4001b8b1
+                                MX6QDL_PAD_EIM_D18__I2C3_SDA            0x4001b8b1
+                        >;
+                };
+
+                pinctrl_led: ledgrp {
+                        fsl,pins = <
+                                /* user led */
+                                MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x80000000
+                        >;
+                };
+
+                pinctrl_uart1: uart1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA    0x1b0b1
+                                MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA    0x1b0b1
+                        >;
+                };
+
+                pinctrl_uart2: uart2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA      0x1b0b1
+                                MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA      0x1b0b1
+                        >;
+                };
+
+                pinctrl_usbh1: usbh1grp {
+                        fsl,pins = <
+                                /* power enable, high active */
+                                MX6QDL_PAD_EIM_D31__GPIO3_IO31          0x10b0
+                        >;
+                };
+
+                pinctrl_usbotg: usbotggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x17059
+                                MX6QDL_PAD_EIM_D21__USB_OTG_OC          0x1b0b0
+                                /* power enable, high active */
+                                MX6QDL_PAD_EIM_D22__GPIO3_IO22          0x10b0
+                        >;
+                };
+
+                pinctrl_usdhc2: usdhc2grp {
+                        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
+                                /* CD */
+                                MX6QDL_PAD_NANDF_D2__GPIO2_IO02         0x1b0b0
+                                /* WP */
+                                MX6QDL_PAD_NANDF_D3__GPIO2_IO03         0x1f0b0
+                        >;
+                };
+
+                pinctrl_usdhc3: usdhc3grp {
+                        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
+                                /* CD */
+                                MX6QDL_PAD_NANDF_D0__GPIO2_IO00         0x1b0b0
+                                /* WP */
+                                MX6QDL_PAD_NANDF_D1__GPIO2_IO01         0x1f0b0
+                        >;
+                };
+        };
+};
+
+&ssi1 {
+        fsl,mode = "i2s-slave";
+        status = "okay";
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart1>;
+        status = "okay";
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart2>;
+        status = "okay";
+};
+
+&usbh1 {
+        vbus-supply = <&reg_usbh1_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbh1>;
+        status = "okay";
+};
+
+&usbotg {
+        vbus-supply = <&reg_usb_otg_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg>;
+        status = "okay";
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        bus-width = <4>;
+        cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
+        wp-gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
+        status = "okay";
+};
+
+&usdhc3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc3>;
+        bus-width = <4>;
+        cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
+        wp-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
index 6df6127bf835..0a36129152e0 100644
--- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@@ -381,7 +381,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 40ea36534643..ec43dde78525 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -340,6 +340,7 @@
                                 MX6QDL_PAD_KEY_COL1__ECSPI1_MISO        0x100b1
                                 MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI        0x100b1
                                 MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK        0x100b1
+                                MX6QDL_PAD_KEY_ROW1__GPIO4_IO09         0x1b0b0
                         >;
                 };
 
@@ -512,7 +513,6 @@
 };
 
 &ssi2 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
new file mode 100644
index 000000000000..f02b80b41d4f
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -0,0 +1,696 @@
+/*
+ * Copyright 2014 Lothar Waßmann <LW@KARO-electronics.de>
+ *
+ * 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 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/pwm/pwm.h>
+
+/ {
+        aliases {
+                can0 = &can2;
+                can1 = &can1;
+                ethernet0 = &fec;
+                lcdif_23bit_pins_a = &pinctrl_disp0_1;
+                lcdif_24bit_pins_a = &pinctrl_disp0_2;
+                pwm0 = &pwm1;
+                pwm1 = &pwm2;
+                reg_can_xcvr = &reg_can_xcvr;
+                stk5led = &user_led;
+                usbotg = &usbotg;
+                sdhc0 = &usdhc1;
+                sdhc1 = &usdhc2;
+        };
+
+        memory {
+                reg = <0 0>; /* will be filled by U-Boot */
+        };
+
+        clocks {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                mclk: clock@0 {
+                        compatible = "fixed-clock";
+                        reg = <0>;
+                        #clock-cells = <0>;
+                        clock-frequency = <27000000>;
+                };
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                power {
+                        label = "Power Button";
+                        gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
+                        linux,code = <KEY_POWER>;
+                        gpio-key,wakeup;
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+
+                user_led: user {
+                        label = "Heartbeat";
+                        gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                reg_3v3_etn: regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        regulator-name = "3V3_ETN";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_etnphy_power>;
+                        gpio = <&gpio3 20 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+
+                reg_2v5: regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "2V5";
+                        regulator-min-microvolt = <2500000>;
+                        regulator-max-microvolt = <2500000>;
+                        regulator-always-on;
+                };
+
+                reg_3v3: regulator@2 {
+                        compatible = "regulator-fixed";
+                        reg = <2>;
+                        regulator-name = "3V3";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                reg_can_xcvr: regulator@3 {
+                        compatible = "regulator-fixed";
+                        reg = <3>;
+                        regulator-name = "CAN XCVR";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_flexcan_xcvr>;
+                        gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
+                        enable-active-low;
+                };
+
+                reg_lcd0_pwr: regulator@4 {
+                        compatible = "regulator-fixed";
+                        reg = <4>;
+                        regulator-name = "LCD0 POWER";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_lcd0_pwr>;
+                        gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                reg_lcd1_pwr: regulator@5 {
+                        compatible = "regulator-fixed";
+                        reg = <5>;
+                        regulator-name = "LCD1 POWER";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_lcd1_pwr>;
+                        gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                reg_usbh1_vbus: regulator@6 {
+                        compatible = "regulator-fixed";
+                        reg = <6>;
+                        regulator-name = "usbh1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usbh1_vbus>;
+                        gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+
+                reg_usbotg_vbus: regulator@7 {
+                        compatible = "regulator-fixed";
+                        reg = <7>;
+                        regulator-name = "usbotg_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usbotg_vbus>;
+                        gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+        };
+
+        sound {
+                compatible = "karo,imx6qdl-tx6qdl-sgtl5000",
+                             "fsl,imx-audio-sgtl5000";
+                model = "sgtl5000-audio";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_audmux>;
+                ssi-controller = <&ssi1>;
+                audio-codec = <&sgtl5000>;
+                audio-routing =
+                        "MIC_IN", "Mic Jack",
+                        "Mic Jack", "Mic Bias",
+                        "Headphone Jack", "HP_OUT";
+                mux-int-port = <1>;
+                mux-ext-port = <5>;
+        };
+};
+
+&audmux {
+        status = "okay";
+};
+
+&can1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flexcan1>;
+        xceiver-supply = <&reg_can_xcvr>;
+        status = "okay";
+};
+
+&can2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_flexcan2>;
+        xceiver-supply = <&reg_can_xcvr>;
+        status = "okay";
+};
+
+&ecspi1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi1>;
+        fsl,spi-num-chipselects = <2>;
+        cs-gpios = <
+                &gpio2 30 GPIO_ACTIVE_HIGH
+                &gpio3 19 GPIO_ACTIVE_HIGH
+        >;
+        status = "okay";
+
+        spidev0: spi@0 {
+                compatible = "spidev";
+                reg = <0>;
+                spi-max-frequency = <54000000>;
+        };
+
+        spidev1: spi@1 {
+                compatible = "spidev";
+                reg = <1>;
+                spi-max-frequency = <54000000>;
+        };
+};
+
+&fec {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet>;
+        phy-mode = "rmii";
+        phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_HIGH>;
+        phy-supply = <&reg_3v3_etn>;
+        status = "okay";
+};
+
+&gpmi {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_gpmi_nand>;
+        nand-on-flash-bbt;
+        fsl,no-blockmark-swap;
+        status = "okay";
+};
+
+&i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        clock-frequency = <400000>;
+        status = "okay";
+
+        ds1339: rtc@68 {
+                compatible = "dallas,ds1339";
+                reg = <0x68>;
+        };
+};
+
+&i2c3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c3>;
+        clock-frequency = <400000>;
+        status = "okay";
+
+        sgtl5000: sgtl5000@0a {
+                compatible = "fsl,sgtl5000";
+                reg = <0x0a>;
+                VDDA-supply = <&reg_2v5>;
+                VDDIO-supply = <&reg_3v3>;
+                clocks = <&mclk>;
+        };
+
+        polytouch: edt-ft5x06@38 {
+                compatible = "edt,edt-ft5x06";
+                reg = <0x38>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_edt_ft5x06>;
+                interrupt-parent = <&gpio6>;
+                interrupts = <15 0>;
+                reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
+                wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
+                linux,wakeup;
+        };
+
+        touchscreen: tsc2007@48 {
+                compatible = "ti,tsc2007";
+                reg = <0x48>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_tsc2007>;
+                interrupt-parent = <&gpio3>;
+                interrupts = <26 0>;
+                gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
+                ti,x-plate-ohms = <660>;
+                linux,wakeup;
+        };
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hog>;
+
+        imx6qdl-tx6 {
+                pinctrl_hog: hoggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_A18__GPIO2_IO20          0x1b0b1 /* LED */
+                                MX6QDL_PAD_SD3_DAT2__GPIO7_IO06         0x1b0b1 /* ETN PHY RESET */
+                                MX6QDL_PAD_SD3_DAT4__GPIO7_IO01         0x1b0b1 /* ETN PHY INT */
+                                MX6QDL_PAD_EIM_A25__GPIO5_IO02          0x1b0b1 /* PWR BTN */
+                        >;
+                };
+
+                pinctrl_audmux: audmuxgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_KEY_ROW1__AUD5_RXD           0x130b0 /* SSI1_RXD */
+                                MX6QDL_PAD_KEY_ROW0__AUD5_TXD           0x110b0 /* SSI1_TXD */
+                                MX6QDL_PAD_KEY_COL0__AUD5_TXC           0x130b0 /* SSI1_CLK */
+                                MX6QDL_PAD_KEY_COL1__AUD5_TXFS          0x130b0 /* SSI1_FS */
+                        >;
+                };
+
+                pinctrl_disp0_1: disp0grp-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
+                                /* PAD DISP0_DAT0 is used for the Flexcan transceiver control */
+                                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_disp0_2: disp0grp-2 {
+                        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_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_ecspi1: ecspi1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D18__ECSPI1_MOSI         0x0b0b0
+                                MX6QDL_PAD_EIM_D17__ECSPI1_MISO         0x0b0b0
+                                MX6QDL_PAD_EIM_D16__ECSPI1_SCLK         0x0b0b0
+                                MX6QDL_PAD_GPIO_19__ECSPI1_RDY          0x0b0b0
+                                MX6QDL_PAD_EIM_EB2__GPIO2_IO30          0x0b0b0 /* SPI CS0 */
+                                MX6QDL_PAD_EIM_D19__GPIO3_IO19          0x0b0b0 /* SPI CS1 */
+                        >;
+                };
+
+                pinctrl_edt_ft5x06: edt-ft5x06grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_NANDF_CS2__GPIO6_IO15        0x1b0b0 /* Interrupt */
+                                MX6QDL_PAD_EIM_A16__GPIO2_IO22          0x1b0b0 /* Reset */
+                                MX6QDL_PAD_EIM_A17__GPIO2_IO21          0x1b0b0 /* Wake */
+                        >;
+                };
+
+                pinctrl_enet: enetgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
+                                MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
+                                MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0     0x1b0b0
+                                MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1     0x1b0b0
+                                MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER       0x1b0b0
+                                MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN       0x1b0b0
+                                MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0     0x1b0b0
+                                MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1     0x1b0b0
+                                MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN      0x1b0b0
+                        >;
+                };
+
+                pinctrl_etnphy_power: etnphy-pwrgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D20__GPIO3_IO20          0x1b0b1 /* ETN PHY POWER */
+                        >;
+                };
+
+                pinctrl_flexcan1: flexcan1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_7__FLEXCAN1_TX          0x1b0b0
+                                MX6QDL_PAD_GPIO_8__FLEXCAN1_RX          0x1b0b0
+                        >;
+                };
+
+                pinctrl_flexcan2: flexcan2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX        0x1b0b0
+                                MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX        0x1b0b0
+                        >;
+                };
+
+                pinctrl_flexcan_xcvr: flexcan-xcvrgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_DISP0_DAT0__GPIO4_IO21       0x1b0b0 /* Flexcan XCVR enable */
+                        >;
+                };
+
+                pinctrl_gpmi_nand: gpminandgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_NANDF_CLE__NAND_CLE          0x0b0b1
+                                MX6QDL_PAD_NANDF_ALE__NAND_ALE          0x0b0b1
+                                MX6QDL_PAD_NANDF_WP_B__NAND_WP_B        0x0b0b1
+                                MX6QDL_PAD_NANDF_RB0__NAND_READY_B      0x0b000
+                                MX6QDL_PAD_NANDF_CS0__NAND_CE0_B        0x0b0b1
+                                MX6QDL_PAD_SD4_CMD__NAND_RE_B           0x0b0b1
+                                MX6QDL_PAD_SD4_CLK__NAND_WE_B           0x0b0b1
+                                MX6QDL_PAD_NANDF_D0__NAND_DATA00        0x0b0b1
+                                MX6QDL_PAD_NANDF_D1__NAND_DATA01        0x0b0b1
+                                MX6QDL_PAD_NANDF_D2__NAND_DATA02        0x0b0b1
+                                MX6QDL_PAD_NANDF_D3__NAND_DATA03        0x0b0b1
+                                MX6QDL_PAD_NANDF_D4__NAND_DATA04        0x0b0b1
+                                MX6QDL_PAD_NANDF_D5__NAND_DATA05        0x0b0b1
+                                MX6QDL_PAD_NANDF_D6__NAND_DATA06        0x0b0b1
+                                MX6QDL_PAD_NANDF_D7__NAND_DATA07        0x0b0b1
+                        >;
+                };
+
+                pinctrl_i2c1: i2c1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
+                                MX6QDL_PAD_EIM_D28__I2C1_SDA            0x4001b8b1
+                        >;
+                };
+
+                pinctrl_i2c3: i2c3grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_3__I2C3_SCL             0x4001b8b1
+                                MX6QDL_PAD_GPIO_6__I2C3_SDA             0x4001b8b1
+                        >;
+                };
+
+                pinctrl_kpp: kppgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_9__KEY_COL6             0x1b0b1
+                                MX6QDL_PAD_GPIO_4__KEY_COL7             0x1b0b1
+                                MX6QDL_PAD_KEY_COL2__KEY_COL2           0x1b0b1
+                                MX6QDL_PAD_KEY_COL3__KEY_COL3           0x1b0b1
+                                MX6QDL_PAD_GPIO_2__KEY_ROW6             0x1b0b1
+                                MX6QDL_PAD_GPIO_5__KEY_ROW7             0x1b0b1
+                                MX6QDL_PAD_KEY_ROW2__KEY_ROW2           0x1b0b1
+                                MX6QDL_PAD_KEY_ROW3__KEY_ROW3           0x1b0b1
+                        >;
+                };
+
+                pinctrl_lcd0_pwr: lcd0-pwrgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D29__GPIO3_IO29          0x1b0b1 /* LCD Reset */
+                        >;
+                };
+
+                pinctrl_lcd1_pwr: lcd1-pwrgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_EB3__GPIO2_IO31          0x1b0b1 /* LCD Power Enable */
+                        >;
+                };
+
+                pinctrl_pwm1: pwm1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_9__PWM1_OUT             0x1b0b1
+                        >;
+                };
+
+                pinctrl_pwm2: pwm2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_1__PWM2_OUT             0x1b0b1
+                        >;
+                };
+
+                pinctrl_tsc2007: tsc2007grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D26__GPIO3_IO26          0x1b0b0 /* Interrupt */
+                        >;
+                };
+
+                pinctrl_uart1: uart1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA      0x1b0b1
+                                MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA      0x1b0b1
+                        >;
+                };
+
+                pinctrl_uart1_rtscts: uart1_rtsctsgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD3_DAT1__UART1_RTS_B        0x1b0b1
+                                MX6QDL_PAD_SD3_DAT0__UART1_CTS_B        0x1b0b1
+                        >;
+                };
+
+                pinctrl_uart2: uart2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA      0x1b0b1
+                                MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA      0x1b0b1
+                        >;
+                };
+
+                pinctrl_uart2_rtscts: uart2_rtsctsgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD4_DAT5__UART2_RTS_B        0x1b0b1
+                                MX6QDL_PAD_SD4_DAT6__UART2_CTS_B        0x1b0b1
+                        >;
+                };
+
+                pinctrl_uart3: uart3grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D24__UART3_TX_DATA       0x1b0b1
+                                MX6QDL_PAD_EIM_D25__UART3_RX_DATA       0x1b0b1
+                        >;
+                };
+
+                pinctrl_uart3_rtscts: uart3_rtsctsgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD3_DAT3__UART3_CTS_B        0x1b0b1
+                                MX6QDL_PAD_SD3_RST__UART3_RTS_B         0x1b0b1
+                        >;
+                };
+
+                pinctrl_usbh1_vbus: usbh1-vbusgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D31__GPIO3_IO31          0x1b0b0 /* USBH1_VBUSEN */
+                        >;
+                };
+
+                pinctrl_usbotg: usbotggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D23__GPIO3_IO23          0x17059
+                        >;
+                };
+
+                pinctrl_usbotg_vbus: usbotg-vbusgrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_7__GPIO1_IO07           0x1b0b0 /* USBOTG_VBUSEN */
+                        >;
+                };
+
+                pinctrl_usdhc1: usdhc1grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD1_CMD__SD1_CMD             0x070b1
+                                MX6QDL_PAD_SD1_CLK__SD1_CLK             0x070b1
+                                MX6QDL_PAD_SD1_DAT0__SD1_DATA0          0x070b1
+                                MX6QDL_PAD_SD1_DAT1__SD1_DATA1          0x070b1
+                                MX6QDL_PAD_SD1_DAT2__SD1_DATA2          0x070b1
+                                MX6QDL_PAD_SD1_DAT3__SD1_DATA3          0x070b1
+                                MX6QDL_PAD_SD3_CMD__GPIO7_IO02          0x170b0 /* SD1 CD */
+                        >;
+                };
+
+                pinctrl_usdhc2: usdhc2grp {
+                        fsl,pins = <
+                                MX6QDL_PAD_SD2_CMD__SD2_CMD             0x070b1
+                                MX6QDL_PAD_SD2_CLK__SD2_CLK             0x070b1
+                                MX6QDL_PAD_SD2_DAT0__SD2_DATA0          0x070b1
+                                MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x070b1
+                                MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x070b1
+                                MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x070b1
+                                MX6QDL_PAD_SD3_CLK__GPIO7_IO03          0x170b0 /* SD2 CD */
+                        >;
+                };
+        };
+};
+
+&kpp {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_kpp>;
+        /* sample keymap */
+        /* row/col 0,1 are mapped to KPP row/col 6,7 */
+        linux,keymap = <
+                MATRIX_KEY(6, 6, KEY_POWER) /* 0x06060074 */
+                MATRIX_KEY(6, 7, KEY_KP0) /* 0x06070052 */
+                MATRIX_KEY(6, 2, KEY_KP1) /* 0x0602004f */
+                MATRIX_KEY(6, 3, KEY_KP2) /* 0x06030050 */
+                MATRIX_KEY(7, 6, KEY_KP3) /* 0x07060051 */
+                MATRIX_KEY(7, 7, KEY_KP4) /* 0x0707004b */
+                MATRIX_KEY(7, 2, KEY_KP5) /* 0x0702004c */
+                MATRIX_KEY(7, 3, KEY_KP6) /* 0x0703004d */
+                MATRIX_KEY(2, 6, KEY_KP7) /* 0x02060047 */
+                MATRIX_KEY(2, 7, KEY_KP8) /* 0x02070048 */
+                MATRIX_KEY(2, 2, KEY_KP9) /* 0x02020049 */
+        >;
+        status = "okay";
+};
+
+&pwm1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm1>;
+        #pwm-cells = <3>;
+        status = "disabled";
+};
+
+&pwm2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm2>;
+        #pwm-cells = <3>;
+        status = "okay";
+};
+
+&ssi1 {
+        status = "okay";
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart1>;
+        status = "okay";
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart2 &pinctrl_uart2_rtscts>;
+        status = "okay";
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart3 &pinctrl_uart3_rtscts>;
+        status = "okay";
+};
+
+&usbh1 {
+        vbus-supply = <&reg_usbh1_vbus>;
+        dr_mode = "host";
+        disable-over-current;
+        status = "okay";
+};
+
+&usbotg {
+        vbus-supply = <&reg_usbotg_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usbotg>;
+        dr_mode = "peripheral";
+        disable-over-current;
+        status = "okay";
+};
+
+&usdhc1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc1>;
+        bus-width = <4>;
+        no-1-8-v;
+        cd-gpios = <&gpio7 2 0>;
+        fsl,wp-controller;
+        status = "okay";
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        bus-width = <4>;
+        no-1-8-v;
+        cd-gpios = <&gpio7 3 0>;
+        fsl,wp-controller;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi
new file mode 100644
index 000000000000..ef7fa62b9898
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ *
+ */
+
+#include "imx6qdl-wandboard.dtsi"
+
+&iomuxc {
+        pinctrl-0 = <&pinctrl_hog>;
+
+        imx6qdl-wandboard {
+                pinctrl_hog: hoggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_0__CCM_CLKO1            0x130b0         /* GPIO_0_CLKO */
+                                MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x80000000      /* uSDHC1 CD */
+                                MX6QDL_PAD_EIM_DA9__GPIO3_IO09          0x80000000      /* uSDHC3 CD */
+                                MX6QDL_PAD_EIM_EB1__GPIO2_IO29          0x0f0b0         /* WL_REF_ON */
+                                MX6QDL_PAD_EIM_A25__GPIO5_IO02          0x0f0b0         /* WL_RST_N */
+                                MX6QDL_PAD_ENET_RXD1__GPIO1_IO26        0x000b0         /* WL_REG_ON */
+                                MX6QDL_PAD_ENET_TXD1__GPIO1_IO29        0x80000000      /* WL_HOST_WAKE */
+                                MX6QDL_PAD_ENET_TXD0__GPIO1_IO30        0x80000000      /* WL_WAKE */
+                                MX6QDL_PAD_EIM_D29__GPIO3_IO29          0x80000000      /* RGMII_nRST */
+                                MX6QDL_PAD_EIM_DA13__GPIO3_IO13         0x80000000      /* BT_ON */
+                                MX6QDL_PAD_EIM_DA14__GPIO3_IO14         0x80000000      /* BT_WAKE */
+                                MX6QDL_PAD_EIM_DA15__GPIO3_IO15         0x80000000      /* BT_HOST_WAKE */                              
+                        >;
+                };
+        };
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        non-removable;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi
new file mode 100644
index 000000000000..8d893a78cdf0
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ *
+ */
+
+#include "imx6qdl-wandboard.dtsi"
+
+&iomuxc {
+        pinctrl-0 = <&pinctrl_hog>;
+
+        imx6qdl-wandboard {
+                pinctrl_hog: hoggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_0__CCM_CLKO1            0x130b0         /* GPIO_0_CLKO */
+                                MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x80000000      /* uSDHC1 CD */
+                                MX6QDL_PAD_EIM_DA9__GPIO3_IO09          0x80000000      /* uSDHC3 CD */
+                                MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00       0x0f0b0         /* WIFI_ON (reset, active low) */
+                                MX6QDL_PAD_ENET_RXD1__GPIO1_IO26        0x000b0         /* WL_REG_ON (unused) */
+                                MX6QDL_PAD_ENET_TXD1__GPIO1_IO29        0x80000000      /* WL_HOST_WAKE, input */
+                                MX6QDL_PAD_CSI0_DAT13__GPIO5_IO31       0x0f0b0         /* GPIO5_IO31 (Wifi Power Enable) */
+                                MX6QDL_PAD_ENET_TXD0__GPIO1_IO30        0x80000000      /* WL_WAKE (unused) */
+                                MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21       0x80000000      /* BT_ON */
+                                MX6QDL_PAD_CSI0_DAT12__GPIO5_IO30       0x80000000      /* BT_WAKE */
+                                MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20     0x80000000      /* BT_HOST_WAKE */
+                                MX6QDL_PAD_EIM_D29__GPIO3_IO29          0x80000000      /* RGMII_nRST */
+                        >;
+                };
+        };
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
index 5c6f10c43f65..5fb091675582 100644
--- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
@@ -91,22 +91,8 @@
 
 &iomuxc {
         pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_hog>;
 
         imx6qdl-wandboard {
-                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 */
-                                MX6QDL_PAD_EIM_D29__GPIO3_IO29   0x80000000
-                        >;
-                };
 
                 pinctrl_audmux: audmuxgrp {
                         fsl,pins = <
@@ -233,7 +219,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
@@ -269,13 +254,6 @@
         status = "okay";
 };
 
-&usdhc2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_usdhc2>;
-        non-removable;
-        status = "okay";
-};
-
 &usdhc3 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_usdhc3>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index ce0599134a69..c701af958006 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -10,6 +10,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+#include <dt-bindings/clock/imx6qdl-clock.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 #include "skeleton.dtsi"
@@ -94,7 +95,7 @@
                         interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3";
                         #dma-cells = <1>;
                         dma-channels = <4>;
-                        clocks = <&clks 106>;
+                        clocks = <&clks IMX6QDL_CLK_APBH_DMA>;
                 };
 
                 gpmi: gpmi-nand@00112000 {
@@ -105,8 +106,11 @@
                         reg-names = "gpmi-nand", "bch";
                         interrupts = <0 15 IRQ_TYPE_LEVEL_HIGH>;
                         interrupt-names = "bch";
-                        clocks = <&clks 152>, <&clks 153>, <&clks 151>,
-                                 <&clks 150>, <&clks 149>;
+                        clocks = <&clks IMX6QDL_CLK_GPMI_IO>,
+                                 <&clks IMX6QDL_CLK_GPMI_APB>,
+                                 <&clks IMX6QDL_CLK_GPMI_BCH>,
+                                 <&clks IMX6QDL_CLK_GPMI_BCH_APB>,
+                                 <&clks IMX6QDL_CLK_PER1_BCH>;
                         clock-names = "gpmi_io", "gpmi_apb", "gpmi_bch",
                                       "gpmi_bch_apb", "per1_bch";
                         dmas = <&dma_apbh 0>;
@@ -118,7 +122,7 @@
                         compatible = "arm,cortex-a9-twd-timer";
                         reg = <0x00a00600 0x20>;
                         interrupts = <1 13 0xf01>;
-                        clocks = <&clks 15>;
+                        clocks = <&clks IMX6QDL_CLK_TWD>;
                 };
 
                 L2: l2-cache@00a02000 {
@@ -149,7 +153,9 @@
                                         <0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
                                         <0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
                                         <0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clks 144>, <&clks 206>, <&clks 189>;
+                        clocks = <&clks IMX6QDL_CLK_PCIE_AXI>,
+                                 <&clks IMX6QDL_CLK_LVDS1_GATE>,
+                                 <&clks IMX6QDL_CLK_PCIE_REF_125M>;
                         clock-names = "pcie", "pcie_bus", "pcie_phy";
                         status = "disabled";
                 };
@@ -180,11 +186,11 @@
                                         dmas = <&sdma 14 18 0>,
                                                <&sdma 15 18 0>;
                                         dma-names = "rx", "tx";
-                                        clocks = <&clks 197>, <&clks 3>,
-                                                 <&clks 197>, <&clks 107>,
-                                                 <&clks 0>,   <&clks 118>,
-                                                 <&clks 0>,  <&clks 139>,
-                                                 <&clks 0>;
+                                        clocks = <&clks IMX6QDL_CLK_SPDIF>, <&clks IMX6QDL_CLK_OSC>,
+                                                 <&clks IMX6QDL_CLK_SPDIF>, <&clks IMX6QDL_CLK_DUMMY>,
+                                                 <&clks IMX6QDL_CLK_DUMMY>, <&clks IMX6QDL_CLK_DUMMY>,
+                                                 <&clks IMX6QDL_CLK_DUMMY>, <&clks IMX6QDL_CLK_DUMMY>,
+                                                 <&clks IMX6QDL_CLK_DUMMY>;
                                         clock-names = "core",  "rxtx0",
                                                       "rxtx1", "rxtx2",
                                                       "rxtx3", "rxtx4",
@@ -199,7 +205,8 @@
                                         compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
                                         reg = <0x02008000 0x4000>;
                                         interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
-                                        clocks = <&clks 112>, <&clks 112>;
+                                        clocks = <&clks IMX6QDL_CLK_ECSPI1>,
+                                                 <&clks IMX6QDL_CLK_ECSPI1>;
                                         clock-names = "ipg", "per";
                                         dmas = <&sdma 3 7 1>, <&sdma 4 7 2>;
                                         dma-names = "rx", "tx";
@@ -212,7 +219,8 @@
                                         compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
                                         reg = <0x0200c000 0x4000>;
                                         interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>;
-                                        clocks = <&clks 113>, <&clks 113>;
+                                        clocks = <&clks IMX6QDL_CLK_ECSPI2>,
+                                                 <&clks IMX6QDL_CLK_ECSPI2>;
                                         clock-names = "ipg", "per";
                                         dmas = <&sdma 5 7 1>, <&sdma 6 7 2>;
                                         dma-names = "rx", "tx";
@@ -225,7 +233,8 @@
                                         compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
                                         reg = <0x02010000 0x4000>;
                                         interrupts = <0 33 IRQ_TYPE_LEVEL_HIGH>;
-                                        clocks = <&clks 114>, <&clks 114>;
+                                        clocks = <&clks IMX6QDL_CLK_ECSPI3>,
+                                                 <&clks IMX6QDL_CLK_ECSPI3>;
                                         clock-names = "ipg", "per";
                                         dmas = <&sdma 7 7 1>, <&sdma 8 7 2>;
                                         dma-names = "rx", "tx";
@@ -238,7 +247,8 @@
                                         compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
                                         reg = <0x02014000 0x4000>;
                                         interrupts = <0 34 IRQ_TYPE_LEVEL_HIGH>;
-                                        clocks = <&clks 115>, <&clks 115>;
+                                        clocks = <&clks IMX6QDL_CLK_ECSPI4>,
+                                                 <&clks IMX6QDL_CLK_ECSPI4>;
                                         clock-names = "ipg", "per";
                                         dmas = <&sdma 9 7 1>, <&sdma 10 7 2>;
                                         dma-names = "rx", "tx";
@@ -249,7 +259,8 @@
                                         compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                         reg = <0x02020000 0x4000>;
                                         interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>;
-                                        clocks = <&clks 160>, <&clks 161>;
+                                        clocks = <&clks IMX6QDL_CLK_UART_IPG>,
+                                                 <&clks IMX6QDL_CLK_UART_SERIAL>;
                                         clock-names = "ipg", "per";
                                         dmas = <&sdma 25 4 0>, <&sdma 26 4 0>;
                                         dma-names = "rx", "tx";
@@ -263,46 +274,40 @@
 
                                 ssi1: ssi@02028000 {
                                         compatible = "fsl,imx6q-ssi",
-                                                        "fsl,imx51-ssi",
-                                                        "fsl,imx21-ssi";
+                                                        "fsl,imx51-ssi";
                                         reg = <0x02028000 0x4000>;
                                         interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
-                                        clocks = <&clks 178>;
+                                        clocks = <&clks IMX6QDL_CLK_SSI1_IPG>;
                                         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";
                                 };
 
                                 ssi2: ssi@0202c000 {
                                         compatible = "fsl,imx6q-ssi",
-                                                        "fsl,imx51-ssi",
-                                                        "fsl,imx21-ssi";
+                                                        "fsl,imx51-ssi";
                                         reg = <0x0202c000 0x4000>;
                                         interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
-                                        clocks = <&clks 179>;
+                                        clocks = <&clks IMX6QDL_CLK_SSI2_IPG>;
                                         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";
                                 };
 
                                 ssi3: ssi@02030000 {
                                         compatible = "fsl,imx6q-ssi",
-                                                        "fsl,imx51-ssi",
-                                                        "fsl,imx21-ssi";
+                                                        "fsl,imx51-ssi";
                                         reg = <0x02030000 0x4000>;
                                         interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
-                                        clocks = <&clks 180>;
+                                        clocks = <&clks IMX6QDL_CLK_SSI3_IPG>;
                                         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";
                                 };
 
@@ -331,7 +336,8 @@
                                 compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
                                 reg = <0x02080000 0x4000>;
                                 interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 62>, <&clks 145>;
+                                clocks = <&clks IMX6QDL_CLK_IPG>,
+                                         <&clks IMX6QDL_CLK_PWM1>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -340,7 +346,8 @@
                                 compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
                                 reg = <0x02084000 0x4000>;
                                 interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 62>, <&clks 146>;
+                                clocks = <&clks IMX6QDL_CLK_IPG>,
+                                         <&clks IMX6QDL_CLK_PWM2>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -349,7 +356,8 @@
                                 compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
                                 reg = <0x02088000 0x4000>;
                                 interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 62>, <&clks 147>;
+                                clocks = <&clks IMX6QDL_CLK_IPG>,
+                                         <&clks IMX6QDL_CLK_PWM3>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -358,7 +366,8 @@
                                 compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
                                 reg = <0x0208c000 0x4000>;
                                 interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 62>, <&clks 148>;
+                                clocks = <&clks IMX6QDL_CLK_IPG>,
+                                         <&clks IMX6QDL_CLK_PWM4>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -366,7 +375,8 @@
                                 compatible = "fsl,imx6q-flexcan";
                                 reg = <0x02090000 0x4000>;
                                 interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 108>, <&clks 109>;
+                                clocks = <&clks IMX6QDL_CLK_CAN1_IPG>,
+                                         <&clks IMX6QDL_CLK_CAN1_SERIAL>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -375,7 +385,8 @@
                                 compatible = "fsl,imx6q-flexcan";
                                 reg = <0x02094000 0x4000>;
                                 interrupts = <0 111 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 110>, <&clks 111>;
+                                clocks = <&clks IMX6QDL_CLK_CAN2_IPG>,
+                                         <&clks IMX6QDL_CLK_CAN2_SERIAL>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -384,7 +395,8 @@
                                 compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";
                                 reg = <0x02098000 0x4000>;
                                 interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 119>, <&clks 120>;
+                                clocks = <&clks IMX6QDL_CLK_GPT_IPG>,
+                                         <&clks IMX6QDL_CLK_GPT_IPG_PER>;
                                 clock-names = "ipg", "per";
                         };
 
@@ -466,22 +478,25 @@
                         };
 
                         kpp: kpp@020b8000 {
+                                compatible = "fsl,imx6q-kpp", "fsl,imx21-kpp";
                                 reg = <0x020b8000 0x4000>;
                                 interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6QDL_CLK_IPG>;
+                                status = "disabled";
                         };
 
                         wdog1: wdog@020bc000 {
                                 compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
                                 reg = <0x020bc000 0x4000>;
                                 interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 0>;
+                                clocks = <&clks IMX6QDL_CLK_DUMMY>;
                         };
 
                         wdog2: wdog@020c0000 {
                                 compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
                                 reg = <0x020c0000 0x4000>;
                                 interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 0>;
+                                clocks = <&clks IMX6QDL_CLK_DUMMY>;
                                 status = "disabled";
                         };
 
@@ -599,14 +614,14 @@
                                 interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>;
                                 fsl,tempmon = <&anatop>;
                                 fsl,tempmon-data = <&ocotp>;
-                                clocks = <&clks 172>;
+                                clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
                         };
 
                         usbphy1: usbphy@020c9000 {
                                 compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
                                 reg = <0x020c9000 0x1000>;
                                 interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 182>;
+                                clocks = <&clks IMX6QDL_CLK_USBPHY1>;
                                 fsl,anatop = <&anatop>;
                         };
 
@@ -614,7 +629,7 @@
                                 compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
                                 reg = <0x020ca000 0x1000>;
                                 interrupts = <0 45 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 183>;
+                                clocks = <&clks IMX6QDL_CLK_USBPHY2>;
                                 fsl,anatop = <&anatop>;
                         };
 
@@ -727,7 +742,8 @@
                                 reg = <0x00120000 0x9000>;
                                 interrupts = <0 115 0x04>;
                                 gpr = <&gpr>;
-                                clocks = <&clks 123>, <&clks 124>;
+                                clocks = <&clks IMX6QDL_CLK_HDMI_IAHB>,
+                                         <&clks IMX6QDL_CLK_HDMI_ISFR>;
                                 clock-names = "iahb", "isfr";
                                 status = "disabled";
 
@@ -762,7 +778,8 @@
                                 compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";
                                 reg = <0x020ec000 0x4000>;
                                 interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 155>, <&clks 155>;
+                                clocks = <&clks IMX6QDL_CLK_SDMA>,
+                                         <&clks IMX6QDL_CLK_SDMA>;
                                 clock-names = "ipg", "ahb";
                                 #dma-cells = <3>;
                                 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
@@ -790,7 +807,7 @@
                                 compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
                                 reg = <0x02184000 0x200>;
                                 interrupts = <0 43 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 162>;
+                                clocks = <&clks IMX6QDL_CLK_USBOH3>;
                                 fsl,usbphy = <&usbphy1>;
                                 fsl,usbmisc = <&usbmisc 0>;
                                 status = "disabled";
@@ -800,7 +817,7 @@
                                 compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
                                 reg = <0x02184200 0x200>;
                                 interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 162>;
+                                clocks = <&clks IMX6QDL_CLK_USBOH3>;
                                 fsl,usbphy = <&usbphy2>;
                                 fsl,usbmisc = <&usbmisc 1>;
                                 status = "disabled";
@@ -810,7 +827,7 @@
                                 compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
                                 reg = <0x02184400 0x200>;
                                 interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 162>;
+                                clocks = <&clks IMX6QDL_CLK_USBOH3>;
                                 fsl,usbmisc = <&usbmisc 2>;
                                 status = "disabled";
                         };
@@ -819,7 +836,7 @@
                                 compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
                                 reg = <0x02184600 0x200>;
                                 interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 162>;
+                                clocks = <&clks IMX6QDL_CLK_USBOH3>;
                                 fsl,usbmisc = <&usbmisc 3>;
                                 status = "disabled";
                         };
@@ -828,7 +845,7 @@
                                 #index-cells = <1>;
                                 compatible = "fsl,imx6q-usbmisc";
                                 reg = <0x02184800 0x200>;
-                                clocks = <&clks 162>;
+                                clocks = <&clks IMX6QDL_CLK_USBOH3>;
                         };
 
                         fec: ethernet@02188000 {
@@ -837,7 +854,9 @@
                                 interrupts-extended =
                                         <&intc 0 118 IRQ_TYPE_LEVEL_HIGH>,
                                         <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 117>, <&clks 117>, <&clks 190>;
+                                clocks = <&clks IMX6QDL_CLK_ENET>,
+                                         <&clks IMX6QDL_CLK_ENET>,
+                                         <&clks IMX6QDL_CLK_ENET_REF>;
                                 clock-names = "ipg", "ahb", "ptp";
                                 status = "disabled";
                         };
@@ -853,7 +872,9 @@
                                 compatible = "fsl,imx6q-usdhc";
                                 reg = <0x02190000 0x4000>;
                                 interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 163>, <&clks 163>, <&clks 163>;
+                                clocks = <&clks IMX6QDL_CLK_USDHC1>,
+                                         <&clks IMX6QDL_CLK_USDHC1>,
+                                         <&clks IMX6QDL_CLK_USDHC1>;
                                 clock-names = "ipg", "ahb", "per";
                                 bus-width = <4>;
                                 status = "disabled";
@@ -863,7 +884,9 @@
                                 compatible = "fsl,imx6q-usdhc";
                                 reg = <0x02194000 0x4000>;
                                 interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 164>, <&clks 164>, <&clks 164>;
+                                clocks = <&clks IMX6QDL_CLK_USDHC2>,
+                                         <&clks IMX6QDL_CLK_USDHC2>,
+                                         <&clks IMX6QDL_CLK_USDHC2>;
                                 clock-names = "ipg", "ahb", "per";
                                 bus-width = <4>;
                                 status = "disabled";
@@ -873,7 +896,9 @@
                                 compatible = "fsl,imx6q-usdhc";
                                 reg = <0x02198000 0x4000>;
                                 interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 165>, <&clks 165>, <&clks 165>;
+                                clocks = <&clks IMX6QDL_CLK_USDHC3>,
+                                         <&clks IMX6QDL_CLK_USDHC3>,
+                                         <&clks IMX6QDL_CLK_USDHC3>;
                                 clock-names = "ipg", "ahb", "per";
                                 bus-width = <4>;
                                 status = "disabled";
@@ -883,7 +908,9 @@
                                 compatible = "fsl,imx6q-usdhc";
                                 reg = <0x0219c000 0x4000>;
                                 interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 166>, <&clks 166>, <&clks 166>;
+                                clocks = <&clks IMX6QDL_CLK_USDHC4>,
+                                         <&clks IMX6QDL_CLK_USDHC4>,
+                                         <&clks IMX6QDL_CLK_USDHC4>;
                                 clock-names = "ipg", "ahb", "per";
                                 bus-width = <4>;
                                 status = "disabled";
@@ -895,7 +922,7 @@
                                 compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
                                 reg = <0x021a0000 0x4000>;
                                 interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 125>;
+                                clocks = <&clks IMX6QDL_CLK_I2C1>;
                                 status = "disabled";
                         };
 
@@ -905,7 +932,7 @@
                                 compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
                                 reg = <0x021a4000 0x4000>;
                                 interrupts = <0 37 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 126>;
+                                clocks = <&clks IMX6QDL_CLK_I2C2>;
                                 status = "disabled";
                         };
 
@@ -915,7 +942,7 @@
                                 compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c";
                                 reg = <0x021a8000 0x4000>;
                                 interrupts = <0 38 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 127>;
+                                clocks = <&clks IMX6QDL_CLK_I2C3>;
                                 status = "disabled";
                         };
 
@@ -936,7 +963,7 @@
                                 compatible = "fsl,imx6q-weim";
                                 reg = <0x021b8000 0x4000>;
                                 interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 196>;
+                                clocks = <&clks IMX6QDL_CLK_EIM_SLOW>;
                         };
 
                         ocotp: ocotp@021bc000 {
@@ -996,7 +1023,8 @@
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021e8000 0x4000>;
                                 interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 160>, <&clks 161>;
+                                clocks = <&clks IMX6QDL_CLK_UART_IPG>,
+                                         <&clks IMX6QDL_CLK_UART_SERIAL>;
                                 clock-names = "ipg", "per";
                                 dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
                                 dma-names = "rx", "tx";
@@ -1007,7 +1035,8 @@
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021ec000 0x4000>;
                                 interrupts = <0 28 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 160>, <&clks 161>;
+                                clocks = <&clks IMX6QDL_CLK_UART_IPG>,
+                                         <&clks IMX6QDL_CLK_UART_SERIAL>;
                                 clock-names = "ipg", "per";
                                 dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
                                 dma-names = "rx", "tx";
@@ -1018,7 +1047,8 @@
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021f0000 0x4000>;
                                 interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 160>, <&clks 161>;
+                                clocks = <&clks IMX6QDL_CLK_UART_IPG>,
+                                         <&clks IMX6QDL_CLK_UART_SERIAL>;
                                 clock-names = "ipg", "per";
                                 dmas = <&sdma 31 4 0>, <&sdma 32 4 0>;
                                 dma-names = "rx", "tx";
@@ -1029,7 +1059,8 @@
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021f4000 0x4000>;
                                 interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clks 160>, <&clks 161>;
+                                clocks = <&clks IMX6QDL_CLK_UART_IPG>,
+                                         <&clks IMX6QDL_CLK_UART_SERIAL>;
                                 clock-names = "ipg", "per";
                                 dmas = <&sdma 33 4 0>, <&sdma 34 4 0>;
                                 dma-names = "rx", "tx";
@@ -1044,10 +1075,20 @@
                         reg = <0x02400000 0x400000>;
                         interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>,
                                      <0 5 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clks 130>, <&clks 131>, <&clks 132>;
+                        clocks = <&clks IMX6QDL_CLK_IPU1>,
+                                 <&clks IMX6QDL_CLK_IPU1_DI0>,
+                                 <&clks IMX6QDL_CLK_IPU1_DI1>;
                         clock-names = "bus", "di0", "di1";
                         resets = <&src 2>;
 
+                        ipu1_csi0: port@0 {
+                                reg = <0>;
+                        };
+
+                        ipu1_csi1: port@1 {
+                                reg = <1>;
+                        };
+
                         ipu1_di0: port@2 {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index a8d9a93fab85..3f9e041c0252 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -116,8 +116,9 @@
 };
 
 &fec {
-        pinctrl-names = "default";
+        pinctrl-names = "default", "sleep";
         pinctrl-0 = <&pinctrl_fec>;
+        pinctrl-1 = <&pinctrl_fec_sleep>;
         phy-mode = "rmii";
         status = "okay";
 };
@@ -300,6 +301,19 @@
                         >;
                 };
 
+                pinctrl_fec_sleep: fecgrp-sleep {
+                        fsl,pins = <
+                                MX6SL_PAD_FEC_MDC__GPIO4_IO23      0x3080
+                                MX6SL_PAD_FEC_CRS_DV__GPIO4_IO25   0x3080
+                                MX6SL_PAD_FEC_RXD0__GPIO4_IO17     0x3080
+                                MX6SL_PAD_FEC_RXD1__GPIO4_IO18     0x3080
+                                MX6SL_PAD_FEC_TX_EN__GPIO4_IO22    0x3080
+                                MX6SL_PAD_FEC_TXD0__GPIO4_IO24     0x3080
+                                MX6SL_PAD_FEC_TXD1__GPIO4_IO16     0x3080
+                                MX6SL_PAD_FEC_REF_CLK__GPIO4_IO26  0x3080
+                        >;
+                };
+
                 pinctrl_i2c1: i2c1grp {
                         fsl,pins = <
                                 MX6SL_PAD_I2C1_SCL__I2C1_SCL    0x4001b8b1
@@ -475,7 +489,6 @@
 };
 
 &ssi2 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 57d4abe03a94..c75800ca8b35 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -227,8 +227,7 @@
 
                                 ssi1: ssi@02028000 {
                                         compatible = "fsl,imx6sl-ssi",
-                                                        "fsl,imx51-ssi",
-                                                        "fsl,imx21-ssi";
+                                                        "fsl,imx51-ssi";
                                         reg = <0x02028000 0x4000>;
                                         interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
                                         clocks = <&clks IMX6SL_CLK_SSI1>;
@@ -241,8 +240,7 @@
 
                                 ssi2: ssi@0202c000 {
                                         compatible = "fsl,imx6sl-ssi",
-                                                        "fsl,imx51-ssi",
-                                                        "fsl,imx21-ssi";
+                                                        "fsl,imx51-ssi";
                                         reg = <0x0202c000 0x4000>;
                                         interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
                                         clocks = <&clks IMX6SL_CLK_SSI2>;
@@ -255,8 +253,7 @@
 
                                 ssi3: ssi@02030000 {
                                         compatible = "fsl,imx6sl-ssi",
-                                                        "fsl,imx51-ssi",
-                                                        "fsl,imx21-ssi";
+                                                        "fsl,imx51-ssi";
                                         reg = <0x02030000 0x4000>;
                                         interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
                                         clocks = <&clks IMX6SL_CLK_SSI3>;
@@ -403,6 +400,7 @@
                                 reg = <0x020b8000 0x4000>;
                                 interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6SL_CLK_DUMMY>;
+                                status = "disabled";
                         };
 
                         wdog1: wdog@020bc000 {
@@ -607,7 +605,7 @@
                         };
 
                         sdma: sdma@020ec000 {
-                                compatible = "fsl,imx6sl-sdma", "fsl,imx35-sdma";
+                                compatible = "fsl,imx6sl-sdma", "fsl,imx6q-sdma";
                                 reg = <0x020ec000 0x4000>;
                                 interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
                                 clocks = <&clks IMX6SL_CLK_SDMA>,
diff --git a/arch/arm/boot/dts/imx6sx-pinfunc.h b/arch/arm/boot/dts/imx6sx-pinfunc.h
new file mode 100644
index 000000000000..3e0b816dac08
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-pinfunc.h
@@ -0,0 +1,1544 @@
+/*
+ * Copyright 2014 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 version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#ifndef __DTS_IMX6SX_PINFUNC_H
+#define __DTS_IMX6SX_PINFUNC_H
+
+/*
+ * The pin function ID is a tuple of
+ * <mux_reg conf_reg input_reg mux_mode input_val>
+ */
+#define MX6SX_PAD_GPIO1_IO00__I2C1_SCL                            0x0014 0x035C 0x07A8 0x0 0x1
+#define MX6SX_PAD_GPIO1_IO00__USDHC1_VSELECT                      0x0014 0x035C 0x0000 0x1 0x0
+#define MX6SX_PAD_GPIO1_IO00__SPDIF_LOCK                          0x0014 0x035C 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO00__CCM_WAIT                            0x0014 0x035C 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO00__WDOG1_WDOG_ANY                      0x0014 0x035C 0x0000 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO00__GPIO1_IO_0                          0x0014 0x035C 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO00__SNVS_HP_WRAPPER_VIO_5               0x0014 0x035C 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO00__PHY_DTB_1                           0x0014 0x035C 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO01__I2C1_SDA                            0x0018 0x0360 0x07AC 0x0 0x1
+#define MX6SX_PAD_GPIO1_IO01__USDHC1_RESET_B                      0x0018 0x0360 0x0000 0x1 0x0
+#define MX6SX_PAD_GPIO1_IO01__SPDIF_SR_CLK                        0x0018 0x0360 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO01__CCM_STOP                            0x0018 0x0360 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO01__WDOG3_WDOG_B                        0x0018 0x0360 0x0000 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO01__GPIO1_IO_1                          0x0018 0x0360 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO01__SNVS_HP_WRAPPER_VIO_5_CTL           0x0018 0x0360 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO01__PHY_DTB_0                           0x0018 0x0360 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO02__I2C2_SCL                            0x001C 0x0364 0x07B0 0x0 0x1
+#define MX6SX_PAD_GPIO1_IO02__USDHC1_CD_B                         0x001C 0x0364 0x0864 0x1 0x1
+#define MX6SX_PAD_GPIO1_IO02__CSI2_MCLK                           0x001C 0x0364 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO02__CCM_DI0_EXT_CLK                     0x001C 0x0364 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO02__WDOG1_WDOG_B                        0x001C 0x0364 0x0000 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO02__GPIO1_IO_2                          0x001C 0x0364 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO02__CCM_REF_EN_B                        0x001C 0x0364 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO02__PHY_TDI                             0x001C 0x0364 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO03__I2C2_SDA                            0x0020 0x0368 0x07B4 0x0 0x1
+#define MX6SX_PAD_GPIO1_IO03__USDHC1_WP                           0x0020 0x0368 0x0868 0x1 0x1
+#define MX6SX_PAD_GPIO1_IO03__ENET1_REF_CLK_25M                   0x0020 0x0368 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO03__CCM_DI1_EXT_CLK                     0x0020 0x0368 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO03__WDOG2_WDOG_B                        0x0020 0x0368 0x0000 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO03__GPIO1_IO_3                          0x0020 0x0368 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO03__CCM_PLL3_BYP                        0x0020 0x0368 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO03__PHY_TCK                             0x0020 0x0368 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO04__UART1_RX                            0x0024 0x036C 0x0830 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO04__UART1_TX                            0x0024 0x036C 0x0000 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO04__USDHC2_RESET_B                      0x0024 0x036C 0x0000 0x1 0x0
+#define MX6SX_PAD_GPIO1_IO04__ENET1_MDC                           0x0024 0x036C 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO04__OSC32K_32K_OUT                      0x0024 0x036C 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO04__ENET2_REF_CLK2                      0x0024 0x036C 0x076C 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO04__GPIO1_IO_4                          0x0024 0x036C 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO04__CCM_PLL2_BYP                        0x0024 0x036C 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO04__PHY_TMS                             0x0024 0x036C 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO05__UART1_RX                            0x0028 0x0370 0x0830 0x0 0x1
+#define MX6SX_PAD_GPIO1_IO05__UART1_TX                            0x0028 0x0370 0x0000 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO05__USDHC2_VSELECT                      0x0028 0x0370 0x0000 0x1 0x0
+#define MX6SX_PAD_GPIO1_IO05__ENET1_MDIO                          0x0028 0x0370 0x0764 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO05__ASRC_ASRC_EXT_CLK                   0x0028 0x0370 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO05__ENET1_REF_CLK1                      0x0028 0x0370 0x0760 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO05__GPIO1_IO_5                          0x0028 0x0370 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO05__SRC_TESTER_ACK                      0x0028 0x0370 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO05__PHY_TDO                             0x0028 0x0370 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO06__UART2_RX                            0x002C 0x0374 0x0838 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO06__UART2_TX                            0x002C 0x0374 0x0000 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO06__USDHC2_CD_B                         0x002C 0x0374 0x086C 0x1 0x1
+#define MX6SX_PAD_GPIO1_IO06__ENET2_MDC                           0x002C 0x0374 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO06__CSI1_MCLK                           0x002C 0x0374 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO06__UART1_RTS_B                         0x002C 0x0374 0x082C 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO06__GPIO1_IO_6                          0x002C 0x0374 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO06__SRC_ANY_PU_RESET                    0x002C 0x0374 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO06__OCOTP_CTRL_WRAPPER_FUSE_LATCHED     0x002C 0x0374 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO07__UART2_RX                            0x0030 0x0378 0x0838 0x0 0x1
+#define MX6SX_PAD_GPIO1_IO07__UART2_TX                            0x0030 0x0378 0x0000 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO07__USDHC2_WP                           0x0030 0x0378 0x0870 0x1 0x1
+#define MX6SX_PAD_GPIO1_IO07__ENET2_MDIO                          0x0030 0x0378 0x0770 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO07__AUDMUX_MCLK                         0x0030 0x0378 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO07__UART1_CTS_B                         0x0030 0x0378 0x082C 0x4 0x1
+#define MX6SX_PAD_GPIO1_IO07__GPIO1_IO_7                          0x0030 0x0378 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO07__SRC_EARLY_RESET                     0x0030 0x0378 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO07__DCIC2_OUT                           0x0030 0x0378 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO07__VDEC_DEBUG_44                       0x0030 0x0378 0x0000 0x8 0x0
+#define MX6SX_PAD_GPIO1_IO08__USB_OTG1_OC                         0x0034 0x037C 0x0860 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO08__WDOG1_WDOG_B                        0x0034 0x037C 0x0000 0x1 0x0
+#define MX6SX_PAD_GPIO1_IO08__SDMA_EXT_EVENT_0                    0x0034 0x037C 0x081C 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO08__CCM_PMIC_RDY                        0x0034 0x037C 0x069C 0x3 0x1
+#define MX6SX_PAD_GPIO1_IO08__UART2_RTS_B                         0x0034 0x037C 0x0834 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO08__GPIO1_IO_8                          0x0034 0x037C 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO08__SRC_SYSTEM_RESET                    0x0034 0x037C 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO08__DCIC1_OUT                           0x0034 0x037C 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO08__VDEC_DEBUG_43                       0x0034 0x037C 0x0000 0x8 0x0
+#define MX6SX_PAD_GPIO1_IO09__USB_OTG1_PWR                        0x0038 0x0380 0x0000 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO09__WDOG2_WDOG_B                        0x0038 0x0380 0x0000 0x1 0x0
+#define MX6SX_PAD_GPIO1_IO09__SDMA_EXT_EVENT_1                    0x0038 0x0380 0x0820 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO09__CCM_OUT0                            0x0038 0x0380 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO09__UART2_CTS_B                         0x0038 0x0380 0x0834 0x4 0x1
+#define MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9                          0x0038 0x0380 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO09__SRC_INT_BOOT                        0x0038 0x0380 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO09__OBSERVE_MUX_OUT_4                   0x0038 0x0380 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO09__VDEC_DEBUG_42                       0x0038 0x0380 0x0000 0x8 0x0
+#define MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID                      0x003C 0x0384 0x0624 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO10__SPDIF_EXT_CLK                       0x003C 0x0384 0x0828 0x1 0x0
+#define MX6SX_PAD_GPIO1_IO10__PWM1_OUT                            0x003C 0x0384 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO10__CCM_OUT1                            0x003C 0x0384 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO10__CSI1_FIELD                          0x003C 0x0384 0x070C 0x4 0x1
+#define MX6SX_PAD_GPIO1_IO10__GPIO1_IO_10                         0x003C 0x0384 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO10__CSU_CSU_INT_DEB                     0x003C 0x0384 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO10__OBSERVE_MUX_OUT_3                   0x003C 0x0384 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO10__VDEC_DEBUG_41                       0x003C 0x0384 0x0000 0x8 0x0
+#define MX6SX_PAD_GPIO1_IO11__USB_OTG2_OC                         0x0040 0x0388 0x085C 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO11__SPDIF_IN                            0x0040 0x0388 0x0824 0x1 0x2
+#define MX6SX_PAD_GPIO1_IO11__PWM2_OUT                            0x0040 0x0388 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO11__CCM_CLKO1                           0x0040 0x0388 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO11__MLB_DATA                            0x0040 0x0388 0x07EC 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO11__GPIO1_IO_11                         0x0040 0x0388 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO11__CSU_CSU_ALARM_AUT_0                 0x0040 0x0388 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO11__OBSERVE_MUX_OUT_2                   0x0040 0x0388 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO11__VDEC_DEBUG_40                       0x0040 0x0388 0x0000 0x8 0x0
+#define MX6SX_PAD_GPIO1_IO12__USB_OTG2_PWR                        0x0044 0x038C 0x0000 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO12__SPDIF_OUT                           0x0044 0x038C 0x0000 0x1 0x0
+#define MX6SX_PAD_GPIO1_IO12__PWM3_OUT                            0x0044 0x038C 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO12__CCM_CLKO2                           0x0044 0x038C 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO12__MLB_CLK                             0x0044 0x038C 0x07E8 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO12__GPIO1_IO_12                         0x0044 0x038C 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO12__CSU_CSU_ALARM_AUT_1                 0x0044 0x038C 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO12__OBSERVE_MUX_OUT_1                   0x0044 0x038C 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO12__VDEC_DEBUG_39                       0x0044 0x038C 0x0000 0x8 0x0
+#define MX6SX_PAD_GPIO1_IO13__WDOG1_WDOG_ANY                      0x0048 0x0390 0x0000 0x0 0x0
+#define MX6SX_PAD_GPIO1_IO13__ANATOP_OTG2_ID                      0x0048 0x0390 0x0628 0x1 0x0
+#define MX6SX_PAD_GPIO1_IO13__PWM4_OUT                            0x0048 0x0390 0x0000 0x2 0x0
+#define MX6SX_PAD_GPIO1_IO13__CCM_OUT2                            0x0048 0x0390 0x0000 0x3 0x0
+#define MX6SX_PAD_GPIO1_IO13__MLB_SIG                             0x0048 0x0390 0x07F0 0x4 0x0
+#define MX6SX_PAD_GPIO1_IO13__GPIO1_IO_13                         0x0048 0x0390 0x0000 0x5 0x0
+#define MX6SX_PAD_GPIO1_IO13__CSU_CSU_ALARM_AUT_2                 0x0048 0x0390 0x0000 0x6 0x0
+#define MX6SX_PAD_GPIO1_IO13__OBSERVE_MUX_OUT_0                   0x0048 0x0390 0x0000 0x7 0x0
+#define MX6SX_PAD_GPIO1_IO13__VDEC_DEBUG_38                       0x0048 0x0390 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_DATA00__CSI1_DATA_2                         0x004C 0x0394 0x06A8 0x0 0x0
+#define MX6SX_PAD_CSI_DATA00__ESAI_TX_CLK                         0x004C 0x0394 0x078C 0x1 0x1
+#define MX6SX_PAD_CSI_DATA00__AUDMUX_AUD6_TXC                     0x004C 0x0394 0x0684 0x2 0x1
+#define MX6SX_PAD_CSI_DATA00__I2C1_SCL                            0x004C 0x0394 0x07A8 0x3 0x0
+#define MX6SX_PAD_CSI_DATA00__UART6_RI_B                          0x004C 0x0394 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_DATA00__GPIO1_IO_14                         0x004C 0x0394 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_DATA00__WEIM_DATA_23                        0x004C 0x0394 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_DATA00__SAI1_TX_BCLK                        0x004C 0x0394 0x0800 0x7 0x0
+#define MX6SX_PAD_CSI_DATA00__VADC_DATA_4                         0x004C 0x0394 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_DATA00__MMDC_DEBUG_37                       0x004C 0x0394 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_DATA01__CSI1_DATA_3                         0x0050 0x0398 0x06AC 0x0 0x0
+#define MX6SX_PAD_CSI_DATA01__ESAI_TX_FS                          0x0050 0x0398 0x077C 0x1 0x1
+#define MX6SX_PAD_CSI_DATA01__AUDMUX_AUD6_TXFS                    0x0050 0x0398 0x0688 0x2 0x1
+#define MX6SX_PAD_CSI_DATA01__I2C1_SDA                            0x0050 0x0398 0x07AC 0x3 0x0
+#define MX6SX_PAD_CSI_DATA01__UART6_DSR_B                         0x0050 0x0398 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_DATA01__GPIO1_IO_15                         0x0050 0x0398 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_DATA01__WEIM_DATA_22                        0x0050 0x0398 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_DATA01__SAI1_TX_SYNC                        0x0050 0x0398 0x0804 0x7 0x0
+#define MX6SX_PAD_CSI_DATA01__VADC_DATA_5                         0x0050 0x0398 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_DATA01__MMDC_DEBUG_38                       0x0050 0x0398 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_DATA02__CSI1_DATA_4                         0x0054 0x039C 0x06B0 0x0 0x0
+#define MX6SX_PAD_CSI_DATA02__ESAI_RX_CLK                         0x0054 0x039C 0x0788 0x1 0x1
+#define MX6SX_PAD_CSI_DATA02__AUDMUX_AUD6_RXC                     0x0054 0x039C 0x067C 0x2 0x1
+#define MX6SX_PAD_CSI_DATA02__KPP_COL_5                           0x0054 0x039C 0x07C8 0x3 0x0
+#define MX6SX_PAD_CSI_DATA02__UART6_DTR_B                         0x0054 0x039C 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_DATA02__GPIO1_IO_16                         0x0054 0x039C 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_DATA02__WEIM_DATA_21                        0x0054 0x039C 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_DATA02__SAI1_RX_BCLK                        0x0054 0x039C 0x07F4 0x7 0x0
+#define MX6SX_PAD_CSI_DATA02__VADC_DATA_6                         0x0054 0x039C 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_DATA02__MMDC_DEBUG_39                       0x0054 0x039C 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_DATA03__CSI1_DATA_5                         0x0058 0x03A0 0x06B4 0x0 0x0
+#define MX6SX_PAD_CSI_DATA03__ESAI_RX_FS                          0x0058 0x03A0 0x0778 0x1 0x1
+#define MX6SX_PAD_CSI_DATA03__AUDMUX_AUD6_RXFS                    0x0058 0x03A0 0x0680 0x2 0x1
+#define MX6SX_PAD_CSI_DATA03__KPP_ROW_5                           0x0058 0x03A0 0x07D4 0x3 0x0
+#define MX6SX_PAD_CSI_DATA03__UART6_DCD_B                         0x0058 0x03A0 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_DATA03__GPIO1_IO_17                         0x0058 0x03A0 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_DATA03__WEIM_DATA_20                        0x0058 0x03A0 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_DATA03__SAI1_RX_SYNC                        0x0058 0x03A0 0x07FC 0x7 0x0
+#define MX6SX_PAD_CSI_DATA03__VADC_DATA_7                         0x0058 0x03A0 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_DATA03__MMDC_DEBUG_40                       0x0058 0x03A0 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_DATA04__CSI1_DATA_6                         0x005C 0x03A4 0x06B8 0x0 0x0
+#define MX6SX_PAD_CSI_DATA04__ESAI_TX1                            0x005C 0x03A4 0x0794 0x1 0x1
+#define MX6SX_PAD_CSI_DATA04__SPDIF_OUT                           0x005C 0x03A4 0x0000 0x2 0x0
+#define MX6SX_PAD_CSI_DATA04__KPP_COL_6                           0x005C 0x03A4 0x07CC 0x3 0x0
+#define MX6SX_PAD_CSI_DATA04__UART6_RX                            0x005C 0x03A4 0x0858 0x4 0x0
+#define MX6SX_PAD_CSI_DATA04__UART6_TX                            0x005C 0x03A4 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_DATA04__GPIO1_IO_18                         0x005C 0x03A4 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_DATA04__WEIM_DATA_19                        0x005C 0x03A4 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_DATA04__PWM5_OUT                            0x005C 0x03A4 0x0000 0x7 0x0
+#define MX6SX_PAD_CSI_DATA04__VADC_DATA_8                         0x005C 0x03A4 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_DATA04__MMDC_DEBUG_41                       0x005C 0x03A4 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_DATA05__CSI1_DATA_7                         0x0060 0x03A8 0x06BC 0x0 0x0
+#define MX6SX_PAD_CSI_DATA05__ESAI_TX4_RX1                        0x0060 0x03A8 0x07A0 0x1 0x1
+#define MX6SX_PAD_CSI_DATA05__SPDIF_IN                            0x0060 0x03A8 0x0824 0x2 0x1
+#define MX6SX_PAD_CSI_DATA05__KPP_ROW_6                           0x0060 0x03A8 0x07D8 0x3 0x0
+#define MX6SX_PAD_CSI_DATA05__UART6_RX                            0x0060 0x03A8 0x0858 0x4 0x1
+#define MX6SX_PAD_CSI_DATA05__UART6_TX                            0x0060 0x03A8 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_DATA05__GPIO1_IO_19                         0x0060 0x03A8 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_DATA05__WEIM_DATA_18                        0x0060 0x03A8 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_DATA05__PWM6_OUT                            0x0060 0x03A8 0x0000 0x7 0x0
+#define MX6SX_PAD_CSI_DATA05__VADC_DATA_9                         0x0060 0x03A8 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_DATA05__MMDC_DEBUG_42                       0x0060 0x03A8 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_DATA06__CSI1_DATA_8                         0x0064 0x03AC 0x06C0 0x0 0x0
+#define MX6SX_PAD_CSI_DATA06__ESAI_TX2_RX3                        0x0064 0x03AC 0x0798 0x1 0x1
+#define MX6SX_PAD_CSI_DATA06__I2C4_SCL                            0x0064 0x03AC 0x07C0 0x2 0x2
+#define MX6SX_PAD_CSI_DATA06__KPP_COL_7                           0x0064 0x03AC 0x07D0 0x3 0x0
+#define MX6SX_PAD_CSI_DATA06__UART6_RTS_B                         0x0064 0x03AC 0x0854 0x4 0x0
+#define MX6SX_PAD_CSI_DATA06__GPIO1_IO_20                         0x0064 0x03AC 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_DATA06__WEIM_DATA_17                        0x0064 0x03AC 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_DATA06__DCIC2_OUT                           0x0064 0x03AC 0x0000 0x7 0x0
+#define MX6SX_PAD_CSI_DATA06__VADC_DATA_10                        0x0064 0x03AC 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_DATA06__MMDC_DEBUG_43                       0x0064 0x03AC 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_DATA07__CSI1_DATA_9                         0x0068 0x03B0 0x06C4 0x0 0x0
+#define MX6SX_PAD_CSI_DATA07__ESAI_TX3_RX2                        0x0068 0x03B0 0x079C 0x1 0x1
+#define MX6SX_PAD_CSI_DATA07__I2C4_SDA                            0x0068 0x03B0 0x07C4 0x2 0x2
+#define MX6SX_PAD_CSI_DATA07__KPP_ROW_7                           0x0068 0x03B0 0x07DC 0x3 0x0
+#define MX6SX_PAD_CSI_DATA07__UART6_CTS_B                         0x0068 0x03B0 0x0854 0x4 0x1
+#define MX6SX_PAD_CSI_DATA07__GPIO1_IO_21                         0x0068 0x03B0 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_DATA07__WEIM_DATA_16                        0x0068 0x03B0 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_DATA07__DCIC1_OUT                           0x0068 0x03B0 0x0000 0x7 0x0
+#define MX6SX_PAD_CSI_DATA07__VADC_DATA_11                        0x0068 0x03B0 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_DATA07__MMDC_DEBUG_44                       0x0068 0x03B0 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_HSYNC__CSI1_HSYNC                           0x006C 0x03B4 0x0700 0x0 0x0
+#define MX6SX_PAD_CSI_HSYNC__ESAI_TX0                             0x006C 0x03B4 0x0790 0x1 0x1
+#define MX6SX_PAD_CSI_HSYNC__AUDMUX_AUD6_TXD                      0x006C 0x03B4 0x0678 0x2 0x1
+#define MX6SX_PAD_CSI_HSYNC__UART4_RTS_B                          0x006C 0x03B4 0x0844 0x3 0x2
+#define MX6SX_PAD_CSI_HSYNC__MQS_LEFT                             0x006C 0x03B4 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_HSYNC__GPIO1_IO_22                          0x006C 0x03B4 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_HSYNC__WEIM_DATA_25                         0x006C 0x03B4 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_HSYNC__SAI1_TX_DATA_0                       0x006C 0x03B4 0x0000 0x7 0x0
+#define MX6SX_PAD_CSI_HSYNC__VADC_DATA_2                          0x006C 0x03B4 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_HSYNC__MMDC_DEBUG_35                        0x006C 0x03B4 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_MCLK__CSI1_MCLK                             0x0070 0x03B8 0x0000 0x0 0x0
+#define MX6SX_PAD_CSI_MCLK__ESAI_TX_HF_CLK                        0x0070 0x03B8 0x0784 0x1 0x1
+#define MX6SX_PAD_CSI_MCLK__OSC32K_32K_OUT                        0x0070 0x03B8 0x0000 0x2 0x0
+#define MX6SX_PAD_CSI_MCLK__UART4_RX                              0x0070 0x03B8 0x0848 0x3 0x2
+#define MX6SX_PAD_CSI_MCLK__UART4_TX                              0x0070 0x03B8 0x0000 0x3 0x0
+#define MX6SX_PAD_CSI_MCLK__ANATOP_32K_OUT                        0x0070 0x03B8 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_MCLK__GPIO1_IO_23                           0x0070 0x03B8 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_MCLK__WEIM_DATA_26                          0x0070 0x03B8 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_MCLK__CSI1_FIELD                            0x0070 0x03B8 0x070C 0x7 0x0
+#define MX6SX_PAD_CSI_MCLK__VADC_DATA_1                           0x0070 0x03B8 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_MCLK__MMDC_DEBUG_34                         0x0070 0x03B8 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_PIXCLK__CSI1_PIXCLK                         0x0074 0x03BC 0x0704 0x0 0x0
+#define MX6SX_PAD_CSI_PIXCLK__ESAI_RX_HF_CLK                      0x0074 0x03BC 0x0780 0x1 0x1
+#define MX6SX_PAD_CSI_PIXCLK__AUDMUX_MCLK                         0x0074 0x03BC 0x0000 0x2 0x0
+#define MX6SX_PAD_CSI_PIXCLK__UART4_RX                            0x0074 0x03BC 0x0848 0x3 0x3
+#define MX6SX_PAD_CSI_PIXCLK__UART4_TX                            0x0074 0x03BC 0x0000 0x3 0x0
+#define MX6SX_PAD_CSI_PIXCLK__ANATOP_24M_OUT                      0x0074 0x03BC 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_PIXCLK__GPIO1_IO_24                         0x0074 0x03BC 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_PIXCLK__WEIM_DATA_27                        0x0074 0x03BC 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_PIXCLK__ESAI_TX_HF_CLK                      0x0074 0x03BC 0x0784 0x7 0x2
+#define MX6SX_PAD_CSI_PIXCLK__VADC_CLK                            0x0074 0x03BC 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_PIXCLK__MMDC_DEBUG_33                       0x0074 0x03BC 0x0000 0x9 0x0
+#define MX6SX_PAD_CSI_VSYNC__CSI1_VSYNC                           0x0078 0x03C0 0x0708 0x0 0x0
+#define MX6SX_PAD_CSI_VSYNC__ESAI_TX5_RX0                         0x0078 0x03C0 0x07A4 0x1 0x1
+#define MX6SX_PAD_CSI_VSYNC__AUDMUX_AUD6_RXD                      0x0078 0x03C0 0x0674 0x2 0x1
+#define MX6SX_PAD_CSI_VSYNC__UART4_CTS_B                          0x0078 0x03C0 0x0844 0x3 0x3
+#define MX6SX_PAD_CSI_VSYNC__MQS_RIGHT                            0x0078 0x03C0 0x0000 0x4 0x0
+#define MX6SX_PAD_CSI_VSYNC__GPIO1_IO_25                          0x0078 0x03C0 0x0000 0x5 0x0
+#define MX6SX_PAD_CSI_VSYNC__WEIM_DATA_24                         0x0078 0x03C0 0x0000 0x6 0x0
+#define MX6SX_PAD_CSI_VSYNC__SAI1_RX_DATA_0                       0x0078 0x03C0 0x07F8 0x7 0x0
+#define MX6SX_PAD_CSI_VSYNC__VADC_DATA_3                          0x0078 0x03C0 0x0000 0x8 0x0
+#define MX6SX_PAD_CSI_VSYNC__MMDC_DEBUG_36                        0x0078 0x03C0 0x0000 0x9 0x0
+#define MX6SX_PAD_ENET1_COL__ENET1_COL                            0x007C 0x03C4 0x0000 0x0 0x0
+#define MX6SX_PAD_ENET1_COL__ENET2_MDC                            0x007C 0x03C4 0x0000 0x1 0x0
+#define MX6SX_PAD_ENET1_COL__AUDMUX_AUD4_TXC                      0x007C 0x03C4 0x0654 0x2 0x1
+#define MX6SX_PAD_ENET1_COL__UART1_RI_B                           0x007C 0x03C4 0x0000 0x3 0x0
+#define MX6SX_PAD_ENET1_COL__SPDIF_EXT_CLK                        0x007C 0x03C4 0x0828 0x4 0x1
+#define MX6SX_PAD_ENET1_COL__GPIO2_IO_0                           0x007C 0x03C4 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET1_COL__CSI2_DATA_23                         0x007C 0x03C4 0x0000 0x6 0x0
+#define MX6SX_PAD_ENET1_COL__LCDIF2_DATA_16                       0x007C 0x03C4 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET1_COL__VDEC_DEBUG_37                        0x007C 0x03C4 0x0000 0x8 0x0
+#define MX6SX_PAD_ENET1_COL__PCIE_CTRL_DEBUG_31                   0x007C 0x03C4 0x0000 0x9 0x0
+#define MX6SX_PAD_ENET1_CRS__ENET1_CRS                            0x0080 0x03C8 0x0000 0x0 0x0
+#define MX6SX_PAD_ENET1_CRS__ENET2_MDIO                           0x0080 0x03C8 0x0770 0x1 0x1
+#define MX6SX_PAD_ENET1_CRS__AUDMUX_AUD4_TXD                      0x0080 0x03C8 0x0648 0x2 0x1
+#define MX6SX_PAD_ENET1_CRS__UART1_DCD_B                          0x0080 0x03C8 0x0000 0x3 0x0
+#define MX6SX_PAD_ENET1_CRS__SPDIF_LOCK                           0x0080 0x03C8 0x0000 0x4 0x0
+#define MX6SX_PAD_ENET1_CRS__GPIO2_IO_1                           0x0080 0x03C8 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET1_CRS__CSI2_DATA_22                         0x0080 0x03C8 0x0000 0x6 0x0
+#define MX6SX_PAD_ENET1_CRS__LCDIF2_DATA_17                       0x0080 0x03C8 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET1_CRS__VDEC_DEBUG_36                        0x0080 0x03C8 0x0000 0x8 0x0
+#define MX6SX_PAD_ENET1_CRS__PCIE_CTRL_DEBUG_30                   0x0080 0x03C8 0x0000 0x9 0x0
+#define MX6SX_PAD_ENET1_MDC__ENET1_MDC                            0x0084 0x03CC 0x0000 0x0 0x0
+#define MX6SX_PAD_ENET1_MDC__ENET2_MDC                            0x0084 0x03CC 0x0000 0x1 0x0
+#define MX6SX_PAD_ENET1_MDC__AUDMUX_AUD3_RXFS                     0x0084 0x03CC 0x0638 0x2 0x1
+#define MX6SX_PAD_ENET1_MDC__ANATOP_24M_OUT                       0x0084 0x03CC 0x0000 0x3 0x0
+#define MX6SX_PAD_ENET1_MDC__EPIT2_OUT                            0x0084 0x03CC 0x0000 0x4 0x0
+#define MX6SX_PAD_ENET1_MDC__GPIO2_IO_2                           0x0084 0x03CC 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET1_MDC__USB_OTG1_PWR                         0x0084 0x03CC 0x0000 0x6 0x0
+#define MX6SX_PAD_ENET1_MDC__PWM7_OUT                             0x0084 0x03CC 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET1_MDIO__ENET1_MDIO                          0x0088 0x03D0 0x0764 0x0 0x1
+#define MX6SX_PAD_ENET1_MDIO__ENET2_MDIO                          0x0088 0x03D0 0x0770 0x1 0x2
+#define MX6SX_PAD_ENET1_MDIO__AUDMUX_MCLK                         0x0088 0x03D0 0x0000 0x2 0x0
+#define MX6SX_PAD_ENET1_MDIO__OSC32K_32K_OUT                      0x0088 0x03D0 0x0000 0x3 0x0
+#define MX6SX_PAD_ENET1_MDIO__EPIT1_OUT                           0x0088 0x03D0 0x0000 0x4 0x0
+#define MX6SX_PAD_ENET1_MDIO__GPIO2_IO_3                          0x0088 0x03D0 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET1_MDIO__USB_OTG1_OC                         0x0088 0x03D0 0x0860 0x6 0x1
+#define MX6SX_PAD_ENET1_MDIO__PWM8_OUT                            0x0088 0x03D0 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET1_RX_CLK__ENET1_RX_CLK                      0x008C 0x03D4 0x0768 0x0 0x0
+#define MX6SX_PAD_ENET1_RX_CLK__ENET1_REF_CLK_25M                 0x008C 0x03D4 0x0000 0x1 0x0
+#define MX6SX_PAD_ENET1_RX_CLK__AUDMUX_AUD4_TXFS                  0x008C 0x03D4 0x0658 0x2 0x1
+#define MX6SX_PAD_ENET1_RX_CLK__UART1_DSR_B                       0x008C 0x03D4 0x0000 0x3 0x0
+#define MX6SX_PAD_ENET1_RX_CLK__SPDIF_OUT                         0x008C 0x03D4 0x0000 0x4 0x0
+#define MX6SX_PAD_ENET1_RX_CLK__GPIO2_IO_4                        0x008C 0x03D4 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET1_RX_CLK__CSI2_DATA_21                      0x008C 0x03D4 0x0000 0x6 0x0
+#define MX6SX_PAD_ENET1_RX_CLK__LCDIF2_DATA_18                    0x008C 0x03D4 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET1_RX_CLK__VDEC_DEBUG_35                     0x008C 0x03D4 0x0000 0x8 0x0
+#define MX6SX_PAD_ENET1_RX_CLK__PCIE_CTRL_DEBUG_29                0x008C 0x03D4 0x0000 0x9 0x0
+#define MX6SX_PAD_ENET1_TX_CLK__ENET1_TX_CLK                      0x0090 0x03D8 0x0000 0x0 0x0
+#define MX6SX_PAD_ENET1_TX_CLK__ENET1_REF_CLK1                    0x0090 0x03D8 0x0760 0x1 0x1
+#define MX6SX_PAD_ENET1_TX_CLK__AUDMUX_AUD4_RXD                   0x0090 0x03D8 0x0644 0x2 0x1
+#define MX6SX_PAD_ENET1_TX_CLK__UART1_DTR_B                       0x0090 0x03D8 0x0000 0x3 0x0
+#define MX6SX_PAD_ENET1_TX_CLK__SPDIF_SR_CLK                      0x0090 0x03D8 0x0000 0x4 0x0
+#define MX6SX_PAD_ENET1_TX_CLK__GPIO2_IO_5                        0x0090 0x03D8 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET1_TX_CLK__CSI2_DATA_20                      0x0090 0x03D8 0x0000 0x6 0x0
+#define MX6SX_PAD_ENET1_TX_CLK__LCDIF2_DATA_19                    0x0090 0x03D8 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET1_TX_CLK__VDEC_DEBUG_34                     0x0090 0x03D8 0x0000 0x8 0x0
+#define MX6SX_PAD_ENET1_TX_CLK__PCIE_CTRL_DEBUG_28                0x0090 0x03D8 0x0000 0x9 0x0
+#define MX6SX_PAD_ENET2_COL__ENET2_COL                            0x0094 0x03DC 0x0000 0x0 0x0
+#define MX6SX_PAD_ENET2_COL__ENET1_MDC                            0x0094 0x03DC 0x0000 0x1 0x0
+#define MX6SX_PAD_ENET2_COL__AUDMUX_AUD4_RXC                      0x0094 0x03DC 0x064C 0x2 0x1
+#define MX6SX_PAD_ENET2_COL__UART1_RX                             0x0094 0x03DC 0x0830 0x3 0x2
+#define MX6SX_PAD_ENET2_COL__UART1_TX                             0x0094 0x03DC 0x0000 0x3 0x0
+#define MX6SX_PAD_ENET2_COL__SPDIF_IN                             0x0094 0x03DC 0x0824 0x4 0x3
+#define MX6SX_PAD_ENET2_COL__GPIO2_IO_6                           0x0094 0x03DC 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET2_COL__ANATOP_OTG1_ID                       0x0094 0x03DC 0x0624 0x6 0x1
+#define MX6SX_PAD_ENET2_COL__LCDIF2_DATA_20                       0x0094 0x03DC 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET2_COL__VDEC_DEBUG_33                        0x0094 0x03DC 0x0000 0x8 0x0
+#define MX6SX_PAD_ENET2_COL__PCIE_CTRL_DEBUG_27                   0x0094 0x03DC 0x0000 0x9 0x0
+#define MX6SX_PAD_ENET2_CRS__ENET2_CRS                            0x0098 0x03E0 0x0000 0x0 0x0
+#define MX6SX_PAD_ENET2_CRS__ENET1_MDIO                           0x0098 0x03E0 0x0764 0x1 0x2
+#define MX6SX_PAD_ENET2_CRS__AUDMUX_AUD4_RXFS                     0x0098 0x03E0 0x0650 0x2 0x1
+#define MX6SX_PAD_ENET2_CRS__UART1_RX                             0x0098 0x03E0 0x0830 0x3 0x3
+#define MX6SX_PAD_ENET2_CRS__UART1_TX                             0x0098 0x03E0 0x0000 0x3 0x0
+#define MX6SX_PAD_ENET2_CRS__MLB_SIG                              0x0098 0x03E0 0x07F0 0x4 0x1
+#define MX6SX_PAD_ENET2_CRS__GPIO2_IO_7                           0x0098 0x03E0 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET2_CRS__ANATOP_OTG2_ID                       0x0098 0x03E0 0x0628 0x6 0x1
+#define MX6SX_PAD_ENET2_CRS__LCDIF2_DATA_21                       0x0098 0x03E0 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET2_CRS__VDEC_DEBUG_32                        0x0098 0x03E0 0x0000 0x8 0x0
+#define MX6SX_PAD_ENET2_CRS__PCIE_CTRL_DEBUG_26                   0x0098 0x03E0 0x0000 0x9 0x0
+#define MX6SX_PAD_ENET2_RX_CLK__ENET2_RX_CLK                      0x009C 0x03E4 0x0774 0x0 0x0
+#define MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M                 0x009C 0x03E4 0x0000 0x1 0x0
+#define MX6SX_PAD_ENET2_RX_CLK__I2C3_SCL                          0x009C 0x03E4 0x07B8 0x2 0x1
+#define MX6SX_PAD_ENET2_RX_CLK__UART1_RTS_B                       0x009C 0x03E4 0x082C 0x3 0x2
+#define MX6SX_PAD_ENET2_RX_CLK__MLB_DATA                          0x009C 0x03E4 0x07EC 0x4 0x1
+#define MX6SX_PAD_ENET2_RX_CLK__GPIO2_IO_8                        0x009C 0x03E4 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET2_RX_CLK__USB_OTG2_OC                       0x009C 0x03E4 0x085C 0x6 0x1
+#define MX6SX_PAD_ENET2_RX_CLK__LCDIF2_DATA_22                    0x009C 0x03E4 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET2_RX_CLK__VDEC_DEBUG_31                     0x009C 0x03E4 0x0000 0x8 0x0
+#define MX6SX_PAD_ENET2_RX_CLK__PCIE_CTRL_DEBUG_25                0x009C 0x03E4 0x0000 0x9 0x0
+#define MX6SX_PAD_ENET2_TX_CLK__ENET2_TX_CLK                      0x00A0 0x03E8 0x0000 0x0 0x0
+#define MX6SX_PAD_ENET2_TX_CLK__ENET2_REF_CLK2                    0x00A0 0x03E8 0x076C 0x1 0x1
+#define MX6SX_PAD_ENET2_TX_CLK__I2C3_SDA                          0x00A0 0x03E8 0x07BC 0x2 0x1
+#define MX6SX_PAD_ENET2_TX_CLK__UART1_CTS_B                       0x00A0 0x03E8 0x082C 0x3 0x3
+#define MX6SX_PAD_ENET2_TX_CLK__MLB_CLK                           0x00A0 0x03E8 0x07E8 0x4 0x1
+#define MX6SX_PAD_ENET2_TX_CLK__GPIO2_IO_9                        0x00A0 0x03E8 0x0000 0x5 0x0
+#define MX6SX_PAD_ENET2_TX_CLK__USB_OTG2_PWR                      0x00A0 0x03E8 0x0000 0x6 0x0
+#define MX6SX_PAD_ENET2_TX_CLK__LCDIF2_DATA_23                    0x00A0 0x03E8 0x0000 0x7 0x0
+#define MX6SX_PAD_ENET2_TX_CLK__VDEC_DEBUG_30                     0x00A0 0x03E8 0x0000 0x8 0x0
+#define MX6SX_PAD_ENET2_TX_CLK__PCIE_CTRL_DEBUG_24                0x00A0 0x03E8 0x0000 0x9 0x0
+#define MX6SX_PAD_KEY_COL0__KPP_COL_0                             0x00A4 0x03EC 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_COL0__USDHC3_CD_B                           0x00A4 0x03EC 0x0000 0x1 0x0
+#define MX6SX_PAD_KEY_COL0__UART6_RTS_B                           0x00A4 0x03EC 0x0854 0x2 0x2
+#define MX6SX_PAD_KEY_COL0__ECSPI1_SCLK                           0x00A4 0x03EC 0x0710 0x3 0x0
+#define MX6SX_PAD_KEY_COL0__AUDMUX_AUD5_TXC                       0x00A4 0x03EC 0x066C 0x4 0x0
+#define MX6SX_PAD_KEY_COL0__GPIO2_IO_10                           0x00A4 0x03EC 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_COL0__SDMA_EXT_EVENT_1                      0x00A4 0x03EC 0x0820 0x6 0x1
+#define MX6SX_PAD_KEY_COL0__SAI2_TX_BCLK                          0x00A4 0x03EC 0x0814 0x7 0x0
+#define MX6SX_PAD_KEY_COL0__VADC_DATA_0                           0x00A4 0x03EC 0x0000 0x8 0x0
+#define MX6SX_PAD_KEY_COL1__KPP_COL_1                             0x00A8 0x03F0 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_COL1__USDHC3_RESET_B                        0x00A8 0x03F0 0x0000 0x1 0x0
+#define MX6SX_PAD_KEY_COL1__UART6_RX                              0x00A8 0x03F0 0x0858 0x2 0x2
+#define MX6SX_PAD_KEY_COL1__UART6_TX                              0x00A8 0x03F0 0x0000 0x2 0x0
+#define MX6SX_PAD_KEY_COL1__ECSPI1_MISO                           0x00A8 0x03F0 0x0714 0x3 0x0
+#define MX6SX_PAD_KEY_COL1__AUDMUX_AUD5_TXFS                      0x00A8 0x03F0 0x0670 0x4 0x0
+#define MX6SX_PAD_KEY_COL1__GPIO2_IO_11                           0x00A8 0x03F0 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_COL1__USDHC3_RESET                          0x00A8 0x03F0 0x0000 0x6 0x0
+#define MX6SX_PAD_KEY_COL1__SAI2_TX_SYNC                          0x00A8 0x03F0 0x0818 0x7 0x0
+#define MX6SX_PAD_KEY_COL2__KPP_COL_2                             0x00AC 0x03F4 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_COL2__USDHC4_CD_B                           0x00AC 0x03F4 0x0874 0x1 0x1
+#define MX6SX_PAD_KEY_COL2__UART5_RTS_B                           0x00AC 0x03F4 0x084C 0x2 0x2
+#define MX6SX_PAD_KEY_COL2__CAN1_TX                               0x00AC 0x03F4 0x0000 0x3 0x0
+#define MX6SX_PAD_KEY_COL2__CANFD_TX1                             0x00AC 0x03F4 0x0000 0x4 0x0
+#define MX6SX_PAD_KEY_COL2__GPIO2_IO_12                           0x00AC 0x03F4 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_COL2__WEIM_DATA_30                          0x00AC 0x03F4 0x0000 0x6 0x0
+#define MX6SX_PAD_KEY_COL2__ECSPI1_RDY                            0x00AC 0x03F4 0x0000 0x7 0x0
+#define MX6SX_PAD_KEY_COL3__KPP_COL_3                             0x00B0 0x03F8 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_COL3__USDHC4_LCTL                           0x00B0 0x03F8 0x0000 0x1 0x0
+#define MX6SX_PAD_KEY_COL3__UART5_RX                              0x00B0 0x03F8 0x0850 0x2 0x2
+#define MX6SX_PAD_KEY_COL3__UART5_TX                              0x00B0 0x03F8 0x0000 0x2 0x0
+#define MX6SX_PAD_KEY_COL3__CAN2_TX                               0x00B0 0x03F8 0x0000 0x3 0x0
+#define MX6SX_PAD_KEY_COL3__CANFD_TX2                             0x00B0 0x03F8 0x0000 0x4 0x0
+#define MX6SX_PAD_KEY_COL3__GPIO2_IO_13                           0x00B0 0x03F8 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_COL3__WEIM_DATA_28                          0x00B0 0x03F8 0x0000 0x6 0x0
+#define MX6SX_PAD_KEY_COL3__ECSPI1_SS2                            0x00B0 0x03F8 0x0000 0x7 0x0
+#define MX6SX_PAD_KEY_COL4__KPP_COL_4                             0x00B4 0x03FC 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_COL4__ENET2_MDC                             0x00B4 0x03FC 0x0000 0x1 0x0
+#define MX6SX_PAD_KEY_COL4__I2C3_SCL                              0x00B4 0x03FC 0x07B8 0x2 0x2
+#define MX6SX_PAD_KEY_COL4__USDHC2_LCTL                           0x00B4 0x03FC 0x0000 0x3 0x0
+#define MX6SX_PAD_KEY_COL4__AUDMUX_AUD5_RXC                       0x00B4 0x03FC 0x0664 0x4 0x0
+#define MX6SX_PAD_KEY_COL4__GPIO2_IO_14                           0x00B4 0x03FC 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_COL4__WEIM_CRE                              0x00B4 0x03FC 0x0000 0x6 0x0
+#define MX6SX_PAD_KEY_COL4__SAI2_RX_BCLK                          0x00B4 0x03FC 0x0808 0x7 0x0
+#define MX6SX_PAD_KEY_ROW0__KPP_ROW_0                             0x00B8 0x0400 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_ROW0__USDHC3_WP                             0x00B8 0x0400 0x0000 0x1 0x0
+#define MX6SX_PAD_KEY_ROW0__UART6_CTS_B                           0x00B8 0x0400 0x0854 0x2 0x3
+#define MX6SX_PAD_KEY_ROW0__ECSPI1_MOSI                           0x00B8 0x0400 0x0718 0x3 0x0
+#define MX6SX_PAD_KEY_ROW0__AUDMUX_AUD5_TXD                       0x00B8 0x0400 0x0660 0x4 0x0
+#define MX6SX_PAD_KEY_ROW0__GPIO2_IO_15                           0x00B8 0x0400 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_ROW0__SDMA_EXT_EVENT_0                      0x00B8 0x0400 0x081C 0x6 0x1
+#define MX6SX_PAD_KEY_ROW0__SAI2_TX_DATA_0                        0x00B8 0x0400 0x0000 0x7 0x0
+#define MX6SX_PAD_KEY_ROW0__GPU_IDLE                              0x00B8 0x0400 0x0000 0x8 0x0
+#define MX6SX_PAD_KEY_ROW1__KPP_ROW_1                             0x00BC 0x0404 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_ROW1__USDHC4_VSELECT                        0x00BC 0x0404 0x0000 0x1 0x0
+#define MX6SX_PAD_KEY_ROW1__UART6_RX                              0x00BC 0x0404 0x0858 0x2 0x3
+#define MX6SX_PAD_KEY_ROW1__UART6_TX                              0x00BC 0x0404 0x0000 0x2 0x0
+#define MX6SX_PAD_KEY_ROW1__ECSPI1_SS0                            0x00BC 0x0404 0x071C 0x3 0x0
+#define MX6SX_PAD_KEY_ROW1__AUDMUX_AUD5_RXD                       0x00BC 0x0404 0x065C 0x4 0x0
+#define MX6SX_PAD_KEY_ROW1__GPIO2_IO_16                           0x00BC 0x0404 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_ROW1__WEIM_DATA_31                          0x00BC 0x0404 0x0000 0x6 0x0
+#define MX6SX_PAD_KEY_ROW1__SAI2_RX_DATA_0                        0x00BC 0x0404 0x080C 0x7 0x0
+#define MX6SX_PAD_KEY_ROW1__M4_NMI                                0x00BC 0x0404 0x0000 0x8 0x0
+#define MX6SX_PAD_KEY_ROW2__KPP_ROW_2                             0x00C0 0x0408 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_ROW2__USDHC4_WP                             0x00C0 0x0408 0x0878 0x1 0x1
+#define MX6SX_PAD_KEY_ROW2__UART5_CTS_B                           0x00C0 0x0408 0x084C 0x2 0x3
+#define MX6SX_PAD_KEY_ROW2__CAN1_RX                               0x00C0 0x0408 0x068C 0x3 0x1
+#define MX6SX_PAD_KEY_ROW2__CANFD_RX1                             0x00C0 0x0408 0x0694 0x4 0x1
+#define MX6SX_PAD_KEY_ROW2__GPIO2_IO_17                           0x00C0 0x0408 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_ROW2__WEIM_DATA_29                          0x00C0 0x0408 0x0000 0x6 0x0
+#define MX6SX_PAD_KEY_ROW2__ECSPI1_SS3                            0x00C0 0x0408 0x0000 0x7 0x0
+#define MX6SX_PAD_KEY_ROW3__KPP_ROW_3                             0x00C4 0x040C 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_ROW3__USDHC3_LCTL                           0x00C4 0x040C 0x0000 0x1 0x0
+#define MX6SX_PAD_KEY_ROW3__UART5_RX                              0x00C4 0x040C 0x0850 0x2 0x3
+#define MX6SX_PAD_KEY_ROW3__UART5_TX                              0x00C4 0x040C 0x0000 0x2 0x0
+#define MX6SX_PAD_KEY_ROW3__CAN2_RX                               0x00C4 0x040C 0x0690 0x3 0x1
+#define MX6SX_PAD_KEY_ROW3__CANFD_RX2                             0x00C4 0x040C 0x0698 0x4 0x1
+#define MX6SX_PAD_KEY_ROW3__GPIO2_IO_18                           0x00C4 0x040C 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_ROW3__WEIM_DTACK_B                          0x00C4 0x040C 0x0000 0x6 0x0
+#define MX6SX_PAD_KEY_ROW3__ECSPI1_SS1                            0x00C4 0x040C 0x0000 0x7 0x0
+#define MX6SX_PAD_KEY_ROW4__KPP_ROW_4                             0x00C8 0x0410 0x0000 0x0 0x0
+#define MX6SX_PAD_KEY_ROW4__ENET2_MDIO                            0x00C8 0x0410 0x0770 0x1 0x3
+#define MX6SX_PAD_KEY_ROW4__I2C3_SDA                              0x00C8 0x0410 0x07BC 0x2 0x2
+#define MX6SX_PAD_KEY_ROW4__USDHC1_LCTL                           0x00C8 0x0410 0x0000 0x3 0x0
+#define MX6SX_PAD_KEY_ROW4__AUDMUX_AUD5_RXFS                      0x00C8 0x0410 0x0668 0x4 0x0
+#define MX6SX_PAD_KEY_ROW4__GPIO2_IO_19                           0x00C8 0x0410 0x0000 0x5 0x0
+#define MX6SX_PAD_KEY_ROW4__WEIM_ACLK_FREERUN                     0x00C8 0x0410 0x0000 0x6 0x0
+#define MX6SX_PAD_KEY_ROW4__SAI2_RX_SYNC                          0x00C8 0x0410 0x0810 0x7 0x0
+#define MX6SX_PAD_LCD1_CLK__LCDIF1_CLK                            0x00CC 0x0414 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_CLK__LCDIF1_WR_RWN                         0x00CC 0x0414 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_CLK__AUDMUX_AUD3_RXC                       0x00CC 0x0414 0x0634 0x2 0x1
+#define MX6SX_PAD_LCD1_CLK__ENET1_1588_EVENT2_IN                  0x00CC 0x0414 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_CLK__CSI1_DATA_16                          0x00CC 0x0414 0x06DC 0x4 0x0
+#define MX6SX_PAD_LCD1_CLK__GPIO3_IO_0                            0x00CC 0x0414 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_CLK__USDHC1_WP                             0x00CC 0x0414 0x0868 0x6 0x0
+#define MX6SX_PAD_LCD1_CLK__SIM_M_HADDR_16                        0x00CC 0x0414 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_CLK__VADC_TEST_0                           0x00CC 0x0414 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_CLK__MMDC_DEBUG_0                          0x00CC 0x0414 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA00__LCDIF1_DATA_0                      0x00D0 0x0418 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA00__WEIM_CS1_B                         0x00D0 0x0418 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA00__M4_TRACE_0                         0x00D0 0x0418 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA00__KITTEN_TRACE_0                     0x00D0 0x0418 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA00__CSI1_DATA_20                       0x00D0 0x0418 0x06EC 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA00__GPIO3_IO_1                         0x00D0 0x0418 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA00__SRC_BT_CFG_0                       0x00D0 0x0418 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA00__SIM_M_HADDR_21                     0x00D0 0x0418 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA00__VADC_TEST_5                        0x00D0 0x0418 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA00__MMDC_DEBUG_5                       0x00D0 0x0418 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA01__LCDIF1_DATA_1                      0x00D4 0x041C 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA01__WEIM_CS2_B                         0x00D4 0x041C 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA01__M4_TRACE_1                         0x00D4 0x041C 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA01__KITTEN_TRACE_1                     0x00D4 0x041C 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA01__CSI1_DATA_21                       0x00D4 0x041C 0x06F0 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA01__GPIO3_IO_2                         0x00D4 0x041C 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA01__SRC_BT_CFG_1                       0x00D4 0x041C 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA01__SIM_M_HADDR_22                     0x00D4 0x041C 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA01__VADC_TEST_6                        0x00D4 0x041C 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA01__MMDC_DEBUG_6                       0x00D4 0x041C 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA02__LCDIF1_DATA_2                      0x00D8 0x0420 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA02__WEIM_CS3_B                         0x00D8 0x0420 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA02__M4_TRACE_2                         0x00D8 0x0420 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA02__KITTEN_TRACE_2                     0x00D8 0x0420 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA02__CSI1_DATA_22                       0x00D8 0x0420 0x06F4 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA02__GPIO3_IO_3                         0x00D8 0x0420 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA02__SRC_BT_CFG_2                       0x00D8 0x0420 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA02__SIM_M_HADDR_23                     0x00D8 0x0420 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA02__VADC_TEST_7                        0x00D8 0x0420 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA02__MMDC_DEBUG_7                       0x00D8 0x0420 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA03__LCDIF1_DATA_3                      0x00DC 0x0424 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA03__WEIM_ADDR_24                       0x00DC 0x0424 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA03__M4_TRACE_3                         0x00DC 0x0424 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA03__KITTEN_TRACE_3                     0x00DC 0x0424 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA03__CSI1_DATA_23                       0x00DC 0x0424 0x06F8 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA03__GPIO3_IO_4                         0x00DC 0x0424 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA03__SRC_BT_CFG_3                       0x00DC 0x0424 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA03__SIM_M_HADDR_24                     0x00DC 0x0424 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA03__VADC_TEST_8                        0x00DC 0x0424 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA03__MMDC_DEBUG_8                       0x00DC 0x0424 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA04__LCDIF1_DATA_4                      0x00E0 0x0428 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA04__WEIM_ADDR_25                       0x00E0 0x0428 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA04__KITTEN_TRACE_4                     0x00E0 0x0428 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA04__CSI1_VSYNC                         0x00E0 0x0428 0x0708 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA04__GPIO3_IO_5                         0x00E0 0x0428 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA04__SRC_BT_CFG_4                       0x00E0 0x0428 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA04__SIM_M_HADDR_25                     0x00E0 0x0428 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA04__VADC_TEST_9                        0x00E0 0x0428 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA04__MMDC_DEBUG_9                       0x00E0 0x0428 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA05__LCDIF1_DATA_5                      0x00E4 0x042C 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA05__WEIM_ADDR_26                       0x00E4 0x042C 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA05__KITTEN_TRACE_5                     0x00E4 0x042C 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA05__CSI1_HSYNC                         0x00E4 0x042C 0x0700 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA05__GPIO3_IO_6                         0x00E4 0x042C 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA05__SRC_BT_CFG_5                       0x00E4 0x042C 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA05__SIM_M_HADDR_26                     0x00E4 0x042C 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA05__VADC_TEST_10                       0x00E4 0x042C 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA05__MMDC_DEBUG_10                      0x00E4 0x042C 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA06__LCDIF1_DATA_6                      0x00E8 0x0430 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA06__WEIM_EB_B_2                        0x00E8 0x0430 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA06__KITTEN_TRACE_6                     0x00E8 0x0430 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA06__CSI1_PIXCLK                        0x00E8 0x0430 0x0704 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA06__GPIO3_IO_7                         0x00E8 0x0430 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA06__SRC_BT_CFG_6                       0x00E8 0x0430 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA06__SIM_M_HADDR_27                     0x00E8 0x0430 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA06__VADC_TEST_11                       0x00E8 0x0430 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA06__MMDC_DEBUG_11                      0x00E8 0x0430 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA07__LCDIF1_DATA_7                      0x00EC 0x0434 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA07__WEIM_EB_B_3                        0x00EC 0x0434 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA07__KITTEN_TRACE_7                     0x00EC 0x0434 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA07__CSI1_MCLK                          0x00EC 0x0434 0x0000 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA07__GPIO3_IO_8                         0x00EC 0x0434 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA07__SRC_BT_CFG_7                       0x00EC 0x0434 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA07__SIM_M_HADDR_28                     0x00EC 0x0434 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA07__VADC_TEST_12                       0x00EC 0x0434 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA07__MMDC_DEBUG_12                      0x00EC 0x0434 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA08__LCDIF1_DATA_8                      0x00F0 0x0438 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA08__WEIM_AD_8                          0x00F0 0x0438 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA08__KITTEN_TRACE_8                     0x00F0 0x0438 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA08__CSI1_DATA_9                        0x00F0 0x0438 0x06C4 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA08__GPIO3_IO_9                         0x00F0 0x0438 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA08__SRC_BT_CFG_8                       0x00F0 0x0438 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA08__SIM_M_HADDR_29                     0x00F0 0x0438 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA08__VADC_TEST_13                       0x00F0 0x0438 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA08__MMDC_DEBUG_13                      0x00F0 0x0438 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA09__LCDIF1_DATA_9                      0x00F4 0x043C 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA09__WEIM_AD_9                          0x00F4 0x043C 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA09__KITTEN_TRACE_9                     0x00F4 0x043C 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA09__CSI1_DATA_8                        0x00F4 0x043C 0x06C0 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA09__GPIO3_IO_10                        0x00F4 0x043C 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA09__SRC_BT_CFG_9                       0x00F4 0x043C 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA09__SIM_M_HADDR_30                     0x00F4 0x043C 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA09__VADC_TEST_14                       0x00F4 0x043C 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA09__MMDC_DEBUG_14                      0x00F4 0x043C 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA10__LCDIF1_DATA_10                     0x00F8 0x0440 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA10__WEIM_AD_10                         0x00F8 0x0440 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA10__KITTEN_TRACE_10                    0x00F8 0x0440 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA10__CSI1_DATA_7                        0x00F8 0x0440 0x06BC 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA10__GPIO3_IO_11                        0x00F8 0x0440 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA10__SRC_BT_CFG_10                      0x00F8 0x0440 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA10__SIM_M_HADDR_31                     0x00F8 0x0440 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA10__VADC_TEST_15                       0x00F8 0x0440 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA10__MMDC_DEBUG_15                      0x00F8 0x0440 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA11__LCDIF1_DATA_11                     0x00FC 0x0444 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA11__WEIM_AD_11                         0x00FC 0x0444 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA11__KITTEN_TRACE_11                    0x00FC 0x0444 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA11__CSI1_DATA_6                        0x00FC 0x0444 0x06B8 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA11__GPIO3_IO_12                        0x00FC 0x0444 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA11__SRC_BT_CFG_11                      0x00FC 0x0444 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA11__SIM_M_HBURST_0                     0x00FC 0x0444 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA11__VADC_TEST_16                       0x00FC 0x0444 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA11__MMDC_DEBUG_16                      0x00FC 0x0444 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA12__LCDIF1_DATA_12                     0x0100 0x0448 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA12__WEIM_AD_12                         0x0100 0x0448 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA12__KITTEN_TRACE_12                    0x0100 0x0448 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA12__CSI1_DATA_5                        0x0100 0x0448 0x06B4 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA12__GPIO3_IO_13                        0x0100 0x0448 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA12__SRC_BT_CFG_12                      0x0100 0x0448 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA12__SIM_M_HBURST_1                     0x0100 0x0448 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA12__VADC_TEST_17                       0x0100 0x0448 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA12__MMDC_DEBUG_17                      0x0100 0x0448 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA13__LCDIF1_DATA_13                     0x0104 0x044C 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA13__WEIM_AD_13                         0x0104 0x044C 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA13__KITTEN_TRACE_13                    0x0104 0x044C 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA13__CSI1_DATA_4                        0x0104 0x044C 0x06B0 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA13__GPIO3_IO_14                        0x0104 0x044C 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA13__SRC_BT_CFG_13                      0x0104 0x044C 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA13__SIM_M_HBURST_2                     0x0104 0x044C 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA13__VADC_TEST_18                       0x0104 0x044C 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA13__MMDC_DEBUG_18                      0x0104 0x044C 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA14__LCDIF1_DATA_14                     0x0108 0x0450 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA14__WEIM_AD_14                         0x0108 0x0450 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA14__KITTEN_TRACE_14                    0x0108 0x0450 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA14__CSI1_DATA_3                        0x0108 0x0450 0x06AC 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA14__GPIO3_IO_15                        0x0108 0x0450 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA14__SRC_BT_CFG_14                      0x0108 0x0450 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA14__SIM_M_HMASTLOCK                    0x0108 0x0450 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA14__VADC_TEST_19                       0x0108 0x0450 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA14__MMDC_DEBUG_19                      0x0108 0x0450 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA15__LCDIF1_DATA_15                     0x010C 0x0454 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA15__WEIM_AD_15                         0x010C 0x0454 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA15__KITTEN_TRACE_15                    0x010C 0x0454 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA15__CSI1_DATA_2                        0x010C 0x0454 0x06A8 0x4 0x1
+#define MX6SX_PAD_LCD1_DATA15__GPIO3_IO_16                        0x010C 0x0454 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA15__SRC_BT_CFG_15                      0x010C 0x0454 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA15__SIM_M_HPROT_0                      0x010C 0x0454 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA15__VDEC_DEBUG_0                       0x010C 0x0454 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA15__MMDC_DEBUG_20                      0x010C 0x0454 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA16__LCDIF1_DATA_16                     0x0110 0x0458 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA16__WEIM_ADDR_16                       0x0110 0x0458 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA16__M4_TRACE_CLK                       0x0110 0x0458 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA16__KITTEN_TRACE_CLK                   0x0110 0x0458 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA16__CSI1_DATA_1                        0x0110 0x0458 0x06A4 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA16__GPIO3_IO_17                        0x0110 0x0458 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA16__SRC_BT_CFG_24                      0x0110 0x0458 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA16__SIM_M_HPROT_1                      0x0110 0x0458 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA16__VDEC_DEBUG_1                       0x0110 0x0458 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA16__MMDC_DEBUG_21                      0x0110 0x0458 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA17__LCDIF1_DATA_17                     0x0114 0x045C 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA17__WEIM_ADDR_17                       0x0114 0x045C 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA17__KITTEN_TRACE_CTL                   0x0114 0x045C 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA17__CSI1_DATA_0                        0x0114 0x045C 0x06A0 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA17__GPIO3_IO_18                        0x0114 0x045C 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA17__SRC_BT_CFG_25                      0x0114 0x045C 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA17__SIM_M_HPROT_2                      0x0114 0x045C 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA17__VDEC_DEBUG_2                       0x0114 0x045C 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA17__MMDC_DEBUG_22                      0x0114 0x045C 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA18__LCDIF1_DATA_18                     0x0118 0x0460 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA18__WEIM_ADDR_18                       0x0118 0x0460 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA18__M4_EVENTO                          0x0118 0x0460 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA18__KITTEN_EVENTO                      0x0118 0x0460 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA18__CSI1_DATA_15                       0x0118 0x0460 0x06D8 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA18__GPIO3_IO_19                        0x0118 0x0460 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA18__SRC_BT_CFG_26                      0x0118 0x0460 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA18__SIM_M_HPROT_3                      0x0118 0x0460 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA18__VDEC_DEBUG_3                       0x0118 0x0460 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA18__MMDC_DEBUG_23                      0x0118 0x0460 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA19__LCDIF1_DATA_19                     0x011C 0x0464 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA19__WEIM_ADDR_19                       0x011C 0x0464 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA19__M4_TRACE_SWO                       0x011C 0x0464 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA19__CSI1_DATA_14                       0x011C 0x0464 0x06D4 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA19__GPIO3_IO_20                        0x011C 0x0464 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA19__SRC_BT_CFG_27                      0x011C 0x0464 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA19__SIM_M_HREADYOUT                    0x011C 0x0464 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA19__VDEC_DEBUG_4                       0x011C 0x0464 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA19__MMDC_DEBUG_24                      0x011C 0x0464 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA20__LCDIF1_DATA_20                     0x0120 0x0468 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA20__WEIM_ADDR_20                       0x0120 0x0468 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA20__PWM8_OUT                           0x0120 0x0468 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA20__ENET1_1588_EVENT2_OUT              0x0120 0x0468 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA20__CSI1_DATA_13                       0x0120 0x0468 0x06D0 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA20__GPIO3_IO_21                        0x0120 0x0468 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA20__SRC_BT_CFG_28                      0x0120 0x0468 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA20__SIM_M_HRESP                        0x0120 0x0468 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA20__VDEC_DEBUG_5                       0x0120 0x0468 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA20__MMDC_DEBUG_25                      0x0120 0x0468 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA21__LCDIF1_DATA_21                     0x0124 0x046C 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA21__WEIM_ADDR_21                       0x0124 0x046C 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA21__PWM7_OUT                           0x0124 0x046C 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA21__ENET1_1588_EVENT3_OUT              0x0124 0x046C 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA21__CSI1_DATA_12                       0x0124 0x046C 0x06CC 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA21__GPIO3_IO_22                        0x0124 0x046C 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA21__SRC_BT_CFG_29                      0x0124 0x046C 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA21__SIM_M_HSIZE_0                      0x0124 0x046C 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA21__VDEC_DEBUG_6                       0x0124 0x046C 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA21__MMDC_DEBUG_26                      0x0124 0x046C 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA22__LCDIF1_DATA_22                     0x0128 0x0470 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA22__WEIM_ADDR_22                       0x0128 0x0470 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA22__PWM6_OUT                           0x0128 0x0470 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA22__ENET2_1588_EVENT2_OUT              0x0128 0x0470 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA22__CSI1_DATA_11                       0x0128 0x0470 0x06C8 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA22__GPIO3_IO_23                        0x0128 0x0470 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA22__SRC_BT_CFG_30                      0x0128 0x0470 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA22__SIM_M_HSIZE_1                      0x0128 0x0470 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA22__VDEC_DEBUG_7                       0x0128 0x0470 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA22__MMDC_DEBUG_27                      0x0128 0x0470 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_DATA23__LCDIF1_DATA_23                     0x012C 0x0474 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_DATA23__WEIM_ADDR_23                       0x012C 0x0474 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_DATA23__PWM5_OUT                           0x012C 0x0474 0x0000 0x2 0x0
+#define MX6SX_PAD_LCD1_DATA23__ENET2_1588_EVENT3_OUT              0x012C 0x0474 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_DATA23__CSI1_DATA_10                       0x012C 0x0474 0x06FC 0x4 0x0
+#define MX6SX_PAD_LCD1_DATA23__GPIO3_IO_24                        0x012C 0x0474 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_DATA23__SRC_BT_CFG_31                      0x012C 0x0474 0x0000 0x6 0x0
+#define MX6SX_PAD_LCD1_DATA23__SIM_M_HSIZE_2                      0x012C 0x0474 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_DATA23__VDEC_DEBUG_8                       0x012C 0x0474 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_DATA23__MMDC_DEBUG_28                      0x012C 0x0474 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_ENABLE__LCDIF1_ENABLE                      0x0130 0x0478 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_ENABLE__LCDIF1_RD_E                        0x0130 0x0478 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_ENABLE__AUDMUX_AUD3_TXC                    0x0130 0x0478 0x063C 0x2 0x1
+#define MX6SX_PAD_LCD1_ENABLE__ENET1_1588_EVENT3_IN               0x0130 0x0478 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_ENABLE__CSI1_DATA_17                       0x0130 0x0478 0x06E0 0x4 0x0
+#define MX6SX_PAD_LCD1_ENABLE__GPIO3_IO_25                        0x0130 0x0478 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_ENABLE__USDHC1_CD_B                        0x0130 0x0478 0x0864 0x6 0x0
+#define MX6SX_PAD_LCD1_ENABLE__SIM_M_HADDR_17                     0x0130 0x0478 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_ENABLE__VADC_TEST_1                        0x0130 0x0478 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_ENABLE__MMDC_DEBUG_1                       0x0130 0x0478 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_HSYNC__LCDIF1_HSYNC                        0x0134 0x047C 0x07E0 0x0 0x0
+#define MX6SX_PAD_LCD1_HSYNC__LCDIF1_RS                           0x0134 0x047C 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_HSYNC__AUDMUX_AUD3_TXD                     0x0134 0x047C 0x0630 0x2 0x1
+#define MX6SX_PAD_LCD1_HSYNC__ENET2_1588_EVENT2_IN                0x0134 0x047C 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_HSYNC__CSI1_DATA_18                        0x0134 0x047C 0x06E4 0x4 0x0
+#define MX6SX_PAD_LCD1_HSYNC__GPIO3_IO_26                         0x0134 0x047C 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_HSYNC__USDHC2_WP                           0x0134 0x047C 0x0870 0x6 0x0
+#define MX6SX_PAD_LCD1_HSYNC__SIM_M_HADDR_18                      0x0134 0x047C 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_HSYNC__VADC_TEST_2                         0x0134 0x047C 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_HSYNC__MMDC_DEBUG_2                        0x0134 0x047C 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_RESET__LCDIF1_RESET                        0x0138 0x0480 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_RESET__LCDIF1_CS                           0x0138 0x0480 0x0000 0x1 0x0
+#define MX6SX_PAD_LCD1_RESET__AUDMUX_AUD3_RXD                     0x0138 0x0480 0x062C 0x2 0x1
+#define MX6SX_PAD_LCD1_RESET__KITTEN_EVENTI                       0x0138 0x0480 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_RESET__M4_EVENTI                           0x0138 0x0480 0x0000 0x4 0x0
+#define MX6SX_PAD_LCD1_RESET__GPIO3_IO_27                         0x0138 0x0480 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_RESET__CCM_PMIC_RDY                        0x0138 0x0480 0x069C 0x6 0x0
+#define MX6SX_PAD_LCD1_RESET__SIM_M_HADDR_20                      0x0138 0x0480 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_RESET__VADC_TEST_4                         0x0138 0x0480 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_RESET__MMDC_DEBUG_4                        0x0138 0x0480 0x0000 0x9 0x0
+#define MX6SX_PAD_LCD1_VSYNC__LCDIF1_VSYNC                        0x013C 0x0484 0x0000 0x0 0x0
+#define MX6SX_PAD_LCD1_VSYNC__LCDIF1_BUSY                         0x013C 0x0484 0x07E0 0x1 0x1
+#define MX6SX_PAD_LCD1_VSYNC__AUDMUX_AUD3_TXFS                    0x013C 0x0484 0x0640 0x2 0x1
+#define MX6SX_PAD_LCD1_VSYNC__ENET2_1588_EVENT3_IN                0x013C 0x0484 0x0000 0x3 0x0
+#define MX6SX_PAD_LCD1_VSYNC__CSI1_DATA_19                        0x013C 0x0484 0x06E8 0x4 0x0
+#define MX6SX_PAD_LCD1_VSYNC__GPIO3_IO_28                         0x013C 0x0484 0x0000 0x5 0x0
+#define MX6SX_PAD_LCD1_VSYNC__USDHC2_CD_B                         0x013C 0x0484 0x086C 0x6 0x0
+#define MX6SX_PAD_LCD1_VSYNC__SIM_M_HADDR_19                      0x013C 0x0484 0x0000 0x7 0x0
+#define MX6SX_PAD_LCD1_VSYNC__VADC_TEST_3                         0x013C 0x0484 0x0000 0x8 0x0
+#define MX6SX_PAD_LCD1_VSYNC__MMDC_DEBUG_3                        0x013C 0x0484 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_ALE__RAWNAND_ALE                           0x0140 0x0488 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_ALE__I2C3_SDA                              0x0140 0x0488 0x07BC 0x1 0x0
+#define MX6SX_PAD_NAND_ALE__QSPI2_A_SS0_B                         0x0140 0x0488 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_ALE__ECSPI2_SS0                            0x0140 0x0488 0x072C 0x3 0x0
+#define MX6SX_PAD_NAND_ALE__ESAI_TX3_RX2                          0x0140 0x0488 0x079C 0x4 0x0
+#define MX6SX_PAD_NAND_ALE__GPIO4_IO_0                            0x0140 0x0488 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_ALE__WEIM_CS0_B                            0x0140 0x0488 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_ALE__TPSMP_HDATA_0                         0x0140 0x0488 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_ALE__ANATOP_USBPHY1_TSTI_TX_EN             0x0140 0x0488 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_ALE__SDMA_DEBUG_PC_12                      0x0140 0x0488 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_CE0_B__RAWNAND_CE0_B                       0x0144 0x048C 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_CE0_B__USDHC2_VSELECT                      0x0144 0x048C 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_CE0_B__QSPI2_A_DATA_2                      0x0144 0x048C 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_CE0_B__AUDMUX_AUD4_TXC                     0x0144 0x048C 0x0654 0x3 0x0
+#define MX6SX_PAD_NAND_CE0_B__ESAI_TX_CLK                         0x0144 0x048C 0x078C 0x4 0x0
+#define MX6SX_PAD_NAND_CE0_B__GPIO4_IO_1                          0x0144 0x048C 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_CE0_B__WEIM_LBA_B                          0x0144 0x048C 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_CE0_B__TPSMP_HDATA_3                       0x0144 0x048C 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_CE0_B__ANATOP_USBPHY1_TSTI_TX_HIZ          0x0144 0x048C 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_CE0_B__SDMA_DEBUG_PC_9                     0x0144 0x048C 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_CE1_B__RAWNAND_CE1_B                       0x0148 0x0490 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_CE1_B__USDHC3_RESET_B                      0x0148 0x0490 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_CE1_B__QSPI2_A_DATA_3                      0x0148 0x0490 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_CE1_B__AUDMUX_AUD4_TXD                     0x0148 0x0490 0x0648 0x3 0x0
+#define MX6SX_PAD_NAND_CE1_B__ESAI_TX0                            0x0148 0x0490 0x0790 0x4 0x0
+#define MX6SX_PAD_NAND_CE1_B__GPIO4_IO_2                          0x0148 0x0490 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_CE1_B__WEIM_OE                             0x0148 0x0490 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_CE1_B__TPSMP_HDATA_4                       0x0148 0x0490 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_CE1_B__ANATOP_USBPHY1_TSTI_TX_LS_MODE      0x0148 0x0490 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_CE1_B__SDMA_DEBUG_PC_8                     0x0148 0x0490 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_CLE__RAWNAND_CLE                           0x014C 0x0494 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_CLE__I2C3_SCL                              0x014C 0x0494 0x07B8 0x1 0x0
+#define MX6SX_PAD_NAND_CLE__QSPI2_A_SCLK                          0x014C 0x0494 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_CLE__ECSPI2_SCLK                           0x014C 0x0494 0x0720 0x3 0x0
+#define MX6SX_PAD_NAND_CLE__ESAI_TX2_RX3                          0x014C 0x0494 0x0798 0x4 0x0
+#define MX6SX_PAD_NAND_CLE__GPIO4_IO_3                            0x014C 0x0494 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_CLE__WEIM_BCLK                             0x014C 0x0494 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_CLE__TPSMP_CLK                             0x014C 0x0494 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_CLE__ANATOP_USBPHY1_TSTI_TX_DP             0x014C 0x0494 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_CLE__SDMA_DEBUG_PC_13                      0x014C 0x0494 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_DATA00__RAWNAND_DATA00                     0x0150 0x0498 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_DATA00__USDHC1_DATA4                       0x0150 0x0498 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_DATA00__QSPI2_B_DATA_1                     0x0150 0x0498 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_DATA00__ECSPI5_MISO                        0x0150 0x0498 0x0754 0x3 0x0
+#define MX6SX_PAD_NAND_DATA00__ESAI_RX_CLK                        0x0150 0x0498 0x0788 0x4 0x0
+#define MX6SX_PAD_NAND_DATA00__GPIO4_IO_4                         0x0150 0x0498 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_DATA00__WEIM_AD_0                          0x0150 0x0498 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_DATA00__TPSMP_HDATA_7                      0x0150 0x0498 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_DATA00__ANATOP_USBPHY1_TSTO_RX_DISCON_DET  0x0150 0x0498 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_DATA00__SDMA_DEBUG_EVT_CHN_LINES_5         0x0150 0x0498 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_DATA01__RAWNAND_DATA01                     0x0154 0x049C 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_DATA01__USDHC1_DATA5                       0x0154 0x049C 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_DATA01__QSPI2_B_DATA_0                     0x0154 0x049C 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_DATA01__ECSPI5_MOSI                        0x0154 0x049C 0x0758 0x3 0x0
+#define MX6SX_PAD_NAND_DATA01__ESAI_RX_FS                         0x0154 0x049C 0x0778 0x4 0x0
+#define MX6SX_PAD_NAND_DATA01__GPIO4_IO_5                         0x0154 0x049C 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_DATA01__WEIM_AD_1                          0x0154 0x049C 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_DATA01__TPSMP_HDATA_8                      0x0154 0x049C 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_DATA01__ANATOP_USBPHY1_TSTO_RX_HS_RXD      0x0154 0x049C 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_DATA01__SDMA_DEBUG_EVT_CHN_LINES_4         0x0154 0x049C 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_DATA02__RAWNAND_DATA02                     0x0158 0x04A0 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_DATA02__USDHC1_DATA6                       0x0158 0x04A0 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_DATA02__QSPI2_B_SCLK                       0x0158 0x04A0 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_DATA02__ECSPI5_SCLK                        0x0158 0x04A0 0x0750 0x3 0x0
+#define MX6SX_PAD_NAND_DATA02__ESAI_TX_HF_CLK                     0x0158 0x04A0 0x0784 0x4 0x0
+#define MX6SX_PAD_NAND_DATA02__GPIO4_IO_6                         0x0158 0x04A0 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_DATA02__WEIM_AD_2                          0x0158 0x04A0 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_DATA02__TPSMP_HDATA_9                      0x0158 0x04A0 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_DATA02__ANATOP_USBPHY2_TSTO_PLL_CLK20DIV   0x0158 0x04A0 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_DATA02__SDMA_DEBUG_EVT_CHN_LINES_3         0x0158 0x04A0 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_DATA03__RAWNAND_DATA03                     0x015C 0x04A4 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_DATA03__USDHC1_DATA7                       0x015C 0x04A4 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_DATA03__QSPI2_B_SS0_B                      0x015C 0x04A4 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_DATA03__ECSPI5_SS0                         0x015C 0x04A4 0x075C 0x3 0x0
+#define MX6SX_PAD_NAND_DATA03__ESAI_RX_HF_CLK                     0x015C 0x04A4 0x0780 0x4 0x0
+#define MX6SX_PAD_NAND_DATA03__GPIO4_IO_7                         0x015C 0x04A4 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_DATA03__WEIM_AD_3                          0x015C 0x04A4 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_DATA03__TPSMP_HDATA_10                     0x015C 0x04A4 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_DATA03__ANATOP_USBPHY1_TSTO_RX_SQUELCH     0x015C 0x04A4 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_DATA03__SDMA_DEBUG_EVT_CHN_LINES_6         0x015C 0x04A4 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_DATA04__RAWNAND_DATA04                     0x0160 0x04A8 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_DATA04__USDHC2_DATA4                       0x0160 0x04A8 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_DATA04__QSPI2_B_SS1_B                      0x0160 0x04A8 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_DATA04__UART3_RTS_B                        0x0160 0x04A8 0x083C 0x3 0x0
+#define MX6SX_PAD_NAND_DATA04__AUDMUX_AUD4_RXFS                   0x0160 0x04A8 0x0650 0x4 0x0
+#define MX6SX_PAD_NAND_DATA04__GPIO4_IO_8                         0x0160 0x04A8 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_DATA04__WEIM_AD_4                          0x0160 0x04A8 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_DATA04__TPSMP_HDATA_11                     0x0160 0x04A8 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_DATA04__ANATOP_USBPHY2_TSTO_RX_SQUELCH     0x0160 0x04A8 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_DATA04__SDMA_DEBUG_CORE_STATE_0            0x0160 0x04A8 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_DATA05__RAWNAND_DATA05                     0x0164 0x04AC 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_DATA05__USDHC2_DATA5                       0x0164 0x04AC 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_DATA05__QSPI2_B_DQS                        0x0164 0x04AC 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_DATA05__UART3_CTS_B                        0x0164 0x04AC 0x083C 0x3 0x1
+#define MX6SX_PAD_NAND_DATA05__AUDMUX_AUD4_RXC                    0x0164 0x04AC 0x064C 0x4 0x0
+#define MX6SX_PAD_NAND_DATA05__GPIO4_IO_9                         0x0164 0x04AC 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_DATA05__WEIM_AD_5                          0x0164 0x04AC 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_DATA05__TPSMP_HDATA_12                     0x0164 0x04AC 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_DATA05__ANATOP_USBPHY2_TSTO_RX_DISCON_DET  0x0164 0x04AC 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_DATA05__SDMA_DEBUG_CORE_STATE_1            0x0164 0x04AC 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_DATA06__RAWNAND_DATA06                     0x0168 0x04B0 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_DATA06__USDHC2_DATA6                       0x0168 0x04B0 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_DATA06__QSPI2_A_SS1_B                      0x0168 0x04B0 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_DATA06__UART3_RX                           0x0168 0x04B0 0x0840 0x3 0x0
+#define MX6SX_PAD_NAND_DATA06__UART3_TX                           0x0168 0x04B0 0x0000 0x3 0x0
+#define MX6SX_PAD_NAND_DATA06__PWM3_OUT                           0x0168 0x04B0 0x0000 0x4 0x0
+#define MX6SX_PAD_NAND_DATA06__GPIO4_IO_10                        0x0168 0x04B0 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_DATA06__WEIM_AD_6                          0x0168 0x04B0 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_DATA06__TPSMP_HDATA_13                     0x0168 0x04B0 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_DATA06__ANATOP_USBPHY2_TSTO_RX_FS_RXD      0x0168 0x04B0 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_DATA06__SDMA_DEBUG_CORE_STATE_2            0x0168 0x04B0 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_DATA07__RAWNAND_DATA07                     0x016C 0x04B4 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_DATA07__USDHC2_DATA7                       0x016C 0x04B4 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_DATA07__QSPI2_A_DQS                        0x016C 0x04B4 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_DATA07__UART3_RX                           0x016C 0x04B4 0x0840 0x3 0x1
+#define MX6SX_PAD_NAND_DATA07__UART3_TX                           0x016C 0x04B4 0x0000 0x3 0x0
+#define MX6SX_PAD_NAND_DATA07__PWM4_OUT                           0x016C 0x04B4 0x0000 0x4 0x0
+#define MX6SX_PAD_NAND_DATA07__GPIO4_IO_11                        0x016C 0x04B4 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_DATA07__WEIM_AD_7                          0x016C 0x04B4 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_DATA07__TPSMP_HDATA_14                     0x016C 0x04B4 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_DATA07__ANATOP_USBPHY1_TSTO_RX_FS_RXD      0x016C 0x04B4 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_DATA07__SDMA_DEBUG_CORE_STATE_3            0x016C 0x04B4 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_RE_B__RAWNAND_RE_B                         0x0170 0x04B8 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_RE_B__USDHC2_RESET_B                       0x0170 0x04B8 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_RE_B__QSPI2_B_DATA_3                       0x0170 0x04B8 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_RE_B__AUDMUX_AUD4_TXFS                     0x0170 0x04B8 0x0658 0x3 0x0
+#define MX6SX_PAD_NAND_RE_B__ESAI_TX_FS                           0x0170 0x04B8 0x077C 0x4 0x0
+#define MX6SX_PAD_NAND_RE_B__GPIO4_IO_12                          0x0170 0x04B8 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_RE_B__WEIM_RW                              0x0170 0x04B8 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_RE_B__TPSMP_HDATA_5                        0x0170 0x04B8 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_RE_B__ANATOP_USBPHY2_TSTO_RX_HS_RXD        0x0170 0x04B8 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_RE_B__SDMA_DEBUG_PC_7                      0x0170 0x04B8 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_READY_B__RAWNAND_READY_B                   0x0174 0x04BC 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_READY_B__USDHC1_VSELECT                    0x0174 0x04BC 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_READY_B__QSPI2_A_DATA_1                    0x0174 0x04BC 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_READY_B__ECSPI2_MISO                       0x0174 0x04BC 0x0724 0x3 0x0
+#define MX6SX_PAD_NAND_READY_B__ESAI_TX1                          0x0174 0x04BC 0x0794 0x4 0x0
+#define MX6SX_PAD_NAND_READY_B__GPIO4_IO_13                       0x0174 0x04BC 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_READY_B__WEIM_EB_B_1                       0x0174 0x04BC 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_READY_B__TPSMP_HDATA_2                     0x0174 0x04BC 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_READY_B__ANATOP_USBPHY1_TSTI_TX_DN         0x0174 0x04BC 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_READY_B__SDMA_DEBUG_PC_10                  0x0174 0x04BC 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_WE_B__RAWNAND_WE_B                         0x0178 0x04C0 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_WE_B__USDHC4_VSELECT                       0x0178 0x04C0 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_WE_B__QSPI2_B_DATA_2                       0x0178 0x04C0 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_WE_B__AUDMUX_AUD4_RXD                      0x0178 0x04C0 0x0644 0x3 0x0
+#define MX6SX_PAD_NAND_WE_B__ESAI_TX5_RX0                         0x0178 0x04C0 0x07A4 0x4 0x0
+#define MX6SX_PAD_NAND_WE_B__GPIO4_IO_14                          0x0178 0x04C0 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_WE_B__WEIM_WAIT                            0x0178 0x04C0 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_WE_B__TPSMP_HDATA_6                        0x0178 0x04C0 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_WE_B__ANATOP_USBPHY1_TSTO_PLL_CLK20DIV     0x0178 0x04C0 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_WE_B__SDMA_DEBUG_PC_6                      0x0178 0x04C0 0x0000 0x9 0x0
+#define MX6SX_PAD_NAND_WP_B__RAWNAND_WP_B                         0x017C 0x04C4 0x0000 0x0 0x0
+#define MX6SX_PAD_NAND_WP_B__USDHC1_RESET_B                       0x017C 0x04C4 0x0000 0x1 0x0
+#define MX6SX_PAD_NAND_WP_B__QSPI2_A_DATA_0                       0x017C 0x04C4 0x0000 0x2 0x0
+#define MX6SX_PAD_NAND_WP_B__ECSPI2_MOSI                          0x017C 0x04C4 0x0728 0x3 0x0
+#define MX6SX_PAD_NAND_WP_B__ESAI_TX4_RX1                         0x017C 0x04C4 0x07A0 0x4 0x0
+#define MX6SX_PAD_NAND_WP_B__GPIO4_IO_15                          0x017C 0x04C4 0x0000 0x5 0x0
+#define MX6SX_PAD_NAND_WP_B__WEIM_EB_B_0                          0x017C 0x04C4 0x0000 0x6 0x0
+#define MX6SX_PAD_NAND_WP_B__TPSMP_HDATA_1                        0x017C 0x04C4 0x0000 0x7 0x0
+#define MX6SX_PAD_NAND_WP_B__ANATOP_USBPHY1_TSTI_TX_HS_MODE       0x017C 0x04C4 0x0000 0x8 0x0
+#define MX6SX_PAD_NAND_WP_B__SDMA_DEBUG_PC_11                     0x017C 0x04C4 0x0000 0x9 0x0
+#define MX6SX_PAD_QSPI1A_DATA0__QSPI1_A_DATA_0                    0x0180 0x04C8 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1A_DATA0__USB_OTG2_OC                       0x0180 0x04C8 0x085C 0x1 0x2
+#define MX6SX_PAD_QSPI1A_DATA0__ECSPI1_MOSI                       0x0180 0x04C8 0x0718 0x2 0x1
+#define MX6SX_PAD_QSPI1A_DATA0__ESAI_TX4_RX1                      0x0180 0x04C8 0x07A0 0x3 0x2
+#define MX6SX_PAD_QSPI1A_DATA0__CSI1_DATA_14                      0x0180 0x04C8 0x06D4 0x4 0x1
+#define MX6SX_PAD_QSPI1A_DATA0__GPIO4_IO_16                       0x0180 0x04C8 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1A_DATA0__WEIM_DATA_6                       0x0180 0x04C8 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1A_DATA0__SIM_M_HADDR_3                     0x0180 0x04C8 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1A_DATA0__SDMA_DEBUG_BUS_DEVICE_3           0x0180 0x04C8 0x0000 0x9 0x0
+#define MX6SX_PAD_QSPI1A_DATA1__QSPI1_A_DATA_1                    0x0184 0x04CC 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1A_DATA1__ANATOP_OTG1_ID                    0x0184 0x04CC 0x0624 0x1 0x2
+#define MX6SX_PAD_QSPI1A_DATA1__ECSPI1_MISO                       0x0184 0x04CC 0x0714 0x2 0x1
+#define MX6SX_PAD_QSPI1A_DATA1__ESAI_TX1                          0x0184 0x04CC 0x0794 0x3 0x2
+#define MX6SX_PAD_QSPI1A_DATA1__CSI1_DATA_13                      0x0184 0x04CC 0x06D0 0x4 0x1
+#define MX6SX_PAD_QSPI1A_DATA1__GPIO4_IO_17                       0x0184 0x04CC 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1A_DATA1__WEIM_DATA_5                       0x0184 0x04CC 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1A_DATA1__SIM_M_HADDR_4                     0x0184 0x04CC 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1A_DATA1__SDMA_DEBUG_PC_0                   0x0184 0x04CC 0x0000 0x9 0x0
+#define MX6SX_PAD_QSPI1A_DATA2__QSPI1_A_DATA_2                    0x0188 0x04D0 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1A_DATA2__USB_OTG1_PWR                      0x0188 0x04D0 0x0000 0x1 0x0
+#define MX6SX_PAD_QSPI1A_DATA2__ECSPI5_SS1                        0x0188 0x04D0 0x0000 0x2 0x0
+#define MX6SX_PAD_QSPI1A_DATA2__ESAI_TX_CLK                       0x0188 0x04D0 0x078C 0x3 0x2
+#define MX6SX_PAD_QSPI1A_DATA2__CSI1_DATA_12                      0x0188 0x04D0 0x06CC 0x4 0x1
+#define MX6SX_PAD_QSPI1A_DATA2__GPIO4_IO_18                       0x0188 0x04D0 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1A_DATA2__WEIM_DATA_4                       0x0188 0x04D0 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1A_DATA2__SIM_M_HADDR_6                     0x0188 0x04D0 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1A_DATA2__SDMA_DEBUG_PC_1                   0x0188 0x04D0 0x0000 0x9 0x0
+#define MX6SX_PAD_QSPI1A_DATA3__QSPI1_A_DATA_3                    0x018C 0x04D4 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1A_DATA3__USB_OTG1_OC                       0x018C 0x04D4 0x0860 0x1 0x2
+#define MX6SX_PAD_QSPI1A_DATA3__ECSPI5_SS2                        0x018C 0x04D4 0x0000 0x2 0x0
+#define MX6SX_PAD_QSPI1A_DATA3__ESAI_TX0                          0x018C 0x04D4 0x0790 0x3 0x2
+#define MX6SX_PAD_QSPI1A_DATA3__CSI1_DATA_11                      0x018C 0x04D4 0x06C8 0x4 0x1
+#define MX6SX_PAD_QSPI1A_DATA3__GPIO4_IO_19                       0x018C 0x04D4 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1A_DATA3__WEIM_DATA_3                       0x018C 0x04D4 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1A_DATA3__SIM_M_HADDR_7                     0x018C 0x04D4 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1A_DATA3__SDMA_DEBUG_PC_2                   0x018C 0x04D4 0x0000 0x9 0x0
+#define MX6SX_PAD_QSPI1A_DQS__QSPI1_A_DQS                         0x0190 0x04D8 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1A_DQS__CAN2_TX                             0x0190 0x04D8 0x0000 0x1 0x0
+#define MX6SX_PAD_QSPI1A_DQS__CANFD_TX2                           0x0190 0x04D8 0x0000 0x2 0x0
+#define MX6SX_PAD_QSPI1A_DQS__ECSPI5_MOSI                         0x0190 0x04D8 0x0758 0x3 0x1
+#define MX6SX_PAD_QSPI1A_DQS__CSI1_DATA_15                        0x0190 0x04D8 0x06D8 0x4 0x1
+#define MX6SX_PAD_QSPI1A_DQS__GPIO4_IO_20                         0x0190 0x04D8 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1A_DQS__WEIM_DATA_7                         0x0190 0x04D8 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1A_DQS__SIM_M_HADDR_13                      0x0190 0x04D8 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1A_DQS__SDMA_DEBUG_BUS_DEVICE_4             0x0190 0x04D8 0x0000 0x9 0x0
+#define MX6SX_PAD_QSPI1A_SCLK__QSPI1_A_SCLK                       0x0194 0x04DC 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1A_SCLK__ANATOP_OTG2_ID                     0x0194 0x04DC 0x0628 0x1 0x2
+#define MX6SX_PAD_QSPI1A_SCLK__ECSPI1_SCLK                        0x0194 0x04DC 0x0710 0x2 0x1
+#define MX6SX_PAD_QSPI1A_SCLK__ESAI_TX2_RX3                       0x0194 0x04DC 0x0798 0x3 0x2
+#define MX6SX_PAD_QSPI1A_SCLK__CSI1_DATA_1                        0x0194 0x04DC 0x06A4 0x4 0x1
+#define MX6SX_PAD_QSPI1A_SCLK__GPIO4_IO_21                        0x0194 0x04DC 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1A_SCLK__WEIM_DATA_0                        0x0194 0x04DC 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1A_SCLK__SIM_M_HADDR_0                      0x0194 0x04DC 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1A_SCLK__SDMA_DEBUG_PC_5                    0x0194 0x04DC 0x0000 0x9 0x0
+#define MX6SX_PAD_QSPI1A_SS0_B__QSPI1_A_SS0_B                     0x0198 0x04E0 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1A_SS0_B__USB_OTG2_PWR                      0x0198 0x04E0 0x0000 0x1 0x0
+#define MX6SX_PAD_QSPI1A_SS0_B__ECSPI1_SS0                        0x0198 0x04E0 0x071C 0x2 0x1
+#define MX6SX_PAD_QSPI1A_SS0_B__ESAI_TX3_RX2                      0x0198 0x04E0 0x079C 0x3 0x2
+#define MX6SX_PAD_QSPI1A_SS0_B__CSI1_DATA_0                       0x0198 0x04E0 0x06A0 0x4 0x1
+#define MX6SX_PAD_QSPI1A_SS0_B__GPIO4_IO_22                       0x0198 0x04E0 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1A_SS0_B__WEIM_DATA_1                       0x0198 0x04E0 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1A_SS0_B__SIM_M_HADDR_1                     0x0198 0x04E0 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1A_SS0_B__SDMA_DEBUG_PC_4                   0x0198 0x04E0 0x0000 0x9 0x0
+#define MX6SX_PAD_QSPI1A_SS1_B__QSPI1_A_SS1_B                     0x019C 0x04E4 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1A_SS1_B__CAN1_RX                           0x019C 0x04E4 0x068C 0x1 0x2
+#define MX6SX_PAD_QSPI1A_SS1_B__CANFD_RX1                         0x019C 0x04E4 0x0694 0x2 0x2
+#define MX6SX_PAD_QSPI1A_SS1_B__ECSPI5_MISO                       0x019C 0x04E4 0x0754 0x3 0x1
+#define MX6SX_PAD_QSPI1A_SS1_B__CSI1_DATA_10                      0x019C 0x04E4 0x06FC 0x4 0x1
+#define MX6SX_PAD_QSPI1A_SS1_B__GPIO4_IO_23                       0x019C 0x04E4 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1A_SS1_B__WEIM_DATA_2                       0x019C 0x04E4 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1A_SS1_B__SIM_M_HADDR_12                    0x019C 0x04E4 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1A_SS1_B__SDMA_DEBUG_PC_3                   0x019C 0x04E4 0x0000 0x9 0x0
+#define MX6SX_PAD_QSPI1B_DATA0__QSPI1_B_DATA_0                    0x01A0 0x04E8 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1B_DATA0__UART3_CTS_B                       0x01A0 0x04E8 0x083C 0x1 0x4
+#define MX6SX_PAD_QSPI1B_DATA0__ECSPI3_MOSI                       0x01A0 0x04E8 0x0738 0x2 0x1
+#define MX6SX_PAD_QSPI1B_DATA0__ESAI_RX_FS                        0x01A0 0x04E8 0x0778 0x3 0x2
+#define MX6SX_PAD_QSPI1B_DATA0__CSI1_DATA_22                      0x01A0 0x04E8 0x06F4 0x4 0x1
+#define MX6SX_PAD_QSPI1B_DATA0__GPIO4_IO_24                       0x01A0 0x04E8 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1B_DATA0__WEIM_DATA_14                      0x01A0 0x04E8 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1B_DATA0__SIM_M_HADDR_9                     0x01A0 0x04E8 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1B_DATA1__QSPI1_B_DATA_1                    0x01A4 0x04EC 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1B_DATA1__UART3_RTS_B                       0x01A4 0x04EC 0x083C 0x1 0x5
+#define MX6SX_PAD_QSPI1B_DATA1__ECSPI3_MISO                       0x01A4 0x04EC 0x0734 0x2 0x1
+#define MX6SX_PAD_QSPI1B_DATA1__ESAI_RX_CLK                       0x01A4 0x04EC 0x0788 0x3 0x2
+#define MX6SX_PAD_QSPI1B_DATA1__CSI1_DATA_21                      0x01A4 0x04EC 0x06F0 0x4 0x1
+#define MX6SX_PAD_QSPI1B_DATA1__GPIO4_IO_25                       0x01A4 0x04EC 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1B_DATA1__WEIM_DATA_13                      0x01A4 0x04EC 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1B_DATA1__SIM_M_HADDR_8                     0x01A4 0x04EC 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1B_DATA2__QSPI1_B_DATA_2                    0x01A8 0x04F0 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1B_DATA2__I2C2_SDA                          0x01A8 0x04F0 0x07B4 0x1 0x2
+#define MX6SX_PAD_QSPI1B_DATA2__ECSPI5_RDY                        0x01A8 0x04F0 0x0000 0x2 0x0
+#define MX6SX_PAD_QSPI1B_DATA2__ESAI_TX5_RX0                      0x01A8 0x04F0 0x07A4 0x3 0x2
+#define MX6SX_PAD_QSPI1B_DATA2__CSI1_DATA_20                      0x01A8 0x04F0 0x06EC 0x4 0x1
+#define MX6SX_PAD_QSPI1B_DATA2__GPIO4_IO_26                       0x01A8 0x04F0 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1B_DATA2__WEIM_DATA_12                      0x01A8 0x04F0 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1B_DATA2__SIM_M_HADDR_5                     0x01A8 0x04F0 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1B_DATA3__QSPI1_B_DATA_3                    0x01AC 0x04F4 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1B_DATA3__I2C2_SCL                          0x01AC 0x04F4 0x07B0 0x1 0x2
+#define MX6SX_PAD_QSPI1B_DATA3__ECSPI5_SS3                        0x01AC 0x04F4 0x0000 0x2 0x0
+#define MX6SX_PAD_QSPI1B_DATA3__ESAI_TX_FS                        0x01AC 0x04F4 0x077C 0x3 0x2
+#define MX6SX_PAD_QSPI1B_DATA3__CSI1_DATA_19                      0x01AC 0x04F4 0x06E8 0x4 0x1
+#define MX6SX_PAD_QSPI1B_DATA3__GPIO4_IO_27                       0x01AC 0x04F4 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1B_DATA3__WEIM_DATA_11                      0x01AC 0x04F4 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1B_DATA3__SIM_M_HADDR_2                     0x01AC 0x04F4 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1B_DQS__QSPI1_B_DQS                         0x01B0 0x04F8 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1B_DQS__CAN1_TX                             0x01B0 0x04F8 0x0000 0x1 0x0
+#define MX6SX_PAD_QSPI1B_DQS__CANFD_TX1                           0x01B0 0x04F8 0x0000 0x2 0x0
+#define MX6SX_PAD_QSPI1B_DQS__ECSPI5_SS0                          0x01B0 0x04F8 0x075C 0x3 0x1
+#define MX6SX_PAD_QSPI1B_DQS__CSI1_DATA_23                        0x01B0 0x04F8 0x06F8 0x4 0x1
+#define MX6SX_PAD_QSPI1B_DQS__GPIO4_IO_28                         0x01B0 0x04F8 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1B_DQS__WEIM_DATA_15                        0x01B0 0x04F8 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1B_DQS__SIM_M_HADDR_15                      0x01B0 0x04F8 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1B_SCLK__QSPI1_B_SCLK                       0x01B4 0x04FC 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1B_SCLK__UART3_RX                           0x01B4 0x04FC 0x0840 0x1 0x4
+#define MX6SX_PAD_QSPI1B_SCLK__UART3_TX                           0x01B4 0x04FC 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1B_SCLK__ECSPI3_SCLK                        0x01B4 0x04FC 0x0730 0x2 0x1
+#define MX6SX_PAD_QSPI1B_SCLK__ESAI_RX_HF_CLK                     0x01B4 0x04FC 0x0780 0x3 0x2
+#define MX6SX_PAD_QSPI1B_SCLK__CSI1_DATA_16                       0x01B4 0x04FC 0x06DC 0x4 0x1
+#define MX6SX_PAD_QSPI1B_SCLK__GPIO4_IO_29                        0x01B4 0x04FC 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1B_SCLK__WEIM_DATA_8                        0x01B4 0x04FC 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1B_SCLK__SIM_M_HADDR_11                     0x01B4 0x04FC 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1B_SS0_B__QSPI1_B_SS0_B                     0x01B8 0x0500 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1B_SS0_B__UART3_RX                          0x01B8 0x0500 0x0840 0x1 0x5
+#define MX6SX_PAD_QSPI1B_SS0_B__UART3_TX                          0x01B8 0x0500 0x0000 0x1 0x0
+#define MX6SX_PAD_QSPI1B_SS0_B__ECSPI3_SS0                        0x01B8 0x0500 0x073C 0x2 0x1
+#define MX6SX_PAD_QSPI1B_SS0_B__ESAI_TX_HF_CLK                    0x01B8 0x0500 0x0784 0x3 0x3
+#define MX6SX_PAD_QSPI1B_SS0_B__CSI1_DATA_17                      0x01B8 0x0500 0x06E0 0x4 0x1
+#define MX6SX_PAD_QSPI1B_SS0_B__GPIO4_IO_30                       0x01B8 0x0500 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1B_SS0_B__WEIM_DATA_9                       0x01B8 0x0500 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1B_SS0_B__SIM_M_HADDR_10                    0x01B8 0x0500 0x0000 0x7 0x0
+#define MX6SX_PAD_QSPI1B_SS1_B__QSPI1_B_SS1_B                     0x01BC 0x0504 0x0000 0x0 0x0
+#define MX6SX_PAD_QSPI1B_SS1_B__CAN2_RX                           0x01BC 0x0504 0x0690 0x1 0x2
+#define MX6SX_PAD_QSPI1B_SS1_B__CANFD_RX2                         0x01BC 0x0504 0x0698 0x2 0x2
+#define MX6SX_PAD_QSPI1B_SS1_B__ECSPI5_SCLK                       0x01BC 0x0504 0x0750 0x3 0x1
+#define MX6SX_PAD_QSPI1B_SS1_B__CSI1_DATA_18                      0x01BC 0x0504 0x06E4 0x4 0x1
+#define MX6SX_PAD_QSPI1B_SS1_B__GPIO4_IO_31                       0x01BC 0x0504 0x0000 0x5 0x0
+#define MX6SX_PAD_QSPI1B_SS1_B__WEIM_DATA_10                      0x01BC 0x0504 0x0000 0x6 0x0
+#define MX6SX_PAD_QSPI1B_SS1_B__SIM_M_HADDR_14                    0x01BC 0x0504 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_RD0__ENET1_RX_DATA_0                     0x01C0 0x0508 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_RD0__GPIO5_IO_0                          0x01C0 0x0508 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_RD0__CSI2_DATA_10                        0x01C0 0x0508 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_RD0__ANATOP_TESTI_0                      0x01C0 0x0508 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_RD0__RAWNAND_TESTER_TRIGGER              0x01C0 0x0508 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_RD0__PCIE_CTRL_DEBUG_0                   0x01C0 0x0508 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_RD1__ENET1_RX_DATA_1                     0x01C4 0x050C 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_RD1__GPIO5_IO_1                          0x01C4 0x050C 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_RD1__CSI2_DATA_11                        0x01C4 0x050C 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_RD1__ANATOP_TESTI_1                      0x01C4 0x050C 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_RD1__USDHC1_TESTER_TRIGGER               0x01C4 0x050C 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_RD1__PCIE_CTRL_DEBUG_1                   0x01C4 0x050C 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_RD2__ENET1_RX_DATA_2                     0x01C8 0x0510 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_RD2__GPIO5_IO_2                          0x01C8 0x0510 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_RD2__CSI2_DATA_12                        0x01C8 0x0510 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_RD2__ANATOP_TESTI_2                      0x01C8 0x0510 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_RD2__USDHC2_TESTER_TRIGGER               0x01C8 0x0510 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_RD2__PCIE_CTRL_DEBUG_2                   0x01C8 0x0510 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3                     0x01CC 0x0514 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_RD3__GPIO5_IO_3                          0x01CC 0x0514 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_RD3__CSI2_DATA_13                        0x01CC 0x0514 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_RD3__ANATOP_TESTI_3                      0x01CC 0x0514 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_RD3__USDHC3_TESTER_TRIGGER               0x01CC 0x0514 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_RD3__PCIE_CTRL_DEBUG_3                   0x01CC 0x0514 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN                      0x01D0 0x0518 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_RX_CTL__GPIO5_IO_4                       0x01D0 0x0518 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_RX_CTL__CSI2_DATA_14                     0x01D0 0x0518 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_RX_CTL__ANATOP_TESTO_0                   0x01D0 0x0518 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_RX_CTL__USDHC4_TESTER_TRIGGER            0x01D0 0x0518 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_RX_CTL__PCIE_CTRL_DEBUG_4                0x01D0 0x0518 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_RXC__ENET1_RX_CLK                        0x01D4 0x051C 0x0768 0x0 0x1
+#define MX6SX_PAD_RGMII1_RXC__ENET1_RX_ER                         0x01D4 0x051C 0x0000 0x1 0x0
+#define MX6SX_PAD_RGMII1_RXC__GPIO5_IO_5                          0x01D4 0x051C 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_RXC__CSI2_DATA_15                        0x01D4 0x051C 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_RXC__ANATOP_TESTO_1                      0x01D4 0x051C 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_RXC__ECSPI1_TESTER_TRIGGER               0x01D4 0x051C 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_RXC__PCIE_CTRL_DEBUG_5                   0x01D4 0x051C 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_TD0__ENET1_TX_DATA_0                     0x01D8 0x0520 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_TD0__SAI2_RX_SYNC                        0x01D8 0x0520 0x0810 0x2 0x1
+#define MX6SX_PAD_RGMII1_TD0__GPIO5_IO_6                          0x01D8 0x0520 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_TD0__CSI2_DATA_16                        0x01D8 0x0520 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_TD0__ANATOP_TESTO_2                      0x01D8 0x0520 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_TD0__ECSPI2_TESTER_TRIGGER               0x01D8 0x0520 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_TD0__PCIE_CTRL_DEBUG_6                   0x01D8 0x0520 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_TD1__ENET1_TX_DATA_1                     0x01DC 0x0524 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_TD1__SAI2_RX_BCLK                        0x01DC 0x0524 0x0808 0x2 0x1
+#define MX6SX_PAD_RGMII1_TD1__GPIO5_IO_7                          0x01DC 0x0524 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_TD1__CSI2_DATA_17                        0x01DC 0x0524 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_TD1__ANATOP_TESTO_3                      0x01DC 0x0524 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_TD1__ECSPI3_TESTER_TRIGGER               0x01DC 0x0524 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_TD1__PCIE_CTRL_DEBUG_7                   0x01DC 0x0524 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_TD2__ENET1_TX_DATA_2                     0x01E0 0x0528 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_TD2__SAI2_TX_SYNC                        0x01E0 0x0528 0x0818 0x2 0x1
+#define MX6SX_PAD_RGMII1_TD2__GPIO5_IO_8                          0x01E0 0x0528 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_TD2__CSI2_DATA_18                        0x01E0 0x0528 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_TD2__ANATOP_TESTO_4                      0x01E0 0x0528 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_TD2__ECSPI4_TESTER_TRIGGER               0x01E0 0x0528 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_TD2__PCIE_CTRL_DEBUG_8                   0x01E0 0x0528 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_TD3__ENET1_TX_DATA_3                     0x01E4 0x052C 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_TD3__SAI2_TX_BCLK                        0x01E4 0x052C 0x0814 0x2 0x1
+#define MX6SX_PAD_RGMII1_TD3__GPIO5_IO_9                          0x01E4 0x052C 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_TD3__CSI2_DATA_19                        0x01E4 0x052C 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_TD3__ANATOP_TESTO_5                      0x01E4 0x052C 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_TD3__ECSPI5_TESTER_TRIGGER               0x01E4 0x052C 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_TD3__PCIE_CTRL_DEBUG_9                   0x01E4 0x052C 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_TX_CTL__ENET1_TX_EN                      0x01E8 0x0530 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_TX_CTL__SAI2_RX_DATA_0                   0x01E8 0x0530 0x080C 0x2 0x1
+#define MX6SX_PAD_RGMII1_TX_CTL__GPIO5_IO_10                      0x01E8 0x0530 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_TX_CTL__CSI2_DATA_0                      0x01E8 0x0530 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_TX_CTL__ANATOP_TESTO_6                   0x01E8 0x0530 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_TX_CTL__QSPI1_TESTER_TRIGGER             0x01E8 0x0530 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_TX_CTL__PCIE_CTRL_DEBUG_10               0x01E8 0x0530 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII1_TXC__ENET1_RGMII_TXC                     0x01EC 0x0534 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII1_TXC__ENET1_TX_ER                         0x01EC 0x0534 0x0000 0x1 0x0
+#define MX6SX_PAD_RGMII1_TXC__SAI2_TX_DATA_0                      0x01EC 0x0534 0x0000 0x2 0x0
+#define MX6SX_PAD_RGMII1_TXC__GPIO5_IO_11                         0x01EC 0x0534 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII1_TXC__CSI2_DATA_1                         0x01EC 0x0534 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII1_TXC__ANATOP_TESTO_7                      0x01EC 0x0534 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII1_TXC__QSPI2_TESTER_TRIGGER                0x01EC 0x0534 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII1_TXC__PCIE_CTRL_DEBUG_11                  0x01EC 0x0534 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_RD0__ENET2_RX_DATA_0                     0x01F0 0x0538 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_RD0__PWM4_OUT                            0x01F0 0x0538 0x0000 0x2 0x0
+#define MX6SX_PAD_RGMII2_RD0__GPIO5_IO_12                         0x01F0 0x0538 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_RD0__CSI2_DATA_2                         0x01F0 0x0538 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_RD0__ANATOP_TESTO_8                      0x01F0 0x0538 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_RD0__VDEC_DEBUG_18                       0x01F0 0x0538 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_RD0__PCIE_CTRL_DEBUG_12                  0x01F0 0x0538 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_RD1__ENET2_RX_DATA_1                     0x01F4 0x053C 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_RD1__PWM3_OUT                            0x01F4 0x053C 0x0000 0x2 0x0
+#define MX6SX_PAD_RGMII2_RD1__GPIO5_IO_13                         0x01F4 0x053C 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_RD1__CSI2_DATA_3                         0x01F4 0x053C 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_RD1__ANATOP_TESTO_9                      0x01F4 0x053C 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_RD1__VDEC_DEBUG_19                       0x01F4 0x053C 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_RD1__PCIE_CTRL_DEBUG_13                  0x01F4 0x053C 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_RD2__ENET2_RX_DATA_2                     0x01F8 0x0540 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_RD2__PWM2_OUT                            0x01F8 0x0540 0x0000 0x2 0x0
+#define MX6SX_PAD_RGMII2_RD2__GPIO5_IO_14                         0x01F8 0x0540 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_RD2__CSI2_DATA_4                         0x01F8 0x0540 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_RD2__ANATOP_TESTO_10                     0x01F8 0x0540 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_RD2__VDEC_DEBUG_20                       0x01F8 0x0540 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_RD2__PCIE_CTRL_DEBUG_14                  0x01F8 0x0540 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_RD3__ENET2_RX_DATA_3                     0x01FC 0x0544 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_RD3__PWM1_OUT                            0x01FC 0x0544 0x0000 0x2 0x0
+#define MX6SX_PAD_RGMII2_RD3__GPIO5_IO_15                         0x01FC 0x0544 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_RD3__CSI2_DATA_5                         0x01FC 0x0544 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_RD3__ANATOP_TESTO_11                     0x01FC 0x0544 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_RD3__VDEC_DEBUG_21                       0x01FC 0x0544 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_RD3__PCIE_CTRL_DEBUG_15                  0x01FC 0x0544 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_RX_CTL__ENET2_RX_EN                      0x0200 0x0548 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_RX_CTL__GPIO5_IO_16                      0x0200 0x0548 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_RX_CTL__CSI2_DATA_6                      0x0200 0x0548 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_RX_CTL__ANATOP_TESTO_12                  0x0200 0x0548 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_RX_CTL__VDEC_DEBUG_22                    0x0200 0x0548 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_RX_CTL__PCIE_CTRL_DEBUG_16               0x0200 0x0548 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_RXC__ENET2_RX_CLK                        0x0204 0x054C 0x0774 0x0 0x1
+#define MX6SX_PAD_RGMII2_RXC__ENET2_RX_ER                         0x0204 0x054C 0x0000 0x1 0x0
+#define MX6SX_PAD_RGMII2_RXC__GPIO5_IO_17                         0x0204 0x054C 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_RXC__CSI2_DATA_7                         0x0204 0x054C 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_RXC__ANATOP_TESTO_13                     0x0204 0x054C 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_RXC__VDEC_DEBUG_23                       0x0204 0x054C 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_RXC__PCIE_CTRL_DEBUG_17                  0x0204 0x054C 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_TD0__ENET2_TX_DATA_0                     0x0208 0x0550 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_TD0__SAI1_RX_SYNC                        0x0208 0x0550 0x07FC 0x2 0x1
+#define MX6SX_PAD_RGMII2_TD0__PWM8_OUT                            0x0208 0x0550 0x0000 0x3 0x0
+#define MX6SX_PAD_RGMII2_TD0__GPIO5_IO_18                         0x0208 0x0550 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_TD0__CSI2_DATA_8                         0x0208 0x0550 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_TD0__ANATOP_TESTO_14                     0x0208 0x0550 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_TD0__VDEC_DEBUG_24                       0x0208 0x0550 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_TD0__PCIE_CTRL_DEBUG_18                  0x0208 0x0550 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_TD1__ENET2_TX_DATA_1                     0x020C 0x0554 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_TD1__SAI1_RX_BCLK                        0x020C 0x0554 0x07F4 0x2 0x1
+#define MX6SX_PAD_RGMII2_TD1__PWM7_OUT                            0x020C 0x0554 0x0000 0x3 0x0
+#define MX6SX_PAD_RGMII2_TD1__GPIO5_IO_19                         0x020C 0x0554 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_TD1__CSI2_DATA_9                         0x020C 0x0554 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_TD1__ANATOP_TESTO_15                     0x020C 0x0554 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_TD1__VDEC_DEBUG_25                       0x020C 0x0554 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_TD1__PCIE_CTRL_DEBUG_19                  0x020C 0x0554 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_TD2__ENET2_TX_DATA_2                     0x0210 0x0558 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_TD2__SAI1_TX_SYNC                        0x0210 0x0558 0x0804 0x2 0x1
+#define MX6SX_PAD_RGMII2_TD2__PWM6_OUT                            0x0210 0x0558 0x0000 0x3 0x0
+#define MX6SX_PAD_RGMII2_TD2__GPIO5_IO_20                         0x0210 0x0558 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_TD2__CSI2_VSYNC                          0x0210 0x0558 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_TD2__SJC_FAIL                            0x0210 0x0558 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_TD2__VDEC_DEBUG_26                       0x0210 0x0558 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_TD2__PCIE_CTRL_DEBUG_20                  0x0210 0x0558 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_TD3__ENET2_TX_DATA_3                     0x0214 0x055C 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_TD3__SAI1_TX_BCLK                        0x0214 0x055C 0x0800 0x2 0x1
+#define MX6SX_PAD_RGMII2_TD3__PWM5_OUT                            0x0214 0x055C 0x0000 0x3 0x0
+#define MX6SX_PAD_RGMII2_TD3__GPIO5_IO_21                         0x0214 0x055C 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_TD3__CSI2_HSYNC                          0x0214 0x055C 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_TD3__SJC_JTAG_ACT                        0x0214 0x055C 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_TD3__VDEC_DEBUG_27                       0x0214 0x055C 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_TD3__PCIE_CTRL_DEBUG_21                  0x0214 0x055C 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_TX_CTL__ENET2_TX_EN                      0x0218 0x0560 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_TX_CTL__SAI1_RX_DATA_0                   0x0218 0x0560 0x07F8 0x2 0x1
+#define MX6SX_PAD_RGMII2_TX_CTL__GPIO5_IO_22                      0x0218 0x0560 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_TX_CTL__CSI2_FIELD                       0x0218 0x0560 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_TX_CTL__SJC_DE_B                         0x0218 0x0560 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_TX_CTL__VDEC_DEBUG_28                    0x0218 0x0560 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_TX_CTL__PCIE_CTRL_DEBUG_22               0x0218 0x0560 0x0000 0x9 0x0
+#define MX6SX_PAD_RGMII2_TXC__ENET2_RGMII_TXC                     0x021C 0x0564 0x0000 0x0 0x0
+#define MX6SX_PAD_RGMII2_TXC__ENET2_TX_ER                         0x021C 0x0564 0x0000 0x1 0x0
+#define MX6SX_PAD_RGMII2_TXC__SAI1_TX_DATA_0                      0x021C 0x0564 0x0000 0x2 0x0
+#define MX6SX_PAD_RGMII2_TXC__GPIO5_IO_23                         0x021C 0x0564 0x0000 0x5 0x0
+#define MX6SX_PAD_RGMII2_TXC__CSI2_PIXCLK                         0x021C 0x0564 0x0000 0x6 0x0
+#define MX6SX_PAD_RGMII2_TXC__SJC_DONE                            0x021C 0x0564 0x0000 0x7 0x0
+#define MX6SX_PAD_RGMII2_TXC__VDEC_DEBUG_29                       0x021C 0x0564 0x0000 0x8 0x0
+#define MX6SX_PAD_RGMII2_TXC__PCIE_CTRL_DEBUG_23                  0x021C 0x0564 0x0000 0x9 0x0
+#define MX6SX_PAD_SD1_CLK__USDHC1_CLK                             0x0220 0x0568 0x0000 0x0 0x0
+#define MX6SX_PAD_SD1_CLK__AUDMUX_AUD5_RXFS                       0x0220 0x0568 0x0668 0x1 0x1
+#define MX6SX_PAD_SD1_CLK__WDOG2_WDOG_B                           0x0220 0x0568 0x0000 0x2 0x0
+#define MX6SX_PAD_SD1_CLK__GPT_CLK                                0x0220 0x0568 0x0000 0x3 0x0
+#define MX6SX_PAD_SD1_CLK__WDOG2_WDOG_RST_B_DEB                   0x0220 0x0568 0x0000 0x4 0x0
+#define MX6SX_PAD_SD1_CLK__GPIO6_IO_0                             0x0220 0x0568 0x0000 0x5 0x0
+#define MX6SX_PAD_SD1_CLK__ENET2_1588_EVENT1_OUT                  0x0220 0x0568 0x0000 0x6 0x0
+#define MX6SX_PAD_SD1_CLK__CCM_OUT1                               0x0220 0x0568 0x0000 0x7 0x0
+#define MX6SX_PAD_SD1_CLK__VADC_ADC_PROC_CLK                      0x0220 0x0568 0x0000 0x8 0x0
+#define MX6SX_PAD_SD1_CLK__MMDC_DEBUG_45                          0x0220 0x0568 0x0000 0x9 0x0
+#define MX6SX_PAD_SD1_CMD__USDHC1_CMD                             0x0224 0x056C 0x0000 0x0 0x0
+#define MX6SX_PAD_SD1_CMD__AUDMUX_AUD5_RXC                        0x0224 0x056C 0x0664 0x1 0x1
+#define MX6SX_PAD_SD1_CMD__WDOG1_WDOG_B                           0x0224 0x056C 0x0000 0x2 0x0
+#define MX6SX_PAD_SD1_CMD__GPT_COMPARE1                           0x0224 0x056C 0x0000 0x3 0x0
+#define MX6SX_PAD_SD1_CMD__WDOG1_WDOG_RST_B_DEB                   0x0224 0x056C 0x0000 0x4 0x0
+#define MX6SX_PAD_SD1_CMD__GPIO6_IO_1                             0x0224 0x056C 0x0000 0x5 0x0
+#define MX6SX_PAD_SD1_CMD__ENET2_1588_EVENT1_IN                   0x0224 0x056C 0x0000 0x6 0x0
+#define MX6SX_PAD_SD1_CMD__CCM_CLKO1                              0x0224 0x056C 0x0000 0x7 0x0
+#define MX6SX_PAD_SD1_CMD__VADC_EXT_SYSCLK                        0x0224 0x056C 0x0000 0x8 0x0
+#define MX6SX_PAD_SD1_CMD__MMDC_DEBUG_46                          0x0224 0x056C 0x0000 0x9 0x0
+#define MX6SX_PAD_SD1_DATA0__USDHC1_DATA0                         0x0228 0x0570 0x0000 0x0 0x0
+#define MX6SX_PAD_SD1_DATA0__AUDMUX_AUD5_RXD                      0x0228 0x0570 0x065C 0x1 0x1
+#define MX6SX_PAD_SD1_DATA0__CAAM_WRAPPER_RNG_OSC_OBS             0x0228 0x0570 0x0000 0x2 0x0
+#define MX6SX_PAD_SD1_DATA0__GPT_CAPTURE1                         0x0228 0x0570 0x0000 0x3 0x0
+#define MX6SX_PAD_SD1_DATA0__UART2_RX                             0x0228 0x0570 0x0838 0x4 0x2
+#define MX6SX_PAD_SD1_DATA0__UART2_TX                             0x0228 0x0570 0x0000 0x4 0x0
+#define MX6SX_PAD_SD1_DATA0__GPIO6_IO_2                           0x0228 0x0570 0x0000 0x5 0x0
+#define MX6SX_PAD_SD1_DATA0__ENET1_1588_EVENT1_IN                 0x0228 0x0570 0x0000 0x6 0x0
+#define MX6SX_PAD_SD1_DATA0__CCM_OUT2                             0x0228 0x0570 0x0000 0x7 0x0
+#define MX6SX_PAD_SD1_DATA0__VADC_CLAMP_UP                        0x0228 0x0570 0x0000 0x8 0x0
+#define MX6SX_PAD_SD1_DATA0__MMDC_DEBUG_48                        0x0228 0x0570 0x0000 0x9 0x0
+#define MX6SX_PAD_SD1_DATA1__USDHC1_DATA1                         0x022C 0x0574 0x0000 0x0 0x0
+#define MX6SX_PAD_SD1_DATA1__AUDMUX_AUD5_TXC                      0x022C 0x0574 0x066C 0x1 0x1
+#define MX6SX_PAD_SD1_DATA1__PWM4_OUT                             0x022C 0x0574 0x0000 0x2 0x0
+#define MX6SX_PAD_SD1_DATA1__GPT_CAPTURE2                         0x022C 0x0574 0x0000 0x3 0x0
+#define MX6SX_PAD_SD1_DATA1__UART2_RX                             0x022C 0x0574 0x0838 0x4 0x3
+#define MX6SX_PAD_SD1_DATA1__UART2_TX                             0x022C 0x0574 0x0000 0x4 0x0
+#define MX6SX_PAD_SD1_DATA1__GPIO6_IO_3                           0x022C 0x0574 0x0000 0x5 0x0
+#define MX6SX_PAD_SD1_DATA1__ENET1_1588_EVENT1_OUT                0x022C 0x0574 0x0000 0x6 0x0
+#define MX6SX_PAD_SD1_DATA1__CCM_CLKO2                            0x022C 0x0574 0x0000 0x7 0x0
+#define MX6SX_PAD_SD1_DATA1__VADC_CLAMP_DOWN                      0x022C 0x0574 0x0000 0x8 0x0
+#define MX6SX_PAD_SD1_DATA1__MMDC_DEBUG_47                        0x022C 0x0574 0x0000 0x9 0x0
+#define MX6SX_PAD_SD1_DATA2__USDHC1_DATA2                         0x0230 0x0578 0x0000 0x0 0x0
+#define MX6SX_PAD_SD1_DATA2__AUDMUX_AUD5_TXFS                     0x0230 0x0578 0x0670 0x1 0x1
+#define MX6SX_PAD_SD1_DATA2__PWM3_OUT                             0x0230 0x0578 0x0000 0x2 0x0
+#define MX6SX_PAD_SD1_DATA2__GPT_COMPARE2                         0x0230 0x0578 0x0000 0x3 0x0
+#define MX6SX_PAD_SD1_DATA2__UART2_CTS_B                          0x0230 0x0578 0x0834 0x4 0x2
+#define MX6SX_PAD_SD1_DATA2__GPIO6_IO_4                           0x0230 0x0578 0x0000 0x5 0x0
+#define MX6SX_PAD_SD1_DATA2__ECSPI4_RDY                           0x0230 0x0578 0x0000 0x6 0x0
+#define MX6SX_PAD_SD1_DATA2__CCM_OUT0                             0x0230 0x0578 0x0000 0x7 0x0
+#define MX6SX_PAD_SD1_DATA2__VADC_EXT_PD_N                        0x0230 0x0578 0x0000 0x8 0x0
+#define MX6SX_PAD_SD1_DATA3__USDHC1_DATA3                         0x0234 0x057C 0x0000 0x0 0x0
+#define MX6SX_PAD_SD1_DATA3__AUDMUX_AUD5_TXD                      0x0234 0x057C 0x0660 0x1 0x1
+#define MX6SX_PAD_SD1_DATA3__AUDMUX_AUD5_RXD                      0x0234 0x057C 0x065C 0x2 0x2
+#define MX6SX_PAD_SD1_DATA3__GPT_COMPARE3                         0x0234 0x057C 0x0000 0x3 0x0
+#define MX6SX_PAD_SD1_DATA3__UART2_RTS_B                          0x0234 0x057C 0x0834 0x4 0x3
+#define MX6SX_PAD_SD1_DATA3__GPIO6_IO_5                           0x0234 0x057C 0x0000 0x5 0x0
+#define MX6SX_PAD_SD1_DATA3__ECSPI4_SS1                           0x0234 0x057C 0x0000 0x6 0x0
+#define MX6SX_PAD_SD1_DATA3__CCM_PMIC_RDY                         0x0234 0x057C 0x069C 0x7 0x2
+#define MX6SX_PAD_SD1_DATA3__VADC_RST_N                           0x0234 0x057C 0x0000 0x8 0x0
+#define MX6SX_PAD_SD2_CLK__USDHC2_CLK                             0x0238 0x0580 0x0000 0x0 0x0
+#define MX6SX_PAD_SD2_CLK__AUDMUX_AUD6_RXFS                       0x0238 0x0580 0x0680 0x1 0x2
+#define MX6SX_PAD_SD2_CLK__KPP_COL_5                              0x0238 0x0580 0x07C8 0x2 0x1
+#define MX6SX_PAD_SD2_CLK__ECSPI4_SCLK                            0x0238 0x0580 0x0740 0x3 0x1
+#define MX6SX_PAD_SD2_CLK__MLB_SIG                                0x0238 0x0580 0x07F0 0x4 0x2
+#define MX6SX_PAD_SD2_CLK__GPIO6_IO_6                             0x0238 0x0580 0x0000 0x5 0x0
+#define MX6SX_PAD_SD2_CLK__MQS_RIGHT                              0x0238 0x0580 0x0000 0x6 0x0
+#define MX6SX_PAD_SD2_CLK__WDOG1_WDOG_ANY                         0x0238 0x0580 0x0000 0x7 0x0
+#define MX6SX_PAD_SD2_CLK__VADC_CLAMP_CURRENT_5                   0x0238 0x0580 0x0000 0x8 0x0
+#define MX6SX_PAD_SD2_CLK__MMDC_DEBUG_29                          0x0238 0x0580 0x0000 0x9 0x0
+#define MX6SX_PAD_SD2_CMD__USDHC2_CMD                             0x023C 0x0584 0x0000 0x0 0x0
+#define MX6SX_PAD_SD2_CMD__AUDMUX_AUD6_RXC                        0x023C 0x0584 0x067C 0x1 0x2
+#define MX6SX_PAD_SD2_CMD__KPP_ROW_5                              0x023C 0x0584 0x07D4 0x2 0x1
+#define MX6SX_PAD_SD2_CMD__ECSPI4_MOSI                            0x023C 0x0584 0x0748 0x3 0x1
+#define MX6SX_PAD_SD2_CMD__MLB_CLK                                0x023C 0x0584 0x07E8 0x4 0x2
+#define MX6SX_PAD_SD2_CMD__GPIO6_IO_7                             0x023C 0x0584 0x0000 0x5 0x0
+#define MX6SX_PAD_SD2_CMD__MQS_LEFT                               0x023C 0x0584 0x0000 0x6 0x0
+#define MX6SX_PAD_SD2_CMD__WDOG3_WDOG_B                           0x023C 0x0584 0x0000 0x7 0x0
+#define MX6SX_PAD_SD2_CMD__VADC_CLAMP_CURRENT_4                   0x023C 0x0584 0x0000 0x8 0x0
+#define MX6SX_PAD_SD2_CMD__MMDC_DEBUG_30                          0x023C 0x0584 0x0000 0x9 0x0
+#define MX6SX_PAD_SD2_DATA0__USDHC2_DATA0                         0x0240 0x0588 0x0000 0x0 0x0
+#define MX6SX_PAD_SD2_DATA0__AUDMUX_AUD6_RXD                      0x0240 0x0588 0x0674 0x1 0x2
+#define MX6SX_PAD_SD2_DATA0__KPP_ROW_7                            0x0240 0x0588 0x07DC 0x2 0x1
+#define MX6SX_PAD_SD2_DATA0__PWM1_OUT                             0x0240 0x0588 0x0000 0x3 0x0
+#define MX6SX_PAD_SD2_DATA0__I2C4_SDA                             0x0240 0x0588 0x07C4 0x4 0x3
+#define MX6SX_PAD_SD2_DATA0__GPIO6_IO_8                           0x0240 0x0588 0x0000 0x5 0x0
+#define MX6SX_PAD_SD2_DATA0__ECSPI4_SS3                           0x0240 0x0588 0x0000 0x6 0x0
+#define MX6SX_PAD_SD2_DATA0__UART4_RX                             0x0240 0x0588 0x0848 0x7 0x4
+#define MX6SX_PAD_SD2_DATA0__UART4_TX                             0x0240 0x0588 0x0000 0x7 0x0
+#define MX6SX_PAD_SD2_DATA0__VADC_CLAMP_CURRENT_0                 0x0240 0x0588 0x0000 0x8 0x0
+#define MX6SX_PAD_SD2_DATA0__MMDC_DEBUG_50                        0x0240 0x0588 0x0000 0x9 0x0
+#define MX6SX_PAD_SD2_DATA1__USDHC2_DATA1                         0x0244 0x058C 0x0000 0x0 0x0
+#define MX6SX_PAD_SD2_DATA1__AUDMUX_AUD6_TXC                      0x0244 0x058C 0x0684 0x1 0x2
+#define MX6SX_PAD_SD2_DATA1__KPP_COL_7                            0x0244 0x058C 0x07D0 0x2 0x1
+#define MX6SX_PAD_SD2_DATA1__PWM2_OUT                             0x0244 0x058C 0x0000 0x3 0x0
+#define MX6SX_PAD_SD2_DATA1__I2C4_SCL                             0x0244 0x058C 0x07C0 0x4 0x3
+#define MX6SX_PAD_SD2_DATA1__GPIO6_IO_9                           0x0244 0x058C 0x0000 0x5 0x0
+#define MX6SX_PAD_SD2_DATA1__ECSPI4_SS2                           0x0244 0x058C 0x0000 0x6 0x0
+#define MX6SX_PAD_SD2_DATA1__UART4_RX                             0x0244 0x058C 0x0848 0x7 0x5
+#define MX6SX_PAD_SD2_DATA1__UART4_TX                             0x0244 0x058C 0x0000 0x7 0x0
+#define MX6SX_PAD_SD2_DATA1__VADC_CLAMP_CURRENT_1                 0x0244 0x058C 0x0000 0x8 0x0
+#define MX6SX_PAD_SD2_DATA1__MMDC_DEBUG_49                        0x0244 0x058C 0x0000 0x9 0x0
+#define MX6SX_PAD_SD2_DATA2__USDHC2_DATA2                         0x0248 0x0590 0x0000 0x0 0x0
+#define MX6SX_PAD_SD2_DATA2__AUDMUX_AUD6_TXFS                     0x0248 0x0590 0x0688 0x1 0x2
+#define MX6SX_PAD_SD2_DATA2__KPP_ROW_6                            0x0248 0x0590 0x07D8 0x2 0x1
+#define MX6SX_PAD_SD2_DATA2__ECSPI4_SS0                           0x0248 0x0590 0x074C 0x3 0x1
+#define MX6SX_PAD_SD2_DATA2__SDMA_EXT_EVENT_0                     0x0248 0x0590 0x081C 0x4 0x2
+#define MX6SX_PAD_SD2_DATA2__GPIO6_IO_10                          0x0248 0x0590 0x0000 0x5 0x0
+#define MX6SX_PAD_SD2_DATA2__SPDIF_OUT                            0x0248 0x0590 0x0000 0x6 0x0
+#define MX6SX_PAD_SD2_DATA2__UART6_RX                             0x0248 0x0590 0x0858 0x7 0x4
+#define MX6SX_PAD_SD2_DATA2__UART6_TX                             0x0248 0x0590 0x0000 0x7 0x0
+#define MX6SX_PAD_SD2_DATA2__VADC_CLAMP_CURRENT_2                 0x0248 0x0590 0x0000 0x8 0x0
+#define MX6SX_PAD_SD2_DATA2__MMDC_DEBUG_32                        0x0248 0x0590 0x0000 0x9 0x0
+#define MX6SX_PAD_SD2_DATA3__USDHC2_DATA3                         0x024C 0x0594 0x0000 0x0 0x0
+#define MX6SX_PAD_SD2_DATA3__AUDMUX_AUD6_TXD                      0x024C 0x0594 0x0678 0x1 0x2
+#define MX6SX_PAD_SD2_DATA3__KPP_COL_6                            0x024C 0x0594 0x07CC 0x2 0x1
+#define MX6SX_PAD_SD2_DATA3__ECSPI4_MISO                          0x024C 0x0594 0x0744 0x3 0x1
+#define MX6SX_PAD_SD2_DATA3__MLB_DATA                             0x024C 0x0594 0x07EC 0x4 0x2
+#define MX6SX_PAD_SD2_DATA3__GPIO6_IO_11                          0x024C 0x0594 0x0000 0x5 0x0
+#define MX6SX_PAD_SD2_DATA3__SPDIF_IN                             0x024C 0x0594 0x0824 0x6 0x4
+#define MX6SX_PAD_SD2_DATA3__UART6_RX                             0x024C 0x0594 0x0858 0x7 0x5
+#define MX6SX_PAD_SD2_DATA3__UART6_TX                             0x024C 0x0594 0x0000 0x7 0x0
+#define MX6SX_PAD_SD2_DATA3__VADC_CLAMP_CURRENT_3                 0x024C 0x0594 0x0000 0x8 0x0
+#define MX6SX_PAD_SD2_DATA3__MMDC_DEBUG_31                        0x024C 0x0594 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_CLK__USDHC3_CLK                             0x0250 0x0598 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_CLK__UART4_CTS_B                            0x0250 0x0598 0x0844 0x1 0x0
+#define MX6SX_PAD_SD3_CLK__ECSPI4_SCLK                            0x0250 0x0598 0x0740 0x2 0x0
+#define MX6SX_PAD_SD3_CLK__AUDMUX_AUD6_RXFS                       0x0250 0x0598 0x0680 0x3 0x0
+#define MX6SX_PAD_SD3_CLK__LCDIF2_VSYNC                           0x0250 0x0598 0x0000 0x4 0x0
+#define MX6SX_PAD_SD3_CLK__GPIO7_IO_0                             0x0250 0x0598 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_CLK__LCDIF2_BUSY                            0x0250 0x0598 0x07E4 0x6 0x0
+#define MX6SX_PAD_SD3_CLK__TPSMP_HDATA_29                         0x0250 0x0598 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_CLK__SDMA_DEBUG_EVENT_CHANNEL_5             0x0250 0x0598 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_CMD__USDHC3_CMD                             0x0254 0x059C 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_CMD__UART4_RX                               0x0254 0x059C 0x0848 0x1 0x0
+#define MX6SX_PAD_SD3_CMD__UART4_TX                               0x0254 0x059C 0x0000 0x1 0x0
+#define MX6SX_PAD_SD3_CMD__ECSPI4_MOSI                            0x0254 0x059C 0x0748 0x2 0x0
+#define MX6SX_PAD_SD3_CMD__AUDMUX_AUD6_RXC                        0x0254 0x059C 0x067C 0x3 0x0
+#define MX6SX_PAD_SD3_CMD__LCDIF2_HSYNC                           0x0254 0x059C 0x07E4 0x4 0x1
+#define MX6SX_PAD_SD3_CMD__GPIO7_IO_1                             0x0254 0x059C 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_CMD__LCDIF2_RS                              0x0254 0x059C 0x0000 0x6 0x0
+#define MX6SX_PAD_SD3_CMD__TPSMP_HDATA_28                         0x0254 0x059C 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_CMD__SDMA_DEBUG_EVENT_CHANNEL_4             0x0254 0x059C 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_DATA0__USDHC3_DATA0                         0x0258 0x05A0 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_DATA0__I2C4_SCL                             0x0258 0x05A0 0x07C0 0x1 0x0
+#define MX6SX_PAD_SD3_DATA0__ECSPI2_SS1                           0x0258 0x05A0 0x0000 0x2 0x0
+#define MX6SX_PAD_SD3_DATA0__AUDMUX_AUD6_RXD                      0x0258 0x05A0 0x0674 0x3 0x0
+#define MX6SX_PAD_SD3_DATA0__LCDIF2_DATA_1                        0x0258 0x05A0 0x0000 0x4 0x0
+#define MX6SX_PAD_SD3_DATA0__GPIO7_IO_2                           0x0258 0x05A0 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_DATA0__DCIC1_OUT                            0x0258 0x05A0 0x0000 0x6 0x0
+#define MX6SX_PAD_SD3_DATA0__TPSMP_HDATA_30                       0x0258 0x05A0 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_DATA0__GPU_DEBUG_0                          0x0258 0x05A0 0x0000 0x8 0x0
+#define MX6SX_PAD_SD3_DATA0__SDMA_DEBUG_EVT_CHN_LINES_0           0x0258 0x05A0 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_DATA1__USDHC3_DATA1                         0x025C 0x05A4 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_DATA1__I2C4_SDA                             0x025C 0x05A4 0x07C4 0x1 0x0
+#define MX6SX_PAD_SD3_DATA1__ECSPI2_SS2                           0x025C 0x05A4 0x0000 0x2 0x0
+#define MX6SX_PAD_SD3_DATA1__AUDMUX_AUD6_TXC                      0x025C 0x05A4 0x0684 0x3 0x0
+#define MX6SX_PAD_SD3_DATA1__LCDIF2_DATA_0                        0x025C 0x05A4 0x0000 0x4 0x0
+#define MX6SX_PAD_SD3_DATA1__GPIO7_IO_3                           0x025C 0x05A4 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_DATA1__DCIC2_OUT                            0x025C 0x05A4 0x0000 0x6 0x0
+#define MX6SX_PAD_SD3_DATA1__TPSMP_HDATA_31                       0x025C 0x05A4 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_DATA1__GPU_DEBUG_1                          0x025C 0x05A4 0x0000 0x8 0x0
+#define MX6SX_PAD_SD3_DATA1__SDMA_DEBUG_EVT_CHN_LINES_1           0x025C 0x05A4 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_DATA2__USDHC3_DATA2                         0x0260 0x05A8 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_DATA2__UART4_RTS_B                          0x0260 0x05A8 0x0844 0x1 0x1
+#define MX6SX_PAD_SD3_DATA2__ECSPI4_SS0                           0x0260 0x05A8 0x074C 0x2 0x0
+#define MX6SX_PAD_SD3_DATA2__AUDMUX_AUD6_TXFS                     0x0260 0x05A8 0x0688 0x3 0x0
+#define MX6SX_PAD_SD3_DATA2__LCDIF2_CLK                           0x0260 0x05A8 0x0000 0x4 0x0
+#define MX6SX_PAD_SD3_DATA2__GPIO7_IO_4                           0x0260 0x05A8 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_DATA2__LCDIF2_WR_RWN                        0x0260 0x05A8 0x0000 0x6 0x0
+#define MX6SX_PAD_SD3_DATA2__TPSMP_HDATA_26                       0x0260 0x05A8 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_DATA2__GPU_DEBUG_2                          0x0260 0x05A8 0x0000 0x8 0x0
+#define MX6SX_PAD_SD3_DATA2__SDMA_DEBUG_EVENT_CHANNEL_2           0x0260 0x05A8 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_DATA3__USDHC3_DATA3                         0x0264 0x05AC 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_DATA3__UART4_RX                             0x0264 0x05AC 0x0848 0x1 0x1
+#define MX6SX_PAD_SD3_DATA3__UART4_TX                             0x0264 0x05AC 0x0000 0x1 0x0
+#define MX6SX_PAD_SD3_DATA3__ECSPI4_MISO                          0x0264 0x05AC 0x0744 0x2 0x0
+#define MX6SX_PAD_SD3_DATA3__AUDMUX_AUD6_TXD                      0x0264 0x05AC 0x0678 0x3 0x0
+#define MX6SX_PAD_SD3_DATA3__LCDIF2_ENABLE                        0x0264 0x05AC 0x0000 0x4 0x0
+#define MX6SX_PAD_SD3_DATA3__GPIO7_IO_5                           0x0264 0x05AC 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_DATA3__LCDIF2_RD_E                          0x0264 0x05AC 0x0000 0x6 0x0
+#define MX6SX_PAD_SD3_DATA3__TPSMP_HDATA_27                       0x0264 0x05AC 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_DATA3__GPU_DEBUG_3                          0x0264 0x05AC 0x0000 0x8 0x0
+#define MX6SX_PAD_SD3_DATA3__SDMA_DEBUG_EVENT_CHANNEL_3           0x0264 0x05AC 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_DATA4__USDHC3_DATA4                         0x0268 0x05B0 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_DATA4__CAN2_RX                              0x0268 0x05B0 0x0690 0x1 0x0
+#define MX6SX_PAD_SD3_DATA4__CANFD_RX2                            0x0268 0x05B0 0x0698 0x2 0x0
+#define MX6SX_PAD_SD3_DATA4__UART3_RX                             0x0268 0x05B0 0x0840 0x3 0x2
+#define MX6SX_PAD_SD3_DATA4__UART3_TX                             0x0268 0x05B0 0x0000 0x3 0x0
+#define MX6SX_PAD_SD3_DATA4__LCDIF2_DATA_3                        0x0268 0x05B0 0x0000 0x4 0x0
+#define MX6SX_PAD_SD3_DATA4__GPIO7_IO_6                           0x0268 0x05B0 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_DATA4__ENET2_1588_EVENT0_IN                 0x0268 0x05B0 0x0000 0x6 0x0
+#define MX6SX_PAD_SD3_DATA4__TPSMP_HTRANS_1                       0x0268 0x05B0 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_DATA4__GPU_DEBUG_4                          0x0268 0x05B0 0x0000 0x8 0x0
+#define MX6SX_PAD_SD3_DATA4__SDMA_DEBUG_BUS_DEVICE_0              0x0268 0x05B0 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_DATA5__USDHC3_DATA5                         0x026C 0x05B4 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_DATA5__CAN1_TX                              0x026C 0x05B4 0x0000 0x1 0x0
+#define MX6SX_PAD_SD3_DATA5__CANFD_TX1                            0x026C 0x05B4 0x0000 0x2 0x0
+#define MX6SX_PAD_SD3_DATA5__UART3_RX                             0x026C 0x05B4 0x0840 0x3 0x3
+#define MX6SX_PAD_SD3_DATA5__UART3_TX                             0x026C 0x05B4 0x0000 0x3 0x0
+#define MX6SX_PAD_SD3_DATA5__LCDIF2_DATA_2                        0x026C 0x05B4 0x0000 0x4 0x0
+#define MX6SX_PAD_SD3_DATA5__GPIO7_IO_7                           0x026C 0x05B4 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_DATA5__ENET2_1588_EVENT0_OUT                0x026C 0x05B4 0x0000 0x6 0x0
+#define MX6SX_PAD_SD3_DATA5__SIM_M_HWRITE                         0x026C 0x05B4 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_DATA5__GPU_DEBUG_5                          0x026C 0x05B4 0x0000 0x8 0x0
+#define MX6SX_PAD_SD3_DATA5__SDMA_DEBUG_BUS_DEVICE_1              0x026C 0x05B4 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_DATA6__USDHC3_DATA6                         0x0270 0x05B8 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_DATA6__CAN2_TX                              0x0270 0x05B8 0x0000 0x1 0x0
+#define MX6SX_PAD_SD3_DATA6__CANFD_TX2                            0x0270 0x05B8 0x0000 0x2 0x0
+#define MX6SX_PAD_SD3_DATA6__UART3_RTS_B                          0x0270 0x05B8 0x083C 0x3 0x2
+#define MX6SX_PAD_SD3_DATA6__LCDIF2_DATA_4                        0x0270 0x05B8 0x0000 0x4 0x0
+#define MX6SX_PAD_SD3_DATA6__GPIO7_IO_8                           0x0270 0x05B8 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_DATA6__ENET1_1588_EVENT0_OUT                0x0270 0x05B8 0x0000 0x6 0x0
+#define MX6SX_PAD_SD3_DATA6__TPSMP_HTRANS_0                       0x0270 0x05B8 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_DATA6__GPU_DEBUG_7                          0x0270 0x05B8 0x0000 0x8 0x0
+#define MX6SX_PAD_SD3_DATA6__SDMA_DEBUG_EVT_CHN_LINES_7           0x0270 0x05B8 0x0000 0x9 0x0
+#define MX6SX_PAD_SD3_DATA7__USDHC3_DATA7                         0x0274 0x05BC 0x0000 0x0 0x0
+#define MX6SX_PAD_SD3_DATA7__CAN1_RX                              0x0274 0x05BC 0x068C 0x1 0x0
+#define MX6SX_PAD_SD3_DATA7__CANFD_RX1                            0x0274 0x05BC 0x0694 0x2 0x0
+#define MX6SX_PAD_SD3_DATA7__UART3_CTS_B                          0x0274 0x05BC 0x083C 0x3 0x3
+#define MX6SX_PAD_SD3_DATA7__LCDIF2_DATA_5                        0x0274 0x05BC 0x0000 0x4 0x0
+#define MX6SX_PAD_SD3_DATA7__GPIO7_IO_9                           0x0274 0x05BC 0x0000 0x5 0x0
+#define MX6SX_PAD_SD3_DATA7__ENET1_1588_EVENT0_IN                 0x0274 0x05BC 0x0000 0x6 0x0
+#define MX6SX_PAD_SD3_DATA7__TPSMP_HDATA_DIR                      0x0274 0x05BC 0x0000 0x7 0x0
+#define MX6SX_PAD_SD3_DATA7__GPU_DEBUG_6                          0x0274 0x05BC 0x0000 0x8 0x0
+#define MX6SX_PAD_SD3_DATA7__SDMA_DEBUG_EVT_CHN_LINES_2           0x0274 0x05BC 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_CLK__USDHC4_CLK                             0x0278 0x05C0 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_CLK__RAWNAND_DATA15                         0x0278 0x05C0 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_CLK__ECSPI2_MISO                            0x0278 0x05C0 0x0724 0x2 0x1
+#define MX6SX_PAD_SD4_CLK__AUDMUX_AUD3_RXFS                       0x0278 0x05C0 0x0638 0x3 0x0
+#define MX6SX_PAD_SD4_CLK__LCDIF2_DATA_13                         0x0278 0x05C0 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_CLK__GPIO6_IO_12                            0x0278 0x05C0 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_CLK__ECSPI3_SS2                             0x0278 0x05C0 0x0000 0x6 0x0
+#define MX6SX_PAD_SD4_CLK__TPSMP_HDATA_20                         0x0278 0x05C0 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_CLK__VDEC_DEBUG_12                          0x0278 0x05C0 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_CLK__SDMA_DEBUG_EVENT_CHANNEL_SEL           0x0278 0x05C0 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_CMD__USDHC4_CMD                             0x027C 0x05C4 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_CMD__RAWNAND_DATA14                         0x027C 0x05C4 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_CMD__ECSPI2_MOSI                            0x027C 0x05C4 0x0728 0x2 0x1
+#define MX6SX_PAD_SD4_CMD__AUDMUX_AUD3_RXC                        0x027C 0x05C4 0x0634 0x3 0x0
+#define MX6SX_PAD_SD4_CMD__LCDIF2_DATA_14                         0x027C 0x05C4 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_CMD__GPIO6_IO_13                            0x027C 0x05C4 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_CMD__ECSPI3_SS1                             0x027C 0x05C4 0x0000 0x6 0x0
+#define MX6SX_PAD_SD4_CMD__TPSMP_HDATA_19                         0x027C 0x05C4 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_CMD__VDEC_DEBUG_11                          0x027C 0x05C4 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_CMD__SDMA_DEBUG_CORE_RUN                    0x027C 0x05C4 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_DATA0__USDHC4_DATA0                         0x0280 0x05C8 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_DATA0__RAWNAND_DATA10                       0x0280 0x05C8 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_DATA0__ECSPI2_SS0                           0x0280 0x05C8 0x072C 0x2 0x1
+#define MX6SX_PAD_SD4_DATA0__AUDMUX_AUD3_RXD                      0x0280 0x05C8 0x062C 0x3 0x0
+#define MX6SX_PAD_SD4_DATA0__LCDIF2_DATA_12                       0x0280 0x05C8 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_DATA0__GPIO6_IO_14                          0x0280 0x05C8 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_DATA0__ECSPI3_SS3                           0x0280 0x05C8 0x0000 0x6 0x0
+#define MX6SX_PAD_SD4_DATA0__TPSMP_HDATA_21                       0x0280 0x05C8 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_DATA0__VDEC_DEBUG_13                        0x0280 0x05C8 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_DATA0__SDMA_DEBUG_MODE                      0x0280 0x05C8 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_DATA1__USDHC4_DATA1                         0x0284 0x05CC 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_DATA1__RAWNAND_DATA11                       0x0284 0x05CC 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_DATA1__ECSPI2_SCLK                          0x0284 0x05CC 0x0720 0x2 0x1
+#define MX6SX_PAD_SD4_DATA1__AUDMUX_AUD3_TXC                      0x0284 0x05CC 0x063C 0x3 0x0
+#define MX6SX_PAD_SD4_DATA1__LCDIF2_DATA_11                       0x0284 0x05CC 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_DATA1__GPIO6_IO_15                          0x0284 0x05CC 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_DATA1__ECSPI3_RDY                           0x0284 0x05CC 0x0000 0x6 0x0
+#define MX6SX_PAD_SD4_DATA1__TPSMP_HDATA_22                       0x0284 0x05CC 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_DATA1__VDEC_DEBUG_14                        0x0284 0x05CC 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_DATA1__SDMA_DEBUG_BUS_ERROR                 0x0284 0x05CC 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_DATA2__USDHC4_DATA2                         0x0288 0x05D0 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_DATA2__RAWNAND_DATA12                       0x0288 0x05D0 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_DATA2__I2C2_SDA                             0x0288 0x05D0 0x07B4 0x2 0x0
+#define MX6SX_PAD_SD4_DATA2__AUDMUX_AUD3_TXFS                     0x0288 0x05D0 0x0640 0x3 0x0
+#define MX6SX_PAD_SD4_DATA2__LCDIF2_DATA_10                       0x0288 0x05D0 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_DATA2__GPIO6_IO_16                          0x0288 0x05D0 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_DATA2__ECSPI2_SS3                           0x0288 0x05D0 0x0000 0x6 0x0
+#define MX6SX_PAD_SD4_DATA2__TPSMP_HDATA_23                       0x0288 0x05D0 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_DATA2__VDEC_DEBUG_15                        0x0288 0x05D0 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_DATA2__SDMA_DEBUG_BUS_RWB                   0x0288 0x05D0 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_DATA3__USDHC4_DATA3                         0x028C 0x05D4 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_DATA3__RAWNAND_DATA13                       0x028C 0x05D4 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_DATA3__I2C2_SCL                             0x028C 0x05D4 0x07B0 0x2 0x0
+#define MX6SX_PAD_SD4_DATA3__AUDMUX_AUD3_TXD                      0x028C 0x05D4 0x0630 0x3 0x0
+#define MX6SX_PAD_SD4_DATA3__LCDIF2_DATA_9                        0x028C 0x05D4 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_DATA3__GPIO6_IO_17                          0x028C 0x05D4 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_DATA3__ECSPI2_RDY                           0x028C 0x05D4 0x0000 0x6 0x0
+#define MX6SX_PAD_SD4_DATA3__TPSMP_HDATA_24                       0x028C 0x05D4 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_DATA3__VDEC_DEBUG_16                        0x028C 0x05D4 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_DATA3__SDMA_DEBUG_MATCHED_DMBUS             0x028C 0x05D4 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_DATA4__USDHC4_DATA4                         0x0290 0x05D8 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_DATA4__RAWNAND_DATA09                       0x0290 0x05D8 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_DATA4__UART5_RX                             0x0290 0x05D8 0x0850 0x2 0x0
+#define MX6SX_PAD_SD4_DATA4__UART5_TX                             0x0290 0x05D8 0x0000 0x2 0x0
+#define MX6SX_PAD_SD4_DATA4__ECSPI3_SCLK                          0x0290 0x05D8 0x0730 0x3 0x0
+#define MX6SX_PAD_SD4_DATA4__LCDIF2_DATA_8                        0x0290 0x05D8 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_DATA4__GPIO6_IO_18                          0x0290 0x05D8 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_DATA4__SPDIF_OUT                            0x0290 0x05D8 0x0000 0x6 0x0
+#define MX6SX_PAD_SD4_DATA4__TPSMP_HDATA_16                       0x0290 0x05D8 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_DATA4__USB_OTG_HOST_MODE                    0x0290 0x05D8 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_DATA4__SDMA_DEBUG_RTBUFFER_WRITE            0x0290 0x05D8 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_DATA5__USDHC4_DATA5                         0x0294 0x05DC 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_DATA5__RAWNAND_CE2_B                        0x0294 0x05DC 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_DATA5__UART5_RX                             0x0294 0x05DC 0x0850 0x2 0x1
+#define MX6SX_PAD_SD4_DATA5__UART5_TX                             0x0294 0x05DC 0x0000 0x2 0x0
+#define MX6SX_PAD_SD4_DATA5__ECSPI3_MOSI                          0x0294 0x05DC 0x0738 0x3 0x0
+#define MX6SX_PAD_SD4_DATA5__LCDIF2_DATA_7                        0x0294 0x05DC 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_DATA5__GPIO6_IO_19                          0x0294 0x05DC 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_DATA5__SPDIF_IN                             0x0294 0x05DC 0x0824 0x6 0x0
+#define MX6SX_PAD_SD4_DATA5__TPSMP_HDATA_17                       0x0294 0x05DC 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_DATA5__VDEC_DEBUG_9                         0x0294 0x05DC 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_DATA5__SDMA_DEBUG_EVENT_CHANNEL_0           0x0294 0x05DC 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_DATA6__USDHC4_DATA6                         0x0298 0x05E0 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_DATA6__RAWNAND_CE3_B                        0x0298 0x05E0 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_DATA6__UART5_RTS_B                          0x0298 0x05E0 0x084C 0x2 0x0
+#define MX6SX_PAD_SD4_DATA6__ECSPI3_MISO                          0x0298 0x05E0 0x0734 0x3 0x0
+#define MX6SX_PAD_SD4_DATA6__LCDIF2_DATA_6                        0x0298 0x05E0 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_DATA6__GPIO6_IO_20                          0x0298 0x05E0 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_DATA6__USDHC4_WP                            0x0298 0x05E0 0x0878 0x6 0x0
+#define MX6SX_PAD_SD4_DATA6__TPSMP_HDATA_18                       0x0298 0x05E0 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_DATA6__VDEC_DEBUG_10                        0x0298 0x05E0 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_DATA6__SDMA_DEBUG_EVENT_CHANNEL_1           0x0298 0x05E0 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_DATA7__USDHC4_DATA7                         0x029C 0x05E4 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_DATA7__RAWNAND_DATA08                       0x029C 0x05E4 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_DATA7__UART5_CTS_B                          0x029C 0x05E4 0x084C 0x2 0x1
+#define MX6SX_PAD_SD4_DATA7__ECSPI3_SS0                           0x029C 0x05E4 0x073C 0x3 0x0
+#define MX6SX_PAD_SD4_DATA7__LCDIF2_DATA_15                       0x029C 0x05E4 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_DATA7__GPIO6_IO_21                          0x029C 0x05E4 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_DATA7__USDHC4_CD_B                          0x029C 0x05E4 0x0874 0x6 0x0
+#define MX6SX_PAD_SD4_DATA7__TPSMP_HDATA_15                       0x029C 0x05E4 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_DATA7__USB_OTG_PWR_WAKE                     0x029C 0x05E4 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_DATA7__SDMA_DEBUG_YIELD                     0x029C 0x05E4 0x0000 0x9 0x0
+#define MX6SX_PAD_SD4_RESET_B__USDHC4_RESET_B                     0x02A0 0x05E8 0x0000 0x0 0x0
+#define MX6SX_PAD_SD4_RESET_B__RAWNAND_DQS                        0x02A0 0x05E8 0x0000 0x1 0x0
+#define MX6SX_PAD_SD4_RESET_B__USDHC4_RESET                       0x02A0 0x05E8 0x0000 0x2 0x0
+#define MX6SX_PAD_SD4_RESET_B__AUDMUX_MCLK                        0x02A0 0x05E8 0x0000 0x3 0x0
+#define MX6SX_PAD_SD4_RESET_B__LCDIF2_RESET                       0x02A0 0x05E8 0x0000 0x4 0x0
+#define MX6SX_PAD_SD4_RESET_B__GPIO6_IO_22                        0x02A0 0x05E8 0x0000 0x5 0x0
+#define MX6SX_PAD_SD4_RESET_B__LCDIF2_CS                          0x02A0 0x05E8 0x0000 0x6 0x0
+#define MX6SX_PAD_SD4_RESET_B__TPSMP_HDATA_25                     0x02A0 0x05E8 0x0000 0x7 0x0
+#define MX6SX_PAD_SD4_RESET_B__VDEC_DEBUG_17                      0x02A0 0x05E8 0x0000 0x8 0x0
+#define MX6SX_PAD_SD4_RESET_B__SDMA_DEBUG_BUS_DEVICE_2            0x02A0 0x05E8 0x0000 0x9 0x0
+#define MX6SX_PAD_USB_H_DATA__USB_H_DATA                          0x02A4 0x05EC 0x0000 0x0 0x0
+#define MX6SX_PAD_USB_H_DATA__PWM2_OUT                            0x02A4 0x05EC 0x0000 0x1 0x0
+#define MX6SX_PAD_USB_H_DATA__ANATOP_24M_OUT                      0x02A4 0x05EC 0x0000 0x2 0x0
+#define MX6SX_PAD_USB_H_DATA__I2C4_SDA                            0x02A4 0x05EC 0x07C4 0x3 0x1
+#define MX6SX_PAD_USB_H_DATA__WDOG3_WDOG_B                        0x02A4 0x05EC 0x0000 0x4 0x0
+#define MX6SX_PAD_USB_H_DATA__GPIO7_IO_10                         0x02A4 0x05EC 0x0000 0x5 0x0
+#define MX6SX_PAD_USB_H_STROBE__USB_H_STROBE                      0x02A8 0x05F0 0x0000 0x0 0x0
+#define MX6SX_PAD_USB_H_STROBE__PWM1_OUT                          0x02A8 0x05F0 0x0000 0x1 0x0
+#define MX6SX_PAD_USB_H_STROBE__ANATOP_32K_OUT                    0x02A8 0x05F0 0x0000 0x2 0x0
+#define MX6SX_PAD_USB_H_STROBE__I2C4_SCL                          0x02A8 0x05F0 0x07C0 0x3 0x1
+#define MX6SX_PAD_USB_H_STROBE__WDOG3_WDOG_RST_B_DEB              0x02A8 0x05F0 0x0000 0x4 0x0
+#define MX6SX_PAD_USB_H_STROBE__GPIO7_IO_11                       0x02A8 0x05F0 0x0000 0x5 0x0
+
+#endif /* __DTS_IMX6SX_PINFUNC_H */
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
new file mode 100644
index 000000000000..a3980d970590
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -0,0 +1,479 @@
+/*
+ * Copyright (C) 2014 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 version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include "imx6sx.dtsi"
+
+/ {
+        model = "Freescale i.MX6 SoloX SDB Board";
+        compatible = "fsl,imx6sx-sdb", "fsl,imx6sx";
+
+        chosen {
+                stdout-path = &uart1;
+        };
+
+        memory {
+                reg = <0x80000000 0x40000000>;
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                pinctrl-names = "default";
+                pinctrl-0 = <&pinctrl_gpio_keys>;
+
+                volume-up {
+                        label = "Volume Up";
+                        gpios = <&gpio1 18 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_VOLUMEUP>;
+                };
+
+                volume-down {
+                        label = "Volume Down";
+                        gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_VOLUMEDOWN>;
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                vcc_sd3: regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_vcc_sd3>;
+                        regulator-name = "VCC_SD3";
+                        regulator-min-microvolt = <3000000>;
+                        regulator-max-microvolt = <3000000>;
+                        gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+
+                reg_usb_otg1_vbus: regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usb_otg1>;
+                        regulator-name = "usb_otg1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+
+                reg_usb_otg2_vbus: regulator@2 {
+                        compatible = "regulator-fixed";
+                        reg = <2>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&pinctrl_usb_otg2>;
+                        regulator-name = "usb_otg2_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                };
+
+                reg_psu_5v: regulator@3 {
+                        compatible = "regulator-fixed";
+                        reg = <3>;
+                        regulator-name = "PSU-5V0";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                };
+        };
+
+        sound {
+                compatible = "fsl,imx6sx-sdb-wm8962", "fsl,imx-audio-wm8962";
+                model = "wm8962-audio";
+                ssi-controller = <&ssi2>;
+                audio-codec = <&codec>;
+                audio-routing =
+                        "Headphone Jack", "HPOUTL",
+                        "Headphone Jack", "HPOUTR",
+                        "Ext Spk", "SPKOUTL",
+                        "Ext Spk", "SPKOUTR",
+                        "AMIC", "MICBIAS",
+                        "IN3R", "AMIC";
+                mux-int-port = <2>;
+                mux-ext-port = <6>;
+        };
+};
+
+&audmux {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_audmux>;
+        status = "okay";
+};
+
+&fec1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet1>;
+        phy-mode = "rgmii";
+        status = "okay";
+};
+
+&i2c1 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1>;
+        status = "okay";
+
+        pmic: pfuze100@08 {
+                compatible = "fsl,pfuze100";
+                reg = <0x08>;
+
+                regulators {
+                        sw1a_reg: sw1ab {
+                                regulator-min-microvolt = <300000>;
+                                regulator-max-microvolt = <1875000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                                regulator-ramp-delay = <6250>;
+                        };
+
+                        sw1c_reg: sw1c {
+                                regulator-min-microvolt = <300000>;
+                                regulator-max-microvolt = <1875000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                                regulator-ramp-delay = <6250>;
+                        };
+
+                        sw2_reg: sw2 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        sw3a_reg: sw3a {
+                                regulator-min-microvolt = <400000>;
+                                regulator-max-microvolt = <1975000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        sw3b_reg: sw3b {
+                                regulator-min-microvolt = <400000>;
+                                regulator-max-microvolt = <1975000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        sw4_reg: sw4 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <3300000>;
+                        };
+
+                        swbst_reg: swbst {
+                                regulator-min-microvolt = <5000000>;
+                                regulator-max-microvolt = <5150000>;
+                        };
+
+                        snvs_reg: vsnvs {
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        vref_reg: vrefddr {
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        vgen1_reg: vgen1 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <1550000>;
+                                regulator-always-on;
+                        };
+
+                        vgen2_reg: vgen2 {
+                                regulator-min-microvolt = <800000>;
+                                regulator-max-microvolt = <1550000>;
+                        };
+
+                        vgen3_reg: vgen3 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vgen4_reg: vgen4 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vgen5_reg: vgen5 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vgen6_reg: vgen6 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+                };
+        };
+};
+
+&i2c4 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c4>;
+        status = "okay";
+
+        codec: wm8962@1a {
+                compatible = "wlf,wm8962";
+                reg = <0x1a>;
+                clocks = <&clks IMX6SX_CLK_AUDIO>;
+                DCVDD-supply = <&vgen4_reg>;
+                DBVDD-supply = <&vgen4_reg>;
+                AVDD-supply = <&vgen4_reg>;
+                CPVDD-supply = <&vgen4_reg>;
+                MICVDD-supply = <&vgen3_reg>;
+                PLLVDD-supply = <&vgen4_reg>;
+                SPKVDD1-supply = <&reg_psu_5v>;
+                SPKVDD2-supply = <&reg_psu_5v>;
+        };
+};
+
+&ssi2 {
+        status = "okay";
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart1>;
+        status = "okay";
+};
+
+&uart5 { /* for bluetooth */
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart5>;
+        fsl,uart-has-rtscts;
+        status = "okay";
+};
+
+&usbotg1 {
+        vbus-supply = <&reg_usb_otg1_vbus>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usb_otg1_id>;
+        status = "okay";
+};
+
+&usbotg2 {
+        vbus-supply = <&reg_usb_otg2_vbus>;
+        dr_mode = "host";
+        status = "okay";
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2>;
+        non-removable;
+        no-1-8-v;
+        keep-power-in-suspend;
+        enable-sdio-wakeup;
+        status = "okay";
+};
+
+&usdhc3 {
+        pinctrl-names = "default", "state_100mhz", "state_200mhz";
+        pinctrl-0 = <&pinctrl_usdhc3>;
+        pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
+        pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+        bus-width = <8>;
+        cd-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;
+        wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
+        keep-power-in-suspend;
+        enable-sdio-wakeup;
+        vmmc-supply = <&vcc_sd3>;
+        status = "okay";
+};
+
+&usdhc4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc4>;
+        cd-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>;
+        wp-gpios = <&gpio6 20 GPIO_ACTIVE_HIGH>;
+        status = "okay";
+};
+
+&iomuxc {
+        imx6x-sdb {
+                pinctrl_audmux: audmuxgrp {
+                        fsl,pins = <
+                                MX6SX_PAD_CSI_DATA00__AUDMUX_AUD6_TXC   0x130b0
+                                MX6SX_PAD_CSI_DATA01__AUDMUX_AUD6_TXFS  0x130b0
+                                MX6SX_PAD_CSI_HSYNC__AUDMUX_AUD6_TXD    0x120b0
+                                MX6SX_PAD_CSI_VSYNC__AUDMUX_AUD6_RXD    0x130b0
+                                MX6SX_PAD_CSI_PIXCLK__AUDMUX_MCLK       0x130b0
+                        >;
+                };
+
+                pinctrl_enet1: enet1grp {
+                        fsl,pins = <
+                                MX6SX_PAD_ENET1_MDIO__ENET1_MDIO        0xa0b1
+                                MX6SX_PAD_ENET1_MDC__ENET1_MDC          0xa0b1
+                                MX6SX_PAD_RGMII1_TXC__ENET1_RGMII_TXC   0xa0b1
+                                MX6SX_PAD_RGMII1_TD0__ENET1_TX_DATA_0   0xa0b1
+                                MX6SX_PAD_RGMII1_TD1__ENET1_TX_DATA_1   0xa0b1
+                                MX6SX_PAD_RGMII1_TD2__ENET1_TX_DATA_2   0xa0b1
+                                MX6SX_PAD_RGMII1_TD3__ENET1_TX_DATA_3   0xa0b1
+                                MX6SX_PAD_RGMII1_TX_CTL__ENET1_TX_EN    0xa0b1
+                                MX6SX_PAD_RGMII1_RXC__ENET1_RX_CLK      0x3081
+                                MX6SX_PAD_RGMII1_RD0__ENET1_RX_DATA_0   0x3081
+                                MX6SX_PAD_RGMII1_RD1__ENET1_RX_DATA_1   0x3081
+                                MX6SX_PAD_RGMII1_RD2__ENET1_RX_DATA_2   0x3081
+                                MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3   0x3081
+                                MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN    0x3081
+                        >;
+                };
+
+                pinctrl_gpio_keys: gpio_keysgrp {
+                        fsl,pins = <
+                                MX6SX_PAD_CSI_DATA04__GPIO1_IO_18 0x17059
+                                MX6SX_PAD_CSI_DATA05__GPIO1_IO_19 0x17059
+                        >;
+                };
+
+                pinctrl_i2c1: i2c1grp {
+                        fsl,pins = <
+                                MX6SX_PAD_GPIO1_IO01__I2C1_SDA          0x4001b8b1
+                                MX6SX_PAD_GPIO1_IO00__I2C1_SCL          0x4001b8b1
+                        >;
+                };
+
+                pinctrl_i2c4: i2c4grp {
+                        fsl,pins = <
+                                MX6SX_PAD_CSI_DATA07__I2C4_SDA          0x4001b8b1
+                                MX6SX_PAD_CSI_DATA06__I2C4_SCL          0x4001b8b1
+                        >;
+                };
+
+                pinctrl_vcc_sd3: vccsd3grp {
+                        fsl,pins = <
+                                MX6SX_PAD_KEY_COL1__GPIO2_IO_11         0x17059
+                        >;
+                };
+
+                pinctrl_uart1: uart1grp {
+                        fsl,pins = <
+                                MX6SX_PAD_GPIO1_IO04__UART1_TX          0x1b0b1
+                                MX6SX_PAD_GPIO1_IO05__UART1_RX          0x1b0b1
+                        >;
+                };
+
+                pinctrl_uart5: uart5grp {
+                        fsl,pins = <
+                                MX6SX_PAD_KEY_ROW3__UART5_RX            0x1b0b1
+                                MX6SX_PAD_KEY_COL3__UART5_TX            0x1b0b1
+                                MX6SX_PAD_KEY_ROW2__UART5_CTS_B         0x1b0b1
+                                MX6SX_PAD_KEY_COL2__UART5_RTS_B         0x1b0b1
+                        >;
+                };
+
+                pinctrl_usb_otg1: usbotg1grp {
+                        fsl,pins = <
+                                MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9        0x10b0
+                        >;
+                };
+
+                pinctrl_usb_otg1_id: usbotg1idgrp {
+                        fsl,pins = <
+                                MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID    0x17059
+                        >;
+                };
+
+                pinctrl_usb_otg2: usbot2ggrp {
+                        fsl,pins = <
+                                MX6SX_PAD_GPIO1_IO12__GPIO1_IO_12       0x10b0
+                        >;
+                };
+
+                pinctrl_usdhc2: usdhc2grp {
+                        fsl,pins = <
+                                MX6SX_PAD_SD2_CMD__USDHC2_CMD           0x17059
+                                MX6SX_PAD_SD2_CLK__USDHC2_CLK           0x10059
+                                MX6SX_PAD_SD2_DATA0__USDHC2_DATA0       0x17059
+                                MX6SX_PAD_SD2_DATA1__USDHC2_DATA1       0x17059
+                                MX6SX_PAD_SD2_DATA2__USDHC2_DATA2       0x17059
+                                MX6SX_PAD_SD2_DATA3__USDHC2_DATA3       0x17059
+                        >;
+                };
+
+                pinctrl_usdhc3: usdhc3grp {
+                        fsl,pins = <
+                                MX6SX_PAD_SD3_CMD__USDHC3_CMD           0x17059
+                                MX6SX_PAD_SD3_CLK__USDHC3_CLK           0x10059
+                                MX6SX_PAD_SD3_DATA0__USDHC3_DATA0       0x17059
+                                MX6SX_PAD_SD3_DATA1__USDHC3_DATA1       0x17059
+                                MX6SX_PAD_SD3_DATA2__USDHC3_DATA2       0x17059
+                                MX6SX_PAD_SD3_DATA3__USDHC3_DATA3       0x17059
+                                MX6SX_PAD_SD3_DATA4__USDHC3_DATA4       0x17059
+                                MX6SX_PAD_SD3_DATA5__USDHC3_DATA5       0x17059
+                                MX6SX_PAD_SD3_DATA6__USDHC3_DATA6       0x17059
+                                MX6SX_PAD_SD3_DATA7__USDHC3_DATA7       0x17059
+                                MX6SX_PAD_KEY_COL0__GPIO2_IO_10         0x17059 /* CD */
+                                MX6SX_PAD_KEY_ROW0__GPIO2_IO_15         0x17059 /* WP */
+                        >;
+                };
+
+                pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
+                        fsl,pins = <
+                                MX6SX_PAD_SD3_CMD__USDHC3_CMD           0x170b9
+                                MX6SX_PAD_SD3_CLK__USDHC3_CLK           0x100b9
+                                MX6SX_PAD_SD3_DATA0__USDHC3_DATA0       0x170b9
+                                MX6SX_PAD_SD3_DATA1__USDHC3_DATA1       0x170b9
+                                MX6SX_PAD_SD3_DATA2__USDHC3_DATA2       0x170b9
+                                MX6SX_PAD_SD3_DATA3__USDHC3_DATA3       0x170b9
+                                MX6SX_PAD_SD3_DATA4__USDHC3_DATA4       0x170b9
+                                MX6SX_PAD_SD3_DATA5__USDHC3_DATA5       0x170b9
+                                MX6SX_PAD_SD3_DATA6__USDHC3_DATA6       0x170b9
+                                MX6SX_PAD_SD3_DATA7__USDHC3_DATA7       0x170b9
+                        >;
+                };
+
+                pinctrl_usdhc3_200mhz: usdhc3grp-200mhz {
+                        fsl,pins = <
+                                MX6SX_PAD_SD3_CMD__USDHC3_CMD           0x170f9
+                                MX6SX_PAD_SD3_CLK__USDHC3_CLK           0x100f9
+                                MX6SX_PAD_SD3_DATA0__USDHC3_DATA0       0x170f9
+                                MX6SX_PAD_SD3_DATA1__USDHC3_DATA1       0x170f9
+                                MX6SX_PAD_SD3_DATA2__USDHC3_DATA2       0x170f9
+                                MX6SX_PAD_SD3_DATA3__USDHC3_DATA3       0x170f9
+                                MX6SX_PAD_SD3_DATA4__USDHC3_DATA4       0x170f9
+                                MX6SX_PAD_SD3_DATA5__USDHC3_DATA5       0x170f9
+                                MX6SX_PAD_SD3_DATA6__USDHC3_DATA6       0x170f9
+                                MX6SX_PAD_SD3_DATA7__USDHC3_DATA7       0x170f9
+                        >;
+                };
+
+                pinctrl_usdhc4: usdhc4grp {
+                        fsl,pins = <
+                                MX6SX_PAD_SD4_CMD__USDHC4_CMD           0x17059
+                                MX6SX_PAD_SD4_CLK__USDHC4_CLK           0x10059
+                                MX6SX_PAD_SD4_DATA0__USDHC4_DATA0       0x17059
+                                MX6SX_PAD_SD4_DATA1__USDHC4_DATA1       0x17059
+                                MX6SX_PAD_SD4_DATA2__USDHC4_DATA2       0x17059
+                                MX6SX_PAD_SD4_DATA3__USDHC4_DATA3       0x17059
+                                MX6SX_PAD_SD4_DATA7__GPIO6_IO_21        0x17059 /* CD */
+                                MX6SX_PAD_SD4_DATA6__GPIO6_IO_20        0x17059 /* WP */
+                        >;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
new file mode 100644
index 000000000000..f4b9da65bc0f
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -0,0 +1,1208 @@
+/*
+ * Copyright 2014 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 version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <dt-bindings/clock/imx6sx-clock.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include "imx6sx-pinfunc.h"
+#include "skeleton.dtsi"
+
+/ {
+        aliases {
+                can0 = &flexcan1;
+                can1 = &flexcan2;
+                ethernet0 = &fec1;
+                ethernet1 = &fec2;
+                gpio0 = &gpio1;
+                gpio1 = &gpio2;
+                gpio2 = &gpio3;
+                gpio3 = &gpio4;
+                gpio4 = &gpio5;
+                gpio5 = &gpio6;
+                gpio6 = &gpio7;
+                i2c0 = &i2c1;
+                i2c1 = &i2c2;
+                i2c2 = &i2c3;
+                i2c3 = &i2c4;
+                mmc0 = &usdhc1;
+                mmc1 = &usdhc2;
+                mmc2 = &usdhc3;
+                mmc3 = &usdhc4;
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+                serial3 = &uart4;
+                serial4 = &uart5;
+                serial5 = &uart6;
+                spi0 = &ecspi1;
+                spi1 = &ecspi2;
+                spi2 = &ecspi3;
+                spi3 = &ecspi4;
+                spi4 = &ecspi5;
+                usbphy0 = &usbphy1;
+                usbphy1 = &usbphy2;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu0: cpu@0 {
+                        compatible = "arm,cortex-a9";
+                        device_type = "cpu";
+                        reg = <0>;
+                        next-level-cache = <&L2>;
+                        operating-points = <
+                                /* kHz    uV */
+                                996000  1250000
+                                792000  1175000
+                                396000  1075000
+                        >;
+                        fsl,soc-operating-points = <
+                                /* ARM kHz  SOC uV */
+                                996000      1175000
+                                792000      1175000
+                                396000      1175000
+                        >;
+                        clock-latency = <61036>; /* two CLK32 periods */
+                        clocks = <&clks IMX6SX_CLK_ARM>,
+                                 <&clks IMX6SX_CLK_PLL2_PFD2>,
+                                 <&clks IMX6SX_CLK_STEP>,
+                                 <&clks IMX6SX_CLK_PLL1_SW>,
+                                 <&clks IMX6SX_CLK_PLL1_SYS>;
+                        clock-names = "arm", "pll2_pfd2_396m", "step",
+                                      "pll1_sw", "pll1_sys";
+                        arm-supply = <&reg_arm>;
+                        soc-supply = <&reg_soc>;
+                };
+        };
+
+        intc: interrupt-controller@00a01000 {
+                compatible = "arm,cortex-a9-gic";
+                #interrupt-cells = <3>;
+                interrupt-controller;
+                reg = <0x00a01000 0x1000>,
+                      <0x00a00100 0x100>;
+        };
+
+        clocks {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                ckil: clock@0 {
+                        compatible = "fixed-clock";
+                        reg = <0>;
+                        #clock-cells = <0>;
+                        clock-frequency = <32768>;
+                        clock-output-names = "ckil";
+                };
+
+                osc: clock@1 {
+                        compatible = "fixed-clock";
+                        reg = <1>;
+                        #clock-cells = <0>;
+                        clock-frequency = <24000000>;
+                        clock-output-names = "osc";
+                };
+
+                ipp_di0: clock@2 {
+                        compatible = "fixed-clock";
+                        reg = <2>;
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                        clock-output-names = "ipp_di0";
+                };
+
+                ipp_di1: clock@3 {
+                        compatible = "fixed-clock";
+                        reg = <3>;
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                        clock-output-names = "ipp_di1";
+                };
+        };
+
+        soc {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                interrupt-parent = <&intc>;
+                ranges;
+
+                pmu {
+                        compatible = "arm,cortex-a9-pmu";
+                        interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+                };
+
+                ocram: sram@00900000 {
+                        compatible = "mmio-sram";
+                        reg = <0x00900000 0x20000>;
+                        clocks = <&clks IMX6SX_CLK_OCRAM>;
+                };
+
+                L2: l2-cache@00a02000 {
+                        compatible = "arm,pl310-cache";
+                        reg = <0x00a02000 0x1000>;
+                        interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+                        cache-unified;
+                        cache-level = <2>;
+                        arm,tag-latency = <4 2 3>;
+                        arm,data-latency = <4 2 3>;
+                };
+
+                dma_apbh: dma-apbh@01804000 {
+                        compatible = "fsl,imx6sx-dma-apbh", "fsl,imx28-dma-apbh";
+                        reg = <0x01804000 0x2000>;
+                        interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                     <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3";
+                        #dma-cells = <1>;
+                        dma-channels = <4>;
+                        clocks = <&clks IMX6SX_CLK_APBH_DMA>;
+                };
+
+                gpmi: gpmi-nand@01806000{
+                        compatible = "fsl,imx6sx-gpmi-nand";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x01806000 0x2000>, <0x01808000 0x4000>;
+                        reg-names = "gpmi-nand", "bch";
+                        interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "bch";
+                        clocks = <&clks IMX6SX_CLK_GPMI_IO>,
+                                 <&clks IMX6SX_CLK_GPMI_APB>,
+                                 <&clks IMX6SX_CLK_GPMI_BCH>,
+                                 <&clks IMX6SX_CLK_GPMI_BCH_APB>,
+                                 <&clks IMX6SX_CLK_PER1_BCH>;
+                        clock-names = "gpmi_io", "gpmi_apb", "gpmi_bch",
+                                      "gpmi_bch_apb", "per1_bch";
+                        dmas = <&dma_apbh 0>;
+                        dma-names = "rx-tx";
+                        status = "disabled";
+                };
+
+                aips1: aips-bus@02000000 {
+                        compatible = "fsl,aips-bus", "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x02000000 0x100000>;
+                        ranges;
+
+                        spba-bus@02000000 {
+                                compatible = "fsl,spba-bus", "simple-bus";
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0x02000000 0x40000>;
+                                ranges;
+
+                                spdif: spdif@02004000 {
+                                        compatible = "fsl,imx6sx-spdif", "fsl,imx35-spdif";
+                                        reg = <0x02004000 0x4000>;
+                                        interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
+                                        dmas = <&sdma 14 18 0>,
+                                               <&sdma 15 18 0>;
+                                        dma-names = "rx", "tx";
+                                        clocks = <&clks IMX6SX_CLK_SPDIF>,
+                                                 <&clks IMX6SX_CLK_OSC>,
+                                                 <&clks IMX6SX_CLK_SPDIF>,
+                                                 <&clks 0>, <&clks 0>, <&clks 0>,
+                                                 <&clks IMX6SX_CLK_IPG>,
+                                                 <&clks 0>, <&clks 0>,
+                                                 <&clks IMX6SX_CLK_SPBA>;
+                                        clock-names = "core", "rxtx0",
+                                                      "rxtx1", "rxtx2",
+                                                      "rxtx3", "rxtx4",
+                                                      "rxtx5", "rxtx6",
+                                                      "rxtx7", "dma";
+                                        status = "disabled";
+                                };
+
+                                ecspi1: ecspi@02008000 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
+                                        reg = <0x02008000 0x4000>;
+                                        interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_ECSPI1>,
+                                                 <&clks IMX6SX_CLK_ECSPI1>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
+
+                                ecspi2: ecspi@0200c000 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
+                                        reg = <0x0200c000 0x4000>;
+                                        interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_ECSPI2>,
+                                                 <&clks IMX6SX_CLK_ECSPI2>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
+
+                                ecspi3: ecspi@02010000 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
+                                        reg = <0x02010000 0x4000>;
+                                        interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_ECSPI3>,
+                                                 <&clks IMX6SX_CLK_ECSPI3>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
+
+                                ecspi4: ecspi@02014000 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
+                                        reg = <0x02014000 0x4000>;
+                                        interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_ECSPI4>,
+                                                 <&clks IMX6SX_CLK_ECSPI4>;
+                                        clock-names = "ipg", "per";
+                                        status = "disabled";
+                                };
+
+                                uart1: serial@02020000 {
+                                        compatible = "fsl,imx6sx-uart", "fsl,imx21-uart";
+                                        reg = <0x02020000 0x4000>;
+                                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_UART_IPG>,
+                                                 <&clks IMX6SX_CLK_UART_SERIAL>;
+                                        clock-names = "ipg", "per";
+                                        dmas = <&sdma 25 4 0>, <&sdma 26 4 0>;
+                                        dma-names = "rx", "tx";
+                                        status = "disabled";
+                                };
+
+                                esai: esai@02024000 {
+                                        reg = <0x02024000 0x4000>;
+                                        interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_ESAI_IPG>,
+                                                 <&clks IMX6SX_CLK_ESAI_MEM>,
+                                                 <&clks IMX6SX_CLK_ESAI_EXTAL>,
+                                                 <&clks IMX6SX_CLK_ESAI_IPG>,
+                                                 <&clks IMX6SX_CLK_SPBA>;
+                                        clock-names = "core", "mem", "extal",
+                                                      "fsys", "dma";
+                                        status = "disabled";
+                                };
+
+                                ssi1: ssi@02028000 {
+                                        compatible = "fsl,imx6sx-ssi", "fsl,imx51-ssi";
+                                        reg = <0x02028000 0x4000>;
+                                        interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_SSI1_IPG>,
+                                                 <&clks IMX6SX_CLK_SSI1>;
+                                        clock-names = "ipg", "baud";
+                                        dmas = <&sdma 37 1 0>, <&sdma 38 1 0>;
+                                        dma-names = "rx", "tx";
+                                        fsl,fifo-depth = <15>;
+                                        status = "disabled";
+                                };
+
+                                ssi2: ssi@0202c000 {
+                                        compatible = "fsl,imx6sx-ssi", "fsl,imx51-ssi";
+                                        reg = <0x0202c000 0x4000>;
+                                        interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_SSI2_IPG>,
+                                                 <&clks IMX6SX_CLK_SSI2>;
+                                        clock-names = "ipg", "baud";
+                                        dmas = <&sdma 41 1 0>, <&sdma 42 1 0>;
+                                        dma-names = "rx", "tx";
+                                        fsl,fifo-depth = <15>;
+                                        status = "disabled";
+                                };
+
+                                ssi3: ssi@02030000 {
+                                        compatible = "fsl,imx6sx-ssi", "fsl,imx51-ssi";
+                                        reg = <0x02030000 0x4000>;
+                                        interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_SSI3_IPG>,
+                                                 <&clks IMX6SX_CLK_SSI3>;
+                                        clock-names = "ipg", "baud";
+                                        dmas = <&sdma 45 1 0>, <&sdma 46 1 0>;
+                                        dma-names = "rx", "tx";
+                                        fsl,fifo-depth = <15>;
+                                        status = "disabled";
+                                };
+
+                                asrc: asrc@02034000 {
+                                        reg = <0x02034000 0x4000>;
+                                        interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_ASRC_MEM>,
+                                                 <&clks IMX6SX_CLK_ASRC_IPG>,
+                                                 <&clks IMX6SX_CLK_SPDIF>,
+                                                 <&clks IMX6SX_CLK_SPBA>;
+                                        clock-names = "mem", "ipg", "asrck", "dma";
+                                        dmas = <&sdma 17 20 1>, <&sdma 18 20 1>,
+                                               <&sdma 19 20 1>, <&sdma 20 20 1>,
+                                               <&sdma 21 20 1>, <&sdma 22 20 1>;
+                                        dma-names = "rxa", "rxb", "rxc",
+                                                    "txa", "txb", "txc";
+                                        status = "okay";
+                                };
+                        };
+
+                        pwm1: pwm@02080000 {
+                                compatible = "fsl,imx6sx-pwm", "fsl,imx27-pwm";
+                                reg = <0x02080000 0x4000>;
+                                interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_PWM1>,
+                                         <&clks IMX6SX_CLK_PWM1>;
+                                clock-names = "ipg", "per";
+                                #pwm-cells = <2>;
+                        };
+
+                        pwm2: pwm@02084000 {
+                                compatible = "fsl,imx6sx-pwm", "fsl,imx27-pwm";
+                                reg = <0x02084000 0x4000>;
+                                interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_PWM2>,
+                                         <&clks IMX6SX_CLK_PWM2>;
+                                clock-names = "ipg", "per";
+                                #pwm-cells = <2>;
+                        };
+
+                        pwm3: pwm@02088000 {
+                                compatible = "fsl,imx6sx-pwm", "fsl,imx27-pwm";
+                                reg = <0x02088000 0x4000>;
+                                interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_PWM3>,
+                                         <&clks IMX6SX_CLK_PWM3>;
+                                clock-names = "ipg", "per";
+                                #pwm-cells = <2>;
+                        };
+
+                        pwm4: pwm@0208c000 {
+                                compatible = "fsl,imx6sx-pwm", "fsl,imx27-pwm";
+                                reg = <0x0208c000 0x4000>;
+                                interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_PWM4>,
+                                         <&clks IMX6SX_CLK_PWM4>;
+                                clock-names = "ipg", "per";
+                                #pwm-cells = <2>;
+                        };
+
+                        flexcan1: can@02090000 {
+                                compatible = "fsl,imx6sx-flexcan", "fsl,imx6q-flexcan";
+                                reg = <0x02090000 0x4000>;
+                                interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_CAN1_IPG>,
+                                         <&clks IMX6SX_CLK_CAN1_SERIAL>;
+                                clock-names = "ipg", "per";
+                                status = "disabled";
+                        };
+
+                        flexcan2: can@02094000 {
+                                compatible = "fsl,imx6sx-flexcan", "fsl,imx6q-flexcan";
+                                reg = <0x02094000 0x4000>;
+                                interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_CAN2_IPG>,
+                                         <&clks IMX6SX_CLK_CAN2_SERIAL>;
+                                clock-names = "ipg", "per";
+                                status = "disabled";
+                        };
+
+                        gpt: gpt@02098000 {
+                                compatible = "fsl,imx6sx-gpt", "fsl,imx31-gpt";
+                                reg = <0x02098000 0x4000>;
+                                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_GPT_BUS>,
+                                         <&clks IMX6SX_CLK_GPT_SERIAL>;
+                                clock-names = "ipg", "per";
+                        };
+
+                        gpio1: gpio@0209c000 {
+                                compatible = "fsl,imx6sx-gpio", "fsl,imx35-gpio";
+                                reg = <0x0209c000 0x4000>;
+                                interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                        };
+
+                        gpio2: gpio@020a0000 {
+                                compatible = "fsl,imx6sx-gpio", "fsl,imx35-gpio";
+                                reg = <0x020a0000 0x4000>;
+                                interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                        };
+
+                        gpio3: gpio@020a4000 {
+                                compatible = "fsl,imx6sx-gpio", "fsl,imx35-gpio";
+                                reg = <0x020a4000 0x4000>;
+                                interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                        };
+
+                        gpio4: gpio@020a8000 {
+                                compatible = "fsl,imx6sx-gpio", "fsl,imx35-gpio";
+                                reg = <0x020a8000 0x4000>;
+                                interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                        };
+
+                        gpio5: gpio@020ac000 {
+                                compatible = "fsl,imx6sx-gpio", "fsl,imx35-gpio";
+                                reg = <0x020ac000 0x4000>;
+                                interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                        };
+
+                        gpio6: gpio@020b0000 {
+                                compatible = "fsl,imx6sx-gpio", "fsl,imx35-gpio";
+                                reg = <0x020b0000 0x4000>;
+                                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                        };
+
+                        gpio7: gpio@020b4000 {
+                                compatible = "fsl,imx6sx-gpio", "fsl,imx35-gpio";
+                                reg = <0x020b4000 0x4000>;
+                                interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                                interrupt-controller;
+                                #interrupt-cells = <2>;
+                        };
+
+                        kpp: kpp@020b8000 {
+                                compatible = "fsl,imx6sx-kpp", "fsl,imx21-kpp";
+                                reg = <0x020b8000 0x4000>;
+                                interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_DUMMY>;
+                                status = "disabled";
+                        };
+
+                        wdog1: wdog@020bc000 {
+                                compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
+                                reg = <0x020bc000 0x4000>;
+                                interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_DUMMY>;
+                        };
+
+                        wdog2: wdog@020c0000 {
+                                compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
+                                reg = <0x020c0000 0x4000>;
+                                interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_DUMMY>;
+                                status = "disabled";
+                        };
+
+                        clks: ccm@020c4000 {
+                                compatible = "fsl,imx6sx-ccm";
+                                reg = <0x020c4000 0x4000>;
+                                interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
+                                #clock-cells = <1>;
+                                clocks = <&ckil>, <&osc>, <&ipp_di0>, <&ipp_di1>;
+                                clock-names = "ckil", "osc", "ipp_di0", "ipp_di1";
+                        };
+
+                        anatop: anatop@020c8000 {
+                                compatible = "fsl,imx6sx-anatop", "fsl,imx6q-anatop",
+                                             "syscon", "simple-bus";
+                                reg = <0x020c8000 0x1000>;
+                                interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+
+                                regulator-1p1@110 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vdd1p1";
+                                        regulator-min-microvolt = <800000>;
+                                        regulator-max-microvolt = <1375000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x110>;
+                                        anatop-vol-bit-shift = <8>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-min-bit-val = <4>;
+                                        anatop-min-voltage = <800000>;
+                                        anatop-max-voltage = <1375000>;
+                                };
+
+                                regulator-3p0@120 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vdd3p0";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <3150000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x120>;
+                                        anatop-vol-bit-shift = <8>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-min-bit-val = <0>;
+                                        anatop-min-voltage = <2625000>;
+                                        anatop-max-voltage = <3400000>;
+                                };
+
+                                regulator-2p5@130 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vdd2p5";
+                                        regulator-min-microvolt = <2100000>;
+                                        regulator-max-microvolt = <2875000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x130>;
+                                        anatop-vol-bit-shift = <8>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-min-bit-val = <0>;
+                                        anatop-min-voltage = <2100000>;
+                                        anatop-max-voltage = <2875000>;
+                                };
+
+                                reg_arm: regulator-vddcore@140 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vddarm";
+                                        regulator-min-microvolt = <725000>;
+                                        regulator-max-microvolt = <1450000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x140>;
+                                        anatop-vol-bit-shift = <0>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-delay-reg-offset = <0x170>;
+                                        anatop-delay-bit-shift = <24>;
+                                        anatop-delay-bit-width = <2>;
+                                        anatop-min-bit-val = <1>;
+                                        anatop-min-voltage = <725000>;
+                                        anatop-max-voltage = <1450000>;
+                                };
+
+                                reg_pcie: regulator-vddpcie@140 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vddpcie";
+                                        regulator-min-microvolt = <725000>;
+                                        regulator-max-microvolt = <1450000>;
+                                        anatop-reg-offset = <0x140>;
+                                        anatop-vol-bit-shift = <9>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-delay-reg-offset = <0x170>;
+                                        anatop-delay-bit-shift = <26>;
+                                        anatop-delay-bit-width = <2>;
+                                        anatop-min-bit-val = <1>;
+                                        anatop-min-voltage = <725000>;
+                                        anatop-max-voltage = <1450000>;
+                                };
+
+                                reg_soc: regulator-vddsoc@140 {
+                                        compatible = "fsl,anatop-regulator";
+                                        regulator-name = "vddsoc";
+                                        regulator-min-microvolt = <725000>;
+                                        regulator-max-microvolt = <1450000>;
+                                        regulator-always-on;
+                                        anatop-reg-offset = <0x140>;
+                                        anatop-vol-bit-shift = <18>;
+                                        anatop-vol-bit-width = <5>;
+                                        anatop-delay-reg-offset = <0x170>;
+                                        anatop-delay-bit-shift = <28>;
+                                        anatop-delay-bit-width = <2>;
+                                        anatop-min-bit-val = <1>;
+                                        anatop-min-voltage = <725000>;
+                                        anatop-max-voltage = <1450000>;
+                                };
+                        };
+
+                        tempmon: tempmon {
+                                compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
+                                interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
+                                fsl,tempmon = <&anatop>;
+                                fsl,tempmon-data = <&ocotp>;
+                                clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
+                        };
+
+                        usbphy1: usbphy@020c9000 {
+                                compatible = "fsl,imx6sx-usbphy", "fsl,imx23-usbphy";
+                                reg = <0x020c9000 0x1000>;
+                                interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_USBPHY1>;
+                                fsl,anatop = <&anatop>;
+                        };
+
+                        usbphy2: usbphy@020ca000 {
+                                compatible = "fsl,imx6sx-usbphy", "fsl,imx23-usbphy";
+                                reg = <0x020ca000 0x1000>;
+                                interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_USBPHY2>;
+                                fsl,anatop = <&anatop>;
+                        };
+
+                        snvs: snvs@020cc000 {
+                                compatible = "fsl,sec-v4.0-mon", "simple-bus";
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0x020cc000 0x4000>;
+
+                                snvs-rtc-lp@34 {
+                                        compatible = "fsl,sec-v4.0-mon-rtc-lp";
+                                        reg = <0x34 0x58>;
+                                        interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                                };
+                        };
+
+                        epit1: epit@020d0000 {
+                                reg = <0x020d0000 0x4000>;
+                                interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
+                        };
+
+                        epit2: epit@020d4000 {
+                                reg = <0x020d4000 0x4000>;
+                                interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+                        };
+
+                        src: src@020d8000 {
+                                compatible = "fsl,imx6sx-src", "fsl,imx51-src";
+                                reg = <0x020d8000 0x4000>;
+                                interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                                #reset-cells = <1>;
+                        };
+
+                        gpc: gpc@020dc000 {
+                                compatible = "fsl,imx6sx-gpc", "fsl,imx6q-gpc";
+                                reg = <0x020dc000 0x4000>;
+                                interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
+                        };
+
+                        iomuxc: iomuxc@020e0000 {
+                                compatible = "fsl,imx6sx-iomuxc";
+                                reg = <0x020e0000 0x4000>;
+                        };
+
+                        gpr: iomuxc-gpr@020e4000 {
+                                compatible = "fsl,imx6sx-iomuxc-gpr",
+                                             "fsl,imx6q-iomuxc-gpr", "syscon";
+                                reg = <0x020e4000 0x4000>;
+                        };
+
+                        sdma: sdma@020ec000 {
+                                compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";
+                                reg = <0x020ec000 0x4000>;
+                                interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_SDMA>,
+                                         <&clks IMX6SX_CLK_SDMA>;
+                                clock-names = "ipg", "ahb";
+                                #dma-cells = <3>;
+                                /* imx6sx reuses imx6q sdma firmware */
+                                fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
+                        };
+                };
+
+                aips2: aips-bus@02100000 {
+                        compatible = "fsl,aips-bus", "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x02100000 0x100000>;
+                        ranges;
+
+                        usbotg1: usb@02184000 {
+                                compatible = "fsl,imx6sx-usb", "fsl,imx27-usb";
+                                reg = <0x02184000 0x200>;
+                                interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_USBOH3>;
+                                fsl,usbphy = <&usbphy1>;
+                                fsl,usbmisc = <&usbmisc 0>;
+                                fsl,anatop = <&anatop>;
+                                status = "disabled";
+                        };
+
+                        usbotg2: usb@02184200 {
+                                compatible = "fsl,imx6sx-usb", "fsl,imx27-usb";
+                                reg = <0x02184200 0x200>;
+                                interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_USBOH3>;
+                                fsl,usbphy = <&usbphy2>;
+                                fsl,usbmisc = <&usbmisc 1>;
+                                status = "disabled";
+                        };
+
+                        usbh: usb@02184400 {
+                                compatible = "fsl,imx6sx-usb", "fsl,imx27-usb";
+                                reg = <0x02184400 0x200>;
+                                interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_USBOH3>;
+                                fsl,usbmisc = <&usbmisc 2>;
+                                phy_type = "hsic";
+                                fsl,anatop = <&anatop>;
+                                status = "disabled";
+                        };
+
+                        usbmisc: usbmisc@02184800 {
+                                #index-cells = <1>;
+                                compatible = "fsl,imx6sx-usbmisc", "fsl,imx6q-usbmisc";
+                                reg = <0x02184800 0x200>;
+                                clocks = <&clks IMX6SX_CLK_USBOH3>;
+                        };
+
+                        fec1: ethernet@02188000 {
+                                compatible = "fsl,imx6sx-fec", "fsl,imx6q-fec";
+                                reg = <0x02188000 0x4000>;
+                                interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_ENET>,
+                                         <&clks IMX6SX_CLK_ENET_AHB>,
+                                         <&clks IMX6SX_CLK_ENET_PTP>,
+                                         <&clks IMX6SX_CLK_ENET_REF>,
+                                         <&clks IMX6SX_CLK_ENET_PTP>;
+                                clock-names = "ipg", "ahb", "ptp",
+                                              "enet_clk_ref", "enet_out";
+                                status = "disabled";
+                        };
+
+                        mlb: mlb@0218c000 {
+                                reg = <0x0218c000 0x4000>;
+                                interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_MLB>;
+                                status = "disabled";
+                        };
+
+                        usdhc1: usdhc@02190000 {
+                                compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+                                reg = <0x02190000 0x4000>;
+                                interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_USDHC1>,
+                                         <&clks IMX6SX_CLK_USDHC1>,
+                                         <&clks IMX6SX_CLK_USDHC1>;
+                                clock-names = "ipg", "ahb", "per";
+                                bus-width = <4>;
+                                status = "disabled";
+                        };
+
+                        usdhc2: usdhc@02194000 {
+                                compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+                                reg = <0x02194000 0x4000>;
+                                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_USDHC2>,
+                                         <&clks IMX6SX_CLK_USDHC2>,
+                                         <&clks IMX6SX_CLK_USDHC2>;
+                                clock-names = "ipg", "ahb", "per";
+                                bus-width = <4>;
+                                status = "disabled";
+                        };
+
+                        usdhc3: usdhc@02198000 {
+                                compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+                                reg = <0x02198000 0x4000>;
+                                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_USDHC3>,
+                                         <&clks IMX6SX_CLK_USDHC3>,
+                                         <&clks IMX6SX_CLK_USDHC3>;
+                                clock-names = "ipg", "ahb", "per";
+                                bus-width = <4>;
+                                status = "disabled";
+                        };
+
+                        usdhc4: usdhc@0219c000 {
+                                compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
+                                reg = <0x0219c000 0x4000>;
+                                interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_USDHC4>,
+                                         <&clks IMX6SX_CLK_USDHC4>,
+                                         <&clks IMX6SX_CLK_USDHC4>;
+                                clock-names = "ipg", "ahb", "per";
+                                bus-width = <4>;
+                                status = "disabled";
+                        };
+
+                        i2c1: i2c@021a0000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx6sx-i2c", "fsl,imx21-i2c";
+                                reg = <0x021a0000 0x4000>;
+                                interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_I2C1>;
+                                status = "disabled";
+                        };
+
+                        i2c2: i2c@021a4000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx6sx-i2c", "fsl,imx21-i2c";
+                                reg = <0x021a4000 0x4000>;
+                                interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_I2C2>;
+                                status = "disabled";
+                        };
+
+                        i2c3: i2c@021a8000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx6sx-i2c", "fsl,imx21-i2c";
+                                reg = <0x021a8000 0x4000>;
+                                interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_I2C3>;
+                                status = "disabled";
+                        };
+
+                        mmdc: mmdc@021b0000 {
+                                compatible = "fsl,imx6sx-mmdc", "fsl,imx6q-mmdc";
+                                reg = <0x021b0000 0x4000>;
+                        };
+
+                        fec2: ethernet@021b4000 {
+                                compatible = "fsl,imx6sx-fec";
+                                reg = <0x021b4000 0x4000>;
+                                interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
+                                             <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_ENET>,
+                                         <&clks IMX6SX_CLK_ENET_AHB>,
+                                         <&clks IMX6SX_CLK_ENET_PTP>,
+                                         <&clks IMX6SX_CLK_ENET2_REF_125M>,
+                                         <&clks IMX6SX_CLK_ENET_PTP>;
+                                clock-names = "ipg", "ahb", "ptp",
+                                              "enet_clk_ref", "enet_out";
+                                status = "disabled";
+                        };
+
+                        weim: weim@021b8000 {
+                                compatible = "fsl,imx6sx-weim", "fsl,imx6q-weim";
+                                reg = <0x021b8000 0x4000>;
+                                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_EIM_SLOW>;
+                        };
+
+                        ocotp: ocotp@021bc000 {
+                                compatible = "fsl,imx6sx-ocotp", "syscon";
+                                reg = <0x021bc000 0x4000>;
+                                clocks = <&clks IMX6SX_CLK_OCOTP>;
+                        };
+
+                        sai1: sai@021d4000 {
+                                compatible = "fsl,imx6sx-sai";
+                                reg = <0x021d4000 0x4000>;
+                                interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_SAI1_IPG>,
+                                         <&clks IMX6SX_CLK_SAI1>,
+                                         <&clks 0>, <&clks 0>;
+                                clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                                dma-names = "rx", "tx";
+                                dmas = <&sdma 31 23 0>, <&sdma 32 23 0>;
+                                dma-source = <&gpr 0 15 0 16>;
+                                status = "disabled";
+                        };
+
+                        audmux: audmux@021d8000 {
+                                compatible = "fsl,imx6sx-audmux", "fsl,imx31-audmux";
+                                reg = <0x021d8000 0x4000>;
+                                status = "disabled";
+                        };
+
+                        sai2: sai@021dc000 {
+                                compatible = "fsl,imx6sx-sai";
+                                reg = <0x021dc000 0x4000>;
+                                interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_SAI2_IPG>,
+                                         <&clks IMX6SX_CLK_SAI2>,
+                                         <&clks 0>, <&clks 0>;
+                                clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                                dma-names = "rx", "tx";
+                                dmas = <&sdma 33 23 0>, <&sdma 34 23 0>;
+                                dma-source = <&gpr 0 17 0 18>;
+                                status = "disabled";
+                        };
+
+                        qspi1: qspi@021e0000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx6sx-qspi";
+                                reg = <0x021e0000 0x4000>, <0x60000000 0x10000000>;
+                                reg-names = "QuadSPI", "QuadSPI-memory";
+                                interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_QSPI1>,
+                                         <&clks IMX6SX_CLK_QSPI1>;
+                                clock-names = "qspi_en", "qspi";
+                                status = "disabled";
+                        };
+
+                        qspi2: qspi@021e4000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx6sx-qspi";
+                                reg = <0x021e4000 0x4000>, <0x70000000 0x10000000>;
+                                reg-names = "QuadSPI", "QuadSPI-memory";
+                                interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_QSPI2>,
+                                         <&clks IMX6SX_CLK_QSPI2>;
+                                clock-names = "qspi_en", "qspi";
+                                status = "disabled";
+                        };
+
+                        uart2: serial@021e8000 {
+                                compatible = "fsl,imx6sx-uart", "fsl,imx21-uart";
+                                reg = <0x021e8000 0x4000>;
+                                interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_UART_IPG>,
+                                         <&clks IMX6SX_CLK_UART_SERIAL>;
+                                clock-names = "ipg", "per";
+                                dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
+                                dma-names = "rx", "tx";
+                                status = "disabled";
+                        };
+
+                        uart3: serial@021ec000 {
+                                compatible = "fsl,imx6sx-uart", "fsl,imx21-uart";
+                                reg = <0x021ec000 0x4000>;
+                                interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_UART_IPG>,
+                                         <&clks IMX6SX_CLK_UART_SERIAL>;
+                                clock-names = "ipg", "per";
+                                dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
+                                dma-names = "rx", "tx";
+                                status = "disabled";
+                        };
+
+                        uart4: serial@021f0000 {
+                                compatible = "fsl,imx6sx-uart", "fsl,imx21-uart";
+                                reg = <0x021f0000 0x4000>;
+                                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_UART_IPG>,
+                                         <&clks IMX6SX_CLK_UART_SERIAL>;
+                                clock-names = "ipg", "per";
+                                dmas = <&sdma 31 4 0>, <&sdma 32 4 0>;
+                                dma-names = "rx", "tx";
+                                status = "disabled";
+                        };
+
+                        uart5: serial@021f4000 {
+                                compatible = "fsl,imx6sx-uart", "fsl,imx21-uart";
+                                reg = <0x021f4000 0x4000>;
+                                interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_UART_IPG>,
+                                         <&clks IMX6SX_CLK_UART_SERIAL>;
+                                clock-names = "ipg", "per";
+                                dmas = <&sdma 33 4 0>, <&sdma 34 4 0>;
+                                dma-names = "rx", "tx";
+                                status = "disabled";
+                        };
+
+                        i2c4: i2c@021f8000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx6sx-i2c", "fsl,imx21-i2c";
+                                reg = <0x021f8000 0x4000>;
+                                interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_I2C4>;
+                                status = "disabled";
+                        };
+                };
+
+                aips3: aips-bus@02200000 {
+                        compatible = "fsl,aips-bus", "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x02200000 0x100000>;
+                        ranges;
+
+                        spba-bus@02200000 {
+                                compatible = "fsl,spba-bus", "simple-bus";
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0x02240000 0x40000>;
+                                ranges;
+
+                                csi1: csi@02214000 {
+                                        reg = <0x02214000 0x4000>;
+                                        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_DISPLAY_AXI>,
+                                                 <&clks IMX6SX_CLK_CSI>,
+                                                 <&clks IMX6SX_CLK_DCIC1>;
+                                        clock-names = "disp-axi", "csi_mclk", "dcic";
+                                        status = "disabled";
+                                };
+
+                                pxp: pxp@02218000 {
+                                        reg = <0x02218000 0x4000>;
+                                        interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_PXP_AXI>,
+                                                 <&clks IMX6SX_CLK_DISPLAY_AXI>;
+                                        clock-names = "pxp-axi", "disp-axi";
+                                        status = "disabled";
+                                };
+
+                                csi2: csi@0221c000 {
+                                        reg = <0x0221c000 0x4000>;
+                                        interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_DISPLAY_AXI>,
+                                                 <&clks IMX6SX_CLK_CSI>,
+                                                 <&clks IMX6SX_CLK_DCIC2>;
+                                        clock-names = "disp-axi", "csi_mclk", "dcic";
+                                        status = "disabled";
+                                };
+
+                                lcdif1: lcdif@02220000 {
+                                        reg = <0x02220000 0x4000>;
+                                        interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>,
+                                                 <&clks IMX6SX_CLK_LCDIF_APB>,
+                                                 <&clks IMX6SX_CLK_DISPLAY_AXI>;
+                                        clock-names = "pix", "axi", "disp_axi";
+                                        status = "disabled";
+                                };
+
+                                lcdif2: lcdif@02224000 {
+                                        reg = <0x02224000 0x4000>;
+                                        interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+                                        clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>,
+                                                 <&clks IMX6SX_CLK_LCDIF_APB>,
+                                                 <&clks IMX6SX_CLK_DISPLAY_AXI>;
+                                        clock-names = "pix", "axi", "disp_axi";
+                                        status = "disabled";
+                                };
+
+                                vadc: vadc@02228000 {
+                                        reg = <0x02228000 0x4000>, <0x0222c000 0x4000>;
+                                        reg-names = "vadc-vafe", "vadc-vdec";
+                                        clocks = <&clks IMX6SX_CLK_VADC>,
+                                                 <&clks IMX6SX_CLK_CSI>;
+                                        clock-names = "vadc", "csi";
+                                        status = "disabled";
+                                };
+                        };
+
+                        adc1: adc@02280000 {
+                                compatible = "fsl,imx6sx-adc", "fsl,vf610-adc";
+                                reg = <0x02280000 0x4000>;
+                                interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_IPG>;
+                                clock-names = "adc";
+                                status = "disabled";
+                        };
+
+                        adc2: adc@02284000 {
+                                compatible = "fsl,imx6sx-adc", "fsl,vf610-adc";
+                                reg = <0x02284000 0x4000>;
+                                interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_IPG>;
+                                clock-names = "adc";
+                                status = "disabled";
+                        };
+
+                        wdog3: wdog@02288000 {
+                                compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
+                                reg = <0x02288000 0x4000>;
+                                interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_DUMMY>;
+                                status = "disabled";
+                        };
+
+                        ecspi5: ecspi@0228c000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
+                                reg = <0x0228c000 0x4000>;
+                                interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_ECSPI5>,
+                                         <&clks IMX6SX_CLK_ECSPI5>;
+                                clock-names = "ipg", "per";
+                                status = "disabled";
+                        };
+
+                        uart6: serial@022a0000 {
+                                compatible = "fsl,imx6sx-uart", "fsl,imx21-uart";
+                                reg = <0x022a0000 0x4000>;
+                                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_UART_IPG>,
+                                         <&clks IMX6SX_CLK_UART_SERIAL>;
+                                clock-names = "ipg", "per";
+                                dmas = <&sdma 0 4 0>, <&sdma 47 4 0>;
+                                dma-names = "rx", "tx";
+                                status = "disabled";
+                        };
+
+                        pwm5: pwm@022a4000 {
+                                compatible = "fsl,imx6sx-pwm", "fsl,imx27-pwm";
+                                reg = <0x022a4000 0x4000>;
+                                interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_PWM5>,
+                                         <&clks IMX6SX_CLK_PWM5>;
+                                clock-names = "ipg", "per";
+                                #pwm-cells = <2>;
+                        };
+
+                        pwm6: pwm@022a8000 {
+                                compatible = "fsl,imx6sx-pwm", "fsl,imx27-pwm";
+                                reg = <0x022a8000 0x4000>;
+                                interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_PWM6>,
+                                         <&clks IMX6SX_CLK_PWM6>;
+                                clock-names = "ipg", "per";
+                                #pwm-cells = <2>;
+                        };
+
+                        pwm7: pwm@022ac000 {
+                                compatible = "fsl,imx6sx-pwm", "fsl,imx27-pwm";
+                                reg = <0x022ac000 0x4000>;
+                                interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_PWM7>,
+                                         <&clks IMX6SX_CLK_PWM7>;
+                                clock-names = "ipg", "per";
+                                #pwm-cells = <2>;
+                        };
+
+                        pwm8: pwm@0022b0000 {
+                                compatible = "fsl,imx6sx-pwm", "fsl,imx27-pwm";
+                                reg = <0x0022b0000 0x4000>;
+                                interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks IMX6SX_CLK_PWM8>,
+                                         <&clks IMX6SX_CLK_PWM8>;
+                                clock-names = "ipg", "per";
+                                #pwm-cells = <2>;
+                        };
+                };
+
+                pcie: pcie@0x08000000 {
+                        compatible = "fsl,imx6sx-pcie", "snps,dw-pcie";
+                        reg = <0x08ffc000 0x4000>; /* DBI */
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        device_type = "pci";
+                                  /* configuration space */
+                        ranges = <0x00000800 0 0x08f00000 0x08f00000 0 0x00080000
+                                  /* downstream I/O */
+                                  0x81000000 0 0          0x08f80000 0 0x00010000
+                                  /* non-prefetchable memory */
+                                  0x82000000 0 0x08000000 0x08000000 0 0x00f00000>;
+                        num-lanes = <1>;
+                        interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&clks IMX6SX_CLK_PCIE_REF_125M>,
+                                 <&clks IMX6SX_CLK_PCIE_AXI>,
+                                 <&clks IMX6SX_CLK_LVDS1_OUT>,
+                                 <&clks IMX6SX_CLK_DISPLAY_AXI>;
+                        clock-names = "pcie_ref_125m", "pcie_axi",
+                                      "lvds_gate", "display_axi";
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts
index b10e6351da53..cf06e32ee108 100644
--- a/arch/arm/boot/dts/integratorap.dts
+++ b/arch/arm/boot/dts/integratorap.dts
@@ -8,6 +8,7 @@
 / {
         model = "ARM Integrator/AP";
         compatible = "arm,integrator-ap";
+        dma-ranges = <0x80000000 0x0 0x80000000>;
 
         aliases {
                 arm,timer-primary = &timer2;
diff --git a/arch/arm/boot/dts/k2e-clocks.dtsi b/arch/arm/boot/dts/k2e-clocks.dtsi
index 90774d604bc1..598afe91c676 100644
--- a/arch/arm/boot/dts/k2e-clocks.dtsi
+++ b/arch/arm/boot/dts/k2e-clocks.dtsi
@@ -22,7 +22,7 @@ clocks {
                 #clock-cells = <0>;
                 compatible = "ti,keystone,pll-clock";
                 clocks = <&refclkpass>;
-                clock-output-names = "pa-pll-clk";
+                clock-output-names = "papllclk";
                 reg = <0x02620358 4>;
                 reg-names = "control";
         };
diff --git a/arch/arm/boot/dts/k2hk-clocks.dtsi b/arch/arm/boot/dts/k2hk-clocks.dtsi
index 96e65365afe3..d5adee3c0067 100644
--- a/arch/arm/boot/dts/k2hk-clocks.dtsi
+++ b/arch/arm/boot/dts/k2hk-clocks.dtsi
@@ -31,7 +31,7 @@ clocks {
                 #clock-cells = <0>;
                 compatible = "ti,keystone,pll-clock";
                 clocks = <&refclkpass>;
-                clock-output-names = "pa-pll-clk";
+                clock-output-names = "papllclk";
                 reg = <0x02620358 4>;
                 reg-names = "control";
         };
diff --git a/arch/arm/boot/dts/k2hk-evm.dts b/arch/arm/boot/dts/k2hk-evm.dts
index 1f90cbf27fd7..3223cc152a85 100644
--- a/arch/arm/boot/dts/k2hk-evm.dts
+++ b/arch/arm/boot/dts/k2hk-evm.dts
@@ -167,3 +167,15 @@
                 };
         };
 };
+
+&mdio {
+        ethphy0: ethernet-phy@0 {
+                compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";
+                reg = <0>;
+        };
+
+        ethphy1: ethernet-phy@1 {
+                compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";
+                reg = <1>;
+        };
+};
diff --git a/arch/arm/boot/dts/k2l-clocks.dtsi b/arch/arm/boot/dts/k2l-clocks.dtsi
index f584b80200f8..eb1e3e29f073 100644
--- a/arch/arm/boot/dts/k2l-clocks.dtsi
+++ b/arch/arm/boot/dts/k2l-clocks.dtsi
@@ -31,7 +31,7 @@ clocks {
                 #clock-cells = <0>;
                 compatible = "ti,keystone,pll-clock";
                 clocks = <&refclksys>;
-                clock-output-names = "pa-pll-clk";
+                clock-output-names = "papllclk";
                 reg = <0x02620358 4>;
                 reg-names = "control";
         };
diff --git a/arch/arm/boot/dts/keystone-clocks.dtsi b/arch/arm/boot/dts/keystone-clocks.dtsi
index 93f82c7010ab..0c334b25781e 100644
--- a/arch/arm/boot/dts/keystone-clocks.dtsi
+++ b/arch/arm/boot/dts/keystone-clocks.dtsi
@@ -215,7 +215,7 @@ clocks {
         clkpa: clkpa {
                 #clock-cells = <0>;
                 compatible = "ti,keystone,psc-clock";
-                clocks = <&chipclk16>;
+                clocks = <&paclk13>;
                 clock-output-names = "pa";
                 reg = <0x0235001c 0xb00>, <0x02350008 0x400>;
                 reg-names = "control", "domain";
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index c1414cb81fd4..9e31fe7d31f8 100644
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -266,5 +266,16 @@
                         ranges = <0 0 0x30000000 0x10000000
                                   1 0 0x21000A00 0x00000100>;
                 };
+
+                mdio: mdio@02090300 {
+                        compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg             = <0x02090300 0x100>;
+                        status = "disabled";
+                        clocks = <&clkpa>;
+                        clock-names = "fck";
+                        bus_freq        = <2500000>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood-d2net.dts b/arch/arm/boot/dts/kirkwood-d2net.dts
new file mode 100644
index 000000000000..6b7856025001
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-d2net.dts
@@ -0,0 +1,42 @@
+/*
+ * Device Tree file for d2 Network v2
+ *
+ * Copyright (C) 2014 Simon Guinot <simon.guinot@sequanux.org>
+ *
+ * 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 "kirkwood-netxbig.dtsi"
+
+/ {
+        model = "LaCie d2 Network v2";
+        compatible = "lacie,d2net_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        ns2-leds {
+                compatible = "lacie,ns2-leds";
+
+                blue-sata {
+                        label = "d2net_v2:blue:sata";
+                        slow-gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+                        cmd-gpio = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+                };
+        };
+
+        gpio-leds {
+                compatible = "gpio-leds";
+
+                red-fail {
+                        label = "d2net_v2:red:fail";
+                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-net2big.dts b/arch/arm/boot/dts/kirkwood-net2big.dts
new file mode 100644
index 000000000000..53dc37a3b687
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-net2big.dts
@@ -0,0 +1,60 @@
+/*
+ * Device Tree file for LaCie 2Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.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 "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-netxbig.dtsi"
+
+/ {
+        model = "LaCie 2Big Network v2";
+        compatible = "lacie,net2big_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+};
+
+&regulators {
+        regulator@2 {
+                compatible = "regulator-fixed";
+                reg = <2>;
+                regulator-name = "hdd1power";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                regulator-always-on;
+                regulator-boot-on;
+                gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+        };
+
+        clocks {
+               g762_clk: g762-oscillator {
+                         compatible = "fixed-clock";
+                         #clock-cells = <0>;
+                         clock-frequency = <32768>;
+               };
+        };
+};
+
+&i2c0 {
+        g762@3e {
+                compatible = "gmt,g762";
+                reg = <0x3e>;
+                clocks = <&g762_clk>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
new file mode 100644
index 000000000000..36155b749d9f
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-net5big.dts
@@ -0,0 +1,111 @@
+/*
+ * Device Tree file for LaCie 5Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.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 "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-netxbig.dtsi"
+
+/ {
+        model = "LaCie 5Big Network v2";
+        compatible = "lacie,net5big_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>;
+        };
+
+};
+
+&regulators {
+        regulator@2 {
+                compatible = "regulator-fixed";
+                reg = <2>;
+                regulator-name = "hdd1power";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                regulator-always-on;
+                regulator-boot-on;
+                gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+        };
+
+        regulator@3 {
+                compatible = "regulator-fixed";
+                reg = <3>;
+                regulator-name = "hdd2power";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                regulator-always-on;
+                regulator-boot-on;
+                gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+        };
+
+        regulator@4 {
+                compatible = "regulator-fixed";
+                reg = <4>;
+                regulator-name = "hdd3power";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                regulator-always-on;
+                regulator-boot-on;
+                gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+        };
+
+        regulator@5 {
+                compatible = "regulator-fixed";
+                reg = <5>;
+                regulator-name = "hdd4power";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                regulator-always-on;
+                regulator-boot-on;
+                gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+        };
+
+        clocks {
+               g762_clk: g762-oscillator {
+                         compatible = "fixed-clock";
+                         #clock-cells = <0>;
+                         clock-frequency = <32768>;
+               };
+        };
+};
+
+&mdio {
+        ethphy1: ethernet-phy@1 {
+                reg = <0>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        ethernet1-port@0 {
+                phy-handle = <&ethphy1>;
+        };
+};
+
+
+&i2c0 {
+        g762@3e {
+                compatible = "gmt,g762";
+                reg = <0x3e>;
+                clocks = <&g762_clk>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
new file mode 100644
index 000000000000..b0cfb7cd30b9
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
@@ -0,0 +1,154 @@
+/*
+ * Device Tree common file for LaCie 2Big and 5Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.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 "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+        chosen {
+                bootargs = "console=ttyS0,115200n8";
+                stdout-path = &uart0;
+        };
+
+        ocp@f1000000 {
+                serial@12000 {
+                        status = "okay";
+                };
+
+                spi@10600 {
+                        status = "okay";
+
+                        flash@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "mxicy,mx25l4005a";
+                                reg = <0>;
+                                spi-max-frequency = <20000000>;
+                                mode = <0>;
+
+                                partition@0 {
+                                        reg = <0x0 0x80000>;
+                                        label = "u-boot";
+                                };
+                        };
+                };
+
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                /*
+                 * button@1 and button@2 represent a three position rocker
+                 * switch. Thus the conventional KEY_POWER does not fit
+                 */
+                button@1 {
+                        label = "Back power switch (on|auto)";
+                        linux,code = <KEY_ESC>;
+                        linux,input-type = <5>;
+                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                };
+                button@2 {
+                        label = "Back power switch (auto|off)";
+                        linux,code = <KEY_1>;
+                        linux,input-type = <5>;
+                        gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+                };
+                button@3 {
+                        label = "Function button";
+                        linux,code = <KEY_OPTION>;
+                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+                };
+
+        };
+
+        gpio-poweroff {
+                compatible = "gpio-poweroff";
+                gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+        };
+
+        regulators: regulators {
+                status = "okay";
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                pinctrl-names = "default";
+
+                regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "hdd0power";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+                };
+        };
+};
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                reg = <8>;
+        };
+
+        ethphy1: ethernet-phy@1 {
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
+
+&pinctrl {
+        pinctrl-names = "default";
+
+        pmx_button_function: pmx-button-function {
+                marvell,pins = "mpp34";
+                marvell,function = "gpio";
+        };
+        pmx_button_power_off: pmx-button-power-off {
+                marvell,pins = "mpp15";
+                marvell,function = "gpio";
+        };
+        pmx_button_power_on: pmx-button-power-on {
+                marvell,pins = "mpp13";
+                marvell,function = "gpio";
+        };
+};
+
+&i2c0 {
+        status = "okay";
+
+        eeprom@50 {
+                compatible = "atmel,24c04";
+                pagesize = <16>;
+                reg = <0x50>;
+        };
+};
diff --git a/arch/arm/boot/dts/kizbox.dts b/arch/arm/boot/dts/kizbox.dts
index 928f6eef2d59..e83e4f9310b8 100644
--- a/arch/arm/boot/dts/kizbox.dts
+++ b/arch/arm/boot/dts/kizbox.dts
@@ -30,6 +30,10 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <18432000>;
                 };
+
+                main_xtal {
+                        clock-frequency = <18432000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/mpa1600.dts b/arch/arm/boot/dts/mpa1600.dts
index ccf9ea242f72..f0f5e1098928 100644
--- a/arch/arm/boot/dts/mpa1600.dts
+++ b/arch/arm/boot/dts/mpa1600.dts
@@ -25,6 +25,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <18432000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <18432000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/mach-s5pv210/include/mach/dma.h b/arch/arm/boot/dts/mt6589-aquaris5.dts
index 201842a3769e..443b4467de15 100644
--- a/arch/arm/mach-s5pv210/include/mach/dma.h
+++ b/arch/arm/boot/dts/mt6589-aquaris5.dts
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.com>
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Matthias Brugger <matthias.bgg@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
@@ -11,16 +11,15 @@
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef __MACH_DMA_H
-#define __MACH_DMA_H
+/dts-v1/;
+#include "mt6589.dtsi"
 
-/* This platform uses the common DMA API driver for PL330 */
-#include <plat/dma-pl330.h>
+/ {
+        model = "bq Aquaris5";
 
-#endif /* __MACH_DMA_H */
+        memory {
+                reg = <0x80000000 0x40000000>;
+        };
+};
diff --git a/arch/arm/boot/dts/mt6589.dtsi b/arch/arm/boot/dts/mt6589.dtsi
new file mode 100644
index 000000000000..d0297a051549
--- /dev/null
+++ b/arch/arm/boot/dts/mt6589.dtsi
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Matthias Brugger <matthias.bgg@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.
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include "skeleton.dtsi"
+
+/ {
+        compatible = "mediatek,mt6589";
+        interrupt-parent = <&gic>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a7";
+                        reg = <0x0>;
+                };
+                cpu@1 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a7";
+                        reg = <0x1>;
+                };
+                cpu@2 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a7";
+                        reg = <0x2>;
+                };
+                cpu@3 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a7";
+                        reg = <0x3>;
+                };
+
+        };
+
+        clocks {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                ranges;
+
+                system_clk: dummy13m {
+                        compatible = "fixed-clock";
+                        clock-frequency = <13000000>;
+                        #clock-cells = <0>;
+                };
+
+                rtc_clk: dummy32k {
+                        compatible = "fixed-clock";
+                        clock-frequency = <32000>;
+                        #clock-cells = <0>;
+                };
+        };
+
+        soc {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                ranges;
+
+                timer: timer@10008000 {
+                        compatible = "mediatek,mt6577-timer";
+                        reg = <0x10008000 0x80>;
+                        interrupts = <GIC_SPI 113 IRQ_TYPE_EDGE_RISING>;
+                        clocks = <&system_clk>, <&rtc_clk>;
+                        clock-names = "system-clk", "rtc-clk";
+                };
+
+                gic: interrupt-controller@10212000 {
+                        compatible = "arm,cortex-a15-gic";
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        reg = <0x10211000 0x1000>,
+                              <0x10212000 0x1000>,
+                              <0x10214000 0x2000>,
+                              <0x10216000 0x2000>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi
index e83b0468080c..9be3c1266378 100644
--- a/arch/arm/boot/dts/omap2420.dtsi
+++ b/arch/arm/boot/dts/omap2420.dtsi
@@ -157,6 +157,8 @@
                         interrupts = <26>, <34>;
                         interrupt-names = "dsp", "iva";
                         ti,hwmods = "mailbox";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <6>;
                 };
 
                 timer1: timer@48028000 {
@@ -182,3 +184,6 @@
 &i2c2 {
         compatible = "ti,omap2420-i2c";
 };
+
+/include/ "omap24xx-clocks.dtsi"
+/include/ "omap2420-clocks.dtsi"
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index c4e8013801ee..1a00f15d9096 100644
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -247,6 +247,8 @@
                         reg = <0x48094000 0x200>;
                         interrupts = <26>;
                         ti,hwmods = "mailbox";
+                        ti,mbox-num-users = <4>;
+                        ti,mbox-num-fifos = <6>;
                 };
 
                 timer1: timer@49018000 {
@@ -288,3 +290,6 @@
 &i2c2 {
         compatible = "ti,omap2430-i2c";
 };
+
+/include/ "omap24xx-clocks.dtsi"
+/include/ "omap2430-clocks.dtsi"
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index b2891a9a6975..575a49bf968d 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -332,6 +332,8 @@
                         ti,hwmods = "mailbox";
                         reg = <0x48094000 0x200>;
                         interrupts = <26>;
+                        ti,mbox-num-users = <2>;
+                        ti,mbox-num-fifos = <2>;
                 };
 
                 mcspi1: spi@48098000 {
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 7e26d222bfe3..69408b53200d 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -649,6 +649,15 @@
                         };
                 };
 
+                mailbox: mailbox@4a0f4000 {
+                        compatible = "ti,omap4-mailbox";
+                        reg = <0x4a0f4000 0x200>;
+                        interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                        ti,hwmods = "mailbox";
+                        ti,mbox-num-users = <3>;
+                        ti,mbox-num-fifos = <8>;
+                };
+
                 timer1: timer@4a318000 {
                         compatible = "ti,omap3430-timer";
                         reg = <0x4a318000 0x80>;
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 1e1b05768cec..159720d6c956 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -100,15 +100,33 @@
                         };
                 };
         };
+
+        sound: sound {
+                compatible = "ti,abe-twl6040";
+                ti,model = "omap5-uevm";
+
+                ti,mclk-freq = <19200000>;
+
+                ti,mcpdm = <&mcpdm>;
+
+                ti,twl6040 = <&twl6040>;
+
+                /* Audio routing */
+                ti,audio-routing =
+                        "Headset Stereophone", "HSOL",
+                        "Headset Stereophone", "HSOR",
+                        "Line Out", "AUXL",
+                        "Line Out", "AUXR",
+                        "HSMIC", "Headset Mic",
+                        "Headset Mic", "Headset Mic Bias",
+                        "AFML", "Line In",
+                        "AFMR", "Line In";
+        };
 };
 
 &omap5_pmx_core {
         pinctrl-names = "default";
         pinctrl-0 = <
-                        &twl6040_pins
-                        &mcpdm_pins
-                        &mcbsp1_pins
-                        &mcbsp2_pins
                         &usbhost_pins
                         &led_gpio_pins
         >;
@@ -306,6 +324,11 @@
                         ti,wakeup;
                 };
 
+                clk32kgaudio: palmas_clk32k@1 {
+                        compatible = "ti,palmas-clk32kgaudio";
+                        #clock-cells = <0>;
+                };
+
                 palmas_pmic {
                         compatible = "ti,palmas-pmic";
                         interrupt-parent = <&palmas>;
@@ -489,6 +512,25 @@
                         };
                 };
         };
+
+        twl6040: twl@4b {
+                compatible = "ti,twl6040";
+                reg = <0x4b>;
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&twl6040_pins>;
+
+                interrupts = <GIC_SPI 119 IRQ_TYPE_NONE>; /* IRQ_SYS_2N cascaded to gic */
+                interrupt-parent = <&gic>;
+                ti,audpwron-gpio = <&gpio5 13 0>;  /* gpio line 141 */
+
+                vio-supply = <&smps7_reg>;
+                v2v1-supply = <&smps9_reg>;
+                enable-active-high;
+
+                clocks = <&clk32kgaudio>;
+                clock-names = "clk32k";
+        };
 };
 
 &i2c5 {
@@ -505,8 +547,22 @@
         };
 };
 
-&mcbsp3 {
-        status = "disabled";
+&mcpdm {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcpdm_pins>;
+        status = "okay";
+};
+
+&mcbsp1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcbsp1_pins>;
+        status = "okay";
+};
+
+&mcbsp2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcbsp2_pins>;
+        status = "okay";
 };
 
 &usbhshost {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index a4ed54988866..fc8df1739f39 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -640,6 +640,8 @@
                         reg = <0x4a0f4000 0x200>;
                         interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
                         ti,hwmods = "mailbox";
+                        ti,mbox-num-users = <3>;
+                        ti,mbox-num-fifos = <8>;
                 };
 
                 timer1: timer@4ae18000 {
@@ -985,6 +987,66 @@
                                 dma-names = "audio_tx";
                         };
                 };
+
+                abb_mpu: regulator-abb-mpu {
+                        compatible = "ti,abb-v2";
+                        regulator-name = "abb_mpu";
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        clocks = <&sys_clkin>;
+                        ti,settling-time = <50>;
+                        ti,clock-cycles = <16>;
+
+                        reg = <0x4ae07cdc 0x8>, <0x4ae06014 0x4>,
+                              <0x4a0021c4 0x8>, <0x4ae0c318 0x4>;
+                        reg-names = "base-address", "int-address",
+                                    "efuse-address", "ldo-address";
+                        ti,tranxdone-status-mask = <0x80>;
+                        /* LDOVBBMPU_MUX_CTRL */
+                        ti,ldovbb-override-mask = <0x400>;
+                        /* LDOVBBMPU_VSET_OUT */
+                        ti,ldovbb-vset-mask = <0x1F>;
+
+                        /*
+                         * NOTE: only FBB mode used but actual vset will
+                         * determine final biasing
+                         */
+                        ti,abb_info = <
+                        /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
+                        1060000         0       0x0     0 0x02000000 0x01F00000
+                        1250000         0       0x4     0 0x02000000 0x01F00000
+                        >;
+                };
+
+                abb_mm: regulator-abb-mm {
+                        compatible = "ti,abb-v2";
+                        regulator-name = "abb_mm";
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        clocks = <&sys_clkin>;
+                        ti,settling-time = <50>;
+                        ti,clock-cycles = <16>;
+
+                        reg = <0x4ae07ce4 0x8>, <0x4ae06010 0x4>,
+                              <0x4a0021a4 0x8>, <0x4ae0c314 0x4>;
+                        reg-names = "base-address", "int-address",
+                                    "efuse-address", "ldo-address";
+                        ti,tranxdone-status-mask = <0x80000000>;
+                        /* LDOVBBMM_MUX_CTRL */
+                        ti,ldovbb-override-mask = <0x400>;
+                        /* LDOVBBMM_VSET_OUT */
+                        ti,ldovbb-vset-mask = <0x1F>;
+
+                        /*
+                         * NOTE: only FBB mode used but actual vset will
+                         * determine final biasing
+                         */
+                        ti,abb_info = <
+                        /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
+                        1025000         0       0x0     0 0x02000000 0x01F00000
+                        1120000         0       0x4     0 0x02000000 0x01F00000
+                        >;
+                };
         };
 };
 
diff --git a/arch/arm/boot/dts/pm9g45.dts b/arch/arm/boot/dts/pm9g45.dts
index 33ffabe9c4c8..66afcff67fde 100644
--- a/arch/arm/boot/dts/pm9g45.dts
+++ b/arch/arm/boot/dts/pm9g45.dts
@@ -29,6 +29,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                      clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                      clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/r7s72100-genmai.dts b/arch/arm/boot/dts/r7s72100-genmai.dts
index 56849b55e1c2..20705467f4c9 100644
--- a/arch/arm/boot/dts/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai.dts
@@ -57,3 +57,13 @@
 &scif2 {
         status = "okay";
 };
+
+&spi4 {
+        status = "okay";
+
+        codec: codec@0 {
+                compatible = "wlf,wm8978";
+                reg = <0>;
+                spi-max-frequency = <5000000>;
+        };
+};
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index f50fbc8f3bd9..bdee22541189 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -144,6 +144,7 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a9";
                         reg = <0>;
+                        clock-frequency = <400000000>;
                 };
         };
 
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
index 70b1fff8f4a3..a860f32bca27 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
@@ -16,6 +16,10 @@
         model = "APE6EVM";
         compatible = "renesas,ape6evm-reference", "renesas,r8a73a4";
 
+        aliases {
+                serial0 = &scifa0;
+        };
+
         chosen {
                 bootargs = "console=ttySC0,115200 ignore_loglevel rw";
         };
@@ -90,9 +94,6 @@
 };
 
 &pfc {
-        pinctrl-0 = <&scifa0_pins>;
-        pinctrl-names = "default";
-
         scifa0_pins: serial0 {
                 renesas,groups = "scifa0_data";
                 renesas,function = "scifa0";
@@ -123,6 +124,13 @@
         status = "okay";
 };
 
+&scifa0 {
+        pinctrl-0 = <&scifa0_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
+
 &sdhi0 {
         vmmc-supply = <&vcc_sdhi0>;
         bus-width = <4>;
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index 82c5ac825386..d8ec5058c351 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -252,6 +252,48 @@
                 status = "disabled";
         };
 
+        scifa0: serial@e6c40000 {
+                compatible = "renesas,scifa-r8a73a4", "renesas,scifa";
+                reg = <0 0xe6c40000 0 0x100>;
+                interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa1: serial@e6c50000 {
+                compatible = "renesas,scifa-r8a73a4", "renesas,scifa";
+                reg = <0 0xe6c50000 0 0x100>;
+                interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifb2: serial@e6c20000 {
+                compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
+                reg = <0 0xe6c20000 0 0x100>;
+                interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifb3: serial@e6c30000 {
+                compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
+                reg = <0 0xe6c30000 0 0x100>;
+                interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifb4: serial@e6ce0000 {
+                compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
+                reg = <0 0xe6ce0000 0 0x100>;
+                interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifb5: serial@e6cf0000 {
+                compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
+                reg = <0 0xe6cf0000 0 0x100>;
+                interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
         mmcif0: mmc@ee200000 {
                 compatible = "renesas,sh-mmcif";
                 reg = <0 0xee200000 0 0x80>;
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index 486007d7ffe4..ee9e7d5c97a9 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -19,8 +19,12 @@
         model = "armadillo 800 eva reference";
         compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740";
 
+        aliases {
+                serial1 = &scifa1;
+        };
+
         chosen {
-                bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+                bootargs = "console=tty0 console=ttySC1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
         };
 
         memory {
@@ -104,17 +108,21 @@
 
         leds {
                 compatible = "gpio-leds";
-                led1 {
+                led3 {
                         gpios = <&pfc 102 GPIO_ACTIVE_HIGH>;
+                        label = "LED3";
                 };
-                led2 {
+                led4 {
                         gpios = <&pfc 111 GPIO_ACTIVE_HIGH>;
+                        label = "LED4";
                 };
-                led3 {
+                led5 {
                         gpios = <&pfc 110 GPIO_ACTIVE_HIGH>;
+                        label = "LED5";
                 };
-                led4 {
+                led6 {
                         gpios = <&pfc 177 GPIO_ACTIVE_HIGH>;
+                        label = "LED6";
                 };
         };
 
@@ -198,9 +206,6 @@
 };
 
 &pfc {
-        pinctrl-0 = <&scifa1_pins>;
-        pinctrl-names = "default";
-
         ether_pins: ether {
                 renesas,groups = "gether_mii", "gether_int";
                 renesas,function = "gether";
@@ -252,6 +257,13 @@
         status = "okay";
 };
 
+&scifa1 {
+        pinctrl-0 = <&scifa1_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
+
 &sdhi0 {
         pinctrl-0 = <&sdhi0_pins>;
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 55d29f4d2ed6..bda18fb3d9e5 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -156,6 +156,69 @@
                 status = "disabled";
         };
 
+        scifa0: serial@e6c40000 {
+                compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+                reg = <0xe6c40000 0x100>;
+                interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa1: serial@e6c50000 {
+                compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+                reg = <0xe6c50000 0x100>;
+                interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa2: serial@e6c60000 {
+                compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+                reg = <0xe6c60000 0x100>;
+                interrupts = <0 102 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa3: serial@e6c70000 {
+                compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+                reg = <0xe6c70000 0x100>;
+                interrupts = <0 103 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa4: serial@e6c80000 {
+                compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+                reg = <0xe6c80000 0x100>;
+                interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa5: serial@e6cb0000 {
+                compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+                reg = <0xe6cb0000 0x100>;
+                interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa6: serial@e6cc0000 {
+                compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+                reg = <0xe6cc0000 0x100>;
+                interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa7: serial@e6cd0000 {
+                compatible = "renesas,scifa-r8a7740", "renesas,scifa";
+                reg = <0xe6cd0000 0x100>;
+                interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifb8: serial@e6c30000 {
+                compatible = "renesas,scifb-r8a7740", "renesas,scifb";
+                reg = <0xe6c30000 0x100>;
+                interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
         pfc: pfc@e6050000 {
                 compatible = "renesas,pfc-r8a7740";
                 reg = <0xe6050000 0x8000>,
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index f76f6ec01e19..3342c74c5de8 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -23,6 +23,10 @@
         model = "bockw";
         compatible = "renesas,bockw-reference", "renesas,r8a7778";
 
+        aliases {
+                serial0 = &scif0;
+        };
+
         chosen {
                 bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
         };
@@ -70,9 +74,6 @@
 };
 
 &pfc {
-        pinctrl-0 = <&scif0_pins>;
-        pinctrl-names = "default";
-
         scif0_pins: serial0 {
                 renesas,groups = "scif0_data_a", "scif0_ctrl";
                 renesas,function = "scif0";
@@ -124,3 +125,10 @@
                 };
         };
 };
+
+&scif0 {
+        pinctrl-0 = <&scif0_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 3af0a2187493..ecfdf4b01b5a 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -156,6 +156,48 @@
                 status = "disabled";
         };
 
+        scif0: serial@ffe40000 {
+                compatible = "renesas,scif-r8a7778", "renesas,scif";
+                reg = <0xffe40000 0x100>;
+                interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scif1: serial@ffe41000 {
+                compatible = "renesas,scif-r8a7778", "renesas,scif";
+                reg = <0xffe41000 0x100>;
+                interrupts = <0 71 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scif2: serial@ffe42000 {
+                compatible = "renesas,scif-r8a7778", "renesas,scif";
+                reg = <0xffe42000 0x100>;
+                interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scif3: serial@ffe43000 {
+                compatible = "renesas,scif-r8a7778", "renesas,scif";
+                reg = <0xffe43000 0x100>;
+                interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scif4: serial@ffe44000 {
+                compatible = "renesas,scif-r8a7778", "renesas,scif";
+                reg = <0xffe44000 0x100>;
+                interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scif5: serial@ffe45000 {
+                compatible = "renesas,scif-r8a7778", "renesas,scif";
+                reg = <0xffe45000 0x100>;
+                interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
         mmcif: mmc@ffe4e000 {
                 compatible = "renesas,sh-mmcif";
                 reg = <0xffe4e000 0x100>;
diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
deleted file mode 100644
index b27c6373ff4d..000000000000
--- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Reference 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"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.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 rw";
-        };
-
-        memory {
-                device_type = "memory";
-                reg = <0x60000000 0x40000000>;
-        };
-
-        fixedregulator3v3: fixedregulator@0 {
-                compatible = "regulator-fixed";
-                regulator-name = "fixed-3.3V";
-                regulator-min-microvolt = <3300000>;
-                regulator-max-microvolt = <3300000>;
-                regulator-boot-on;
-                regulator-always-on;
-        };
-
-        lan0@18000000 {
-                compatible = "smsc,lan9220", "smsc,lan9115";
-                reg = <0x18000000 0x100>;
-                pinctrl-0 = <&lan0_pins>;
-                pinctrl-names = "default";
-
-                phy-mode = "mii";
-                interrupt-parent = <&irqpin0>;
-                interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
-                smsc,irq-push-pull;
-                reg-io-width = <4>;
-                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>;
-                };
-        };
-};
-
-&irqpin0 {
-        status = "okay";
-};
-
-&pfc {
-        pinctrl-0 = <&scif2_pins &scif4_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: serial2 {
-                renesas,groups = "scif2_data_c";
-                renesas,function = "scif2";
-        };
-
-        scif4_pins: serial4 {
-                renesas,groups = "scif4_data";
-                renesas,function = "scif4";
-        };
-
-        sdhi0_pins: sd0 {
-                renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd";
-                renesas,function = "sdhi0";
-        };
-
-        hspi0_pins: hspi0 {
-                renesas,groups = "hspi0";
-                renesas,function = "hspi0";
-        };
-};
-
-&sdhi0 {
-        pinctrl-0 = <&sdhi0_pins>;
-        pinctrl-names = "default";
-
-        vmmc-supply = <&fixedregulator3v3>;
-        bus-width = <4>;
-        status = "okay";
-};
-
-&hspi0 {
-        pinctrl-0 = <&hspi0_pins>;
-        pinctrl-names = "default";
-        status = "okay";
-};
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index a7af2c2371f2..5745555df943 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -11,17 +11,131 @@
 
 /dts-v1/;
 #include "r8a7779.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
         model = "marzen";
         compatible = "renesas,marzen", "renesas,r8a7779";
 
+        aliases {
+                serial2 = &scif2;
+                serial4 = &scif4;
+        };
+
         chosen {
-                bootargs = "console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on";
+                bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
         };
 
         memory {
                 device_type = "memory";
                 reg = <0x60000000 0x40000000>;
         };
+
+        fixedregulator3v3: fixedregulator@0 {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-3.3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+
+        lan0@18000000 {
+                compatible = "smsc,lan9220", "smsc,lan9115";
+                reg = <0x18000000 0x100>;
+                pinctrl-0 = <&lan0_pins>;
+                pinctrl-names = "default";
+
+                phy-mode = "mii";
+                interrupt-parent = <&irqpin0>;
+                interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
+                smsc,irq-push-pull;
+                reg-io-width = <4>;
+                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>;
+                };
+        };
+};
+
+&irqpin0 {
+        status = "okay";
+};
+
+&extal_clk {
+        clock-frequency = <31250000>;
+};
+
+&pfc {
+        lan0_pins: lan0 {
+                intc {
+                        renesas,groups = "intc_irq1_b";
+                        renesas,function = "intc";
+                };
+                lbsc {
+                        renesas,groups = "lbsc_ex_cs0";
+                        renesas,function = "lbsc";
+                };
+        };
+
+        scif2_pins: serial2 {
+                renesas,groups = "scif2_data_c";
+                renesas,function = "scif2";
+        };
+
+        scif4_pins: serial4 {
+                renesas,groups = "scif4_data";
+                renesas,function = "scif4";
+        };
+
+        sdhi0_pins: sd0 {
+                renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd";
+                renesas,function = "sdhi0";
+        };
+
+        hspi0_pins: hspi0 {
+                renesas,groups = "hspi0";
+                renesas,function = "hspi0";
+        };
+};
+
+&scif2 {
+        pinctrl-0 = <&scif2_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
+
+&scif4 {
+        pinctrl-0 = <&scif4_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
+
+&sdhi0 {
+        pinctrl-0 = <&sdhi0_pins>;
+        pinctrl-names = "default";
+
+        vmmc-supply = <&fixedregulator3v3>;
+        bus-width = <4>;
+        status = "okay";
+};
+
+&hspi0 {
+        pinctrl-0 = <&hspi0_pins>;
+        pinctrl-names = "default";
+        status = "okay";
 };
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index b517c8e6b420..58d0d952d60e 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -11,6 +11,7 @@
 
 /include/ "skeleton.dtsi"
 
+#include <dt-bindings/clock/r8a7779-clock.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
 / {
@@ -25,21 +26,25 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a9";
                         reg = <0>;
+                        clock-frequency = <1000000000>;
                 };
                 cpu@1 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a9";
                         reg = <1>;
+                        clock-frequency = <1000000000>;
                 };
                 cpu@2 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a9";
                         reg = <2>;
+                        clock-frequency = <1000000000>;
                 };
                 cpu@3 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a9";
                         reg = <3>;
+                        clock-frequency = <1000000000>;
                 };
         };
 
@@ -49,13 +54,13 @@
                 spi2 = &hspi2;
         };
 
-        gic: interrupt-controller@f0001000 {
-                compatible = "arm,cortex-a9-gic";
-                #interrupt-cells = <3>;
-                interrupt-controller;
-                reg = <0xf0001000 0x1000>,
-                      <0xf0000100 0x100>;
-        };
+        gic: interrupt-controller@f0001000 {
+                compatible = "arm,cortex-a9-gic";
+                #interrupt-cells = <3>;
+                interrupt-controller;
+                reg = <0xf0001000 0x1000>,
+                      <0xf0000100 0x100>;
+        };
 
         gpio0: gpio@ffc40000 {
                 compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
@@ -157,6 +162,7 @@
                 compatible = "renesas,i2c-r8a7779";
                 reg = <0xffc70000 0x1000>;
                 interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp0_clks R8A7779_CLK_I2C0>;
                 status = "disabled";
         };
 
@@ -166,6 +172,7 @@
                 compatible = "renesas,i2c-r8a7779";
                 reg = <0xffc71000 0x1000>;
                 interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp0_clks R8A7779_CLK_I2C1>;
                 status = "disabled";
         };
 
@@ -175,6 +182,7 @@
                 compatible = "renesas,i2c-r8a7779";
                 reg = <0xffc72000 0x1000>;
                 interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp0_clks R8A7779_CLK_I2C2>;
                 status = "disabled";
         };
 
@@ -184,6 +192,67 @@
                 compatible = "renesas,i2c-r8a7779";
                 reg = <0xffc73000 0x1000>;
                 interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp0_clks R8A7779_CLK_I2C3>;
+                status = "disabled";
+        };
+
+        scif0: serial@ffe40000 {
+                compatible = "renesas,scif-r8a7779", "renesas,scif";
+                reg = <0xffe40000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cpg_clocks R8A7779_CLK_P>;
+                clock-names = "sci_ick";
+                status = "disabled";
+        };
+
+        scif1: serial@ffe41000 {
+                compatible = "renesas,scif-r8a7779", "renesas,scif";
+                reg = <0xffe41000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cpg_clocks R8A7779_CLK_P>;
+                clock-names = "sci_ick";
+                status = "disabled";
+        };
+
+        scif2: serial@ffe42000 {
+                compatible = "renesas,scif-r8a7779", "renesas,scif";
+                reg = <0xffe42000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 90 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cpg_clocks R8A7779_CLK_P>;
+                clock-names = "sci_ick";
+                status = "disabled";
+        };
+
+        scif3: serial@ffe43000 {
+                compatible = "renesas,scif-r8a7779", "renesas,scif";
+                reg = <0xffe43000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 91 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cpg_clocks R8A7779_CLK_P>;
+                clock-names = "sci_ick";
+                status = "disabled";
+        };
+
+        scif4: serial@ffe44000 {
+                compatible = "renesas,scif-r8a7779", "renesas,scif";
+                reg = <0xffe44000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cpg_clocks R8A7779_CLK_P>;
+                clock-names = "sci_ick";
+                status = "disabled";
+        };
+
+        scif5: serial@ffe45000 {
+                compatible = "renesas,scif-r8a7779", "renesas,scif";
+                reg = <0xffe45000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 93 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cpg_clocks R8A7779_CLK_P>;
+                clock-names = "sci_ick";
                 status = "disabled";
         };
 
@@ -201,12 +270,14 @@
                 compatible = "renesas,rcar-sata";
                 reg = <0xfc600000 0x2000>;
                 interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7779_CLK_SATA>;
         };
 
         sdhi0: sd@ffe4c000 {
                 compatible = "renesas,sdhi-r8a7779";
                 reg = <0xffe4c000 0x100>;
                 interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp3_clks R8A7779_CLK_SDHI0>;
                 cap-sd-highspeed;
                 cap-sdio-irq;
                 status = "disabled";
@@ -216,6 +287,7 @@
                 compatible = "renesas,sdhi-r8a7779";
                 reg = <0xffe4d000 0x100>;
                 interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp3_clks R8A7779_CLK_SDHI1>;
                 cap-sd-highspeed;
                 cap-sdio-irq;
                 status = "disabled";
@@ -225,6 +297,7 @@
                 compatible = "renesas,sdhi-r8a7779";
                 reg = <0xffe4e000 0x100>;
                 interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp3_clks R8A7779_CLK_SDHI2>;
                 cap-sd-highspeed;
                 cap-sdio-irq;
                 status = "disabled";
@@ -234,6 +307,7 @@
                 compatible = "renesas,sdhi-r8a7779";
                 reg = <0xffe4f000 0x100>;
                 interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp3_clks R8A7779_CLK_SDHI3>;
                 cap-sd-highspeed;
                 cap-sdio-irq;
                 status = "disabled";
@@ -245,6 +319,7 @@
                 interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
                 #address-cells = <1>;
                 #size-cells = <0>;
+                clocks = <&mstp0_clks R8A7779_CLK_HSPI>;
                 status = "disabled";
         };
 
@@ -254,6 +329,7 @@
                 interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
                 #address-cells = <1>;
                 #size-cells = <0>;
+                clocks = <&mstp0_clks R8A7779_CLK_HSPI>;
                 status = "disabled";
         };
 
@@ -263,6 +339,150 @@
                 interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
                 #address-cells = <1>;
                 #size-cells = <0>;
+                clocks = <&mstp0_clks R8A7779_CLK_HSPI>;
                 status = "disabled";
         };
+
+        clocks {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                /* External root clock */
+                extal_clk: extal_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        /* This value must be overriden by the board. */
+                        clock-frequency = <0>;
+                        clock-output-names = "extal";
+                };
+
+                /* Special CPG clocks */
+                cpg_clocks: clocks@ffc80000 {
+                        compatible = "renesas,r8a7779-cpg-clocks";
+                        reg = <0xffc80000 0x30>;
+                        clocks = <&extal_clk>;
+                        #clock-cells = <1>;
+                        clock-output-names = "plla", "z", "zs", "s",
+                                             "s1", "p", "b", "out";
+                };
+
+                /* Fixed factor clocks */
+                i_clk: i_clk {
+                        compatible = "fixed-factor-clock";
+                        clocks = <&cpg_clocks R8A7779_CLK_PLLA>;
+                        #clock-cells = <0>;
+                        clock-div = <2>;
+                        clock-mult = <1>;
+                        clock-output-names = "i";
+                };
+                s3_clk: s3_clk {
+                        compatible = "fixed-factor-clock";
+                        clocks = <&cpg_clocks R8A7779_CLK_PLLA>;
+                        #clock-cells = <0>;
+                        clock-div = <8>;
+                        clock-mult = <1>;
+                        clock-output-names = "s3";
+                };
+                s4_clk: s4_clk {
+                        compatible = "fixed-factor-clock";
+                        clocks = <&cpg_clocks R8A7779_CLK_PLLA>;
+                        #clock-cells = <0>;
+                        clock-div = <16>;
+                        clock-mult = <1>;
+                        clock-output-names = "s4";
+                };
+                g_clk: g_clk {
+                        compatible = "fixed-factor-clock";
+                        clocks = <&cpg_clocks R8A7779_CLK_PLLA>;
+                        #clock-cells = <0>;
+                        clock-div = <24>;
+                        clock-mult = <1>;
+                        clock-output-names = "g";
+                };
+
+                /* Gate clocks */
+                mstp0_clks: clocks@ffc80030 {
+                        compatible = "renesas,r8a7779-mstp-clocks",
+                                     "renesas,cpg-mstp-clocks";
+                        reg = <0xffc80030 4>;
+                        clocks = <&cpg_clocks R8A7779_CLK_S>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_S>,
+                                 <&cpg_clocks R8A7779_CLK_S>,
+                                 <&cpg_clocks R8A7779_CLK_S1>,
+                                 <&cpg_clocks R8A7779_CLK_S1>,
+                                 <&cpg_clocks R8A7779_CLK_S1>,
+                                 <&cpg_clocks R8A7779_CLK_S1>,
+                                 <&cpg_clocks R8A7779_CLK_S1>,
+                                 <&cpg_clocks R8A7779_CLK_S1>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_P>;
+                        #clock-cells = <1>;
+                        renesas,clock-indices = <
+                                R8A7779_CLK_HSPI R8A7779_CLK_TMU2
+                                R8A7779_CLK_TMU1 R8A7779_CLK_TMU0
+                                R8A7779_CLK_HSCIF1 R8A7779_CLK_HSCIF0
+                                R8A7779_CLK_SCIF5 R8A7779_CLK_SCIF4
+                                R8A7779_CLK_SCIF3 R8A7779_CLK_SCIF2
+                                R8A7779_CLK_SCIF1 R8A7779_CLK_SCIF0
+                                R8A7779_CLK_I2C3 R8A7779_CLK_I2C2
+                                R8A7779_CLK_I2C1 R8A7779_CLK_I2C0
+                        >;
+                        clock-output-names =
+                                "hspi", "tmu2", "tmu1", "tmu0", "hscif1",
+                                "hscif0", "scif5", "scif4", "scif3", "scif2",
+                                "scif1", "scif0", "i2c3", "i2c2", "i2c1",
+                                "i2c0";
+                };
+                mstp1_clks: clocks@ffc80034 {
+                        compatible = "renesas,r8a7779-mstp-clocks",
+                                     "renesas,cpg-mstp-clocks";
+                        reg = <0xffc80034 4>, <0xffc80044 4>;
+                        clocks = <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_S>,
+                                 <&cpg_clocks R8A7779_CLK_S>,
+                                 <&cpg_clocks R8A7779_CLK_S>,
+                                 <&cpg_clocks R8A7779_CLK_S>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_P>,
+                                 <&cpg_clocks R8A7779_CLK_S>;
+                        #clock-cells = <1>;
+                        renesas,clock-indices = <
+                                R8A7779_CLK_USB01 R8A7779_CLK_USB2
+                                R8A7779_CLK_DU R8A7779_CLK_VIN2
+                                R8A7779_CLK_VIN1 R8A7779_CLK_VIN0
+                                R8A7779_CLK_ETHER R8A7779_CLK_SATA
+                                R8A7779_CLK_PCIE R8A7779_CLK_VIN3
+                        >;
+                        clock-output-names =
+                                "usb01", "usb2",
+                                "du", "vin2",
+                                "vin1", "vin0",
+                                "ether", "sata",
+                                "pcie", "vin3";
+                };
+                mstp3_clks: clocks@ffc8003c {
+                        compatible = "renesas,r8a7779-mstp-clocks",
+                                     "renesas,cpg-mstp-clocks";
+                        reg = <0xffc8003c 4>;
+                        clocks = <&s4_clk>, <&s4_clk>, <&s4_clk>, <&s4_clk>,
+                                 <&s4_clk>, <&s4_clk>;
+                        #clock-cells = <1>;
+                        renesas,clock-indices = <
+                                R8A7779_CLK_SDHI3 R8A7779_CLK_SDHI2
+                                R8A7779_CLK_SDHI1 R8A7779_CLK_SDHI0
+                                R8A7779_CLK_MMC1 R8A7779_CLK_MMC0
+                        >;
+                        clock-output-names =
+                                "sdhi3", "sdhi2", "sdhi1", "sdhi0",
+                                "mmc1", "mmc0";
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index dd2fe46073f2..856b4236b674 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -29,12 +29,12 @@
 
         memory@40000000 {
                 device_type = "memory";
-                reg = <0 0x40000000 0 0x80000000>;
+                reg = <0 0x40000000 0 0x40000000>;
         };
 
         memory@180000000 {
                 device_type = "memory";
-                reg = <1 0x80000000 0 0x80000000>;
+                reg = <1 0x40000000 0 0xc0000000>;
         };
 
         lbsc {
@@ -204,6 +204,36 @@
                                  "msiof1_tx";
                 renesas,function = "msiof1";
         };
+
+        iic1_pins: iic1 {
+                renesas,groups = "iic1";
+                renesas,function = "iic1";
+        };
+
+        iic2_pins: iic2 {
+                renesas,groups = "iic2";
+                renesas,function = "iic2";
+        };
+
+        iic3_pins: iic3 {
+                renesas,groups = "iic3";
+                renesas,function = "iic3";
+        };
+
+        usb0_pins: usb0 {
+                renesas,groups = "usb0";
+                renesas,function = "usb0";
+        };
+
+        usb1_pins: usb1 {
+                renesas,groups = "usb1";
+                renesas,function = "usb1";
+        };
+
+        usb2_pins: usb2 {
+                renesas,groups = "usb2";
+                renesas,function = "usb2";
+        };
 };
 
 &ether {
@@ -317,3 +347,57 @@
         cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;
         status = "okay";
 };
+
+&cpu0 {
+        cpu0-supply = <&vdd_dvfs>;
+};
+
+&iic0   {
+        status = "ok";
+};
+
+&iic1   {
+        status = "ok";
+        pinctrl-0 = <&iic1_pins>;
+        pinctrl-names = "default";
+};
+
+&iic2   {
+        status = "ok";
+        pinctrl-0 = <&iic2_pins>;
+        pinctrl-names = "default";
+};
+
+&iic3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&iic3_pins>;
+        status = "okay";
+
+        vdd_dvfs: regulator@68 {
+                compatible = "diasemi,da9210";
+                reg = <0x68>;
+
+                regulator-min-microvolt = <1000000>;
+                regulator-max-microvolt = <1000000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+};
+
+&pci0 {
+        status = "okay";
+        pinctrl-0 = <&usb0_pins>;
+        pinctrl-names = "default";
+};
+
+&pci1 {
+        status = "okay";
+        pinctrl-0 = <&usb1_pins>;
+        pinctrl-names = "default";
+};
+
+&pci2 {
+        status = "okay";
+        pinctrl-0 = <&usb2_pins>;
+        pinctrl-names = "default";
+};
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 7ff29601f962..d9ddecbb859c 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -44,6 +44,17 @@
                         compatible = "arm,cortex-a15";
                         reg = <0>;
                         clock-frequency = <1300000000>;
+                        voltage-tolerance = <1>; /* 1% */
+                        clocks = <&cpg_clocks R8A7790_CLK_Z>;
+                        clock-latency = <300000>; /* 300 us */
+
+                        /* kHz - uV - OPPs unknown yet */
+                        operating-points = <1400000 1000000>,
+                                           <1225000 1000000>,
+                                           <1050000 1000000>,
+                                           < 875000 1000000>,
+                                           < 700000 1000000>,
+                                           < 350000 1000000>;
                 };
 
                 cpu1: cpu@1 {
@@ -476,6 +487,15 @@
                         clock-output-names = "extal";
                 };
 
+                /* External PCIe clock - can be overridden by the board */
+                pcie_bus_clk: pcie_bus_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <100000000>;
+                        clock-output-names = "pcie_bus";
+                        status = "disabled";
+                };
+
                 /*
                  * The external audio clocks are configured as 0 Hz fixed frequency clocks by
                  * default. Boards that provide audio clocks should override them.
@@ -754,17 +774,17 @@
                         reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
                         clocks = <&hp_clk>, <&cp_clk>, <&mmc1_clk>, <&sd3_clk>,
                                  <&sd2_clk>, <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>, <&mmc0_clk>,
-                                 <&hp_clk>, <&hp_clk>, <&rclk_clk>;
+                                 <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>;
                         #clock-cells = <1>;
                         renesas,clock-indices = <
                                 R8A7790_CLK_IIC2 R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
                                 R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0 R8A7790_CLK_MMCIF0
-                                R8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_CMT1
+                                R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1
                         >;
                         clock-output-names =
                                 "iic2", "tpu0", "mmcif1", "sdhi3",
                                 "sdhi2", "sdhi1", "sdhi0", "mmcif0",
-                                "iic0", "iic1", "cmt1";
+                                "iic0", "pciec", "iic1", "ssusb", "cmt1";
                 };
                 mstp5_clks: mstp5_clks@e6150144 {
                         compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
@@ -824,6 +844,39 @@
                                 "rcan1", "rcan0", "qspi_mod", "iic3",
                                 "i2c3", "i2c2", "i2c1", "i2c0";
                 };
+                mstp10_clks: mstp10_clks@e6150998 {
+                        compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
+                        reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>;
+                        clocks = <&p_clk>,
+                                <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
+                                <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
+                                <&p_clk>,
+                                <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>;
+
+                        #clock-cells = <1>;
+                        clock-indices = <
+                                R8A7790_CLK_SSI_ALL
+                                R8A7790_CLK_SSI9 R8A7790_CLK_SSI8 R8A7790_CLK_SSI7 R8A7790_CLK_SSI6 R8A7790_CLK_SSI5
+                                R8A7790_CLK_SSI4 R8A7790_CLK_SSI3 R8A7790_CLK_SSI2 R8A7790_CLK_SSI1 R8A7790_CLK_SSI0
+                                R8A7790_CLK_SCU_ALL
+                                R8A7790_CLK_SCU_DVC1 R8A7790_CLK_SCU_DVC0
+                                R8A7790_CLK_SCU_SRC9 R8A7790_CLK_SCU_SRC8 R8A7790_CLK_SCU_SRC7 R8A7790_CLK_SCU_SRC6 R8A7790_CLK_SCU_SRC5
+                                R8A7790_CLK_SCU_SRC4 R8A7790_CLK_SCU_SRC3 R8A7790_CLK_SCU_SRC2 R8A7790_CLK_SCU_SRC1 R8A7790_CLK_SCU_SRC0
+                        >;
+                        clock-output-names =
+                                "ssi-all",
+                                "ssi9", "ssi8", "ssi7", "ssi6", "ssi5",
+                                "ssi4", "ssi3", "ssi2", "ssi1", "ssi0",
+                                "scu-all",
+                                "scu-dvc1", "scu-dvc0",
+                                "scu-src9", "scu-src8", "scu-src7", "scu-src6", "scu-src5",
+                                "scu-src4", "scu-src3", "scu-src2", "scu-src1", "scu-src0";
+                };
         };
 
         qspi: spi@e6b10000 {
@@ -876,4 +929,152 @@
                 #size-cells = <0>;
                 status = "disabled";
         };
+
+        pci0: pci@ee090000 {
+                compatible = "renesas,pci-r8a7790";
+                device_type = "pci";
+                clocks = <&mstp7_clks R8A7790_CLK_EHCI>;
+                reg = <0 0xee090000 0 0xc00>,
+                      <0 0xee080000 0 0x1100>;
+                interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+
+                bus-range = <0 0>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                #interrupt-cells = <1>;
+                ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                interrupt-map-mask = <0xff00 0 0 0x7>;
+                interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+                                 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+                                 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
+        pci1: pci@ee0b0000 {
+                compatible = "renesas,pci-r8a7790";
+                device_type = "pci";
+                clocks = <&mstp7_clks R8A7790_CLK_EHCI>;
+                reg = <0 0xee0b0000 0 0xc00>,
+                      <0 0xee0a0000 0 0x1100>;
+                interrupts = <0 112 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+
+                bus-range = <1 1>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                #interrupt-cells = <1>;
+                ranges = <0x02000000 0 0xee0a0000 0 0xee0a0000 0 0x00010000>;
+                interrupt-map-mask = <0xff00 0 0 0x7>;
+                interrupt-map = <0x0000 0 0 1 &gic 0 112 IRQ_TYPE_LEVEL_HIGH
+                                 0x0800 0 0 1 &gic 0 112 IRQ_TYPE_LEVEL_HIGH
+                                 0x1000 0 0 2 &gic 0 112 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
+        pci2: pci@ee0d0000 {
+                compatible = "renesas,pci-r8a7790";
+                device_type = "pci";
+                clocks = <&mstp7_clks R8A7790_CLK_EHCI>;
+                reg = <0 0xee0d0000 0 0xc00>,
+                      <0 0xee0c0000 0 0x1100>;
+                interrupts = <0 113 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+
+                bus-range = <2 2>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                #interrupt-cells = <1>;
+                ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                interrupt-map-mask = <0xff00 0 0 0x7>;
+                interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+                                 0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+                                 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
+        pciec: pcie@fe000000 {
+                compatible = "renesas,pcie-r8a7790";
+                reg = <0 0xfe000000 0 0x80000>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                bus-range = <0x00 0xff>;
+                device_type = "pci";
+                ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+                          0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+                          0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+                          0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+                /* Map all possible DDR as inbound ranges */
+                dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+                              0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
+                interrupts = <0 116 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 117 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 118 IRQ_TYPE_LEVEL_HIGH>;
+                #interrupt-cells = <1>;
+                interrupt-map-mask = <0 0 0 0>;
+                interrupt-map = <0 0 0 0 &gic 0 116 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp3_clks R8A7790_CLK_PCIEC>, <&pcie_bus_clk>;
+                clock-names = "pcie", "pcie_bus";
+                status = "disabled";
+        };
+
+        rcar_sound: rcar_sound@0xec500000 {
+                #sound-dai-cells = <1>;
+                compatible =  "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
+                interrupt-parent = <&gic>;
+                reg =   <0 0xec500000 0 0x1000>, /* SCU */
+                        <0 0xec5a0000 0 0x100>,  /* ADG */
+                        <0 0xec540000 0 0x1000>, /* SSIU */
+                        <0 0xec541000 0 0x1280>; /* SSI */
+                clocks = <&mstp10_clks R8A7790_CLK_SSI_ALL>,
+                        <&mstp10_clks R8A7790_CLK_SSI9>, <&mstp10_clks R8A7790_CLK_SSI8>,
+                        <&mstp10_clks R8A7790_CLK_SSI7>, <&mstp10_clks R8A7790_CLK_SSI6>,
+                        <&mstp10_clks R8A7790_CLK_SSI5>, <&mstp10_clks R8A7790_CLK_SSI4>,
+                        <&mstp10_clks R8A7790_CLK_SSI3>, <&mstp10_clks R8A7790_CLK_SSI2>,
+                        <&mstp10_clks R8A7790_CLK_SSI1>, <&mstp10_clks R8A7790_CLK_SSI0>,
+                        <&mstp10_clks R8A7790_CLK_SCU_SRC9>, <&mstp10_clks R8A7790_CLK_SCU_SRC8>,
+                        <&mstp10_clks R8A7790_CLK_SCU_SRC7>, <&mstp10_clks R8A7790_CLK_SCU_SRC6>,
+                        <&mstp10_clks R8A7790_CLK_SCU_SRC5>, <&mstp10_clks R8A7790_CLK_SCU_SRC4>,
+                        <&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>,
+                        <&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>,
+                        <&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>,
+                        <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
+                clock-names = "ssi-all",
+                                "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
+                                "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
+                                "src.9", "src.8", "src.7", "src.6", "src.5",
+                                "src.4", "src.3", "src.2", "src.1", "src.0",
+                                "dvc.0", "dvc.1",
+                                "clk_a", "clk_b", "clk_c", "clk_i";
+
+                status = "disabled";
+
+                rcar_sound,dvc {
+                        dvc0: dvc@0 { };
+                        dvc1: dvc@1 { };
+                };
+
+                rcar_sound,src {
+                        src0: src@0 { };
+                        src1: src@1 { };
+                        src2: src@2 { };
+                        src3: src@3 { };
+                        src4: src@4 { };
+                        src5: src@5 { };
+                        src6: src@6 { };
+                        src7: src@7 { };
+                        src8: src@8 { };
+                        src9: src@9 { };
+                };
+
+                rcar_sound,ssi {
+                        ssi0: ssi@0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi1: ssi@1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi2: ssi@2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi3: ssi@3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi4: ssi@4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi5: ssi@5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi6: ssi@6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi7: ssi@7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi8: ssi@8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi9: ssi@9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts
index cc6d992e8db2..3a2ef0a2a137 100644
--- a/arch/arm/boot/dts/r8a7791-henninger.dts
+++ b/arch/arm/boot/dts/r8a7791-henninger.dts
@@ -110,6 +110,11 @@
                 renesas,function = "sdhi2";
         };
 
+        i2c2_pins: i2c2 {
+                renesas,groups = "i2c2";
+                renesas,function = "i2c2";
+        };
+
         qspi_pins: spi0 {
                 renesas,groups = "qspi_ctrl", "qspi_data4";
                 renesas,function = "qspi";
@@ -120,6 +125,16 @@
                                  "msiof0_tx";
                 renesas,function = "msiof0";
         };
+
+        usb0_pins: usb0 {
+                renesas,groups = "usb0";
+                renesas,function = "usb0";
+        };
+
+        usb1_pins: usb1 {
+                renesas,groups = "usb1";
+                renesas,function = "usb1";
+        };
 };
 
 &scif0 {
@@ -146,7 +161,7 @@
 };
 
 &sata0 {
-       status = "okay";
+        status = "okay";
 };
 
 &sdhi0 {
@@ -170,6 +185,14 @@
         status = "okay";
 };
 
+&i2c2 {
+        pinctrl-0 = <&i2c2_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+        clock-frequency = <400000>;
+};
+
 &qspi {
         pinctrl-0 = <&qspi_pins>;
         pinctrl-names = "default";
@@ -217,3 +240,23 @@
                 spi-cpha;
         };
 };
+
+&pci0 {
+        status = "okay";
+        pinctrl-0 = <&usb0_pins>;
+        pinctrl-names = "default";
+};
+
+&pci1 {
+        status = "okay";
+        pinctrl-0 = <&usb1_pins>;
+        pinctrl-names = "default";
+};
+
+&pcie_bus_clk {
+        status = "okay";
+};
+
+&pciec {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 05d44f9b202f..23486c081a69 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -215,25 +215,6 @@
         clock-frequency = <20000000>;
 };
 
-&i2c2 {
-        pinctrl-0 = <&i2c2_pins>;
-        pinctrl-names = "default";
-
-        status = "okay";
-        clock-frequency = <400000>;
-
-        eeprom@50 {
-                compatible = "renesas,24c02";
-                reg = <0x50>;
-                pagesize = <16>;
-        };
-};
-
-&i2c6 {
-        status = "okay";
-        clock-frequency = <100000>;
-};
-
 &pfc {
         pinctrl-0 = <&du_pins>;
         pinctrl-names = "default";
@@ -293,6 +274,21 @@
                                  "msiof0_tx";
                 renesas,function = "msiof0";
         };
+
+        i2c6_pins: i2c6 {
+                renesas,groups = "i2c6";
+                renesas,function = "i2c6";
+        };
+
+        usb0_pins: usb0 {
+                renesas,groups = "usb0";
+                renesas,function = "usb0";
+        };
+
+        usb1_pins: usb1 {
+                renesas,groups = "usb1";
+                renesas,function = "usb1";
+        };
 };
 
 &ether {
@@ -408,3 +404,58 @@
                 spi-cpha;
         };
 };
+
+&i2c2 {
+        pinctrl-0 = <&i2c2_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+        clock-frequency = <400000>;
+
+        eeprom@50 {
+                compatible = "renesas,24c02";
+                reg = <0x50>;
+                pagesize = <16>;
+        };
+};
+
+&i2c6 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c6_pins>;
+        status = "okay";
+        clock-frequency = <100000>;
+
+        vdd_dvfs: regulator@68 {
+                compatible = "diasemi,da9210";
+                reg = <0x68>;
+
+                regulator-min-microvolt = <1000000>;
+                regulator-max-microvolt = <1000000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+};
+
+&pci0 {
+        status = "okay";
+        pinctrl-0 = <&usb0_pins>;
+        pinctrl-names = "default";
+};
+
+&pci1 {
+        status = "okay";
+        pinctrl-0 = <&usb1_pins>;
+        pinctrl-names = "default";
+};
+
+&pcie_bus_clk {
+        status = "okay";
+};
+
+&pciec {
+        status = "okay";
+};
+
+&cpu0 {
+        cpu0-supply = <&vdd_dvfs>;
+};
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 79f68acfd5d4..0d82a4b3c650 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -45,6 +45,17 @@
                         compatible = "arm,cortex-a15";
                         reg = <0>;
                         clock-frequency = <1500000000>;
+                        voltage-tolerance = <1>; /* 1% */
+                        clocks = <&cpg_clocks R8A7791_CLK_Z>;
+                        clock-latency = <300000>; /* 300 us */
+
+                        /* kHz - uV - OPPs unknown yet */
+                        operating-points = <1500000 1000000>,
+                                           <1312500 1000000>,
+                                           <1125000 1000000>,
+                                           < 937500 1000000>,
+                                           < 750000 1000000>,
+                                           < 375000 1000000>;
                 };
 
                 cpu1: cpu@1 {
@@ -521,6 +532,38 @@
                         clock-output-names = "extal";
                 };
 
+                /*
+                 * The external audio clocks are configured as 0 Hz fixed frequency clocks by
+                 * default. Boards that provide audio clocks should override them.
+                 */
+                audio_clk_a: audio_clk_a {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                        clock-output-names = "audio_clk_a";
+                };
+                audio_clk_b: audio_clk_b {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                        clock-output-names = "audio_clk_b";
+                };
+                audio_clk_c: audio_clk_c {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                        clock-output-names = "audio_clk_c";
+                };
+
+                /* External PCIe clock - can be overridden by the board */
+                pcie_bus_clk: pcie_bus_clk {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <100000000>;
+                        clock-output-names = "pcie_bus";
+                        status = "disabled";
+                };
+
                 /* Special CPG clocks */
                 cpg_clocks: cpg_clocks@e6150000 {
                         compatible = "renesas,r8a7791-cpg-clocks",
@@ -743,30 +786,34 @@
                         compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
                         reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>;
                         clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>,
-                                 <&mp_clk>, <&mp_clk>, <&mp_clk>;
+                                 <&mp_clk>, <&mp_clk>, <&mp_clk>,
+                                 <&zs_clk>, <&zs_clk>;
                         #clock-cells = <1>;
                         renesas,clock-indices = <
                                 R8A7791_CLK_SCIFA2 R8A7791_CLK_SCIFA1 R8A7791_CLK_SCIFA0
                                 R8A7791_CLK_MSIOF2 R8A7791_CLK_SCIFB0 R8A7791_CLK_SCIFB1
                                 R8A7791_CLK_MSIOF1 R8A7791_CLK_SCIFB2
+                                R8A7791_CLK_SYS_DMAC1 R8A7791_CLK_SYS_DMAC0
                         >;
                         clock-output-names =
                                 "scifa2", "scifa1", "scifa0", "msiof2", "scifb0",
-                                "scifb1", "msiof1", "scifb2";
+                                "scifb1", "msiof1", "scifb2",
+                                "sys-dmac1", "sys-dmac0";
                 };
                 mstp3_clks: mstp3_clks@e615013c {
                         compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
                         reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
                         clocks = <&cp_clk>, <&sd2_clk>, <&sd1_clk>, <&cpg_clocks R8A7791_CLK_SD0>,
-                                 <&mmc0_clk>, <&hp_clk>, <&hp_clk>, <&rclk_clk>;
+                                 <&mmc0_clk>, <&hp_clk>, <&mp_clk>, <&hp_clk>, <&mp_clk>, <&rclk_clk>;
                         #clock-cells = <1>;
                         renesas,clock-indices = <
                                 R8A7791_CLK_TPU0 R8A7791_CLK_SDHI2 R8A7791_CLK_SDHI1 R8A7791_CLK_SDHI0
-                                R8A7791_CLK_MMCIF0 R8A7791_CLK_IIC0 R8A7791_CLK_IIC1 R8A7791_CLK_CMT1
+                                R8A7791_CLK_MMCIF0 R8A7791_CLK_IIC0 R8A7791_CLK_PCIEC R8A7791_CLK_IIC1
+                                R8A7791_CLK_SSUSB R8A7791_CLK_CMT1
                         >;
                         clock-output-names =
                                 "tpu0", "sdhi2", "sdhi1", "sdhi0",
-                                "mmcif0", "i2c7", "i2c8", "cmt1";
+                                "mmcif0", "i2c7", "pciec", "i2c8", "ssusb", "cmt1";
                 };
                 mstp5_clks: mstp5_clks@e6150144 {
                         compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
@@ -828,6 +875,39 @@
                                 "rcan1", "rcan0", "qspi_mod", "i2c5", "i2c6", "i2c4", "i2c3", "i2c2",
                                 "i2c1", "i2c0";
                 };
+                mstp10_clks: mstp10_clks@e6150998 {
+                        compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
+                        reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>;
+                        clocks = <&p_clk>,
+                                <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
+                                <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>,
+                                <&p_clk>,
+                                <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
+                                <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>;
+
+                        #clock-cells = <1>;
+                        clock-indices = <
+                                R8A7791_CLK_SSI_ALL
+                                R8A7791_CLK_SSI9 R8A7791_CLK_SSI8 R8A7791_CLK_SSI7 R8A7791_CLK_SSI6 R8A7791_CLK_SSI5
+                                R8A7791_CLK_SSI4 R8A7791_CLK_SSI3 R8A7791_CLK_SSI2 R8A7791_CLK_SSI1 R8A7791_CLK_SSI0
+                                R8A7791_CLK_SCU_ALL
+                                R8A7791_CLK_SCU_DVC1 R8A7791_CLK_SCU_DVC0
+                                R8A7791_CLK_SCU_SRC9 R8A7791_CLK_SCU_SRC8 R8A7791_CLK_SCU_SRC7 R8A7791_CLK_SCU_SRC6 R8A7791_CLK_SCU_SRC5
+                                R8A7791_CLK_SCU_SRC4 R8A7791_CLK_SCU_SRC3 R8A7791_CLK_SCU_SRC2 R8A7791_CLK_SCU_SRC1 R8A7791_CLK_SCU_SRC0
+                        >;
+                        clock-output-names =
+                                "ssi-all",
+                                "ssi9", "ssi8", "ssi7", "ssi6", "ssi5",
+                                "ssi4", "ssi3", "ssi2", "ssi1", "ssi0",
+                                "scu-all",
+                                "scu-dvc1", "scu-dvc0",
+                                "scu-src9", "scu-src8", "scu-src7", "scu-src6", "scu-src5",
+                                "scu-src4", "scu-src3", "scu-src2", "scu-src1", "scu-src0";
+                };
                 mstp11_clks: mstp11_clks@e615099c {
                         compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
                         reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;
@@ -880,4 +960,132 @@
                 #size-cells = <0>;
                 status = "disabled";
         };
+
+        pci0: pci@ee090000 {
+                compatible = "renesas,pci-r8a7791";
+                device_type = "pci";
+                clocks = <&mstp7_clks R8A7791_CLK_EHCI>;
+                reg = <0 0xee090000 0 0xc00>,
+                      <0 0xee080000 0 0x1100>;
+                interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+
+                bus-range = <0 0>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                #interrupt-cells = <1>;
+                ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;
+                interrupt-map-mask = <0xff00 0 0 0x7>;
+                interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+                                 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH
+                                 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
+        pci1: pci@ee0d0000 {
+                compatible = "renesas,pci-r8a7791";
+                device_type = "pci";
+                clocks = <&mstp7_clks R8A7791_CLK_EHCI>;
+                reg = <0 0xee0d0000 0 0xc00>,
+                      <0 0xee0c0000 0 0x1100>;
+                interrupts = <0 113 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+
+                bus-range = <1 1>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                #interrupt-cells = <1>;
+                ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;
+                interrupt-map-mask = <0xff00 0 0 0x7>;
+                interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+                                 0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH
+                                 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
+        };
+
+        pciec: pcie@fe000000 {
+                compatible = "renesas,pcie-r8a7791";
+                reg = <0 0xfe000000 0 0x80000>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                bus-range = <0x00 0xff>;
+                device_type = "pci";
+                ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+                          0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+                          0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+                          0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+                /* Map all possible DDR as inbound ranges */
+                dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+                              0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
+                interrupts = <0 116 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 117 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 118 IRQ_TYPE_LEVEL_HIGH>;
+                #interrupt-cells = <1>;
+                interrupt-map-mask = <0 0 0 0>;
+                interrupt-map = <0 0 0 0 &gic 0 116 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp3_clks R8A7791_CLK_PCIEC>, <&pcie_bus_clk>;
+                clock-names = "pcie", "pcie_bus";
+                status = "disabled";
+        };
+
+        rcar_sound: rcar_sound@0xec500000 {
+                #sound-dai-cells = <1>;
+                compatible =  "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
+                interrupt-parent = <&gic>;
+                reg =   <0 0xec500000 0 0x1000>, /* SCU */
+                        <0 0xec5a0000 0 0x100>,  /* ADG */
+                        <0 0xec540000 0 0x1000>, /* SSIU */
+                        <0 0xec541000 0 0x1280>; /* SSI */
+                clocks = <&mstp10_clks R8A7791_CLK_SSI_ALL>,
+                        <&mstp10_clks R8A7791_CLK_SSI9>, <&mstp10_clks R8A7791_CLK_SSI8>,
+                        <&mstp10_clks R8A7791_CLK_SSI7>, <&mstp10_clks R8A7791_CLK_SSI6>,
+                        <&mstp10_clks R8A7791_CLK_SSI5>, <&mstp10_clks R8A7791_CLK_SSI4>,
+                        <&mstp10_clks R8A7791_CLK_SSI3>, <&mstp10_clks R8A7791_CLK_SSI2>,
+                        <&mstp10_clks R8A7791_CLK_SSI1>, <&mstp10_clks R8A7791_CLK_SSI0>,
+                        <&mstp10_clks R8A7791_CLK_SCU_SRC9>, <&mstp10_clks R8A7791_CLK_SCU_SRC8>,
+                        <&mstp10_clks R8A7791_CLK_SCU_SRC7>, <&mstp10_clks R8A7791_CLK_SCU_SRC6>,
+                        <&mstp10_clks R8A7791_CLK_SCU_SRC5>, <&mstp10_clks R8A7791_CLK_SCU_SRC4>,
+                        <&mstp10_clks R8A7791_CLK_SCU_SRC3>, <&mstp10_clks R8A7791_CLK_SCU_SRC2>,
+                        <&mstp10_clks R8A7791_CLK_SCU_SRC1>, <&mstp10_clks R8A7791_CLK_SCU_SRC0>,
+                        <&mstp10_clks R8A7791_CLK_SCU_DVC0>, <&mstp10_clks R8A7791_CLK_SCU_DVC1>,
+                        <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
+                clock-names = "ssi-all",
+                                "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
+                                "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
+                                "src.9", "src.8", "src.7", "src.6", "src.5",
+                                "src.4", "src.3", "src.2", "src.1", "src.0",
+                                "dvc.0", "dvc.1",
+                                "clk_a", "clk_b", "clk_c", "clk_i";
+
+                status = "disabled";
+
+                rcar_sound,dvc {
+                        dvc0: dvc@0 { };
+                        dvc1: dvc@1 { };
+                };
+
+                rcar_sound,src {
+                        src0: src@0 { };
+                        src1: src@1 { };
+                        src2: src@2 { };
+                        src3: src@3 { };
+                        src4: src@4 { };
+                        src5: src@5 { };
+                        src6: src@6 { };
+                        src7: src@7 { };
+                        src8: src@8 { };
+                        src9: src@9 { };
+                };
+
+                rcar_sound,ssi {
+                        ssi0: ssi@0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi1: ssi@1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi2: ssi@2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi3: ssi@3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi4: ssi@4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi5: ssi@5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi6: ssi@6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi7: ssi@7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi8: ssi@8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };
+                        ssi9: ssi@9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index afb327322a4a..042f821d9e4d 100644
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -24,87 +24,171 @@
                 reg = <0x60000000 0x40000000>;
         };
 
-        soc {
-                uart0: serial@10124000 {
-                        status = "okay";
-                };
+        vcc_sd0: fixed-regulator {
+                compatible = "regulator-fixed";
+                regulator-name = "sdmmc-supply";
+                regulator-min-microvolt = <3000000>;
+                regulator-max-microvolt = <3000000>;
+                gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;
+                startup-delay-us = <100000>;
+                vin-supply = <&vcc_io>;
+        };
 
-                uart1: serial@10126000 {
-                        status = "okay";
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+
+                button@0 {
+                        gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
+                        linux,code = <116>;
+                        label = "GPIO Key Power";
+                        linux,input-type = <1>;
+                        gpio-key,wakeup = <1>;
+                        debounce-interval = <100>;
                 };
-
-                uart2: serial@20064000 {
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&uart2_xfer>;
-                        status = "okay";
+                button@1 {
+                        gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
+                        linux,code = <104>;
+                        label = "GPIO Key Vol-";
+                        linux,input-type = <1>;
+                        gpio-key,wakeup = <0>;
+                        debounce-interval = <100>;
                 };
+                /* VOL+ comes somehow thru the ADC */
+        };
+};
 
-                uart3: serial@20068000 {
-                        status = "okay";
-                };
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
 
-                vcc_sd0: fixed-regulator {
-                        compatible = "regulator-fixed";
-                        regulator-name = "sdmmc-supply";
-                        regulator-min-microvolt = <3000000>;
-                        regulator-max-microvolt = <3000000>;
-                        gpio = <&gpio3 7 GPIO_ACTIVE_LOW>;
-                        startup-delay-us = <100000>;
-                };
+        tps: tps@2d {
+                reg = <0x2d>;
 
-                dwmmc@10214000 { /* sdmmc */
-                        num-slots = <1>;
-                        status = "okay";
+                interrupt-parent = <&gpio6>;
+                interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
 
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
-                        vmmc-supply = <&vcc_sd0>;
+                vcc5-supply = <&vcc_io>;
+                vcc6-supply = <&vcc_io>;
 
-                        slot@0 {
-                                reg = <0>;
-                                bus-width = <4>;
-                                disable-wp;
+                regulators {
+                        vcc_rtc: regulator@0 {
+                                regulator-name = "vcc_rtc";
+                                regulator-always-on;
                         };
-                };
 
-                dwmmc@10218000 { /* wifi */
-                        num-slots = <1>;
-                        status = "okay";
-                        non-removable;
+                        vcc_io: regulator@1 {
+                                regulator-name = "vcc_io";
+                                regulator-always-on;
+                        };
 
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
+                        vdd_arm: regulator@2 {
+                                regulator-name = "vdd_arm";
+                                regulator-min-microvolt = <600000>;
+                                regulator-max-microvolt = <1500000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
 
-                        slot@0 {
-                                reg = <0>;
-                                bus-width = <4>;
-                                disable-wp;
+                        vcc_ddr: regulator@3 {
+                                regulator-name = "vcc_ddr";
+                                regulator-min-microvolt = <600000>;
+                                regulator-max-microvolt = <1500000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+
+                        vcc18_cif: regulator@5 {
+                                regulator-name = "vcc18_cif";
+                                regulator-always-on;
+                        };
+
+                        vdd_11: regulator@6 {
+                                regulator-name = "vdd_11";
+                                regulator-always-on;
+                        };
+
+                        vcc_25: regulator@7 {
+                                regulator-name = "vcc_25";
+                                regulator-always-on;
+                        };
+
+                        vcc_18: regulator@8 {
+                                regulator-name = "vcc_18";
+                                regulator-always-on;
+                        };
+
+                        vcc25_hdmi: regulator@9 {
+                                regulator-name = "vcc25_hdmi";
+                                regulator-always-on;
+                        };
+
+                        vcca_33: regulator@10 {
+                                regulator-name = "vcca_33";
+                                regulator-always-on;
                         };
-                };
 
-                gpio-keys {
-                        compatible = "gpio-keys";
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        autorepeat;
-
-                        button@0 {
-                                gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
-                                linux,code = <116>;
-                                label = "GPIO Key Power";
-                                linux,input-type = <1>;
-                                gpio-key,wakeup = <1>;
-                                debounce-interval = <100>;
+                        vcc_tp: regulator@11 {
+                                regulator-name = "vcc_tp";
+                                regulator-always-on;
                         };
-                        button@1 {
-                                gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
-                                linux,code = <104>;
-                                label = "GPIO Key Vol-";
-                                linux,input-type = <1>;
-                                gpio-key,wakeup = <0>;
-                                debounce-interval = <100>;
+
+                        vcc28_cif: regulator@12 {
+                                regulator-name = "vcc28_cif";
+                                regulator-always-on;
                         };
-                        /* VOL+ comes somehow thru the ADC */
                 };
         };
 };
+
+/* must be included after &tps gets defined */
+#include "tps65910.dtsi"
+
+&mmc0 { /* sdmmc */
+        num-slots = <1>;
+        status = "okay";
+        vmmc-supply = <&vcc_sd0>;
+
+        slot@0 {
+                reg = <0>;
+                bus-width = <4>;
+                disable-wp;
+        };
+};
+
+&mmc1 { /* wifi */
+        num-slots = <1>;
+        status = "okay";
+        non-removable;
+
+        pinctrl-names = "default";
+        pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
+
+        slot@0 {
+                reg = <0>;
+                bus-width = <4>;
+                disable-wp;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&wdt {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/rk3066a-clocks.dtsi b/arch/arm/boot/dts/rk3066a-clocks.dtsi
deleted file mode 100644
index 6e307fc4c451..000000000000
--- a/arch/arm/boot/dts/rk3066a-clocks.dtsi
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (c) 2013 MundoReader S.L.
- * Author: Heiko Stuebner <heiko@sntech.de>
- *
- * 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.
- */
-
-/ {
-        clocks {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                ranges;
-
-                /*
-                 * 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.
-                 */
-                dummy: dummy {
-                        compatible = "fixed-clock";
-                        clock-frequency = <0>;
-                        #clock-cells = <0>;
-                };
-
-                xin24m: xin24m {
-                        compatible = "fixed-clock";
-                        clock-frequency = <24000000>;
-                        #clock-cells = <0>;
-                };
-
-                dummy48m: dummy48m {
-                        compatible = "fixed-clock";
-                        clock-frequency = <48000000>;
-                        #clock-cells = <0>;
-                };
-
-                dummy150m: dummy150m {
-                        compatible = "fixed-clock";
-                        clock-frequency = <150000000>;
-                        #clock-cells = <0>;
-                };
-
-                clk_gates0: gate-clk@200000d0 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000d0 0x4>;
-                        clocks = <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_core_periph", "gate_cpu_gpll",
-                                "gate_ddrphy", "gate_aclk_cpu",
-                                "gate_hclk_cpu", "gate_pclk_cpu",
-                                "gate_atclk_cpu", "gate_i2s0",
-                                "gate_i2s0_frac", "gate_i2s1",
-                                "gate_i2s1_frac", "gate_i2s2",
-                                "gate_i2s2_frac", "gate_spdif",
-                                "gate_spdif_frac", "gate_testclk";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates1: gate-clk@200000d4 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000d4 0x4>;
-                        clocks = <&xin24m>, <&xin24m>,
-                                 <&xin24m>, <&dummy>,
-                                 <&dummy>, <&xin24m>,
-                                 <&xin24m>, <&dummy>,
-                                 <&xin24m>, <&dummy>,
-                                 <&xin24m>, <&dummy>,
-                                 <&xin24m>, <&dummy>,
-                                 <&xin24m>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_timer0", "gate_timer1",
-                                "gate_timer2", "gate_jtag",
-                                "gate_aclk_lcdc1_src", "gate_otgphy0",
-                                "gate_otgphy1", "gate_ddr_gpll",
-                                "gate_uart0", "gate_frac_uart0",
-                                "gate_uart1", "gate_frac_uart1",
-                                "gate_uart2", "gate_frac_uart2",
-                                "gate_uart3", "gate_frac_uart3";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates2: gate-clk@200000d8 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000d8 0x4>;
-                        clocks = <&clk_gates2 1>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&clk_gates2 3>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy48m>,
-                                 <&dummy>, <&dummy48m>,
-                                 <&dummy>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_periph_src", "gate_aclk_periph",
-                                "gate_hclk_periph", "gate_pclk_periph",
-                                "gate_smc", "gate_mac",
-                                "gate_hsadc", "gate_hsadc_frac",
-                                "gate_saradc", "gate_spi0",
-                                "gate_spi1", "gate_mmc0",
-                                "gate_mac_lbtest", "gate_mmc1",
-                                "gate_emmc", "gate_tsadc";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates3: gate-clk@200000dc {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000dc 0x4>;
-                        clocks = <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_aclk_lcdc0_src", "gate_dclk_lcdc0",
-                                "gate_dclk_lcdc1", "gate_pclkin_cif0",
-                                "gate_pclkin_cif1", "reserved",
-                                "reserved", "gate_cif0_out",
-                                "gate_cif1_out", "gate_aclk_vepu",
-                                "gate_hclk_vepu", "gate_aclk_vdpu",
-                                "gate_hclk_vdpu", "gate_gpu_src",
-                                "reserved", "gate_xin27m";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates4: gate-clk@200000e0 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000e0 0x4>;
-                        clocks = <&clk_gates2 2>, <&clk_gates2 3>,
-                                 <&clk_gates2 1>, <&clk_gates2 1>,
-                                 <&clk_gates2 1>, <&clk_gates2 2>,
-                                 <&clk_gates2 2>, <&clk_gates2 2>,
-                                 <&clk_gates0 4>, <&clk_gates0 4>,
-                                 <&clk_gates0 3>, <&clk_gates0 3>,
-                                 <&clk_gates0 3>, <&clk_gates2 3>,
-                                 <&clk_gates0 4>;
-
-                        clock-output-names =
-                                "gate_hclk_peri_axi_matrix", "gate_pclk_peri_axi_matrix",
-                                "gate_aclk_cpu_peri", "gate_aclk_peri_axi_matrix",
-                                "gate_aclk_pei_niu", "gate_hclk_usb_peri",
-                                "gate_hclk_peri_ahb_arbi", "gate_hclk_emem_peri",
-                                "gate_hclk_cpubus", "gate_hclk_ahb2apb",
-                                "gate_aclk_strc_sys", "gate_aclk_l2mem_con",
-                                "gate_aclk_intmem", "gate_pclk_tsadc",
-                                "gate_hclk_hdmi";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates5: gate-clk@200000e4 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000e4 0x4>;
-                        clocks = <&clk_gates0 3>, <&clk_gates2 1>,
-                                 <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates0 4>, <&clk_gates0 5>,
-                                 <&clk_gates2 1>, <&clk_gates2 2>,
-                                 <&clk_gates2 2>, <&clk_gates2 2>,
-                                 <&clk_gates2 2>, <&clk_gates4 5>,
-                                 <&clk_gates4 5>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_aclk_dmac1", "gate_aclk_dmac2",
-                                "gate_pclk_efuse", "gate_pclk_tzpc",
-                                "gate_pclk_grf", "gate_pclk_pmu",
-                                "gate_hclk_rom", "gate_pclk_ddrupctl",
-                                "gate_aclk_smc", "gate_hclk_nandc",
-                                "gate_hclk_mmc0", "gate_hclk_mmc1",
-                                "gate_hclk_emmc", "gate_hclk_otg0",
-                                "gate_hclk_otg1", "gate_aclk_gpu";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates6: gate-clk@200000e8 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000e8 0x4>;
-                        clocks = <&clk_gates3 0>, <&clk_gates0 4>,
-                                 <&clk_gates0 4>, <&clk_gates1 4>,
-                                 <&clk_gates0 4>, <&clk_gates3 0>,
-                                 <&clk_gates0 4>, <&clk_gates1 4>,
-                                 <&clk_gates3 0>, <&clk_gates0 4>,
-                                 <&clk_gates0 4>, <&clk_gates1 4>,
-                                 <&clk_gates0 4>, <&clk_gates3 0>,
-                                 <&dummy>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_aclk_lcdc0", "gate_hclk_lcdc0",
-                                "gate_hclk_lcdc1", "gate_aclk_lcdc1",
-                                "gate_hclk_cif0", "gate_aclk_cif0",
-                                "gate_hclk_cif1", "gate_aclk_cif1",
-                                "gate_aclk_ipp", "gate_hclk_ipp",
-                                "gate_hclk_rga", "gate_aclk_rga",
-                                "gate_hclk_vio_bus", "gate_aclk_vio0",
-                                "gate_aclk_vcodec", "gate_shclk_vio_h2h";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates7: gate-clk@200000ec {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000ec 0x4>;
-                        clocks = <&clk_gates2 2>, <&clk_gates0 4>,
-                                 <&clk_gates0 4>, <&clk_gates0 4>,
-                                 <&clk_gates0 4>, <&clk_gates2 2>,
-                                 <&clk_gates2 2>, <&clk_gates0 5>,
-                                 <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates0 5>, <&clk_gates2 3>,
-                                 <&clk_gates2 3>, <&clk_gates2 3>,
-                                 <&clk_gates2 3>, <&clk_gates2 3>;
-
-                        clock-output-names =
-                                "gate_hclk_emac", "gate_hclk_spdif",
-                                "gate_hclk_i2s0_2ch", "gate_hclk_i2s1_2ch",
-                                "gate_hclk_i2s_8ch", "gate_hclk_hsadc",
-                                "gate_hclk_pidf", "gate_pclk_timer0",
-                                "gate_pclk_timer1", "gate_pclk_timer2",
-                                "gate_pclk_pwm01", "gate_pclk_pwm23",
-                                "gate_pclk_spi0", "gate_pclk_spi1",
-                                "gate_pclk_saradc", "gate_pclk_wdt";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates8: gate-clk@200000f0 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000f0 0x4>;
-                        clocks = <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates2 3>, <&clk_gates2 3>,
-                                 <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates2 3>, <&clk_gates2 3>,
-                                 <&clk_gates2 3>, <&clk_gates0 5>,
-                                 <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates2 3>, <&clk_gates2 3>,
-                                 <&dummy>, <&clk_gates0 5>;
-
-                        clock-output-names =
-                                "gate_pclk_uart0", "gate_pclk_uart1",
-                                "gate_pclk_uart2", "gate_pclk_uart3",
-                                "gate_pclk_i2c0", "gate_pclk_i2c1",
-                                "gate_pclk_i2c2", "gate_pclk_i2c3",
-                                "gate_pclk_i2c4", "gate_pclk_gpio0",
-                                "gate_pclk_gpio1", "gate_pclk_gpio2",
-                                "gate_pclk_gpio3", "gate_pclk_gpio4",
-                                "reserved", "gate_pclk_gpio6";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates9: gate-clk@200000f4 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000f4 0x4>;
-                        clocks = <&dummy>, <&clk_gates0 5>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&clk_gates1 4>,
-                                 <&clk_gates0 5>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>;
-
-                        clock-output-names =
-                                "gate_clk_core_dbg", "gate_pclk_dbg",
-                                "gate_clk_trace", "gate_atclk",
-                                "gate_clk_l2c", "gate_aclk_vio1",
-                                "gate_pclk_publ", "gate_aclk_intmem0",
-                                "gate_aclk_intmem1", "gate_aclk_intmem2",
-                                "gate_aclk_intmem3";
-
-                        #clock-cells = <1>;
-                };
-        };
-
-};
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index 4387cfd420ba..879a818fba51 100644
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -15,8 +15,8 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/clock/rk3066a-cru.h>
 #include "rk3xxx.dtsi"
-#include "rk3066a-clocks.dtsi"
 
 / {
         compatible = "rockchip,rk3066a";
@@ -40,247 +40,392 @@
                 };
         };
 
-        soc {
-                timer@20038000 {
-                        compatible = "snps,dw-apb-timer-osc";
-                        reg = <0x20038000 0x100>;
-                        interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clk_gates1 0>, <&clk_gates7 7>;
-                        clock-names = "timer", "pclk";
+        sram: sram@10080000 {
+                compatible = "mmio-sram";
+                reg = <0x10080000 0x10000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0x10080000 0x10000>;
+
+                smp-sram@0 {
+                        compatible = "rockchip,rk3066-smp-sram";
+                        reg = <0x0 0x50>;
                 };
+        };
+
+        cru: clock-controller@20000000 {
+                compatible = "rockchip,rk3066a-cru";
+                reg = <0x20000000 0x1000>;
+                rockchip,grf = <&grf>;
 
-                timer@2003a000 {
-                        compatible = "snps,dw-apb-timer-osc";
-                        reg = <0x2003a000 0x100>;
-                        interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clk_gates1 1>, <&clk_gates7 8>;
-                        clock-names = "timer", "pclk";
+                #clock-cells = <1>;
+                #reset-cells = <1>;
+        };
+
+        timer@2000e000 {
+                compatible = "snps,dw-apb-timer-osc";
+                reg = <0x2000e000 0x100>;
+                interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cru SCLK_TIMER2>, <&cru PCLK_TIMER2>;
+                clock-names = "timer", "pclk";
+        };
+
+        timer@20038000 {
+                compatible = "snps,dw-apb-timer-osc";
+                reg = <0x20038000 0x100>;
+                interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cru SCLK_TIMER0>, <&cru PCLK_TIMER0>;
+                clock-names = "timer", "pclk";
+        };
+
+        timer@2003a000 {
+                compatible = "snps,dw-apb-timer-osc";
+                reg = <0x2003a000 0x100>;
+                interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cru SCLK_TIMER1>, <&cru PCLK_TIMER1>;
+                clock-names = "timer", "pclk";
+        };
+
+        pinctrl: pinctrl {
+                compatible = "rockchip,rk3066a-pinctrl";
+                rockchip,grf = <&grf>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                gpio0: gpio0@20034000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0x20034000 0x100>;
+                        interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO0>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
                 };
 
-                timer@2000e000 {
-                        compatible = "snps,dw-apb-timer-osc";
-                        reg = <0x2000e000 0x100>;
-                        interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
-                        clocks = <&clk_gates1 2>, <&clk_gates7 9>;
-                        clock-names = "timer", "pclk";
+                gpio1: gpio1@2003c000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0x2003c000 0x100>;
+                        interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO1>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
                 };
 
-                sram: sram@10080000 {
-                        compatible = "mmio-sram";
-                        reg = <0x10080000 0x10000>;
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        ranges = <0 0x10080000 0x10000>;
+                gpio2: gpio2@2003e000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0x2003e000 0x100>;
+                        interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO2>;
 
-                        smp-sram@0 {
-                                compatible = "rockchip,rk3066-smp-sram";
-                                reg = <0x0 0x50>;
-                        };
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio3: gpio3@20080000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0x20080000 0x100>;
+                        interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO3>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
                 };
 
-                pinctrl@20008000 {
-                        compatible = "rockchip,rk3066a-pinctrl";
-                        rockchip,grf = <&grf>;
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        ranges;
+                gpio4: gpio4@20084000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0x20084000 0x100>;
+                        interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO4>;
 
-                        gpio0: gpio0@20034000 {
-                                compatible = "rockchip,gpio-bank";
-                                reg = <0x20034000 0x100>;
-                                interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 9>;
+                        gpio-controller;
+                        #gpio-cells = <2>;
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
+                gpio6: gpio6@2000a000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0x2000a000 0x100>;
+                        interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO6>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                pcfg_pull_default: pcfg_pull_default {
+                        bias-pull-pin-default;
+                };
+
+                pcfg_pull_none: pcfg_pull_none {
+                        bias-disable;
+                };
+
+                i2c0 {
+                        i2c0_xfer: i2c0-xfer {
+                                rockchip,pins = <RK_GPIO2 28 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO2 29 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        gpio1: gpio1@2003c000 {
-                                compatible = "rockchip,gpio-bank";
-                                reg = <0x2003c000 0x100>;
-                                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 10>;
+                i2c1 {
+                        i2c1_xfer: i2c1-xfer {
+                                rockchip,pins = <RK_GPIO2 30 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO2 31 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                i2c2 {
+                        i2c2_xfer: i2c2-xfer {
+                                rockchip,pins = <RK_GPIO3 0 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO3 1 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
+                i2c3 {
+                        i2c3_xfer: i2c3-xfer {
+                                rockchip,pins = <RK_GPIO3 2 RK_FUNC_2 &pcfg_pull_none>,
+                                                <RK_GPIO3 3 RK_FUNC_2 &pcfg_pull_none>;
                         };
+                };
 
-                        gpio2: gpio2@2003e000 {
-                                compatible = "rockchip,gpio-bank";
-                                reg = <0x2003e000 0x100>;
-                                interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 11>;
+                i2c4 {
+                        i2c4_xfer: i2c4-xfer {
+                                rockchip,pins = <RK_GPIO3 4 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO3 5 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                pwm0 {
+                        pwm0_out: pwm0-out {
+                                rockchip,pins = <RK_GPIO0 3 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
+                pwm1 {
+                        pwm1_out: pwm1-out {
+                                rockchip,pins = <RK_GPIO0 4 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        gpio3: gpio3@20080000 {
-                                compatible = "rockchip,gpio-bank";
-                                reg = <0x20080000 0x100>;
-                                interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 12>;
+                pwm2 {
+                        pwm2_out: pwm2-out {
+                                rockchip,pins = <RK_GPIO0 30 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                pwm3 {
+                        pwm3_out: pwm3-out {
+                                rockchip,pins = <RK_GPIO0 31 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
+                uart0 {
+                        uart0_xfer: uart0-xfer {
+                                rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_default>;
                         };
 
-                        gpio4: gpio4@20084000 {
-                                compatible = "rockchip,gpio-bank";
-                                reg = <0x20084000 0x100>;
-                                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 13>;
+                        uart0_cts: uart0-cts {
+                                rockchip,pins = <RK_GPIO1 2 RK_FUNC_1 &pcfg_pull_default>;
+                        };
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                        uart0_rts: uart0-rts {
+                                rockchip,pins = <RK_GPIO1 3 RK_FUNC_1 &pcfg_pull_default>;
+                        };
+                };
+
+                uart1 {
+                        uart1_xfer: uart1-xfer {
+                                rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_default>;
+                        };
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
+                        uart1_cts: uart1-cts {
+                                rockchip,pins = <RK_GPIO1 6 RK_FUNC_1 &pcfg_pull_default>;
                         };
 
-                        gpio6: gpio6@2000a000 {
-                                compatible = "rockchip,gpio-bank";
-                                reg = <0x2000a000 0x100>;
-                                interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 15>;
+                        uart1_rts: uart1-rts {
+                                rockchip,pins = <RK_GPIO1 7 RK_FUNC_1 &pcfg_pull_default>;
+                        };
+                };
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                uart2 {
+                        uart2_xfer: uart2-xfer {
+                                rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_default>;
+                        };
+                        /* no rts / cts for uart2 */
+                };
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
+                uart3 {
+                        uart3_xfer: uart3-xfer {
+                                rockchip,pins = <RK_GPIO3 27 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO3 28 RK_FUNC_1 &pcfg_pull_default>;
                         };
 
-                        pcfg_pull_default: pcfg_pull_default {
-                                bias-pull-pin-default;
+                        uart3_cts: uart3-cts {
+                                rockchip,pins = <RK_GPIO3 29 RK_FUNC_1 &pcfg_pull_default>;
                         };
 
-                        pcfg_pull_none: pcfg_pull_none {
-                                bias-disable;
+                        uart3_rts: uart3-rts {
+                                rockchip,pins = <RK_GPIO3 30 RK_FUNC_1 &pcfg_pull_default>;
                         };
+                };
 
-                        uart0 {
-                                uart0_xfer: uart0-xfer {
-                                        rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                sd0 {
+                        sd0_clk: sd0-clk {
+                                rockchip,pins = <RK_GPIO3 8 RK_FUNC_1 &pcfg_pull_default>;
+                        };
 
-                                uart0_cts: uart0-cts {
-                                        rockchip,pins = <RK_GPIO1 2 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd0_cmd: sd0-cmd {
+                                rockchip,pins = <RK_GPIO3 9 RK_FUNC_1 &pcfg_pull_default>;
+                        };
 
-                                uart0_rts: uart0-rts {
-                                        rockchip,pins = <RK_GPIO1 3 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd0_cd: sd0-cd {
+                                rockchip,pins = <RK_GPIO3 14 RK_FUNC_1 &pcfg_pull_default>;
                         };
 
-                        uart1 {
-                                uart1_xfer: uart1-xfer {
-                                        rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd0_wp: sd0-wp {
+                                rockchip,pins = <RK_GPIO3 15 RK_FUNC_1 &pcfg_pull_default>;
+                        };
 
-                                uart1_cts: uart1-cts {
-                                        rockchip,pins = <RK_GPIO1 6 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd0_bus1: sd0-bus-width1 {
+                                rockchip,pins = <RK_GPIO3 10 RK_FUNC_1 &pcfg_pull_default>;
+                        };
 
-                                uart1_rts: uart1-rts {
-                                        rockchip,pins = <RK_GPIO1 7 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd0_bus4: sd0-bus-width4 {
+                                rockchip,pins = <RK_GPIO3 10 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO3 11 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO3 12 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO3 13 RK_FUNC_1 &pcfg_pull_default>;
                         };
+                };
 
-                        uart2 {
-                                uart2_xfer: uart2-xfer {
-                                        rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-                                /* no rts / cts for uart2 */
+                sd1 {
+                        sd1_clk: sd1-clk {
+                                rockchip,pins = <RK_GPIO3 21 RK_FUNC_1 &pcfg_pull_default>;
                         };
 
-                        uart3 {
-                                uart3_xfer: uart3-xfer {
-                                        rockchip,pins = <RK_GPIO3 27 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO3 28 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd1_cmd: sd1-cmd {
+                                rockchip,pins = <RK_GPIO3 16 RK_FUNC_1 &pcfg_pull_default>;
+                        };
 
-                                uart3_cts: uart3-cts {
-                                        rockchip,pins = <RK_GPIO3 29 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd1_cd: sd1-cd {
+                                rockchip,pins = <RK_GPIO3 22 RK_FUNC_1 &pcfg_pull_default>;
+                        };
 
-                                uart3_rts: uart3-rts {
-                                        rockchip,pins = <RK_GPIO3 30 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd1_wp: sd1-wp {
+                                rockchip,pins = <RK_GPIO3 23 RK_FUNC_1 &pcfg_pull_default>;
                         };
 
-                        sd0 {
-                                sd0_clk: sd0-clk {
-                                        rockchip,pins = <RK_GPIO3 8 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd0_cmd: sd0-cmd {
-                                        rockchip,pins = <RK_GPIO3 9 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd0_cd: sd0-cd {
-                                        rockchip,pins = <RK_GPIO3 14 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd0_wp: sd0-wp {
-                                        rockchip,pins = <RK_GPIO3 15 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd0_bus1: sd0-bus-width1 {
-                                        rockchip,pins = <RK_GPIO3 10 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd0_bus4: sd0-bus-width4 {
-                                        rockchip,pins = <RK_GPIO3 10 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO3 11 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO3 12 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO3 13 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd1_bus1: sd1-bus-width1 {
+                                rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_default>;
                         };
 
-                        sd1 {
-                                sd1_clk: sd1-clk {
-                                        rockchip,pins = <RK_GPIO3 21 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd1_cmd: sd1-cmd {
-                                        rockchip,pins = <RK_GPIO3 16 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd1_cd: sd1-cd {
-                                        rockchip,pins = <RK_GPIO3 22 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd1_wp: sd1-wp {
-                                        rockchip,pins = <RK_GPIO3 23 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd1_bus1: sd1-bus-width1 {
-                                        rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_default>;
-                                };
-
-                                sd1_bus4: sd1-bus-width4 {
-                                        rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO3 18 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO3 19 RK_FUNC_1 &pcfg_pull_default>,
-                                                        <RK_GPIO3 20 RK_FUNC_1 &pcfg_pull_default>;
-                                };
+                        sd1_bus4: sd1-bus-width4 {
+                                rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO3 18 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO3 19 RK_FUNC_1 &pcfg_pull_default>,
+                                                <RK_GPIO3 20 RK_FUNC_1 &pcfg_pull_default>;
                         };
                 };
         };
 };
+
+&i2c0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c0_xfer>;
+};
+
+&i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c1_xfer>;
+};
+
+&i2c2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c2_xfer>;
+};
+
+&i2c3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c3_xfer>;
+};
+
+&i2c4 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c4_xfer>;
+};
+
+&mmc0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
+};
+
+&mmc1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>;
+};
+
+&pwm0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pwm0_out>;
+};
+
+&pwm1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pwm1_out>;
+};
+
+&pwm2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pwm2_out>;
+};
+
+&pwm3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pwm3_out>;
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_xfer>;
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart1_xfer>;
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart2_xfer>;
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart3_xfer>;
+};
+
+&wdt {
+        compatible = "rockchip,rk3066-wdt", "snps,dw-wdt";
+};
diff --git a/arch/arm/boot/dts/rk3188-clocks.dtsi b/arch/arm/boot/dts/rk3188-clocks.dtsi
deleted file mode 100644
index b1b92dc245ce..000000000000
--- a/arch/arm/boot/dts/rk3188-clocks.dtsi
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 2013 MundoReader S.L.
- * Author: Heiko Stuebner <heiko@sntech.de>
- *
- * 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.
- */
-
-/ {
-        clocks {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                ranges;
-
-                /*
-                 * 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.
-                 */
-                dummy: dummy {
-                        compatible = "fixed-clock";
-                        clock-frequency = <0>;
-                        #clock-cells = <0>;
-                };
-
-                xin24m: xin24m {
-                        compatible = "fixed-clock";
-                        clock-frequency = <24000000>;
-                        #clock-cells = <0>;
-                };
-
-                dummy48m: dummy48m {
-                        compatible = "fixed-clock";
-                        clock-frequency = <48000000>;
-                        #clock-cells = <0>;
-                };
-
-                dummy150m: dummy150m {
-                        compatible = "fixed-clock";
-                        clock-frequency = <150000000>;
-                        #clock-cells = <0>;
-                };
-
-                clk_gates0: gate-clk@200000d0 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000d0 0x4>;
-                        clocks = <&dummy150m>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_core_periph", "gate_cpu_gpll",
-                                "gate_ddrphy", "gate_aclk_cpu",
-                                "gate_hclk_cpu", "gate_pclk_cpu",
-                                "gate_atclk_cpu", "gate_aclk_core",
-                                "reserved", "gate_i2s0",
-                                "gate_i2s0_frac", "reserved",
-                                "reserved", "gate_spdif",
-                                "gate_spdif_frac", "gate_testclk";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates1: gate-clk@200000d4 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000d4 0x4>;
-                        clocks = <&xin24m>, <&xin24m>,
-                                 <&xin24m>, <&dummy>,
-                                 <&dummy>, <&xin24m>,
-                                 <&xin24m>, <&dummy>,
-                                 <&xin24m>, <&dummy>,
-                                 <&xin24m>, <&dummy>,
-                                 <&xin24m>, <&dummy>,
-                                 <&xin24m>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_timer0", "gate_timer1",
-                                "gate_timer3", "gate_jtag",
-                                "gate_aclk_lcdc1_src", "gate_otgphy0",
-                                "gate_otgphy1", "gate_ddr_gpll",
-                                "gate_uart0", "gate_frac_uart0",
-                                "gate_uart1", "gate_frac_uart1",
-                                "gate_uart2", "gate_frac_uart2",
-                                "gate_uart3", "gate_frac_uart3";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates2: gate-clk@200000d8 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000d8 0x4>;
-                        clocks = <&clk_gates2 1>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&clk_gates2 3>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy48m>,
-                                 <&dummy>, <&dummy48m>,
-                                 <&dummy>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_periph_src", "gate_aclk_periph",
-                                "gate_hclk_periph", "gate_pclk_periph",
-                                "gate_smc", "gate_mac",
-                                "gate_hsadc", "gate_hsadc_frac",
-                                "gate_saradc", "gate_spi0",
-                                "gate_spi1", "gate_mmc0",
-                                "gate_mac_lbtest", "gate_mmc1",
-                                "gate_emmc", "reserved";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates3: gate-clk@200000dc {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000dc 0x4>;
-                        clocks = <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&xin24m>, <&xin24m>,
-                                 <&dummy>, <&dummy>,
-                                 <&xin24m>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&xin24m>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_aclk_lcdc0_src", "gate_dclk_lcdc0",
-                                "gate_dclk_lcdc1", "gate_pclkin_cif0",
-                                "gate_timer2", "gate_timer4",
-                                "gate_hsicphy", "gate_cif0_out",
-                                "gate_timer5", "gate_aclk_vepu",
-                                "gate_hclk_vepu", "gate_aclk_vdpu",
-                                "gate_hclk_vdpu", "reserved",
-                                "gate_timer6", "gate_aclk_gpu_src";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates4: gate-clk@200000e0 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000e0 0x4>;
-                        clocks = <&clk_gates2 2>, <&clk_gates2 3>,
-                                 <&clk_gates2 1>, <&clk_gates2 1>,
-                                 <&clk_gates2 1>, <&clk_gates2 2>,
-                                 <&clk_gates2 2>, <&clk_gates2 2>,
-                                 <&clk_gates0 4>, <&clk_gates0 4>,
-                                 <&clk_gates0 3>, <&dummy>,
-                                 <&clk_gates0 3>, <&dummy>,
-                                 <&dummy>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_hclk_peri_axi_matrix", "gate_pclk_peri_axi_matrix",
-                                "gate_aclk_cpu_peri", "gate_aclk_peri_axi_matrix",
-                                "gate_aclk_pei_niu", "gate_hclk_usb_peri",
-                                "gate_hclk_peri_ahb_arbi", "gate_hclk_emem_peri",
-                                "gate_hclk_cpubus", "gate_hclk_ahb2apb",
-                                "gate_aclk_strc_sys", "reserved",
-                                "gate_aclk_intmem", "reserved",
-                                "gate_hclk_imem1", "gate_hclk_imem0";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates5: gate-clk@200000e4 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000e4 0x4>;
-                        clocks = <&clk_gates0 3>, <&clk_gates2 1>,
-                                 <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates0 4>, <&clk_gates0 5>,
-                                 <&clk_gates2 1>, <&clk_gates2 2>,
-                                 <&clk_gates2 2>, <&clk_gates2 2>,
-                                 <&clk_gates2 2>, <&clk_gates4 5>;
-
-                        clock-output-names =
-                                "gate_aclk_dmac1", "gate_aclk_dmac2",
-                                "gate_pclk_efuse", "gate_pclk_tzpc",
-                                "gate_pclk_grf", "gate_pclk_pmu",
-                                "gate_hclk_rom", "gate_pclk_ddrupctl",
-                                "gate_aclk_smc", "gate_hclk_nandc",
-                                "gate_hclk_mmc0", "gate_hclk_mmc1",
-                                "gate_hclk_emmc", "gate_hclk_otg0";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates6: gate-clk@200000e8 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000e8 0x4>;
-                        clocks = <&clk_gates3 0>, <&clk_gates0 4>,
-                                 <&clk_gates0 4>, <&clk_gates1 4>,
-                                 <&clk_gates0 4>, <&clk_gates3 0>,
-                                 <&dummy>, <&dummy>,
-                                 <&clk_gates3 0>, <&clk_gates0 4>,
-                                 <&clk_gates0 4>, <&clk_gates1 4>,
-                                 <&clk_gates0 4>, <&clk_gates3 0>;
-
-                        clock-output-names =
-                                "gate_aclk_lcdc0", "gate_hclk_lcdc0",
-                                "gate_hclk_lcdc1", "gate_aclk_lcdc1",
-                                "gate_hclk_cif0", "gate_aclk_cif0",
-                                "reserved", "reserved",
-                                "gate_aclk_ipp", "gate_hclk_ipp",
-                                "gate_hclk_rga", "gate_aclk_rga",
-                                "gate_hclk_vio_bus", "gate_aclk_vio0";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates7: gate-clk@200000ec {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000ec 0x4>;
-                        clocks = <&clk_gates2 2>, <&clk_gates0 4>,
-                                 <&clk_gates0 4>, <&dummy>,
-                                 <&dummy>, <&clk_gates2 2>,
-                                 <&clk_gates2 2>, <&clk_gates0 5>,
-                                 <&dummy>, <&clk_gates0 5>,
-                                 <&clk_gates0 5>, <&clk_gates2 3>,
-                                 <&clk_gates2 3>, <&clk_gates2 3>,
-                                 <&clk_gates2 3>, <&clk_gates2 3>;
-
-                        clock-output-names =
-                                "gate_hclk_emac", "gate_hclk_spdif",
-                                "gate_hclk_i2s0_2ch", "gate_hclk_otg1",
-                                "gate_hclk_hsic", "gate_hclk_hsadc",
-                                "gate_hclk_pidf", "gate_pclk_timer0",
-                                "reserved", "gate_pclk_timer2",
-                                "gate_pclk_pwm01", "gate_pclk_pwm23",
-                                "gate_pclk_spi0", "gate_pclk_spi1",
-                                "gate_pclk_saradc", "gate_pclk_wdt";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates8: gate-clk@200000f0 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000f0 0x4>;
-                        clocks = <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates2 3>, <&clk_gates2 3>,
-                                 <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates2 3>, <&clk_gates2 3>,
-                                 <&clk_gates2 3>, <&clk_gates0 5>,
-                                 <&clk_gates0 5>, <&clk_gates0 5>,
-                                 <&clk_gates2 3>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_pclk_uart0", "gate_pclk_uart1",
-                                "gate_pclk_uart2", "gate_pclk_uart3",
-                                "gate_pclk_i2c0", "gate_pclk_i2c1",
-                                "gate_pclk_i2c2", "gate_pclk_i2c3",
-                                "gate_pclk_i2c4", "gate_pclk_gpio0",
-                                "gate_pclk_gpio1", "gate_pclk_gpio2",
-                                "gate_pclk_gpio3", "gate_aclk_gps";
-
-                        #clock-cells = <1>;
-                };
-
-                clk_gates9: gate-clk@200000f4 {
-                        compatible = "rockchip,rk2928-gate-clk";
-                        reg = <0x200000f4 0x4>;
-                        clocks = <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>,
-                                 <&dummy>, <&dummy>;
-
-                        clock-output-names =
-                                "gate_clk_core_dbg", "gate_pclk_dbg",
-                                "gate_clk_trace", "gate_atclk",
-                                "gate_clk_l2c", "gate_aclk_vio1",
-                                "gate_pclk_publ", "gate_aclk_gpu";
-
-                        #clock-cells = <1>;
-                };
-        };
-
-};
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index a5eee55079cb..171b610db709 100644
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -23,59 +23,205 @@
                 reg = <0x60000000 0x80000000>;
         };
 
-        soc {
-                uart0: serial@10124000 {
-                        status = "okay";
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+
+                button@0 {
+                        gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+                        linux,code = <116>;
+                        label = "GPIO Key Power";
+                        linux,input-type = <1>;
+                        gpio-key,wakeup = <1>;
+                        debounce-interval = <100>;
                 };
+        };
 
-                uart1: serial@10126000 {
-                        status = "okay";
+        gpio-leds {
+                compatible = "gpio-leds";
+
+                green {
+                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
                 };
 
-                uart2: serial@20064000 {
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&uart2_xfer>;
-                        status = "okay";
+                yellow {
+                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                        default-state = "off";
                 };
 
-                uart3: serial@20068000 {
-                        status = "okay";
+                sleep {
+                        gpios = <&gpio0 15 0>;
+                        default-state = "off";
                 };
+        };
 
-                gpio-keys {
-                        compatible = "gpio-keys";
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        autorepeat;
-
-                        button@0 {
-                                gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
-                                linux,code = <116>;
-                                label = "GPIO Key Power";
-                                linux,input-type = <1>;
-                                gpio-key,wakeup = <1>;
-                                debounce-interval = <100>;
+        ir_recv: gpio-ir-receiver {
+                compatible = "gpio-ir-receiver";
+                gpios = <&gpio0 10 1>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&ir_recv_pin>;
+        };
+
+        vcc_sd0: sdmmc-regulator {
+                compatible = "regulator-fixed";
+                regulator-name = "sdmmc-supply";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&gpio3 1 GPIO_ACTIVE_LOW>;
+                startup-delay-us = <100000>;
+                vin-supply = <&vcc_io>;
+        };
+};
+
+&i2c1 {
+        status = "okay";
+        clock-frequency = <400000>;
+
+        act8846: act8846@5a {
+                compatible = "active-semi,act8846";
+                reg = <0x5a>;
+                status = "okay";
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&act8846_dvs0_ctl>;
+
+                regulators {
+                        vcc_ddr: REG1 {
+                                regulator-name = "VCC_DDR";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <1200000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_log: REG2 {
+                                regulator-name = "VDD_LOG";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_arm: REG3 {
+                                regulator-name = "VDD_ARM";
+                                regulator-min-microvolt = <875000>;
+                                regulator-max-microvolt = <1300000>;
+                                regulator-always-on;
+                        };
+
+                        vcc_io: REG4 {
+                                regulator-name = "VCC_IO";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_10: REG5 {
+                                regulator-name = "VDD_10";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_hdmi: REG6 {
+                                regulator-name = "VDD_HDMI";
+                                regulator-min-microvolt = <2500000>;
+                                regulator-max-microvolt = <2500000>;
+                                regulator-always-on;
+                        };
+
+                        vcc18: REG7 {
+                                regulator-name = "VCC_18";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
                         };
-                };
 
-                gpio-leds {
-                        compatible = "gpio-leds";
+                        vcca_33: REG8 {
+                                regulator-name = "VCCA_33";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vcc_rmii: REG9 {
+                                regulator-name = "VCC_RMII";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
 
-                        green {
-                                gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
-                                default-state = "off";
+                        vccio_wl: REG10 {
+                                regulator-name = "VCCIO_WL";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
                         };
 
-                        yellow {
-                                gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
-                                default-state = "off";
+                        vcc_18: REG11 {
+                                regulator-name = "VCC18_IO";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
                         };
 
-                        sleep {
-                                gpios = <&gpio0 15 0>;
-                                default-state = "off";
+                        vcc28: REG12 {
+                                regulator-name = "VCC_28";
+                                regulator-min-microvolt = <2800000>;
+                                regulator-max-microvolt = <2800000>;
+                                regulator-always-on;
                         };
                 };
+        };
+};
+
+&mmc0 {
+        num-slots = <1>;
+        status = "okay";
+        vmmc-supply = <&vcc_sd0>;
 
+        slot@0 {
+                reg = <0>;
+                bus-width = <4>;
+                disable-wp;
         };
 };
+
+&pinctrl {
+        pcfg_output_low: pcfg-output-low {
+                output-low;
+        };
+
+        act8846 {
+                act8846_dvs0_ctl: act8846-dvs0-ctl {
+                        rockchip,pins = <RK_GPIO3 27 RK_FUNC_GPIO &pcfg_output_low>;
+                };
+        };
+
+        ir-receiver {
+                ir_recv_pin: ir-recv-pin {
+                        rockchip,pins = <RK_GPIO0 10 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&wdt {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 238c996d4a7f..ee801a9c6b74 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -15,8 +15,8 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/clock/rk3188-cru.h>
 #include "rk3xxx.dtsi"
-#include "rk3188-clocks.dtsi"
 
 / {
         compatible = "rockchip,rk3188";
@@ -52,215 +52,355 @@
                 };
         };
 
-        soc {
-                global-timer@1013c200 {
-                        interrupts = <GIC_PPI 11 0xf04>;
+        sram: sram@10080000 {
+                compatible = "mmio-sram";
+                reg = <0x10080000 0x8000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0x10080000 0x8000>;
+
+                smp-sram@0 {
+                        compatible = "rockchip,rk3066-smp-sram";
+                        reg = <0x0 0x50>;
                 };
+        };
+
+        cru: clock-controller@20000000 {
+                compatible = "rockchip,rk3188-cru";
+                reg = <0x20000000 0x1000>;
+                rockchip,grf = <&grf>;
+
+                #clock-cells = <1>;
+                #reset-cells = <1>;
+        };
+
+        pinctrl: pinctrl {
+                compatible = "rockchip,rk3188-pinctrl";
+                rockchip,grf = <&grf>;
+                rockchip,pmu = <&pmu>;
+
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                gpio0: gpio0@0x2000a000 {
+                        compatible = "rockchip,rk3188-gpio-bank0";
+                        reg = <0x2000a000 0x100>;
+                        interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO0>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
 
-                local-timer@1013c600 {
-                        interrupts = <GIC_PPI 13 0xf04>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
                 };
 
-                sram: sram@10080000 {
-                        compatible = "mmio-sram";
-                        reg = <0x10080000 0x8000>;
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        ranges = <0 0x10080000 0x8000>;
+                gpio1: gpio1@0x2003c000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0x2003c000 0x100>;
+                        interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO1>;
 
-                        smp-sram@0 {
-                                compatible = "rockchip,rk3066-smp-sram";
-                                reg = <0x0 0x50>;
-                        };
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
                 };
 
-                pinctrl@20008000 {
-                        compatible = "rockchip,rk3188-pinctrl";
-                        rockchip,grf = <&grf>;
-                        rockchip,pmu = <&pmu>;
+                gpio2: gpio2@2003e000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0x2003e000 0x100>;
+                        interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO2>;
 
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        ranges;
+                        gpio-controller;
+                        #gpio-cells = <2>;
 
-                        gpio0: gpio0@0x2000a000 {
-                                compatible = "rockchip,rk3188-gpio-bank0";
-                                reg = <0x2000a000 0x100>;
-                                interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 9>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                gpio3: gpio3@20080000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0x20080000 0x100>;
+                        interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO3>;
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                        };
+                        gpio-controller;
+                        #gpio-cells = <2>;
 
-                        gpio1: gpio1@0x2003c000 {
-                                compatible = "rockchip,gpio-bank";
-                                reg = <0x2003c000 0x100>;
-                                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 10>;
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                pcfg_pull_up: pcfg_pull_up {
+                        bias-pull-up;
+                };
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
-                        };
+                pcfg_pull_down: pcfg_pull_down {
+                        bias-pull-down;
+                };
 
-                        gpio2: gpio2@2003e000 {
-                                compatible = "rockchip,gpio-bank";
-                                reg = <0x2003e000 0x100>;
-                                interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 11>;
+                pcfg_pull_none: pcfg_pull_none {
+                        bias-disable;
+                };
+
+                i2c0 {
+                        i2c0_xfer: i2c0-xfer {
+                                rockchip,pins = <RK_GPIO1 24 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO1 25 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                i2c1 {
+                        i2c1_xfer: i2c1-xfer {
+                                rockchip,pins = <RK_GPIO1 26 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO1 27 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
+                i2c2 {
+                        i2c2_xfer: i2c2-xfer {
+                                rockchip,pins = <RK_GPIO1 28 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO1 29 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        gpio3: gpio3@20080000 {
-                                compatible = "rockchip,gpio-bank";
-                                reg = <0x20080000 0x100>;
-                                interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 12>;
+                i2c3 {
+                        i2c3_xfer: i2c3-xfer {
+                                rockchip,pins = <RK_GPIO3 14 RK_FUNC_2 &pcfg_pull_none>,
+                                                <RK_GPIO3 15 RK_FUNC_2 &pcfg_pull_none>;
+                        };
+                };
 
-                                gpio-controller;
-                                #gpio-cells = <2>;
+                i2c4 {
+                        i2c4_xfer: i2c4-xfer {
+                                rockchip,pins = <RK_GPIO1 30 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO1 31 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
 
-                                interrupt-controller;
-                                #interrupt-cells = <2>;
+                pwm0 {
+                        pwm0_out: pwm0-out {
+                                rockchip,pins = <RK_GPIO3 27 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        pcfg_pull_up: pcfg_pull_up {
-                                bias-pull-up;
+                pwm1 {
+                        pwm1_out: pwm1-out {
+                                rockchip,pins = <RK_GPIO3 28 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        pcfg_pull_down: pcfg_pull_down {
-                                bias-pull-down;
+                pwm2 {
+                        pwm2_out: pwm2-out {
+                                rockchip,pins = <RK_GPIO3 29 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        pcfg_pull_none: pcfg_pull_none {
-                                bias-disable;
+                pwm3 {
+                        pwm3_out: pwm3-out {
+                                rockchip,pins = <RK_GPIO3 30 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        uart0 {
-                                uart0_xfer: uart0-xfer {
-                                        rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>,
-                                                        <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                uart0 {
+                        uart0_xfer: uart0-xfer {
+                                rockchip,pins = <RK_GPIO1 0 RK_FUNC_1 &pcfg_pull_up>,
+                                                <RK_GPIO1 1 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                uart0_cts: uart0-cts {
-                                        rockchip,pins = <RK_GPIO1 2 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        uart0_cts: uart0-cts {
+                                rockchip,pins = <RK_GPIO1 2 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                uart0_rts: uart0-rts {
-                                        rockchip,pins = <RK_GPIO1 3 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        uart0_rts: uart0-rts {
+                                rockchip,pins = <RK_GPIO1 3 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        uart1 {
-                                uart1_xfer: uart1-xfer {
-                                        rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_up>,
-                                                        <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                uart1 {
+                        uart1_xfer: uart1-xfer {
+                                rockchip,pins = <RK_GPIO1 4 RK_FUNC_1 &pcfg_pull_up>,
+                                                <RK_GPIO1 5 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                uart1_cts: uart1-cts {
-                                        rockchip,pins = <RK_GPIO1 6 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        uart1_cts: uart1-cts {
+                                rockchip,pins = <RK_GPIO1 6 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                uart1_rts: uart1-rts {
-                                        rockchip,pins = <RK_GPIO1 7 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        uart1_rts: uart1-rts {
+                                rockchip,pins = <RK_GPIO1 7 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        uart2 {
-                                uart2_xfer: uart2-xfer {
-                                        rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_up>,
-                                                        <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>;
-                                };
-                                /* no rts / cts for uart2 */
+                uart2 {
+                        uart2_xfer: uart2-xfer {
+                                rockchip,pins = <RK_GPIO1 8 RK_FUNC_1 &pcfg_pull_up>,
+                                                <RK_GPIO1 9 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                        /* no rts / cts for uart2 */
+                };
 
-                        uart3 {
-                                uart3_xfer: uart3-xfer {
-                                        rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_up>,
-                                                        <RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                uart3 {
+                        uart3_xfer: uart3-xfer {
+                                rockchip,pins = <RK_GPIO1 10 RK_FUNC_1 &pcfg_pull_up>,
+                                                <RK_GPIO1 11 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                uart3_cts: uart3-cts {
-                                        rockchip,pins = <RK_GPIO1 12 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        uart3_cts: uart3-cts {
+                                rockchip,pins = <RK_GPIO1 12 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                uart3_rts: uart3-rts {
-                                        rockchip,pins = <RK_GPIO1 13 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        uart3_rts: uart3-rts {
+                                rockchip,pins = <RK_GPIO1 13 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        sd0 {
-                                sd0_clk: sd0-clk {
-                                        rockchip,pins = <RK_GPIO3 2 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                sd0 {
+                        sd0_clk: sd0-clk {
+                                rockchip,pins = <RK_GPIO3 2 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd0_cmd: sd0-cmd {
-                                        rockchip,pins = <RK_GPIO3 3 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd0_cmd: sd0-cmd {
+                                rockchip,pins = <RK_GPIO3 3 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd0_cd: sd0-cd {
-                                        rockchip,pins = <RK_GPIO3 8 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd0_cd: sd0-cd {
+                                rockchip,pins = <RK_GPIO3 8 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd0_wp: sd0-wp {
-                                        rockchip,pins = <RK_GPIO3 9 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd0_wp: sd0-wp {
+                                rockchip,pins = <RK_GPIO3 9 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd0_pwr: sd0-pwr {
-                                        rockchip,pins = <RK_GPIO3 1 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd0_pwr: sd0-pwr {
+                                rockchip,pins = <RK_GPIO3 1 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd0_bus1: sd0-bus-width1 {
-                                        rockchip,pins = <RK_GPIO3 4 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd0_bus1: sd0-bus-width1 {
+                                rockchip,pins = <RK_GPIO3 4 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd0_bus4: sd0-bus-width4 {
-                                        rockchip,pins = <RK_GPIO3 4 RK_FUNC_1 &pcfg_pull_none>,
-                                                        <RK_GPIO3 5 RK_FUNC_1 &pcfg_pull_none>,
-                                                        <RK_GPIO3 6 RK_FUNC_1 &pcfg_pull_none>,
-                                                        <RK_GPIO3 7 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd0_bus4: sd0-bus-width4 {
+                                rockchip,pins = <RK_GPIO3 4 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO3 5 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO3 6 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO3 7 RK_FUNC_1 &pcfg_pull_none>;
                         };
+                };
 
-                        sd1 {
-                                sd1_clk: sd1-clk {
-                                        rockchip,pins = <RK_GPIO3 21 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                sd1 {
+                        sd1_clk: sd1-clk {
+                                rockchip,pins = <RK_GPIO3 21 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd1_cmd: sd1-cmd {
-                                        rockchip,pins = <RK_GPIO3 16 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd1_cmd: sd1-cmd {
+                                rockchip,pins = <RK_GPIO3 16 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd1_cd: sd1-cd {
-                                        rockchip,pins = <RK_GPIO3 22 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd1_cd: sd1-cd {
+                                rockchip,pins = <RK_GPIO3 22 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd1_wp: sd1-wp {
-                                        rockchip,pins = <RK_GPIO3 23 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd1_wp: sd1-wp {
+                                rockchip,pins = <RK_GPIO3 23 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd1_bus1: sd1-bus-width1 {
-                                        rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd1_bus1: sd1-bus-width1 {
+                                rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_none>;
+                        };
 
-                                sd1_bus4: sd1-bus-width4 {
-                                        rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_none>,
-                                                        <RK_GPIO3 18 RK_FUNC_1 &pcfg_pull_none>,
-                                                        <RK_GPIO3 19 RK_FUNC_1 &pcfg_pull_none>,
-                                                        <RK_GPIO3 20 RK_FUNC_1 &pcfg_pull_none>;
-                                };
+                        sd1_bus4: sd1-bus-width4 {
+                                rockchip,pins = <RK_GPIO3 17 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO3 18 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO3 19 RK_FUNC_1 &pcfg_pull_none>,
+                                                <RK_GPIO3 20 RK_FUNC_1 &pcfg_pull_none>;
                         };
                 };
         };
 };
+
+&global_timer {
+        interrupts = <GIC_PPI 11 0xf04>;
+};
+
+&local_timer {
+        interrupts = <GIC_PPI 13 0xf04>;
+};
+
+&i2c0 {
+        compatible = "rockchip,rk3188-i2c";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c0_xfer>;
+};
+
+&i2c1 {
+        compatible = "rockchip,rk3188-i2c";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c1_xfer>;
+};
+
+&i2c2 {
+        compatible = "rockchip,rk3188-i2c";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c2_xfer>;
+};
+
+&i2c3 {
+        compatible = "rockchip,rk3188-i2c";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c3_xfer>;
+};
+
+&i2c4 {
+        compatible = "rockchip,rk3188-i2c";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c4_xfer>;
+};
+
+&pwm0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pwm0_out>;
+};
+
+&pwm1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pwm1_out>;
+};
+
+&pwm2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pwm2_out>;
+};
+
+&pwm3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pwm3_out>;
+};
+
+&uart0 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart0_xfer>;
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart1_xfer>;
+};
+
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart2_xfer>;
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart3_xfer>;
+};
+
+&wdt {
+        compatible = "rockchip,rk3188-wdt", "snps,dw-wdt";
+};
diff --git a/arch/arm/boot/dts/rk3288-evb-act8846.dts b/arch/arm/boot/dts/rk3288-evb-act8846.dts
new file mode 100644
index 000000000000..7d59ff4de408
--- /dev/null
+++ b/arch/arm/boot/dts/rk3288-evb-act8846.dts
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+
+/dts-v1/;
+#include "rk3288-evb.dtsi"
+
+/ {
+        compatible = "rockchip,rk3288-evb-act8846", "rockchip,rk3288";
+};
+
+&i2c0 {
+        hym8563@51 {
+                compatible = "haoyu,hym8563";
+                reg = <0x51>;
+
+                interrupt-parent = <&gpio0>;
+                interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&hym8563_int>;
+
+                #clock-cells = <0>;
+                clock-output-names = "xin32k";
+        };
+
+        act8846: act8846@5a {
+                compatible = "active-semi,act8846";
+                reg = <0x5a>;
+                status = "okay";
+
+                regulators {
+                        vcc_ddr: REG1 {
+                                regulator-name = "VCC_DDR";
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <1200000>;
+                                regulator-always-on;
+                        };
+
+                        vcc_io: REG2 {
+                                regulator-name = "VCC_IO";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_log: REG3 {
+                                regulator-name = "VDD_LOG";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                        };
+
+                        vcc_20: REG4 {
+                                regulator-name = "VCC_20";
+                                regulator-min-microvolt = <2000000>;
+                                regulator-max-microvolt = <2000000>;
+                                regulator-always-on;
+                        };
+
+                        vccio_sd: REG5 {
+                                regulator-name = "VCCIO_SD";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vdd10_lcd: REG6 {
+                                regulator-name = "VDD10_LCD";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                        };
+
+                        vcca_codec: REG7 {
+                                regulator-name = "VCCA_CODEC";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vcca_tp: REG8 {
+                                regulator-name = "VCCA_TP";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vccio_pmu: REG9 {
+                                regulator-name = "VCCIO_PMU";
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_10: REG10 {
+                                regulator-name = "VDD_10";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <1000000>;
+                                regulator-always-on;
+                        };
+
+                        vcc_18: REG11 {
+                                regulator-name = "VCC_18";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+
+                        vcc18_lcd: REG12 {
+                                regulator-name = "VCC18_LCD";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-always-on;
+                        };
+                };
+        };
+};
+
+&pinctrl {
+        hym8563 {
+                hym8563_int: hym8563-int {
+                        rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
+                };
+        };
+};
diff --git a/arch/arm/mach-s5p64x0/include/mach/dma.h b/arch/arm/boot/dts/rk3288-evb-rk808.dts
index 5a622af461d7..9a88b6c66396 100644
--- a/arch/arm/mach-s5p64x0/include/mach/dma.h
+++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts
@@ -1,7 +1,4 @@
 /*
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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
@@ -11,16 +8,11 @@
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef __MACH_DMA_H
-#define __MACH_DMA_H
-
-/* This platform uses the common common DMA API driver for PL330 */
-#include <plat/dma-pl330.h>
+/dts-v1/;
+#include "rk3288-evb.dtsi"
 
-#endif /* __MACH_DMA_H */
+/ {
+        compatible = "rockchip,rk3288-evb-rk808", "rockchip,rk3288";
+};
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
new file mode 100644
index 000000000000..4f572093c8b4
--- /dev/null
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+
+#include "rk3288.dtsi"
+
+/ {
+        memory {
+                reg = <0x0 0x80000000>;
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                autorepeat;
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&pwrbtn>;
+
+                button@0 {
+                        gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
+                        linux,code = <116>;
+                        label = "GPIO Key Power";
+                        linux,input-type = <1>;
+                        gpio-key,wakeup = <1>;
+                        debounce-interval = <100>;
+                };
+        };
+
+        /* This turns on USB vbus for both host0 (ehci) and host1 (dwc2) */
+        vcc_host: vcc-host-regulator {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&host_vbus_drv>;
+                regulator-name = "vcc_host";
+                regulator-always-on;
+                regulator-boot-on;
+        };
+};
+
+&i2c0 {
+        status = "okay";
+};
+
+&wdt {
+        status = "okay";
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&uart4 {
+        status = "okay";
+};
+
+&pinctrl {
+        buttons {
+                pwrbtn: pwrbtn {
+                        rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
+                };
+        };
+
+        usb {
+                host_vbus_drv: host-vbus-drv {
+                        rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+};
+
+&usb_host0_ehci {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
new file mode 100644
index 000000000000..5950b0a53224
--- /dev/null
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -0,0 +1,595 @@
+/*
+ * 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.
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/clock/rk3288-cru.h>
+#include "skeleton.dtsi"
+
+/ {
+        compatible = "rockchip,rk3288";
+
+        interrupt-parent = <&gic>;
+
+        aliases {
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                i2c2 = &i2c2;
+                i2c3 = &i2c3;
+                i2c4 = &i2c4;
+                i2c5 = &i2c5;
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &uart2;
+                serial3 = &uart3;
+                serial4 = &uart4;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@500 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a12";
+                        reg = <0x500>;
+                };
+                cpu@501 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a12";
+                        reg = <0x501>;
+                };
+                cpu@502 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a12";
+                        reg = <0x502>;
+                };
+                cpu@503 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a12";
+                        reg = <0x503>;
+                };
+        };
+
+        xin24m: oscillator {
+                compatible = "fixed-clock";
+                clock-frequency = <24000000>;
+                clock-output-names = "xin24m";
+                #clock-cells = <0>;
+        };
+
+        timer {
+                compatible = "arm,armv7-timer";
+                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
+                             <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
+                             <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
+                             <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+                clock-frequency = <24000000>;
+        };
+
+        i2c1: i2c@ff140000 {
+                compatible = "rockchip,rk3288-i2c";
+                reg = <0xff140000 0x1000>;
+                interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "i2c";
+                clocks = <&cru PCLK_I2C1>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2c1_xfer>;
+                status = "disabled";
+        };
+
+        i2c3: i2c@ff150000 {
+                compatible = "rockchip,rk3288-i2c";
+                reg = <0xff150000 0x1000>;
+                interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "i2c";
+                clocks = <&cru PCLK_I2C3>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2c3_xfer>;
+                status = "disabled";
+        };
+
+        i2c4: i2c@ff160000 {
+                compatible = "rockchip,rk3288-i2c";
+                reg = <0xff160000 0x1000>;
+                interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "i2c";
+                clocks = <&cru PCLK_I2C4>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2c4_xfer>;
+                status = "disabled";
+        };
+
+        i2c5: i2c@ff170000 {
+                compatible = "rockchip,rk3288-i2c";
+                reg = <0xff170000 0x1000>;
+                interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "i2c";
+                clocks = <&cru PCLK_I2C5>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2c5_xfer>;
+                status = "disabled";
+        };
+
+        uart0: serial@ff180000 {
+                compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
+                reg = <0xff180000 0x100>;
+                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+                reg-shift = <2>;
+                reg-io-width = <4>;
+                clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
+                clock-names = "baudclk", "apb_pclk";
+                pinctrl-names = "default";
+                pinctrl-0 = <&uart0_xfer>;
+                status = "disabled";
+        };
+
+        uart1: serial@ff190000 {
+                compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
+                reg = <0xff190000 0x100>;
+                interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
+                reg-shift = <2>;
+                reg-io-width = <4>;
+                clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
+                clock-names = "baudclk", "apb_pclk";
+                pinctrl-names = "default";
+                pinctrl-0 = <&uart1_xfer>;
+                status = "disabled";
+        };
+
+        uart2: serial@ff690000 {
+                compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
+                reg = <0xff690000 0x100>;
+                interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
+                reg-shift = <2>;
+                reg-io-width = <4>;
+                clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
+                clock-names = "baudclk", "apb_pclk";
+                pinctrl-names = "default";
+                pinctrl-0 = <&uart2_xfer>;
+                status = "disabled";
+        };
+
+        uart3: serial@ff1b0000 {
+                compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
+                reg = <0xff1b0000 0x100>;
+                interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
+                reg-shift = <2>;
+                reg-io-width = <4>;
+                clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
+                clock-names = "baudclk", "apb_pclk";
+                pinctrl-names = "default";
+                pinctrl-0 = <&uart3_xfer>;
+                status = "disabled";
+        };
+
+        uart4: serial@ff1c0000 {
+                compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
+                reg = <0xff1c0000 0x100>;
+                interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
+                reg-shift = <2>;
+                reg-io-width = <4>;
+                clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>;
+                clock-names = "baudclk", "apb_pclk";
+                pinctrl-names = "default";
+                pinctrl-0 = <&uart4_xfer>;
+                status = "disabled";
+        };
+
+        usb_host0_ehci: usb@ff500000 {
+                compatible = "generic-ehci";
+                reg = <0xff500000 0x100>;
+                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cru HCLK_USBHOST0>;
+                clock-names = "usbhost";
+                status = "disabled";
+        };
+
+        /* NOTE: ohci@ff520000 doesn't actually work on hardware */
+
+        usb_hsic: usb@ff5c0000 {
+                compatible = "generic-ehci";
+                reg = <0xff5c0000 0x100>;
+                interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cru HCLK_HSIC>;
+                clock-names = "usbhost";
+                status = "disabled";
+        };
+
+        i2c0: i2c@ff650000 {
+                compatible = "rockchip,rk3288-i2c";
+                reg = <0xff650000 0x1000>;
+                interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "i2c";
+                clocks = <&cru PCLK_I2C0>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2c0_xfer>;
+                status = "disabled";
+        };
+
+        i2c2: i2c@ff660000 {
+                compatible = "rockchip,rk3288-i2c";
+                reg = <0xff660000 0x1000>;
+                interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                clock-names = "i2c";
+                clocks = <&cru PCLK_I2C2>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&i2c2_xfer>;
+                status = "disabled";
+        };
+
+        pmu: power-management@ff730000 {
+                compatible = "rockchip,rk3288-pmu", "syscon";
+                reg = <0xff730000 0x100>;
+        };
+
+        sgrf: syscon@ff740000 {
+                compatible = "rockchip,rk3288-sgrf", "syscon";
+                reg = <0xff740000 0x1000>;
+        };
+
+        cru: clock-controller@ff760000 {
+                compatible = "rockchip,rk3288-cru";
+                reg = <0xff760000 0x1000>;
+                rockchip,grf = <&grf>;
+                #clock-cells = <1>;
+                #reset-cells = <1>;
+        };
+
+        grf: syscon@ff770000 {
+                compatible = "rockchip,rk3288-grf", "syscon";
+                reg = <0xff770000 0x1000>;
+        };
+
+        wdt: watchdog@ff800000 {
+                compatible = "rockchip,rk3288-wdt", "snps,dw-wdt";
+                reg = <0xff800000 0x100>;
+                interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        gic: interrupt-controller@ffc01000 {
+                compatible = "arm,gic-400";
+                interrupt-controller;
+                #interrupt-cells = <3>;
+                #address-cells = <0>;
+
+                reg = <0xffc01000 0x1000>,
+                      <0xffc02000 0x1000>,
+                      <0xffc04000 0x2000>,
+                      <0xffc06000 0x2000>;
+                interrupts = <GIC_PPI 9 0xf04>;
+        };
+
+        pinctrl: pinctrl {
+                compatible = "rockchip,rk3288-pinctrl";
+                rockchip,grf = <&grf>;
+                rockchip,pmu = <&pmu>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                gpio0: gpio0@ff750000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg =   <0xff750000 0x100>;
+                        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO0>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio1: gpio1@ff780000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0xff780000 0x100>;
+                        interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO1>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio2: gpio2@ff790000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0xff790000 0x100>;
+                        interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO2>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio3: gpio3@ff7a0000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0xff7a0000 0x100>;
+                        interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO3>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio4: gpio4@ff7b0000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0xff7b0000 0x100>;
+                        interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO4>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio5: gpio5@ff7c0000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0xff7c0000 0x100>;
+                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO5>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio6: gpio6@ff7d0000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0xff7d0000 0x100>;
+                        interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO6>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio7: gpio7@ff7e0000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0xff7e0000 0x100>;
+                        interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO7>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                gpio8: gpio8@ff7f0000 {
+                        compatible = "rockchip,gpio-bank";
+                        reg = <0xff7f0000 0x100>;
+                        interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
+                        clocks = <&cru PCLK_GPIO8>;
+
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                };
+
+                pcfg_pull_up: pcfg-pull-up {
+                        bias-pull-up;
+                };
+
+                pcfg_pull_down: pcfg-pull-down {
+                        bias-pull-down;
+                };
+
+                pcfg_pull_none: pcfg-pull-none {
+                        bias-disable;
+                };
+
+                i2c0 {
+                        i2c0_xfer: i2c0-xfer {
+                                rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,
+                                                <0 16 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
+
+                i2c1 {
+                        i2c1_xfer: i2c1-xfer {
+                                rockchip,pins = <8 4 RK_FUNC_1 &pcfg_pull_none>,
+                                                <8 5 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
+
+                i2c2 {
+                        i2c2_xfer: i2c2-xfer {
+                                rockchip,pins = <6 9 RK_FUNC_1 &pcfg_pull_none>,
+                                                <6 10 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
+
+                i2c3 {
+                        i2c3_xfer: i2c3-xfer {
+                                rockchip,pins = <2 16 RK_FUNC_1 &pcfg_pull_none>,
+                                                <2 17 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
+
+                i2c4 {
+                        i2c4_xfer: i2c4-xfer {
+                                rockchip,pins = <7 17 RK_FUNC_1 &pcfg_pull_none>,
+                                                <7 18 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
+
+                i2c5 {
+                        i2c5_xfer: i2c5-xfer {
+                                rockchip,pins = <7 19 RK_FUNC_1 &pcfg_pull_none>,
+                                                <7 20 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
+
+                sdmmc {
+                        sdmmc_clk: sdmmc-clk {
+                                rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+
+                        sdmmc_cmd: sdmmc-cmd {
+                                rockchip,pins = <6 21 RK_FUNC_1 &pcfg_pull_up>;
+                        };
+
+                        sdmmc_cd: sdmcc-cd {
+                                rockchip,pins = <6 22 RK_FUNC_1 &pcfg_pull_up>;
+                        };
+
+                        sdmmc_bus1: sdmmc-bus1 {
+                                rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up>;
+                        };
+
+                        sdmmc_bus4: sdmmc-bus4 {
+                                rockchip,pins = <6 16 RK_FUNC_1 &pcfg_pull_up>,
+                                                <6 17 RK_FUNC_1 &pcfg_pull_up>,
+                                                <6 18 RK_FUNC_1 &pcfg_pull_up>,
+                                                <6 19 RK_FUNC_1 &pcfg_pull_up>;
+                        };
+                };
+
+                emmc {
+                        emmc_clk: emmc-clk {
+                                rockchip,pins = <3 18 RK_FUNC_2 &pcfg_pull_none>;
+                        };
+
+                        emmc_cmd: emmc-cmd {
+                                rockchip,pins = <3 16 RK_FUNC_2 &pcfg_pull_up>;
+                        };
+
+                        emmc_pwr: emmc-pwr {
+                                rockchip,pins = <3 9 RK_FUNC_2 &pcfg_pull_up>;
+                        };
+
+                        emmc_bus1: emmc-bus1 {
+                                rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>;
+                        };
+
+                        emmc_bus4: emmc-bus4 {
+                                rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 1 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 2 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 3 RK_FUNC_2 &pcfg_pull_up>;
+                        };
+
+                        emmc_bus8: emmc-bus8 {
+                                rockchip,pins = <3 0 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 1 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 2 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 3 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 4 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 5 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 6 RK_FUNC_2 &pcfg_pull_up>,
+                                                <3 7 RK_FUNC_2 &pcfg_pull_up>;
+                        };
+                };
+
+                uart0 {
+                        uart0_xfer: uart0-xfer {
+                                rockchip,pins = <4 16 RK_FUNC_1 &pcfg_pull_up>,
+                                                <4 17 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+
+                        uart0_cts: uart0-cts {
+                                rockchip,pins = <4 18 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+
+                        uart0_rts: uart0-rts {
+                                rockchip,pins = <4 19 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
+
+                uart1 {
+                        uart1_xfer: uart1-xfer {
+                                rockchip,pins = <5 8 RK_FUNC_1 &pcfg_pull_up>,
+                                                <5 9 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+
+                        uart1_cts: uart1-cts {
+                                rockchip,pins = <5 10 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+
+                        uart1_rts: uart1-rts {
+                                rockchip,pins = <5 11 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
+
+                uart2 {
+                        uart2_xfer: uart2-xfer {
+                                rockchip,pins = <7 22 RK_FUNC_1 &pcfg_pull_up>,
+                                                <7 23 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                        /* no rts / cts for uart2 */
+                };
+
+                uart3 {
+                        uart3_xfer: uart3-xfer {
+                                rockchip,pins = <7 7 RK_FUNC_1 &pcfg_pull_up>,
+                                                <7 8 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+
+                        uart3_cts: uart3-cts {
+                                rockchip,pins = <7 9 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+
+                        uart3_rts: uart3-rts {
+                                rockchip,pins = <7 10 RK_FUNC_1 &pcfg_pull_none>;
+                        };
+                };
+
+                uart4 {
+                        uart4_xfer: uart4-xfer {
+                                rockchip,pins = <5 12 3 &pcfg_pull_up>,
+                                                <5 13 3 &pcfg_pull_none>;
+                        };
+
+                        uart4_cts: uart4-cts {
+                                rockchip,pins = <5 14 3 &pcfg_pull_none>;
+                        };
+
+                        uart4_rts: uart4-rts {
+                                rockchip,pins = <5 15 3 &pcfg_pull_none>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index 2adf1cc9e85d..8caf85d83901 100644
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -20,120 +20,248 @@
 / {
         interrupt-parent = <&gic>;
 
-        soc {
+        aliases {
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                i2c2 = &i2c2;
+                i2c3 = &i2c3;
+                i2c4 = &i2c4;
+        };
+
+        xin24m: oscillator {
+                compatible = "fixed-clock";
+                clock-frequency = <24000000>;
+                #clock-cells = <0>;
+                clock-output-names = "xin24m";
+        };
+
+        L2: l2-cache-controller@10138000 {
+                compatible = "arm,pl310-cache";
+                reg = <0x10138000 0x1000>;
+                cache-unified;
+                cache-level = <2>;
+        };
+
+        scu@1013c000 {
+                compatible = "arm,cortex-a9-scu";
+                reg = <0x1013c000 0x100>;
+        };
+
+        global_timer: global-timer@1013c200 {
+                compatible = "arm,cortex-a9-global-timer";
+                reg = <0x1013c200 0x20>;
+                interrupts = <GIC_PPI 11 0x304>;
+                clocks = <&cru CORE_PERI>;
+        };
+
+        local_timer: local-timer@1013c600 {
+                compatible = "arm,cortex-a9-twd-timer";
+                reg = <0x1013c600 0x20>;
+                interrupts = <GIC_PPI 13 0x304>;
+                clocks = <&cru CORE_PERI>;
+        };
+
+        gic: interrupt-controller@1013d000 {
+                compatible = "arm,cortex-a9-gic";
+                interrupt-controller;
+                #interrupt-cells = <3>;
+                reg = <0x1013d000 0x1000>,
+                      <0x1013c100 0x0100>;
+        };
+
+        uart0: serial@10124000 {
+                compatible = "snps,dw-apb-uart";
+                reg = <0x10124000 0x400>;
+                interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+                reg-shift = <2>;
+                reg-io-width = <1>;
+                clock-names = "baudclk", "apb_pclk";
+                clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>;
+                status = "disabled";
+        };
+
+        uart1: serial@10126000 {
+                compatible = "snps,dw-apb-uart";
+                reg = <0x10126000 0x400>;
+                interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+                reg-shift = <2>;
+                reg-io-width = <1>;
+                clock-names = "baudclk", "apb_pclk";
+                clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>;
+                status = "disabled";
+        };
+
+        mmc0: dwmmc@10214000 {
+                compatible = "rockchip,rk2928-dw-mshc";
+                reg = <0x10214000 0x1000>;
+                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
                 #address-cells = <1>;
-                #size-cells = <1>;
-                compatible = "simple-bus";
-                ranges;
-
-                scu@1013c000 {
-                        compatible = "arm,cortex-a9-scu";
-                        reg = <0x1013c000 0x100>;
-                };
-
-                pmu: pmu@20004000 {
-                        compatible = "rockchip,rk3066-pmu", "syscon";
-                        reg = <0x20004000 0x100>;
-                };
-
-                grf: grf@20008000 {
-                        compatible = "syscon";
-                        reg = <0x20008000 0x200>;
-                };
-
-                gic: interrupt-controller@1013d000 {
-                        compatible = "arm,cortex-a9-gic";
-                        interrupt-controller;
-                        #interrupt-cells = <3>;
-                        reg = <0x1013d000 0x1000>,
-                              <0x1013c100 0x0100>;
-                };
-
-                L2: l2-cache-controller@10138000 {
-                        compatible = "arm,pl310-cache";
-                        reg = <0x10138000 0x1000>;
-                        cache-unified;
-                        cache-level = <2>;
-                };
-
-                global-timer@1013c200 {
-                        compatible = "arm,cortex-a9-global-timer";
-                        reg = <0x1013c200 0x20>;
-                        interrupts = <GIC_PPI 11 0x304>;
-                        clocks = <&dummy150m>;
-                };
-
-                local-timer@1013c600 {
-                        compatible = "arm,cortex-a9-twd-timer";
-                        reg = <0x1013c600 0x20>;
-                        interrupts = <GIC_PPI 13 0x304>;
-                        clocks = <&dummy150m>;
-                };
-
-                uart0: serial@10124000 {
-                        compatible = "snps,dw-apb-uart";
-                        reg = <0x10124000 0x400>;
-                        interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
-                        reg-shift = <2>;
-                        reg-io-width = <1>;
-                        clocks = <&clk_gates1 8>;
-                        status = "disabled";
-                };
-
-                uart1: serial@10126000 {
-                        compatible = "snps,dw-apb-uart";
-                        reg = <0x10126000 0x400>;
-                        interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
-                        reg-shift = <2>;
-                        reg-io-width = <1>;
-                        clocks = <&clk_gates1 10>;
-                        status = "disabled";
-                };
-
-                uart2: serial@20064000 {
-                        compatible = "snps,dw-apb-uart";
-                        reg = <0x20064000 0x400>;
-                        interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
-                        reg-shift = <2>;
-                        reg-io-width = <1>;
-                        clocks = <&clk_gates1 12>;
-                        status = "disabled";
-                };
-
-                uart3: serial@20068000 {
-                        compatible = "snps,dw-apb-uart";
-                        reg = <0x20068000 0x400>;
-                        interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
-                        reg-shift = <2>;
-                        reg-io-width = <1>;
-                        clocks = <&clk_gates1 14>;
-                        status = "disabled";
-                };
-
-                dwmmc@10214000 {
-                        compatible = "rockchip,rk2928-dw-mshc";
-                        reg = <0x10214000 0x1000>;
-                        interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        clocks = <&clk_gates5 10>, <&clk_gates2 11>;
-                        clock-names = "biu", "ciu";
-
-                        status = "disabled";
-                };
-
-                dwmmc@10218000 {
-                        compatible = "rockchip,rk2928-dw-mshc";
-                        reg = <0x10218000 0x1000>;
-                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-
-                        clocks = <&clk_gates5 11>, <&clk_gates2 13>;
-                        clock-names = "biu", "ciu";
-
-                        status = "disabled";
-                };
+                #size-cells = <0>;
+
+                clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
+                clock-names = "biu", "ciu";
+
+                status = "disabled";
+        };
+
+        mmc1: dwmmc@10218000 {
+                compatible = "rockchip,rk2928-dw-mshc";
+                reg = <0x10218000 0x1000>;
+                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>;
+                clock-names = "biu", "ciu";
+
+                status = "disabled";
+        };
+
+        pmu: pmu@20004000 {
+                compatible = "rockchip,rk3066-pmu", "syscon";
+                reg = <0x20004000 0x100>;
+        };
+
+        grf: grf@20008000 {
+                compatible = "syscon";
+                reg = <0x20008000 0x200>;
+        };
+
+        i2c0: i2c@2002d000 {
+                compatible = "rockchip,rk3066-i2c";
+                reg = <0x2002d000 0x1000>;
+                interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                rockchip,grf = <&grf>;
+                rockchip,bus-index = <0>;
+
+                clock-names = "i2c";
+                clocks = <&cru PCLK_I2C0>;
+
+                status = "disabled";
+        };
+
+        i2c1: i2c@2002f000 {
+                compatible = "rockchip,rk3066-i2c";
+                reg = <0x2002f000 0x1000>;
+                interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                rockchip,grf = <&grf>;
+
+                clocks = <&cru PCLK_I2C1>;
+                clock-names = "i2c";
+
+                status = "disabled";
+        };
+
+        pwm0: pwm@20030000 {
+                compatible = "rockchip,rk2928-pwm";
+                reg = <0x20030000 0x10>;
+                #pwm-cells = <2>;
+                clocks = <&cru PCLK_PWM01>;
+                status = "disabled";
+        };
+
+        pwm1: pwm@20030010 {
+                compatible = "rockchip,rk2928-pwm";
+                reg = <0x20030010 0x10>;
+                #pwm-cells = <2>;
+                clocks = <&cru PCLK_PWM01>;
+                status = "disabled";
+        };
+
+        wdt: watchdog@2004c000 {
+                compatible = "snps,dw-wdt";
+                reg = <0x2004c000 0x100>;
+                clocks = <&cru PCLK_WDT>;
+                interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        pwm2: pwm@20050020 {
+                compatible = "rockchip,rk2928-pwm";
+                reg = <0x20050020 0x10>;
+                #pwm-cells = <2>;
+                clocks = <&cru PCLK_PWM23>;
+                status = "disabled";
+        };
+
+        pwm3: pwm@20050030 {
+                compatible = "rockchip,rk2928-pwm";
+                reg = <0x20050030 0x10>;
+                #pwm-cells = <2>;
+                clocks = <&cru PCLK_PWM23>;
+                status = "disabled";
+        };
+
+        i2c2: i2c@20056000 {
+                compatible = "rockchip,rk3066-i2c";
+                reg = <0x20056000 0x1000>;
+                interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                rockchip,grf = <&grf>;
+
+                clocks = <&cru PCLK_I2C2>;
+                clock-names = "i2c";
+
+                status = "disabled";
+        };
+
+        i2c3: i2c@2005a000 {
+                compatible = "rockchip,rk3066-i2c";
+                reg = <0x2005a000 0x1000>;
+                interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                rockchip,grf = <&grf>;
+
+                clocks = <&cru PCLK_I2C3>;
+                clock-names = "i2c";
+
+                status = "disabled";
+        };
+
+        i2c4: i2c@2005e000 {
+                compatible = "rockchip,rk3066-i2c";
+                reg = <0x2005e000 0x1000>;
+                interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                rockchip,grf = <&grf>;
+
+                clocks = <&cru PCLK_I2C4>;
+                clock-names = "i2c";
+
+                status = "disabled";
+        };
+
+        uart2: serial@20064000 {
+                compatible = "snps,dw-apb-uart";
+                reg = <0x20064000 0x400>;
+                interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+                reg-shift = <2>;
+                reg-io-width = <1>;
+                clock-names = "baudclk", "apb_pclk";
+                clocks = <&cru SCLK_UART2>, <&cru PCLK_UART2>;
+                status = "disabled";
+        };
+
+        uart3: serial@20068000 {
+                compatible = "snps,dw-apb-uart";
+                reg = <0x20068000 0x400>;
+                interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+                reg-shift = <2>;
+                reg-io-width = <1>;
+                clock-names = "baudclk", "apb_pclk";
+                clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>;
+                status = "disabled";
         };
 };
diff --git a/arch/arm/boot/dts/s3c2416.dtsi b/arch/arm/boot/dts/s3c2416.dtsi
index 955e4a4f8c31..30b8f7e47454 100644
--- a/arch/arm/boot/dts/s3c2416.dtsi
+++ b/arch/arm/boot/dts/s3c2416.dtsi
@@ -16,6 +16,10 @@
         model = "Samsung S3C2416 SoC";
         compatible = "samsung,s3c2416";
 
+        aliases {
+                serial3 = &uart3;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -68,7 +72,7 @@
                                 <&clocks SCLK_UART>;
         };
 
-        serial@5000C000 {
+        uart3: serial@5000C000 {
                 compatible = "samsung,s3c2440-uart";
                 reg = <0x5000C000 0x4000>;
                 interrupts = <1 18 24 4>, <1 18 25 4>;
diff --git a/arch/arm/boot/dts/s3c24xx.dtsi b/arch/arm/boot/dts/s3c24xx.dtsi
index 2d1d7dc9418a..5ed43b857cc4 100644
--- a/arch/arm/boot/dts/s3c24xx.dtsi
+++ b/arch/arm/boot/dts/s3c24xx.dtsi
@@ -16,6 +16,9 @@
 
         aliases {
                 pinctrl0 = &pinctrl_0;
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &uart2;
         };
 
         intc:interrupt-controller@4a000000 {
@@ -46,21 +49,21 @@
                 #pwm-cells = <4>;
         };
 
-        serial@50000000 {
+        uart0: serial@50000000 {
                 compatible = "samsung,s3c2410-uart";
                 reg = <0x50000000 0x4000>;
                 interrupts = <1 28 0 4>, <1 28 1 4>;
                 status = "disabled";
         };
 
-        serial@50004000 {
+        uart1: serial@50004000 {
                 compatible = "samsung,s3c2410-uart";
                 reg = <0x50004000 0x4000>;
                 interrupts = <1 23 3 4>, <1 23 4 4>;
                 status = "disabled";
         };
 
-        serial@50008000 {
+        uart2: serial@50008000 {
                 compatible = "samsung,s3c2410-uart";
                 reg = <0x50008000 0x4000>;
                 interrupts = <1 15 6 4>, <1 15 7 4>;
diff --git a/arch/arm/boot/dts/s3c64xx.dtsi b/arch/arm/boot/dts/s3c64xx.dtsi
index 4e3be4d3493d..ff5bdaac987a 100644
--- a/arch/arm/boot/dts/s3c64xx.dtsi
+++ b/arch/arm/boot/dts/s3c64xx.dtsi
@@ -23,6 +23,10 @@
         aliases {
                 i2c0 = &i2c0;
                 pinctrl0 = &pinctrl0;
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &uart2;
+                serial3 = &uart3;
         };
 
         cpus {
diff --git a/arch/arm/boot/dts/s5pv210-aquila.dts b/arch/arm/boot/dts/s5pv210-aquila.dts
new file mode 100644
index 000000000000..aa31b84a707a
--- /dev/null
+++ b/arch/arm/boot/dts/s5pv210-aquila.dts
@@ -0,0 +1,392 @@
+/*
+ * Samsung's S5PV210 SoC device tree source
+ *
+ * Copyright (c) 2013-2014 Samsung Electronics, Co. Ltd.
+ *
+ * Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
+ * Tomasz Figa <t.figa@samsung.com>
+ *
+ * Board device tree source for Samsung Aquila board.
+ *
+ * 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 <dt-bindings/input/input.h>
+#include "s5pv210.dtsi"
+
+/ {
+        model = "Samsung Aquila based on S5PC110";
+        compatible = "samsung,aquila", "samsung,s5pv210";
+
+        aliases {
+                i2c3 = &i2c_pmic;
+        };
+
+        chosen {
+                bootargs = "console=ttySAC2,115200n8 root=/dev/mmcblk1p5 rw rootwait ignore_loglevel earlyprintk";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x30000000 0x05000000
+                        0x40000000 0x18000000>;
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                vtf_reg: fixed-regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        regulator-name = "V_TF_2.8V";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        gpios = <&mp05 4 0>;
+                        enable-active-high;
+                };
+
+                pda_reg: fixed-regulator@1 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "VCC_1.8V_PDA";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        reg = <1>;
+                };
+
+                bat_reg: fixed-regulator@2 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "V_BAT";
+                        regulator-min-microvolt = <3700000>;
+                        regulator-max-microvolt = <3700000>;
+                        reg = <2>;
+                };
+        };
+
+        i2c_pmic: i2c-pmic {
+                compatible = "i2c-gpio";
+                gpios = <&gpj4 0 0>, /* sda */
+                        <&gpj4 3 0>; /* scl */
+                i2c-gpio,delay-us = <2>;        /* ~100 kHz */
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                pmic@66 {
+                        compatible = "national,lp3974";
+                        reg = <0x66>;
+
+                        max8998,pmic-buck1-default-dvs-idx = <0>;
+                        max8998,pmic-buck1-dvs-gpios = <&gph0 3 0>,
+                                                        <&gph0 4 0>;
+                        max8998,pmic-buck1-dvs-voltage = <1200000>, <1200000>,
+                                                        <1200000>, <1200000>;
+
+                        max8998,pmic-buck2-default-dvs-idx = <0>;
+                        max8998,pmic-buck2-dvs-gpio = <&gph0 5 0>;
+                        max8998,pmic-buck2-dvs-voltage = <1200000>, <1200000>;
+
+                        regulators {
+                                ldo2_reg: LDO2 {
+                                        regulator-name = "VALIVE_1.1V";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo3_reg: LDO3 {
+                                        regulator-name = "VUSB+MIPI_1.1V";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo4_reg: LDO4 {
+                                        regulator-name = "VADC_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                };
+
+                                ldo5_reg: LDO5 {
+                                        regulator-name = "VTF_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo6_reg: LDO6 {
+                                        regulator-name = "VCC_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo7_reg: LDO7 {
+                                        regulator-name = "VCC_3.0V";
+                                        regulator-min-microvolt = <3000000>;
+                                        regulator-max-microvolt = <3000000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo8_reg: LDO8 {
+                                        regulator-name = "VUSB+VDAC_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo9_reg: LDO9 {
+                                        regulator-name = "VCC+VCAM_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo10_reg: LDO10 {
+                                        regulator-name = "VPLL_1.1V";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                };
+
+                                ldo11_reg: LDO11 {
+                                        regulator-name = "CAM_IO_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo12_reg: LDO12 {
+                                        regulator-name = "CAM_ISP_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo13_reg: LDO13 {
+                                        regulator-name = "CAM_A_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo14_reg: LDO14 {
+                                        regulator-name = "CAM_CIF_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo15_reg: LDO15 {
+                                        regulator-name = "CAM_AF_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo16_reg: LDO16 {
+                                        regulator-name = "VMIPI_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo17_reg: LDO17 {
+                                        regulator-name = "CAM_8M_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                buck1_reg: BUCK1 {
+                                        regulator-name = "VARM_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+
+                                buck2_reg: BUCK2 {
+                                        regulator-name = "VINT_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+
+                                buck3_reg: BUCK3 {
+                                        regulator-name = "VCC_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                buck4_reg: BUCK4 {
+                                        regulator-name = "CAM_CORE_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+
+                                vichg_reg: ENVICHG {
+                                        regulator-name = "VICHG";
+                                };
+
+                                safeout1_reg: ESAFEOUT1 {
+                                        regulator-name = "SAFEOUT1";
+                                        regulator-always-on;
+                                };
+
+                                safeout2_reg: ESAFEOUT2 {
+                                        regulator-name = "SAFEOUT2";
+                                        regulator-boot-on;
+                                };
+                        };
+                };
+
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                power-key {
+                        gpios = <&gph2 6 1>;
+                        linux,code = <KEY_POWER>;
+                        label = "power";
+                        debounce-interval = <1>;
+                        gpio-key,wakeup;
+                };
+        };
+};
+
+&xusbxti {
+        clock-frequency = <24000000>;
+};
+
+&keypad {
+        linux,input-no-autorepeat;
+        linux,input-wakeup;
+        samsung,keypad-num-rows = <3>;
+        samsung,keypad-num-columns = <3>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&keypad_row0>, <&keypad_row1>, <&keypad_row2>,
+                        <&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
+        status = "okay";
+
+        key_1 {
+                keypad,row = <0>;
+                keypad,column = <1>;
+                linux,code = <KEY_CONNECT>;
+        };
+
+        key_2 {
+                keypad,row = <0>;
+                keypad,column = <2>;
+                linux,code = <KEY_BACK>;
+        };
+
+        key_3 {
+                keypad,row = <1>;
+                keypad,column = <1>;
+                linux,code = <KEY_CAMERA_FOCUS>;
+        };
+
+        key_4 {
+                keypad,row = <1>;
+                keypad,column = <2>;
+                linux,code = <KEY_VOLUMEUP>;
+        };
+
+        key_5 {
+                keypad,row = <2>;
+                keypad,column = <1>;
+                linux,code = <KEY_CAMERA>;
+        };
+
+        key_6 {
+                keypad,row = <2>;
+                keypad,column = <2>;
+                linux,code = <KEY_VOLUMEDOWN>;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&sdhci0 {
+        bus-width = <4>;
+        non-removable;
+        status = "okay";
+        vmmc-supply = <&ldo5_reg>;
+        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4>;
+        pinctrl-names = "default";
+};
+
+&sdhci2 {
+        bus-width = <4>;
+        cd-gpios = <&gph3 4 1>;
+        vmmc-supply = <&vtf_reg>;
+        cd-inverted;
+        pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &t_flash_detect>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&onenand {
+        status = "okay";
+};
+
+&hsotg {
+        vusb_a-supply = <&ldo3_reg>;
+        vusb_d-supply = <&ldo8_reg>;
+        status = "okay";
+};
+
+&usbphy {
+        status = "okay";
+};
+
+&fimd {
+        pinctrl-0 = <&lcd_clk &lcd_data24 &pwm1_out>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        display-timings {
+                native-mode = <&timing0>;
+                timing0: timing {
+                        clock-frequency = <0>;
+                        hactive = <800>;
+                        vactive = <480>;
+                        hfront-porch = <16>;
+                        hback-porch = <16>;
+                        hsync-len = <2>;
+                        vback-porch = <3>;
+                        vfront-porch = <28>;
+                        vsync-len = <1>;
+                };
+        };
+};
+
+&pinctrl0 {
+        t_flash_detect: t-flash-detect {
+                samsung,pins = "gph3-4";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <0>;
+        };
+};
diff --git a/arch/arm/boot/dts/s5pv210-goni.dts b/arch/arm/boot/dts/s5pv210-goni.dts
new file mode 100644
index 000000000000..6387c77a6f7b
--- /dev/null
+++ b/arch/arm/boot/dts/s5pv210-goni.dts
@@ -0,0 +1,449 @@
+/*
+ * Samsung's S5PV210 SoC device tree source
+ *
+ * Copyright (c) 2013-2014 Samsung Electronics, Co. Ltd.
+ *
+ * Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
+ * Tomasz Figa <t.figa@samsung.com>
+ *
+ * Board device tree source for Samsung Goni board.
+ *
+ * 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 <dt-bindings/input/input.h>
+#include "s5pv210.dtsi"
+
+/ {
+        model = "Samsung Goni based on S5PC110";
+        compatible = "samsung,goni", "samsung,s5pv210";
+
+        aliases {
+                i2c3 = &i2c_pmic;
+        };
+
+        chosen {
+                bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p5 rw rootwait ignore_loglevel earlyprintk";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x30000000 0x05000000
+                        0x40000000 0x10000000
+                        0x50000000 0x08000000>;
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                vtf_reg: fixed-regulator@0 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "V_TF_2.8V";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        reg = <0>;
+                        gpios = <&mp05 4 0>;
+                        enable-active-high;
+                };
+
+                pda_reg: fixed-regulator@1 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "VCC_1.8V_PDA";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        reg = <1>;
+                };
+
+                bat_reg: fixed-regulator@2 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "V_BAT";
+                        regulator-min-microvolt = <3700000>;
+                        regulator-max-microvolt = <3700000>;
+                        reg = <2>;
+                };
+
+                tsp_reg: fixed-regulator@3 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "TSP_VDD";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        reg = <3>;
+                        gpios = <&gpj1 3 0>;
+                        enable-active-high;
+                };
+        };
+
+        i2c_pmic: i2c-pmic {
+                compatible = "i2c-gpio";
+                gpios = <&gpj4 0 0>, /* sda */
+                        <&gpj4 3 0>; /* scl */
+                i2c-gpio,delay-us = <2>;        /* ~100 kHz */
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                pmic@66 {
+                        compatible = "national,lp3974";
+                        reg = <0x66>;
+
+                        max8998,pmic-buck1-default-dvs-idx = <0>;
+                        max8998,pmic-buck1-dvs-gpios = <&gph0 3 0>,
+                                                        <&gph0 4 0>;
+                        max8998,pmic-buck1-dvs-voltage = <1200000>, <1200000>,
+                                                        <1200000>, <1200000>;
+
+                        max8998,pmic-buck2-default-dvs-idx = <0>;
+                        max8998,pmic-buck2-dvs-gpio = <&gph0 5 0>;
+                        max8998,pmic-buck2-dvs-voltage = <1200000>, <1200000>;
+
+                        regulators {
+                                ldo2_reg: LDO2 {
+                                        regulator-name = "VALIVE_1.1V";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo3_reg: LDO3 {
+                                        regulator-name = "VUSB+MIPI_1.1V";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo4_reg: LDO4 {
+                                        regulator-name = "VADC_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                };
+
+                                ldo5_reg: LDO5 {
+                                        regulator-name = "VTF_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+
+                                ldo6_reg: LDO6 {
+                                        regulator-name = "VCC_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                };
+
+                                ldo7_reg: LDO7 {
+                                        regulator-name = "VLCD_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                ldo8_reg: LDO8 {
+                                        regulator-name = "VUSB+VDAC_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                };
+
+                                ldo9_reg: LDO9 {
+                                        regulator-name = "VCC+VCAM_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+
+                                ldo10_reg: LDO10 {
+                                        regulator-name = "VPLL_1.1V";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-boot-on;
+                                };
+
+                                ldo11_reg: LDO11 {
+                                        regulator-name = "CAM_IO_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+
+                                ldo12_reg: LDO12 {
+                                        regulator-name = "CAM_ISP_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                };
+
+                                ldo13_reg: LDO13 {
+                                        regulator-name = "CAM_A_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                };
+
+                                ldo14_reg: LDO14 {
+                                        regulator-name = "CAM_CIF_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo15_reg: LDO15 {
+                                        regulator-name = "CAM_AF_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                };
+
+                                ldo16_reg: LDO16 {
+                                        regulator-name = "VMIPI_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                };
+
+                                ldo17_reg: LDO17 {
+                                        regulator-name = "CAM_8M_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                buck1_reg: BUCK1 {
+                                        regulator-name = "VARM_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                };
+
+                                buck2_reg: BUCK2 {
+                                        regulator-name = "VINT_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                };
+
+                                buck3_reg: BUCK3 {
+                                        regulator-name = "VCC_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                buck4_reg: BUCK4 {
+                                        regulator-name = "CAM_CORE_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+                        };
+                };
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                power-key {
+                        gpios = <&gph2 6 1>;
+                        linux,code = <KEY_POWER>;
+                        label = "power";
+                        debounce-interval = <1>;
+                        gpio-key,wakeup;
+                };
+        };
+};
+
+&xusbxti {
+        clock-frequency = <24000000>;
+};
+
+&keypad {
+        linux,input-no-autorepeat;
+        linux,input-wakeup;
+        samsung,keypad-num-rows = <3>;
+        samsung,keypad-num-columns = <3>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&keypad_row0>, <&keypad_row1>, <&keypad_row2>,
+                        <&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
+        status = "okay";
+
+        key_1 {
+                keypad,row = <0>;
+                keypad,column = <1>;
+                linux,code = <KEY_CONNECT>;
+        };
+
+        key_2 {
+                keypad,row = <0>;
+                keypad,column = <2>;
+                linux,code = <KEY_BACK>;
+        };
+
+        key_3 {
+                keypad,row = <1>;
+                keypad,column = <1>;
+                linux,code = <KEY_CAMERA_FOCUS>;
+        };
+
+        key_4 {
+                keypad,row = <1>;
+                keypad,column = <2>;
+                linux,code = <KEY_VOLUMEUP>;
+        };
+
+        key_5 {
+                keypad,row = <2>;
+                keypad,column = <1>;
+                linux,code = <KEY_CAMERA>;
+        };
+
+        key_6 {
+                keypad,row = <2>;
+                keypad,column = <2>;
+                linux,code = <KEY_VOLUMEDOWN>;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&sdhci0 {
+        bus-width = <4>;
+        non-removable;
+        vmmc-supply = <&ldo5_reg>;
+        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus1 &sd0_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&sdhci2 {
+        bus-width = <4>;
+        cd-gpios = <&gph3 4 1>;
+        vmmc-supply = <&vtf_reg>;
+        cd-inverted;
+        pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&hsotg {
+        vusb_a-supply = <&ldo3_reg>;
+        vusb_d-supply = <&ldo8_reg>;
+        status = "okay";
+};
+
+&usbphy {
+        status = "okay";
+};
+
+&i2c2 {
+        samsung,i2c-sda-delay = <100>;
+        samsung,i2c-max-bus-freq = <400000>;
+        samsung,i2c-slave-addr = <0x10>;
+        status = "okay";
+
+        tsp@4a {
+                compatible = "atmel,maxtouch";
+                reg = <0x4a>;
+                interrupt-parent = <&gpj0>;
+                interrupts = <5 2>;
+
+                atmel,x-line = <17>;
+                atmel,y-line = <11>;
+                atmel,x-size = <800>;
+                atmel,y-size = <480>;
+                atmel,burst-length = <0x21>;
+                atmel,threshold = <0x28>;
+                atmel,orientation = <1>;
+
+                vdd-supply = <&tsp_reg>;
+        };
+};
+
+&i2c0 {
+        samsung,i2c-sda-delay = <100>;
+        samsung,i2c-max-bus-freq = <100000>;
+        samsung,i2c-slave-addr = <0x10>;
+        status = "okay";
+
+        noon010pc30: sensor@30 {
+                compatible = "siliconfile,noon010pc30";
+                reg = <0x30>;
+                vddio-supply = <&ldo11_reg>;
+                vdda-supply = <&ldo13_reg>;
+                vdd_core-supply = <&ldo14_reg>;
+
+                clock-frequency = <16000000>;
+                clocks = <&clock_cam 0>;
+                clock-names = "mclk";
+                nreset-gpios = <&gpb 2 0>;
+                nstby-gpios = <&gpb 0 0>;
+
+                port {
+                        noon010pc30_ep: endpoint {
+                                remote-endpoint = <&fimc0_ep>;
+                                bus-width = <8>;
+                                hsync-active = <0>;
+                                vsync-active = <1>;
+                                pclk-sample = <1>;
+                        };
+                };
+        };
+};
+
+&camera {
+        pinctrl-0 = <&cam_port_a_io &cam_port_a_clk_active>;
+        pinctrl-1 = <&cam_port_a_io &cam_port_a_clk_idle>;
+        pinctrl-names = "default", "idle";
+
+        parallel-ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                /* camera A input */
+                port@1 {
+                        reg = <1>;
+                        fimc0_ep: endpoint {
+                                remote-endpoint = <&noon010pc30_ep>;
+                                bus-width = <8>;
+                                hsync-active = <1>;
+                                vsync-active = <1>;
+                                pclk-sample = <0>;
+                        };
+                };
+        };
+};
+
+&fimd {
+        pinctrl-0 = <&lcd_clk &lcd_data24>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        display-timings {
+                native-mode = <&timing0>;
+                timing0: timing {
+                        /* 480x800@55Hz */
+                        clock-frequency = <23439570>;
+                        hactive = <480>;
+                        hfront-porch = <16>;
+                        hback-porch = <16>;
+                        hsync-len = <2>;
+                        vactive = <800>;
+                        vback-porch = <2>;
+                        vfront-porch = <28>;
+                        vsync-len = <1>;
+                        hsync-active = <0>;
+                        vsync-active = <0>;
+                        de-active = <0>;
+                        pixelclk-active = <0>;
+                };
+        };
+};
+
+&onenand {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/s5pv210-pinctrl.dtsi b/arch/arm/boot/dts/s5pv210-pinctrl.dtsi
new file mode 100644
index 000000000000..8c714088e3c6
--- /dev/null
+++ b/arch/arm/boot/dts/s5pv210-pinctrl.dtsi
@@ -0,0 +1,839 @@
+/*
+ * Samsung's S5PV210 SoC device tree source
+ *
+ * Copyright (c) 2013-2014 Samsung Electronics, Co. Ltd.
+ *
+ * Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
+ * Tomasz Figa <t.figa@samsung.com>
+ *
+ * Samsung's S5PV210 SoC device nodes are listed in this file. S5PV210
+ * based board files can include this file and provide values for board specfic
+ * bindings.
+ *
+ * Note: This file does not include device nodes for all the controllers in
+ * S5PV210 SoC. As device tree coverage for S5PV210 increases, additional
+ * nodes can be added to this file.
+ *
+ * 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.
+ */
+
+&pinctrl0 {
+        gpa0: gpa0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpa1: gpa1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpb: gpb {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpc0: gpc0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpc1: gpc1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpd0: gpd0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpd1: gpd1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpe0: gpe0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpe1: gpe1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf0: gpf0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf1: gpf1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf2: gpf2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpf3: gpf3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpg0: gpg0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpg1: gpg1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpg2: gpg2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpg3: gpg3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpj0: gpj0 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpj1: gpj1 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpj2: gpj2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpj3: gpj3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpj4: gpj4 {
+                gpio-controller;
+                #gpio-cells = <2>;
+
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+
+        gpgi: gpgi {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        mp01: mp01 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        mp02: mp02 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        mp03: mp03 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        mp04: mp04 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        mp05: mp05 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        mp06: mp06 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        mp07: mp07 {
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        gph0: gph0 {
+                gpio-controller;
+                interrupt-controller;
+                interrupt-parent = <&vic0>;
+                interrupts = <0>, <1>, <2>, <3>,
+                                <4>, <5>, <6>, <7>;
+                #gpio-cells = <2>;
+                #interrupt-cells = <2>;
+        };
+
+        gph1: gph1 {
+                gpio-controller;
+                interrupt-controller;
+                interrupt-parent = <&vic0>;
+                interrupts = <8>, <9>, <10>, <11>,
+                                <12>, <13>, <14>, <15>;
+                #gpio-cells = <2>;
+                #interrupt-cells = <2>;
+        };
+
+        gph2: gph2 {
+                gpio-controller;
+                #gpio-cells = <2>;
+                #interrupt-cells = <2>;
+        };
+
+        gph3: gph3 {
+                gpio-controller;
+                #gpio-cells = <2>;
+                #interrupt-cells = <2>;
+        };
+
+        uart0_data: uart0-data {
+                samsung,pins = "gpa0-0", "gpa0-1";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        uart0_fctl: uart0-fctl {
+                samsung,pins = "gpa0-2", "gpa0-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        uart1_data: uart1-data {
+                samsung,pins = "gpa0-4", "gpa0-5";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        uart1_fctl: uart1-fctl {
+                samsung,pins = "gpa0-6", "gpa0-7";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        uart2_data: uart2-data {
+                samsung,pins = "gpa1-0", "gpa1-1";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        uart2_fctl: uart2-fctl {
+                samsung,pins = "gpa1-2", "gpa1-3";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        uart3_data: uart3-data {
+                samsung,pins = "gpa1-2", "gpa1-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        uart_audio: uart-audio {
+                samsung,pins = "gpa1-2", "gpa1-3";
+                samsung,pin-function = <4>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        spi0_bus: spi0-bus {
+                samsung,pins = "gpb-0", "gpb-2", "gpb-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <0>;
+        };
+
+        spi1_bus: spi1-bus {
+                samsung,pins = "gpb-4", "gpb-6", "gpb-7";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <0>;
+        };
+
+        i2s0_bus: i2s0-bus {
+                samsung,pins = "gpi-0", "gpi-1", "gpi-2", "gpi-3",
+                                "gpi-4", "gpi-5", "gpi-6";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        i2s1_bus: i2s1-bus {
+                samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
+                                "gpc0-4";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        i2s2_bus: i2s2-bus {
+                samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
+                                "gpc1-4";
+                samsung,pin-function = <4>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        pcm1_bus: pcm1-bus {
+                samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
+                                "gpc0-4";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        ac97_bus: ac97-bus {
+                samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3",
+                                "gpc0-4";
+                samsung,pin-function = <4>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        i2s2_bus: i2s2-bus {
+                samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
+                                "gpc1-4";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        pcm2_bus: pcm2-bus {
+                samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3",
+                                "gpc1-4";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        spdif_bus: spdif-bus {
+                samsung,pins = "gpc1-0", "gpc1-1";
+                samsung,pin-function = <4>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        spi2_bus: spi2-bus {
+                samsung,pins = "gpc1-1", "gpc1-2", "gpc1-3", "gpc1-4";
+                samsung,pin-function = <5>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <0>;
+        };
+
+        i2c0_bus: i2c0-bus {
+                samsung,pins = "gpd1-0", "gpd1-1";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <0>;
+        };
+
+        i2c1_bus: i2c1-bus {
+                samsung,pins = "gpd1-2", "gpd1-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <0>;
+        };
+
+        i2c2_bus: i2c2-bus {
+                samsung,pins = "gpd1-4", "gpd1-5";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <0>;
+        };
+
+        pwm0_out: pwm0-out {
+                samsung,pins = "gpd0-0";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        pwm1_out: pwm1-out {
+                samsung,pins = "gpd0-1";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        pwm2_out: pwm2-out {
+                samsung,pins = "gpd0-2";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        pwm3_out: pwm3-out {
+                samsung,pins = "gpd0-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_row0: keypad-row-0 {
+                samsung,pins = "gph3-0";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_row1: keypad-row-1 {
+                samsung,pins = "gph3-1";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_row2: keypad-row-2 {
+                samsung,pins = "gph3-2";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_row3: keypad-row-3 {
+                samsung,pins = "gph3-3";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_row4: keypad-row-4 {
+                samsung,pins = "gph3-4";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_row5: keypad-row-5 {
+                samsung,pins = "gph3-5";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_row6: keypad-row-6 {
+                samsung,pins = "gph3-6";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_row7: keypad-row-7 {
+                samsung,pins = "gph3-7";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_col0: keypad-col-0 {
+                samsung,pins = "gph2-0";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_col1: keypad-col-1 {
+                samsung,pins = "gph2-1";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_col2: keypad-col-2 {
+                samsung,pins = "gph2-2";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_col3: keypad-col-3 {
+                samsung,pins = "gph2-3";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_col4: keypad-col-4 {
+                samsung,pins = "gph2-4";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_col5: keypad-col-5 {
+                samsung,pins = "gph2-5";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_col6: keypad-col-6 {
+                samsung,pins = "gph2-6";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        keypad_col7: keypad-col-7 {
+                samsung,pins = "gph2-7";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        sd0_clk: sd0-clk {
+                samsung,pins = "gpg0-0";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd0_cmd: sd0-cmd {
+                samsung,pins = "gpg0-1";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd0_cd: sd0-cd {
+                samsung,pins = "gpg0-2";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd0_bus1: sd0-bus-width1 {
+                samsung,pins = "gpg0-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd0_bus4: sd0-bus-width4 {
+                samsung,pins = "gpg0-3", "gpg0-4", "gpg0-5", "gpg0-6";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd0_bus8: sd0-bus-width8 {
+                samsung,pins = "gpg1-3", "gpg1-4", "gpg1-5", "gpg1-6";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd1_clk: sd1-clk {
+                samsung,pins = "gpg1-0";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd1_cmd: sd1-cmd {
+                samsung,pins = "gpg1-1";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd1_cd: sd1-cd {
+                samsung,pins = "gpg1-2";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd1_bus1: sd1-bus-width1 {
+                samsung,pins = "gpg1-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd1_bus4: sd1-bus-width4 {
+                samsung,pins = "gpg1-3", "gpg1-4", "gpg1-5", "gpg1-6";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd2_clk: sd2-clk {
+                samsung,pins = "gpg2-0";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd2_cmd: sd2-cmd {
+                samsung,pins = "gpg2-1";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd2_cd: sd2-cd {
+                samsung,pins = "gpg2-2";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd2_bus1: sd2-bus-width1 {
+                samsung,pins = "gpg2-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd2_bus4: sd2-bus-width4 {
+                samsung,pins = "gpg2-3", "gpg2-4", "gpg2-5", "gpg2-6";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd2_bus8: sd2-bus-width8 {
+                samsung,pins = "gpg3-3", "gpg3-4", "gpg3-5", "gpg3-6";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd3_clk: sd3-clk {
+                samsung,pins = "gpg3-0";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd3_cmd: sd3-cmd {
+                samsung,pins = "gpg3-1";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd3_cd: sd3-cd {
+                samsung,pins = "gpg3-2";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd3_bus1: sd3-bus-width1 {
+                samsung,pins = "gpg3-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        sd3_bus4: sd3-bus-width4 {
+                samsung,pins = "gpg3-3", "gpg3-4", "gpg3-5", "gpg3-6";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <2>;
+                samsung,pin-drv = <3>;
+        };
+
+        eint0: ext-int0 {
+                samsung,pins = "gph0-0";
+                samsung,pin-function = <0xf>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        eint8: ext-int8 {
+                samsung,pins = "gph1-0";
+                samsung,pin-function = <0xf>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        eint15: ext-int15 {
+                samsung,pins = "gph1-7";
+                samsung,pin-function = <0xf>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        eint16: ext-int16 {
+                samsung,pins = "gph2-0";
+                samsung,pin-function = <0xf>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        eint31: ext-int31 {
+                samsung,pins = "gph3-7";
+                samsung,pin-function = <0xf>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        cam_port_a_io: cam-port-a-io {
+                samsung,pins = "gpe0-0", "gpe0-1", "gpe0-2", "gpe0-3",
+                                "gpe0-4", "gpe0-5", "gpe0-6", "gpe0-7",
+                                "gpe1-0", "gpe1-1", "gpe1-2", "gpe1-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 = "gpe1-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 = "gpe1-3";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <1>;
+                samsung,pin-drv = <0>;
+        };
+
+        cam_port_b_io: cam-port-b-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 = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        cam_port_b_clk_active: cam-port-b-clk-active {
+                samsung,pins = "gpj1-3";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <3>;
+        };
+
+        cam_port_b_clk_idle: cam-port-b-clk-idle {
+                samsung,pins = "gpj1-3";
+                samsung,pin-function = <0>;
+                samsung,pin-pud = <1>;
+                samsung,pin-drv = <0>;
+        };
+
+                lcd_ctrl: lcd-ctrl {
+                samsung,pins = "gpd0-0", "gpd0-1";
+                samsung,pin-function = <3>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        lcd_sync: lcd-sync {
+                samsung,pins = "gpf0-0", "gpf0-1";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        lcd_clk: lcd-clk {
+                samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+
+        lcd_data24: lcd-data-width24 {
+                samsung,pins =  "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7",
+                                "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3",
+                                "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7",
+                                "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
+                                "gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
+                                "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
+                samsung,pin-function = <2>;
+                samsung,pin-pud = <0>;
+                samsung,pin-drv = <0>;
+        };
+};
diff --git a/arch/arm/boot/dts/s5pv210-smdkc110.dts b/arch/arm/boot/dts/s5pv210-smdkc110.dts
new file mode 100644
index 000000000000..1eedab7ffe94
--- /dev/null
+++ b/arch/arm/boot/dts/s5pv210-smdkc110.dts
@@ -0,0 +1,78 @@
+/*
+ * Samsung's S5PV210 SoC device tree source
+ *
+ * Copyright (c) 2013-2014 Samsung Electronics, Co. Ltd.
+ *
+ * Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
+ * Tomasz Figa <t.figa@samsung.com>
+ *
+ * Board device tree source for YIC System SMDC110 board.
+ *
+ * NOTE: This file is completely based on original board file for mach-smdkc110
+ * available in Linux 3.15 and intends to provide equivalent level of hardware
+ * support. Due to lack of hardware, _no_ testing has been performed.
+ *
+ * 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 <dt-bindings/input/input.h>
+#include "s5pv210.dtsi"
+
+/ {
+        model = "YIC System SMDKC110 based on S5PC110";
+        compatible = "yic,smdkc110", "samsung,s5pv210";
+
+        chosen {
+                bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x20000000 0x20000000>;
+        };
+};
+
+&xusbxti {
+        clock-frequency = <24000000>;
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&rtc {
+        status = "okay";
+};
+
+&i2c0 {
+        status = "okay";
+
+        audio-codec@1b {
+                compatible = "wlf,wm8580";
+                reg = <0x1b>;
+        };
+
+        eeprom@50 {
+                compatible = "atmel,24c08";
+                reg = <0x50>;
+        };
+};
+
+&i2s0 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/s5pv210-smdkv210.dts b/arch/arm/boot/dts/s5pv210-smdkv210.dts
new file mode 100644
index 000000000000..cb8521899ec8
--- /dev/null
+++ b/arch/arm/boot/dts/s5pv210-smdkv210.dts
@@ -0,0 +1,238 @@
+/*
+ * Samsung's S5PV210 SoC device tree source
+ *
+ * Copyright (c) 2013-2014 Samsung Electronics, Co. Ltd.
+ *
+ * Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
+ * Tomasz Figa <t.figa@samsung.com>
+ *
+ * Board device tree source for YIC System SMDV210 board.
+ *
+ * NOTE: This file is completely based on original board file for mach-smdkv210
+ * available in Linux 3.15 and intends to provide equivalent level of hardware
+ * support. Due to lack of hardware, _no_ testing has been performed.
+ *
+ * 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 <dt-bindings/input/input.h>
+#include "s5pv210.dtsi"
+
+/ {
+        model = "YIC System SMDKV210 based on S5PV210";
+        compatible = "yic,smdkv210", "samsung,s5pv210";
+
+        chosen {
+                bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x20000000 0x40000000>;
+        };
+
+        ethernet@18000000 {
+                compatible = "davicom,dm9000";
+                reg = <0xA8000000 0x2 0xA8000002 0x2>;
+                interrupt-parent = <&gph1>;
+                interrupts = <1 4>;
+                local-mac-address = [00 00 de ad be ef];
+                davicom,no-eeprom;
+        };
+
+        backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm 3 5000000 0>;
+                brightness-levels = <0 4 8 16 32 64 128 255>;
+                default-brightness-level = <6>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&pwm3_out>;
+        };
+};
+
+&xusbxti {
+        clock-frequency = <24000000>;
+};
+
+&keypad {
+        linux,input-no-autorepeat;
+        linux,input-wakeup;
+        samsung,keypad-num-rows = <8>;
+        samsung,keypad-num-columns = <8>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&keypad_row0>, <&keypad_row1>, <&keypad_row2>,
+                        <&keypad_row3>, <&keypad_row4>, <&keypad_row5>,
+                        <&keypad_row6>, <&keypad_row7>,
+                        <&keypad_col0>, <&keypad_col1>, <&keypad_col2>,
+                        <&keypad_col3>, <&keypad_col4>, <&keypad_col5>,
+                        <&keypad_col6>, <&keypad_col7>;
+        status = "okay";
+
+        key_1 {
+                keypad,row = <0>;
+                keypad,column = <3>;
+                linux,code = <KEY_1>;
+        };
+
+        key_2 {
+                keypad,row = <0>;
+                keypad,column = <4>;
+                linux,code = <KEY_2>;
+        };
+
+        key_3 {
+                keypad,row = <0>;
+                keypad,column = <5>;
+                linux,code = <KEY_3>;
+        };
+
+        key_4 {
+                keypad,row = <0>;
+                keypad,column = <6>;
+                linux,code = <KEY_4>;
+        };
+
+        key_5 {
+                keypad,row = <0
+                >;
+                keypad,column = <7>;
+                linux,code = <KEY_5>;
+        };
+
+        key_6 {
+                keypad,row = <1>;
+                keypad,column = <3>;
+                linux,code = <KEY_A>;
+        };
+        key_7 {
+                keypad,row = <1>;
+                keypad,column = <4>;
+                linux,code = <KEY_B>;
+        };
+
+        key_8 {
+                keypad,row = <1>;
+                keypad,column = <5>;
+                linux,code = <KEY_C>;
+        };
+
+        key_9 {
+                keypad,row = <1>;
+                keypad,column = <6>;
+                linux,code = <KEY_D>;
+        };
+
+        key_10 {
+                keypad,row = <1>;
+                keypad,column = <7>;
+                linux,code = <KEY_E>;
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&rtc {
+        status = "okay";
+};
+
+&sdhci0 {
+        bus-width = <4>;
+        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus1 &sd0_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&sdhci1 {
+        bus-width = <4>;
+        pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus1 &sd1_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&sdhci2 {
+        bus-width = <4>;
+        pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&sdhci3 {
+        bus-width = <4>;
+        pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_cd &sd3_bus1 &sd3_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&hsotg {
+        status = "okay";
+};
+
+&usbphy {
+        status = "okay";
+};
+
+&fimd {
+        pinctrl-0 = <&lcd_clk &lcd_data24>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        display-timings {
+                native-mode = <&timing0>;
+
+                timing0: timing@0 {
+                        /* 800x480@60Hz */
+                        clock-frequency = <24373920>;
+                        hactive = <800>;
+                        vactive = <480>;
+                        hfront-porch = <8>;
+                        hback-porch = <13>;
+                        hsync-len = <3>;
+                        vback-porch = <7>;
+                        vfront-porch = <5>;
+                        vsync-len = <1>;
+                        hsync-active = <0>;
+                        vsync-active = <0>;
+                        de-active = <1>;
+                        pixelclk-active = <1>;
+                };
+        };
+};
+
+&pwm {
+        samsung,pwm-outputs = <3>;
+};
+
+&i2c0 {
+        status = "okay";
+
+        audio-codec@1b {
+                compatible = "wlf,wm8580";
+                reg = <0x1b>;
+        };
+
+        eeprom@50 {
+                compatible = "atmel,24c08";
+                reg = <0x50>;
+        };
+};
+
+&i2s0 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/s5pv210-torbreck.dts b/arch/arm/boot/dts/s5pv210-torbreck.dts
new file mode 100644
index 000000000000..622599fd2cfa
--- /dev/null
+++ b/arch/arm/boot/dts/s5pv210-torbreck.dts
@@ -0,0 +1,92 @@
+/*
+ * Samsung's S5PV210 SoC device tree source
+ *
+ * Copyright (c) 2013-2014 Samsung Electronics, Co. Ltd.
+ *
+ * Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
+ * Tomasz Figa <t.figa@samsung.com>
+ *
+ * Board device tree source for Torbreck board.
+ *
+ * NOTE: This file is completely based on original board file for mach-torbreck
+ * available in Linux 3.15 and intends to provide equivalent level of hardware
+ * support. Due to lack of hardware, _no_ testing has been performed.
+ *
+ * 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 <dt-bindings/input/input.h>
+#include "s5pv210.dtsi"
+
+/ {
+        model = "aESOP Torbreck based on S5PV210";
+        compatible = "aesop,torbreck", "samsung,s5pv210";
+
+        chosen {
+                bootargs = "console=ttySAC0,115200n8 root=/dev/mmcblk0p1 rw rootwait ignore_loglevel earlyprintk";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x20000000 0x20000000>;
+        };
+};
+
+&xusbxti {
+        clock-frequency = <24000000>;
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
+
+&uart2 {
+        status = "okay";
+};
+
+&uart3 {
+        status = "okay";
+};
+
+&rtc {
+        status = "okay";
+};
+
+&sdhci0 {
+        bus-width = <4>;
+        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus1 &sd0_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&sdhci1 {
+        bus-width = <4>;
+        pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus1 &sd1_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&sdhci2 {
+        bus-width = <4>;
+        pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus1 &sd2_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&sdhci3 {
+        bus-width = <4>;
+        pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_cd &sd3_bus1 &sd3_bus4>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&i2s0 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
new file mode 100644
index 000000000000..8344a0ee2b86
--- /dev/null
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -0,0 +1,633 @@
+/*
+ * Samsung's S5PV210 SoC device tree source
+ *
+ * Copyright (c) 2013-2014 Samsung Electronics, Co. Ltd.
+ *
+ * Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
+ * Tomasz Figa <t.figa@samsung.com>
+ *
+ * Samsung's S5PV210 SoC device nodes are listed in this file. S5PV210
+ * based board files can include this file and provide values for board specfic
+ * bindings.
+ *
+ * Note: This file does not include device nodes for all the controllers in
+ * S5PV210 SoC. As device tree coverage for S5PV210 increases, additional
+ * nodes can be added to this file.
+ *
+ * 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 "skeleton.dtsi"
+#include <dt-bindings/clock/s5pv210.h>
+#include <dt-bindings/clock/s5pv210-audss.h>
+
+/ {
+        aliases {
+                csis0 = &csis0;
+                fimc0 = &fimc0;
+                fimc1 = &fimc1;
+                fimc2 = &fimc2;
+                i2c0 = &i2c0;
+                i2c1 = &i2c1;
+                i2c2 = &i2c2;
+                i2s0 = &i2s0;
+                i2s1 = &i2s1;
+                i2s2 = &i2s2;
+                pinctrl0 = &pinctrl0;
+                spi0 = &spi0;
+                spi1 = &spi1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a8";
+                        reg = <0>;
+                };
+        };
+
+        soc {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                external-clocks {
+                        compatible = "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        xxti: oscillator@0 {
+                                compatible = "fixed-clock";
+                                reg = <0>;
+                                clock-frequency = <0>;
+                                clock-output-names = "xxti";
+                                #clock-cells = <0>;
+                        };
+
+                        xusbxti: oscillator@1 {
+                                compatible = "fixed-clock";
+                                reg = <1>;
+                                clock-frequency = <0>;
+                                clock-output-names = "xusbxti";
+                                #clock-cells = <0>;
+                        };
+                };
+
+                onenand: onenand@b0000000 {
+                        compatible = "samsung,s5pv210-onenand";
+                        reg = <0xb0600000 0x2000>,
+                                <0xb0000000 0x20000>,
+                                <0xb0040000 0x20000>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <31>;
+                        clocks = <&clocks CLK_NANDXL>, <&clocks DOUT_FLASH>;
+                        clock-names = "bus", "onenand";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        status = "disabled";
+                };
+
+                chipid@e0000000 {
+                        compatible = "samsung,s5pv210-chipid";
+                        reg = <0xe0000000 0x1000>;
+                };
+
+                clocks: clock-controller@e0100000 {
+                        compatible = "samsung,s5pv210-clock", "simple-bus";
+                        reg = <0xe0100000 0x10000>;
+                        clock-names = "xxti", "xusbxti";
+                        clocks = <&xxti>, <&xusbxti>;
+                        #clock-cells = <1>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges;
+
+                        pmu_syscon: syscon@e0108000 {
+                                compatible = "samsung-s5pv210-pmu", "syscon";
+                                reg = <0xe0108000 0x8000>;
+                        };
+                };
+
+                pinctrl0: pinctrl@e0200000 {
+                        compatible = "samsung,s5pv210-pinctrl";
+                        reg = <0xe0200000 0x1000>;
+                        interrupt-parent = <&vic0>;
+                        interrupts = <30>;
+
+                        wakeup-interrupt-controller {
+                                compatible = "samsung,exynos4210-wakeup-eint";
+                                interrupts = <16>;
+                                interrupt-parent = <&vic0>;
+                        };
+                };
+
+                amba {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "arm,amba-bus";
+                        ranges;
+
+                        pdma0: dma@e0900000 {
+                                compatible = "arm,pl330", "arm,primecell";
+                                reg = <0xe0900000 0x1000>;
+                                interrupt-parent = <&vic0>;
+                                interrupts = <19>;
+                                clocks = <&clocks CLK_PDMA0>;
+                                clock-names = "apb_pclk";
+                                #dma-cells = <1>;
+                                #dma-channels = <8>;
+                                #dma-requests = <32>;
+                        };
+
+                        pdma1: dma@e0a00000 {
+                                compatible = "arm,pl330", "arm,primecell";
+                                reg = <0xe0a00000 0x1000>;
+                                interrupt-parent = <&vic0>;
+                                interrupts = <20>;
+                                clocks = <&clocks CLK_PDMA1>;
+                                clock-names = "apb_pclk";
+                                #dma-cells = <1>;
+                                #dma-channels = <8>;
+                                #dma-requests = <32>;
+                        };
+                };
+
+                spi0: spi@e1300000 {
+                        compatible = "samsung,s5pv210-spi";
+                        reg = <0xe1300000 0x1000>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <15>;
+                        dmas = <&pdma0 7>, <&pdma0 6>;
+                        dma-names = "tx", "rx";
+                        clocks = <&clocks SCLK_SPI0>, <&clocks CLK_SPI0>;
+                        clock-names = "spi", "spi_busclk0";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&spi0_bus>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                spi1: spi@e1400000 {
+                        compatible = "samsung,s5pv210-spi";
+                        reg = <0xe1400000 0x1000>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <16>;
+                        dmas = <&pdma1 7>, <&pdma1 6>;
+                        dma-names = "tx", "rx";
+                        clocks = <&clocks SCLK_SPI1>, <&clocks CLK_SPI1>;
+                        clock-names = "spi", "spi_busclk0";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&spi1_bus>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                keypad: keypad@e1600000 {
+                        compatible = "samsung,s5pv210-keypad";
+                        reg = <0xe1600000 0x1000>;
+                        interrupt-parent = <&vic2>;
+                        interrupts = <25>;
+                        clocks = <&clocks CLK_KEYIF>;
+                        clock-names = "keypad";
+                        status = "disabled";
+                };
+
+                i2c0: i2c@e1800000 {
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0xe1800000 0x1000>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <14>;
+                        clocks = <&clocks CLK_I2C0>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c0_bus>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2c2: i2c@e1a00000 {
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0xe1a00000 0x1000>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <19>;
+                        clocks = <&clocks CLK_I2C2>;
+                        clock-names = "i2c";
+                        pinctrl-0 = <&i2c2_bus>;
+                        pinctrl-names = "default";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                audio-subsystem {
+                        compatible = "samsung,s5pv210-audss", "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges;
+
+                        clk_audss: clock-controller@eee10000 {
+                                compatible = "samsung,s5pv210-audss-clock";
+                                reg = <0xeee10000 0x1000>;
+                                clock-names = "hclk", "xxti",
+                                                "fout_epll",
+                                                "sclk_audio0";
+                                clocks = <&clocks DOUT_HCLKP>, <&xxti>,
+                                                <&clocks FOUT_EPLL>,
+                                                <&clocks SCLK_AUDIO0>;
+                                #clock-cells = <1>;
+                        };
+
+                        i2s0: i2s@eee30000 {
+                                compatible = "samsung,s5pv210-i2s";
+                                reg = <0xeee30000 0x1000>;
+                                interrupt-parent = <&vic2>;
+                                interrupts = <16>;
+                                dma-names = "rx", "tx", "tx-sec";
+                                dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
+                                clock-names = "iis",
+                                                "i2s_opclk0",
+                                                "i2s_opclk1";
+                                clocks = <&clk_audss CLK_I2S>,
+                                                <&clk_audss CLK_I2S>,
+                                                <&clk_audss CLK_DOUT_AUD_BUS>;
+                                samsung,idma-addr = <0xc0010000>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&i2s0_bus>;
+                                #sound-dai-cells = <0>;
+                                status = "disabled";
+                        };
+                };
+
+                i2s1: i2s@e2100000 {
+                        compatible = "samsung,s3c6410-i2s";
+                        reg = <0xe2100000 0x1000>;
+                        interrupt-parent = <&vic2>;
+                        interrupts = <17>;
+                        dma-names = "rx", "tx";
+                        dmas = <&pdma1 12>, <&pdma1 13>;
+                        clock-names = "iis", "i2s_opclk0";
+                        clocks = <&clocks CLK_I2S1>, <&clocks SCLK_AUDIO1>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2s1_bus>;
+                        #sound-dai-cells = <0>;
+                        status = "disabled";
+                };
+
+                i2s2: i2s@e2a00000 {
+                        compatible = "samsung,s3c6410-i2s";
+                        reg = <0xe2a00000 0x1000>;
+                        interrupt-parent = <&vic2>;
+                        interrupts = <18>;
+                        dma-names = "rx", "tx";
+                        dmas = <&pdma1 14>, <&pdma1 15>;
+                        clock-names = "iis", "i2s_opclk0";
+                        clocks = <&clocks CLK_I2S2>, <&clocks SCLK_AUDIO2>;
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2s2_bus>;
+                        #sound-dai-cells = <0>;
+                        status = "disabled";
+                };
+
+                pwm: pwm@e2500000 {
+                        compatible = "samsung,s5pc100-pwm";
+                        reg = <0xe2500000 0x1000>;
+                        interrupt-parent = <&vic0>;
+                        interrupts = <21>, <22>, <23>, <24>, <25>;
+                        clock-names = "timers";
+                        clocks = <&clocks CLK_PWM>;
+                        #pwm-cells = <3>;
+                };
+
+                watchdog: watchdog@e2700000 {
+                        compatible = "samsung,s3c2410-wdt";
+                        reg = <0xe2700000 0x1000>;
+                        interrupt-parent = <&vic0>;
+                        interrupts = <26>;
+                        clock-names = "watchdog";
+                        clocks = <&clocks CLK_WDT>;
+                };
+
+                rtc: rtc@e2800000 {
+                        compatible = "samsung,s3c6410-rtc";
+                        reg = <0xe2800000 0x100>;
+                        interrupt-parent = <&vic0>;
+                        interrupts = <28>, <29>;
+                        clocks = <&clocks CLK_RTC>;
+                        clock-names = "rtc";
+                        status = "disabled";
+                };
+
+                uart0: serial@e2900000 {
+                        compatible = "samsung,s5pv210-uart";
+                        reg = <0xe2900000 0x400>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <10>;
+                        clock-names = "uart", "clk_uart_baud0",
+                                        "clk_uart_baud1";
+                        clocks = <&clocks CLK_UART0>, <&clocks CLK_UART0>,
+                                        <&clocks SCLK_UART0>;
+                        status = "disabled";
+                };
+
+                uart1: serial@e2900400 {
+                        compatible = "samsung,s5pv210-uart";
+                        reg = <0xe2900400 0x400>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <11>;
+                        clock-names = "uart", "clk_uart_baud0",
+                                        "clk_uart_baud1";
+                        clocks = <&clocks CLK_UART1>, <&clocks CLK_UART1>,
+                                        <&clocks SCLK_UART1>;
+                        status = "disabled";
+                };
+
+                uart2: serial@e2900800 {
+                        compatible = "samsung,s5pv210-uart";
+                        reg = <0xe2900800 0x400>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <12>;
+                        clock-names = "uart", "clk_uart_baud0",
+                                        "clk_uart_baud1";
+                        clocks = <&clocks CLK_UART2>, <&clocks CLK_UART2>,
+                                        <&clocks SCLK_UART2>;
+                        status = "disabled";
+                };
+
+                uart3: serial@e2900c00 {
+                        compatible = "samsung,s5pv210-uart";
+                        reg = <0xe2900c00 0x400>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <13>;
+                        clock-names = "uart", "clk_uart_baud0",
+                                        "clk_uart_baud1";
+                        clocks = <&clocks CLK_UART3>, <&clocks CLK_UART3>,
+                                        <&clocks SCLK_UART3>;
+                        status = "disabled";
+                };
+
+                sdhci0: sdhci@eb000000 {
+                        compatible = "samsung,s3c6410-sdhci";
+                        reg = <0xeb000000 0x100000>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <26>;
+                        clock-names = "hsmmc", "mmc_busclk.0", "mmc_busclk.2";
+                        clocks = <&clocks CLK_HSMMC0>, <&clocks CLK_HSMMC0>,
+                                        <&clocks SCLK_MMC0>;
+                        status = "disabled";
+                };
+
+                sdhci1: sdhci@eb100000 {
+                        compatible = "samsung,s3c6410-sdhci";
+                        reg = <0xeb100000 0x100000>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <27>;
+                        clock-names = "hsmmc", "mmc_busclk.0", "mmc_busclk.2";
+                        clocks = <&clocks CLK_HSMMC1>, <&clocks CLK_HSMMC1>,
+                                        <&clocks SCLK_MMC1>;
+                        status = "disabled";
+                };
+
+                sdhci2: sdhci@eb200000 {
+                        compatible = "samsung,s3c6410-sdhci";
+                        reg = <0xeb200000 0x100000>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <28>;
+                        clock-names = "hsmmc", "mmc_busclk.0", "mmc_busclk.2";
+                        clocks = <&clocks CLK_HSMMC2>, <&clocks CLK_HSMMC2>,
+                                        <&clocks SCLK_MMC2>;
+                        status = "disabled";
+                };
+
+                sdhci3: sdhci@eb300000 {
+                        compatible = "samsung,s3c6410-sdhci";
+                        reg = <0xeb300000 0x100000>;
+                        interrupt-parent = <&vic3>;
+                        interrupts = <2>;
+                        clock-names = "hsmmc", "mmc_busclk.0", "mmc_busclk.3";
+                        clocks = <&clocks CLK_HSMMC3>, <&clocks CLK_HSMMC3>,
+                                        <&clocks SCLK_MMC3>;
+                        status = "disabled";
+                };
+
+                hsotg: hsotg@ec000000 {
+                        compatible = "samsung,s3c6400-hsotg";
+                        reg = <0xec000000 0x20000>;
+                        interrupt-parent = <&vic1>;
+                        interrupts = <24>;
+                        clocks = <&clocks CLK_USB_OTG>;
+                        clock-names = "otg";
+                        phy-names = "usb2-phy";
+                        phys = <&usbphy 0>;
+                        status = "disabled";
+                };
+
+                usbphy: usbphy@ec100000 {
+                        compatible = "samsung,s5pv210-usb2-phy";
+                        reg = <0xec100000 0x100>;
+                        samsung,pmureg-phandle = <&pmu_syscon>;
+                        clocks = <&clocks CLK_USB_OTG>, <&xusbxti>;
+                        clock-names = "phy", "ref";
+                        #phy-cells = <1>;
+                        status = "disabled";
+                };
+
+                ehci: ehci@ec200000 {
+                        compatible = "samsung,exynos4210-ehci";
+                        reg = <0xec200000 0x100>;
+                        interrupts = <23>;
+                        interrupt-parent = <&vic1>;
+                        clocks = <&clocks CLK_USB_HOST>;
+                        clock-names = "usbhost";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+
+                        port@0 {
+                                reg = <0>;
+                                phys = <&usbphy 1>;
+                        };
+                };
+
+                ohci: ohci@ec300000 {
+                        compatible = "samsung,exynos4210-ohci";
+                        reg = <0xec300000 0x100>;
+                        interrupts = <23>;
+                        clocks = <&clocks CLK_USB_HOST>;
+                        clock-names = "usbhost";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+
+                        port@0 {
+                                reg = <0>;
+                                phys = <&usbphy 1>;
+                        };
+                };
+
+                mfc: codec@f1700000 {
+                        compatible = "samsung,mfc-v5";
+                        reg = <0xf1700000 0x10000>;
+                        interrupt-parent = <&vic2>;
+                        interrupts = <14>;
+                        clocks = <&clocks DOUT_MFC>, <&clocks CLK_MFC>;
+                        clock-names = "sclk_mfc", "mfc";
+                };
+
+                vic0: interrupt-controller@f2000000 {
+                        compatible = "arm,pl192-vic";
+                        interrupt-controller;
+                        reg = <0xf2000000 0x1000>;
+                        #interrupt-cells = <1>;
+                };
+
+                vic1: interrupt-controller@f2100000 {
+                        compatible = "arm,pl192-vic";
+                        interrupt-controller;
+                        reg = <0xf2100000 0x1000>;
+                        #interrupt-cells = <1>;
+                };
+
+                vic2: interrupt-controller@f2200000 {
+                        compatible = "arm,pl192-vic";
+                        interrupt-controller;
+                        reg = <0xf2200000 0x1000>;
+                        #interrupt-cells = <1>;
+                };
+
+                vic3: interrupt-controller@f2300000 {
+                        compatible = "arm,pl192-vic";
+                        interrupt-controller;
+                        reg = <0xf2300000 0x1000>;
+                        #interrupt-cells = <1>;
+                };
+
+                fimd: fimd@f8000000 {
+                        compatible = "samsung,exynos4210-fimd";
+                        interrupt-parent = <&vic2>;
+                        reg = <0xf8000000 0x20000>;
+                        interrupt-names = "fifo", "vsync", "lcd_sys";
+                        interrupts = <0>, <1>, <2>;
+                        clocks = <&clocks SCLK_FIMD>, <&clocks CLK_FIMD>;
+                        clock-names = "sclk_fimd", "fimd";
+                        status = "disabled";
+                };
+
+                g2d: g2d@fa000000 {
+                        compatible = "samsung,s5pv210-g2d";
+                        reg = <0xfa000000 0x1000>;
+                        interrupt-parent = <&vic2>;
+                        interrupts = <9>;
+                        clocks = <&clocks DOUT_G2D>, <&clocks CLK_G2D>;
+                        clock-names = "sclk_fimg2d", "fimg2d";
+                };
+
+                mdma1: mdma@fa200000 {
+                        compatible = "arm,pl330", "arm,primecell";
+                        reg = <0xfa200000 0x1000>;
+                        interrupt-parent = <&vic0>;
+                        interrupts = <18>;
+                        clocks = <&clocks CLK_MDMA>;
+                        clock-names = "apb_pclk";
+                        #dma-cells = <1>;
+                        #dma-channels = <8>;
+                        #dma-requests = <1>;
+                };
+
+                i2c1: i2c@fab00000 {
+                        compatible = "samsung,s3c2440-i2c";
+                        reg = <0xfab00000 0x1000>;
+                        interrupt-parent = <&vic2>;
+                        interrupts = <13>;
+                        clocks = <&clocks CLK_I2C1>;
+                        clock-names = "i2c";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c1_bus>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        status = "disabled";
+                };
+
+                camera: camera {
+                        compatible = "samsung,fimc", "simple-bus";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <>;
+                        clocks = <&clocks SCLK_CAM0>, <&clocks SCLK_CAM1>;
+                        clock-names = "sclk_cam0", "sclk_cam1";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges;
+
+                        clock_cam: clock-controller {
+                                #clock-cells = <1>;
+                        };
+
+                        csis0: csis@fa600000 {
+                                compatible = "samsung,s5pv210-csis";
+                                reg = <0xfa600000 0x4000>;
+                                interrupt-parent = <&vic2>;
+                                interrupts = <29>;
+                                clocks = <&clocks CLK_CSIS>,
+                                                <&clocks SCLK_CSIS>;
+                                clock-names = "clk_csis",
+                                                "sclk_csis";
+                                bus-width = <4>;
+                                status = "disabled";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+
+                        fimc0: fimc@fb200000 {
+                                compatible = "samsung,s5pv210-fimc";
+                                reg = <0xfb200000 0x1000>;
+                                interrupts = <5>;
+                                interrupt-parent = <&vic2>;
+                                clocks = <&clocks CLK_FIMC0>,
+                                                <&clocks SCLK_FIMC0>;
+                                clock-names = "fimc",
+                                                "sclk_fimc";
+                                samsung,pix-limits = <4224 8192 1920 4224>;
+                                samsung,mainscaler-ext;
+                                samsung,cam-if;
+                        };
+
+                        fimc1: fimc@fb300000 {
+                                compatible = "samsung,s5pv210-fimc";
+                                reg = <0xfb300000 0x1000>;
+                                interrupt-parent = <&vic2>;
+                                interrupts = <6>;
+                                clocks = <&clocks CLK_FIMC1>,
+                                                <&clocks SCLK_FIMC1>;
+                                clock-names = "fimc",
+                                                "sclk_fimc";
+                                samsung,pix-limits = <4224 8192 1920 4224>;
+                                samsung,mainscaler-ext;
+                                samsung,cam-if;
+                        };
+
+                        fimc2: fimc@fb400000 {
+                                compatible = "samsung,s5pv210-fimc";
+                                reg = <0xfb400000 0x1000>;
+                                interrupt-parent = <&vic2>;
+                                interrupts = <7>;
+                                clocks = <&clocks CLK_FIMC2>,
+                                                <&clocks SCLK_FIMC2>;
+                                clock-names = "fimc",
+                                                "sclk_fimc";
+                                samsung,pix-limits = <4224 8192 1920 4224>;
+                                samsung,mainscaler-ext;
+                                samsung,lcd-wb;
+                        };
+                };
+        };
+};
+
+#include "s5pv210-pinctrl.dtsi"
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index e0b15a6e8897..45013b867c8d 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -58,19 +58,19 @@
                 reg = <0x20000000 0x8000000>;
         };
 
-        slow_xtal: slow_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+        clocks {
+                slow_xtal: slow_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
 
-        main_xtal: main_xtal {
-                compatible = "fixed-clock";
-                #clock-cells = <0>;
-                clock-frequency = <0>;
-        };
+                main_xtal: main_xtal {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <0>;
+                };
 
-        clocks {
                 adc_op_clk: adc_op_clk{
                         compatible = "fixed-clock";
                         #clock-cells = <0>;
diff --git a/arch/arm/boot/dts/sama5d3_gmac.dtsi b/arch/arm/boot/dts/sama5d3_gmac.dtsi
index a6cb0508762f..de5ed59fb446 100644
--- a/arch/arm/boot/dts/sama5d3_gmac.dtsi
+++ b/arch/arm/boot/dts/sama5d3_gmac.dtsi
@@ -74,7 +74,7 @@
                         };
 
                         macb0: ethernet@f0028000 {
-                                compatible = "cdns,pc302-gem", "cdns,gem";
+                                compatible = "atmel,sama5d3-gem";
                                 reg = <0xf0028000 0x100>;
                                 interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
                                 pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi
index b0b1331c1974..f7d8583eef82 100644
--- a/arch/arm/boot/dts/sama5d3xcm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi
@@ -18,12 +18,14 @@
                 reg = <0x20000000 0x20000000>;
         };
 
-        slow_xtal {
-                clock-frequency = <32768>;
-        };
+        clocks {
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
 
-        main_xtal {
-                clock-frequency = <12000000>;
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 306eef0f97ef..b8c6f20e780c 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -45,6 +45,8 @@
                                 wm8904: wm8904@1a {
                                         compatible = "wm8904";
                                         reg = <0x1a>;
+                                        clocks = <&pck0>;
+                                        clock-names = "mclk";
                                 };
                         };
 
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index a99171c8a782..18662aec2ec4 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -21,6 +21,10 @@
         model = "KZM-A9-GT";
         compatible = "renesas,kzm9g-reference", "renesas,sh73a0";
 
+        aliases {
+                serial4 = &scifa4;
+        };
+
         cpus {
                 cpu@0 {
                         cpu0-supply = <&vdd_dvfs>;
@@ -35,7 +39,7 @@
         };
 
         chosen {
-                bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200 rw";
+                bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel rw";
         };
 
         memory {
@@ -276,9 +280,6 @@
 };
 
 &pfc {
-        pinctrl-0 = <&scifa4_pins>;
-        pinctrl-names = "default";
-
         i2c3_pins: i2c3 {
                 renesas,groups = "i2c3_1";
                 renesas,function = "i2c3";
@@ -318,6 +319,13 @@
         };
 };
 
+&scifa4 {
+        pinctrl-0 = <&scifa4_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
+
 &sdhi0 {
         pinctrl-0 = <&sdhi0_pins>;
         pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 5ecf552e1c00..910b79079d5a 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -235,6 +235,78 @@
                 status = "disabled";
         };
 
+        scifa0: serial@e6c40000 {
+                compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+                reg = <0xe6c40000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa1: serial@e6c50000 {
+                compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+                reg = <0xe6c50000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa2: serial@e6c60000 {
+                compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+                reg = <0xe6c60000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa3: serial@e6c70000 {
+                compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+                reg = <0xe6c70000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa4: serial@e6c80000 {
+                compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+                reg = <0xe6c80000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa5: serial@e6cb0000 {
+                compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+                reg = <0xe6cb0000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa6: serial@e6cc0000 {
+                compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+                reg = <0xe6cc0000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa7: serial@e6cd0000 {
+                compatible = "renesas,scifa-sh73a0", "renesas,scifa";
+                reg = <0xe6cd0000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifb8: serial@e6c30000 {
+                compatible = "renesas,scifb-sh73a0", "renesas,scifb";
+                reg = <0xe6c30000 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
         pfc: pfc@e6050000 {
                 compatible = "renesas,pfc-sh73a0";
                 reg = <0xe6050000 0x8000>,
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 4676f25e87a7..4d77ad690ed5 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -486,6 +486,8 @@
                         clock-names = "stmmaceth";
                         resets = <&rst EMAC0_RESET>;
                         reset-names = "stmmaceth";
+                        snps,multicast-filter-bins = <256>;
+                        snps,perfect-filter-entries = <128>;
                         status = "disabled";
                 };
 
@@ -500,6 +502,8 @@
                         clock-names = "stmmaceth";
                         resets = <&rst EMAC1_RESET>;
                         reset-names = "stmmaceth";
+                        snps,multicast-filter-bins = <256>;
+                        snps,perfect-filter-entries = <128>;
                         status = "disabled";
                 };
 
@@ -683,6 +687,7 @@
                 };
 
                 rst: rstmgr@ffd05000 {
+                        #reset-cells = <1>;
                         compatible = "altr,rst-mgr";
                         reg = <0xffd05000 0x1000>;
                 };
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index b56a801e42a2..d42c84b1df8d 100644
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -106,6 +106,10 @@
                         status = "okay";
                 };
 
+                miphy@eb800000 {
+                        status = "okay";
+                };
+
                 cf@b2800000 {
                         status = "okay";
                 };
diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi
index 122ae94076c8..fa5f2bb5f106 100644
--- a/arch/arm/boot/dts/spear1310.dtsi
+++ b/arch/arm/boot/dts/spear1310.dtsi
@@ -29,24 +29,111 @@
                         #gpio-cells = <2>;
                 };
 
-                ahci@b1000000 {
+                miphy0: miphy@eb800000 {
+                        compatible = "st,spear1310-miphy";
+                        reg = <0xeb800000 0x4000>;
+                        misc = <&misc>;
+                        phy-id = <0>;
+                        #phy-cells = <1>;
+                        status = "disabled";
+                };
+
+                miphy1: miphy@eb804000 {
+                        compatible = "st,spear1310-miphy";
+                        reg = <0xeb804000 0x4000>;
+                        misc = <&misc>;
+                        phy-id = <1>;
+                        #phy-cells = <1>;
+                        status = "disabled";
+                };
+
+                miphy2: miphy@eb808000 {
+                        compatible = "st,spear1310-miphy";
+                        reg = <0xeb808000 0x4000>;
+                        misc = <&misc>;
+                        phy-id = <2>;
+                        #phy-cells = <1>;
+                        status = "disabled";
+                };
+
+                ahci0: ahci@b1000000 {
                         compatible = "snps,spear-ahci";
                         reg = <0xb1000000 0x10000>;
                         interrupts = <0 68 0x4>;
+                        phys = <&miphy0 0>;
+                        phy-names = "sata-phy";
                         status = "disabled";
                 };
 
-                ahci@b1800000 {
+                ahci1: ahci@b1800000 {
                         compatible = "snps,spear-ahci";
                         reg = <0xb1800000 0x10000>;
                         interrupts = <0 69 0x4>;
+                        phys = <&miphy1 0>;
+                        phy-names = "sata-phy";
                         status = "disabled";
                 };
 
-                ahci@b4000000 {
+                ahci2: ahci@b4000000 {
                         compatible = "snps,spear-ahci";
                         reg = <0xb4000000 0x10000>;
                         interrupts = <0 70 0x4>;
+                        phys = <&miphy2 0>;
+                        phy-names = "sata-phy";
+                        status = "disabled";
+                };
+
+                pcie0: pcie@b1000000 {
+                        compatible = "st,spear1340-pcie", "snps,dw-pcie";
+                        reg = <0xb1000000 0x4000>;
+                        interrupts = <0 68 0x4>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0x0 0 &gic 0 68 0x4>;
+                        num-lanes = <1>;
+                        phys = <&miphy0 1>;
+                        phy-names = "pcie-phy";
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        device_type = "pci";
+                        ranges = <0x00000800 0 0x80000000 0x80000000 0 0x00020000   /* configuration space */
+                                0x81000000 0 0   0x80020000 0 0x00010000   /* downstream I/O */
+                                0x82000000 0 0x80030000 0xc0030000 0 0x0ffd0000>; /* non-prefetchable memory */
+                        status = "disabled";
+                };
+
+                pcie1: pcie@b1800000 {
+                        compatible = "st,spear1340-pcie", "snps,dw-pcie";
+                        reg = <0xb1800000 0x4000>;
+                        interrupts = <0 69 0x4>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0x0 0 &gic 0 69 0x4>;
+                        num-lanes = <1>;
+                        phys = <&miphy1 1>;
+                        phy-names = "pcie-phy";
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        device_type = "pci";
+                        ranges = <0x00000800 0 0x90000000 0x90000000 0 0x00020000   /* configuration space */
+                                0x81000000 0 0  0x90020000 0 0x00010000   /* downstream I/O */
+                                0x82000000 0 0x90030000 0x90030000 0 0x0ffd0000>; /* non-prefetchable memory */
+                        status = "disabled";
+                };
+
+                pcie2: pcie@b4000000 {
+                        compatible = "st,spear1340-pcie", "snps,dw-pcie";
+                        reg = <0xb4000000 0x4000>;
+                        interrupts = <0 70 0x4>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0x0 0 &gic 0 70 0x4>;
+                        num-lanes = <1>;
+                        phys = <&miphy2 1>;
+                        phy-names = "pcie-phy";
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        device_type = "pci";
+                        ranges = <0x00000800 0 0xc0000000 0xc0000000 0 0x00020000   /* configuration space */
+                                0x81000000 0 0   0xc0020000 0 0x00010000   /* downstream I/O */
+                                0x82000000 0 0xc0030000 0xc0030000 0 0x0ffd0000>; /* non-prefetchable memory */
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index d6c30ae0a8d7..b23e05ed1d60 100644
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -122,6 +122,10 @@
                         status = "okay";
                 };
 
+                miphy@eb800000 {
+                        status = "okay";
+                };
+
                 dma@ea800000 {
                         status = "okay";
                 };
diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
index 54d128d35681..e71df0f2cb52 100644
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@ -31,10 +31,38 @@
                         status = "disabled";
                 };
 
-                ahci@b1000000 {
+                miphy0: miphy@eb800000 {
+                        compatible = "st,spear1340-miphy";
+                        reg = <0xeb800000 0x4000>;
+                        misc = <&misc>;
+                        #phy-cells = <1>;
+                        status = "disabled";
+                };
+
+                ahci0: ahci@b1000000 {
                         compatible = "snps,spear-ahci";
                         reg = <0xb1000000 0x10000>;
                         interrupts = <0 72 0x4>;
+                        phys = <&miphy0 0>;
+                        phy-names = "sata-phy";
+                        status = "disabled";
+                };
+
+                pcie0: pcie@b1000000 {
+                        compatible = "st,spear1340-pcie", "snps,dw-pcie";
+                        reg = <0xb1000000 0x4000>;
+                        interrupts = <0 68 0x4>;
+                        interrupt-map-mask = <0 0 0 0>;
+                        interrupt-map = <0x0 0 &gic 0 68 0x4>;
+                        num-lanes = <1>;
+                        phys = <&miphy0 1>;
+                        phy-names = "pcie-phy";
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        device_type = "pci";
+                        ranges = <0x00000800 0 0x80000000 0x80000000 0 0x00020000   /* configuration space */
+                                0x81000000 0 0   0x80020000 0 0x00010000   /* downstream I/O */
+                                0x82000000 0 0x80030000 0xc0030000 0 0x0ffd0000>; /* non-prefetchable memory */
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index 4382547df58a..a6eb5436d26d 100644
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -83,8 +83,8 @@
                 #size-cells = <1>;
                 compatible = "simple-bus";
                 ranges = <0x50000000 0x50000000 0x10000000
-                          0xb0000000 0xb0000000 0x10000000
-                          0xd0000000 0xd0000000 0x02000000
+                          0x80000000 0x80000000 0x20000000
+                          0xb0000000 0xb0000000 0x22000000
                           0xd8000000 0xd8000000 0x01000000
                           0xe0000000 0xe0000000 0x10000000>;
 
@@ -220,6 +220,11 @@
                                   0xd8000000 0xd8000000 0x01000000
                                   0xe0000000 0xe0000000 0x10000000>;
 
+                        misc: syscon@e0700000 {
+                                compatible = "st,spear1340-misc", "syscon";
+                                reg = <0xe0700000 0x1000>;
+                        };
+
                         gpio0: gpio@e0600000 {
                                 compatible = "arm,pl061", "arm,primecell";
                                 reg = <0xe0600000 0x1000>;
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index e41eedca3ce3..9d2323020d34 100644
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -875,6 +875,10 @@
                         reg = <0x80119000 0x1000>;
                         interrupts = <0 59 IRQ_TYPE_LEVEL_HIGH>;
 
+                        dmas = <&dma 41 0 0x2>, /* Logical - DevToMem */
+                               <&dma 41 0 0x0>; /* Logical - MemToDev */
+                        dma-names = "rx", "tx";
+
                         clocks = <&prcc_kclk 2 5>, <&prcc_pclk 2 7>;
                         clock-names = "sdi", "apb_pclk";
 
@@ -901,6 +905,10 @@
                         reg = <0x80008000 0x1000>;
                         interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
 
+                        dmas = <&dma 43 0 0x2>, /* Logical - DevToMem */
+                               <&dma 43 0 0x0>; /* Logical - MemToDev */
+                        dma-names = "rx", "tx";
+
                         clocks = <&prcc_kclk 3 7>, <&prcc_pclk 3 7>;
                         clock-names = "sdi", "apb_pclk";
 
@@ -929,6 +937,7 @@
                         interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
                         v-ape-supply = <&db8500_vape_reg>;
 
+                        /* This DMA channel only exist on DB8500 v1 */
                         dmas = <&dma 30 0 0x10>; /* Logical - MemToDev - HighPrio */
                         dma-names = "tx";
 
@@ -962,6 +971,7 @@
                         interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
                         v-ape-supply = <&db8500_vape_reg>;
 
+                        /* This DMA channel only exist on DB8500 v2 */
                         dmas = <&dma 30 0 0x12>; /* Logical - DevToMem - HighPrio */
                         dma-names = "rx";
 
diff --git a/arch/arm/boot/dts/ste-href-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi
index 1c3574435ea8..84d7c5d883f2 100644
--- a/arch/arm/boot/dts/ste-href-stuib.dtsi
+++ b/arch/arm/boot/dts/ste-href-stuib.dtsi
@@ -42,6 +42,8 @@
                                 interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
                                 interrupt-parent = <&gpio6>;
                                 interrupt-controller;
+                                vcc-supply = <&db8500_vsmps2_reg>;
+                                vio-supply = <&db8500_vsmps2_reg>;
 
                                 wakeup-source;
                                 st,autosleep-timeout = <1024>;
diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
index c40565320978..18b65d1b14f2 100644
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -88,6 +88,43 @@
                                 };
                         };
                 };
+                /* Sensors mounted on this board variant */
+                i2c@80128000 {
+                        lsm303dlh@18 {
+                                /* Accelerometer */
+                                compatible = "st,lsm303dlh-accel";
+                                st,drdy-int-pin = <1>;
+                                reg = <0x18>;
+                                vdd-supply = <&ab8500_ldo_aux1_reg>;
+                                vddio-supply = <&db8500_vsmps2_reg>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&accel_tvk_mode>;
+                        };
+                        lsm303dlm@1e {
+                                /* Magnetometer */
+                                compatible = "st,lsm303dlm-magn";
+                                reg = <0x1e>;
+                                vdd-supply = <&ab8500_ldo_aux1_reg>;
+                                vddio-supply = <&db8500_vsmps2_reg>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&magneto_tvk_mode>;
+                        };
+                        l3g4200d@68 {
+                                /* Gyroscope */
+                                compatible = "st,l3g4200d-gyro";
+                                st,drdy-int-pin = <2>;
+                                reg = <0x68>;
+                                vdd-supply = <&ab8500_ldo_aux1_reg>;
+                                vddio-supply = <&db8500_vsmps2_reg>;
+                        };
+                        lsp001wm@5c {
+                                /* Barometer/pressure sensor */
+                                compatible = "st,lps001wp-press";
+                                reg = <0x5c>;
+                                vdd-supply = <&ab8500_ldo_aux1_reg>;
+                                vddio-supply = <&db8500_vsmps2_reg>;
+                        };
+                };
                 pinctrl {
                         /* Pull up this GPIO pin */
                         tc35893 {
@@ -114,6 +151,28 @@
                                         };
                                 };
                         };
+                        accelerometer {
+                                accel_tvk_mode: accel_tvk {
+                                        /* Accelerometer interrupt lines 1 & 2 */
+                                        tvk_cfg {
+                                                ste,pins = "GPIO82_C1", "GPIO83_D3";
+                                                ste,config = <&gpio_in_pu>;
+                                        };
+                                };
+                        };
+                        magnetometer {
+                                magneto_tvk_mode: magneto_tvk {
+                                        /* Magnetometer uses GPIO 31 and 32, pull these up/down respectively */
+                                        tvk_cfg1 {
+                                                ste,pins = "GPIO31_V3";
+                                                ste,config = <&gpio_in_pu>;
+                                        };
+                                        tvk_cfg2 {
+                                                ste,pins = "GPIO32_V2";
+                                                ste,config = <&gpio_in_pd>;
+                                        };
+                                };
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index c2341061b943..bcc1f0c37f49 100644
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -35,8 +35,6 @@
                          */
                         pinctrl-names = "default";
                         pinctrl-0 = <&ipgpio_hrefv60_mode>,
-                                  <&accel_hrefv60_mode>,
-                                  <&magneto_hrefv60_mode>,
                                   <&etm_hrefv60_mode>,
                                   <&nahj_hrefv60_mode>,
                                   <&nfc_hrefv60_mode>,
@@ -83,28 +81,6 @@
                                         };
                                 };
                         };
-                        accelerometer {
-                                accel_hrefv60_mode: accel_hrefv60 {
-                                        /* Accelerometer interrupt lines 1 & 2 */
-                                        hrefv60_cfg1 {
-                                                ste,pins = "GPIO82_C1", "GPIO83_D3";
-                                                ste,config = <&gpio_in_pu>;
-                                        };
-                                };
-                        };
-                        magnetometer {
-                                magneto_hrefv60_mode: magneto_hrefv60 {
-                                        /* Magnetometer uses GPIO 31 and 32, pull these up/down respectively */
-                                        hrefv60_cfg1 {
-                                                ste,pins = "GPIO31_V3";
-                                                ste,config = <&gpio_in_pu>;
-                                        };
-                                        hrefv60_cfg2 {
-                                                ste,pins = "GPIO32_V2";
-                                                ste,config = <&gpio_in_pd>;
-                                        };
-                                };
-                        };
                         etm {
                                 /*
                                  * Drive D19-D23 for the ETM PTM trace interface low,
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 474ef83229cd..4a2000c620ad 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -241,6 +241,40 @@
                         pinctrl-names = "default","sleep";
                         pinctrl-0 = <&i2c2_default_mode>;
                         pinctrl-1 = <&i2c2_sleep_mode>;
+                        lsm303dlh@18 {
+                                /* Accelerometer */
+                                compatible = "st,lsm303dlh-accel";
+                                st,drdy-int-pin = <1>;
+                                reg = <0x18>;
+                                vdd-supply = <&ab8500_ldo_aux1_reg>;
+                                vddio-supply = <&db8500_vsmps2_reg>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&accel_snowball_mode>;
+                        };
+                        lsm303dlm@1e {
+                                /* Magnetometer */
+                                compatible = "st,lsm303dlm-magn";
+                                reg = <0x1e>;
+                                vdd-supply = <&ab8500_ldo_aux1_reg>;
+                                vddio-supply = <&db8500_vsmps2_reg>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&magneto_snowball_mode>;
+                        };
+                        l3g4200d@68 {
+                                /* Gyroscope */
+                                compatible = "st,l3g4200d-gyro";
+                                st,drdy-int-pin = <2>;
+                                reg = <0x68>;
+                                vdd-supply = <&ab8500_ldo_aux1_reg>;
+                                vddio-supply = <&db8500_vsmps2_reg>;
+                        };
+                        lsp001wm@5c {
+                                /* Barometer/pressure sensor */
+                                compatible = "st,lps001wp-press";
+                                reg = <0x5c>;
+                                vdd-supply = <&ab8500_ldo_aux1_reg>;
+                                vddio-supply = <&db8500_vsmps2_reg>;
+                        };
                 };
 
                 i2c@80110000 {
@@ -361,9 +395,7 @@
                          * can be moved over to being controlled by respective device.
                          */
                         pinctrl-names = "default";
-                        pinctrl-0 = <&accel_snowball_mode>,
-                                  <&magneto_snowball_mode>,
-                                  <&gbf_snowball_mode>,
+                        pinctrl-0 = <&gbf_snowball_mode>,
                                   <&wlan_snowball_mode>;
 
                         ethernet {
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index 0b97c071dd56..9e99ade35e37 100644
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -88,6 +88,12 @@
                         };
                 };
 
+                ir0: ir@01c21800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&ir0_pins_a>;
+                        status = "okay";
+                };
+
                 uart0: serial@01c28000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&uart0_pins_a>;
@@ -98,6 +104,15 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c0_pins_a>;
                         status = "okay";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupts = <0>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
                 };
         };
 
diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
new file mode 100644
index 000000000000..1763cc7ec023
--- /dev/null
+++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2014 Hans de Goede <hdegoede@redhat.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/ "sun4i-a10.dtsi"
+/include/ "sunxi-common-regulators.dtsi"
+
+/ {
+        model = "BA10 tvbox";
+        compatible = "allwinner,ba10-tvbox", "allwinner,sun4i-a10";
+
+        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>;
+                        };
+                };
+
+                mmc0: mmc@01c0f000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
+                        vmmc-supply = <&reg_vcc3v3>;
+                        bus-width = <4>;
+                        cd-gpios = <&pio 7 1 0>; /* PH1 */
+                        cd-inverted;
+                        status = "okay";
+                };
+
+                usbphy: phy@01c13400 {
+                        usb1_vbus-supply = <&reg_usb1_vbus>;
+                        usb2_vbus-supply = <&reg_usb2_vbus>;
+                        status = "okay";
+                };
+
+                ehci0: usb@01c14000 {
+                        status = "okay";
+                };
+
+                ohci0: usb@01c14400 {
+                        status = "okay";
+                };
+
+                ehci1: usb@01c1c000 {
+                        status = "okay";
+                };
+
+                ohci1: usb@01c1c400 {
+                        status = "okay";
+                };
+
+                pinctrl@01c20800 {
+                        usb2_vbus_pin_a: usb2_vbus_pin@0 {
+                                allwinner,pins = "PH12";
+                        };
+                };
+
+                ir0: ir@01c21800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&ir0_pins_a>;
+                        status = "okay";
+                };
+
+                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";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupts = <0>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
+                };
+        };
+
+        reg_usb1_vbus: usb1-vbus {
+                status = "okay";
+        };
+
+        reg_usb2_vbus: usb2-vbus {
+                gpio = <&pio 7 12 0>;
+                status = "okay";
+        };
+};
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index c200eacc66e8..3ce56bfbc0b5 100644
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -80,6 +80,12 @@
                         };
                 };
 
+                ir0: ir@01c21800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&ir0_pins_a>;
+                        status = "okay";
+                };
+
                 uart0: serial@01c28000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&uart0_pins_a>;
@@ -90,6 +96,15 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c0_pins_a>;
                         status = "okay";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupts = <0>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
                 };
 
                 i2c1: i2c@01c2b000 {
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index 547fadcb984b..891ea446abae 100644
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -87,11 +87,32 @@
                         };
                 };
 
+                ir0: ir@01c21800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&ir0_pins_a>;
+                        status = "okay";
+                };
+
                 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";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupts = <0>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
+                };
         };
 
         reg_emac_3v3: emac-3v3 {
diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
index f13723e18b86..6b0c37812ade 100644
--- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
@@ -40,12 +40,6 @@
                         status = "okay";
                 };
 
-                i2c0: i2c@01c2ac00 {
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&i2c0_pins_a>;
-                        status = "okay";
-                };
-
                 usbphy: phy@01c13400 {
                         usb1_vbus-supply = <&reg_usb1_vbus>;
                         usb2_vbus-supply = <&reg_usb2_vbus>;
@@ -67,6 +61,21 @@
                 ohci1: usb@01c1c400 {
                         status = "okay";
                 };
+
+                i2c0: i2c@01c2ac00 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c0_pins_a>;
+                        status = "okay";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupts = <0>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
+                };
         };
 
         reg_usb1_vbus: usb1-vbus {
diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
index c01cea50cf0c..b9ecce60f2e7 100644
--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
@@ -52,11 +52,39 @@
                         status = "okay";
                 };
 
+                pinctrl@01c20800 {
+                        ir0_pins_a: ir0@0 {
+                                /* The ir receiver is not always populated */
+                                allwinner,pull = <1>;
+                        };
+                };
+
+                ir0: ir@01c21800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&ir0_pins_a>;
+                        status = "okay";
+                };
+
                 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";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupts = <0>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
+                };
         };
 
         reg_usb1_vbus: usb1-vbus {
diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
index d46a7dbecef5..d046d568f5a1 100644
--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
@@ -91,6 +91,21 @@
                         pinctrl-0 = <&uart0_pins_a>;
                         status = "okay";
                 };
+
+                i2c0: i2c@01c2ac00 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c0_pins_a>;
+                        status = "okay";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupts = <0>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
+                };
         };
 
         leds {
diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
index fb03bccb78d2..6675bcd7860e 100644
--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
@@ -76,6 +76,15 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c0_pins_a>;
                         status = "okay";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupts = <0>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
                 };
         };
 
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index d96e179490ce..459cb6377764 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -509,7 +509,7 @@
                         clocks = <&apb0_gates 5>;
                         gpio-controller;
                         interrupt-controller;
-                        #address-cells = <1>;
+                        #interrupt-cells = <2>;
                         #size-cells = <0>;
                         #gpio-cells = <3>;
 
@@ -593,6 +593,20 @@
                                 allwinner,drive = <0>;
                                 allwinner,pull = <1>;
                         };
+
+                        ir0_pins_a: ir0@0 {
+                                allwinner,pins = "PB3","PB4";
+                                allwinner,function = "ir0";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+
+                        ir1_pins_a: ir1@0 {
+                                allwinner,pins = "PB22","PB23";
+                                allwinner,function = "ir1";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
                 };
 
                 timer@01c20c00 {
@@ -621,6 +635,24 @@
                         status = "disabled";
                 };
 
+                ir0: ir@01c21800 {
+                        compatible = "allwinner,sun4i-a10-ir";
+                        clocks = <&apb0_gates 6>, <&ir0_clk>;
+                        clock-names = "apb", "ir";
+                        interrupts = <5>;
+                        reg = <0x01c21800 0x40>;
+                        status = "disabled";
+                };
+
+                ir1: ir@01c21c00 {
+                        compatible = "allwinner,sun4i-a10-ir";
+                        clocks = <&apb0_gates 7>, <&ir1_clk>;
+                        clock-names = "apb", "ir";
+                        interrupts = <6>;
+                        reg = <0x01c21c00 0x40>;
+                        status = "disabled";
+                };
+
                 sid: eeprom@01c23800 {
                         compatible = "allwinner,sun4i-a10-sid";
                         reg = <0x01c23800 0x10>;
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index b64f705d9008..24b0ad3a7c07 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -422,7 +422,7 @@
                         clocks = <&apb0_gates 5>;
                         gpio-controller;
                         interrupt-controller;
-                        #address-cells = <1>;
+                        #interrupt-cells = <2>;
                         #size-cells = <0>;
                         #gpio-cells = <3>;
 
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index 3b2a94c40f6e..bf86e65dd167 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -395,7 +395,7 @@
                         clocks = <&apb0_gates 5>;
                         gpio-controller;
                         interrupt-controller;
-                        #address-cells = <1>;
+                        #interrupt-cells = <2>;
                         #size-cells = <0>;
                         #gpio-cells = <3>;
 
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
new file mode 100644
index 000000000000..f142065b3c1f
--- /dev/null
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2014 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"
+/include/ "sunxi-common-regulators.dtsi"
+
+/ {
+        model = "Merrii A31 Hummingbird";
+        compatible = "merrii,a31-hummingbird", "allwinner,sun6i-a31";
+
+        chosen {
+                bootargs = "earlyprintk console=ttyS0,115200";
+        };
+
+        soc@01c00000 {
+                mmc0: mmc@01c0f000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>;
+                        vmmc-supply = <&reg_vcc3v0>;
+                        bus-width = <4>;
+                        cd-gpios = <&pio 0 8 0>; /* PA8 */
+                        cd-inverted;
+                        status = "okay";
+                };
+
+                usbphy: phy@01c19400 {
+                        usb1_vbus-supply = <&reg_usb1_vbus>;
+                        status = "okay";
+                };
+
+                ehci0: usb@01c1a000 {
+                        status = "okay";
+                };
+
+                ohci0: usb@01c1a400 {
+                        status = "okay";
+                };
+
+                pio: pinctrl@01c20800 {
+                        mmc0_pins_a: mmc0@0 {
+                                /* external pull-ups missing for some pins */
+                                allwinner,pull = <1>;
+                        };
+
+                        mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {
+                                allwinner,pins = "PA8";
+                                allwinner,function = "gpio_in";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <1>;
+                        };
+
+                        usb1_vbus_pin_a: usb1_vbus_pin@0 {
+                                allwinner,pins = "PH24";
+                                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>;
+                        /* pull-ups and devices require AXP221 DLDO3 */
+                        status = "failed";
+                };
+
+                i2c1: i2c@01c2b000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c1_pins_a>;
+                        status = "okay";
+                };
+
+                i2c2: i2c@01c2b400 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c2_pins_a>;
+                        status = "okay";
+
+                        pcf8563: rtc@51 {
+                                compatible = "nxp,pcf8563";
+                                reg = <0x51>;
+                        };
+                };
+
+                gmac: ethernet@01c30000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&gmac_pins_rgmii_a>;
+                        phy = <&phy1>;
+                        phy-mode = "rgmii";
+                        status = "okay";
+
+                        phy1: ethernet-phy@1 {
+                                reg = <1>;
+                        };
+                };
+        };
+
+        reg_usb1_vbus: usb1-vbus {
+                pinctrl-0 = <&usb1_vbus_pin_a>;
+                gpio = <&pio 7 24 0>; /* PH24 */
+                status = "okay";
+        };
+};
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index a9dfa12eb735..44b07e512c24 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -23,6 +23,7 @@
                 serial3 = &uart3;
                 serial4 = &uart4;
                 serial5 = &uart5;
+                ethernet0 = &gmac;
         };
 
 
@@ -281,6 +282,34 @@
                                              "usb_ohci0", "usb_ohci1",
                                              "usb_ohci2";
                 };
+
+                /*
+                 * The following two are dummy clocks, placeholders used in the gmac_tx
+                 * clock. The gmac driver will choose one parent depending on the PHY
+                 * interface mode, using clk_set_rate auto-reparenting.
+                 * The actual TX clock rate is not controlled by the gmac_tx clock.
+                 */
+                mii_phy_tx_clk: clk@1 {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <25000000>;
+                        clock-output-names = "mii_phy_tx";
+                };
+
+                gmac_int_tx_clk: clk@2 {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <125000000>;
+                        clock-output-names = "gmac_int_tx";
+                };
+
+                gmac_tx_clk: clk@01c200d0 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun7i-a20-gmac-clk";
+                        reg = <0x01c200d0 0x4>;
+                        clocks = <&mii_phy_tx_clk>, <&gmac_int_tx_clk>;
+                        clock-output-names = "gmac_tx";
+                };
         };
 
         soc@01c00000 {
@@ -429,7 +458,7 @@
                         clocks = <&apb1_gates 5>;
                         gpio-controller;
                         interrupt-controller;
-                        #address-cells = <1>;
+                        #interrupt-cells = <2>;
                         #size-cells = <0>;
                         #gpio-cells = <3>;
 
@@ -467,6 +496,48 @@
                                 allwinner,drive = <2>;
                                 allwinner,pull = <0>;
                         };
+
+                        gmac_pins_mii_a: gmac_mii@0 {
+                                allwinner,pins = "PA0", "PA1", "PA2", "PA3",
+                                                "PA8", "PA9", "PA11",
+                                                "PA12", "PA13", "PA14", "PA19",
+                                                "PA20", "PA21", "PA22", "PA23",
+                                                "PA24", "PA26", "PA27";
+                                allwinner,function = "gmac";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+
+                        gmac_pins_gmii_a: gmac_gmii@0 {
+                                allwinner,pins = "PA0", "PA1", "PA2", "PA3",
+                                                "PA4", "PA5", "PA6", "PA7",
+                                                "PA8", "PA9", "PA10", "PA11",
+                                                "PA12", "PA13", "PA14", "PA15",
+                                                "PA16", "PA17", "PA18", "PA19",
+                                                "PA20", "PA21", "PA22", "PA23",
+                                                "PA24", "PA25", "PA26", "PA27";
+                                allwinner,function = "gmac";
+                                /*
+                                 * data lines in GMII mode run at 125MHz and
+                                 * might need a higher signal drive strength
+                                 */
+                                allwinner,drive = <2>;
+                                allwinner,pull = <0>;
+                        };
+
+                        gmac_pins_rgmii_a: gmac_rgmii@0 {
+                                allwinner,pins = "PA0", "PA1", "PA2", "PA3",
+                                                "PA9", "PA10", "PA11",
+                                                "PA12", "PA13", "PA14", "PA19",
+                                                "PA20", "PA25", "PA26", "PA27";
+                                allwinner,function = "gmac";
+                                /*
+                                 * data lines in RGMII mode use DDR mode
+                                 * and need a higher signal drive strength
+                                 */
+                                allwinner,drive = <3>;
+                                allwinner,pull = <0>;
+                        };
                 };
 
                 ahb1_rst: reset@01c202c0 {
@@ -621,6 +692,23 @@
                         status = "disabled";
                 };
 
+                gmac: ethernet@01c30000 {
+                        compatible = "allwinner,sun7i-a20-gmac";
+                        reg = <0x01c30000 0x1054>;
+                        interrupts = <0 82 4>;
+                        interrupt-names = "macirq";
+                        clocks = <&ahb1_gates 17>, <&gmac_tx_clk>;
+                        clock-names = "stmmaceth", "allwinner_gmac_tx";
+                        resets = <&ahb1_rst 17>;
+                        reset-names = "stmmaceth";
+                        snps,pbl = <2>;
+                        snps,fixed-burst;
+                        snps,force_sf_dma_mode;
+                        status = "disabled";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
                 timer@01c60000 {
                         compatible = "allwinner,sun6i-a31-hstimer", "allwinner,sun7i-a20-hstimer";
                         reg = <0x01c60000 0x1000>;
@@ -756,7 +844,7 @@
                         resets = <&apb0_rst 0>;
                         gpio-controller;
                         interrupt-controller;
-                        #address-cells = <1>;
+                        #interrupt-cells = <2>;
                         #size-cells = <0>;
                         #gpio-cells = <3>;
                 };
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index a5ad945197e8..53680983461a 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -66,6 +66,12 @@
                         };
                 };
 
+                ir0: ir@01c21800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&ir0_pins_a>;
+                        status = "okay";
+                };
+
                 uart0: serial@01c28000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&uart0_pins_a>;
@@ -76,6 +82,16 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c0_pins_a>;
                         status = "okay";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupt-parent = <&nmi_intc>;
+                                interrupts = <0 8>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
                 };
 
                 i2c1: i2c@01c2b000 {
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index b87fea901489..a6c1a3c717bc 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -100,6 +100,12 @@
                         status = "okay";
                 };
 
+                ir0: ir@01c21800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&ir0_pins_a>;
+                        status = "okay";
+                };
+
                 uart0: serial@01c28000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&uart0_pins_a>;
@@ -110,6 +116,16 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c0_pins_a>;
                         status = "okay";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupt-parent = <&nmi_intc>;
+                                interrupts = <0 8>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
                 };
 
                 i2c1: i2c@01c2b000 {
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index b77308e90199..6a67712d417a 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -94,12 +94,34 @@
                         };
                 };
 
+                ir0: ir@01c21800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&ir0_pins_a>;
+                        status = "okay";
+                };
+
                 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";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupt-parent = <&nmi_intc>;
+                                interrupts = <0 8>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
+                };
+
                 gmac: ethernet@01c50000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&gmac_pins_mii_a>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index b759630bc9a9..9d669cdf031d 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -122,6 +122,16 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c0_pins_a>;
                         status = "okay";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupt-parent = <&nmi_intc>;
+                                interrupts = <0 8>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
                 };
 
                 i2c1: i2c@01c2b000 {
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
new file mode 100644
index 000000000000..046dfc0d45d8
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2014 Zoltan HERPAI
+ * Zoltan HERPAI <wigyori@uid0.hu>
+ *
+ * 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"
+/include/ "sunxi-common-regulators.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+        model = "LinkSprite pcDuino3";
+        compatible = "linksprite,pcduino3", "allwinner,sun7i-a20";
+
+        soc@01c00000 {
+                mmc0: mmc@01c0f000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
+                        vmmc-supply = <&reg_vcc3v3>;
+                        bus-width = <4>;
+                        cd-gpios = <&pio 7 1 0>; /* PH1 */
+                        cd-inverted;
+                        status = "okay";
+                };
+
+                usbphy: phy@01c13400 {
+                        usb1_vbus-supply = <&reg_usb1_vbus>;
+                        usb2_vbus-supply = <&reg_usb2_vbus>;
+                        status = "okay";
+                };
+
+                ehci0: usb@01c14000 {
+                        status = "okay";
+                };
+
+                ohci0: usb@01c14400 {
+                        status = "okay";
+                };
+
+                ahci: sata@01c18000 {
+                        target-supply = <&reg_ahci_5v>;
+                        status = "okay";
+                };
+
+                ehci1: usb@01c1c000 {
+                        status = "okay";
+                };
+
+                ohci1: usb@01c1c400 {
+                        status = "okay";
+                };
+
+                pinctrl@01c20800 {
+                        ahci_pwr_pin_a: ahci_pwr_pin@0 {
+                                allwinner,pins = "PH2";
+                        };
+
+                        led_pins_pcduino3: led_pins@0 {
+                                allwinner,pins = "PH15", "PH16";
+                                allwinner,function = "gpio_out";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+
+                        key_pins_pcduino3: key_pins@0 {
+                                allwinner,pins = "PH17", "PH18", "PH19";
+                                allwinner,function = "gpio_in";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+                };
+
+                ir0: ir@01c21800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&ir0_pins_a>;
+                        status = "okay";
+                };
+
+                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";
+
+                        axp209: pmic@34 {
+                                compatible = "x-powers,axp209";
+                                reg = <0x34>;
+                                interrupt-parent = <&nmi_intc>;
+                                interrupts = <0 8>;
+
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
+                };
+
+                gmac: ethernet@01c50000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&gmac_pins_mii_a>;
+                        phy = <&phy1>;
+                        phy-mode = "mii";
+                        status = "okay";
+
+                        phy1: ethernet-phy@1 {
+                                reg = <1>;
+                        };
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&led_pins_pcduino3>;
+
+                tx {
+                        label = "pcduino3:green:tx";
+                        gpios = <&pio 7 15 GPIO_ACTIVE_LOW>;
+                };
+
+                rx {
+                        label = "pcduino3:green:rx";
+                        gpios = <&pio 7 16 GPIO_ACTIVE_LOW>;
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                pinctrl-names = "default";
+                pinctrl-0 = <&key_pins_pcduino3>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                button@0 {
+                        label = "Key Back";
+                        linux,code = <KEY_BACK>;
+                        gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;
+                };
+                button@1 {
+                        label = "Key Home";
+                        linux,code = <KEY_HOME>;
+                        gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;
+                };
+                button@2 {
+                        label = "Key Menu";
+                        linux,code = <KEY_MENU>;
+                        gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;
+                };
+        };
+
+        reg_usb1_vbus: usb1-vbus {
+                status = "okay";
+        };
+
+        reg_usb2_vbus: usb2-vbus {
+                status = "okay";
+        };
+
+        reg_ahci_5v: ahci-5v {
+                gpio = <&pio 7 2 0>;
+                status = "okay";
+        };
+};
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 01e94664232a..4011628c7381 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -586,7 +586,7 @@
                         clocks = <&apb0_gates 5>;
                         gpio-controller;
                         interrupt-controller;
-                        #address-cells = <1>;
+                        #interrupt-cells = <2>;
                         #size-cells = <0>;
                         #gpio-cells = <3>;
 
@@ -738,6 +738,20 @@
                                 allwinner,drive = <2>;
                                 allwinner,pull = <0>;
                         };
+
+                        ir0_pins_a: ir0@0 {
+                                    allwinner,pins = "PB3","PB4";
+                                    allwinner,function = "ir0";
+                                    allwinner,drive = <0>;
+                                    allwinner,pull = <0>;
+                        };
+
+                        ir1_pins_a: ir1@0 {
+                                    allwinner,pins = "PB22","PB23";
+                                    allwinner,function = "ir1";
+                                    allwinner,drive = <0>;
+                                    allwinner,pull = <0>;
+                        };
                 };
 
                 timer@01c20c00 {
@@ -771,6 +785,24 @@
                         status = "disabled";
                 };
 
+                ir0: ir@01c21800 {
+                        compatible = "allwinner,sun4i-a10-ir";
+                        clocks = <&apb0_gates 6>, <&ir0_clk>;
+                        clock-names = "apb", "ir";
+                        interrupts = <0 5 4>;
+                        reg = <0x01c21800 0x40>;
+                        status = "disabled";
+                };
+
+                ir1: ir@01c21c00 {
+                        compatible = "allwinner,sun4i-a10-ir";
+                        clocks = <&apb0_gates 7>, <&ir1_clk>;
+                        clock-names = "apb", "ir";
+                        interrupts = <0 6 4>;
+                        reg = <0x01c21c00 0x40>;
+                        status = "disabled";
+                };
+
                 sid: eeprom@01c23800 {
                         compatible = "allwinner,sun7i-a20-sid";
                         reg = <0x01c23800 0x200>;
diff --git a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
new file mode 100644
index 000000000000..34002e3eba9d
--- /dev/null
+++ b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 Chen-Yu Tsai
+ *
+ * Chen-Yu Tsai <wens@csie.org>
+ *
+ * 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/ "sun8i-a23.dtsi"
+
+/ {
+        model = "Ippo Q8H Dual Core Tablet (v5)";
+        compatible = "ippo,q8h-v5", "allwinner,sun8i-a23";
+
+        chosen {
+                bootargs = "earlyprintk console=ttyS0,115200";
+        };
+
+        soc@01c00000 {
+                r_uart: serial@01f02800 {
+                        status = "okay";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
new file mode 100644
index 000000000000..54ac0787216a
--- /dev/null
+++ b/arch/arm/boot/dts/sun8i-a23.dtsi
@@ -0,0 +1,343 @@
+/*
+ * Copyright 2014 Chen-Yu Tsai
+ *
+ * Chen-Yu Tsai <wens@csie.org>
+ *
+ * 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>;
+
+        aliases {
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &uart2;
+                serial3 = &uart3;
+                serial4 = &uart4;
+                serial5 = &r_uart;
+        };
+
+        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 0x40000000>;
+        };
+
+        clocks {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                osc24M: osc24M_clk {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <24000000>;
+                        clock-output-names = "osc24M";
+                };
+
+                osc32k: osc32k_clk {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <32768>;
+                        clock-output-names = "osc32k";
+                };
+
+                pll1: clk@01c20000 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun8i-a23-pll1-clk";
+                        reg = <0x01c20000 0x4>;
+                        clocks = <&osc24M>;
+                        clock-output-names = "pll1";
+                };
+
+                /* dummy clock until actually implemented */
+                pll6: pll6_clk {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <600000000>;
+                        clock-output-names = "pll6";
+                };
+
+                cpu: cpu_clk@01c20050 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-a10-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>;
+                        clock-output-names = "cpu";
+                };
+
+                axi: axi_clk@01c20050 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun8i-a23-axi-clk";
+                        reg = <0x01c20050 0x4>;
+                        clocks = <&cpu>;
+                        clock-output-names = "axi";
+                };
+
+                ahb1_mux: ahb1_mux_clk@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun6i-a31-ahb1-mux-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>;
+                        clock-output-names = "ahb1_mux";
+                };
+
+                ahb1: ahb1_clk@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-a10-ahb-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&ahb1_mux>;
+                        clock-output-names = "ahb1";
+                };
+
+                apb1: apb1_clk@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-a10-apb0-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&ahb1>;
+                        clock-output-names = "apb1";
+                };
+
+                ahb1_gates: clk@01c20060 {
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun8i-a23-ahb1-gates-clk";
+                        reg = <0x01c20060 0x8>;
+                        clocks = <&ahb1>;
+                        clock-output-names = "ahb1_mipidsi", "ahb1_dma",
+                                        "ahb1_mmc0", "ahb1_mmc1", "ahb1_mmc2",
+                                        "ahb1_nand", "ahb1_sdram",
+                                        "ahb1_hstimer", "ahb1_spi0",
+                                        "ahb1_spi1", "ahb1_otg", "ahb1_ehci",
+                                        "ahb1_ohci", "ahb1_ve", "ahb1_lcd",
+                                        "ahb1_csi", "ahb1_be",  "ahb1_fe",
+                                        "ahb1_gpu", "ahb1_spinlock",
+                                        "ahb1_drc";
+                };
+
+                apb1_gates: clk@01c20068 {
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun8i-a23-apb1-gates-clk";
+                        reg = <0x01c20068 0x4>;
+                        clocks = <&apb1>;
+                        clock-output-names = "apb1_codec", "apb1_pio",
+                                        "apb1_daudio0", "apb1_daudio1";
+                };
+
+                apb2_mux: apb2_mux_clk@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
+                        clock-output-names = "apb2_mux";
+                };
+
+                apb2: apb2_clk@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun6i-a31-apb2-div-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&apb2_mux>;
+                        clock-output-names = "apb2";
+                };
+
+                apb2_gates: clk@01c2006c {
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun8i-a23-apb2-gates-clk";
+                        reg = <0x01c2006c 0x4>;
+                        clocks = <&apb2>;
+                        clock-output-names = "apb2_i2c0", "apb2_i2c1",
+                                        "apb2_i2c2", "apb2_uart0",
+                                        "apb2_uart1", "apb2_uart2",
+                                        "apb2_uart3", "apb2_uart4";
+                };
+        };
+
+        soc@01c00000 {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                ahb1_rst: reset@01c202c0 {
+                        #reset-cells = <1>;
+                        compatible = "allwinner,sun6i-a31-clock-reset";
+                        reg = <0x01c202c0 0xc>;
+                };
+
+                apb1_rst: reset@01c202d0 {
+                        #reset-cells = <1>;
+                        compatible = "allwinner,sun6i-a31-clock-reset";
+                        reg = <0x01c202d0 0x4>;
+                };
+
+                apb2_rst: reset@01c202d8 {
+                        #reset-cells = <1>;
+                        compatible = "allwinner,sun6i-a31-clock-reset";
+                        reg = <0x01c202d8 0x4>;
+                };
+
+                timer@01c20c00 {
+                        compatible = "allwinner,sun4i-a10-timer";
+                        reg = <0x01c20c00 0xa0>;
+                        interrupts = <0 18 4>,
+                                     <0 19 4>;
+                        clocks = <&osc24M>;
+                };
+
+                wdt0: watchdog@01c20ca0 {
+                        compatible = "allwinner,sun6i-a31-wdt";
+                        reg = <0x01c20ca0 0x20>;
+                        interrupts = <0 25 4>;
+                };
+
+                uart0: serial@01c28000 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28000 0x400>;
+                        interrupts = <0 0 4>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 16>;
+                        resets = <&apb2_rst 16>;
+                        status = "disabled";
+                };
+
+                uart1: serial@01c28400 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28400 0x400>;
+                        interrupts = <0 1 4>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 17>;
+                        resets = <&apb2_rst 17>;
+                        status = "disabled";
+                };
+
+                uart2: serial@01c28800 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28800 0x400>;
+                        interrupts = <0 2 4>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 18>;
+                        resets = <&apb2_rst 18>;
+                        status = "disabled";
+                };
+
+                uart3: serial@01c28c00 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28c00 0x400>;
+                        interrupts = <0 3 4>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 19>;
+                        resets = <&apb2_rst 19>;
+                        status = "disabled";
+                };
+
+                uart4: serial@01c29000 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c29000 0x400>;
+                        interrupts = <0 4 4>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 20>;
+                        resets = <&apb2_rst 20>;
+                        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>;
+                };
+
+                prcm@01f01400 {
+                        compatible = "allwinner,sun8i-a23-prcm";
+                        reg = <0x01f01400 0x200>;
+
+                        ar100: ar100_clk {
+                                compatible = "fixed-factor-clock";
+                                #clock-cells = <0>;
+                                clock-div = <1>;
+                                clock-mult = <1>;
+                                clocks = <&osc24M>;
+                                clock-output-names = "ar100";
+                        };
+
+                        ahb0: ahb0_clk {
+                                compatible = "fixed-factor-clock";
+                                #clock-cells = <0>;
+                                clock-div = <1>;
+                                clock-mult = <1>;
+                                clocks = <&ar100>;
+                                clock-output-names = "ahb0";
+                        };
+
+                        apb0: apb0_clk {
+                                compatible = "allwinner,sun8i-a23-apb0-clk";
+                                #clock-cells = <0>;
+                                clocks = <&ahb0>;
+                                clock-output-names = "apb0";
+                        };
+
+                        apb0_gates: apb0_gates_clk {
+                                compatible = "allwinner,sun8i-a23-apb0-gates-clk";
+                                #clock-cells = <1>;
+                                clocks = <&apb0>;
+                                clock-output-names = "apb0_pio", "apb0_timer",
+                                                "apb0_rsb", "apb0_uart",
+                                                "apb0_i2c";
+                        };
+
+                        apb0_rst: apb0_rst {
+                                compatible = "allwinner,sun6i-a31-clock-reset";
+                                #reset-cells = <1>;
+                        };
+                };
+
+                r_uart: serial@01f02800 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01f02800 0x400>;
+                        interrupts = <0 38 4>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb0_gates 4>;
+                        resets = <&apb0_rst 4>;
+                        status = "disabled";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts
index 0b0e8e07d965..c7c6825f11fb 100644
--- a/arch/arm/boot/dts/tegra114-roth.dts
+++ b/arch/arm/boot/dts/tegra114-roth.dts
@@ -28,6 +28,22 @@
                 reg = <0x80000000 0x79600000>;
         };
 
+        host1x@50000000 {
+                dsi@54300000 {
+                        status = "okay";
+
+                        vdd-supply = <&vdd_1v2_ap>;
+
+                        panel@0 {
+                                compatible = "lg,lh500wx1-sd03";
+                                reg = <0>;
+
+                                power-supply = <&vdd_lcd>;
+                                backlight = <&backlight>;
+                        };
+                };
+        };
+
         pinmux@70000868 {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
@@ -244,7 +260,7 @@
                                 nvidia,function = "sdmmc1";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
-                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                         };
                         sdmmc1_cmd_pz1 {
                                 nvidia,pins = "sdmmc1_cmd_pz1",
@@ -262,7 +278,7 @@
                                 nvidia,function = "sdmmc3";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
-                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                         };
                         sdmmc3_cmd_pa7 {
                                 nvidia,pins = "sdmmc3_cmd_pa7",
@@ -290,7 +306,7 @@
                                 nvidia,function = "sdmmc4";
                                 nvidia,pull = <TEGRA_PIN_PULL_NONE>;
                                 nvidia,tristate = <TEGRA_PIN_DISABLE>;
-                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
                         };
                         sdmmc4_cmd_pt7 {
                                 nvidia,pins = "sdmmc4_cmd_pt7",
@@ -730,7 +746,6 @@
                                 nvidia,pins = "drive_sdio1";
                                 nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
                                 nvidia,schmitt = <TEGRA_PIN_DISABLE>;
-                                nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
                                 nvidia,pull-down-strength = <36>;
                                 nvidia,pull-up-strength = <20>;
                                 nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_SLOW>;
@@ -740,7 +755,6 @@
                                 nvidia,pins = "drive_sdio3";
                                 nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
                                 nvidia,schmitt = <TEGRA_PIN_DISABLE>;
-                                nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
                                 nvidia,pull-down-strength = <36>;
                                 nvidia,pull-up-strength = <20>;
                                 nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
@@ -750,12 +764,10 @@
                                 nvidia,pins = "drive_gma";
                                 nvidia,high-speed-mode = <TEGRA_PIN_ENABLE>;
                                 nvidia,schmitt = <TEGRA_PIN_DISABLE>;
-                                nvidia,low-power-mode = <TEGRA_PIN_LP_DRIVE_DIV_1>;
                                 nvidia,pull-down-strength = <2>;
                                 nvidia,pull-up-strength = <2>;
                                 nvidia,slew-rate-rising = <TEGRA_PIN_SLEW_RATE_FASTEST>;
                                 nvidia,slew-rate-falling = <TEGRA_PIN_SLEW_RATE_FASTEST>;
-                                nvidia,drive-type = <1>;
                         };
                 };
         };
@@ -815,7 +827,6 @@
                                                 regulator-name = "vdd-1v8";
                                                 regulator-min-microvolt = <1800000>;
                                                 regulator-max-microvolt = <1800000>;
-                                                regulator-always-on;
                                                 regulator-boot-on;
                                         };
 
@@ -862,10 +873,11 @@
                                                 regulator-name = "vdd-2v8-display";
                                                 regulator-min-microvolt = <2800000>;
                                                 regulator-max-microvolt = <2800000>;
+                                                regulator-always-on;
                                                 regulator-boot-on;
                                         };
 
-                                        ldo3 {
+                                        vdd_1v2_ap: ldo3 {
                                                 regulator-name = "avdd-1v2";
                                                 regulator-min-microvolt = <1200000>;
                                                 regulator-max-microvolt = <1200000>;
@@ -1052,7 +1064,7 @@
                         regulator-boot-on;
                 };
 
-                regulator@1 {
+                vdd_lcd: regulator@1 {
                         compatible = "regulator-fixed";
                         reg = <1>;
                         regulator-name = "vdd_lcd_1v8";
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index fdc559ab2db3..80b8eddb4105 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -220,6 +220,12 @@
                 interrupt-controller;
         };
 
+        apbmisc@70000800 {
+                compatible = "nvidia,tegra114-apbmisc", "nvidia,tegra20-apbmisc";
+                reg = <0x70000800 0x64   /* Chip revision */
+                       0x70000008 0x04>; /* Strapping options */
+        };
+
         pinmux: pinmux@70000868 {
                 compatible = "nvidia,tegra114-pinmux";
                 reg = <0x70000868 0x148         /* Pad control registers */
@@ -485,6 +491,15 @@
                 clock-names = "pclk", "clk32k_in";
         };
 
+        fuse@7000f800 {
+                compatible = "nvidia,tegra114-efuse";
+                reg = <0x7000f800 0x400>;
+                clocks = <&tegra_car TEGRA114_CLK_FUSE>;
+                clock-names = "fuse";
+                resets = <&tegra_car 39>;
+                reset-names = "fuse";
+        };
+
         iommu@70019010 {
                 compatible = "nvidia,tegra114-smmu", "nvidia,tegra30-smmu";
                 reg = <0x70019010 0x02c
@@ -657,6 +672,8 @@
                          <&tegra_car TEGRA114_CLK_PLL_U>,
                          <&tegra_car TEGRA114_CLK_USBD>;
                 clock-names = "reg", "pll_u", "utmi-pads";
+                resets = <&tegra_car 22>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,hssync-start-delay = <0>;
                 nvidia,idle-wait-delay = <17>;
                 nvidia,elastic-limit = <16>;
@@ -667,6 +684,7 @@
                 nvidia,hssquelch-level = <2>;
                 nvidia,hsdiscon-level = <5>;
                 nvidia,xcvr-hsslew = <12>;
+                nvidia,has-utmi-pad-registers;
                 status = "disabled";
         };
 
@@ -690,6 +708,8 @@
                          <&tegra_car TEGRA114_CLK_PLL_U>,
                          <&tegra_car TEGRA114_CLK_USBD>;
                 clock-names = "reg", "pll_u", "utmi-pads";
+                resets = <&tegra_car 59>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,hssync-start-delay = <0>;
                 nvidia,idle-wait-delay = <17>;
                 nvidia,elastic-limit = <16>;
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index e31fb61a81d3..624b0fba2d0a 100644
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1461,7 +1461,7 @@
                                         regulator-max-microamp = <3500000>;
                                         regulator-always-on;
                                         regulator-boot-on;
-                                        ams,external-control = <2>;
+                                        ams,ext-control = <2>;
                                 };
 
                                 sd1 {
@@ -1472,7 +1472,7 @@
                                         regulator-max-microamp = <2500000>;
                                         regulator-always-on;
                                         regulator-boot-on;
-                                        ams,external-control = <1>;
+                                        ams,ext-control = <1>;
                                 };
 
                                 vdd_1v35_lp0: sd2 {
@@ -1521,7 +1521,7 @@
                                         regulator-max-microvolt = <1050000>;
                                         regulator-boot-on;
                                         regulator-always-on;
-                                        ams,external-control = <1>;
+                                        ams,ext-control = <1>;
                                 };
 
                                 ldo1 {
@@ -1619,6 +1619,32 @@
                 nvidia,sys-clock-req-active-high;
         };
 
+        padctl@0,7009f000 {
+                pinctrl-0 = <&padctl_default>;
+                pinctrl-names = "default";
+
+                padctl_default: pinmux {
+                        usb3 {
+                                nvidia,lanes = "pcie-0", "pcie-1";
+                                nvidia,function = "usb3";
+                                nvidia,iddq = <0>;
+                        };
+
+                        pcie {
+                                nvidia,lanes = "pcie-2", "pcie-3",
+                                               "pcie-4";
+                                nvidia,function = "pcie";
+                                nvidia,iddq = <0>;
+                        };
+
+                        sata {
+                                nvidia,lanes = "sata-0";
+                                nvidia,function = "sata";
+                                nvidia,iddq = <0>;
+                        };
+                };
+        };
+
         /* SD card */
         sdhci@0,700b0400 {
                 status = "okay";
@@ -1633,6 +1659,7 @@
         sdhci@0,700b0600 {
                 status = "okay";
                 bus-width = <8>;
+                non-removable;
         };
 
         ahub@0,70300000 {
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index f0bb84244025..70ad91d1a20b 100644
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -682,7 +682,7 @@
                                         regulator-max-microamp = <3500000>;
                                         regulator-always-on;
                                         regulator-boot-on;
-                                        ams,external-control = <2>;
+                                        ams,ext-control = <2>;
                                 };
 
                                 sd1 {
@@ -693,7 +693,7 @@
                                         regulator-max-microamp = <2500000>;
                                         regulator-always-on;
                                         regulator-boot-on;
-                                        ams,external-control = <1>;
+                                        ams,ext-control = <1>;
                                 };
 
                                 vdd_1v35_lp0: sd2 {
@@ -742,7 +742,7 @@
                                         regulator-max-microvolt = <1050000>;
                                         regulator-boot-on;
                                         regulator-always-on;
-                                        ams,external-control = <1>;
+                                        ams,ext-control = <1>;
                                 };
 
                                 ldo1 {
@@ -816,7 +816,7 @@
         spi@0,7000d400 {
                 status = "okay";
 
-                cros-ec@0 {
+                cros_ec: cros-ec@0 {
                         compatible = "google,cros-ec-spi";
                         spi-max-frequency = <4000000>;
                         interrupt-parent = <&gpio>;
@@ -825,96 +825,30 @@
 
                         google,cros-ec-spi-msg-delay = <2000>;
 
-                        cros-ec-keyb {
-                                compatible = "google,cros-ec-keyb";
-                                keypad,num-rows = <8>;
-                                keypad,num-columns = <13>;
-                                google,needs-ghost-filter;
-
-                                linux,keymap = <
-                                        MATRIX_KEY(0x00, 0x01, KEY_LEFTMETA)
-                                        MATRIX_KEY(0x00, 0x02, KEY_F1)
-                                        MATRIX_KEY(0x00, 0x03, KEY_B)
-                                        MATRIX_KEY(0x00, 0x04, KEY_F10)
-                                        MATRIX_KEY(0x00, 0x06, KEY_N)
-                                        MATRIX_KEY(0x00, 0x08, KEY_EQUAL)
-                                        MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT)
-
-                                        MATRIX_KEY(0x01, 0x01, KEY_ESC)
-                                        MATRIX_KEY(0x01, 0x02, KEY_F4)
-                                        MATRIX_KEY(0x01, 0x03, KEY_G)
-                                        MATRIX_KEY(0x01, 0x04, KEY_F7)
-                                        MATRIX_KEY(0x01, 0x06, KEY_H)
-                                        MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE)
-                                        MATRIX_KEY(0x01, 0x09, KEY_F9)
-                                        MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE)
-
-                                        MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL)
-                                        MATRIX_KEY(0x02, 0x01, KEY_TAB)
-                                        MATRIX_KEY(0x02, 0x02, KEY_F3)
-                                        MATRIX_KEY(0x02, 0x03, KEY_T)
-                                        MATRIX_KEY(0x02, 0x04, KEY_F6)
-                                        MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE)
-                                        MATRIX_KEY(0x02, 0x06, KEY_Y)
-                                        MATRIX_KEY(0x02, 0x07, KEY_102ND)
-                                        MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)
-                                        MATRIX_KEY(0x02, 0x09, KEY_F8)
-
-                                        MATRIX_KEY(0x03, 0x01, KEY_GRAVE)
-                                        MATRIX_KEY(0x03, 0x02, KEY_F2)
-                                        MATRIX_KEY(0x03, 0x03, KEY_5)
-                                        MATRIX_KEY(0x03, 0x04, KEY_F5)
-                                        MATRIX_KEY(0x03, 0x06, KEY_6)
-                                        MATRIX_KEY(0x03, 0x08, KEY_MINUS)
-                                        MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH)
-
-                                        MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL)
-                                        MATRIX_KEY(0x04, 0x01, KEY_A)
-                                        MATRIX_KEY(0x04, 0x02, KEY_D)
-                                        MATRIX_KEY(0x04, 0x03, KEY_F)
-                                        MATRIX_KEY(0x04, 0x04, KEY_S)
-                                        MATRIX_KEY(0x04, 0x05, KEY_K)
-                                        MATRIX_KEY(0x04, 0x06, KEY_J)
-                                        MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON)
-                                        MATRIX_KEY(0x04, 0x09, KEY_L)
-                                        MATRIX_KEY(0x04, 0x0a, KEY_BACKSLASH)
-                                        MATRIX_KEY(0x04, 0x0b, KEY_ENTER)
-
-                                        MATRIX_KEY(0x05, 0x01, KEY_Z)
-                                        MATRIX_KEY(0x05, 0x02, KEY_C)
-                                        MATRIX_KEY(0x05, 0x03, KEY_V)
-                                        MATRIX_KEY(0x05, 0x04, KEY_X)
-                                        MATRIX_KEY(0x05, 0x05, KEY_COMMA)
-                                        MATRIX_KEY(0x05, 0x06, KEY_M)
-                                        MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT)
-                                        MATRIX_KEY(0x05, 0x08, KEY_SLASH)
-                                        MATRIX_KEY(0x05, 0x09, KEY_DOT)
-                                        MATRIX_KEY(0x05, 0x0b, KEY_SPACE)
-
-                                        MATRIX_KEY(0x06, 0x01, KEY_1)
-                                        MATRIX_KEY(0x06, 0x02, KEY_3)
-                                        MATRIX_KEY(0x06, 0x03, KEY_4)
-                                        MATRIX_KEY(0x06, 0x04, KEY_2)
-                                        MATRIX_KEY(0x06, 0x05, KEY_8)
-                                        MATRIX_KEY(0x06, 0x06, KEY_7)
-                                        MATRIX_KEY(0x06, 0x08, KEY_0)
-                                        MATRIX_KEY(0x06, 0x09, KEY_9)
-                                        MATRIX_KEY(0x06, 0x0a, KEY_LEFTALT)
-                                        MATRIX_KEY(0x06, 0x0b, KEY_DOWN)
-                                        MATRIX_KEY(0x06, 0x0c, KEY_RIGHT)
-
-                                        MATRIX_KEY(0x07, 0x01, KEY_Q)
-                                        MATRIX_KEY(0x07, 0x02, KEY_E)
-                                        MATRIX_KEY(0x07, 0x03, KEY_R)
-                                        MATRIX_KEY(0x07, 0x04, KEY_W)
-                                        MATRIX_KEY(0x07, 0x05, KEY_I)
-                                        MATRIX_KEY(0x07, 0x06, KEY_U)
-                                        MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT)
-                                        MATRIX_KEY(0x07, 0x08, KEY_P)
-                                        MATRIX_KEY(0x07, 0x09, KEY_O)
-                                        MATRIX_KEY(0x07, 0x0b, KEY_UP)
-                                        MATRIX_KEY(0x07, 0x0c, KEY_LEFT)
-                                >;
+                        i2c-tunnel {
+                                compatible = "google,cros-ec-i2c-tunnel";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                google,remote-bus = <0>;
+
+                                charger: bq24735@9 {
+                                        compatible = "ti,bq24735";
+                                        reg = <0x9>;
+                                        interrupt-parent = <&gpio>;
+                                        interrupts = <TEGRA_GPIO(J, 0)
+                                                        GPIO_ACTIVE_HIGH>;
+                                        ti,ac-detect-gpios = <&gpio
+                                                        TEGRA_GPIO(J, 0)
+                                                        GPIO_ACTIVE_HIGH>;
+                                };
+
+                                battery: sbs-battery@b {
+                                        compatible = "sbs,sbs-battery";
+                                        reg = <0xb>;
+                                        sbs,i2c-retry-count = <2>;
+                                        sbs,poll-retry-count = <1>;
+                                };
                         };
                 };
         };
@@ -940,6 +874,10 @@
                 nvidia,sys-clock-req-active-high;
         };
 
+        hda@0,70030000 {
+                status = "okay";
+        };
+
         sdhci@0,700b0400 {
                 cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
                 power-gpios = <&gpio TEGRA_GPIO(R, 0) GPIO_ACTIVE_HIGH>;
@@ -1205,3 +1143,5 @@
                 clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
+
+#include "cros-ec-keyboard.dtsi"
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 6e6bc4e8185c..03916efd6fa9 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -1,6 +1,7 @@
 #include <dt-bindings/clock/tegra124-car.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <dt-bindings/pinctrl/pinctrl-tegra.h>
+#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 #include "skeleton.dtsi"
@@ -102,6 +103,21 @@
                         (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
         };
 
+        gpu@0,57000000 {
+                compatible = "nvidia,gk20a";
+                reg = <0x0 0x57000000 0x0 0x01000000>,
+                      <0x0 0x58000000 0x0 0x01000000>;
+                interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
+                             <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "stall", "nonstall";
+                clocks = <&tegra_car TEGRA124_CLK_GPU>,
+                         <&tegra_car TEGRA124_CLK_PLL_P_OUT5>;
+                clock-names = "gpu", "pwr";
+                resets = <&tegra_car 184>;
+                reset-names = "gpu";
+                status = "disabled";
+        };
+
         timer@0,60005000 {
                 compatible = "nvidia,tegra124-timer", "nvidia,tegra20-timer";
                 reg = <0x0 0x60005000 0x0 0x400>;
@@ -179,6 +195,12 @@
                 #dma-cells = <1>;
         };
 
+        apbmisc@0,70000800 {
+                compatible = "nvidia,tegra124-apbmisc", "nvidia,tegra20-apbmisc";
+                reg = <0x0 0x70000800 0x0 0x64>,   /* Chip revision */
+                      <0x0 0x7000E864 0x0 0x04>;   /* Strapping options */
+        };
+
         pinmux: pinmux@0,70000868 {
                 compatible = "nvidia,tegra124-pinmux";
                 reg = <0x0 0x70000868 0x0 0x164>, /* Pad control registers */
@@ -449,6 +471,39 @@
                 clock-names = "pclk", "clk32k_in";
         };
 
+        fuse@0,7000f800 {
+                compatible = "nvidia,tegra124-efuse";
+                reg = <0x0 0x7000f800 0x0 0x400>;
+                clocks = <&tegra_car TEGRA124_CLK_FUSE>;
+                clock-names = "fuse";
+                resets = <&tegra_car 39>;
+                reset-names = "fuse";
+        };
+
+        hda@0,70030000 {
+                compatible = "nvidia,tegra124-hda", "nvidia,tegra30-hda";
+                reg = <0x0 0x70030000 0x0 0x10000>;
+                interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&tegra_car TEGRA124_CLK_HDA>,
+                         <&tegra_car TEGRA124_CLK_HDA2HDMI>,
+                         <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>;
+                clock-names = "hda", "hda2hdmi", "hdacodec_2x";
+                resets = <&tegra_car 125>, /* hda */
+                         <&tegra_car 128>, /* hda2hdmi */
+                         <&tegra_car 111>; /* hda2codec_2x */
+                reset-names = "hda", "hda2hdmi", "hdacodec_2x";
+                status = "disabled";
+        };
+
+        padctl: padctl@0,7009f000 {
+                compatible = "nvidia,tegra124-xusb-padctl";
+                reg = <0x0 0x7009f000 0x0 0x1000>;
+                resets = <&tegra_car 142>;
+                reset-names = "padctl";
+
+                #phy-cells = <1>;
+        };
+
         sdhci@0,700b0000 {
                 compatible = "nvidia,tegra124-sdhci";
                 reg = <0x0 0x700b0000 0x0 0x200>;
@@ -613,6 +668,8 @@
                          <&tegra_car TEGRA124_CLK_PLL_U>,
                          <&tegra_car TEGRA124_CLK_USBD>;
                 clock-names = "reg", "pll_u", "utmi-pads";
+                resets = <&tegra_car 59>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,hssync-start-delay = <0>;
                 nvidia,idle-wait-delay = <17>;
                 nvidia,elastic-limit = <16>;
@@ -647,6 +704,8 @@
                          <&tegra_car TEGRA124_CLK_PLL_U>,
                          <&tegra_car TEGRA124_CLK_USBD>;
                 clock-names = "reg", "pll_u", "utmi-pads";
+                resets = <&tegra_car 22>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,hssync-start-delay = <0>;
                 nvidia,idle-wait-delay = <17>;
                 nvidia,elastic-limit = <16>;
@@ -657,6 +716,7 @@
                 nvidia,hssquelch-level = <2>;
                 nvidia,hsdiscon-level = <5>;
                 nvidia,xcvr-hsslew = <12>;
+                nvidia,has-utmi-pad-registers;
                 status = "disabled";
         };
 
@@ -681,6 +741,8 @@
                          <&tegra_car TEGRA124_CLK_PLL_U>,
                          <&tegra_car TEGRA124_CLK_USBD>;
                 clock-names = "reg", "pll_u", "utmi-pads";
+                resets = <&tegra_car 58>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,hssync-start-delay = <0>;
                 nvidia,idle-wait-delay = <17>;
                 nvidia,elastic-limit = <16>;
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index f45aad688d9b..a37279af687c 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -562,10 +562,14 @@
         };
 
         pcie-controller@80003000 {
-                pex-clk-supply = <&pci_clk_reg>;
-                vdd-supply = <&pci_vdd_reg>;
                 status = "okay";
 
+                avdd-pex-supply = <&pci_vdd_reg>;
+                vdd-pex-supply = <&pci_vdd_reg>;
+                avdd-pex-pll-supply = <&pci_vdd_reg>;
+                avdd-plle-supply = <&pci_vdd_reg>;
+                vddio-pex-clk-supply = <&pci_clk_reg>;
+
                 pci@1,0 {
                         status = "okay";
                 };
diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts
index 6d3a4cbc36cc..1b7c56b33aca 100644
--- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -10,6 +10,15 @@
                 status = "okay";
         };
 
+        host1x@50000000 {
+                dc@54200000 {
+                        rgb {
+                                status = "okay";
+                                nvidia,panel = <&panel>;
+                        };
+                };
+        };
+
         i2c@7000c000 {
                 wm8903: wm8903@1a {
                         compatible = "wlf,wm8903";
@@ -30,7 +39,7 @@
                 };
         };
 
-        backlight {
+        backlight: backlight {
                 compatible = "pwm-backlight";
                 pwms = <&pwm 0 5000000>;
 
@@ -38,6 +47,15 @@
                 default-brightness-level = <6>;
         };
 
+        panel: panel {
+                compatible = "innolux,n156bge-l21", "simple-panel";
+
+                power-supply =  <&vdd_1v8_reg>, <&vdd_3v3_reg>;
+                enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
+
+                backlight = <&backlight>;
+        };
+
         sound {
                 compatible = "ad,tegra-audio-wm8903-medcom-wide",
                              "nvidia,tegra-audio-wm8903";
@@ -64,4 +82,45 @@
                          <&tegra_car TEGRA20_CLK_CDEV1>;
                 clock-names = "pll_a", "pll_a_out0", "mclk";
         };
+
+        regulators {
+                vcc_24v_reg: regulator@100 {
+                        compatible = "regulator-fixed";
+                        reg = <100>;
+                        regulator-name = "vcc_24v";
+                        regulator-min-microvolt = <24000000>;
+                        regulator-max-microvolt = <24000000>;
+                        regulator-always-on;
+                };
+
+                vdd_5v0_reg: regulator@101 {
+                        compatible = "regulator-fixed";
+                        reg = <101>;
+                        regulator-name = "vdd_5v0";
+                        vin-supply = <&vcc_24v_reg>;
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        regulator-always-on;
+                };
+
+                vdd_3v3_reg: regulator@102 {
+                        compatible = "regulator-fixed";
+                        reg = <102>;
+                        regulator-name = "vdd_3v3";
+                        vin-supply = <&vcc_24v_reg>;
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                vdd_1v8_reg: regulator@103 {
+                        compatible = "regulator-fixed";
+                        reg = <103>;
+                        regulator-name = "vdd_1v8";
+                        vin-supply = <&vdd_3v3_reg>;
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        regulator-always-on;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index 9a39a8001f78..d4438e30de45 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -296,7 +296,7 @@
                 request-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
                 slave-addr = <138>;
                 clocks = <&tegra_car TEGRA20_CLK_I2C3>,
-                         <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;
+                         <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;
                 clock-names = "div-clk", "fast-clk";
                 resets = <&tegra_car 67>;
                 reset-names = "i2c";
@@ -589,8 +589,8 @@
                         GPIO_ACTIVE_HIGH>;
 
                 clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
-                         <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
-                         <&tegra_car TEGRA20_CLK_CDEV1>;
+                         <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
+                         <&tegra_car TEGRA20_CLK_CDEV1>;
                 clock-names = "pll_a", "pll_a_out0", "mclk";
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-plutux.dts b/arch/arm/boot/dts/tegra20-plutux.dts
index 29051a2ae0ae..a10b415bbdee 100644
--- a/arch/arm/boot/dts/tegra20-plutux.dts
+++ b/arch/arm/boot/dts/tegra20-plutux.dts
@@ -58,4 +58,45 @@
                          <&tegra_car TEGRA20_CLK_CDEV1>;
                 clock-names = "pll_a", "pll_a_out0", "mclk";
         };
+
+        regulators {
+                vcc_24v_reg: regulator@100 {
+                        compatible = "regulator-fixed";
+                        reg = <100>;
+                        regulator-name = "vcc_24v";
+                        regulator-min-microvolt = <24000000>;
+                        regulator-max-microvolt = <24000000>;
+                        regulator-always-on;
+                };
+
+                vdd_5v0_reg: regulator@101 {
+                        compatible = "regulator-fixed";
+                        reg = <101>;
+                        regulator-name = "vdd_5v0";
+                        vin-supply = <&vcc_24v_reg>;
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        regulator-always-on;
+                };
+
+                vdd_3v3_reg: regulator@102 {
+                        compatible = "regulator-fixed";
+                        reg = <102>;
+                        regulator-name = "vdd_3v3";
+                        vin-supply = <&vcc_24v_reg>;
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                vdd_1v8_reg: regulator@103 {
+                        compatible = "regulator-fixed";
+                        reg = <103>;
+                        regulator-name = "vdd_1v8";
+                        vin-supply = <&vdd_3v3_reg>;
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        regulator-always-on;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index a1b0d965757f..80e7d386ce34 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -334,6 +334,7 @@
                         #gpio-cells = <2>;
                         gpio-controller;
 
+                        /* vdd_5v0_reg must be provided by the base board */
                         sys-supply = <&vdd_5v0_reg>;
                         vin-sm0-supply = <&sys_reg>;
                         vin-sm1-supply = <&sys_reg>;
@@ -473,8 +474,11 @@
         };
 
         pcie-controller@80003000 {
-                pex-clk-supply = <&pci_clk_reg>;
-                vdd-supply = <&pci_vdd_reg>;
+                avdd-pex-supply = <&pci_vdd_reg>;
+                vdd-pex-supply = <&pci_vdd_reg>;
+                avdd-pex-pll-supply = <&pci_vdd_reg>;
+                avdd-plle-supply = <&pci_vdd_reg>;
+                vddio-pex-clk-supply = <&pci_clk_reg>;
         };
 
         usb@c5008000 {
@@ -511,15 +515,6 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                vdd_5v0_reg: regulator@0 {
-                        compatible = "regulator-fixed";
-                        reg = <0>;
-                        regulator-name = "vdd_5v0";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        regulator-always-on;
-                };
-
                 pci_vdd_reg: regulator@1 {
                         compatible = "regulator-fixed";
                         reg = <1>;
diff --git a/arch/arm/boot/dts/tegra20-tec.dts b/arch/arm/boot/dts/tegra20-tec.dts
index 890562c667fb..c12d8bead2ee 100644
--- a/arch/arm/boot/dts/tegra20-tec.dts
+++ b/arch/arm/boot/dts/tegra20-tec.dts
@@ -67,4 +67,45 @@
                          <&tegra_car TEGRA20_CLK_CDEV1>;
                 clock-names = "pll_a", "pll_a_out0", "mclk";
         };
+
+        regulators {
+                vcc_24v_reg: regulator@100 {
+                        compatible = "regulator-fixed";
+                        reg = <100>;
+                        regulator-name = "vcc_24v";
+                        regulator-min-microvolt = <24000000>;
+                        regulator-max-microvolt = <24000000>;
+                        regulator-always-on;
+                };
+
+                vdd_5v0_reg: regulator@101 {
+                        compatible = "regulator-fixed";
+                        reg = <101>;
+                        regulator-name = "vdd_5v0";
+                        vin-supply = <&vcc_24v_reg>;
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        regulator-always-on;
+                };
+
+                vdd_3v3_reg: regulator@102 {
+                        compatible = "regulator-fixed";
+                        reg = <102>;
+                        regulator-name = "vdd_3v3";
+                        vin-supply = <&vcc_24v_reg>;
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                vdd_1v8_reg: regulator@103 {
+                        compatible = "regulator-fixed";
+                        reg = <103>;
+                        regulator-name = "vdd_1v8";
+                        vin-supply = <&vdd_3v3_reg>;
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        regulator-always-on;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 216fa6d50c65..5ad87979ab13 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -318,8 +318,12 @@
 
         pcie-controller@80003000 {
                 status = "okay";
-                pex-clk-supply = <&pci_clk_reg>;
-                vdd-supply = <&pci_vdd_reg>;
+
+                avdd-pex-supply = <&pci_vdd_reg>;
+                vdd-pex-supply = <&pci_vdd_reg>;
+                avdd-pex-pll-supply = <&pci_vdd_reg>;
+                avdd-plle-supply = <&pci_vdd_reg>;
+                vddio-pex-clk-supply = <&pci_clk_reg>;
 
                 pci@1,0 {
                         status = "okay";
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index a7ddf70df50b..1908f6937e53 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -236,6 +236,12 @@
                 interrupt-controller;
         };
 
+        apbmisc@70000800 {
+                compatible = "nvidia,tegra20-apbmisc";
+                reg = <0x70000800 0x64   /* Chip revision */
+                       0x70000008 0x04>; /* Strapping options */
+        };
+
         pinmux: pinmux@70000014 {
                 compatible = "nvidia,tegra20-pinmux";
                 reg = <0x70000014 0x10   /* Tri-state registers */
@@ -545,6 +551,15 @@
                 #size-cells = <0>;
         };
 
+        fuse@7000f800 {
+                compatible = "nvidia,tegra20-efuse";
+                reg = <0x7000F800 0x400>;
+                clocks = <&tegra_car TEGRA20_CLK_FUSE>;
+                clock-names = "fuse";
+                resets = <&tegra_car 39>;
+                reset-names = "fuse";
+        };
+
         pcie-controller@80003000 {
                 compatible = "nvidia,tegra20-pcie";
                 device_type = "pci";
@@ -630,6 +645,8 @@
                          <&tegra_car TEGRA20_CLK_CLK_M>,
                          <&tegra_car TEGRA20_CLK_USBD>;
                 clock-names = "reg", "pll_u", "timer", "utmi-pads";
+                resets = <&tegra_car 22>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,has-legacy-mode;
                 nvidia,hssync-start-delay = <9>;
                 nvidia,idle-wait-delay = <17>;
@@ -638,6 +655,7 @@
                 nvidia,xcvr-setup = <9>;
                 nvidia,xcvr-lsfslew = <1>;
                 nvidia,xcvr-lsrslew = <1>;
+                nvidia,has-utmi-pad-registers;
                 status = "disabled";
         };
 
@@ -661,6 +679,8 @@
                          <&tegra_car TEGRA20_CLK_PLL_U>,
                          <&tegra_car TEGRA20_CLK_CDEV2>;
                 clock-names = "reg", "pll_u", "ulpi-link";
+                resets = <&tegra_car 58>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 status = "disabled";
         };
 
@@ -685,6 +705,8 @@
                          <&tegra_car TEGRA20_CLK_CLK_M>,
                          <&tegra_car TEGRA20_CLK_USBD>;
                 clock-names = "reg", "pll_u", "timer", "utmi-pads";
+                resets = <&tegra_car 59>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,hssync-start-delay = <9>;
                 nvidia,idle-wait-delay = <17>;
                 nvidia,elastic-limit = <16>;
diff --git a/arch/arm/boot/dts/tegra30-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts
new file mode 100644
index 000000000000..45d40f024585
--- /dev/null
+++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts
@@ -0,0 +1,260 @@
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include "tegra30-apalis.dtsi"
+
+/ {
+        model = "Toradex Apalis T30 on Apalis Evaluation Board";
+        compatible = "toradex,apalis_t30-eval", "toradex,apalis_t30", "nvidia,tegra30";
+
+        aliases {
+                rtc0 = "/i2c@7000c000/rtc@68";
+                rtc1 = "/i2c@7000d000/tps65911@2d";
+                rtc2 = "/rtc@7000e000";
+        };
+
+        pcie-controller@00003000 {
+                status = "okay";
+
+                pci@1,0 {
+                        status = "okay";
+                };
+
+                pci@2,0 {
+                        status = "okay";
+                };
+
+                pci@3,0 {
+                        status = "okay";
+                };
+        };
+
+        host1x@50000000 {
+                dc@54200000 {
+                        rgb {
+                                status = "okay";
+                                nvidia,panel = <&panel>;
+                        };
+                };
+                hdmi@54280000 {
+                        status = "okay";
+                };
+        };
+
+        serial@70006000 {
+                status = "okay";
+        };
+
+        serial@70006040 {
+                compatible = "nvidia,tegra30-hsuart";
+                status = "okay";
+        };
+
+        serial@70006200 {
+                compatible = "nvidia,tegra30-hsuart";
+                status = "okay";
+        };
+
+        serial@70006300 {
+                compatible = "nvidia,tegra30-hsuart";
+                status = "okay";
+        };
+
+        pwm@7000a000 {
+                status = "okay";
+        };
+
+        /*
+         * GEN1_I2C: I2C1_SDA/SCL on MXM3 pin 209/211 (e.g. RTC on carrier
+         * board)
+         */
+        i2c@7000c000 {
+                status = "okay";
+                clock-frequency = <100000>;
+
+                pcie-switch@58 {
+                        compatible = "plx,pex8605";
+                        reg = <0x58>;
+                };
+
+                /* M41T0M6 real time clock on carrier board */
+                rtc@68 {
+                        compatible = "st,m41t00";
+                        reg = <0x68>;
+                };
+        };
+
+        /* GEN2_I2C: unused */
+
+        /*
+         * CAM_I2C: I2C3_SDA/SCL on MXM3 pin 201/203 (e.g. camera sensor on
+         * carrier board)
+         */
+        cami2c: i2c@7000c500 {
+                status = "okay";
+                clock-frequency = <400000>;
+        };
+
+        /* DDC: I2C2_SDA/SCL on MXM3 pin 205/207 (e.g. display EDID) */
+        hdmiddc: i2c@7000c700 {
+                status = "okay";
+        };
+
+        /* SPI1: Apalis SPI1 */
+        spi@7000d400 {
+                status = "okay";
+                spi-max-frequency = <25000000>;
+                spidev0: spidev@1 {
+                        compatible = "spidev";
+                        reg = <1>;
+                        spi-max-frequency = <25000000>;
+                };
+        };
+
+        /* SPI5: Apalis SPI2 */
+        spi@7000dc00 {
+                status = "okay";
+                spi-max-frequency = <25000000>;
+                spidev1: spidev@2 {
+                        compatible = "spidev";
+                        reg = <2>;
+                        spi-max-frequency = <25000000>;
+                };
+        };
+
+        sd1: sdhci@78000000 {
+                status = "okay";
+                bus-width = <4>;
+                /* SD1_CD# */
+                cd-gpios = <&gpio TEGRA_GPIO(CC, 5) GPIO_ACTIVE_LOW>;
+                no-1-8-v;
+        };
+
+        mmc1: sdhci@78000400 {
+                status = "okay";
+                bus-width = <8>;
+                /* MMC1_CD# */
+                cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
+                no-1-8-v;
+        };
+
+        /* EHCI instance 0: USB1_DP/N -> USBO1_DP/N */
+        usb@7d000000 {
+                status = "okay";
+        };
+
+        usb-phy@7d000000 {
+                status = "okay";
+                vbus-supply = <&usbo1_vbus_reg>;
+        };
+
+        /* EHCI instance 1: USB2_DP/N -> USBH2_DP/N */
+        usb@7d004000 {
+                status = "okay";
+        };
+
+        usb-phy@7d004000 {
+                status = "okay";
+                vbus-supply = <&usbh_vbus_reg>;
+        };
+
+        /* EHCI instance 2: USB3_DP/N -> USBH3_DP/N */
+        usb@7d008000 {
+                status = "okay";
+        };
+
+        usb-phy@7d008000 {
+                status = "okay";
+                vbus-supply = <&usbh_vbus_reg>;
+        };
+
+        backlight: backlight {
+                compatible = "pwm-backlight";
+
+                /* PWM0 */
+                pwms = <&pwm 0 5000000>;
+                brightness-levels = <255 231 223 207 191 159 127 0>;
+                default-brightness-level = <6>;
+                /* BKL1_ON */
+                enable-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                power {
+                        label = "Power";
+                        gpios = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_LOW>;
+                        linux,code = <KEY_POWER>;
+                        debounce-interval = <10>;
+                        gpio-key,wakeup;
+                };
+        };
+
+        panel: panel {
+                /*
+                 * edt,et057090dhu: EDT 5.7" LCD TFT
+                 * edt,et070080dh6: EDT 7.0" LCD TFT
+                 */
+                compatible = "edt,et057090dhu", "simple-panel";
+
+                backlight = <&backlight>;
+        };
+
+        pwmleds {
+                compatible = "pwm-leds";
+
+                pwm1 {
+                        label = "PWM1";
+                        pwms = <&pwm 3 19600>;
+                        max-brightness = <255>;
+                };
+
+                pwm2 {
+                        label = "PWM2";
+                        pwms = <&pwm 2 19600>;
+                        max-brightness = <255>;
+                };
+
+                pwm3 {
+                        label = "PWM3";
+                        pwms = <&pwm 1 19600>;
+                        max-brightness = <255>;
+                };
+        };
+
+        regulators {
+                sys_5v0_reg: regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "5v0";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        regulator-always-on;
+                };
+
+                /* USBO1_EN */
+                usbo1_vbus_reg: regulator@2 {
+                        compatible = "regulator-fixed";
+                        reg = <2>;
+                        regulator-name = "usbo1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio TEGRA_GPIO(T, 5) GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                        vin-supply = <&sys_5v0_reg>;
+                };
+
+                /* USBH_EN */
+                usbh_vbus_reg: regulator@3 {
+                        compatible = "regulator-fixed";
+                        reg = <3>;
+                        regulator-name = "usbh_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
+                        enable-active-high;
+                        vin-supply = <&sys_5v0_reg>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
new file mode 100644
index 000000000000..8adaa7871dd3
--- /dev/null
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -0,0 +1,678 @@
+#include "tegra30.dtsi"
+
+/*
+ * Toradex Apalis T30 Device Tree
+ * Compatible for Revisions 1GB: V1.0A; 2GB: V1.0B, V1.0C
+ */
+/ {
+        model = "Toradex Apalis T30";
+        compatible = "toradex,apalis_t30", "nvidia,tegra30";
+
+        pcie-controller@00003000 {
+                avdd-pexa-supply = <&vdd2_reg>;
+                vdd-pexa-supply = <&vdd2_reg>;
+                avdd-pexb-supply = <&vdd2_reg>;
+                vdd-pexb-supply = <&vdd2_reg>;
+                avdd-pex-pll-supply = <&vdd2_reg>;
+                avdd-plle-supply = <&ldo6_reg>;
+                vddio-pex-ctl-supply = <&sys_3v3_reg>;
+                hvdd-pex-supply = <&sys_3v3_reg>;
+
+                pci@1,0 {
+                        nvidia,num-lanes = <4>;
+                };
+
+                pci@2,0 {
+                        nvidia,num-lanes = <1>;
+                };
+
+                pci@3,0 {
+                        nvidia,num-lanes = <1>;
+                };
+        };
+
+        host1x@50000000 {
+                hdmi@54280000 {
+                        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@70000868 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&state_default>;
+
+                state_default: pinmux {
+                        /* Apalis BKL1_ON */
+                        pv2 {
+                                nvidia,pins = "pv2";
+                                nvidia,function = "rsvd4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis BKL1_PWM */
+                        uart3_rts_n_pc0 {
+                                nvidia,pins =   "uart3_rts_n_pc0";
+                                nvidia,function = "pwm0";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+                        /* BKL1_PWM_EN#, disable TPS65911 PMIC PWM backlight */
+                        uart3_cts_n_pa1 {
+                                nvidia,pins =   "uart3_cts_n_pa1";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis CAN1 on SPI6 */
+                        spi2_cs0_n_px3 {
+                                nvidia,pins =   "spi2_cs0_n_px3",
+                                                "spi2_miso_px1",
+                                                "spi2_mosi_px0",
+                                                "spi2_sck_px2";
+                                nvidia,function = "spi6";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+                        /* CAN_INT1 */
+                        spi2_cs1_n_pw2 {
+                                nvidia,pins = "spi2_cs1_n_pw2";
+                                nvidia,function = "spi3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis CAN2 on SPI4 */
+                        gmi_a16_pj7 {
+                                nvidia,pins =   "gmi_a16_pj7",
+                                                "gmi_a17_pb0",
+                                                "gmi_a18_pb1",
+                                                "gmi_a19_pk7";
+                                nvidia,function = "spi4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+                        /* CAN_INT2 */
+                        spi2_cs2_n_pw3 {
+                                nvidia,pins = "spi2_cs2_n_pw3";
+                                nvidia,function = "spi3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis I2C3 */
+                        cam_i2c_scl_pbb1 {
+                                nvidia,pins = "cam_i2c_scl_pbb1",
+                                              "cam_i2c_sda_pbb2";
+                                nvidia,function = "i2c3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,lock = <TEGRA_PIN_DISABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis MMC1 */
+                        sdmmc3_clk_pa6 {
+                                nvidia,pins =   "sdmmc3_clk_pa6",
+                                                "sdmmc3_cmd_pa7";
+                                nvidia,function = "sdmmc3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+                        sdmmc3_dat0_pb7 {
+                                nvidia,pins =   "sdmmc3_dat0_pb7",
+                                                "sdmmc3_dat1_pb6",
+                                                "sdmmc3_dat2_pb5",
+                                                "sdmmc3_dat3_pb4",
+                                                "sdmmc3_dat4_pd1",
+                                                "sdmmc3_dat5_pd0",
+                                                "sdmmc3_dat6_pd3",
+                                                "sdmmc3_dat7_pd4";
+                                nvidia,function = "sdmmc3";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+                        /* Apalis MMC1_CD# */
+                        pv3 {
+                                nvidia,pins = "pv3";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis PWM1 */
+                        gpio_pu6 {
+                                nvidia,pins =   "gpio_pu6";
+                                nvidia,function = "pwm3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis PWM2 */
+                        gpio_pu5 {
+                                nvidia,pins =   "gpio_pu5";
+                                nvidia,function = "pwm2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis PWM3 */
+                        gpio_pu4 {
+                                nvidia,pins =   "gpio_pu4";
+                                nvidia,function = "pwm1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis PWM4 */
+                        gpio_pu3 {
+                                nvidia,pins =   "gpio_pu3";
+                                nvidia,function = "pwm0";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis RESET_MOCI# */
+                        gmi_rst_n_pi4 {
+                                nvidia,pins = "gmi_rst_n_pi4";
+                                nvidia,function = "gmi";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis SD1 */
+                        sdmmc1_clk_pz0 {
+                                nvidia,pins = "sdmmc1_clk_pz0";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+                        sdmmc1_cmd_pz1 {
+                                nvidia,pins =   "sdmmc1_cmd_pz1",
+                                                "sdmmc1_dat0_py7",
+                                                "sdmmc1_dat1_py6",
+                                                "sdmmc1_dat2_py5",
+                                                "sdmmc1_dat3_py4";
+                                nvidia,function = "sdmmc1";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+                        /* Apalis SD1_CD# */
+                        clk2_req_pcc5 {
+                                nvidia,pins = "clk2_req_pcc5";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis SPI1 */
+                        spi1_sck_px5 {
+                                nvidia,pins =   "spi1_sck_px5",
+                                                "spi1_mosi_px4",
+                                                "spi1_miso_px7",
+                                                "spi1_cs0_n_px6";
+                                nvidia,function = "spi1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis SPI2 */
+                        lcd_sck_pz4 {
+                                nvidia,pins =   "lcd_sck_pz4",
+                                                "lcd_sdout_pn5",
+                                                "lcd_sdin_pz2",
+                                                "lcd_cs0_n_pn4";
+                                nvidia,function = "spi5";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis UART1 */
+                        ulpi_data0 {
+                                nvidia,pins =   "ulpi_data0_po1",
+                                                "ulpi_data1_po2",
+                                                "ulpi_data2_po3",
+                                                "ulpi_data3_po4",
+                                                "ulpi_data4_po5",
+                                                "ulpi_data5_po6",
+                                                "ulpi_data6_po7",
+                                                "ulpi_data7_po0";
+                                nvidia,function = "uarta";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis UART2 */
+                        ulpi_clk_py0 {
+                                nvidia,pins =   "ulpi_clk_py0",
+                                                "ulpi_dir_py1",
+                                                "ulpi_nxt_py2",
+                                                "ulpi_stp_py3";
+                                nvidia,function = "uartd";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis UART3 */
+                        uart2_rxd_pc3 {
+                                nvidia,pins =   "uart2_rxd_pc3",
+                                                "uart2_txd_pc2";
+                                nvidia,function = "uartb";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis UART4 */
+                        uart3_rxd_pw7 {
+                                nvidia,pins =   "uart3_rxd_pw7",
+                                                "uart3_txd_pw6";
+                                nvidia,function = "uartc";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis USBO1_EN */
+                        gen2_i2c_scl_pt5 {
+                                nvidia,pins = "gen2_i2c_scl_pt5";
+                                nvidia,function = "rsvd4";
+                                nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Apalis USBO1_OC# */
+                        gen2_i2c_sda_pt6 {
+                                nvidia,pins = "gen2_i2c_sda_pt6";
+                                nvidia,function = "rsvd4";
+                                nvidia,open-drain = <TEGRA_PIN_DISABLE>;
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* Apalis WAKE1_MICO */
+                        pv1 {
+                                nvidia,pins = "pv1";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* eMMC (On-module) */
+                        sdmmc4_clk_pcc4 {
+                                nvidia,pins =   "sdmmc4_clk_pcc4",
+                                                "sdmmc4_rst_n_pcc3";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+                        sdmmc4_dat0_paa0 {
+                                nvidia,pins =   "sdmmc4_dat0_paa0",
+                                                "sdmmc4_dat1_paa1",
+                                                "sdmmc4_dat2_paa2",
+                                                "sdmmc4_dat3_paa3",
+                                                "sdmmc4_dat4_paa4",
+                                                "sdmmc4_dat5_paa5",
+                                                "sdmmc4_dat6_paa6",
+                                                "sdmmc4_dat7_paa7";
+                                nvidia,function = "sdmmc4";
+                                nvidia,pull = <TEGRA_PIN_PULL_UP>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* LVDS Transceiver Configuration */
+                        pbb0 {
+                                nvidia,pins =   "pbb0",
+                                                "pbb7",
+                                                "pcc1",
+                                                "pcc2";
+                                nvidia,function = "rsvd2";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                                nvidia,lock = <TEGRA_PIN_DISABLE>;
+                        };
+                        pbb3 {
+                                nvidia,pins =   "pbb3",
+                                                "pbb4",
+                                                "pbb5",
+                                                "pbb6";
+                                nvidia,function = "displayb";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+                                nvidia,lock = <TEGRA_PIN_DISABLE>;
+                        };
+
+                        /* Power I2C (On-module) */
+                        pwr_i2c_scl_pz6 {
+                                nvidia,pins = "pwr_i2c_scl_pz6",
+                                              "pwr_i2c_sda_pz7";
+                                nvidia,function = "i2cpwr";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                                nvidia,lock = <TEGRA_PIN_DISABLE>;
+                                nvidia,open-drain = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /*
+                         * THERMD_ALERT#, unlatched I2C address pin of LM95245
+                         * temperature sensor therefore requires disabling for
+                         * now
+                         */
+                        lcd_dc1_pd2 {
+                                nvidia,pins = "lcd_dc1_pd2";
+                                nvidia,function = "rsvd3";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+
+                        /* TOUCH_PEN_INT# */
+                        pv0 {
+                                nvidia,pins = "pv0";
+                                nvidia,function = "rsvd1";
+                                nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+                                nvidia,tristate = <TEGRA_PIN_DISABLE>;
+                                nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+                        };
+                };
+        };
+
+        hdmiddc: i2c@7000c700 {
+                clock-frequency = <100000>;
+        };
+
+        /*
+         * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and
+         * touch screen controller
+         */
+        i2c@7000d000 {
+                status = "okay";
+                clock-frequency = <100000>;
+
+                pmic: tps65911@2d {
+                        compatible = "ti,tps65911";
+                        reg = <0x2d>;
+
+                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+
+                        ti,system-power-controller;
+
+                        #gpio-cells = <2>;
+                        gpio-controller;
+
+                        vcc1-supply = <&sys_3v3_reg>;
+                        vcc2-supply = <&sys_3v3_reg>;
+                        vcc3-supply = <&vio_reg>;
+                        vcc4-supply = <&sys_3v3_reg>;
+                        vcc5-supply = <&sys_3v3_reg>;
+                        vcc6-supply = <&vio_reg>;
+                        vcc7-supply = <&sys_5v0_reg>;
+                        vccio-supply = <&sys_3v3_reg>;
+
+                        regulators {
+                                /* SW1: +V1.35_VDDIO_DDR */
+                                vdd1_reg: vdd1 {
+                                        regulator-name = "vddio_ddr_1v35";
+                                        regulator-min-microvolt = <1350000>;
+                                        regulator-max-microvolt = <1350000>;
+                                        regulator-always-on;
+                                };
+
+                                /* SW2: +V1.05 */
+                                vdd2_reg: vdd2 {
+                                        regulator-name =
+                                                "vdd_pexa,vdd_pexb,vdd_sata";
+                                        regulator-min-microvolt = <1050000>;
+                                        regulator-max-microvolt = <1050000>;
+                                };
+
+                                /* SW CTRL: +V1.0_VDD_CPU */
+                                vddctrl_reg: vddctrl {
+                                        regulator-name = "vdd_cpu,vdd_sys";
+                                        regulator-min-microvolt = <1150000>;
+                                        regulator-max-microvolt = <1150000>;
+                                        regulator-always-on;
+                                };
+
+                                /* SWIO: +V1.8 */
+                                vio_reg: vio {
+                                        regulator-name = "vdd_1v8_gen";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                };
+
+                                /* LDO1: unused */
+
+                                /*
+                                 * EN_+V3.3 switching via FET:
+                                 * +V3.3_AUDIO_AVDD_S, +V3.3 and +V1.8_VDD_LAN
+                                 * see also v3_3 fixed supply
+                                 */
+                                ldo2_reg: ldo2 {
+                                        regulator-name = "en_3v3";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-always-on;
+                                };
+
+                                /* +V1.2_CSI */
+                                ldo3_reg: ldo3 {
+                                        regulator-name =
+                                                "avdd_dsi_csi,pwrdet_mipi";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                };
+
+                                /* +V1.2_VDD_RTC */
+                                ldo4_reg: ldo4 {
+                                        regulator-name = "vdd_rtc";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+
+                                /*
+                                 * +V2.8_AVDD_VDAC:
+                                 * only required for analog RGB
+                                 */
+                                ldo5_reg: ldo5 {
+                                        regulator-name = "avdd_vdac";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                };
+
+                                /*
+                                 * +V1.05_AVDD_PLLE: avdd_plle should be 1.05V
+                                 * but LDO6 can't set voltage in 50mV
+                                 * granularity
+                                 */
+                                ldo6_reg: ldo6 {
+                                        regulator-name = "avdd_plle";
+                                        regulator-min-microvolt = <1100000>;
+                                        regulator-max-microvolt = <1100000>;
+                                };
+
+                                /* +V1.2_AVDD_PLL */
+                                ldo7_reg: ldo7 {
+                                        regulator-name = "avdd_pll";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+
+                                /* +V1.0_VDD_DDR_HS */
+                                ldo8_reg: ldo8 {
+                                        regulator-name = "vdd_ddr_hs";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                };
+                        };
+                };
+
+                /* STMPE811 touch screen controller */
+                stmpe811@41 {
+                        compatible = "st,stmpe811";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x41>;
+                        interrupts = <TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>;
+                        interrupt-parent = <&gpio>;
+                        interrupt-controller;
+                        id = <0>;
+                        blocks = <0x5>;
+                        irq-trigger = <0x1>;
+
+                        stmpe_touchscreen {
+                                compatible = "st,stmpe-ts";
+                                reg = <0>;
+                                /* 3.25 MHz ADC clock speed */
+                                st,adc-freq = <1>;
+                                /* 8 sample average control */
+                                st,ave-ctrl = <3>;
+                                /* 7 length fractional part in z */
+                                st,fraction-z = <7>;
+                                /*
+                                 * 50 mA typical 80 mA max touchscreen drivers
+                                 * current limit value
+                                 */
+                                st,i-drive = <1>;
+                                /* 12-bit ADC */
+                                st,mod-12b = <1>;
+                                /* internal ADC reference */
+                                st,ref-sel = <0>;
+                                /* ADC converstion time: 80 clocks */
+                                st,sample-time = <4>;
+                                /* 1 ms panel driver settling time */
+                                st,settling = <3>;
+                                /* 5 ms touch detect interrupt delay */
+                                st,touch-det-delay = <5>;
+                        };
+                };
+
+                /*
+                 * LM95245 temperature sensor
+                 * Note: OVERT_N directly connected to PMIC PWRDN
+                 */
+                temp-sensor@4c {
+                        compatible = "national,lm95245";
+                        reg = <0x4c>;
+                };
+
+                /* SW: +V1.2_VDD_CORE */
+                tps62362@60 {
+                        compatible = "ti,tps62362";
+                        reg = <0x60>;
+
+                        regulator-name = "tps62362-vout";
+                        regulator-min-microvolt = <900000>;
+                        regulator-max-microvolt = <1400000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                        ti,vsel0-state-low;
+                        /* VSEL1: EN_CORE_DVFS_N low for DVFS */
+                        ti,vsel1-state-low;
+                };
+        };
+
+        /* SPI4: CAN2 */
+        spi@7000da00 {
+                status = "okay";
+                spi-max-frequency = <10000000>;
+
+                can@1 {
+                        compatible = "microchip,mcp2515";
+                        reg = <1>;
+                        clocks = <&clk16m>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_LOW>;
+                        spi-max-frequency = <10000000>;
+                };
+        };
+
+        /* SPI6: CAN1 */
+        spi@7000de00 {
+                status = "okay";
+                spi-max-frequency = <10000000>;
+
+                can@0 {
+                        compatible = "microchip,mcp2515";
+                        reg = <0>;
+                        clocks = <&clk16m>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
+                        spi-max-frequency = <10000000>;
+                };
+        };
+
+        pmc@7000e400 {
+                nvidia,invert-interrupt;
+                nvidia,suspend-mode = <1>;
+                nvidia,cpu-pwr-good-time = <5000>;
+                nvidia,cpu-pwr-off-time = <5000>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <0>;
+                nvidia,core-power-req-active-high;
+                nvidia,sys-clock-req-active-high;
+        };
+
+        sdhci@78000600 {
+                status = "okay";
+                bus-width = <8>;
+                non-removable;
+        };
+
+        clocks {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                clk32k_in: clk@0 {
+                        compatible = "fixed-clock";
+                        reg=<0>;
+                        #clock-cells = <0>;
+                        clock-frequency = <32768>;
+                };
+                clk16m: clk@1 {
+                        compatible = "fixed-clock";
+                        reg=<1>;
+                        #clock-cells = <0>;
+                        clock-frequency = <16000000>;
+                        clock-output-names = "clk16m";
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                sys_3v3_reg: regulator@100 {
+                        compatible = "regulator-fixed";
+                        reg = <100>;
+                        regulator-name = "3v3";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 3189791a9289..cee8f2246fdb 100644
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -17,9 +17,15 @@
 
         pcie-controller@00003000 {
                 status = "okay";
-                pex-clk-supply = <&sys_3v3_pexs_reg>;
-                vdd-supply = <&ldo1_reg>;
-                avdd-supply = <&ldo2_reg>;
+
+                avdd-pexa-supply = <&ldo1_reg>;
+                vdd-pexa-supply = <&ldo1_reg>;
+                avdd-pexb-supply = <&ldo1_reg>;
+                vdd-pexb-supply = <&ldo1_reg>;
+                avdd-pex-pll-supply = <&ldo1_reg>;
+                avdd-plle-supply = <&ldo1_reg>;
+                vddio-pex-ctl-supply = <&sys_3v3_reg>;
+                hvdd-pex-supply = <&sys_3v3_pexs_reg>;
 
                 pci@1,0 {
                         status = "okay";
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 0cf0848a82d8..206379546244 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -38,9 +38,14 @@
 
         pcie-controller@00003000 {
                 status = "okay";
-                pex-clk-supply = <&pex_hvdd_3v3_reg>;
-                vdd-supply = <&ldo1_reg>;
-                avdd-supply = <&ldo2_reg>;
+
+                /* AVDD_PEXA and VDD_PEXA inputs are grounded on Cardhu. */
+                avdd-pexb-supply = <&ldo1_reg>;
+                vdd-pexb-supply = <&ldo1_reg>;
+                avdd-pex-pll-supply = <&ldo1_reg>;
+                hvdd-pex-supply = <&pex_hvdd_3v3_reg>;
+                vddio-pex-ctl-supply = <&sys_3v3_reg>;
+                avdd-plle-supply = <&ldo2_reg>;
 
                 pci@1,0 {
                         nvidia,num-lanes = <4>;
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index dec4fc823901..6b35c29278d7 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -335,6 +335,12 @@
                 interrupt-controller;
         };
 
+        apbmisc@70000800 {
+                compatible = "nvidia,tegra30-apbmisc", "nvidia,tegra20-apbmisc";
+                reg = <0x70000800 0x64   /* Chip revision */
+                       0x70000008 0x04>; /* Strapping options */
+        };
+
         pinmux: pinmux@70000868 {
                 compatible = "nvidia,tegra30-pinmux";
                 reg = <0x70000868 0xd4    /* Pad control registers */
@@ -631,6 +637,15 @@
                 nvidia,ahb = <&ahb>;
         };
 
+        fuse@7000f800 {
+                compatible = "nvidia,tegra30-efuse";
+                reg = <0x7000f800 0x400>;
+                clocks = <&tegra_car TEGRA30_CLK_FUSE>;
+                clock-names = "fuse";
+                resets = <&tegra_car 39>;
+                reset-names = "fuse";
+        };
+
         ahub@70080000 {
                 compatible = "nvidia,tegra30-ahub";
                 reg = <0x70080000 0x200
@@ -775,6 +790,8 @@
                          <&tegra_car TEGRA30_CLK_PLL_U>,
                          <&tegra_car TEGRA30_CLK_USBD>;
                 clock-names = "reg", "pll_u", "utmi-pads";
+                resets = <&tegra_car 22>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,hssync-start-delay = <9>;
                 nvidia,idle-wait-delay = <17>;
                 nvidia,elastic-limit = <16>;
@@ -786,6 +803,7 @@
                 nvidia,xcvr-hsslew = <32>;
                 nvidia,hssquelch-level = <2>;
                 nvidia,hsdiscon-level = <5>;
+                nvidia,has-utmi-pad-registers;
                 status = "disabled";
         };
 
@@ -809,6 +827,8 @@
                          <&tegra_car TEGRA30_CLK_PLL_U>,
                          <&tegra_car TEGRA30_CLK_USBD>;
                 clock-names = "reg", "pll_u", "utmi-pads";
+                resets = <&tegra_car 58>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,hssync-start-delay = <9>;
                 nvidia,idle-wait-delay = <17>;
                 nvidia,elastic-limit = <16>;
@@ -843,6 +863,8 @@
                          <&tegra_car TEGRA30_CLK_PLL_U>,
                          <&tegra_car TEGRA30_CLK_USBD>;
                 clock-names = "reg", "pll_u", "utmi-pads";
+                resets = <&tegra_car 59>, <&tegra_car 22>;
+                reset-names = "usb", "utmi-pads";
                 nvidia,hssync-start-delay = <0>;
                 nvidia,idle-wait-delay = <17>;
                 nvidia,elastic-limit = <16>;
diff --git a/arch/arm/boot/dts/tny_a9260_common.dtsi b/arch/arm/boot/dts/tny_a9260_common.dtsi
index 0e6d3de2e09e..ce7138c3af1b 100644
--- a/arch/arm/boot/dts/tny_a9260_common.dtsi
+++ b/arch/arm/boot/dts/tny_a9260_common.dtsi
@@ -24,6 +24,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/tny_a9263.dts b/arch/arm/boot/dts/tny_a9263.dts
index 0751a6a979a8..3043296345b7 100644
--- a/arch/arm/boot/dts/tny_a9263.dts
+++ b/arch/arm/boot/dts/tny_a9263.dts
@@ -29,6 +29,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/usb_a9260_common.dtsi b/arch/arm/boot/dts/usb_a9260_common.dtsi
index 285977682cf3..12edafefd44a 100644
--- a/arch/arm/boot/dts/usb_a9260_common.dtsi
+++ b/arch/arm/boot/dts/usb_a9260_common.dtsi
@@ -16,6 +16,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/usb_a9263.dts b/arch/arm/boot/dts/usb_a9263.dts
index 290e60383baf..68c0de36c339 100644
--- a/arch/arm/boot/dts/usb_a9263.dts
+++ b/arch/arm/boot/dts/usb_a9263.dts
@@ -29,6 +29,14 @@
                         compatible = "atmel,osc", "fixed-clock";
                         clock-frequency = <12000000>;
                 };
+
+                slow_xtal {
+                        clock-frequency = <32768>;
+                };
+
+                main_xtal {
+                        clock-frequency = <12000000>;
+                };
         };
 
         ahb {
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index e01e5a081def..27d0d9c8adf3 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -15,10 +15,49 @@
                 i2c0 = &i2c0;
         };
 
+        chosen {
+                stdout-path = &uart0;
+        };
+
         memory {
                 reg = <0x0 0x08000000>;
         };
 
+        xtal24mhz: xtal24mhz@24M {
+                #clock-cells = <0>;
+                compatible = "fixed-clock";
+                clock-frequency = <24000000>;
+        };
+
+        core-module@10000000 {
+                compatible = "arm,core-module-versatile", "syscon";
+                reg = <0x10000000 0x200>;
+
+                /* OSC1 on AB, OSC4 on PB */
+                osc1: cm_aux_osc@24M {
+                        #clock-cells = <0>;
+                        compatible = "arm,versatile-cm-auxosc";
+                        clocks = <&xtal24mhz>;
+                };
+
+                /* The timer clock is the 24 MHz oscillator divided to 1MHz */
+                timclk: timclk@1M {
+                        #clock-cells = <0>;
+                        compatible = "fixed-factor-clock";
+                        clock-div = <24>;
+                        clock-mult = <1>;
+                        clocks = <&xtal24mhz>;
+                };
+
+                pclk: pclk@24M {
+                        #clock-cells = <0>;
+                        compatible = "fixed-factor-clock";
+                        clock-div = <1>;
+                        clock-mult = <1>;
+                        clocks = <&xtal24mhz>;
+                };
+        };
+
         flash@34000000 {
                 compatible = "arm,versatile-flash";
                 reg = <0x34000000 0x4000000>;
@@ -59,6 +98,8 @@
                         interrupt-controller;
                         #interrupt-cells = <1>;
                         reg = <0x10140000 0x1000>;
+                        clear-mask = <0xffffffff>;
+                        valid-mask = <0xffffffff>;
                 };
 
                 sic: intc@10003000 {
@@ -68,69 +109,93 @@
                         reg = <0x10003000 0x1000>;
                         interrupt-parent = <&vic>;
                         interrupts = <31>; /* Cascaded to vic */
+                        clear-mask = <0xffffffff>;
+                        valid-mask = <0xffc203f8>;
                 };
 
                 dma@10130000 {
                         compatible = "arm,pl081", "arm,primecell";
                         reg = <0x10130000 0x1000>;
                         interrupts = <17>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 uart0: uart@101f1000 {
                         compatible = "arm,pl011", "arm,primecell";
                         reg = <0x101f1000 0x1000>;
                         interrupts = <12>;
+                        clocks = <&xtal24mhz>, <&pclk>;
+                        clock-names = "uartclk", "apb_pclk";
                 };
 
                 uart1: uart@101f2000 {
                         compatible = "arm,pl011", "arm,primecell";
                         reg = <0x101f2000 0x1000>;
                         interrupts = <13>;
+                        clocks = <&xtal24mhz>, <&pclk>;
+                        clock-names = "uartclk", "apb_pclk";
                 };
 
                 uart2: uart@101f3000 {
                         compatible = "arm,pl011", "arm,primecell";
                         reg = <0x101f3000 0x1000>;
                         interrupts = <14>;
+                        clocks = <&xtal24mhz>, <&pclk>;
+                        clock-names = "uartclk", "apb_pclk";
                 };
 
                 smc@10100000 {
                         compatible = "arm,primecell";
                         reg = <0x10100000 0x1000>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 mpmc@10110000 {
                         compatible = "arm,primecell";
                         reg = <0x10110000 0x1000>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 display@10120000 {
                         compatible = "arm,pl110", "arm,primecell";
                         reg = <0x10120000 0x1000>;
                         interrupts = <16>;
+                        clocks = <&osc1>, <&pclk>;
+                        clock-names = "clcd", "apb_pclk";
                 };
 
                 sctl@101e0000 {
                         compatible = "arm,primecell";
                         reg = <0x101e0000 0x1000>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 watchdog@101e1000 {
                         compatible = "arm,primecell";
                         reg = <0x101e1000 0x1000>;
                         interrupts = <0>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 timer@101e2000 {
                         compatible = "arm,sp804", "arm,primecell";
                         reg = <0x101e2000 0x1000>;
                         interrupts = <4>;
+                        clocks = <&timclk>, <&timclk>, <&pclk>;
+                        clock-names = "timer0", "timer1", "apb_pclk";
                 };
 
                 timer@101e3000 {
                         compatible = "arm,sp804", "arm,primecell";
                         reg = <0x101e3000 0x1000>;
                         interrupts = <5>;
+                        clocks = <&timclk>, <&timclk>, <&pclk>;
+                        clock-names = "timer0", "timer1", "apb_pclk";
                 };
 
                 gpio0: gpio@101e4000 {
@@ -141,6 +206,8 @@
                         #gpio-cells = <2>;
                         interrupt-controller;
                         #interrupt-cells = <2>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 gpio1: gpio@101e5000 {
@@ -151,24 +218,32 @@
                         #gpio-cells = <2>;
                         interrupt-controller;
                         #interrupt-cells = <2>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 rtc@101e8000 {
                         compatible = "arm,pl030", "arm,primecell";
                         reg = <0x101e8000 0x1000>;
                         interrupts = <10>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 sci@101f0000 {
                         compatible = "arm,primecell";
                         reg = <0x101f0000 0x1000>;
                         interrupts = <15>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 ssp@101f4000 {
                         compatible = "arm,pl022", "arm,primecell";
                         reg = <0x101f4000 0x1000>;
                         interrupts = <11>;
+                        clocks = <&xtal24mhz>, <&pclk>;
+                        clock-names = "SSPCLK", "apb_pclk";
                 };
 
                 fpga {
@@ -181,23 +256,31 @@
                                 compatible = "arm,primecell";
                                 reg = <0x4000 0x1000>;
                                 interrupts = <24>;
+                                clocks = <&pclk>;
+                                clock-names = "apb_pclk";
                         };
                         mmc@5000 {
-                                compatible = "arm,primecell";
+                                compatible = "arm,pl180", "arm,primecell";
                                 reg = < 0x5000 0x1000>;
                                 interrupts-extended = <&vic 22 &sic 2>;
+                                clocks = <&xtal24mhz>, <&pclk>;
+                                clock-names = "mclk", "apb_pclk";
                         };
                         kmi@6000 {
                                 compatible = "arm,pl050", "arm,primecell";
                                 reg = <0x6000 0x1000>;
                                 interrupt-parent = <&sic>;
                                 interrupts = <3>;
+                                clocks = <&xtal24mhz>, <&pclk>;
+                                clock-names = "KMIREFCLK", "apb_pclk";
                         };
                         kmi@7000 {
                                 compatible = "arm,pl050", "arm,primecell";
                                 reg = <0x7000 0x1000>;
                                 interrupt-parent = <&sic>;
                                 interrupts = <4>;
+                                clocks = <&xtal24mhz>, <&pclk>;
+                                clock-names = "KMIREFCLK", "apb_pclk";
                         };
                 };
         };
diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
index 65f657711323..e36c1e82fea7 100644
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -13,6 +13,8 @@
                         #gpio-cells = <2>;
                         interrupt-controller;
                         #interrupt-cells = <2>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 gpio3: gpio@101e7000 {
@@ -23,6 +25,8 @@
                         #gpio-cells = <2>;
                         interrupt-controller;
                         #interrupt-cells = <2>;
+                        clocks = <&pclk>;
+                        clock-names = "apb_pclk";
                 };
 
                 fpga {
@@ -31,20 +35,24 @@
                                 reg = <0x9000 0x1000>;
                                 interrupt-parent = <&sic>;
                                 interrupts = <6>;
+                                clocks = <&xtal24mhz>, <&pclk>;
+                                clock-names = "uartclk", "apb_pclk";
                         };
                         sci@a000 {
                                 compatible = "arm,primecell";
                                 reg = <0xa000 0x1000>;
                                 interrupt-parent = <&sic>;
                                 interrupts = <5>;
+                                clocks = <&xtal24mhz>;
+                                clock-names = "apb_pclk";
                         };
                         mmc@b000 {
-                                compatible = "arm,primecell";
+                                compatible = "arm,pl180", "arm,primecell";
                                 reg = <0xb000 0x1000>;
                                 interrupts-extended = <&vic 23 &sic 2>;
+                                clocks = <&xtal24mhz>, <&pclk>;
+                                clock-names = "mclk", "apb_pclk";
                         };
                 };
         };
 };
-
-#include <testcases.dtsi>
diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi
index 6cc314e7b8fb..583dd363c9dc 100644
--- a/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@ -14,6 +14,8 @@
 
 / {
         aliases {
+                can0 = &can0;
+                can1 = &can1;
                 serial0 = &uart0;
                 serial1 = &uart1;
                 serial2 = &uart2;
@@ -103,6 +105,16 @@
                                         <&clks VF610_CLK_DMAMUX1>;
                         };
 
+                        can0: flexcan@40020000 {
+                                compatible = "fsl,vf610-flexcan";
+                                reg = <0x40020000 0x4000>;
+                                interrupts = <0 58 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks VF610_CLK_FLEXCAN0>,
+                                         <&clks VF610_CLK_FLEXCAN0>;
+                                clock-names = "ipg", "per";
+                                status = "disabled";
+                        };
+
                         uart0: serial@40027000 {
                                 compatible = "fsl,vf610-lpuart";
                                 reg = <0x40027000 0x1000>;
@@ -362,7 +374,7 @@
 
                         esdhc1: esdhc@400b2000 {
                                 compatible = "fsl,imx53-esdhc";
-                                reg = <0x400b2000 0x4000>;
+                                reg = <0x400b2000 0x1000>;
                                 interrupts = <0 28 0x04>;
                                 clocks = <&clks VF610_CLK_IPG_BUS>,
                                         <&clks VF610_CLK_PLATFORM_BUS>,
@@ -405,6 +417,17 @@
                                 clock-names = "ipg", "ahb", "ptp";
                                 status = "disabled";
                         };
+
+                        can1: flexcan@400d4000 {
+                                compatible = "fsl,vf610-flexcan";
+                                reg = <0x400d4000 0x4000>;
+                                interrupts = <0 59 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&clks VF610_CLK_FLEXCAN1>,
+                                         <&clks VF610_CLK_FLEXCAN1>;
+                                clock-names = "ipg", "per";
+                                status = "disabled";
+                        };
+
                 };
         };
 };
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 760bbc463c5b..6cc83d4c6c76 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -65,6 +65,48 @@
                 interrupt-parent = <&intc>;
                 ranges;
 
+                adc@f8007100 {
+                        compatible = "xlnx,zynq-xadc-1.00.a";
+                        reg = <0xf8007100 0x20>;
+                        interrupts = <0 7 4>;
+                        interrupt-parent = <&intc>;
+                        clocks = <&clkc 12>;
+                };
+
+                can0: can@e0008000 {
+                        compatible = "xlnx,zynq-can-1.0";
+                        status = "disabled";
+                        clocks = <&clkc 19>, <&clkc 36>;
+                        clock-names = "can_clk", "pclk";
+                        reg = <0xe0008000 0x1000>;
+                        interrupts = <0 28 4>;
+                        interrupt-parent = <&intc>;
+                        tx-fifo-depth = <0x40>;
+                        rx-fifo-depth = <0x40>;
+                };
+
+                can1: can@e0009000 {
+                        compatible = "xlnx,zynq-can-1.0";
+                        status = "disabled";
+                        clocks = <&clkc 20>, <&clkc 37>;
+                        clock-names = "can_clk", "pclk";
+                        reg = <0xe0009000 0x1000>;
+                        interrupts = <0 51 4>;
+                        interrupt-parent = <&intc>;
+                        tx-fifo-depth = <0x40>;
+                        rx-fifo-depth = <0x40>;
+                };
+
+                gpio0: gpio@e000a000 {
+                        compatible = "xlnx,zynq-gpio-1.0";
+                        #gpio-cells = <2>;
+                        clocks = <&clkc 42>;
+                        gpio-controller;
+                        interrupt-parent = <&intc>;
+                        interrupts = <0 20 4>;
+                        reg = <0xe000a000 0x1000>;
+                };
+
                 i2c0: i2c@e0004000 {
                         compatible = "cdns,i2c-r1p10";
                         status = "disabled";
@@ -105,23 +147,47 @@
                 };
 
                 uart0: serial@e0000000 {
-                        compatible = "xlnx,xuartps";
+                        compatible = "xlnx,xuartps", "cdns,uart-r1p8";
                         status = "disabled";
                         clocks = <&clkc 23>, <&clkc 40>;
-                        clock-names = "ref_clk", "aper_clk";
+                        clock-names = "uart_clk", "pclk";
                         reg = <0xE0000000 0x1000>;
                         interrupts = <0 27 4>;
                 };
 
                 uart1: serial@e0001000 {
-                        compatible = "xlnx,xuartps";
+                        compatible = "xlnx,xuartps", "cdns,uart-r1p8";
                         status = "disabled";
                         clocks = <&clkc 24>, <&clkc 41>;
-                        clock-names = "ref_clk", "aper_clk";
+                        clock-names = "uart_clk", "pclk";
                         reg = <0xE0001000 0x1000>;
                         interrupts = <0 50 4>;
                 };
 
+                spi0: spi@e0006000 {
+                        compatible = "xlnx,zynq-spi-r1p6";
+                        reg = <0xe0006000 0x1000>;
+                        status = "disabled";
+                        interrupt-parent = <&intc>;
+                        interrupts = <0 26 4>;
+                        clocks = <&clkc 25>, <&clkc 34>;
+                        clock-names = "ref_clk", "pclk";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                spi1: spi@e0007000 {
+                        compatible = "xlnx,zynq-spi-r1p6";
+                        reg = <0xe0007000 0x1000>;
+                        status = "disabled";
+                        interrupt-parent = <&intc>;
+                        interrupts = <0 49 4>;
+                        clocks = <&clkc 26>, <&clkc 35>;
+                        clock-names = "ref_clk", "pclk";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
                 gem0: ethernet@e000b000 {
                         compatible = "cdns,gem";
                         reg = <0xe000b000 0x4000>;
@@ -186,6 +252,22 @@
                         };
                 };
 
+                dmac_s: dmac@f8003000 {
+                        compatible = "arm,pl330", "arm,primecell";
+                        reg = <0xf8003000 0x1000>;
+                        interrupt-parent = <&intc>;
+                        interrupts = <0 13 4>,
+                                     <0 14 4>, <0 15 4>,
+                                     <0 16 4>, <0 17 4>,
+                                     <0 40 4>, <0 41 4>,
+                                     <0 42 4>, <0 43 4>;
+                        #dma-cells = <1>;
+                        #dma-channels = <8>;
+                        #dma-requests = <4>;
+                        clocks = <&clkc 27>;
+                        clock-names = "apb_pclk";
+                };
+
                 devcfg: devcfg@f8007000 {
                         compatible = "xlnx,zynq-devcfg-1.0";
                         reg = <0xf8007000 0x100>;
diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
new file mode 100644
index 000000000000..41afd9da6876
--- /dev/null
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2014 SUSE LINUX Products GmbH
+ *
+ * Derived from zynq-zed.dts:
+ *
+ *  Copyright (C) 2011 Xilinx
+ *  Copyright (C) 2012 National Instruments Corp.
+ *  Copyright (C) 2013 Xilinx
+ *
+ * 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.
+ */
+/dts-v1/;
+/include/ "zynq-7000.dtsi"
+
+/ {
+        model = "Adapteva Parallella Board";
+        compatible = "adapteva,parallella", "xlnx,zynq-7000";
+
+        memory {
+                device_type = "memory";
+                reg = <0 0x40000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait";
+                linux,stdout-path = "/amba/serial@e0001000";
+        };
+};
+
+&gem0 {
+        status = "okay";
+        phy-mode = "rgmii-id";
+        phy-handle = <&ethernet_phy>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        ethernet_phy: ethernet-phy@0 {
+                /* Marvell 88E1318 */
+                compatible = "ethernet-phy-id0141.0e90",
+                             "ethernet-phy-ieee802.3-c22";
+                reg = <0>;
+                marvell,reg-init = <0x3 0x10 0xff00 0x1e>,
+                                   <0x3 0x11 0xfff0 0xa>;
+        };
+};
+
+&i2c0 {
+        status = "okay";
+};
+
+&sdhci1 {
+        status = "okay";
+};
+
+&uart1 {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index 5e09cee33d42..835c3089c61c 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -29,6 +29,10 @@
 
 };
 
+&can0 {
+        status = "okay";
+};
+
 &gem0 {
         status = "okay";
         phy-mode = "rgmii";
diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c
index 490f3dced749..6eaddc47c43d 100644
--- a/arch/arm/common/bL_switcher.c
+++ b/arch/arm/common/bL_switcher.c
@@ -58,16 +58,6 @@ static int read_mpidr(void)
 }
 
 /*
- * Get a global nanosecond time stamp for tracing.
- */
-static s64 get_ns(void)
-{
-        struct timespec ts;
-        getnstimeofday(&ts);
-        return timespec_to_ns(&ts);
-}
-
-/*
  * bL switcher core code.
  */
 
@@ -224,7 +214,7 @@ static int bL_switch_to(unsigned int new_cluster_id)
          */
         local_irq_disable();
         local_fiq_disable();
-        trace_cpu_migrate_begin(get_ns(), ob_mpidr);
+        trace_cpu_migrate_begin(ktime_get_real_ns(), ob_mpidr);
 
         /* redirect GIC's SGIs to our counterpart */
         gic_migrate_target(bL_gic_id[ib_cpu][ib_cluster]);
@@ -267,7 +257,7 @@ static int bL_switch_to(unsigned int new_cluster_id)
                                           tdev->evtdev->next_event, 1);
         }
 
-        trace_cpu_migrate_finish(get_ns(), ib_mpidr);
+        trace_cpu_migrate_finish(ktime_get_real_ns(), ib_mpidr);
         local_fiq_enable();
         local_irq_enable();
 
@@ -558,7 +548,7 @@ int bL_switcher_get_logical_index(u32 mpidr)
 
 static void bL_switcher_trace_trigger_cpu(void *__always_unused info)
 {
-        trace_cpu_migrate_current(get_ns(), read_mpidr());
+        trace_cpu_migrate_current(ktime_get_real_ns(), read_mpidr());
 }
 
 int bL_switcher_trace_trigger(void)
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 485be42519b9..88099175fc56 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -1414,6 +1414,34 @@ void edma_clear_event(unsigned channel)
 }
 EXPORT_SYMBOL(edma_clear_event);
 
+/*
+ * edma_assign_channel_eventq - move given channel to desired eventq
+ * Arguments:
+ *      channel - channel number
+ *      eventq_no - queue to move the channel
+ *
+ * Can be used to move a channel to a selected event queue.
+ */
+void edma_assign_channel_eventq(unsigned channel, enum dma_event_q eventq_no)
+{
+        unsigned ctlr;
+
+        ctlr = EDMA_CTLR(channel);
+        channel = EDMA_CHAN_SLOT(channel);
+
+        if (channel >= edma_cc[ctlr]->num_channels)
+                return;
+
+        /* default to low priority queue */
+        if (eventq_no == EVENTQ_DEFAULT)
+                eventq_no = edma_cc[ctlr]->default_queue;
+        if (eventq_no >= edma_cc[ctlr]->num_tc)
+                return;
+
+        map_dmach_queue(ctlr, channel, eventq_no);
+}
+EXPORT_SYMBOL(edma_assign_channel_eventq);
+
 static int edma_setup_from_hw(struct device *dev, struct edma_soc_info *pdata,
                               struct edma *edma_cc)
 {
@@ -1470,7 +1498,8 @@ static int edma_setup_from_hw(struct device *dev, struct edma_soc_info *pdata,
         queue_priority_map[i][1] = -1;
 
         pdata->queue_priority_mapping = queue_priority_map;
-        pdata->default_queue = 0;
+        /* Default queue has the lowest priority */
+        pdata->default_queue = i - 1;
 
         return 0;
 }
diff --git a/arch/arm/common/mcpm_entry.c b/arch/arm/common/mcpm_entry.c
index f91136ab447e..3c165fc2dce2 100644
--- a/arch/arm/common/mcpm_entry.c
+++ b/arch/arm/common/mcpm_entry.c
@@ -12,11 +12,13 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/irqflags.h>
+#include <linux/cpu_pm.h>
 
 #include <asm/mcpm.h>
 #include <asm/cacheflush.h>
 #include <asm/idmap.h>
 #include <asm/cputype.h>
+#include <asm/suspend.h>
 
 extern unsigned long mcpm_entry_vectors[MAX_NR_CLUSTERS][MAX_CPUS_PER_CLUSTER];
 
@@ -146,6 +148,56 @@ int mcpm_cpu_powered_up(void)
         return 0;
 }
 
+#ifdef CONFIG_ARM_CPU_SUSPEND
+
+static int __init nocache_trampoline(unsigned long _arg)
+{
+        void (*cache_disable)(void) = (void *)_arg;
+        unsigned int mpidr = read_cpuid_mpidr();
+        unsigned int cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+        unsigned int cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+        phys_reset_t phys_reset;
+
+        mcpm_set_entry_vector(cpu, cluster, cpu_resume);
+        setup_mm_for_reboot();
+
+        __mcpm_cpu_going_down(cpu, cluster);
+        BUG_ON(!__mcpm_outbound_enter_critical(cpu, cluster));
+        cache_disable();
+        __mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN);
+        __mcpm_cpu_down(cpu, cluster);
+
+        phys_reset = (phys_reset_t)(unsigned long)virt_to_phys(cpu_reset);
+        phys_reset(virt_to_phys(mcpm_entry_point));
+        BUG();
+}
+
+int __init mcpm_loopback(void (*cache_disable)(void))
+{
+        int ret;
+
+        /*
+         * We're going to soft-restart the current CPU through the
+         * low-level MCPM code by leveraging the suspend/resume
+         * infrastructure. Let's play it safe by using cpu_pm_enter()
+         * in case the CPU init code path resets the VFP or similar.
+         */
+        local_irq_disable();
+        local_fiq_disable();
+        ret = cpu_pm_enter();
+        if (!ret) {
+                ret = cpu_suspend((unsigned long)cache_disable, nocache_trampoline);
+                cpu_pm_exit();
+        }
+        local_fiq_enable();
+        local_irq_enable();
+        if (ret)
+                pr_err("%s returned %d\n", __func__, ret);
+        return ret;
+}
+
+#endif
+
 struct sync_struct mcpm_sync;
 
 /*
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c
index fd6bff0c5b96..19211324772f 100644
--- a/arch/arm/common/timer-sp.c
+++ b/arch/arm/common/timer-sp.c
@@ -233,13 +233,13 @@ static void __init sp804_of_init(struct device_node *np)
         if (IS_ERR(clk1))
                 clk1 = NULL;
 
-        /* Get the 2nd clock if the timer has 2 timer clocks */
+        /* Get the 2nd clock if the timer has 3 timer clocks */
         if (of_count_phandle_with_args(np, "clocks", "#clock-cells") == 3) {
                 clk2 = of_clk_get(np, 1);
                 if (IS_ERR(clk2)) {
                         pr_err("sp804: %s clock not found: %d\n", np->name,
                                 (int)PTR_ERR(clk2));
-                        goto err;
+                        clk2 = NULL;
                 }
         } else
                 clk2 = clk1;
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index 065adddeee3e..d9675c68a399 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -96,6 +96,7 @@ CONFIG_I2C_GPIO=y
 CONFIG_I2C_SH_MOBILE=y
 # CONFIG_HWMON is not set
 CONFIG_REGULATOR=y
+CONFIG_REGULATOR_GPIO=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
@@ -127,6 +128,9 @@ CONFIG_USB_ETH=m
 CONFIG_MMC=y
 CONFIG_MMC_SDHI=y
 CONFIG_MMC_SH_MMCIF=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_S35390A=y
 CONFIG_DMADEVICES=y
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 4bf72264b175..fbebcbce1e8c 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -27,6 +27,7 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BCM_MOBILE=y
 CONFIG_ARM_THUMBEE=y
+CONFIG_SMP=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_COMPACTION is not set
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index e07a227ec0db..fc7d1683bf67 100644
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -8,15 +8,17 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_EXYNOS=y
-CONFIG_S3C_LOWLEVEL_UART_PORT=3
-CONFIG_S3C24XX_PWM=y
-CONFIG_ARCH_EXYNOS5=y
-CONFIG_MACH_EXYNOS4_DT=y
+CONFIG_ARCH_EXYNOS3=y
+CONFIG_EXYNOS5420_MCPM=y
 CONFIG_SMP=y
+CONFIG_BIG_LITTLE=y
+CONFIG_BL_SWITCHER=y
+CONFIG_BL_SWITCHER_DUMMY_IF=y
 CONFIG_NR_CPUS=8
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
+CONFIG_CMA=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
@@ -24,6 +26,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=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_PM_RUNTIME=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -34,6 +37,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_PROC_DEVICETREE=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=y
 CONFIG_BLK_DEV_RAM=y
@@ -66,11 +71,22 @@ CONFIG_I2C=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_ARB_GPIO_CHALLENGE=y
 CONFIG_I2C_EXYNOS5=y
+CONFIG_I2C_CROS_EC_TUNNEL=y
+CONFIG_SPI=y
+CONFIG_SPI_S3C64XX=y
 CONFIG_I2C_S3C2410=y
 CONFIG_DEBUG_GPIO=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_CHARGER_TPS65090=y
 # CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_EXYNOS_THERMAL=y
+CONFIG_EXYNOS_THERMAL_CORE=y
+CONFIG_WATCHDOG=y
+CONFIG_S3C2410_WATCHDOG=y
 CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_CROS_EC_I2C=y
+CONFIG_MFD_CROS_EC_SPI=y
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX8997=y
 CONFIG_MFD_SEC_CORE=y
@@ -80,6 +96,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_MAX8997=y
 CONFIG_REGULATOR_MAX77686=y
+CONFIG_REGULATOR_S2MPA01=y
 CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_REGULATOR_TPS65090=y
@@ -88,28 +105,50 @@ CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_SIMPLE=y
 CONFIG_EXYNOS_VIDEO=y
 CONFIG_EXYNOS_MIPI_DSI=y
-CONFIG_EXYNOS_DP=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FONTS=y
 CONFIG_FONT_7x14=y
 CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_SAMSUNG=y
+CONFIG_SND_SOC_SNOW=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_EXYNOS=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_EXYNOS=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_DWC3=y
-CONFIG_USB_PHY=y
-CONFIG_SAMSUNG_USB2PHY=y
-CONFIG_SAMSUNG_USB3PHY=y
+CONFIG_USB_HSIC_USB3503=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_S3C=y
+CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_IDMAC=y
 CONFIG_MMC_DW_EXYNOS=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_S5M=y
 CONFIG_RTC_DRV_S3C=y
+CONFIG_DMADEVICES=y
+CONFIG_PL330_DMA=y
 CONFIG_COMMON_CLK_MAX77686=y
+CONFIG_COMMON_CLK_S2MPS11=y
+CONFIG_EXYNOS_IOMMU=y
+CONFIG_IIO=y
+CONFIG_EXYNOS_ADC=y
+CONFIG_PWM=y
+CONFIG_PWM_SAMSUNG=y
+CONFIG_PHY_EXYNOS5250_SATA=y
+CONFIG_PHY_SAMSUNG_USB2=y
+CONFIG_PHY_EXYNOS4210_USB2=y
+CONFIG_PHY_EXYNOS4X12_USB2=y
+CONFIG_PHY_EXYNOS5250_USB2=y
+CONFIG_PHY_EXYNOS5_USBDRD=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT4_FS=y
@@ -123,6 +162,7 @@ CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig
deleted file mode 100644
index d238fafb6762..000000000000
--- a/arch/arm/configs/genmai_defconfig
+++ /dev/null
@@ -1,122 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-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_LEGACY=y
-CONFIG_ARCH_R7S72100=y
-CONFIG_MACH_GENMAI=y
-# CONFIG_SH_TIMER_CMT is not set
-# CONFIG_SH_TIMER_MTU2 is not set
-# CONFIG_SH_TIMER_TMU is not set
-# 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_743622=y
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_FORCE_MAX_ZONEORDER=13
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_KEXEC=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
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=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_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_EEPROM_AT24=y
-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_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_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# 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_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=10
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_RIIC=y
-CONFIG_SPI=y
-CONFIG_SPI_RSPI=y
-# CONFIG_HWMON is not set
-CONFIG_THERMAL=y
-CONFIG_RCAR_THERMAL=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_DRM=y
-CONFIG_DRM_RCAR_DU=y
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_SDHI=y
-CONFIG_MMC_SH_MMCIF=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=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_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/hi3xxx_defconfig b/arch/arm/configs/hi3xxx_defconfig
index f186bdfa2369..9630687e7d07 100644
--- a/arch/arm/configs/hi3xxx_defconfig
+++ b/arch/arm/configs/hi3xxx_defconfig
@@ -3,7 +3,9 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_RD_LZMA=y
+CONFIG_ARCH_HISI=y
 CONFIG_ARCH_HI3xxx=y
+CONFIG_ARCH_HIX5HD2=y
 CONFIG_SMP=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index bada59d93b67..63bde0efc041 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -1,6 +1,7 @@
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=14
@@ -35,10 +36,8 @@ CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y
 CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y
 CONFIG_MACH_MX27_3DS=y
 CONFIG_MACH_IMX27_VISSTRIM_M10=y
-CONFIG_MACH_IMX27LITE=y
 CONFIG_MACH_PCA100=y
 CONFIG_MACH_MXT_TD60=y
-CONFIG_MACH_IMX27IPCAM=y
 CONFIG_MACH_IMX27_DT=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
@@ -159,6 +158,8 @@ CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 59b7e45142d8..16cfec4385c8 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -1,5 +1,6 @@
 CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
+CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_LOG_BUF_SHIFT=18
@@ -31,11 +32,12 @@ CONFIG_MACH_IMX35_DT=y
 CONFIG_MACH_PCM043=y
 CONFIG_MACH_MX35_3DS=y
 CONFIG_MACH_VPR200=y
-CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_VF610=y
 CONFIG_PCI=y
 CONFIG_PCI_IMX6=y
@@ -67,6 +69,8 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
 CONFIG_NETFILTER=y
+CONFIG_CAN=y
+CONFIG_CAN_FLEXCAN=y
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_RFKILL=y
@@ -160,6 +164,7 @@ CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MC9S08DZ60=y
+CONFIG_GPIO_STMPE=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_IMX2_WDT=y
@@ -242,6 +247,7 @@ CONFIG_RTC_DRV_SNVS=y
 CONFIG_DMADEVICES=y
 CONFIG_IMX_SDMA=y
 CONFIG_MXS_DMA=y
+CONFIG_FSL_EDMA=y
 CONFIG_STAGING=y
 CONFIG_DRM_IMX=y
 CONFIG_DRM_IMX_FB_HELPER=y
@@ -288,6 +294,7 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_UTF8=y
+CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_SCHED_DEBUG is not set
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
deleted file mode 100644
index b9e480c10b10..000000000000
--- a/arch/arm/configs/kirkwood_defconfig
+++ /dev/null
@@ -1,181 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_KIRKWOOD=y
-CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_NET2BIG_V2=y
-CONFIG_MACH_NET5BIG_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_T5325=y
-CONFIG_MACH_TS219=y
-CONFIG_MACH_TS41X=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
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_HIGHMEM=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_IDLE=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
-CONFIG_NET_PKTGEN=m
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ORION=y
-CONFIG_MTD_SPI_NOR=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
-CONFIG_CHR_DEV_SG=m
-CONFIG_ATA=y
-CONFIG_SATA_AHCI=y
-CONFIG_SATA_MV=y
-CONFIG_NETDEVICES=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
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_LEGACY_PTY_COUNT=16
-# 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_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MV64XXX=y
-CONFIG_SPI=y
-CONFIG_SPI_ORION=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_SENSORS_ADT7475=y
-CONFIG_SENSORS_LM63=y
-CONFIG_SENSORS_LM75=y
-CONFIG_SENSORS_LM85=y
-CONFIG_THERMAL=y
-CONFIG_WATCHDOG=y
-CONFIG_ORION_WATCHDOG=y
-CONFIG_HID_DRAGONRISE=y
-CONFIG_HID_GYRATION=y
-CONFIG_HID_TWINHAN=y
-CONFIG_HID_NTRIG=y
-CONFIG_HID_PANTHERLORD=y
-CONFIG_HID_PETALYNX=y
-CONFIG_HID_SAMSUNG=y
-CONFIG_HID_SONY=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_GREENASIA=y
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_TOPSEED=y
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_ZEROPLUS=y
-CONFIG_USB=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_PRINTER=m
-CONFIG_USB_STORAGE=y
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_MMC=y
-CONFIG_SDIO_UART=y
-CONFIG_MMC_MVSDIO=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-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
-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
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_CRAMFS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=y
-CONFIG_NLS_UTF8=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_FTRACE is not set
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_MV_CESA=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=y
-CONFIG_LIBCRC32C=y
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig
index 7f52dad97f51..dd18c9e527d6 100644
--- a/arch/arm/configs/msm_defconfig
+++ b/arch/arm/configs/msm_defconfig
@@ -45,7 +45,6 @@ CONFIG_RFKILL=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_CHR_DEV_SCH=y
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index 5ebfa8bf8509..018bef9fa7e8 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_IMX25_DT=y
 CONFIG_MACH_IMX27_DT=y
@@ -94,6 +95,7 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_QNAP=y
 CONFIG_SENSORS_ADT7475=y
+CONFIG_SENSORS_G762=y
 CONFIG_SENSORS_LM63=y
 CONFIG_SENSORS_LM75=y
 CONFIG_SENSORS_LM85=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 534836497998..5fb95fb758d9 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -19,15 +19,18 @@ CONFIG_MACH_DOVE=y
 CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BCM_MOBILE=y
 CONFIG_ARCH_BCM_5301X=y
+CONFIG_ARCH_BRCMSTB=y
 CONFIG_ARCH_BERLIN=y
 CONFIG_MACH_BERLIN_BG2=y
 CONFIG_MACH_BERLIN_BG2CD=y
 CONFIG_MACH_BERLIN_BG2Q=y
 CONFIG_ARCH_HIGHBANK=y
+CONFIG_ARCH_HISI=y
 CONFIG_ARCH_HI3xxx=y
+CONFIG_ARCH_HIX5HD2=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MXC=y
-CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
@@ -66,7 +69,6 @@ CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
-CONFIG_NEON=y
 CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
@@ -83,6 +85,7 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_IDLE=y
+CONFIG_NEON=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -127,6 +130,7 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_ST=y
 CONFIG_AHCI_SUNXI=y
 CONFIG_SATA_HIGHBANK=y
 CONFIG_SATA_MV=y
@@ -134,6 +138,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SUN4I_EMAC=y
 CONFIG_MACB=y
 CONFIG_NET_CALXEDA_XGMAC=y
+CONFIG_IGB=y
 CONFIG_MV643XX_ETH=y
 CONFIG_MVNETA=y
 CONFIG_KS8851=y
@@ -155,8 +160,11 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_TEGRA=y
 CONFIG_KEYBOARD_SPEAR=y
+CONFIG_KEYBOARD_ST_KEYSCAN=y
 CONFIG_KEYBOARD_CROS_EC=y
 CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_STMPE=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MPU3050=y
 CONFIG_SERIO_AMBAKMI=y
@@ -195,6 +203,7 @@ CONFIG_I2C_EXYNOS5=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_SIRF=y
 CONFIG_I2C_TEGRA=y
+CONFIG_I2C_ST=y
 CONFIG_SPI=y
 CONFIG_SPI_OMAP24XX=y
 CONFIG_SPI_ORION=y
@@ -222,8 +231,11 @@ CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_SUN6I=y
 CONFIG_SENSORS_LM90=y
+CONFIG_SENSORS_LM95245=y
 CONFIG_THERMAL=y
 CONFIG_ARMADA_THERMAL=y
+CONFIG_ST_THERMAL_SYSCFG=y
+CONFIG_ST_THERMAL_MEMMAP=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
@@ -233,6 +245,7 @@ CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_CROS_EC_SPI=y
 CONFIG_MFD_MAX8907=y
 CONFIG_MFD_SEC_CORE=y
+CONFIG_MFD_STMPE=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS6586X=y
@@ -311,12 +324,16 @@ CONFIG_MMC_SDHCI_SPEAR=y
 CONFIG_MMC_SDHCI_S3C=y
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_SDHCI_BCM_KONA=y
+CONFIG_MMC_SDHCI_ST=y
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_MVSDIO=y
 CONFIG_MMC_SUNXI=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_EXYNOS=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_PWM=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_EDAC_HIGHBANK_MC=y
@@ -368,6 +385,8 @@ CONFIG_PWM=y
 CONFIG_PWM_TEGRA=y
 CONFIG_PWM_VT8500=y
 CONFIG_OMAP_USB2=y
+CONFIG_TI_PIPE3=y
+CONFIG_PHY_MIPHY365X=y
 CONFIG_PHY_SUN4I_USB=y
 CONFIG_EXT4_FS=y
 CONFIG_VFAT_FS=y
diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
index 27c732fdf21e..22058e18dfaa 100644
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@ -12,6 +12,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 # CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
@@ -19,6 +20,8 @@ CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
@@ -36,6 +39,8 @@ CONFIG_NET_PKTGEN=m
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
@@ -89,6 +94,7 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_QNAP=y
 CONFIG_SENSORS_ADT7475=y
+CONFIG_SENSORS_G762=y
 CONFIG_SENSORS_LM63=y
 CONFIG_SENSORS_LM75=y
 CONFIG_SENSORS_LM85=y
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index b0bfefa23902..fdfda1fa9521 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -29,6 +29,10 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_CPU_IDLE=y
+CONFIG_ARM_MVEBU_V7_CPUIDLE=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPUFREQ_GENERIC=y
 CONFIG_VFP=y
 CONFIG_NET=y
 CONFIG_INET=y
@@ -46,6 +50,7 @@ CONFIG_AHCI_MVEBU=y
 CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
 CONFIG_MVNETA=y
+CONFIG_MVPP2=y
 CONFIG_MARVELL_PHY=y
 CONFIG_MWIFIEX=y
 CONFIG_MWIFIEX_SDIO=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index a9f992335eb2..c7906c2fd645 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SYSVIPC=y
+CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TASKSTATS=y
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index ce541bb3c2de..115cda9f3260 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -26,8 +26,6 @@ CONFIG_ARCH_OMAP=y
 CONFIG_ARCH_OMAP1=y
 CONFIG_OMAP_RESET_CLOCKS=y
 # CONFIG_OMAP_MUX is not set
-CONFIG_MAILBOX=y
-CONFIG_OMAP1_MBOX=y
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_ARCH_OMAP730=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 536a137863cb..f650f00e8cee 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -180,6 +180,7 @@ CONFIG_TWL4030_WATCHDOG=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_TPS65217=y
+CONFIG_MFD_TPS65218=y
 CONFIG_MFD_TPS65910=y
 CONFIG_TWL6040_CORE=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -188,6 +189,7 @@ CONFIG_REGULATOR_TI_ABB=y
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
 CONFIG_REGULATOR_TPS65217=y
+CONFIG_REGULATOR_TPS65218=y
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_PBIAS=y
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index eb4d204bff47..f3142369f594 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -225,7 +225,6 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_PLATFORM=y
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
diff --git a/arch/arm/configs/s5p64x0_defconfig b/arch/arm/configs/s5p64x0_defconfig
deleted file mode 100644
index ad6b61b0bd11..000000000000
--- a/arch/arm/configs/s5p64x0_defconfig
+++ /dev/null
@@ -1,68 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSFS_DEPRECATED_V2=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_S5P64X0=y
-CONFIG_S3C_BOOT_ERROR_RESET=y
-CONFIG_S3C_LOWLEVEL_UART_PORT=1
-CONFIG_MACH_SMDK6440=y
-CONFIG_MACH_SMDK6450=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_CPU_32v6K=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"
-CONFIG_FPE_NWFPE=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-# CONFIG_MISC_DEVICES is not set
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_NR_UARTS=3
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_HW_RANDOM=y
-# CONFIG_HWMON is not set
-CONFIG_DISPLAY_SUPPORT=y
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_INOTIFY=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_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_S3C_UART=1
-CONFIG_CRYPTO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRC_CCITT=y
diff --git a/arch/arm/configs/s5pc100_defconfig b/arch/arm/configs/s5pc100_defconfig
deleted file mode 100644
index 41bafc94dd85..000000000000
--- a/arch/arm/configs/s5pc100_defconfig
+++ /dev/null
@@ -1,49 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSFS_DEPRECATED_V2=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_S5PC100=y
-CONFIG_MACH_SMDKC100=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=cramfs init=/linuxrc console=ttySAC2,115200 mem=128M"
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_EEPROM_AT24=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_MMC=y
-CONFIG_MMC_DEBUG=y
-CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_SDIO_UART=y
-CONFIG_MMC_SDHCI=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_INOTIFY=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_CRAMFS=y
-CONFIG_ROMFS_FS=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_LL=y
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 6d6437cbbc52..3b136144cc83 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -10,16 +10,20 @@ CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
 CONFIG_ARCH_SHMOBILE_MULTI=y
 CONFIG_ARCH_EMEV2=y
+CONFIG_ARCH_R7S72100=y
+CONFIG_ARCH_R8A7779=y
 CONFIG_ARCH_R8A7790=y
 CONFIG_ARCH_R8A7791=y
 CONFIG_MACH_KOELSCH=y
 CONFIG_MACH_LAGER=y
+CONFIG_MACH_MARZEN=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_CPU_BPREDICT_DISABLE=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_ARM_ERRATA_754322=y
 CONFIG_PCI=y
 CONFIG_PCI_RCAR_GEN2=y
+CONFIG_PCI_RCAR_GEN2_PCIE=y
 CONFIG_SMP=y
 CONFIG_SCHED_MC=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
@@ -33,6 +37,7 @@ CONFIG_KEXEC=y
 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_UNIX=y
@@ -82,6 +87,7 @@ CONFIG_I2C_RCAR=y
 CONFIG_SPI=y
 CONFIG_SPI_RSPI=y
 CONFIG_SPI_SH_MSIOF=y
+CONFIG_SPI_SH_HSPI=y
 CONFIG_GPIO_EM=y
 CONFIG_GPIO_RCAR=y
 # CONFIG_HWMON is not set
@@ -109,12 +115,14 @@ CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_RCAR=y
 CONFIG_USB=y
-CONFIG_USB_RCAR_GEN2_PHY=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_RENESAS_USBHS=y
+CONFIG_USB_RCAR_PHY=y
+CONFIG_USB_RCAR_GEN2_PHY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_RENESAS_USBHS_UDC=y
+CONFIG_USB_ETH=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHI=y
 CONFIG_MMC_SH_MMCIF=y
@@ -141,3 +149,16 @@ 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_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_THERMAL=y
+CONFIG_GENERIC_CPUFREQ_CPU0=y
+CONFIG_REGULATOR_DA9210=y
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index e3a05e8801d8..d7a5855a5db8 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -11,6 +11,7 @@ CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
+CONFIG_HOTPLUG=y
 # CONFIG_LBDAF is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
@@ -40,6 +41,15 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
+CONFIG_CAN=y
+CONFIG_CAN_RAW=y
+CONFIG_CAN_BCM=y
+CONFIG_CAN_GW=y
+CONFIG_CAN_DEV=y
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_C_CAN=y
+CONFIG_CAN_C_CAN_PLATFORM=y
+CONFIG_CAN_DEBUG_DEVICES=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_PROC_DEVICETREE=y
@@ -55,6 +65,14 @@ CONFIG_STMMAC_ETH=y
 CONFIG_MICREL_PHY=y
 # CONFIG_STMMAC_PHY_ID_ZERO_WORKAROUND is not set
 CONFIG_INPUT_EVDEV=y
+CONFIG_DWMAC_SOCFPGA=y
+CONFIG_PPS=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_GARP=y
+CONFIG_IPV6=y
 # CONFIG_SERIO_SERPORT is not set
 CONFIG_SERIO_AMBAKMI=y
 CONFIG_LEGACY_PTY_COUNT=16
@@ -63,7 +81,12 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=2
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 CONFIG_SERIAL_8250_DW=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_DWAPB=y
 # CONFIG_RTC_HCTOSYS is not set
+CONFIG_WATCHDOG=y
+CONFIG_DW_WATCHDOG=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
@@ -72,6 +95,7 @@ CONFIG_NFS_FS=y
 CONFIG_ROOT_NFS=y
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY_USER is not set
+CONFIG_FHANDLE=y
 CONFIG_VFAT_FS=y
 CONFIG_NTFS_FS=y
 CONFIG_NTFS_RW=y
@@ -86,5 +110,16 @@ CONFIG_DEBUG_INFO=y
 CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_DEBUG_USER=y
 CONFIG_XZ_DEC=y
+CONFIG_I2C=y
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_CHARDEV=y
 CONFIG_MMC=y
 CONFIG_MMC_DW=y
+CONFIG_PM=y
+CONFIG_SUSPEND=y
+CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_USB=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+CONFIG_USB_DWC2_PLATFORM=y
diff --git a/arch/arm/configs/spear13xx_defconfig b/arch/arm/configs/spear13xx_defconfig
index 82eaa552ed14..d271b263f35d 100644
--- a/arch/arm/configs/spear13xx_defconfig
+++ b/arch/arm/configs/spear13xx_defconfig
@@ -11,13 +11,24 @@ CONFIG_ARCH_SPEAR13XX=y
 CONFIG_MACH_SPEAR1310=y
 CONFIG_MACH_SPEAR1340=y
 # CONFIG_SWP_EMULATE is not set
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCIE_SPEAR13XX=y
 CONFIG_SMP=y
 # CONFIG_SMP_ON_UP is not set
 # CONFIG_ARM_CPU_TOPOLOGY is not set
+CONFIG_AEABI=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_VFP=y
 CONFIG_BINFMT_MISC=y
 CONFIG_NET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_NET_IPIP=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_OF_PARTS=y
@@ -27,6 +38,7 @@ CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_FSMC=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
 # CONFIG_SATA_PMP is not set
 CONFIG_SATA_AHCI_PLATFORM=y
@@ -66,6 +78,7 @@ 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_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SPEAR=y
@@ -79,11 +92,14 @@ CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_SECURITY=y
 CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=y
 CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=m
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
+CONFIG_NFS_FS=y
+CONFIG_ROOT_NFS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=m
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index fb25e2982f64..285c433a9aad 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -23,14 +23,11 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_GPIO_PCA953X=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
-CONFIG_TEGRA_EMC_SCALING_ENABLE=y
-CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_TEGRA=y
@@ -74,9 +71,6 @@ CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_TUNNEL=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_CAN=y
-CONFIG_CAN_RAW=y
-CONFIG_CAN_BCM=y
-CONFIG_CAN_DEV=y
 CONFIG_CAN_MCP251X=y
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
@@ -96,7 +90,6 @@ CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_MTD=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_SPI_NOR=y
-CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_AD525X_DPOT=y
 CONFIG_AD525X_DPOT_I2C=y
@@ -111,6 +104,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
+CONFIG_IGB=y
 CONFIG_R8169=y
 CONFIG_USB_PEGASUS=y
 CONFIG_USB_USBNET=y
@@ -125,6 +119,8 @@ CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_TEGRA=y
 CONFIG_KEYBOARD_CROS_EC=y
 CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_STMPE=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MPU3050=y
 # CONFIG_LEGACY_PTYS is not set
@@ -135,6 +131,7 @@ CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_MUX_PINCTRL=y
 CONFIG_I2C_TEGRA=y
@@ -144,6 +141,7 @@ CONFIG_SPI_TEGRA20_SFLASH=y
 CONFIG_SPI_TEGRA20_SLINK=y
 CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_PALMAS=y
+CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_TPS6586X=y
@@ -155,10 +153,12 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_SENSORS_LM90=y
+CONFIG_SENSORS_LM95245=y
 CONFIG_MFD_AS3722=y
 CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_CROS_EC_SPI=y
 CONFIG_MFD_MAX8907=y
+CONFIG_MFD_STMPE=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS6586X=y
@@ -221,6 +221,7 @@ CONFIG_MMC_SDHCI_TEGRA=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
@@ -291,5 +292,4 @@ CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_CRYPTO_TWOFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_TEGRA_AES=y
 CONFIG_CRC_CCITT=y
diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile
index 81cda39860c5..b48fa341648d 100644
--- a/arch/arm/crypto/Makefile
+++ b/arch/arm/crypto/Makefile
@@ -5,10 +5,14 @@
 obj-$(CONFIG_CRYPTO_AES_ARM) += aes-arm.o
 obj-$(CONFIG_CRYPTO_AES_ARM_BS) += aes-arm-bs.o
 obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o
+obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o
+obj-$(CONFIG_CRYPTO_SHA512_ARM_NEON) += sha512-arm-neon.o
 
 aes-arm-y       := aes-armv4.o aes_glue.o
 aes-arm-bs-y    := aesbs-core.o aesbs-glue.o
 sha1-arm-y      := sha1-armv4-large.o sha1_glue.o
+sha1-arm-neon-y := sha1-armv7-neon.o sha1_neon_glue.o
+sha512-arm-neon-y := sha512-armv7-neon.o sha512_neon_glue.o
 
 quiet_cmd_perl = PERL    $@
       cmd_perl = $(PERL) $(<) > $(@)
diff --git a/arch/arm/crypto/aes-armv4.S b/arch/arm/crypto/aes-armv4.S
index 3a14ea8fe97e..ebb9761fb572 100644
--- a/arch/arm/crypto/aes-armv4.S
+++ b/arch/arm/crypto/aes-armv4.S
@@ -35,6 +35,7 @@
 @ that is being targetted.
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 .text
 
@@ -648,7 +649,7 @@ _armv4_AES_set_encrypt_key:
 
 .Ldone: mov     r0,#0
         ldmia   sp!,{r4-r12,lr}
-.Labrt: mov     pc,lr
+.Labrt: ret     lr
 ENDPROC(private_AES_set_encrypt_key)
 
 .align  5
diff --git a/arch/arm/crypto/sha1-armv7-neon.S b/arch/arm/crypto/sha1-armv7-neon.S
new file mode 100644
index 000000000000..50013c0e2864
--- /dev/null
+++ b/arch/arm/crypto/sha1-armv7-neon.S
@@ -0,0 +1,634 @@
+/* sha1-armv7-neon.S - ARM/NEON accelerated SHA-1 transform function
+ *
+ * Copyright © 2013-2014 Jussi Kivilinna <jussi.kivilinna@iki.fi>
+ *
+ * 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/linkage.h>
+
+
+.syntax unified
+.code   32
+.fpu neon
+
+.text
+
+
+/* Context structure */
+
+#define state_h0 0
+#define state_h1 4
+#define state_h2 8
+#define state_h3 12
+#define state_h4 16
+
+
+/* Constants */
+
+#define K1  0x5A827999
+#define K2  0x6ED9EBA1
+#define K3  0x8F1BBCDC
+#define K4  0xCA62C1D6
+.align 4
+.LK_VEC:
+.LK1:   .long K1, K1, K1, K1
+.LK2:   .long K2, K2, K2, K2
+.LK3:   .long K3, K3, K3, K3
+.LK4:   .long K4, K4, K4, K4
+
+
+/* Register macros */
+
+#define RSTATE r0
+#define RDATA r1
+#define RNBLKS r2
+#define ROLDSTACK r3
+#define RWK lr
+
+#define _a r4
+#define _b r5
+#define _c r6
+#define _d r7
+#define _e r8
+
+#define RT0 r9
+#define RT1 r10
+#define RT2 r11
+#define RT3 r12
+
+#define W0 q0
+#define W1 q1
+#define W2 q2
+#define W3 q3
+#define W4 q4
+#define W5 q5
+#define W6 q6
+#define W7 q7
+
+#define tmp0 q8
+#define tmp1 q9
+#define tmp2 q10
+#define tmp3 q11
+
+#define qK1 q12
+#define qK2 q13
+#define qK3 q14
+#define qK4 q15
+
+
+/* Round function macros. */
+
+#define WK_offs(i) (((i) & 15) * 4)
+
+#define _R_F1(a,b,c,d,e,i,pre1,pre2,pre3,i16,\
+              W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        ldr RT3, [sp, WK_offs(i)]; \
+                pre1(i16,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28); \
+        bic RT0, d, b; \
+        add e, e, a, ror #(32 - 5); \
+        and RT1, c, b; \
+                pre2(i16,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28); \
+        add RT0, RT0, RT3; \
+        add e, e, RT1; \
+        ror b, #(32 - 30); \
+                pre3(i16,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28); \
+        add e, e, RT0;
+
+#define _R_F2(a,b,c,d,e,i,pre1,pre2,pre3,i16,\
+              W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        ldr RT3, [sp, WK_offs(i)]; \
+                pre1(i16,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28); \
+        eor RT0, d, b; \
+        add e, e, a, ror #(32 - 5); \
+        eor RT0, RT0, c; \
+                pre2(i16,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28); \
+        add e, e, RT3; \
+        ror b, #(32 - 30); \
+                pre3(i16,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28); \
+        add e, e, RT0; \
+
+#define _R_F3(a,b,c,d,e,i,pre1,pre2,pre3,i16,\
+              W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        ldr RT3, [sp, WK_offs(i)]; \
+                pre1(i16,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28); \
+        eor RT0, b, c; \
+        and RT1, b, c; \
+        add e, e, a, ror #(32 - 5); \
+                pre2(i16,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28); \
+        and RT0, RT0, d; \
+        add RT1, RT1, RT3; \
+        add e, e, RT0; \
+        ror b, #(32 - 30); \
+                pre3(i16,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28); \
+        add e, e, RT1;
+
+#define _R_F4(a,b,c,d,e,i,pre1,pre2,pre3,i16,\
+              W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        _R_F2(a,b,c,d,e,i,pre1,pre2,pre3,i16,\
+              W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28)
+
+#define _R(a,b,c,d,e,f,i,pre1,pre2,pre3,i16,\
+           W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        _R_##f(a,b,c,d,e,i,pre1,pre2,pre3,i16,\
+               W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28)
+
+#define R(a,b,c,d,e,f,i) \
+        _R_##f(a,b,c,d,e,i,dummy,dummy,dummy,i16,\
+               W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28)
+
+#define dummy(...)
+
+
+/* Input expansion macros. */
+
+/********* Precalc macros for rounds 0-15 *************************************/
+
+#define W_PRECALC_00_15() \
+        add       RWK, sp, #(WK_offs(0));                       \
+        \
+        vld1.32   {tmp0, tmp1}, [RDATA]!;                       \
+        vrev32.8  W0, tmp0;             /* big => little */     \
+        vld1.32   {tmp2, tmp3}, [RDATA]!;                       \
+        vadd.u32  tmp0, W0, curK;                               \
+        vrev32.8  W7, tmp1;             /* big => little */     \
+        vrev32.8  W6, tmp2;             /* big => little */     \
+        vadd.u32  tmp1, W7, curK;                               \
+        vrev32.8  W5, tmp3;             /* big => little */     \
+        vadd.u32  tmp2, W6, curK;                               \
+        vst1.32   {tmp0, tmp1}, [RWK]!;                         \
+        vadd.u32  tmp3, W5, curK;                               \
+        vst1.32   {tmp2, tmp3}, [RWK];                          \
+
+#define WPRECALC_00_15_0(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vld1.32   {tmp0, tmp1}, [RDATA]!;                       \
+
+#define WPRECALC_00_15_1(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        add       RWK, sp, #(WK_offs(0));                       \
+
+#define WPRECALC_00_15_2(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vrev32.8  W0, tmp0;             /* big => little */     \
+
+#define WPRECALC_00_15_3(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vld1.32   {tmp2, tmp3}, [RDATA]!;                       \
+
+#define WPRECALC_00_15_4(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vadd.u32  tmp0, W0, curK;                               \
+
+#define WPRECALC_00_15_5(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vrev32.8  W7, tmp1;             /* big => little */     \
+
+#define WPRECALC_00_15_6(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vrev32.8  W6, tmp2;             /* big => little */     \
+
+#define WPRECALC_00_15_7(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vadd.u32  tmp1, W7, curK;                               \
+
+#define WPRECALC_00_15_8(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vrev32.8  W5, tmp3;             /* big => little */     \
+
+#define WPRECALC_00_15_9(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vadd.u32  tmp2, W6, curK;                               \
+
+#define WPRECALC_00_15_10(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vst1.32   {tmp0, tmp1}, [RWK]!;                         \
+
+#define WPRECALC_00_15_11(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vadd.u32  tmp3, W5, curK;                               \
+
+#define WPRECALC_00_15_12(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vst1.32   {tmp2, tmp3}, [RWK];                          \
+
+
+/********* Precalc macros for rounds 16-31 ************************************/
+
+#define WPRECALC_16_31_0(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        veor      tmp0, tmp0;                   \
+        vext.8    W, W_m16, W_m12, #8;          \
+
+#define WPRECALC_16_31_1(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        add       RWK, sp, #(WK_offs(i));       \
+        vext.8    tmp0, W_m04, tmp0, #4;        \
+
+#define WPRECALC_16_31_2(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        veor      tmp0, tmp0, W_m16;            \
+        veor.32   W, W, W_m08;                  \
+
+#define WPRECALC_16_31_3(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        veor      tmp1, tmp1;                   \
+        veor      W, W, tmp0;                   \
+
+#define WPRECALC_16_31_4(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vshl.u32  tmp0, W, #1;                  \
+
+#define WPRECALC_16_31_5(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vext.8    tmp1, tmp1, W, #(16-12);      \
+        vshr.u32  W, W, #31;                    \
+
+#define WPRECALC_16_31_6(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vorr      tmp0, tmp0, W;                \
+        vshr.u32  W, tmp1, #30;                 \
+
+#define WPRECALC_16_31_7(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vshl.u32  tmp1, tmp1, #2;               \
+
+#define WPRECALC_16_31_8(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        veor      tmp0, tmp0, W;                \
+
+#define WPRECALC_16_31_9(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        veor      W, tmp0, tmp1;                \
+
+#define WPRECALC_16_31_10(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vadd.u32  tmp0, W, curK;                \
+
+#define WPRECALC_16_31_11(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vst1.32   {tmp0}, [RWK];
+
+
+/********* Precalc macros for rounds 32-79 ************************************/
+
+#define WPRECALC_32_79_0(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        veor W, W_m28; \
+
+#define WPRECALC_32_79_1(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vext.8 tmp0, W_m08, W_m04, #8; \
+
+#define WPRECALC_32_79_2(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        veor W, W_m16; \
+
+#define WPRECALC_32_79_3(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        veor W, tmp0; \
+
+#define WPRECALC_32_79_4(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        add RWK, sp, #(WK_offs(i&~3)); \
+
+#define WPRECALC_32_79_5(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vshl.u32 tmp1, W, #2; \
+
+#define WPRECALC_32_79_6(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vshr.u32 tmp0, W, #30; \
+
+#define WPRECALC_32_79_7(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vorr W, tmp0, tmp1; \
+
+#define WPRECALC_32_79_8(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vadd.u32 tmp0, W, curK; \
+
+#define WPRECALC_32_79_9(i,W,W_m04,W_m08,W_m12,W_m16,W_m20,W_m24,W_m28) \
+        vst1.32 {tmp0}, [RWK];
+
+
+/*
+ * Transform nblks*64 bytes (nblks*16 32-bit words) at DATA.
+ *
+ * unsigned int
+ * sha1_transform_neon (void *ctx, const unsigned char *data,
+ *                      unsigned int nblks)
+ */
+.align 3
+ENTRY(sha1_transform_neon)
+  /* input:
+   *    r0: ctx, CTX
+   *    r1: data (64*nblks bytes)
+   *    r2: nblks
+   */
+
+  cmp RNBLKS, #0;
+  beq .Ldo_nothing;
+
+  push {r4-r12, lr};
+  /*vpush {q4-q7};*/
+
+  adr RT3, .LK_VEC;
+
+  mov ROLDSTACK, sp;
+
+  /* Align stack. */
+  sub RT0, sp, #(16*4);
+  and RT0, #(~(16-1));
+  mov sp, RT0;
+
+  vld1.32 {qK1-qK2}, [RT3]!; /* Load K1,K2 */
+
+  /* Get the values of the chaining variables. */
+  ldm RSTATE, {_a-_e};
+
+  vld1.32 {qK3-qK4}, [RT3]; /* Load K3,K4 */
+
+#undef curK
+#define curK qK1
+  /* Precalc 0-15. */
+  W_PRECALC_00_15();
+
+.Loop:
+  /* Transform 0-15 + Precalc 16-31. */
+  _R( _a, _b, _c, _d, _e, F1,  0,
+      WPRECALC_16_31_0, WPRECALC_16_31_1, WPRECALC_16_31_2, 16,
+      W4, W5, W6, W7, W0, _, _, _ );
+  _R( _e, _a, _b, _c, _d, F1,  1,
+      WPRECALC_16_31_3, WPRECALC_16_31_4, WPRECALC_16_31_5, 16,
+      W4, W5, W6, W7, W0, _, _, _ );
+  _R( _d, _e, _a, _b, _c, F1,  2,
+      WPRECALC_16_31_6, WPRECALC_16_31_7, WPRECALC_16_31_8, 16,
+      W4, W5, W6, W7, W0, _, _, _ );
+  _R( _c, _d, _e, _a, _b, F1,  3,
+      WPRECALC_16_31_9, WPRECALC_16_31_10,WPRECALC_16_31_11,16,
+      W4, W5, W6, W7, W0, _, _, _ );
+
+#undef curK
+#define curK qK2
+  _R( _b, _c, _d, _e, _a, F1,  4,
+      WPRECALC_16_31_0, WPRECALC_16_31_1, WPRECALC_16_31_2, 20,
+      W3, W4, W5, W6, W7, _, _, _ );
+  _R( _a, _b, _c, _d, _e, F1,  5,
+      WPRECALC_16_31_3, WPRECALC_16_31_4, WPRECALC_16_31_5, 20,
+      W3, W4, W5, W6, W7, _, _, _ );
+  _R( _e, _a, _b, _c, _d, F1,  6,
+      WPRECALC_16_31_6, WPRECALC_16_31_7, WPRECALC_16_31_8, 20,
+      W3, W4, W5, W6, W7, _, _, _ );
+  _R( _d, _e, _a, _b, _c, F1,  7,
+      WPRECALC_16_31_9, WPRECALC_16_31_10,WPRECALC_16_31_11,20,
+      W3, W4, W5, W6, W7, _, _, _ );
+
+  _R( _c, _d, _e, _a, _b, F1,  8,
+      WPRECALC_16_31_0, WPRECALC_16_31_1, WPRECALC_16_31_2, 24,
+      W2, W3, W4, W5, W6, _, _, _ );
+  _R( _b, _c, _d, _e, _a, F1,  9,
+      WPRECALC_16_31_3, WPRECALC_16_31_4, WPRECALC_16_31_5, 24,
+      W2, W3, W4, W5, W6, _, _, _ );
+  _R( _a, _b, _c, _d, _e, F1, 10,
+      WPRECALC_16_31_6, WPRECALC_16_31_7, WPRECALC_16_31_8, 24,
+      W2, W3, W4, W5, W6, _, _, _ );
+  _R( _e, _a, _b, _c, _d, F1, 11,
+      WPRECALC_16_31_9, WPRECALC_16_31_10,WPRECALC_16_31_11,24,
+      W2, W3, W4, W5, W6, _, _, _ );
+
+  _R( _d, _e, _a, _b, _c, F1, 12,
+      WPRECALC_16_31_0, WPRECALC_16_31_1, WPRECALC_16_31_2, 28,
+      W1, W2, W3, W4, W5, _, _, _ );
+  _R( _c, _d, _e, _a, _b, F1, 13,
+      WPRECALC_16_31_3, WPRECALC_16_31_4, WPRECALC_16_31_5, 28,
+      W1, W2, W3, W4, W5, _, _, _ );
+  _R( _b, _c, _d, _e, _a, F1, 14,
+      WPRECALC_16_31_6, WPRECALC_16_31_7, WPRECALC_16_31_8, 28,
+      W1, W2, W3, W4, W5, _, _, _ );
+  _R( _a, _b, _c, _d, _e, F1, 15,
+      WPRECALC_16_31_9, WPRECALC_16_31_10,WPRECALC_16_31_11,28,
+      W1, W2, W3, W4, W5, _, _, _ );
+
+  /* Transform 16-63 + Precalc 32-79. */
+  _R( _e, _a, _b, _c, _d, F1, 16,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 32,
+      W0, W1, W2, W3, W4, W5, W6, W7);
+  _R( _d, _e, _a, _b, _c, F1, 17,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 32,
+      W0, W1, W2, W3, W4, W5, W6, W7);
+  _R( _c, _d, _e, _a, _b, F1, 18,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 32,
+      W0, W1, W2, W3, W4, W5, W6, W7);
+  _R( _b, _c, _d, _e, _a, F1, 19,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 32,
+      W0, W1, W2, W3, W4, W5, W6, W7);
+
+  _R( _a, _b, _c, _d, _e, F2, 20,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 36,
+      W7, W0, W1, W2, W3, W4, W5, W6);
+  _R( _e, _a, _b, _c, _d, F2, 21,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 36,
+      W7, W0, W1, W2, W3, W4, W5, W6);
+  _R( _d, _e, _a, _b, _c, F2, 22,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 36,
+      W7, W0, W1, W2, W3, W4, W5, W6);
+  _R( _c, _d, _e, _a, _b, F2, 23,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 36,
+      W7, W0, W1, W2, W3, W4, W5, W6);
+
+#undef curK
+#define curK qK3
+  _R( _b, _c, _d, _e, _a, F2, 24,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 40,
+      W6, W7, W0, W1, W2, W3, W4, W5);
+  _R( _a, _b, _c, _d, _e, F2, 25,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 40,
+      W6, W7, W0, W1, W2, W3, W4, W5);
+  _R( _e, _a, _b, _c, _d, F2, 26,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 40,
+      W6, W7, W0, W1, W2, W3, W4, W5);
+  _R( _d, _e, _a, _b, _c, F2, 27,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 40,
+      W6, W7, W0, W1, W2, W3, W4, W5);
+
+  _R( _c, _d, _e, _a, _b, F2, 28,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 44,
+      W5, W6, W7, W0, W1, W2, W3, W4);
+  _R( _b, _c, _d, _e, _a, F2, 29,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 44,
+      W5, W6, W7, W0, W1, W2, W3, W4);
+  _R( _a, _b, _c, _d, _e, F2, 30,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 44,
+      W5, W6, W7, W0, W1, W2, W3, W4);
+  _R( _e, _a, _b, _c, _d, F2, 31,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 44,
+      W5, W6, W7, W0, W1, W2, W3, W4);
+
+  _R( _d, _e, _a, _b, _c, F2, 32,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 48,
+      W4, W5, W6, W7, W0, W1, W2, W3);
+  _R( _c, _d, _e, _a, _b, F2, 33,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 48,
+      W4, W5, W6, W7, W0, W1, W2, W3);
+  _R( _b, _c, _d, _e, _a, F2, 34,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 48,
+      W4, W5, W6, W7, W0, W1, W2, W3);
+  _R( _a, _b, _c, _d, _e, F2, 35,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 48,
+      W4, W5, W6, W7, W0, W1, W2, W3);
+
+  _R( _e, _a, _b, _c, _d, F2, 36,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 52,
+      W3, W4, W5, W6, W7, W0, W1, W2);
+  _R( _d, _e, _a, _b, _c, F2, 37,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 52,
+      W3, W4, W5, W6, W7, W0, W1, W2);
+  _R( _c, _d, _e, _a, _b, F2, 38,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 52,
+      W3, W4, W5, W6, W7, W0, W1, W2);
+  _R( _b, _c, _d, _e, _a, F2, 39,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 52,
+      W3, W4, W5, W6, W7, W0, W1, W2);
+
+  _R( _a, _b, _c, _d, _e, F3, 40,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 56,
+      W2, W3, W4, W5, W6, W7, W0, W1);
+  _R( _e, _a, _b, _c, _d, F3, 41,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 56,
+      W2, W3, W4, W5, W6, W7, W0, W1);
+  _R( _d, _e, _a, _b, _c, F3, 42,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 56,
+      W2, W3, W4, W5, W6, W7, W0, W1);
+  _R( _c, _d, _e, _a, _b, F3, 43,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 56,
+      W2, W3, W4, W5, W6, W7, W0, W1);
+
+#undef curK
+#define curK qK4
+  _R( _b, _c, _d, _e, _a, F3, 44,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 60,
+      W1, W2, W3, W4, W5, W6, W7, W0);
+  _R( _a, _b, _c, _d, _e, F3, 45,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 60,
+      W1, W2, W3, W4, W5, W6, W7, W0);
+  _R( _e, _a, _b, _c, _d, F3, 46,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 60,
+      W1, W2, W3, W4, W5, W6, W7, W0);
+  _R( _d, _e, _a, _b, _c, F3, 47,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 60,
+      W1, W2, W3, W4, W5, W6, W7, W0);
+
+  _R( _c, _d, _e, _a, _b, F3, 48,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 64,
+      W0, W1, W2, W3, W4, W5, W6, W7);
+  _R( _b, _c, _d, _e, _a, F3, 49,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 64,
+      W0, W1, W2, W3, W4, W5, W6, W7);
+  _R( _a, _b, _c, _d, _e, F3, 50,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 64,
+      W0, W1, W2, W3, W4, W5, W6, W7);
+  _R( _e, _a, _b, _c, _d, F3, 51,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 64,
+      W0, W1, W2, W3, W4, W5, W6, W7);
+
+  _R( _d, _e, _a, _b, _c, F3, 52,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 68,
+      W7, W0, W1, W2, W3, W4, W5, W6);
+  _R( _c, _d, _e, _a, _b, F3, 53,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 68,
+      W7, W0, W1, W2, W3, W4, W5, W6);
+  _R( _b, _c, _d, _e, _a, F3, 54,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 68,
+      W7, W0, W1, W2, W3, W4, W5, W6);
+  _R( _a, _b, _c, _d, _e, F3, 55,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 68,
+      W7, W0, W1, W2, W3, W4, W5, W6);
+
+  _R( _e, _a, _b, _c, _d, F3, 56,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 72,
+      W6, W7, W0, W1, W2, W3, W4, W5);
+  _R( _d, _e, _a, _b, _c, F3, 57,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 72,
+      W6, W7, W0, W1, W2, W3, W4, W5);
+  _R( _c, _d, _e, _a, _b, F3, 58,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 72,
+      W6, W7, W0, W1, W2, W3, W4, W5);
+  _R( _b, _c, _d, _e, _a, F3, 59,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 72,
+      W6, W7, W0, W1, W2, W3, W4, W5);
+
+  subs RNBLKS, #1;
+
+  _R( _a, _b, _c, _d, _e, F4, 60,
+      WPRECALC_32_79_0, WPRECALC_32_79_1, WPRECALC_32_79_2, 76,
+      W5, W6, W7, W0, W1, W2, W3, W4);
+  _R( _e, _a, _b, _c, _d, F4, 61,
+      WPRECALC_32_79_3, WPRECALC_32_79_4, WPRECALC_32_79_5, 76,
+      W5, W6, W7, W0, W1, W2, W3, W4);
+  _R( _d, _e, _a, _b, _c, F4, 62,
+      WPRECALC_32_79_6, dummy,            WPRECALC_32_79_7, 76,
+      W5, W6, W7, W0, W1, W2, W3, W4);
+  _R( _c, _d, _e, _a, _b, F4, 63,
+      WPRECALC_32_79_8, dummy,            WPRECALC_32_79_9, 76,
+      W5, W6, W7, W0, W1, W2, W3, W4);
+
+  beq .Lend;
+
+  /* Transform 64-79 + Precalc 0-15 of next block. */
+#undef curK
+#define curK qK1
+  _R( _b, _c, _d, _e, _a, F4, 64,
+      WPRECALC_00_15_0, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _a, _b, _c, _d, _e, F4, 65,
+      WPRECALC_00_15_1, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _e, _a, _b, _c, _d, F4, 66,
+      WPRECALC_00_15_2, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _d, _e, _a, _b, _c, F4, 67,
+      WPRECALC_00_15_3, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+
+  _R( _c, _d, _e, _a, _b, F4, 68,
+      dummy,            dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _b, _c, _d, _e, _a, F4, 69,
+      dummy,            dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _a, _b, _c, _d, _e, F4, 70,
+      WPRECALC_00_15_4, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _e, _a, _b, _c, _d, F4, 71,
+      WPRECALC_00_15_5, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+
+  _R( _d, _e, _a, _b, _c, F4, 72,
+      dummy,            dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _c, _d, _e, _a, _b, F4, 73,
+      dummy,            dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _b, _c, _d, _e, _a, F4, 74,
+      WPRECALC_00_15_6, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _a, _b, _c, _d, _e, F4, 75,
+      WPRECALC_00_15_7, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+
+  _R( _e, _a, _b, _c, _d, F4, 76,
+      WPRECALC_00_15_8, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _d, _e, _a, _b, _c, F4, 77,
+      WPRECALC_00_15_9, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _c, _d, _e, _a, _b, F4, 78,
+      WPRECALC_00_15_10, dummy, dummy, _, _, _, _, _, _, _, _, _ );
+  _R( _b, _c, _d, _e, _a, F4, 79,
+      WPRECALC_00_15_11, dummy, WPRECALC_00_15_12, _, _, _, _, _, _, _, _, _ );
+
+  /* Update the chaining variables. */
+  ldm RSTATE, {RT0-RT3};
+  add _a, RT0;
+  ldr RT0, [RSTATE, #state_h4];
+  add _b, RT1;
+  add _c, RT2;
+  add _d, RT3;
+  add _e, RT0;
+  stm RSTATE, {_a-_e};
+
+  b .Loop;
+
+.Lend:
+  /* Transform 64-79 */
+  R( _b, _c, _d, _e, _a, F4, 64 );
+  R( _a, _b, _c, _d, _e, F4, 65 );
+  R( _e, _a, _b, _c, _d, F4, 66 );
+  R( _d, _e, _a, _b, _c, F4, 67 );
+  R( _c, _d, _e, _a, _b, F4, 68 );
+  R( _b, _c, _d, _e, _a, F4, 69 );
+  R( _a, _b, _c, _d, _e, F4, 70 );
+  R( _e, _a, _b, _c, _d, F4, 71 );
+  R( _d, _e, _a, _b, _c, F4, 72 );
+  R( _c, _d, _e, _a, _b, F4, 73 );
+  R( _b, _c, _d, _e, _a, F4, 74 );
+  R( _a, _b, _c, _d, _e, F4, 75 );
+  R( _e, _a, _b, _c, _d, F4, 76 );
+  R( _d, _e, _a, _b, _c, F4, 77 );
+  R( _c, _d, _e, _a, _b, F4, 78 );
+  R( _b, _c, _d, _e, _a, F4, 79 );
+
+  mov sp, ROLDSTACK;
+
+  /* Update the chaining variables. */
+  ldm RSTATE, {RT0-RT3};
+  add _a, RT0;
+  ldr RT0, [RSTATE, #state_h4];
+  add _b, RT1;
+  add _c, RT2;
+  add _d, RT3;
+  /*vpop {q4-q7};*/
+  add _e, RT0;
+  stm RSTATE, {_a-_e};
+
+  pop {r4-r12, pc};
+
+.Ldo_nothing:
+  bx lr
+ENDPROC(sha1_transform_neon)
diff --git a/arch/arm/crypto/sha1_glue.c b/arch/arm/crypto/sha1_glue.c
index 76cd976230bc..84f2a756588b 100644
--- a/arch/arm/crypto/sha1_glue.c
+++ b/arch/arm/crypto/sha1_glue.c
@@ -23,32 +23,27 @@
 #include <linux/types.h>
 #include <crypto/sha.h>
 #include <asm/byteorder.h>
+#include <asm/crypto/sha1.h>
 
-struct SHA1_CTX {
-        uint32_t h0,h1,h2,h3,h4;
-        u64 count;
-        u8 data[SHA1_BLOCK_SIZE];
-};
 
-asmlinkage void sha1_block_data_order(struct SHA1_CTX *digest,
+asmlinkage void sha1_block_data_order(u32 *digest,
                 const unsigned char *data, unsigned int rounds);
 
 
 static int sha1_init(struct shash_desc *desc)
 {
-        struct SHA1_CTX *sctx = shash_desc_ctx(desc);
-        memset(sctx, 0, sizeof(*sctx));
-        sctx->h0 = SHA1_H0;
-        sctx->h1 = SHA1_H1;
-        sctx->h2 = SHA1_H2;
-        sctx->h3 = SHA1_H3;
-        sctx->h4 = SHA1_H4;
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+
+        *sctx = (struct sha1_state){
+                .state = { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 },
+        };
+
         return 0;
 }
 
 
-static int __sha1_update(struct SHA1_CTX *sctx, const u8 *data,
-                               unsigned int len, unsigned int partial)
+static int __sha1_update(struct sha1_state *sctx, const u8 *data,
+                         unsigned int len, unsigned int partial)
 {
         unsigned int done = 0;
 
@@ -56,43 +51,44 @@ static int __sha1_update(struct SHA1_CTX *sctx, const u8 *data,
 
         if (partial) {
                 done = SHA1_BLOCK_SIZE - partial;
-                memcpy(sctx->data + partial, data, done);
-                sha1_block_data_order(sctx, sctx->data, 1);
+                memcpy(sctx->buffer + partial, data, done);
+                sha1_block_data_order(sctx->state, sctx->buffer, 1);
         }
 
         if (len - done >= SHA1_BLOCK_SIZE) {
                 const unsigned int rounds = (len - done) / SHA1_BLOCK_SIZE;
-                sha1_block_data_order(sctx, data + done, rounds);
+                sha1_block_data_order(sctx->state, data + done, rounds);
                 done += rounds * SHA1_BLOCK_SIZE;
         }
 
-        memcpy(sctx->data, data + done, len - done);
+        memcpy(sctx->buffer, data + done, len - done);
         return 0;
 }
 
 
-static int sha1_update(struct shash_desc *desc, const u8 *data,
-                             unsigned int len)
+int sha1_update_arm(struct shash_desc *desc, const u8 *data,
+                    unsigned int len)
 {
-        struct SHA1_CTX *sctx = shash_desc_ctx(desc);
+        struct sha1_state *sctx = shash_desc_ctx(desc);
         unsigned int partial = sctx->count % SHA1_BLOCK_SIZE;
         int res;
 
         /* Handle the fast case right here */
         if (partial + len < SHA1_BLOCK_SIZE) {
                 sctx->count += len;
-                memcpy(sctx->data + partial, data, len);
+                memcpy(sctx->buffer + partial, data, len);
                 return 0;
         }
         res = __sha1_update(sctx, data, len, partial);
         return res;
 }
+EXPORT_SYMBOL_GPL(sha1_update_arm);
 
 
 /* Add padding and return the message digest. */
 static int sha1_final(struct shash_desc *desc, u8 *out)
 {
-        struct SHA1_CTX *sctx = shash_desc_ctx(desc);
+        struct sha1_state *sctx = shash_desc_ctx(desc);
         unsigned int i, index, padlen;
         __be32 *dst = (__be32 *)out;
         __be64 bits;
@@ -106,7 +102,7 @@ static int sha1_final(struct shash_desc *desc, u8 *out)
         /* We need to fill a whole block for __sha1_update() */
         if (padlen <= 56) {
                 sctx->count += padlen;
-                memcpy(sctx->data + index, padding, padlen);
+                memcpy(sctx->buffer + index, padding, padlen);
         } else {
                 __sha1_update(sctx, padding, padlen, index);
         }
@@ -114,7 +110,7 @@ static int sha1_final(struct shash_desc *desc, u8 *out)
 
         /* Store state in digest */
         for (i = 0; i < 5; i++)
-                dst[i] = cpu_to_be32(((u32 *)sctx)[i]);
+                dst[i] = cpu_to_be32(sctx->state[i]);
 
         /* Wipe context */
         memset(sctx, 0, sizeof(*sctx));
@@ -124,7 +120,7 @@ static int sha1_final(struct shash_desc *desc, u8 *out)
 
 static int sha1_export(struct shash_desc *desc, void *out)
 {
-        struct SHA1_CTX *sctx = shash_desc_ctx(desc);
+        struct sha1_state *sctx = shash_desc_ctx(desc);
         memcpy(out, sctx, sizeof(*sctx));
         return 0;
 }
@@ -132,7 +128,7 @@ static int sha1_export(struct shash_desc *desc, void *out)
 
 static int sha1_import(struct shash_desc *desc, const void *in)
 {
-        struct SHA1_CTX *sctx = shash_desc_ctx(desc);
+        struct sha1_state *sctx = shash_desc_ctx(desc);
         memcpy(sctx, in, sizeof(*sctx));
         return 0;
 }
@@ -141,12 +137,12 @@ static int sha1_import(struct shash_desc *desc, const void *in)
 static struct shash_alg alg = {
         .digestsize     =       SHA1_DIGEST_SIZE,
         .init           =       sha1_init,
-        .update         =       sha1_update,
+        .update         =       sha1_update_arm,
         .final          =       sha1_final,
         .export         =       sha1_export,
         .import         =       sha1_import,
-        .descsize       =       sizeof(struct SHA1_CTX),
-        .statesize      =       sizeof(struct SHA1_CTX),
+        .descsize       =       sizeof(struct sha1_state),
+        .statesize      =       sizeof(struct sha1_state),
         .base           =       {
                 .cra_name       =       "sha1",
                 .cra_driver_name=       "sha1-asm",
diff --git a/arch/arm/crypto/sha1_neon_glue.c b/arch/arm/crypto/sha1_neon_glue.c
new file mode 100644
index 000000000000..6f1b411b1d55
--- /dev/null
+++ b/arch/arm/crypto/sha1_neon_glue.c
@@ -0,0 +1,197 @@
+/*
+ * Glue code for the SHA1 Secure Hash Algorithm assembler implementation using
+ * ARM NEON instructions.
+ *
+ * Copyright © 2014 Jussi Kivilinna <jussi.kivilinna@iki.fi>
+ *
+ * This file is based on sha1_generic.c and sha1_ssse3_glue.c:
+ *  Copyright (c) Alan Smithee.
+ *  Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
+ *  Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
+ *  Copyright (c) Mathias Krause <minipli@googlemail.com>
+ *  Copyright (c) Chandramouli Narayanan <mouli@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.
+ *
+ */
+
+#include <crypto/internal/hash.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/cryptohash.h>
+#include <linux/types.h>
+#include <crypto/sha.h>
+#include <asm/byteorder.h>
+#include <asm/neon.h>
+#include <asm/simd.h>
+#include <asm/crypto/sha1.h>
+
+
+asmlinkage void sha1_transform_neon(void *state_h, const char *data,
+                                    unsigned int rounds);
+
+
+static int sha1_neon_init(struct shash_desc *desc)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+
+        *sctx = (struct sha1_state){
+                .state = { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 },
+        };
+
+        return 0;
+}
+
+static int __sha1_neon_update(struct shash_desc *desc, const u8 *data,
+                               unsigned int len, unsigned int partial)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        unsigned int done = 0;
+
+        sctx->count += len;
+
+        if (partial) {
+                done = SHA1_BLOCK_SIZE - partial;
+                memcpy(sctx->buffer + partial, data, done);
+                sha1_transform_neon(sctx->state, sctx->buffer, 1);
+        }
+
+        if (len - done >= SHA1_BLOCK_SIZE) {
+                const unsigned int rounds = (len - done) / SHA1_BLOCK_SIZE;
+
+                sha1_transform_neon(sctx->state, data + done, rounds);
+                done += rounds * SHA1_BLOCK_SIZE;
+        }
+
+        memcpy(sctx->buffer, data + done, len - done);
+
+        return 0;
+}
+
+static int sha1_neon_update(struct shash_desc *desc, const u8 *data,
+                             unsigned int len)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial = sctx->count % SHA1_BLOCK_SIZE;
+        int res;
+
+        /* Handle the fast case right here */
+        if (partial + len < SHA1_BLOCK_SIZE) {
+                sctx->count += len;
+                memcpy(sctx->buffer + partial, data, len);
+
+                return 0;
+        }
+
+        if (!may_use_simd()) {
+                res = sha1_update_arm(desc, data, len);
+        } else {
+                kernel_neon_begin();
+                res = __sha1_neon_update(desc, data, len, partial);
+                kernel_neon_end();
+        }
+
+        return res;
+}
+
+
+/* Add padding and return the message digest. */
+static int sha1_neon_final(struct shash_desc *desc, u8 *out)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+        unsigned int i, index, padlen;
+        __be32 *dst = (__be32 *)out;
+        __be64 bits;
+        static const u8 padding[SHA1_BLOCK_SIZE] = { 0x80, };
+
+        bits = cpu_to_be64(sctx->count << 3);
+
+        /* Pad out to 56 mod 64 and append length */
+        index = sctx->count % SHA1_BLOCK_SIZE;
+        padlen = (index < 56) ? (56 - index) : ((SHA1_BLOCK_SIZE+56) - index);
+        if (!may_use_simd()) {
+                sha1_update_arm(desc, padding, padlen);
+                sha1_update_arm(desc, (const u8 *)&bits, sizeof(bits));
+        } else {
+                kernel_neon_begin();
+                /* We need to fill a whole block for __sha1_neon_update() */
+                if (padlen <= 56) {
+                        sctx->count += padlen;
+                        memcpy(sctx->buffer + index, padding, padlen);
+                } else {
+                        __sha1_neon_update(desc, padding, padlen, index);
+                }
+                __sha1_neon_update(desc, (const u8 *)&bits, sizeof(bits), 56);
+                kernel_neon_end();
+        }
+
+        /* Store state in digest */
+        for (i = 0; i < 5; i++)
+                dst[i] = cpu_to_be32(sctx->state[i]);
+
+        /* Wipe context */
+        memset(sctx, 0, sizeof(*sctx));
+
+        return 0;
+}
+
+static int sha1_neon_export(struct shash_desc *desc, void *out)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+
+        memcpy(out, sctx, sizeof(*sctx));
+
+        return 0;
+}
+
+static int sha1_neon_import(struct shash_desc *desc, const void *in)
+{
+        struct sha1_state *sctx = shash_desc_ctx(desc);
+
+        memcpy(sctx, in, sizeof(*sctx));
+
+        return 0;
+}
+
+static struct shash_alg alg = {
+        .digestsize     =       SHA1_DIGEST_SIZE,
+        .init           =       sha1_neon_init,
+        .update         =       sha1_neon_update,
+        .final          =       sha1_neon_final,
+        .export         =       sha1_neon_export,
+        .import         =       sha1_neon_import,
+        .descsize       =       sizeof(struct sha1_state),
+        .statesize      =       sizeof(struct sha1_state),
+        .base           =       {
+                .cra_name               = "sha1",
+                .cra_driver_name        = "sha1-neon",
+                .cra_priority           = 250,
+                .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
+                .cra_blocksize          = SHA1_BLOCK_SIZE,
+                .cra_module             = THIS_MODULE,
+        }
+};
+
+static int __init sha1_neon_mod_init(void)
+{
+        if (!cpu_has_neon())
+                return -ENODEV;
+
+        return crypto_register_shash(&alg);
+}
+
+static void __exit sha1_neon_mod_fini(void)
+{
+        crypto_unregister_shash(&alg);
+}
+
+module_init(sha1_neon_mod_init);
+module_exit(sha1_neon_mod_fini);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, NEON accelerated");
+MODULE_ALIAS("sha1");
diff --git a/arch/arm/crypto/sha512-armv7-neon.S b/arch/arm/crypto/sha512-armv7-neon.S
new file mode 100644
index 000000000000..fe99472e507c
--- /dev/null
+++ b/arch/arm/crypto/sha512-armv7-neon.S
@@ -0,0 +1,455 @@
+/* sha512-armv7-neon.S  -  ARM/NEON assembly implementation of SHA-512 transform
+ *
+ * Copyright © 2013-2014 Jussi Kivilinna <jussi.kivilinna@iki.fi>
+ *
+ * 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/linkage.h>
+
+
+.syntax unified
+.code   32
+.fpu neon
+
+.text
+
+/* structure of SHA512_CONTEXT */
+#define hd_a 0
+#define hd_b ((hd_a) + 8)
+#define hd_c ((hd_b) + 8)
+#define hd_d ((hd_c) + 8)
+#define hd_e ((hd_d) + 8)
+#define hd_f ((hd_e) + 8)
+#define hd_g ((hd_f) + 8)
+
+/* register macros */
+#define RK %r2
+
+#define RA d0
+#define RB d1
+#define RC d2
+#define RD d3
+#define RE d4
+#define RF d5
+#define RG d6
+#define RH d7
+
+#define RT0 d8
+#define RT1 d9
+#define RT2 d10
+#define RT3 d11
+#define RT4 d12
+#define RT5 d13
+#define RT6 d14
+#define RT7 d15
+
+#define RT01q q4
+#define RT23q q5
+#define RT45q q6
+#define RT67q q7
+
+#define RW0 d16
+#define RW1 d17
+#define RW2 d18
+#define RW3 d19
+#define RW4 d20
+#define RW5 d21
+#define RW6 d22
+#define RW7 d23
+#define RW8 d24
+#define RW9 d25
+#define RW10 d26
+#define RW11 d27
+#define RW12 d28
+#define RW13 d29
+#define RW14 d30
+#define RW15 d31
+
+#define RW01q q8
+#define RW23q q9
+#define RW45q q10
+#define RW67q q11
+#define RW89q q12
+#define RW1011q q13
+#define RW1213q q14
+#define RW1415q q15
+
+/***********************************************************************
+ * ARM assembly implementation of sha512 transform
+ ***********************************************************************/
+#define rounds2_0_63(ra, rb, rc, rd, re, rf, rg, rh, rw0, rw1, rw01q, rw2, \
+                     rw23q, rw1415q, rw9, rw10, interleave_op, arg1) \
+        /* t1 = h + Sum1 (e) + Ch (e, f, g) + k[t] + w[t]; */ \
+        vshr.u64 RT2, re, #14; \
+        vshl.u64 RT3, re, #64 - 14; \
+        interleave_op(arg1); \
+        vshr.u64 RT4, re, #18; \
+        vshl.u64 RT5, re, #64 - 18; \
+        vld1.64 {RT0}, [RK]!; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vshr.u64 RT4, re, #41; \
+        vshl.u64 RT5, re, #64 - 41; \
+        vadd.u64 RT0, RT0, rw0; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vmov.64 RT7, re; \
+        veor.64 RT1, RT2, RT3; \
+        vbsl.64 RT7, rf, rg; \
+        \
+        vadd.u64 RT1, RT1, rh; \
+        vshr.u64 RT2, ra, #28; \
+        vshl.u64 RT3, ra, #64 - 28; \
+        vadd.u64 RT1, RT1, RT0; \
+        vshr.u64 RT4, ra, #34; \
+        vshl.u64 RT5, ra, #64 - 34; \
+        vadd.u64 RT1, RT1, RT7; \
+        \
+        /* h = Sum0 (a) + Maj (a, b, c); */ \
+        veor.64 RT23q, RT23q, RT45q; \
+        vshr.u64 RT4, ra, #39; \
+        vshl.u64 RT5, ra, #64 - 39; \
+        veor.64 RT0, ra, rb; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vbsl.64 RT0, rc, rb; \
+        vadd.u64 rd, rd, RT1; /* d+=t1; */ \
+        veor.64 rh, RT2, RT3; \
+        \
+        /* t1 = g + Sum1 (d) + Ch (d, e, f) + k[t] + w[t]; */ \
+        vshr.u64 RT2, rd, #14; \
+        vshl.u64 RT3, rd, #64 - 14; \
+        vadd.u64 rh, rh, RT0; \
+        vshr.u64 RT4, rd, #18; \
+        vshl.u64 RT5, rd, #64 - 18; \
+        vadd.u64 rh, rh, RT1; /* h+=t1; */ \
+        vld1.64 {RT0}, [RK]!; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vshr.u64 RT4, rd, #41; \
+        vshl.u64 RT5, rd, #64 - 41; \
+        vadd.u64 RT0, RT0, rw1; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vmov.64 RT7, rd; \
+        veor.64 RT1, RT2, RT3; \
+        vbsl.64 RT7, re, rf; \
+        \
+        vadd.u64 RT1, RT1, rg; \
+        vshr.u64 RT2, rh, #28; \
+        vshl.u64 RT3, rh, #64 - 28; \
+        vadd.u64 RT1, RT1, RT0; \
+        vshr.u64 RT4, rh, #34; \
+        vshl.u64 RT5, rh, #64 - 34; \
+        vadd.u64 RT1, RT1, RT7; \
+        \
+        /* g = Sum0 (h) + Maj (h, a, b); */ \
+        veor.64 RT23q, RT23q, RT45q; \
+        vshr.u64 RT4, rh, #39; \
+        vshl.u64 RT5, rh, #64 - 39; \
+        veor.64 RT0, rh, ra; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vbsl.64 RT0, rb, ra; \
+        vadd.u64 rc, rc, RT1; /* c+=t1; */ \
+        veor.64 rg, RT2, RT3; \
+        \
+        /* w[0] += S1 (w[14]) + w[9] + S0 (w[1]); */ \
+        /* w[1] += S1 (w[15]) + w[10] + S0 (w[2]); */ \
+        \
+        /**** S0(w[1:2]) */ \
+        \
+        /* w[0:1] += w[9:10] */ \
+        /* RT23q = rw1:rw2 */ \
+        vext.u64 RT23q, rw01q, rw23q, #1; \
+        vadd.u64 rw0, rw9; \
+        vadd.u64 rg, rg, RT0; \
+        vadd.u64 rw1, rw10;\
+        vadd.u64 rg, rg, RT1; /* g+=t1; */ \
+        \
+        vshr.u64 RT45q, RT23q, #1; \
+        vshl.u64 RT67q, RT23q, #64 - 1; \
+        vshr.u64 RT01q, RT23q, #8; \
+        veor.u64 RT45q, RT45q, RT67q; \
+        vshl.u64 RT67q, RT23q, #64 - 8; \
+        veor.u64 RT45q, RT45q, RT01q; \
+        vshr.u64 RT01q, RT23q, #7; \
+        veor.u64 RT45q, RT45q, RT67q; \
+        \
+        /**** S1(w[14:15]) */ \
+        vshr.u64 RT23q, rw1415q, #6; \
+        veor.u64 RT01q, RT01q, RT45q; \
+        vshr.u64 RT45q, rw1415q, #19; \
+        vshl.u64 RT67q, rw1415q, #64 - 19; \
+        veor.u64 RT23q, RT23q, RT45q; \
+        vshr.u64 RT45q, rw1415q, #61; \
+        veor.u64 RT23q, RT23q, RT67q; \
+        vshl.u64 RT67q, rw1415q, #64 - 61; \
+        veor.u64 RT23q, RT23q, RT45q; \
+        vadd.u64 rw01q, RT01q; /* w[0:1] += S(w[1:2]) */ \
+        veor.u64 RT01q, RT23q, RT67q;
+#define vadd_RT01q(rw01q) \
+        /* w[0:1] += S(w[14:15]) */ \
+        vadd.u64 rw01q, RT01q;
+
+#define dummy(_) /*_*/
+
+#define rounds2_64_79(ra, rb, rc, rd, re, rf, rg, rh, rw0, rw1, \
+                      interleave_op1, arg1, interleave_op2, arg2) \
+        /* t1 = h + Sum1 (e) + Ch (e, f, g) + k[t] + w[t]; */ \
+        vshr.u64 RT2, re, #14; \
+        vshl.u64 RT3, re, #64 - 14; \
+        interleave_op1(arg1); \
+        vshr.u64 RT4, re, #18; \
+        vshl.u64 RT5, re, #64 - 18; \
+        interleave_op2(arg2); \
+        vld1.64 {RT0}, [RK]!; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vshr.u64 RT4, re, #41; \
+        vshl.u64 RT5, re, #64 - 41; \
+        vadd.u64 RT0, RT0, rw0; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vmov.64 RT7, re; \
+        veor.64 RT1, RT2, RT3; \
+        vbsl.64 RT7, rf, rg; \
+        \
+        vadd.u64 RT1, RT1, rh; \
+        vshr.u64 RT2, ra, #28; \
+        vshl.u64 RT3, ra, #64 - 28; \
+        vadd.u64 RT1, RT1, RT0; \
+        vshr.u64 RT4, ra, #34; \
+        vshl.u64 RT5, ra, #64 - 34; \
+        vadd.u64 RT1, RT1, RT7; \
+        \
+        /* h = Sum0 (a) + Maj (a, b, c); */ \
+        veor.64 RT23q, RT23q, RT45q; \
+        vshr.u64 RT4, ra, #39; \
+        vshl.u64 RT5, ra, #64 - 39; \
+        veor.64 RT0, ra, rb; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vbsl.64 RT0, rc, rb; \
+        vadd.u64 rd, rd, RT1; /* d+=t1; */ \
+        veor.64 rh, RT2, RT3; \
+        \
+        /* t1 = g + Sum1 (d) + Ch (d, e, f) + k[t] + w[t]; */ \
+        vshr.u64 RT2, rd, #14; \
+        vshl.u64 RT3, rd, #64 - 14; \
+        vadd.u64 rh, rh, RT0; \
+        vshr.u64 RT4, rd, #18; \
+        vshl.u64 RT5, rd, #64 - 18; \
+        vadd.u64 rh, rh, RT1; /* h+=t1; */ \
+        vld1.64 {RT0}, [RK]!; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vshr.u64 RT4, rd, #41; \
+        vshl.u64 RT5, rd, #64 - 41; \
+        vadd.u64 RT0, RT0, rw1; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vmov.64 RT7, rd; \
+        veor.64 RT1, RT2, RT3; \
+        vbsl.64 RT7, re, rf; \
+        \
+        vadd.u64 RT1, RT1, rg; \
+        vshr.u64 RT2, rh, #28; \
+        vshl.u64 RT3, rh, #64 - 28; \
+        vadd.u64 RT1, RT1, RT0; \
+        vshr.u64 RT4, rh, #34; \
+        vshl.u64 RT5, rh, #64 - 34; \
+        vadd.u64 RT1, RT1, RT7; \
+        \
+        /* g = Sum0 (h) + Maj (h, a, b); */ \
+        veor.64 RT23q, RT23q, RT45q; \
+        vshr.u64 RT4, rh, #39; \
+        vshl.u64 RT5, rh, #64 - 39; \
+        veor.64 RT0, rh, ra; \
+        veor.64 RT23q, RT23q, RT45q; \
+        vbsl.64 RT0, rb, ra; \
+        vadd.u64 rc, rc, RT1; /* c+=t1; */ \
+        veor.64 rg, RT2, RT3;
+#define vadd_rg_RT0(rg) \
+        vadd.u64 rg, rg, RT0;
+#define vadd_rg_RT1(rg) \
+        vadd.u64 rg, rg, RT1; /* g+=t1; */
+
+.align 3
+ENTRY(sha512_transform_neon)
+        /* Input:
+         *      %r0: SHA512_CONTEXT
+         *      %r1: data
+         *      %r2: u64 k[] constants
+         *      %r3: nblks
+         */
+        push {%lr};
+
+        mov %lr, #0;
+
+        /* Load context to d0-d7 */
+        vld1.64 {RA-RD}, [%r0]!;
+        vld1.64 {RE-RH}, [%r0];
+        sub %r0, #(4*8);
+
+        /* Load input to w[16], d16-d31 */
+        /* NOTE: Assumes that on ARMv7 unaligned accesses are always allowed. */
+        vld1.64 {RW0-RW3}, [%r1]!;
+        vld1.64 {RW4-RW7}, [%r1]!;
+        vld1.64 {RW8-RW11}, [%r1]!;
+        vld1.64 {RW12-RW15}, [%r1]!;
+#ifdef __ARMEL__
+        /* byteswap */
+        vrev64.8 RW01q, RW01q;
+        vrev64.8 RW23q, RW23q;
+        vrev64.8 RW45q, RW45q;
+        vrev64.8 RW67q, RW67q;
+        vrev64.8 RW89q, RW89q;
+        vrev64.8 RW1011q, RW1011q;
+        vrev64.8 RW1213q, RW1213q;
+        vrev64.8 RW1415q, RW1415q;
+#endif
+
+        /* EABI says that d8-d15 must be preserved by callee. */
+        /*vpush {RT0-RT7};*/
+
+.Loop:
+        rounds2_0_63(RA, RB, RC, RD, RE, RF, RG, RH, RW0, RW1, RW01q, RW2,
+                     RW23q, RW1415q, RW9, RW10, dummy, _);
+        b .Lenter_rounds;
+
+.Loop_rounds:
+        rounds2_0_63(RA, RB, RC, RD, RE, RF, RG, RH, RW0, RW1, RW01q, RW2,
+                     RW23q, RW1415q, RW9, RW10, vadd_RT01q, RW1415q);
+.Lenter_rounds:
+        rounds2_0_63(RG, RH, RA, RB, RC, RD, RE, RF, RW2, RW3, RW23q, RW4,
+                     RW45q, RW01q, RW11, RW12, vadd_RT01q, RW01q);
+        rounds2_0_63(RE, RF, RG, RH, RA, RB, RC, RD, RW4, RW5, RW45q, RW6,
+                     RW67q, RW23q, RW13, RW14, vadd_RT01q, RW23q);
+        rounds2_0_63(RC, RD, RE, RF, RG, RH, RA, RB, RW6, RW7, RW67q, RW8,
+                     RW89q, RW45q, RW15, RW0, vadd_RT01q, RW45q);
+        rounds2_0_63(RA, RB, RC, RD, RE, RF, RG, RH, RW8, RW9, RW89q, RW10,
+                     RW1011q, RW67q, RW1, RW2, vadd_RT01q, RW67q);
+        rounds2_0_63(RG, RH, RA, RB, RC, RD, RE, RF, RW10, RW11, RW1011q, RW12,
+                     RW1213q, RW89q, RW3, RW4, vadd_RT01q, RW89q);
+        add %lr, #16;
+        rounds2_0_63(RE, RF, RG, RH, RA, RB, RC, RD, RW12, RW13, RW1213q, RW14,
+                     RW1415q, RW1011q, RW5, RW6, vadd_RT01q, RW1011q);
+        cmp %lr, #64;
+        rounds2_0_63(RC, RD, RE, RF, RG, RH, RA, RB, RW14, RW15, RW1415q, RW0,
+                     RW01q, RW1213q, RW7, RW8, vadd_RT01q, RW1213q);
+        bne .Loop_rounds;
+
+        subs %r3, #1;
+
+        rounds2_64_79(RA, RB, RC, RD, RE, RF, RG, RH, RW0, RW1,
+                      vadd_RT01q, RW1415q, dummy, _);
+        rounds2_64_79(RG, RH, RA, RB, RC, RD, RE, RF, RW2, RW3,
+                      vadd_rg_RT0, RG, vadd_rg_RT1, RG);
+        beq .Lhandle_tail;
+        vld1.64 {RW0-RW3}, [%r1]!;
+        rounds2_64_79(RE, RF, RG, RH, RA, RB, RC, RD, RW4, RW5,
+                      vadd_rg_RT0, RE, vadd_rg_RT1, RE);
+        rounds2_64_79(RC, RD, RE, RF, RG, RH, RA, RB, RW6, RW7,
+                      vadd_rg_RT0, RC, vadd_rg_RT1, RC);
+#ifdef __ARMEL__
+        vrev64.8 RW01q, RW01q;
+        vrev64.8 RW23q, RW23q;
+#endif
+        vld1.64 {RW4-RW7}, [%r1]!;
+        rounds2_64_79(RA, RB, RC, RD, RE, RF, RG, RH, RW8, RW9,
+                      vadd_rg_RT0, RA, vadd_rg_RT1, RA);
+        rounds2_64_79(RG, RH, RA, RB, RC, RD, RE, RF, RW10, RW11,
+                      vadd_rg_RT0, RG, vadd_rg_RT1, RG);
+#ifdef __ARMEL__
+        vrev64.8 RW45q, RW45q;
+        vrev64.8 RW67q, RW67q;
+#endif
+        vld1.64 {RW8-RW11}, [%r1]!;
+        rounds2_64_79(RE, RF, RG, RH, RA, RB, RC, RD, RW12, RW13,
+                      vadd_rg_RT0, RE, vadd_rg_RT1, RE);
+        rounds2_64_79(RC, RD, RE, RF, RG, RH, RA, RB, RW14, RW15,
+                      vadd_rg_RT0, RC, vadd_rg_RT1, RC);
+#ifdef __ARMEL__
+        vrev64.8 RW89q, RW89q;
+        vrev64.8 RW1011q, RW1011q;
+#endif
+        vld1.64 {RW12-RW15}, [%r1]!;
+        vadd_rg_RT0(RA);
+        vadd_rg_RT1(RA);
+
+        /* Load context */
+        vld1.64 {RT0-RT3}, [%r0]!;
+        vld1.64 {RT4-RT7}, [%r0];
+        sub %r0, #(4*8);
+
+#ifdef __ARMEL__
+        vrev64.8 RW1213q, RW1213q;
+        vrev64.8 RW1415q, RW1415q;
+#endif
+
+        vadd.u64 RA, RT0;
+        vadd.u64 RB, RT1;
+        vadd.u64 RC, RT2;
+        vadd.u64 RD, RT3;
+        vadd.u64 RE, RT4;
+        vadd.u64 RF, RT5;
+        vadd.u64 RG, RT6;
+        vadd.u64 RH, RT7;
+
+        /* Store the first half of context */
+        vst1.64 {RA-RD}, [%r0]!;
+        sub RK, $(8*80);
+        vst1.64 {RE-RH}, [%r0]; /* Store the last half of context */
+        mov %lr, #0;
+        sub %r0, #(4*8);
+
+        b .Loop;
+
+.Lhandle_tail:
+        rounds2_64_79(RE, RF, RG, RH, RA, RB, RC, RD, RW4, RW5,
+                      vadd_rg_RT0, RE, vadd_rg_RT1, RE);
+        rounds2_64_79(RC, RD, RE, RF, RG, RH, RA, RB, RW6, RW7,
+                      vadd_rg_RT0, RC, vadd_rg_RT1, RC);
+        rounds2_64_79(RA, RB, RC, RD, RE, RF, RG, RH, RW8, RW9,
+                      vadd_rg_RT0, RA, vadd_rg_RT1, RA);
+        rounds2_64_79(RG, RH, RA, RB, RC, RD, RE, RF, RW10, RW11,
+                      vadd_rg_RT0, RG, vadd_rg_RT1, RG);
+        rounds2_64_79(RE, RF, RG, RH, RA, RB, RC, RD, RW12, RW13,
+                      vadd_rg_RT0, RE, vadd_rg_RT1, RE);
+        rounds2_64_79(RC, RD, RE, RF, RG, RH, RA, RB, RW14, RW15,
+                      vadd_rg_RT0, RC, vadd_rg_RT1, RC);
+
+        /* Load context to d16-d23 */
+        vld1.64 {RW0-RW3}, [%r0]!;
+        vadd_rg_RT0(RA);
+        vld1.64 {RW4-RW7}, [%r0];
+        vadd_rg_RT1(RA);
+        sub %r0, #(4*8);
+
+        vadd.u64 RA, RW0;
+        vadd.u64 RB, RW1;
+        vadd.u64 RC, RW2;
+        vadd.u64 RD, RW3;
+        vadd.u64 RE, RW4;
+        vadd.u64 RF, RW5;
+        vadd.u64 RG, RW6;
+        vadd.u64 RH, RW7;
+
+        /* Store the first half of context */
+        vst1.64 {RA-RD}, [%r0]!;
+
+        /* Clear used registers */
+        /* d16-d31 */
+        veor.u64 RW01q, RW01q;
+        veor.u64 RW23q, RW23q;
+        veor.u64 RW45q, RW45q;
+        veor.u64 RW67q, RW67q;
+        vst1.64 {RE-RH}, [%r0]; /* Store the last half of context */
+        veor.u64 RW89q, RW89q;
+        veor.u64 RW1011q, RW1011q;
+        veor.u64 RW1213q, RW1213q;
+        veor.u64 RW1415q, RW1415q;
+        /* d8-d15 */
+        /*vpop {RT0-RT7};*/
+        /* d0-d7 (q0-q3) */
+        veor.u64 %q0, %q0;
+        veor.u64 %q1, %q1;
+        veor.u64 %q2, %q2;
+        veor.u64 %q3, %q3;
+
+        pop {%pc};
+ENDPROC(sha512_transform_neon)
diff --git a/arch/arm/crypto/sha512_neon_glue.c b/arch/arm/crypto/sha512_neon_glue.c
new file mode 100644
index 000000000000..0d2758ff5e12
--- /dev/null
+++ b/arch/arm/crypto/sha512_neon_glue.c
@@ -0,0 +1,305 @@
+/*
+ * Glue code for the SHA512 Secure Hash Algorithm assembly implementation
+ * using NEON instructions.
+ *
+ * Copyright © 2014 Jussi Kivilinna <jussi.kivilinna@iki.fi>
+ *
+ * This file is based on sha512_ssse3_glue.c:
+ *   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.
+ *
+ */
+
+#include <crypto/internal/hash.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/cryptohash.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <crypto/sha.h>
+#include <asm/byteorder.h>
+#include <asm/simd.h>
+#include <asm/neon.h>
+
+
+static const u64 sha512_k[] = {
+        0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
+        0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
+        0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
+        0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
+        0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
+        0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
+        0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
+        0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
+        0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
+        0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
+        0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
+        0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
+        0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
+        0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
+        0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
+        0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
+        0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
+        0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
+        0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
+        0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
+        0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
+        0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
+        0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
+        0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
+        0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
+        0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
+        0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
+        0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
+        0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
+        0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
+        0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
+        0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
+        0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
+        0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
+        0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
+        0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
+        0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
+        0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
+        0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
+        0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
+};
+
+
+asmlinkage void sha512_transform_neon(u64 *digest, const void *data,
+                                      const u64 k[], unsigned int num_blks);
+
+
+static int sha512_neon_init(struct shash_desc *desc)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA512_H0;
+        sctx->state[1] = SHA512_H1;
+        sctx->state[2] = SHA512_H2;
+        sctx->state[3] = SHA512_H3;
+        sctx->state[4] = SHA512_H4;
+        sctx->state[5] = SHA512_H5;
+        sctx->state[6] = SHA512_H6;
+        sctx->state[7] = SHA512_H7;
+        sctx->count[0] = sctx->count[1] = 0;
+
+        return 0;
+}
+
+static int __sha512_neon_update(struct shash_desc *desc, const u8 *data,
+                                unsigned int len, unsigned int partial)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+        unsigned int done = 0;
+
+        sctx->count[0] += len;
+        if (sctx->count[0] < len)
+                sctx->count[1]++;
+
+        if (partial) {
+                done = SHA512_BLOCK_SIZE - partial;
+                memcpy(sctx->buf + partial, data, done);
+                sha512_transform_neon(sctx->state, sctx->buf, sha512_k, 1);
+        }
+
+        if (len - done >= SHA512_BLOCK_SIZE) {
+                const unsigned int rounds = (len - done) / SHA512_BLOCK_SIZE;
+
+                sha512_transform_neon(sctx->state, data + done, sha512_k,
+                                      rounds);
+
+                done += rounds * SHA512_BLOCK_SIZE;
+        }
+
+        memcpy(sctx->buf, data + done, len - done);
+
+        return 0;
+}
+
+static int sha512_neon_update(struct shash_desc *desc, const u8 *data,
+                             unsigned int len)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial = sctx->count[0] % SHA512_BLOCK_SIZE;
+        int res;
+
+        /* Handle the fast case right here */
+        if (partial + len < SHA512_BLOCK_SIZE) {
+                sctx->count[0] += len;
+                if (sctx->count[0] < len)
+                        sctx->count[1]++;
+                memcpy(sctx->buf + partial, data, len);
+
+                return 0;
+        }
+
+        if (!may_use_simd()) {
+                res = crypto_sha512_update(desc, data, len);
+        } else {
+                kernel_neon_begin();
+                res = __sha512_neon_update(desc, data, len, partial);
+                kernel_neon_end();
+        }
+
+        return res;
+}
+
+
+/* Add padding and return the message digest. */
+static int sha512_neon_final(struct shash_desc *desc, u8 *out)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+        unsigned int i, index, padlen;
+        __be64 *dst = (__be64 *)out;
+        __be64 bits[2];
+        static const u8 padding[SHA512_BLOCK_SIZE] = { 0x80, };
+
+        /* save number of bits */
+        bits[1] = cpu_to_be64(sctx->count[0] << 3);
+        bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61);
+
+        /* Pad out to 112 mod 128 and append length */
+        index = sctx->count[0] & 0x7f;
+        padlen = (index < 112) ? (112 - index) : ((128+112) - index);
+
+        if (!may_use_simd()) {
+                crypto_sha512_update(desc, padding, padlen);
+                crypto_sha512_update(desc, (const u8 *)&bits, sizeof(bits));
+        } else {
+                kernel_neon_begin();
+                /* We need to fill a whole block for __sha512_neon_update() */
+                if (padlen <= 112) {
+                        sctx->count[0] += padlen;
+                        if (sctx->count[0] < padlen)
+                                sctx->count[1]++;
+                        memcpy(sctx->buf + index, padding, padlen);
+                } else {
+                        __sha512_neon_update(desc, padding, padlen, index);
+                }
+                __sha512_neon_update(desc, (const u8 *)&bits,
+                                        sizeof(bits), 112);
+                kernel_neon_end();
+        }
+
+        /* Store state in digest */
+        for (i = 0; i < 8; i++)
+                dst[i] = cpu_to_be64(sctx->state[i]);
+
+        /* Wipe context */
+        memset(sctx, 0, sizeof(*sctx));
+
+        return 0;
+}
+
+static int sha512_neon_export(struct shash_desc *desc, void *out)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+
+        memcpy(out, sctx, sizeof(*sctx));
+
+        return 0;
+}
+
+static int sha512_neon_import(struct shash_desc *desc, const void *in)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+
+        memcpy(sctx, in, sizeof(*sctx));
+
+        return 0;
+}
+
+static int sha384_neon_init(struct shash_desc *desc)
+{
+        struct sha512_state *sctx = shash_desc_ctx(desc);
+
+        sctx->state[0] = SHA384_H0;
+        sctx->state[1] = SHA384_H1;
+        sctx->state[2] = SHA384_H2;
+        sctx->state[3] = SHA384_H3;
+        sctx->state[4] = SHA384_H4;
+        sctx->state[5] = SHA384_H5;
+        sctx->state[6] = SHA384_H6;
+        sctx->state[7] = SHA384_H7;
+
+        sctx->count[0] = sctx->count[1] = 0;
+
+        return 0;
+}
+
+static int sha384_neon_final(struct shash_desc *desc, u8 *hash)
+{
+        u8 D[SHA512_DIGEST_SIZE];
+
+        sha512_neon_final(desc, D);
+
+        memcpy(hash, D, SHA384_DIGEST_SIZE);
+        memset(D, 0, SHA512_DIGEST_SIZE);
+
+        return 0;
+}
+
+static struct shash_alg algs[] = { {
+        .digestsize     =       SHA512_DIGEST_SIZE,
+        .init           =       sha512_neon_init,
+        .update         =       sha512_neon_update,
+        .final          =       sha512_neon_final,
+        .export         =       sha512_neon_export,
+        .import         =       sha512_neon_import,
+        .descsize       =       sizeof(struct sha512_state),
+        .statesize      =       sizeof(struct sha512_state),
+        .base           =       {
+                .cra_name       =       "sha512",
+                .cra_driver_name =      "sha512-neon",
+                .cra_priority   =       250,
+                .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
+                .cra_blocksize  =       SHA512_BLOCK_SIZE,
+                .cra_module     =       THIS_MODULE,
+        }
+},  {
+        .digestsize     =       SHA384_DIGEST_SIZE,
+        .init           =       sha384_neon_init,
+        .update         =       sha512_neon_update,
+        .final          =       sha384_neon_final,
+        .export         =       sha512_neon_export,
+        .import         =       sha512_neon_import,
+        .descsize       =       sizeof(struct sha512_state),
+        .statesize      =       sizeof(struct sha512_state),
+        .base           =       {
+                .cra_name       =       "sha384",
+                .cra_driver_name =      "sha384-neon",
+                .cra_priority   =       250,
+                .cra_flags      =       CRYPTO_ALG_TYPE_SHASH,
+                .cra_blocksize  =       SHA384_BLOCK_SIZE,
+                .cra_module     =       THIS_MODULE,
+        }
+} };
+
+static int __init sha512_neon_mod_init(void)
+{
+        if (!cpu_has_neon())
+                return -ENODEV;
+
+        return crypto_register_shashes(algs, ARRAY_SIZE(algs));
+}
+
+static void __exit sha512_neon_mod_fini(void)
+{
+        crypto_unregister_shashes(algs, ARRAY_SIZE(algs));
+}
+
+module_init(sha512_neon_mod_init);
+module_exit(sha512_neon_mod_fini);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, NEON accelerated");
+
+MODULE_ALIAS("sha512");
+MODULE_ALIAS("sha384");
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index f5a357601983..70cd84eb7fda 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -22,6 +22,7 @@ generic-y += poll.h
 generic-y += preempt.h
 generic-y += resource.h
 generic-y += rwsem.h
+generic-y += scatterlist.h
 generic-y += sections.h
 generic-y += segment.h
 generic-y += sembuf.h
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 57f0584e8d97..f67fd3afebdf 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -24,6 +24,8 @@
 #include <asm/domain.h>
 #include <asm/opcodes-virt.h>
 #include <asm/asm-offsets.h>
+#include <asm/page.h>
+#include <asm/thread_info.h>
 
 #define IOMEM(x)        (x)
 
@@ -179,10 +181,10 @@
  * Get current thread_info.
  */
         .macro  get_thread_info, rd
- ARM(   mov     \rd, sp, lsr #13        )
+ ARM(   mov     \rd, sp, lsr #THREAD_SIZE_ORDER + PAGE_SHIFT    )
  THUMB( mov     \rd, sp                 )
- THUMB( lsr     \rd, \rd, #13           )
-        mov     \rd, \rd, lsl #13
+ THUMB( lsr     \rd, \rd, #THREAD_SIZE_ORDER + PAGE_SHIFT       )
+        mov     \rd, \rd, lsl #THREAD_SIZE_ORDER + PAGE_SHIFT
         .endm
 
 /*
@@ -425,4 +427,25 @@ THUMB(	orr	\reg , \reg , #PSR_T_BIT	)
 #endif
         .endm
 
+        .irp    c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo
+        .macro  ret\c, reg
+#if __LINUX_ARM_ARCH__ < 6
+        mov\c   pc, \reg
+#else
+        .ifeqs  "\reg", "lr"
+        bx\c    \reg
+        .else
+        mov\c   pc, \reg
+        .endif
+#endif
+        .endm
+        .endr
+
+        .macro  ret.w, reg
+        ret     \reg
+#ifdef CONFIG_THUMB2_KERNEL
+        nop
+#endif
+        .endm
+
 #endif /* __ASM_ASSEMBLER_H__ */
diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h
index 8c2b7321a478..963a2515906d 100644
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@ -62,17 +62,18 @@
 #define ARM_CPU_IMP_ARM                 0x41
 #define ARM_CPU_IMP_INTEL               0x69
 
-#define ARM_CPU_PART_ARM1136            0xB360
-#define ARM_CPU_PART_ARM1156            0xB560
-#define ARM_CPU_PART_ARM1176            0xB760
-#define ARM_CPU_PART_ARM11MPCORE        0xB020
-#define ARM_CPU_PART_CORTEX_A8          0xC080
-#define ARM_CPU_PART_CORTEX_A9          0xC090
-#define ARM_CPU_PART_CORTEX_A5          0xC050
-#define ARM_CPU_PART_CORTEX_A15         0xC0F0
-#define ARM_CPU_PART_CORTEX_A7          0xC070
-#define ARM_CPU_PART_CORTEX_A12         0xC0D0
-#define ARM_CPU_PART_CORTEX_A17         0xC0E0
+/* ARM implemented processors */
+#define ARM_CPU_PART_ARM1136            0x4100b360
+#define ARM_CPU_PART_ARM1156            0x4100b560
+#define ARM_CPU_PART_ARM1176            0x4100b760
+#define ARM_CPU_PART_ARM11MPCORE        0x4100b020
+#define ARM_CPU_PART_CORTEX_A8          0x4100c080
+#define ARM_CPU_PART_CORTEX_A9          0x4100c090
+#define ARM_CPU_PART_CORTEX_A5          0x4100c050
+#define ARM_CPU_PART_CORTEX_A7          0x4100c070
+#define ARM_CPU_PART_CORTEX_A12         0x4100c0d0
+#define ARM_CPU_PART_CORTEX_A17         0x4100c0e0
+#define ARM_CPU_PART_CORTEX_A15         0x4100c0f0
 
 #define ARM_CPU_XSCALE_ARCH_MASK        0xe000
 #define ARM_CPU_XSCALE_ARCH_V1          0x2000
@@ -171,14 +172,24 @@ static inline unsigned int __attribute_const__ read_cpuid_implementor(void)
         return (read_cpuid_id() & 0xFF000000) >> 24;
 }
 
-static inline unsigned int __attribute_const__ read_cpuid_part_number(void)
+/*
+ * The CPU part number is meaningless without referring to the CPU
+ * implementer: implementers are free to define their own part numbers
+ * which are permitted to clash with other implementer part numbers.
+ */
+static inline unsigned int __attribute_const__ read_cpuid_part(void)
+{
+        return read_cpuid_id() & 0xff00fff0;
+}
+
+static inline unsigned int __attribute_const__ __deprecated read_cpuid_part_number(void)
 {
         return read_cpuid_id() & 0xFFF0;
 }
 
 static inline unsigned int __attribute_const__ xscale_cpu_arch_version(void)
 {
-        return read_cpuid_part_number() & ARM_CPU_XSCALE_ARCH_MASK;
+        return read_cpuid_id() & ARM_CPU_XSCALE_ARCH_MASK;
 }
 
 static inline unsigned int __attribute_const__ read_cpuid_cachetype(void)
diff --git a/arch/arm/include/asm/crypto/sha1.h b/arch/arm/include/asm/crypto/sha1.h
new file mode 100644
index 000000000000..75e6a417416b
--- /dev/null
+++ b/arch/arm/include/asm/crypto/sha1.h
@@ -0,0 +1,10 @@
+#ifndef ASM_ARM_CRYPTO_SHA1_H
+#define ASM_ARM_CRYPTO_SHA1_H
+
+#include <linux/crypto.h>
+#include <crypto/sha.h>
+
+extern int sha1_update_arm(struct shash_desc *desc, const u8 *data,
+                           unsigned int len);
+
+#endif
diff --git a/arch/arm/include/asm/entry-macro-multi.S b/arch/arm/include/asm/entry-macro-multi.S
index 88d61815f0c0..469a2b30fa27 100644
--- a/arch/arm/include/asm/entry-macro-multi.S
+++ b/arch/arm/include/asm/entry-macro-multi.S
@@ -35,5 +35,5 @@
 \symbol_name:
         mov     r8, lr
         arch_irq_handler_default
-        mov     pc, r8
+        ret     r8
         .endm
diff --git a/arch/arm/include/asm/glue-proc.h b/arch/arm/include/asm/glue-proc.h
index 74a8b84f3cb1..74be7c22035a 100644
--- a/arch/arm/include/asm/glue-proc.h
+++ b/arch/arm/include/asm/glue-proc.h
@@ -221,15 +221,6 @@
 # endif
 #endif
 
-#ifdef CONFIG_CPU_V7
-# ifdef CPU_NAME
-#  undef  MULTI_CPU
-#  define MULTI_CPU
-# else
-#  define CPU_NAME cpu_v7
-# endif
-#endif
-
 #ifdef CONFIG_CPU_V7M
 # ifdef CPU_NAME
 #  undef  MULTI_CPU
@@ -248,6 +239,15 @@
 # endif
 #endif
 
+#ifdef CONFIG_CPU_V7
+/*
+ * Cortex-A9 needs a different suspend/resume function, so we need
+ * multiple CPU support for ARMv7 anyway.
+ */
+#  undef  MULTI_CPU
+#  define MULTI_CPU
+#endif
+
 #ifndef MULTI_CPU
 #define cpu_proc_init                   __glue(CPU_NAME,_proc_init)
 #define cpu_proc_fin                    __glue(CPU_NAME,_proc_fin)
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index 477e0206e016..504dcddebfcc 100644
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
@@ -5,12 +5,6 @@
 #define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO
 #endif
 
-/* not all ARM platforms necessarily support this API ... */
-#ifdef CONFIG_NEED_MACH_GPIO_H
-#include <mach/gpio.h>
-#endif
-
-#ifndef __ARM_GPIOLIB_COMPLEX
 /* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h */
 #include <asm-generic/gpio.h>
 
@@ -18,7 +12,6 @@
 #define gpio_get_value  __gpio_get_value
 #define gpio_set_value  __gpio_set_value
 #define gpio_cansleep   __gpio_cansleep
-#endif
 
 /*
  * Provide a default gpio_to_irq() which should satisfy every case.
diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h
index 53b3c4a50d5c..3a67bec72d0c 100644
--- a/arch/arm/include/asm/kvm_asm.h
+++ b/arch/arm/include/asm/kvm_asm.h
@@ -61,6 +61,24 @@
 #define ARM_EXCEPTION_FIQ         6
 #define ARM_EXCEPTION_HVC         7
 
+/*
+ * The rr_lo_hi macro swaps a pair of registers depending on
+ * current endianness. It is used in conjunction with ldrd and strd
+ * instructions that load/store a 64-bit value from/to memory to/from
+ * a pair of registers which are used with the mrrc and mcrr instructions.
+ * If used with the ldrd/strd instructions, the a1 parameter is the first
+ * source/destination register and the a2 parameter is the second
+ * source/destination register. Note that the ldrd/strd instructions
+ * already swap the bytes within the words correctly according to the
+ * endianness setting, but the order of the registers need to be effectively
+ * swapped when used with the mrrc/mcrr instructions.
+ */
+#ifdef CONFIG_CPU_ENDIAN_BE8
+#define rr_lo_hi(a1, a2) a2, a1
+#else
+#define rr_lo_hi(a1, a2) a1, a2
+#endif
+
 #ifndef __ASSEMBLY__
 struct kvm;
 struct kvm_vcpu;
diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index 0fa90c962ac8..69b746955fca 100644
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -185,9 +185,16 @@ static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,
                 default:
                         return be32_to_cpu(data);
                 }
+        } else {
+                switch (len) {
+                case 1:
+                        return data & 0xff;
+                case 2:
+                        return le16_to_cpu(data & 0xffff);
+                default:
+                        return le32_to_cpu(data);
+                }
         }
-
-        return data;            /* Leave LE untouched */
 }
 
 static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu,
@@ -203,9 +210,16 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu,
                 default:
                         return cpu_to_be32(data);
                 }
+        } else {
+                switch (len) {
+                case 1:
+                        return data & 0xff;
+                case 2:
+                        return cpu_to_le16(data & 0xffff);
+                default:
+                        return cpu_to_le32(data);
+                }
         }
-
-        return data;            /* Leave LE untouched */
 }
 
 #endif /* __ARM_KVM_EMULATE_H__ */
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
index 193ceaf01bfd..6dfb404f6c46 100644
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@ -225,10 +225,12 @@ static inline int kvm_arch_dev_ioctl_check_extension(long ext)
         return 0;
 }
 
+static inline void vgic_arch_setup(const struct vgic_params *vgic)
+{
+        BUG_ON(vgic->type != VGIC_V2);
+}
+
 int kvm_perf_init(void);
 int kvm_perf_teardown(void);
 
-u64 kvm_arm_timer_get_reg(struct kvm_vcpu *, u64 regid);
-int kvm_arm_timer_set_reg(struct kvm_vcpu *, u64 regid, u64 value);
-
 #endif /* __ARM_KVM_HOST_H__ */
diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h
index 5c7aa3c1519f..5cc0b0f5f72f 100644
--- a/arch/arm/include/asm/kvm_mmu.h
+++ b/arch/arm/include/asm/kvm_mmu.h
@@ -127,6 +127,18 @@ static inline void kvm_set_s2pmd_writable(pmd_t *pmd)
         (__boundary - 1 < (end) - 1)? __boundary: (end);                \
 })
 
+static inline bool kvm_page_empty(void *ptr)
+{
+        struct page *ptr_page = virt_to_page(ptr);
+        return page_count(ptr_page) == 1;
+}
+
+
+#define kvm_pte_table_empty(ptep) kvm_page_empty(ptep)
+#define kvm_pmd_table_empty(pmdp) kvm_page_empty(pmdp)
+#define kvm_pud_table_empty(pudp) (0)
+
+
 struct kvm;
 
 #define kvm_flush_dcache_to_poc(a,l)    __cpuc_flush_dcache_area((a), (l))
diff --git a/arch/arm/include/asm/mcpm.h b/arch/arm/include/asm/mcpm.h
index 94060adba174..57ff7f2a3084 100644
--- a/arch/arm/include/asm/mcpm.h
+++ b/arch/arm/include/asm/mcpm.h
@@ -217,6 +217,22 @@ int __mcpm_cluster_state(unsigned int cluster);
 int __init mcpm_sync_init(
         void (*power_up_setup)(unsigned int affinity_level));
 
+/**
+ * mcpm_loopback - make a run through the MCPM low-level code
+ *
+ * @cache_disable: pointer to function performing cache disabling
+ *
+ * This exercises the MCPM machinery by soft resetting the CPU and branching
+ * to the MCPM low-level entry code before returning to the caller.
+ * The @cache_disable function must do the necessary cache disabling to
+ * let the regular kernel init code turn it back on as if the CPU was
+ * hotplugged in. The MCPM state machine is set as if the cluster was
+ * initialized meaning the power_up_setup callback passed to mcpm_sync_init()
+ * will be invoked for all affinity levels. This may be useful to initialize
+ * some resources such as enabling the CCI that requires the cache to be off, or simply for testing purposes.
+ */
+int __init mcpm_loopback(void (*cache_disable)(void));
+
 void __init mcpm_smp_set_ops(void);
 
 #else
diff --git a/arch/arm/include/asm/mcs_spinlock.h b/arch/arm/include/asm/mcs_spinlock.h
new file mode 100644
index 000000000000..f652ad65840a
--- /dev/null
+++ b/arch/arm/include/asm/mcs_spinlock.h
@@ -0,0 +1,23 @@
+#ifndef __ASM_MCS_LOCK_H
+#define __ASM_MCS_LOCK_H
+
+#ifdef CONFIG_SMP
+#include <asm/spinlock.h>
+
+/* MCS spin-locking. */
+#define arch_mcs_spin_lock_contended(lock)                              \
+do {                                                                    \
+        /* Ensure prior stores are observed before we enter wfe. */     \
+        smp_mb();                                                       \
+        while (!(smp_load_acquire(lock)))                               \
+                wfe();                                                  \
+} while (0)                                                             \
+
+#define arch_mcs_spin_unlock_contended(lock)                            \
+do {                                                                    \
+        smp_store_release(lock, 1);                                     \
+        dsb_sev();                                                      \
+} while (0)
+
+#endif  /* CONFIG_SMP */
+#endif  /* __ASM_MCS_LOCK_H */
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 2b751464d6ff..e731018869a7 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -91,9 +91,7 @@
  * of this define that was meant to.
  * Fortunately, there is no reference for this in noMMU mode, for now.
  */
-#ifndef TASK_SIZE
-#define TASK_SIZE               (CONFIG_DRAM_SIZE)
-#endif
+#define TASK_SIZE               UL(0xffffffff)
 
 #ifndef TASK_UNMAPPED_BASE
 #define TASK_UNMAPPED_BASE      UL(0x00000000)
@@ -150,13 +148,11 @@
 
 /*
  * PLAT_PHYS_OFFSET is the offset (from zero) of the start of physical
- * memory.  This is used for XIP and NoMMU kernels, or by kernels which
- * have their own mach/memory.h.  Assembly code must always use
+ * memory.  This is used for XIP and NoMMU kernels, and on platforms that don't
+ * have CONFIG_ARM_PATCH_PHYS_VIRT. Assembly code must always use
  * PLAT_PHYS_OFFSET and not PHYS_OFFSET.
  */
-#ifndef PLAT_PHYS_OFFSET
 #define PLAT_PHYS_OFFSET        UL(CONFIG_PHYS_OFFSET)
-#endif
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/arm/include/asm/perf_event.h b/arch/arm/include/asm/perf_event.h
index 755877527cf9..c3a83691af8e 100644
--- a/arch/arm/include/asm/perf_event.h
+++ b/arch/arm/include/asm/perf_event.h
@@ -12,15 +12,6 @@
 #ifndef __ARM_PERF_EVENT_H__
 #define __ARM_PERF_EVENT_H__
 
-/*
- * The ARMv7 CPU PMU supports up to 32 event counters.
- */
-#define ARMPMU_MAX_HWEVENTS             32
-
-#define HW_OP_UNSUPPORTED               0xFFFF
-#define C(_x)                           PERF_COUNT_HW_CACHE_##_x
-#define CACHE_OP_UNSUPPORTED            0xFFFF
-
 #ifdef CONFIG_HW_PERF_EVENTS
 struct pt_regs;
 extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
index 626989fec4d3..9fd61c72a33a 100644
--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
@@ -43,7 +43,7 @@
 #define PMD_SECT_BUFFERABLE     (_AT(pmdval_t, 1) << 2)
 #define PMD_SECT_CACHEABLE      (_AT(pmdval_t, 1) << 3)
 #define PMD_SECT_USER           (_AT(pmdval_t, 1) << 6)         /* AP[1] */
-#define PMD_SECT_RDONLY         (_AT(pmdval_t, 1) << 7)         /* AP[2] */
+#define PMD_SECT_AP2            (_AT(pmdval_t, 1) << 7)         /* read only */
 #define PMD_SECT_S              (_AT(pmdval_t, 3) << 8)
 #define PMD_SECT_AF             (_AT(pmdval_t, 1) << 10)
 #define PMD_SECT_nG             (_AT(pmdval_t, 1) << 11)
@@ -72,6 +72,7 @@
 #define PTE_TABLE_BIT           (_AT(pteval_t, 1) << 1)
 #define PTE_BUFFERABLE          (_AT(pteval_t, 1) << 2)         /* AttrIndx[0] */
 #define PTE_CACHEABLE           (_AT(pteval_t, 1) << 3)         /* AttrIndx[1] */
+#define PTE_AP2                 (_AT(pteval_t, 1) << 7)         /* AP[2] */
 #define PTE_EXT_SHARED          (_AT(pteval_t, 3) << 8)         /* SH[1:0], inner shareable */
 #define PTE_EXT_AF              (_AT(pteval_t, 1) << 10)        /* Access Flag */
 #define PTE_EXT_NG              (_AT(pteval_t, 1) << 11)        /* nG */
diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
index 85c60adc8b60..06e0bc0f8b00 100644
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@ -79,18 +79,19 @@
 #define L_PTE_PRESENT           (_AT(pteval_t, 3) << 0)         /* Present */
 #define L_PTE_FILE              (_AT(pteval_t, 1) << 2)         /* only when !PRESENT */
 #define L_PTE_USER              (_AT(pteval_t, 1) << 6)         /* AP[1] */
-#define L_PTE_RDONLY            (_AT(pteval_t, 1) << 7)         /* AP[2] */
 #define L_PTE_SHARED            (_AT(pteval_t, 3) << 8)         /* SH[1:0], inner shareable */
 #define L_PTE_YOUNG             (_AT(pteval_t, 1) << 10)        /* AF */
 #define L_PTE_XN                (_AT(pteval_t, 1) << 54)        /* XN */
-#define L_PTE_DIRTY             (_AT(pteval_t, 1) << 55)        /* unused */
-#define L_PTE_SPECIAL           (_AT(pteval_t, 1) << 56)        /* unused */
+#define L_PTE_DIRTY             (_AT(pteval_t, 1) << 55)
+#define L_PTE_SPECIAL           (_AT(pteval_t, 1) << 56)
 #define L_PTE_NONE              (_AT(pteval_t, 1) << 57)        /* PROT_NONE */
+#define L_PTE_RDONLY            (_AT(pteval_t, 1) << 58)        /* READ ONLY */
 
-#define PMD_SECT_VALID          (_AT(pmdval_t, 1) << 0)
-#define PMD_SECT_DIRTY          (_AT(pmdval_t, 1) << 55)
-#define PMD_SECT_SPLITTING      (_AT(pmdval_t, 1) << 56)
-#define PMD_SECT_NONE           (_AT(pmdval_t, 1) << 57)
+#define L_PMD_SECT_VALID        (_AT(pmdval_t, 1) << 0)
+#define L_PMD_SECT_DIRTY        (_AT(pmdval_t, 1) << 55)
+#define L_PMD_SECT_SPLITTING    (_AT(pmdval_t, 1) << 56)
+#define L_PMD_SECT_NONE         (_AT(pmdval_t, 1) << 57)
+#define L_PMD_SECT_RDONLY       (_AT(pteval_t, 1) << 58)
 
 /*
  * To be used in assembly code with the upper page attributes.
@@ -207,27 +208,32 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)
 #define pte_huge(pte)           (pte_val(pte) && !(pte_val(pte) & PTE_TABLE_BIT))
 #define pte_mkhuge(pte)         (__pte(pte_val(pte) & ~PTE_TABLE_BIT))
 
-#define pmd_young(pmd)          (pmd_val(pmd) & PMD_SECT_AF)
+#define pmd_isset(pmd, val)     ((u32)(val) == (val) ? pmd_val(pmd) & (val) \
+                                                : !!(pmd_val(pmd) & (val)))
+#define pmd_isclear(pmd, val)   (!(pmd_val(pmd) & (val)))
+
+#define pmd_young(pmd)          (pmd_isset((pmd), PMD_SECT_AF))
 
 #define __HAVE_ARCH_PMD_WRITE
-#define pmd_write(pmd)          (!(pmd_val(pmd) & PMD_SECT_RDONLY))
+#define pmd_write(pmd)          (pmd_isclear((pmd), L_PMD_SECT_RDONLY))
+#define pmd_dirty(pmd)          (pmd_isset((pmd), L_PMD_SECT_DIRTY))
 
 #define pmd_hugewillfault(pmd)  (!pmd_young(pmd) || !pmd_write(pmd))
 #define pmd_thp_or_huge(pmd)    (pmd_huge(pmd) || pmd_trans_huge(pmd))
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-#define pmd_trans_huge(pmd)     (pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT))
-#define pmd_trans_splitting(pmd) (pmd_val(pmd) & PMD_SECT_SPLITTING)
+#define pmd_trans_huge(pmd)     (pmd_val(pmd) && !pmd_table(pmd))
+#define pmd_trans_splitting(pmd) (pmd_isset((pmd), L_PMD_SECT_SPLITTING))
 #endif
 
 #define PMD_BIT_FUNC(fn,op) \
 static inline pmd_t pmd_##fn(pmd_t pmd) { pmd_val(pmd) op; return pmd; }
 
-PMD_BIT_FUNC(wrprotect, |= PMD_SECT_RDONLY);
+PMD_BIT_FUNC(wrprotect, |= L_PMD_SECT_RDONLY);
 PMD_BIT_FUNC(mkold,     &= ~PMD_SECT_AF);
-PMD_BIT_FUNC(mksplitting, |= PMD_SECT_SPLITTING);
-PMD_BIT_FUNC(mkwrite,   &= ~PMD_SECT_RDONLY);
-PMD_BIT_FUNC(mkdirty,   |= PMD_SECT_DIRTY);
+PMD_BIT_FUNC(mksplitting, |= L_PMD_SECT_SPLITTING);
+PMD_BIT_FUNC(mkwrite,   &= ~L_PMD_SECT_RDONLY);
+PMD_BIT_FUNC(mkdirty,   |= L_PMD_SECT_DIRTY);
 PMD_BIT_FUNC(mkyoung,   |= PMD_SECT_AF);
 
 #define pmd_mkhuge(pmd)         (__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))
@@ -241,8 +247,8 @@ PMD_BIT_FUNC(mkyoung,   |= PMD_SECT_AF);
 
 static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
 {
-        const pmdval_t mask = PMD_SECT_USER | PMD_SECT_XN | PMD_SECT_RDONLY |
-                                PMD_SECT_VALID | PMD_SECT_NONE;
+        const pmdval_t mask = PMD_SECT_USER | PMD_SECT_XN | L_PMD_SECT_RDONLY |
+                                L_PMD_SECT_VALID | L_PMD_SECT_NONE;
         pmd_val(pmd) = (pmd_val(pmd) & ~mask) | (pgprot_val(newprot) & mask);
         return pmd;
 }
@@ -253,8 +259,13 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
         BUG_ON(addr >= TASK_SIZE);
 
         /* create a faulting entry if PROT_NONE protected */
-        if (pmd_val(pmd) & PMD_SECT_NONE)
-                pmd_val(pmd) &= ~PMD_SECT_VALID;
+        if (pmd_val(pmd) & L_PMD_SECT_NONE)
+                pmd_val(pmd) &= ~L_PMD_SECT_VALID;
+
+        if (pmd_write(pmd) && pmd_dirty(pmd))
+                pmd_val(pmd) &= ~PMD_SECT_AP2;
+        else
+                pmd_val(pmd) |= PMD_SECT_AP2;
 
         *pmdp = __pmd(pmd_val(pmd) | PMD_SECT_nG);
         flush_pmd_entry(pmdp);
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 5478e5d6ad89..01baef07cd0c 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -214,18 +214,22 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd)
 
 #define pte_clear(mm,addr,ptep) set_pte_ext(ptep, __pte(0), 0)
 
+#define pte_isset(pte, val)     ((u32)(val) == (val) ? pte_val(pte) & (val) \
+                                                : !!(pte_val(pte) & (val)))
+#define pte_isclear(pte, val)   (!(pte_val(pte) & (val)))
+
 #define pte_none(pte)           (!pte_val(pte))
-#define pte_present(pte)        (pte_val(pte) & L_PTE_PRESENT)
-#define pte_valid(pte)          (pte_val(pte) & L_PTE_VALID)
+#define pte_present(pte)        (pte_isset((pte), L_PTE_PRESENT))
+#define pte_valid(pte)          (pte_isset((pte), L_PTE_VALID))
 #define pte_accessible(mm, pte) (mm_tlb_flush_pending(mm) ? pte_present(pte) : pte_valid(pte))
-#define pte_write(pte)          (!(pte_val(pte) & L_PTE_RDONLY))
-#define pte_dirty(pte)          (pte_val(pte) & L_PTE_DIRTY)
-#define pte_young(pte)          (pte_val(pte) & L_PTE_YOUNG)
-#define pte_exec(pte)           (!(pte_val(pte) & L_PTE_XN))
+#define pte_write(pte)          (pte_isclear((pte), L_PTE_RDONLY))
+#define pte_dirty(pte)          (pte_isset((pte), L_PTE_DIRTY))
+#define pte_young(pte)          (pte_isset((pte), L_PTE_YOUNG))
+#define pte_exec(pte)           (pte_isclear((pte), L_PTE_XN))
 #define pte_special(pte)        (0)
 
 #define pte_valid_user(pte)     \
-        (pte_valid(pte) && (pte_val(pte) & L_PTE_USER) && pte_young(pte))
+        (pte_valid(pte) && pte_isset((pte), L_PTE_USER) && pte_young(pte))
 
 #if __LINUX_ARM_ARCH__ < 6
 static inline void __sync_icache_dcache(pte_t pteval)
diff --git a/arch/arm/include/asm/pmu.h b/arch/arm/include/asm/pmu.h
index ae1919be8f98..0b648c541293 100644
--- a/arch/arm/include/asm/pmu.h
+++ b/arch/arm/include/asm/pmu.h
@@ -42,6 +42,25 @@ struct arm_pmu_platdata {
 
 #ifdef CONFIG_HW_PERF_EVENTS
 
+/*
+ * The ARMv7 CPU PMU supports up to 32 event counters.
+ */
+#define ARMPMU_MAX_HWEVENTS             32
+
+#define HW_OP_UNSUPPORTED               0xFFFF
+#define C(_x)                           PERF_COUNT_HW_CACHE_##_x
+#define CACHE_OP_UNSUPPORTED            0xFFFF
+
+#define PERF_MAP_ALL_UNSUPPORTED                                        \
+        [0 ... PERF_COUNT_HW_MAX - 1] = HW_OP_UNSUPPORTED
+
+#define PERF_CACHE_MAP_ALL_UNSUPPORTED                                  \
+[0 ... C(MAX) - 1] = {                                                  \
+        [0 ... C(OP_MAX) - 1] = {                                       \
+                [0 ... C(RESULT_MAX) - 1] = CACHE_OP_UNSUPPORTED,       \
+        },                                                              \
+}
+
 /* The events for a given PMU register set. */
 struct pmu_hw_events {
         /*
diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
index c877654fe3bf..601264d983fa 100644
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -84,6 +84,12 @@ static inline long regs_return_value(struct pt_regs *regs)
 
 #define instruction_pointer(regs)       (regs)->ARM_pc
 
+#ifdef CONFIG_THUMB2_KERNEL
+#define frame_pointer(regs) (regs)->ARM_r7
+#else
+#define frame_pointer(regs) (regs)->ARM_fp
+#endif
+
 static inline void instruction_pointer_set(struct pt_regs *regs,
                                            unsigned long val)
 {
diff --git a/arch/arm/include/asm/scatterlist.h b/arch/arm/include/asm/scatterlist.h
deleted file mode 100644
index cefdb8f898a1..000000000000
--- a/arch/arm/include/asm/scatterlist.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASMARM_SCATTERLIST_H
-#define _ASMARM_SCATTERLIST_H
-
-#ifdef CONFIG_ARM_HAS_SG_CHAIN
-#define ARCH_HAS_SG_CHAIN
-#endif
-
-#include <asm/memory.h>
-#include <asm/types.h>
-#include <asm-generic/scatterlist.h>
-
-#endif /* _ASMARM_SCATTERLIST_H */
diff --git a/arch/arm/include/asm/smp_scu.h b/arch/arm/include/asm/smp_scu.h
index 0393fbab8dd5..bfe163c40024 100644
--- a/arch/arm/include/asm/smp_scu.h
+++ b/arch/arm/include/asm/smp_scu.h
@@ -11,7 +11,7 @@
 
 static inline bool scu_a9_has_base(void)
 {
-        return read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9;
+        return read_cpuid_part() == ARM_CPU_PART_CORTEX_A9;
 }
 
 static inline unsigned long scu_a9_get_base(void)
diff --git a/arch/arm/include/asm/stacktrace.h b/arch/arm/include/asm/stacktrace.h
index 4d0a16441b29..7722201ead19 100644
--- a/arch/arm/include/asm/stacktrace.h
+++ b/arch/arm/include/asm/stacktrace.h
@@ -1,13 +1,28 @@
 #ifndef __ASM_STACKTRACE_H
 #define __ASM_STACKTRACE_H
 
+#include <asm/ptrace.h>
+
 struct stackframe {
+        /*
+         * FP member should hold R7 when CONFIG_THUMB2_KERNEL is enabled
+         * and R11 otherwise.
+         */
         unsigned long fp;
         unsigned long sp;
         unsigned long lr;
         unsigned long pc;
 };
 
+static __always_inline
+void arm_get_current_stackframe(struct pt_regs *regs, struct stackframe *frame)
+{
+                frame->fp = frame_pointer(regs);
+                frame->sp = regs->ARM_sp;
+                frame->lr = regs->ARM_lr;
+                frame->pc = regs->ARM_pc;
+}
+
 extern int unwind_frame(struct stackframe *frame);
 extern void walk_stackframe(struct stackframe *frame,
                             int (*fn)(struct stackframe *, void *), void *data);
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index e4e4208a9130..fc44d3761f9e 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -14,9 +14,10 @@
 
 #include <linux/compiler.h>
 #include <asm/fpstate.h>
+#include <asm/page.h>
 
 #define THREAD_SIZE_ORDER       1
-#define THREAD_SIZE             8192
+#define THREAD_SIZE             (PAGE_SIZE << THREAD_SIZE_ORDER)
 #define THREAD_START_SP         (THREAD_SIZE - 8)
 
 #ifndef __ASSEMBLY__
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index 75d95799b6e6..a4cd7af475e9 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -107,6 +107,8 @@ static inline void set_fs(mm_segment_t fs)
 extern int __get_user_1(void *);
 extern int __get_user_2(void *);
 extern int __get_user_4(void *);
+extern int __get_user_lo8(void *);
+extern int __get_user_8(void *);
 
 #define __GUP_CLOBBER_1 "lr", "cc"
 #ifdef CONFIG_CPU_USE_DOMAINS
@@ -115,6 +117,8 @@ extern int __get_user_4(void *);
 #define __GUP_CLOBBER_2 "lr", "cc"
 #endif
 #define __GUP_CLOBBER_4 "lr", "cc"
+#define __GUP_CLOBBER_lo8 "lr", "cc"
+#define __GUP_CLOBBER_8 "lr", "cc"
 
 #define __get_user_x(__r2,__p,__e,__l,__s)                              \
            __asm__ __volatile__ (                                       \
@@ -125,11 +129,19 @@ extern int __get_user_4(void *);
                 : "0" (__p), "r" (__l)                                  \
                 : __GUP_CLOBBER_##__s)
 
+/* narrowing a double-word get into a single 32bit word register: */
+#ifdef __ARMEB__
+#define __get_user_xb(__r2, __p, __e, __l, __s)                         \
+        __get_user_x(__r2, __p, __e, __l, lo8)
+#else
+#define __get_user_xb __get_user_x
+#endif
+
 #define __get_user_check(x,p)                                                   \
         ({                                                              \
                 unsigned long __limit = current_thread_info()->addr_limit - 1; \
                 register const typeof(*(p)) __user *__p asm("r0") = (p);\
-                register unsigned long __r2 asm("r2");                  \
+                register typeof(x) __r2 asm("r2");                      \
                 register unsigned long __l asm("r1") = __limit;         \
                 register int __e asm("r0");                             \
                 switch (sizeof(*(__p))) {                               \
@@ -142,6 +154,12 @@ extern int __get_user_4(void *);
                 case 4:                                                 \
                         __get_user_x(__r2, __p, __e, __l, 4);           \
                         break;                                          \
+                case 8:                                                 \
+                        if (sizeof((x)) < 8)                            \
+                                __get_user_xb(__r2, __p, __e, __l, 4);  \
+                        else                                            \
+                                __get_user_x(__r2, __p, __e, __l, 8);   \
+                        break;                                          \
                 default: __e = __get_user_bad(); break;                 \
                 }                                                       \
                 x = (typeof(*(p))) __r2;                                \
@@ -224,7 +242,7 @@ static inline void set_fs(mm_segment_t fs)
 #define access_ok(type,addr,size)       (__range_ok(addr,size) == 0)
 
 #define user_addr_max() \
-        (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)
+        (segment_eq(get_fs(), KERNEL_DS) ? ~0UL : get_fs())
 
 /*
  * The "__xxx" versions of the user access functions do not verify the
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 43876245fc57..32640c431a08 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -15,7 +15,17 @@
 
 #include <uapi/asm/unistd.h>
 
-#define __NR_syscalls  (384)
+/*
+ * This may need to be greater than __NR_last_syscall+1 in order to
+ * account for the padding in the syscall table
+ */
+#define __NR_syscalls  (388)
+
+/*
+ * *NOTE*: This is a ghost syscall private to the kernel.  Only the
+ * __kuser_cmpxchg code in entry-armv.S should be aware of its
+ * existence.  Don't ever use this from user code.
+ */
 #define __ARM_NR_cmpxchg                (__ARM_NR_BASE+0x00fff0)
 
 #define __ARCH_WANT_STAT64
diff --git a/arch/arm/include/debug/clps711x.S b/arch/arm/include/debug/clps711x.S
new file mode 100644
index 000000000000..abe225436686
--- /dev/null
+++ b/arch/arm/include/debug/clps711x.S
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>
+ *
+ * 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.
+ */
+
+#ifndef CONFIG_DEBUG_CLPS711X_UART2
+#define CLPS711X_UART_PADDR     (0x80000000 + 0x0000)
+#define CLPS711X_UART_VADDR     (0xfeff0000 + 0x0000)
+#else
+#define CLPS711X_UART_PADDR     (0x80000000 + 0x1000)
+#define CLPS711X_UART_VADDR     (0xfeff0000 + 0x1000)
+#endif
+
+#define SYSFLG          (0x0140)
+#define SYSFLG_UBUSY    (1 << 11)
+#define UARTDR          (0x0480)
+
+        .macro  addruart, rp, rv, tmp
+        ldr     \rv, =CLPS711X_UART_VADDR
+        ldr     \rp, =CLPS711X_UART_PADDR
+        .endm
+
+        .macro  waituart,rd,rx
+        .endm
+
+        .macro  senduart,rd,rx
+        str     \rd, [\rx, #UARTDR]
+        .endm
+
+        .macro  busyuart,rd,rx
+1001:   ldr     \rd, [\rx, #SYSFLG]
+        tst     \rd, #SYSFLG_UBUSY
+        bne     1001b
+        .endm
diff --git a/arch/arm/mach-s5pv210/include/mach/debug-macro.S b/arch/arm/include/debug/s5pv210.S
index 30b511a580aa..4f1a73e2c1a1 100644
--- a/arch/arm/mach-s5pv210/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/s5pv210.S
@@ -1,9 +1,6 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/debug-macro.S
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Based on arch/arm/mach-s3c6400/include/mach/debug-macro.S
+/*
+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.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
@@ -12,8 +9,9 @@
 
 /* pull in the relevant register and map files. */
 
-#include <linux/serial_s3c.h>
-#include <mach/map.h>
+#define S3C_ADDR_BASE   0xF6000000
+#define S3C_VA_UART     S3C_ADDR_BASE + 0x01000000
+#define S5PV210_PA_UART 0xe2900000
 
         /* note, for the boot process to work we have to keep the UART
          * virtual address aligned to an 1MiB boundary for the L1
@@ -22,8 +20,8 @@
          */
 
         .macro addruart, rp, rv, tmp
-                ldr     \rp, = S3C_PA_UART
-                ldr     \rv, = S3C_VA_UART
+                ldr     \rp, =S5PV210_PA_UART
+                ldr     \rv, =S3C_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0
                 add     \rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
                 add     \rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
@@ -33,9 +31,4 @@
 #define fifo_full fifo_full_s5pv210
 #define fifo_level fifo_level_s5pv210
 
-/* include the reset of the code which will do the work, we're only
- * compiling for a single cpu processor type so the default of s3c2440
- * will be fine with us.
- */
-
 #include <debug/samsung.S>
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h
index ba94446c72d9..3aaa75cae90c 100644
--- a/arch/arm/include/uapi/asm/unistd.h
+++ b/arch/arm/include/uapi/asm/unistd.h
@@ -409,11 +409,9 @@
 #define __NR_sched_setattr              (__NR_SYSCALL_BASE+380)
 #define __NR_sched_getattr              (__NR_SYSCALL_BASE+381)
 #define __NR_renameat2                  (__NR_SYSCALL_BASE+382)
-
-/*
- * This may need to be greater than __NR_last_syscall+1 in order to
- * account for the padding in the syscall table
- */
+#define __NR_seccomp                    (__NR_SYSCALL_BASE+383)
+#define __NR_getrandom                  (__NR_SYSCALL_BASE+384)
+#define __NR_memfd_create               (__NR_SYSCALL_BASE+385)
 
 /*
  * The following SWIs are ARM private.
@@ -426,12 +424,6 @@
 #define __ARM_NR_set_tls                (__ARM_NR_BASE+5)
 
 /*
- * *NOTE*: This is a ghost syscall private to the kernel.  Only the
- * __kuser_cmpxchg code in entry-armv.S should be aware of its
- * existence.  Don't ever use this from user code.
- */
-
-/*
  * The following syscalls are obsolete and no longer available for EABI.
  */
 #if !defined(__KERNEL__)
diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
index 85598b5d1efd..713e807621d2 100644
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
@@ -182,13 +182,13 @@ int main(void)
   DEFINE(VCPU_HYP_PC,           offsetof(struct kvm_vcpu, arch.fault.hyp_pc));
 #ifdef CONFIG_KVM_ARM_VGIC
   DEFINE(VCPU_VGIC_CPU,         offsetof(struct kvm_vcpu, arch.vgic_cpu));
-  DEFINE(VGIC_CPU_HCR,          offsetof(struct vgic_cpu, vgic_hcr));
-  DEFINE(VGIC_CPU_VMCR,         offsetof(struct vgic_cpu, vgic_vmcr));
-  DEFINE(VGIC_CPU_MISR,         offsetof(struct vgic_cpu, vgic_misr));
-  DEFINE(VGIC_CPU_EISR,         offsetof(struct vgic_cpu, vgic_eisr));
-  DEFINE(VGIC_CPU_ELRSR,        offsetof(struct vgic_cpu, vgic_elrsr));
-  DEFINE(VGIC_CPU_APR,          offsetof(struct vgic_cpu, vgic_apr));
-  DEFINE(VGIC_CPU_LR,           offsetof(struct vgic_cpu, vgic_lr));
+  DEFINE(VGIC_V2_CPU_HCR,       offsetof(struct vgic_cpu, vgic_v2.vgic_hcr));
+  DEFINE(VGIC_V2_CPU_VMCR,      offsetof(struct vgic_cpu, vgic_v2.vgic_vmcr));
+  DEFINE(VGIC_V2_CPU_MISR,      offsetof(struct vgic_cpu, vgic_v2.vgic_misr));
+  DEFINE(VGIC_V2_CPU_EISR,      offsetof(struct vgic_cpu, vgic_v2.vgic_eisr));
+  DEFINE(VGIC_V2_CPU_ELRSR,     offsetof(struct vgic_cpu, vgic_v2.vgic_elrsr));
+  DEFINE(VGIC_V2_CPU_APR,       offsetof(struct vgic_cpu, vgic_v2.vgic_apr));
+  DEFINE(VGIC_V2_CPU_LR,        offsetof(struct vgic_cpu, vgic_v2.vgic_lr));
   DEFINE(VGIC_CPU_NR_LR,        offsetof(struct vgic_cpu, nr_lr));
 #ifdef CONFIG_KVM_ARM_TIMER
   DEFINE(VCPU_TIMER_CNTV_CTL,   offsetof(struct kvm_vcpu, arch.timer_cpu.cntv_ctl));
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 8f51bdcdacbb..9f899d8fdcca 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -392,6 +392,9 @@
 /* 380 */       CALL(sys_sched_setattr)
                 CALL(sys_sched_getattr)
                 CALL(sys_renameat2)
+                CALL(sys_seccomp)
+                CALL(sys_getrandom)
+/* 385 */       CALL(sys_memfd_create)
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index 14f7c3b14632..78c91b5f97d4 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -90,7 +90,7 @@ ENTRY(printascii)
                 ldrneb  r1, [r0], #1
                 teqne   r1, #0
                 bne     1b
-                mov     pc, lr
+                ret     lr
 ENDPROC(printascii)
 
 ENTRY(printch)
@@ -105,7 +105,7 @@ ENTRY(debug_ll_addr)
                 addruart r2, r3, ip
                 str     r2, [r0]
                 str     r3, [r1]
-                mov     pc, lr
+                ret     lr
 ENDPROC(debug_ll_addr)
 #endif
 
@@ -116,7 +116,7 @@ ENTRY(printascii)
                 mov     r0, #0x04               @ SYS_WRITE0
         ARM(    svc     #0x123456       )
         THUMB(  svc     #0xab           )
-                mov     pc, lr
+                ret     lr
 ENDPROC(printascii)
 
 ENTRY(printch)
@@ -125,14 +125,14 @@ ENTRY(printch)
                 mov     r0, #0x03               @ SYS_WRITEC
         ARM(    svc     #0x123456       )
         THUMB(  svc     #0xab           )
-                mov     pc, lr
+                ret     lr
 ENDPROC(printch)
 
 ENTRY(debug_ll_addr)
                 mov     r2, #0
                 str     r2, [r0]
                 str     r2, [r1]
-                mov     pc, lr
+                ret     lr
 ENDPROC(debug_ll_addr)
 
 #endif
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 52a949a8077d..36276cdccfbc 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -224,7 +224,7 @@ svc_preempt:
 1:      bl      preempt_schedule_irq            @ irq en/disable is done inside
         ldr     r0, [tsk, #TI_FLAGS]            @ get new tasks TI_FLAGS
         tst     r0, #_TIF_NEED_RESCHED
-        moveq   pc, r8                          @ go again
+        reteq   r8                              @ go again
         b       1b
 #endif
 
@@ -490,7 +490,7 @@ ENDPROC(__und_usr)
         .pushsection .fixup, "ax"
         .align  2
 4:      str     r4, [sp, #S_PC]                 @ retry current instruction
-        mov     pc, r9
+        ret     r9
         .popsection
         .pushsection __ex_table,"a"
         .long   1b, 4b
@@ -552,7 +552,7 @@ call_fpe:
 #endif
         tst     r0, #0x08000000                 @ only CDP/CPRT/LDC/STC have bit 27
         tstne   r0, #0x04000000                 @ bit 26 set on both ARM and Thumb-2
-        moveq   pc, lr
+        reteq   lr
         and     r8, r0, #0x00000f00             @ mask out CP number
  THUMB( lsr     r8, r8, #8              )
         mov     r7, #1
@@ -571,33 +571,33 @@ call_fpe:
  THUMB( add     pc, r8                  )
         nop
 
-        movw_pc lr                              @ CP#0
+        ret.w   lr                              @ CP#0
         W(b)    do_fpe                          @ CP#1 (FPE)
         W(b)    do_fpe                          @ CP#2 (FPE)
-        movw_pc lr                              @ CP#3
+        ret.w   lr                              @ CP#3
 #ifdef CONFIG_CRUNCH
         b       crunch_task_enable              @ CP#4 (MaverickCrunch)
         b       crunch_task_enable              @ CP#5 (MaverickCrunch)
         b       crunch_task_enable              @ CP#6 (MaverickCrunch)
 #else
-        movw_pc lr                              @ CP#4
-        movw_pc lr                              @ CP#5
-        movw_pc lr                              @ CP#6
+        ret.w   lr                              @ CP#4
+        ret.w   lr                              @ CP#5
+        ret.w   lr                              @ CP#6
 #endif
-        movw_pc lr                              @ CP#7
-        movw_pc lr                              @ CP#8
-        movw_pc lr                              @ CP#9
+        ret.w   lr                              @ CP#7
+        ret.w   lr                              @ CP#8
+        ret.w   lr                              @ CP#9
 #ifdef CONFIG_VFP
         W(b)    do_vfp                          @ CP#10 (VFP)
         W(b)    do_vfp                          @ CP#11 (VFP)
 #else
-        movw_pc lr                              @ CP#10 (VFP)
-        movw_pc lr                              @ CP#11 (VFP)
+        ret.w   lr                              @ CP#10 (VFP)
+        ret.w   lr                              @ CP#11 (VFP)
 #endif
-        movw_pc lr                              @ CP#12
-        movw_pc lr                              @ CP#13
-        movw_pc lr                              @ CP#14 (Debug)
-        movw_pc lr                              @ CP#15 (Control)
+        ret.w   lr                              @ CP#12
+        ret.w   lr                              @ CP#13
+        ret.w   lr                              @ CP#14 (Debug)
+        ret.w   lr                              @ CP#15 (Control)
 
 #ifdef NEED_CPU_ARCHITECTURE
         .align  2
@@ -649,7 +649,7 @@ ENTRY(fp_enter)
         .popsection
 
 ENTRY(no_fp)
-        mov     pc, lr
+        ret     lr
 ENDPROC(no_fp)
 
 __und_usr_fault_32:
@@ -745,7 +745,7 @@ ENDPROC(__switch_to)
 #ifdef CONFIG_ARM_THUMB
         bx      \reg
 #else
-        mov     pc, \reg
+        ret     \reg
 #endif
         .endm
 
@@ -837,7 +837,7 @@ kuser_cmpxchg64_fixup:
 #if __LINUX_ARM_ARCH__ < 6
         bcc     kuser_cmpxchg32_fixup
 #endif
-        mov     pc, lr
+        ret     lr
         .previous
 
 #else
@@ -905,7 +905,7 @@ kuser_cmpxchg32_fixup:
         subs    r8, r4, r7
         rsbcss  r8, r8, #(2b - 1b)
         strcs   r7, [sp, #S_PC]
-        mov     pc, lr
+        ret     lr
         .previous
 
 #else
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 7139d4a7dea7..e52fe5a2d843 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -8,6 +8,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <asm/assembler.h>
 #include <asm/unistd.h>
 #include <asm/ftrace.h>
 #include <asm/unwind.h>
@@ -88,7 +89,7 @@ ENTRY(ret_from_fork)
         cmp     r5, #0
         movne   r0, r4
         adrne   lr, BSYM(1f)
-        movne   pc, r5
+        retne   r5
 1:      get_thread_info tsk
         b       ret_slow_syscall
 ENDPROC(ret_from_fork)
@@ -290,7 +291,7 @@ ENDPROC(ftrace_graph_caller_old)
 
 .macro mcount_exit
         ldmia   sp!, {r0-r3, ip, lr}
-        mov     pc, ip
+        ret     ip
 .endm
 
 ENTRY(__gnu_mcount_nc)
@@ -298,7 +299,7 @@ UNWIND(.fnstart)
 #ifdef CONFIG_DYNAMIC_FTRACE
         mov     ip, lr
         ldmia   sp!, {lr}
-        mov     pc, ip
+        ret     ip
 #else
         __mcount
 #endif
@@ -333,12 +334,12 @@ return_to_handler:
         bl      ftrace_return_to_handler
         mov     lr, r0                  @ r0 has real ret addr
         ldmia   sp!, {r0-r3}
-        mov     pc, lr
+        ret     lr
 #endif
 
 ENTRY(ftrace_stub)
 .Lftrace_stub:
-        mov     pc, lr
+        ret     lr
 ENDPROC(ftrace_stub)
 
 #endif /* CONFIG_FUNCTION_TRACER */
@@ -561,7 +562,7 @@ sys_mmap2:
                 streq   r5, [sp, #4]
                 beq     sys_mmap_pgoff
                 mov     r0, #-EINVAL
-                mov     pc, lr
+                ret     lr
 #else
                 str     r5, [sp, #4]
                 b       sys_mmap_pgoff
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 5d702f8900b1..8db307d0954b 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -240,12 +240,6 @@
         movs    pc, lr                          @ return & move spsr_svc into cpsr
         .endm
 
-        @
-        @ 32-bit wide "mov pc, reg"
-        @
-        .macro  movw_pc, reg
-        mov     pc, \reg
-        .endm
 #else   /* CONFIG_THUMB2_KERNEL */
         .macro  svc_exit, rpsr, irq = 0
         .if     \irq != 0
@@ -304,14 +298,6 @@
         movs    pc, lr                          @ return & move spsr_svc into cpsr
         .endm
 #endif  /* ifdef CONFIG_CPU_V7M / else */
-
-        @
-        @ 32-bit wide "mov pc, reg"
-        @
-        .macro  movw_pc, reg
-        mov     pc, \reg
-        nop
-        .endm
 #endif  /* !CONFIG_THUMB2_KERNEL */
 
 /*
diff --git a/arch/arm/kernel/fiqasm.S b/arch/arm/kernel/fiqasm.S
index 207f9d652010..8dd26e1a9bd6 100644
--- a/arch/arm/kernel/fiqasm.S
+++ b/arch/arm/kernel/fiqasm.S
@@ -32,7 +32,7 @@ ENTRY(__set_fiq_regs)
         ldr     lr, [r0]
         msr     cpsr_c, r1      @ return to SVC mode
         mov     r0, r0          @ avoid hazard prior to ARMv4
-        mov     pc, lr
+        ret     lr
 ENDPROC(__set_fiq_regs)
 
 ENTRY(__get_fiq_regs)
@@ -45,5 +45,5 @@ ENTRY(__get_fiq_regs)
         str     lr, [r0]
         msr     cpsr_c, r1      @ return to SVC mode
         mov     r0, r0          @ avoid hazard prior to ARMv4
-        mov     pc, lr
+        ret     lr
 ENDPROC(__get_fiq_regs)
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index 572a38335c96..8733012d231f 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -10,6 +10,7 @@
  * published by the Free Software Foundation.
  *
  */
+#include <asm/assembler.h>
 
 #define ATAG_CORE 0x54410001
 #define ATAG_CORE_SIZE ((2*4 + 3*4) >> 2)
@@ -61,10 +62,10 @@ __vet_atags:
         cmp     r5, r6
         bne     1f
 
-2:      mov     pc, lr                          @ atag/dtb pointer is ok
+2:      ret     lr                              @ atag/dtb pointer is ok
 
 1:      mov     r2, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(__vet_atags)
 
 /*
@@ -162,7 +163,7 @@ __lookup_processor_type:
         cmp     r5, r6
         blo     1b
         mov     r5, #0                          @ unknown processor
-2:      mov     pc, lr
+2:      ret     lr
 ENDPROC(__lookup_processor_type)
 
 /*
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
index 716249cc2ee1..cc176b67c134 100644
--- a/arch/arm/kernel/head-nommu.S
+++ b/arch/arm/kernel/head-nommu.S
@@ -82,7 +82,7 @@ ENTRY(stext)
         adr     lr, BSYM(1f)                    @ return (PIC) address
  ARM(   add     pc, r10, #PROCINFO_INITFUNC     )
  THUMB( add     r12, r10, #PROCINFO_INITFUNC    )
- THUMB( mov     pc, r12                         )
+ THUMB( ret     r12                             )
  1:     b       __after_proc_init
 ENDPROC(stext)
 
@@ -119,7 +119,7 @@ ENTRY(secondary_startup)
         mov     r13, r12                        @ __secondary_switched address
  ARM(   add     pc, r10, #PROCINFO_INITFUNC     )
  THUMB( add     r12, r10, #PROCINFO_INITFUNC    )
- THUMB( mov     pc, r12                         )
+ THUMB( ret     r12                             )
 ENDPROC(secondary_startup)
 
 ENTRY(__secondary_switched)
@@ -164,7 +164,7 @@ __after_proc_init:
 #endif
         mcr     p15, 0, r0, c1, c0, 0           @ write control reg
 #endif /* CONFIG_CPU_CP15 */
-        mov     pc, r13
+        ret     r13
 ENDPROC(__after_proc_init)
         .ltorg
 
@@ -254,7 +254,7 @@ ENTRY(__setup_mpu)
         orr     r0, r0, #CR_M                   @ Set SCTRL.M (MPU on)
         mcr     p15, 0, r0, c1, c0, 0           @ Enable MPU
         isb
-        mov pc,lr
+        ret     lr
 ENDPROC(__setup_mpu)
 #endif
 #include "head-common.S"
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 2c35f0ff2fdc..664eee8c4a26 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -140,7 +140,7 @@ ENTRY(stext)
         mov     r8, r4                          @ set TTBR1 to swapper_pg_dir
  ARM(   add     pc, r10, #PROCINFO_INITFUNC     )
  THUMB( add     r12, r10, #PROCINFO_INITFUNC    )
- THUMB( mov     pc, r12                         )
+ THUMB( ret     r12                             )
 1:      b       __enable_mmu
 ENDPROC(stext)
         .ltorg
@@ -335,7 +335,7 @@ __create_page_tables:
         sub     r4, r4, #0x1000         @ point to the PGD table
         mov     r4, r4, lsr #ARCH_PGD_SHIFT
 #endif
-        mov     pc, lr
+        ret     lr
 ENDPROC(__create_page_tables)
         .ltorg
         .align
@@ -383,7 +383,7 @@ ENTRY(secondary_startup)
  ARM(   add     pc, r10, #PROCINFO_INITFUNC     ) @ initialise processor
                                                   @ (return control reg)
  THUMB( add     r12, r10, #PROCINFO_INITFUNC    )
- THUMB( mov     pc, r12                         )
+ THUMB( ret     r12                             )
 ENDPROC(secondary_startup)
 
         /*
@@ -468,7 +468,7 @@ ENTRY(__turn_mmu_on)
         instr_sync
         mov     r3, r3
         mov     r3, r13
-        mov     pc, r3
+        ret     r3
 __turn_mmu_on_end:
 ENDPROC(__turn_mmu_on)
         .popsection
@@ -487,7 +487,7 @@ __fixup_smp:
         orr     r4, r4, #0x0000b000
         orr     r4, r4, #0x00000020     @ val 0x4100b020
         teq     r3, r4                  @ ARM 11MPCore?
-        moveq   pc, lr                  @ yes, assume SMP
+        reteq   lr                      @ yes, assume SMP
 
         mrc     p15, 0, r0, c0, c0, 5   @ read MPIDR
         and     r0, r0, #0xc0000000     @ multiprocessing extensions and
@@ -500,7 +500,7 @@ __fixup_smp:
         orr     r4, r4, #0x0000c000
         orr     r4, r4, #0x00000090
         teq     r3, r4                  @ Check for ARM Cortex-A9
-        movne   pc, lr                  @ Not ARM Cortex-A9,
+        retne   lr                      @ Not ARM Cortex-A9,
 
         @ If a future SoC *does* use 0x0 as the PERIPH_BASE, then the
         @ below address check will need to be #ifdef'd or equivalent
@@ -512,7 +512,7 @@ __fixup_smp:
 ARM_BE8(rev     r0, r0)                 @ byteswap if big endian
         and     r0, r0, #0x3            @ number of CPUs
         teq     r0, #0x0                @ is 1?
-        movne   pc, lr
+        retne   lr
 
 __fixup_smp_on_up:
         adr     r0, 1f
@@ -539,7 +539,7 @@ smp_on_up:
         .text
 __do_fixup_smp_on_up:
         cmp     r4, r5
-        movhs   pc, lr
+        reths   lr
         ldmia   r4!, {r0, r6}
  ARM(   str     r6, [r0, r3]    )
  THUMB( add     r0, r0, r3      )
@@ -672,7 +672,7 @@ ARM_BE8(rev16	ip, ip)
 2:      cmp     r4, r5
         ldrcc   r7, [r4], #4    @ use branch for delay slot
         bcc     1b
-        mov     pc, lr
+        ret     lr
 #endif
 ENDPROC(__fixup_a_pv_table)
 
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
index 797b1a6a4906..2a55373f49bf 100644
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -99,7 +99,7 @@ ENTRY(__hyp_stub_install_secondary)
          * immediately.
          */
         compare_cpu_mode_with_primary   r4, r5, r6, r7
-        movne   pc, lr
+        retne   lr
 
         /*
          * Once we have given up on one CPU, we do not try to install the
@@ -111,7 +111,7 @@ ENTRY(__hyp_stub_install_secondary)
          */
 
         cmp     r4, #HYP_MODE
-        movne   pc, lr                  @ give up if the CPU is not in HYP mode
+        retne   lr                      @ give up if the CPU is not in HYP mode
 
 /*
  * Configure HSCTLR to set correct exception endianness/instruction set
@@ -134,9 +134,7 @@ ENTRY(__hyp_stub_install_secondary)
         mcr     p15, 4, r7, c1, c1, 3   @ HSTR
 
 THUMB(  orr     r7, #(1 << 30)  )       @ HSCTLR.TE
-#ifdef CONFIG_CPU_BIG_ENDIAN
-        orr     r7, #(1 << 9)           @ HSCTLR.EE
-#endif
+ARM_BE8(orr     r7, r7, #(1 << 25))     @ HSCTLR.EE
         mcr     p15, 4, r7, c1, c0, 0   @ HSCTLR
 
         mrc     p15, 4, r7, c1, c1, 1   @ HDCR
@@ -201,7 +199,7 @@ ENDPROC(__hyp_get_vectors)
         @ fall through
 ENTRY(__hyp_set_vectors)
         __HVC(0)
-        mov     pc, lr
+        ret     lr
 ENDPROC(__hyp_set_vectors)
 
 #ifndef ZIMAGE
diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S
index 2b32978ae905..ad58e565fe98 100644
--- a/arch/arm/kernel/iwmmxt.S
+++ b/arch/arm/kernel/iwmmxt.S
@@ -100,7 +100,7 @@ ENTRY(iwmmxt_task_enable)
         get_thread_info r10
 #endif
 4:      dec_preempt_count r10, r3
-        mov     pc, r9                          @ normal exit from exception
+        ret     r9                              @ normal exit from exception
 
 concan_save:
 
@@ -144,7 +144,7 @@ concan_dump:
         wstrd   wR15, [r1, #MMX_WR15]
 
 2:      teq     r0, #0                          @ anything to load?
-        moveq   pc, lr                          @ if not, return
+        reteq   lr                              @ if not, return
 
 concan_load:
 
@@ -177,10 +177,10 @@ concan_load:
         @ clear CUP/MUP (only if r1 != 0)
         teq     r1, #0
         mov     r2, #0
-        moveq   pc, lr
+        reteq   lr
 
         tmcr    wCon, r2
-        mov     pc, lr
+        ret     lr
 
 /*
  * Back up Concan regs to save area and disable access to them
@@ -266,7 +266,7 @@ ENTRY(iwmmxt_task_copy)
         mov     r3, lr                          @ preserve return address
         bl      concan_dump
         msr     cpsr_c, ip                      @ restore interrupt mode
-        mov     pc, r3
+        ret     r3
 
 /*
  * Restore Concan state from given memory address
@@ -302,7 +302,7 @@ ENTRY(iwmmxt_task_restore)
         mov     r3, lr                          @ preserve return address
         bl      concan_load
         msr     cpsr_c, ip                      @ restore interrupt mode
-        mov     pc, r3
+        ret     r3
 
 /*
  * Concan handling on task switch
@@ -324,7 +324,7 @@ ENTRY(iwmmxt_task_switch)
         add     r3, r0, #TI_IWMMXT_STATE        @ get next task Concan save area
         ldr     r2, [r2]                        @ get current Concan owner
         teq     r2, r3                          @ next task owns it?
-        movne   pc, lr                          @ no: leave Concan disabled
+        retne   lr                              @ no: leave Concan disabled
 
 1:      @ flip Concan access
         XSC(eor r1, r1, #0x3)
@@ -351,7 +351,7 @@ ENTRY(iwmmxt_task_release)
         eors    r0, r0, r1                      @ if equal...
         streq   r0, [r3]                        @ then clear ownership
         msr     cpsr_c, r2                      @ restore interrupts
-        mov     pc, lr
+        ret     lr
 
         .data
 concan_owner:
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 4238bcba9d60..266cba46db3e 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -560,11 +560,16 @@ user_backtrace(struct frame_tail __user *tail,
                struct perf_callchain_entry *entry)
 {
         struct frame_tail buftail;
+        unsigned long err;
 
-        /* Also check accessibility of one struct frame_tail beyond */
         if (!access_ok(VERIFY_READ, tail, sizeof(buftail)))
                 return NULL;
-        if (__copy_from_user_inatomic(&buftail, tail, sizeof(buftail)))
+
+        pagefault_disable();
+        err = __copy_from_user_inatomic(&buftail, tail, sizeof(buftail));
+        pagefault_enable();
+
+        if (err)
                 return NULL;
 
         perf_callchain_store(entry, buftail.lr);
@@ -590,6 +595,10 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
         }
 
         perf_callchain_store(entry, regs->ARM_pc);
+
+        if (!current->mm)
+                return;
+
         tail = (struct frame_tail __user *)regs->ARM_fp - 1;
 
         while ((entry->nr < PERF_MAX_STACK_DEPTH) &&
@@ -621,10 +630,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
                 return;
         }
 
-        fr.fp = regs->ARM_fp;
-        fr.sp = regs->ARM_sp;
-        fr.lr = regs->ARM_lr;
-        fr.pc = regs->ARM_pc;
+        arm_get_current_stackframe(regs, &fr);
         walk_stackframe(&fr, callchain_trace, entry);
 }
 
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
index af9e35e8836f..e6a6edbec613 100644
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@ -233,14 +233,17 @@ static struct of_device_id cpu_pmu_of_device_ids[] = {
         {.compatible = "arm,cortex-a7-pmu",     .data = armv7_a7_pmu_init},
         {.compatible = "arm,cortex-a5-pmu",     .data = armv7_a5_pmu_init},
         {.compatible = "arm,arm11mpcore-pmu",   .data = armv6mpcore_pmu_init},
-        {.compatible = "arm,arm1176-pmu",       .data = armv6pmu_init},
-        {.compatible = "arm,arm1136-pmu",       .data = armv6pmu_init},
+        {.compatible = "arm,arm1176-pmu",       .data = armv6_1176_pmu_init},
+        {.compatible = "arm,arm1136-pmu",       .data = armv6_1136_pmu_init},
         {.compatible = "qcom,krait-pmu",        .data = krait_pmu_init},
         {},
 };
 
 static struct platform_device_id cpu_pmu_plat_device_ids[] = {
         {.name = "arm-pmu"},
+        {.name = "armv6-pmu"},
+        {.name = "armv7-pmu"},
+        {.name = "xscale-pmu"},
         {},
 };
 
@@ -250,40 +253,43 @@ static struct platform_device_id cpu_pmu_plat_device_ids[] = {
 static int probe_current_pmu(struct arm_pmu *pmu)
 {
         int cpu = get_cpu();
-        unsigned long implementor = read_cpuid_implementor();
-        unsigned long part_number = read_cpuid_part_number();
         int ret = -ENODEV;
 
         pr_info("probing PMU on CPU %d\n", cpu);
 
+        switch (read_cpuid_part()) {
         /* ARM Ltd CPUs. */
-        if (implementor == ARM_CPU_IMP_ARM) {
-                switch (part_number) {
-                case ARM_CPU_PART_ARM1136:
-                case ARM_CPU_PART_ARM1156:
-                case ARM_CPU_PART_ARM1176:
-                        ret = armv6pmu_init(pmu);
-                        break;
-                case ARM_CPU_PART_ARM11MPCORE:
-                        ret = armv6mpcore_pmu_init(pmu);
-                        break;
-                case ARM_CPU_PART_CORTEX_A8:
-                        ret = armv7_a8_pmu_init(pmu);
-                        break;
-                case ARM_CPU_PART_CORTEX_A9:
-                        ret = armv7_a9_pmu_init(pmu);
-                        break;
-                }
-        /* Intel CPUs [xscale]. */
-        } else if (implementor == ARM_CPU_IMP_INTEL) {
-                switch (xscale_cpu_arch_version()) {
-                case ARM_CPU_XSCALE_ARCH_V1:
-                        ret = xscale1pmu_init(pmu);
-                        break;
-                case ARM_CPU_XSCALE_ARCH_V2:
-                        ret = xscale2pmu_init(pmu);
-                        break;
+        case ARM_CPU_PART_ARM1136:
+                ret = armv6_1136_pmu_init(pmu);
+                break;
+        case ARM_CPU_PART_ARM1156:
+                ret = armv6_1156_pmu_init(pmu);
+                break;
+        case ARM_CPU_PART_ARM1176:
+                ret = armv6_1176_pmu_init(pmu);
+                break;
+        case ARM_CPU_PART_ARM11MPCORE:
+                ret = armv6mpcore_pmu_init(pmu);
+                break;
+        case ARM_CPU_PART_CORTEX_A8:
+                ret = armv7_a8_pmu_init(pmu);
+                break;
+        case ARM_CPU_PART_CORTEX_A9:
+                ret = armv7_a9_pmu_init(pmu);
+                break;
+
+        default:
+                if (read_cpuid_implementor() == ARM_CPU_IMP_INTEL) {
+                        switch (xscale_cpu_arch_version()) {
+                        case ARM_CPU_XSCALE_ARCH_V1:
+                                ret = xscale1pmu_init(pmu);
+                                break;
+                        case ARM_CPU_XSCALE_ARCH_V2:
+                                ret = xscale2pmu_init(pmu);
+                                break;
+                        }
                 }
+                break;
         }
 
         put_cpu();
diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c
index 03664b0e8fa4..abfeb04f3213 100644
--- a/arch/arm/kernel/perf_event_v6.c
+++ b/arch/arm/kernel/perf_event_v6.c
@@ -65,13 +65,11 @@ enum armv6_counters {
  * accesses/misses in hardware.
  */
 static const unsigned armv6_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]              = ARMV6_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]            = ARMV6_PERFCTR_INSTR_EXEC,
-        [PERF_COUNT_HW_CACHE_REFERENCES]        = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_CACHE_MISSES]            = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]     = ARMV6_PERFCTR_BR_EXEC,
         [PERF_COUNT_HW_BRANCH_MISSES]           = ARMV6_PERFCTR_BR_MISPREDICT,
-        [PERF_COUNT_HW_BUS_CYCLES]              = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = ARMV6_PERFCTR_IBUF_STALL,
         [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]  = ARMV6_PERFCTR_LSU_FULL_STALL,
 };
@@ -79,116 +77,31 @@ static const unsigned armv6_perf_map[PERF_COUNT_HW_MAX] = {
 static const unsigned armv6_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
                                           [PERF_COUNT_HW_CACHE_OP_MAX]
                                           [PERF_COUNT_HW_CACHE_RESULT_MAX] = {
-        [C(L1D)] = {
-                /*
-                 * The performance counters don't differentiate between read
-                 * and write accesses/misses so this isn't strictly correct,
-                 * but it's the best we can do. Writes and reads get
-                 * combined.
-                 */
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV6_PERFCTR_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV6_PERFCTR_DCACHE_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV6_PERFCTR_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV6_PERFCTR_DCACHE_MISS,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(L1I)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV6_PERFCTR_ICACHE_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                /*
-                 * The ARM performance counters can count micro DTLB misses,
-                 * micro ITLB misses and main TLB misses. There isn't an event
-                 * for TLB misses, so use the micro misses here and if users
-                 * want the main TLB misses they can use a raw counter.
-                 */
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV6_PERFCTR_DTLB_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV6_PERFCTR_DTLB_MISS,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV6_PERFCTR_ITLB_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV6_PERFCTR_ITLB_MISS,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        /*
+         * The performance counters don't differentiate between read and write
+         * accesses/misses so this isn't strictly correct, but it's the best we
+         * can do. Writes and reads get combined.
+         */
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV6_PERFCTR_DCACHE_ACCESS,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = ARMV6_PERFCTR_DCACHE_MISS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV6_PERFCTR_DCACHE_ACCESS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV6_PERFCTR_DCACHE_MISS,
+
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = ARMV6_PERFCTR_ICACHE_MISS,
+
+        /*
+         * The ARM performance counters can count micro DTLB misses, micro ITLB
+         * misses and main TLB misses. There isn't an event for TLB misses, so
+         * use the micro misses here and if users want the main TLB misses they
+         * can use a raw counter.
+         */
+        [C(DTLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV6_PERFCTR_DTLB_MISS,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV6_PERFCTR_DTLB_MISS,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV6_PERFCTR_ITLB_MISS,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV6_PERFCTR_ITLB_MISS,
 };
 
 enum armv6mpcore_perf_types {
@@ -220,13 +133,11 @@ enum armv6mpcore_perf_types {
  * accesses/misses in hardware.
  */
 static const unsigned armv6mpcore_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]              = ARMV6MPCORE_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]            = ARMV6MPCORE_PERFCTR_INSTR_EXEC,
-        [PERF_COUNT_HW_CACHE_REFERENCES]        = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_CACHE_MISSES]            = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]     = ARMV6MPCORE_PERFCTR_BR_EXEC,
         [PERF_COUNT_HW_BRANCH_MISSES]           = ARMV6MPCORE_PERFCTR_BR_MISPREDICT,
-        [PERF_COUNT_HW_BUS_CYCLES]              = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = ARMV6MPCORE_PERFCTR_IBUF_STALL,
         [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]  = ARMV6MPCORE_PERFCTR_LSU_FULL_STALL,
 };
@@ -234,114 +145,26 @@ static const unsigned armv6mpcore_perf_map[PERF_COUNT_HW_MAX] = {
 static const unsigned armv6mpcore_perf_cache_map[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)]  =
-                                ARMV6MPCORE_PERFCTR_DCACHE_RDACCESS,
-                        [C(RESULT_MISS)]    =
-                                ARMV6MPCORE_PERFCTR_DCACHE_RDMISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]  =
-                                ARMV6MPCORE_PERFCTR_DCACHE_WRACCESS,
-                        [C(RESULT_MISS)]    =
-                                ARMV6MPCORE_PERFCTR_DCACHE_WRMISS,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(L1I)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = ARMV6MPCORE_PERFCTR_ICACHE_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                /*
-                 * The ARM performance counters can count micro DTLB misses,
-                 * micro ITLB misses and main TLB misses. There isn't an event
-                 * for TLB misses, so use the micro misses here and if users
-                 * want the main TLB misses they can use a raw counter.
-                 */
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = ARMV6MPCORE_PERFCTR_DTLB_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = ARMV6MPCORE_PERFCTR_DTLB_MISS,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = ARMV6MPCORE_PERFCTR_ITLB_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = ARMV6MPCORE_PERFCTR_ITLB_MISS,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]  = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]    = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV6MPCORE_PERFCTR_DCACHE_RDACCESS,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = ARMV6MPCORE_PERFCTR_DCACHE_RDMISS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV6MPCORE_PERFCTR_DCACHE_WRACCESS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV6MPCORE_PERFCTR_DCACHE_WRMISS,
+
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = ARMV6MPCORE_PERFCTR_ICACHE_MISS,
+
+        /*
+         * The ARM performance counters can count micro DTLB misses, micro ITLB
+         * misses and main TLB misses. There isn't an event for TLB misses, so
+         * use the micro misses here and if users want the main TLB misses they
+         * can use a raw counter.
+         */
+        [C(DTLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV6MPCORE_PERFCTR_DTLB_MISS,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV6MPCORE_PERFCTR_DTLB_MISS,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV6MPCORE_PERFCTR_ITLB_MISS,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV6MPCORE_PERFCTR_ITLB_MISS,
 };
 
 static inline unsigned long
@@ -653,9 +476,8 @@ static int armv6_map_event(struct perf_event *event)
                                 &armv6_perf_cache_map, 0xFF);
 }
 
-static int armv6pmu_init(struct arm_pmu *cpu_pmu)
+static void armv6pmu_init(struct arm_pmu *cpu_pmu)
 {
-        cpu_pmu->name           = "v6";
         cpu_pmu->handle_irq     = armv6pmu_handle_irq;
         cpu_pmu->enable         = armv6pmu_enable_event;
         cpu_pmu->disable        = armv6pmu_disable_event;
@@ -667,7 +489,26 @@ static int armv6pmu_init(struct arm_pmu *cpu_pmu)
         cpu_pmu->map_event      = armv6_map_event;
         cpu_pmu->num_events     = 3;
         cpu_pmu->max_period     = (1LLU << 32) - 1;
+}
+
+static int armv6_1136_pmu_init(struct arm_pmu *cpu_pmu)
+{
+        armv6pmu_init(cpu_pmu);
+        cpu_pmu->name           = "armv6_1136";
+        return 0;
+}
 
+static int armv6_1156_pmu_init(struct arm_pmu *cpu_pmu)
+{
+        armv6pmu_init(cpu_pmu);
+        cpu_pmu->name           = "armv6_1156";
+        return 0;
+}
+
+static int armv6_1176_pmu_init(struct arm_pmu *cpu_pmu)
+{
+        armv6pmu_init(cpu_pmu);
+        cpu_pmu->name           = "armv6_1176";
         return 0;
 }
 
@@ -687,7 +528,7 @@ static int armv6mpcore_map_event(struct perf_event *event)
 
 static int armv6mpcore_pmu_init(struct arm_pmu *cpu_pmu)
 {
-        cpu_pmu->name           = "v6mpcore";
+        cpu_pmu->name           = "armv6_11mpcore";
         cpu_pmu->handle_irq     = armv6pmu_handle_irq;
         cpu_pmu->enable         = armv6pmu_enable_event;
         cpu_pmu->disable        = armv6mpcore_pmu_disable_event;
@@ -703,7 +544,17 @@ static int armv6mpcore_pmu_init(struct arm_pmu *cpu_pmu)
         return 0;
 }
 #else
-static int armv6pmu_init(struct arm_pmu *cpu_pmu)
+static int armv6_1136_pmu_init(struct arm_pmu *cpu_pmu)
+{
+        return -ENODEV;
+}
+
+static int armv6_1156_pmu_init(struct arm_pmu *cpu_pmu)
+{
+        return -ENODEV;
+}
+
+static int armv6_1176_pmu_init(struct arm_pmu *cpu_pmu)
 {
         return -ENODEV;
 }
diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c
index 1d37568c547a..116758b77f93 100644
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
@@ -148,137 +148,62 @@ enum krait_perf_types {
  * accesses/misses in hardware.
  */
 static const unsigned armv7_a8_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]              = ARMV7_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]            = ARMV7_PERFCTR_INSTR_EXECUTED,
         [PERF_COUNT_HW_CACHE_REFERENCES]        = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
         [PERF_COUNT_HW_CACHE_MISSES]            = ARMV7_PERFCTR_L1_DCACHE_REFILL,
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]     = ARMV7_PERFCTR_PC_WRITE,
         [PERF_COUNT_HW_BRANCH_MISSES]           = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-        [PERF_COUNT_HW_BUS_CYCLES]              = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = ARMV7_A8_PERFCTR_STALL_ISIDE,
-        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]  = HW_OP_UNSUPPORTED,
 };
 
 static const unsigned armv7_a8_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
                                           [PERF_COUNT_HW_CACHE_OP_MAX]
                                           [PERF_COUNT_HW_CACHE_RESULT_MAX] = {
-        [C(L1D)] = {
-                /*
-                 * The performance counters don't differentiate between read
-                 * and write accesses/misses so this isn't strictly correct,
-                 * but it's the best we can do. Writes and reads get
-                 * combined.
-                 */
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(L1I)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A8_PERFCTR_L1_ICACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_ICACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A8_PERFCTR_L2_CACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_A8_PERFCTR_L2_CACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A8_PERFCTR_L2_CACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_A8_PERFCTR_L2_CACHE_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        /*
+         * The performance counters don't differentiate between read and write
+         * accesses/misses so this isn't strictly correct, but it's the best we
+         * can do. Writes and reads get combined.
+         */
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+
+        [C(L1I)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_A8_PERFCTR_L1_ICACHE_ACCESS,
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_ICACHE_REFILL,
+
+        [C(LL)][C(OP_READ)][C(RESULT_ACCESS)]   = ARMV7_A8_PERFCTR_L2_CACHE_ACCESS,
+        [C(LL)][C(OP_READ)][C(RESULT_MISS)]     = ARMV7_A8_PERFCTR_L2_CACHE_REFILL,
+        [C(LL)][C(OP_WRITE)][C(RESULT_ACCESS)]  = ARMV7_A8_PERFCTR_L2_CACHE_ACCESS,
+        [C(LL)][C(OP_WRITE)][C(RESULT_MISS)]    = ARMV7_A8_PERFCTR_L2_CACHE_REFILL,
+
+        [C(DTLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_DTLB_REFILL,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_DTLB_REFILL,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_ITLB_REFILL,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_ITLB_REFILL,
+
+        [C(BPU)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
 };
 
 /*
  * Cortex-A9 HW events mapping
  */
 static const unsigned armv7_a9_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]              = ARMV7_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]            = ARMV7_A9_PERFCTR_INSTR_CORE_RENAME,
         [PERF_COUNT_HW_CACHE_REFERENCES]        = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
         [PERF_COUNT_HW_CACHE_MISSES]            = ARMV7_PERFCTR_L1_DCACHE_REFILL,
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]     = ARMV7_PERFCTR_PC_WRITE,
         [PERF_COUNT_HW_BRANCH_MISSES]           = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-        [PERF_COUNT_HW_BUS_CYCLES]              = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = ARMV7_A9_PERFCTR_STALL_ICACHE,
         [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]  = ARMV7_A9_PERFCTR_STALL_DISPATCH,
 };
@@ -286,238 +211,83 @@ static const unsigned armv7_a9_perf_map[PERF_COUNT_HW_MAX] = {
 static const unsigned armv7_a9_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
                                           [PERF_COUNT_HW_CACHE_OP_MAX]
                                           [PERF_COUNT_HW_CACHE_RESULT_MAX] = {
-        [C(L1D)] = {
-                /*
-                 * The performance counters don't differentiate between read
-                 * and write accesses/misses so this isn't strictly correct,
-                 * but it's the best we can do. Writes and reads get
-                 * combined.
-                 */
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(L1I)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_ICACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        /*
+         * The performance counters don't differentiate between read and write
+         * accesses/misses so this isn't strictly correct, but it's the best we
+         * can do. Writes and reads get combined.
+         */
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_ICACHE_REFILL,
+
+        [C(DTLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_DTLB_REFILL,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_DTLB_REFILL,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_ITLB_REFILL,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_ITLB_REFILL,
+
+        [C(BPU)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
 };
 
 /*
  * Cortex-A5 HW events mapping
  */
 static const unsigned armv7_a5_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]              = ARMV7_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]            = ARMV7_PERFCTR_INSTR_EXECUTED,
         [PERF_COUNT_HW_CACHE_REFERENCES]        = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
         [PERF_COUNT_HW_CACHE_MISSES]            = ARMV7_PERFCTR_L1_DCACHE_REFILL,
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]     = ARMV7_PERFCTR_PC_WRITE,
         [PERF_COUNT_HW_BRANCH_MISSES]           = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-        [PERF_COUNT_HW_BUS_CYCLES]              = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]  = HW_OP_UNSUPPORTED,
 };
 
 static const unsigned armv7_a5_perf_cache_map[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)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A5_PERFCTR_PREFETCH_LINEFILL,
-                        [C(RESULT_MISS)]        = ARMV7_A5_PERFCTR_PREFETCH_LINEFILL_DROP,
-                },
-        },
-        [C(L1I)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_ICACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_ICACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                /*
-                 * The prefetch counters don't differentiate between the I
-                 * side and the D side.
-                 */
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A5_PERFCTR_PREFETCH_LINEFILL,
-                        [C(RESULT_MISS)]        = ARMV7_A5_PERFCTR_PREFETCH_LINEFILL_DROP,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+        [C(L1D)][C(OP_PREFETCH)][C(RESULT_ACCESS)]      = ARMV7_A5_PERFCTR_PREFETCH_LINEFILL,
+        [C(L1D)][C(OP_PREFETCH)][C(RESULT_MISS)]        = ARMV7_A5_PERFCTR_PREFETCH_LINEFILL_DROP,
+
+        [C(L1I)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L1_ICACHE_ACCESS,
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_ICACHE_REFILL,
+        /*
+         * The prefetch counters don't differentiate between the I side and the
+         * D side.
+         */
+        [C(L1I)][C(OP_PREFETCH)][C(RESULT_ACCESS)]      = ARMV7_A5_PERFCTR_PREFETCH_LINEFILL,
+        [C(L1I)][C(OP_PREFETCH)][C(RESULT_MISS)]        = ARMV7_A5_PERFCTR_PREFETCH_LINEFILL_DROP,
+
+        [C(DTLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_DTLB_REFILL,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_DTLB_REFILL,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_ITLB_REFILL,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_ITLB_REFILL,
+
+        [C(BPU)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
 };
 
 /*
  * Cortex-A15 HW events mapping
  */
 static const unsigned armv7_a15_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]              = ARMV7_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]            = ARMV7_PERFCTR_INSTR_EXECUTED,
         [PERF_COUNT_HW_CACHE_REFERENCES]        = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
@@ -525,123 +295,48 @@ static const unsigned armv7_a15_perf_map[PERF_COUNT_HW_MAX] = {
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]     = ARMV7_A15_PERFCTR_PC_WRITE_SPEC,
         [PERF_COUNT_HW_BRANCH_MISSES]           = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
         [PERF_COUNT_HW_BUS_CYCLES]              = ARMV7_PERFCTR_BUS_CYCLES,
-        [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]  = HW_OP_UNSUPPORTED,
 };
 
 static const unsigned armv7_a15_perf_cache_map[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)]      = ARMV7_A15_PERFCTR_L1_DCACHE_ACCESS_READ,
-                        [C(RESULT_MISS)]        = ARMV7_A15_PERFCTR_L1_DCACHE_REFILL_READ,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A15_PERFCTR_L1_DCACHE_ACCESS_WRITE,
-                        [C(RESULT_MISS)]        = ARMV7_A15_PERFCTR_L1_DCACHE_REFILL_WRITE,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(L1I)] = {
-                /*
-                 * Not all performance counters differentiate between read
-                 * and write accesses/misses so we're not always strictly
-                 * correct, but it's the best we can do. Writes and reads get
-                 * combined in these cases.
-                 */
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_ICACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_ICACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A15_PERFCTR_L2_CACHE_ACCESS_READ,
-                        [C(RESULT_MISS)]        = ARMV7_A15_PERFCTR_L2_CACHE_REFILL_READ,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A15_PERFCTR_L2_CACHE_ACCESS_WRITE,
-                        [C(RESULT_MISS)]        = ARMV7_A15_PERFCTR_L2_CACHE_REFILL_WRITE,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_A15_PERFCTR_DTLB_REFILL_L1_READ,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_A15_PERFCTR_DTLB_REFILL_L1_WRITE,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_A15_PERFCTR_L1_DCACHE_ACCESS_READ,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_A15_PERFCTR_L1_DCACHE_REFILL_READ,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_A15_PERFCTR_L1_DCACHE_ACCESS_WRITE,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_A15_PERFCTR_L1_DCACHE_REFILL_WRITE,
+
+        /*
+         * Not all performance counters differentiate between read and write
+         * accesses/misses so we're not always strictly correct, but it's the
+         * best we can do. Writes and reads get combined in these cases.
+         */
+        [C(L1I)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L1_ICACHE_ACCESS,
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_ICACHE_REFILL,
+
+        [C(LL)][C(OP_READ)][C(RESULT_ACCESS)]   = ARMV7_A15_PERFCTR_L2_CACHE_ACCESS_READ,
+        [C(LL)][C(OP_READ)][C(RESULT_MISS)]     = ARMV7_A15_PERFCTR_L2_CACHE_REFILL_READ,
+        [C(LL)][C(OP_WRITE)][C(RESULT_ACCESS)]  = ARMV7_A15_PERFCTR_L2_CACHE_ACCESS_WRITE,
+        [C(LL)][C(OP_WRITE)][C(RESULT_MISS)]    = ARMV7_A15_PERFCTR_L2_CACHE_REFILL_WRITE,
+
+        [C(DTLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_A15_PERFCTR_DTLB_REFILL_L1_READ,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_A15_PERFCTR_DTLB_REFILL_L1_WRITE,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_ITLB_REFILL,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_ITLB_REFILL,
+
+        [C(BPU)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
 };
 
 /*
  * Cortex-A7 HW events mapping
  */
 static const unsigned armv7_a7_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]              = ARMV7_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]            = ARMV7_PERFCTR_INSTR_EXECUTED,
         [PERF_COUNT_HW_CACHE_REFERENCES]        = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
@@ -649,123 +344,48 @@ static const unsigned armv7_a7_perf_map[PERF_COUNT_HW_MAX] = {
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]     = ARMV7_PERFCTR_PC_WRITE,
         [PERF_COUNT_HW_BRANCH_MISSES]           = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
         [PERF_COUNT_HW_BUS_CYCLES]              = ARMV7_PERFCTR_BUS_CYCLES,
-        [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]  = HW_OP_UNSUPPORTED,
 };
 
 static const unsigned armv7_a7_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
                                         [PERF_COUNT_HW_CACHE_OP_MAX]
                                         [PERF_COUNT_HW_CACHE_RESULT_MAX] = {
-        [C(L1D)] = {
-                /*
-                 * The performance counters don't differentiate between read
-                 * and write accesses/misses so this isn't strictly correct,
-                 * but it's the best we can do. Writes and reads get
-                 * combined.
-                 */
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(L1I)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_ICACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_ICACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L2_CACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L2_CACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L2_CACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L2_CACHE_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        /*
+         * The performance counters don't differentiate between read and write
+         * accesses/misses so this isn't strictly correct, but it's the best we
+         * can do. Writes and reads get combined.
+         */
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+
+        [C(L1I)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L1_ICACHE_ACCESS,
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_ICACHE_REFILL,
+
+        [C(LL)][C(OP_READ)][C(RESULT_ACCESS)]   = ARMV7_PERFCTR_L2_CACHE_ACCESS,
+        [C(LL)][C(OP_READ)][C(RESULT_MISS)]     = ARMV7_PERFCTR_L2_CACHE_REFILL,
+        [C(LL)][C(OP_WRITE)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L2_CACHE_ACCESS,
+        [C(LL)][C(OP_WRITE)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L2_CACHE_REFILL,
+
+        [C(DTLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_DTLB_REFILL,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_DTLB_REFILL,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_ITLB_REFILL,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_ITLB_REFILL,
+
+        [C(BPU)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
 };
 
 /*
  * Cortex-A12 HW events mapping
  */
 static const unsigned armv7_a12_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]              = ARMV7_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]            = ARMV7_PERFCTR_INSTR_EXECUTED,
         [PERF_COUNT_HW_CACHE_REFERENCES]        = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
@@ -773,138 +393,60 @@ static const unsigned armv7_a12_perf_map[PERF_COUNT_HW_MAX] = {
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]     = ARMV7_A12_PERFCTR_PC_WRITE_SPEC,
         [PERF_COUNT_HW_BRANCH_MISSES]           = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
         [PERF_COUNT_HW_BUS_CYCLES]              = ARMV7_PERFCTR_BUS_CYCLES,
-        [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]  = HW_OP_UNSUPPORTED,
 };
 
 static const unsigned armv7_a12_perf_cache_map[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)]      = ARMV7_A12_PERFCTR_L1_DCACHE_ACCESS_READ,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A12_PERFCTR_L1_DCACHE_ACCESS_WRITE,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(L1I)] = {
-                /*
-                 * Not all performance counters differentiate between read
-                 * and write accesses/misses so we're not always strictly
-                 * correct, but it's the best we can do. Writes and reads get
-                 * combined in these cases.
-                 */
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_ICACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_ICACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A12_PERFCTR_L2_CACHE_ACCESS_READ,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L2_CACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_A12_PERFCTR_L2_CACHE_ACCESS_WRITE,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L2_CACHE_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_DTLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_A12_PERFCTR_PF_TLB_REFILL,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_ITLB_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_A12_PERFCTR_L1_DCACHE_ACCESS_READ,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_A12_PERFCTR_L1_DCACHE_ACCESS_WRITE,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+
+        /*
+         * Not all performance counters differentiate between read and write
+         * accesses/misses so we're not always strictly correct, but it's the
+         * best we can do. Writes and reads get combined in these cases.
+         */
+        [C(L1I)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L1_ICACHE_ACCESS,
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_ICACHE_REFILL,
+
+        [C(LL)][C(OP_READ)][C(RESULT_ACCESS)]   = ARMV7_A12_PERFCTR_L2_CACHE_ACCESS_READ,
+        [C(LL)][C(OP_READ)][C(RESULT_MISS)]     = ARMV7_PERFCTR_L2_CACHE_REFILL,
+        [C(LL)][C(OP_WRITE)][C(RESULT_ACCESS)]  = ARMV7_A12_PERFCTR_L2_CACHE_ACCESS_WRITE,
+        [C(LL)][C(OP_WRITE)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L2_CACHE_REFILL,
+
+        [C(DTLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_DTLB_REFILL,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_DTLB_REFILL,
+        [C(DTLB)][C(OP_PREFETCH)][C(RESULT_MISS)]       = ARMV7_A12_PERFCTR_PF_TLB_REFILL,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_MISS)]   = ARMV7_PERFCTR_ITLB_REFILL,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_MISS)]  = ARMV7_PERFCTR_ITLB_REFILL,
+
+        [C(BPU)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
 };
 
 /*
  * Krait HW events mapping
  */
 static const unsigned krait_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]          = ARMV7_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]        = ARMV7_PERFCTR_INSTR_EXECUTED,
-        [PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_CACHE_MISSES]        = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERFCTR_PC_WRITE,
         [PERF_COUNT_HW_BRANCH_MISSES]       = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
         [PERF_COUNT_HW_BUS_CYCLES]          = ARMV7_PERFCTR_CLOCK_CYCLES,
 };
 
 static const unsigned krait_perf_map_no_branch[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]          = ARMV7_PERFCTR_CPU_CYCLES,
         [PERF_COUNT_HW_INSTRUCTIONS]        = ARMV7_PERFCTR_INSTR_EXECUTED,
-        [PERF_COUNT_HW_CACHE_REFERENCES]    = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_CACHE_MISSES]        = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_BRANCH_MISSES]       = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
         [PERF_COUNT_HW_BUS_CYCLES]          = ARMV7_PERFCTR_CLOCK_CYCLES,
 };
@@ -912,110 +454,31 @@ static const unsigned krait_perf_map_no_branch[PERF_COUNT_HW_MAX] = {
 static const unsigned krait_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
                                           [PERF_COUNT_HW_CACHE_OP_MAX]
                                           [PERF_COUNT_HW_CACHE_RESULT_MAX] = {
-        [C(L1D)] = {
-                /*
-                 * The performance counters don't differentiate between read
-                 * and write accesses/misses so this isn't strictly correct,
-                 * but it's the best we can do. Writes and reads get
-                 * combined.
-                 */
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_L1_DCACHE_REFILL,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(L1I)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = KRAIT_PERFCTR_L1_ICACHE_ACCESS,
-                        [C(RESULT_MISS)]        = KRAIT_PERFCTR_L1_ICACHE_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = KRAIT_PERFCTR_L1_DTLB_ACCESS,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = KRAIT_PERFCTR_L1_DTLB_ACCESS,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = KRAIT_PERFCTR_L1_ITLB_ACCESS,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = KRAIT_PERFCTR_L1_ITLB_ACCESS,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = ARMV7_PERFCTR_PC_BRANCH_PRED,
-                        [C(RESULT_MISS)]        = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        /*
+         * The performance counters don't differentiate between read and write
+         * accesses/misses so this isn't strictly correct, but it's the best we
+         * can do. Writes and reads get combined.
+         */
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_L1_DCACHE_ACCESS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_L1_DCACHE_REFILL,
+
+        [C(L1I)][C(OP_READ)][C(RESULT_ACCESS)]  = KRAIT_PERFCTR_L1_ICACHE_ACCESS,
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = KRAIT_PERFCTR_L1_ICACHE_MISS,
+
+        [C(DTLB)][C(OP_READ)][C(RESULT_ACCESS)] = KRAIT_PERFCTR_L1_DTLB_ACCESS,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_ACCESS)]        = KRAIT_PERFCTR_L1_DTLB_ACCESS,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_ACCESS)] = KRAIT_PERFCTR_L1_ITLB_ACCESS,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_ACCESS)]        = KRAIT_PERFCTR_L1_ITLB_ACCESS,
+
+        [C(BPU)][C(OP_READ)][C(RESULT_ACCESS)]  = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_READ)][C(RESULT_MISS)]    = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_ACCESS)] = ARMV7_PERFCTR_PC_BRANCH_PRED,
+        [C(BPU)][C(OP_WRITE)][C(RESULT_MISS)]   = ARMV7_PERFCTR_PC_BRANCH_MIS_PRED,
 };
 
 /*
@@ -1545,7 +1008,7 @@ static u32 armv7_read_num_pmnc_events(void)
 static int armv7_a8_pmu_init(struct arm_pmu *cpu_pmu)
 {
         armv7pmu_init(cpu_pmu);
-        cpu_pmu->name           = "ARMv7 Cortex-A8";
+        cpu_pmu->name           = "armv7_cortex_a8";
         cpu_pmu->map_event      = armv7_a8_map_event;
         cpu_pmu->num_events     = armv7_read_num_pmnc_events();
         return 0;
@@ -1554,7 +1017,7 @@ static int armv7_a8_pmu_init(struct arm_pmu *cpu_pmu)
 static int armv7_a9_pmu_init(struct arm_pmu *cpu_pmu)
 {
         armv7pmu_init(cpu_pmu);
-        cpu_pmu->name           = "ARMv7 Cortex-A9";
+        cpu_pmu->name           = "armv7_cortex_a9";
         cpu_pmu->map_event      = armv7_a9_map_event;
         cpu_pmu->num_events     = armv7_read_num_pmnc_events();
         return 0;
@@ -1563,7 +1026,7 @@ static int armv7_a9_pmu_init(struct arm_pmu *cpu_pmu)
 static int armv7_a5_pmu_init(struct arm_pmu *cpu_pmu)
 {
         armv7pmu_init(cpu_pmu);
-        cpu_pmu->name           = "ARMv7 Cortex-A5";
+        cpu_pmu->name           = "armv7_cortex_a5";
         cpu_pmu->map_event      = armv7_a5_map_event;
         cpu_pmu->num_events     = armv7_read_num_pmnc_events();
         return 0;
@@ -1572,7 +1035,7 @@ static int armv7_a5_pmu_init(struct arm_pmu *cpu_pmu)
 static int armv7_a15_pmu_init(struct arm_pmu *cpu_pmu)
 {
         armv7pmu_init(cpu_pmu);
-        cpu_pmu->name           = "ARMv7 Cortex-A15";
+        cpu_pmu->name           = "armv7_cortex_a15";
         cpu_pmu->map_event      = armv7_a15_map_event;
         cpu_pmu->num_events     = armv7_read_num_pmnc_events();
         cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
@@ -1582,7 +1045,7 @@ static int armv7_a15_pmu_init(struct arm_pmu *cpu_pmu)
 static int armv7_a7_pmu_init(struct arm_pmu *cpu_pmu)
 {
         armv7pmu_init(cpu_pmu);
-        cpu_pmu->name           = "ARMv7 Cortex-A7";
+        cpu_pmu->name           = "armv7_cortex_a7";
         cpu_pmu->map_event      = armv7_a7_map_event;
         cpu_pmu->num_events     = armv7_read_num_pmnc_events();
         cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
@@ -1592,7 +1055,7 @@ static int armv7_a7_pmu_init(struct arm_pmu *cpu_pmu)
 static int armv7_a12_pmu_init(struct arm_pmu *cpu_pmu)
 {
         armv7pmu_init(cpu_pmu);
-        cpu_pmu->name           = "ARMv7 Cortex-A12";
+        cpu_pmu->name           = "armv7_cortex_a12";
         cpu_pmu->map_event      = armv7_a12_map_event;
         cpu_pmu->num_events     = armv7_read_num_pmnc_events();
         cpu_pmu->set_event_filter = armv7pmu_set_event_filter;
@@ -1602,7 +1065,7 @@ static int armv7_a12_pmu_init(struct arm_pmu *cpu_pmu)
 static int armv7_a17_pmu_init(struct arm_pmu *cpu_pmu)
 {
         armv7_a12_pmu_init(cpu_pmu);
-        cpu_pmu->name = "ARMv7 Cortex-A17";
+        cpu_pmu->name = "armv7_cortex_a17";
         return 0;
 }
 
@@ -1823,6 +1286,7 @@ static void krait_pmu_disable_event(struct perf_event *event)
         unsigned long flags;
         struct hw_perf_event *hwc = &event->hw;
         int idx = hwc->idx;
+        struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
         struct pmu_hw_events *events = cpu_pmu->get_hw_events();
 
         /* Disable counter and interrupt */
@@ -1848,6 +1312,7 @@ static void krait_pmu_enable_event(struct perf_event *event)
         unsigned long flags;
         struct hw_perf_event *hwc = &event->hw;
         int idx = hwc->idx;
+        struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
         struct pmu_hw_events *events = cpu_pmu->get_hw_events();
 
         /*
@@ -1981,7 +1446,7 @@ static void krait_pmu_clear_event_idx(struct pmu_hw_events *cpuc,
 static int krait_pmu_init(struct arm_pmu *cpu_pmu)
 {
         armv7pmu_init(cpu_pmu);
-        cpu_pmu->name           = "ARMv7 Krait";
+        cpu_pmu->name           = "armv7_krait";
         /* Some early versions of Krait don't support PC write events */
         if (of_property_read_bool(cpu_pmu->plat_device->dev.of_node,
                                   "qcom,no-pc-write"))
diff --git a/arch/arm/kernel/perf_event_xscale.c b/arch/arm/kernel/perf_event_xscale.c
index 63990c42fac9..08da0af550b7 100644
--- a/arch/arm/kernel/perf_event_xscale.c
+++ b/arch/arm/kernel/perf_event_xscale.c
@@ -48,118 +48,31 @@ enum xscale_counters {
 };
 
 static const unsigned xscale_perf_map[PERF_COUNT_HW_MAX] = {
+        PERF_MAP_ALL_UNSUPPORTED,
         [PERF_COUNT_HW_CPU_CYCLES]              = XSCALE_PERFCTR_CCNT,
         [PERF_COUNT_HW_INSTRUCTIONS]            = XSCALE_PERFCTR_INSTRUCTION,
-        [PERF_COUNT_HW_CACHE_REFERENCES]        = HW_OP_UNSUPPORTED,
-        [PERF_COUNT_HW_CACHE_MISSES]            = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]     = XSCALE_PERFCTR_BRANCH,
         [PERF_COUNT_HW_BRANCH_MISSES]           = XSCALE_PERFCTR_BRANCH_MISS,
-        [PERF_COUNT_HW_BUS_CYCLES]              = HW_OP_UNSUPPORTED,
         [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = XSCALE_PERFCTR_ICACHE_NO_DELIVER,
-        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]  = HW_OP_UNSUPPORTED,
 };
 
 static const unsigned xscale_perf_cache_map[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)]      = XSCALE_PERFCTR_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = XSCALE_PERFCTR_DCACHE_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = XSCALE_PERFCTR_DCACHE_ACCESS,
-                        [C(RESULT_MISS)]        = XSCALE_PERFCTR_DCACHE_MISS,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(L1I)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = XSCALE_PERFCTR_ICACHE_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(LL)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(DTLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = XSCALE_PERFCTR_DTLB_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = XSCALE_PERFCTR_DTLB_MISS,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(ITLB)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = XSCALE_PERFCTR_ITLB_MISS,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = XSCALE_PERFCTR_ITLB_MISS,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(BPU)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
-        [C(NODE)] = {
-                [C(OP_READ)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_WRITE)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-                [C(OP_PREFETCH)] = {
-                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
-                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
-                },
-        },
+        PERF_CACHE_MAP_ALL_UNSUPPORTED,
+
+        [C(L1D)][C(OP_READ)][C(RESULT_ACCESS)]  = XSCALE_PERFCTR_DCACHE_ACCESS,
+        [C(L1D)][C(OP_READ)][C(RESULT_MISS)]    = XSCALE_PERFCTR_DCACHE_MISS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_ACCESS)] = XSCALE_PERFCTR_DCACHE_ACCESS,
+        [C(L1D)][C(OP_WRITE)][C(RESULT_MISS)]   = XSCALE_PERFCTR_DCACHE_MISS,
+
+        [C(L1I)][C(OP_READ)][C(RESULT_MISS)]    = XSCALE_PERFCTR_ICACHE_MISS,
+
+        [C(DTLB)][C(OP_READ)][C(RESULT_MISS)]   = XSCALE_PERFCTR_DTLB_MISS,
+        [C(DTLB)][C(OP_WRITE)][C(RESULT_MISS)]  = XSCALE_PERFCTR_DTLB_MISS,
+
+        [C(ITLB)][C(OP_READ)][C(RESULT_MISS)]   = XSCALE_PERFCTR_ITLB_MISS,
+        [C(ITLB)][C(OP_WRITE)][C(RESULT_MISS)]  = XSCALE_PERFCTR_ITLB_MISS,
 };
 
 #define XSCALE_PMU_ENABLE       0x001
@@ -442,7 +355,7 @@ static int xscale_map_event(struct perf_event *event)
 
 static int xscale1pmu_init(struct arm_pmu *cpu_pmu)
 {
-        cpu_pmu->name           = "xscale1";
+        cpu_pmu->name           = "armv5_xscale1";
         cpu_pmu->handle_irq     = xscale1pmu_handle_irq;
         cpu_pmu->enable         = xscale1pmu_enable_event;
         cpu_pmu->disable        = xscale1pmu_disable_event;
@@ -812,7 +725,7 @@ static inline void xscale2pmu_write_counter(struct perf_event *event, u32 val)
 
 static int xscale2pmu_init(struct arm_pmu *cpu_pmu)
 {
-        cpu_pmu->name           = "xscale2";
+        cpu_pmu->name           = "armv5_xscale2";
         cpu_pmu->handle_irq     = xscale2pmu_handle_irq;
         cpu_pmu->enable         = xscale2pmu_enable_event;
         cpu_pmu->disable        = xscale2pmu_disable_event;
diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S
index 95858966d84e..35e72585ec1d 100644
--- a/arch/arm/kernel/relocate_kernel.S
+++ b/arch/arm/kernel/relocate_kernel.S
@@ -3,6 +3,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 #include <asm/kexec.h>
 
         .align  3       /* not needed for this code, but keeps fncpy() happy */
@@ -59,7 +60,7 @@ ENTRY(relocate_new_kernel)
         mov r0,#0
         ldr r1,kexec_mach_type
         ldr r2,kexec_boot_atags
- ARM(   mov pc, lr      )
+ ARM(   ret lr  )
  THUMB( bx lr           )
 
         .align
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 8a16ee5d8a95..84db893dedc2 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -393,19 +393,34 @@ static void __init cpuid_init_hwcaps(void)
                 elf_hwcap |= HWCAP_LPAE;
 }
 
-static void __init feat_v6_fixup(void)
+static void __init elf_hwcap_fixup(void)
 {
-        int id = read_cpuid_id();
-
-        if ((id & 0xff0f0000) != 0x41070000)
-                return;
+        unsigned id = read_cpuid_id();
+        unsigned sync_prim;
 
         /*
          * HWCAP_TLS is available only on 1136 r1p0 and later,
          * see also kuser_get_tls_init.
          */
-        if ((((id >> 4) & 0xfff) == 0xb36) && (((id >> 20) & 3) == 0))
+        if (read_cpuid_part() == ARM_CPU_PART_ARM1136 &&
+            ((id >> 20) & 3) == 0) {
                 elf_hwcap &= ~HWCAP_TLS;
+                return;
+        }
+
+        /* Verify if CPUID scheme is implemented */
+        if ((id & 0x000f0000) != 0x000f0000)
+                return;
+
+        /*
+         * If the CPU supports LDREX/STREX and LDREXB/STREXB,
+         * avoid advertising SWP; it may not be atomic with
+         * multiprocessing cores.
+         */
+        sync_prim = ((read_cpuid_ext(CPUID_EXT_ISAR3) >> 8) & 0xf0) |
+                    ((read_cpuid_ext(CPUID_EXT_ISAR4) >> 20) & 0x0f);
+        if (sync_prim >= 0x13)
+                elf_hwcap &= ~HWCAP_SWP;
 }
 
 /*
@@ -609,7 +624,7 @@ static void __init setup_processor(void)
 #endif
         erratum_a15_798181_init();
 
-        feat_v6_fixup();
+        elf_hwcap_fixup();
 
         cacheid_init();
         cpu_init();
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index 1b880db2a033..e1e60e5a7a27 100644
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@ -107,7 +107,7 @@ ENTRY(cpu_resume_mmu)
         instr_sync
         mov     r0, r0
         mov     r0, r0
-        mov     pc, r3                  @ jump to virtual address
+        ret     r3                      @ jump to virtual address
 ENDPROC(cpu_resume_mmu)
         .popsection
 cpu_resume_after_mmu:
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 7c4fada440f0..9388a3d479e1 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -47,6 +47,9 @@
 #include <asm/mach/arch.h>
 #include <asm/mpu.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/ipi.h>
+
 /*
  * as from 2.5, kernels no longer have an init_tasks structure
  * so we need some other way of telling a new secondary core
@@ -430,38 +433,15 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         }
 }
 
-static void (*smp_cross_call)(const struct cpumask *, unsigned int);
+static void (*__smp_cross_call)(const struct cpumask *, unsigned int);
 
 void __init set_smp_cross_call(void (*fn)(const struct cpumask *, unsigned int))
 {
-        if (!smp_cross_call)
-                smp_cross_call = fn;
-}
-
-void arch_send_call_function_ipi_mask(const struct cpumask *mask)
-{
-        smp_cross_call(mask, IPI_CALL_FUNC);
-}
-
-void arch_send_wakeup_ipi_mask(const struct cpumask *mask)
-{
-        smp_cross_call(mask, IPI_WAKEUP);
-}
-
-void arch_send_call_function_single_ipi(int cpu)
-{
-        smp_cross_call(cpumask_of(cpu), IPI_CALL_FUNC_SINGLE);
+        if (!__smp_cross_call)
+                __smp_cross_call = fn;
 }
 
-#ifdef CONFIG_IRQ_WORK
-void arch_irq_work_raise(void)
-{
-        if (is_smp())
-                smp_cross_call(cpumask_of(smp_processor_id()), IPI_IRQ_WORK);
-}
-#endif
-
-static const char *ipi_types[NR_IPI] = {
+static const char *ipi_types[NR_IPI] __tracepoint_string = {
 #define S(x,s)  [x] = s
         S(IPI_WAKEUP, "CPU wakeup interrupts"),
         S(IPI_TIMER, "Timer broadcast interrupts"),
@@ -473,6 +453,12 @@ static const char *ipi_types[NR_IPI] = {
         S(IPI_COMPLETION, "completion interrupts"),
 };
 
+static void smp_cross_call(const struct cpumask *target, unsigned int ipinr)
+{
+        trace_ipi_raise(target, ipi_types[ipinr]);
+        __smp_cross_call(target, ipinr);
+}
+
 void show_ipi_list(struct seq_file *p, int prec)
 {
         unsigned int cpu, i;
@@ -499,6 +485,29 @@ u64 smp_irq_stat_cpu(unsigned int cpu)
         return sum;
 }
 
+void arch_send_call_function_ipi_mask(const struct cpumask *mask)
+{
+        smp_cross_call(mask, IPI_CALL_FUNC);
+}
+
+void arch_send_wakeup_ipi_mask(const struct cpumask *mask)
+{
+        smp_cross_call(mask, IPI_WAKEUP);
+}
+
+void arch_send_call_function_single_ipi(int cpu)
+{
+        smp_cross_call(cpumask_of(cpu), IPI_CALL_FUNC_SINGLE);
+}
+
+#ifdef CONFIG_IRQ_WORK
+void arch_irq_work_raise(void)
+{
+        if (is_smp())
+                smp_cross_call(cpumask_of(smp_processor_id()), IPI_IRQ_WORK);
+}
+#endif
+
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
 void tick_broadcast(const struct cpumask *mask)
 {
@@ -556,8 +565,10 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
         unsigned int cpu = smp_processor_id();
         struct pt_regs *old_regs = set_irq_regs(regs);
 
-        if (ipinr < NR_IPI)
+        if ((unsigned)ipinr < NR_IPI) {
+                trace_ipi_entry(ipi_types[ipinr]);
                 __inc_irq_stat(cpu, ipi_irqs[ipinr]);
+        }
 
         switch (ipinr) {
         case IPI_WAKEUP:
@@ -612,6 +623,9 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
                        cpu, ipinr);
                 break;
         }
+
+        if ((unsigned)ipinr < NR_IPI)
+                trace_ipi_exit(ipi_types[ipinr]);
         set_irq_regs(old_regs);
 }
 
diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c
index 1aafa0d785eb..72f9241ad5db 100644
--- a/arch/arm/kernel/smp_scu.c
+++ b/arch/arm/kernel/smp_scu.c
@@ -17,6 +17,8 @@
 #include <asm/cputype.h>
 
 #define SCU_CTRL                0x00
+#define SCU_ENABLE              (1 << 0)
+#define SCU_STANDBY_ENABLE      (1 << 5)
 #define SCU_CONFIG              0x04
 #define SCU_CPU_STATUS          0x08
 #define SCU_INVALIDATE          0x0c
@@ -50,10 +52,16 @@ void scu_enable(void __iomem *scu_base)
 
         scu_ctrl = readl_relaxed(scu_base + SCU_CTRL);
         /* already enabled? */
-        if (scu_ctrl & 1)
+        if (scu_ctrl & SCU_ENABLE)
                 return;
 
-        scu_ctrl |= 1;
+        scu_ctrl |= SCU_ENABLE;
+
+        /* Cortex-A9 earlier than r2p0 has no standby bit in SCU */
+        if ((read_cpuid_id() & 0xff0ffff0) == 0x410fc090 &&
+            (read_cpuid_id() & 0x00f0000f) >= 0x00200000)
+                scu_ctrl |= SCU_STANDBY_ENABLE;
+
         writel_relaxed(scu_ctrl, scu_base + SCU_CTRL);
 
         /*
diff --git a/arch/arm/kernel/smp_tlb.c b/arch/arm/kernel/smp_tlb.c
index 95d063620b76..2e72be4f623e 100644
--- a/arch/arm/kernel/smp_tlb.c
+++ b/arch/arm/kernel/smp_tlb.c
@@ -92,15 +92,19 @@ void erratum_a15_798181_init(void)
         unsigned int midr = read_cpuid_id();
         unsigned int revidr = read_cpuid(CPUID_REVIDR);
 
-        /* Cortex-A15 r0p0..r3p2 w/o ECO fix affected */
-        if ((midr & 0xff0ffff0) != 0x410fc0f0 || midr > 0x413fc0f2 ||
-            (revidr & 0x210) == 0x210) {
-                return;
-        }
-        if (revidr & 0x10)
-                erratum_a15_798181_handler = erratum_a15_798181_partial;
-        else
+        /* Brahma-B15 r0p0..r0p2 affected
+         * Cortex-A15 r0p0..r3p2 w/o ECO fix affected */
+        if ((midr & 0xff0ffff0) == 0x420f00f0 && midr <= 0x420f00f2)
                 erratum_a15_798181_handler = erratum_a15_798181_broadcast;
+        else if ((midr & 0xff0ffff0) == 0x410fc0f0 && midr <= 0x413fc0f2 &&
+                 (revidr & 0x210) != 0x210) {
+                if (revidr & 0x10)
+                        erratum_a15_798181_handler =
+                                erratum_a15_798181_partial;
+                else
+                        erratum_a15_798181_handler =
+                                erratum_a15_798181_broadcast;
+        }
 }
 #endif
 
diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
index b1b89882b113..67ca8578c6d8 100644
--- a/arch/arm/kernel/swp_emulate.c
+++ b/arch/arm/kernel/swp_emulate.c
@@ -27,6 +27,7 @@
 #include <linux/perf_event.h>
 
 #include <asm/opcodes.h>
+#include <asm/system_info.h>
 #include <asm/traps.h>
 #include <asm/uaccess.h>
 
@@ -266,6 +267,9 @@ static struct undef_hook swp_hook = {
  */
 static int __init swp_emulation_init(void)
 {
+        if (cpu_architecture() < CPU_ARCH_ARMv7)
+                return 0;
+
 #ifdef CONFIG_PROC_FS
         if (!proc_create("cpu/swp_emulation", S_IRUGO, NULL, &proc_status_fops))
                 return -ENOMEM;
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 829a96d4a179..0cc7e58c47cc 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -50,10 +50,7 @@ unsigned long profile_pc(struct pt_regs *regs)
         if (!in_lock_functions(regs->ARM_pc))
                 return regs->ARM_pc;
 
-        frame.fp = regs->ARM_fp;
-        frame.sp = regs->ARM_sp;
-        frame.lr = regs->ARM_lr;
-        frame.pc = regs->ARM_pc;
+        arm_get_current_stackframe(regs, &frame);
         do {
                 int ret = unwind_frame(&frame);
                 if (ret < 0)
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index abd2fc067736..c8e4bb714944 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -31,11 +31,13 @@
 #include <asm/exception.h>
 #include <asm/unistd.h>
 #include <asm/traps.h>
+#include <asm/ptrace.h>
 #include <asm/unwind.h>
 #include <asm/tls.h>
 #include <asm/system_misc.h>
 #include <asm/opcodes.h>
 
+
 static const char *handler[]= {
         "prefetch abort",
         "data abort",
@@ -184,7 +186,7 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
                 tsk = current;
 
         if (regs) {
-                fp = regs->ARM_fp;
+                fp = frame_pointer(regs);
                 mode = processor_mode(regs);
         } else if (tsk != current) {
                 fp = thread_saved_fp(tsk);
@@ -719,7 +721,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
                 dump_instr("", regs);
                 if (user_mode(regs)) {
                         __show_regs(regs);
-                        c_backtrace(regs->ARM_fp, processor_mode(regs));
+                        c_backtrace(frame_pointer(regs), processor_mode(regs));
                 }
         }
 #endif
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
index e67682f02cb2..a61a1dfbb0db 100644
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
@@ -479,12 +479,10 @@ void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk)
                 tsk = current;
 
         if (regs) {
-                frame.fp = regs->ARM_fp;
-                frame.sp = regs->ARM_sp;
-                frame.lr = regs->ARM_lr;
+                arm_get_current_stackframe(regs, &frame);
                 /* PC might be corrupted, use LR in that case. */
-                frame.pc = kernel_text_address(regs->ARM_pc)
-                         ? regs->ARM_pc : regs->ARM_lr;
+                if (!kernel_text_address(regs->ARM_pc))
+                        frame.pc = regs->ARM_lr;
         } else if (tsk == current) {
                 frame.fp = (unsigned long)__builtin_frame_address(0);
                 frame.sp = current_sp;
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 7bcee5c9b604..6f57cb94367f 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -318,7 +318,6 @@ SECTIONS
         _end = .;
 
         STABS_DEBUG
-        .comment 0 : { *(.comment) }
 }
 
 /*
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index 4be5bb150bdd..466bd299b1a8 100644
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -23,7 +23,7 @@ config KVM
         select HAVE_KVM_CPU_RELAX_INTERCEPT
         select KVM_MMIO
         select KVM_ARM_HOST
-        depends on ARM_VIRT_EXT && ARM_LPAE && !CPU_BIG_ENDIAN
+        depends on ARM_VIRT_EXT && ARM_LPAE
         ---help---
           Support hosting virtualized guest machines. You will also
           need to select one or more of the processor modules below.
diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile
index 789bca9e64a7..f7057ed045b6 100644
--- a/arch/arm/kvm/Makefile
+++ b/arch/arm/kvm/Makefile
@@ -21,4 +21,5 @@ obj-y += kvm-arm.o init.o interrupts.o
 obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o
 obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o
 obj-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic.o
+obj-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v2.o
 obj-$(CONFIG_KVM_ARM_TIMER) += $(KVM)/arm/arch_timer.o
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 3c82b37c0f9e..a99e0cdf8ba2 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -155,16 +155,6 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
         return VM_FAULT_SIGBUS;
 }
 
-void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
-                           struct kvm_memory_slot *dont)
-{
-}
-
-int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
-                            unsigned long npages)
-{
-        return 0;
-}
 
 /**
  * kvm_arch_destroy_vm - destroy the VM data structure
@@ -184,7 +174,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
         }
 }
 
-int kvm_dev_ioctl_check_extension(long ext)
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 {
         int r;
         switch (ext) {
@@ -225,33 +215,6 @@ 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,
-                                   enum kvm_mr_change change)
-{
-        return 0;
-}
-
-void kvm_arch_commit_memory_region(struct kvm *kvm,
-                                   struct kvm_userspace_memory_region *mem,
-                                   const struct kvm_memory_slot *old,
-                                   enum kvm_mr_change change)
-{
-}
-
-void kvm_arch_flush_shadow_all(struct kvm *kvm)
-{
-}
-
-void kvm_arch_flush_shadow_memslot(struct kvm *kvm,
-                                   struct kvm_memory_slot *slot)
-{
-}
 
 struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
 {
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index c58a35116f63..37a0fe1bb9bb 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -44,6 +44,31 @@ static u32 cache_levels;
 /* CSSELR values; used to index KVM_REG_ARM_DEMUX_ID_CCSIDR */
 #define CSSELR_MAX 12
 
+/*
+ * kvm_vcpu_arch.cp15 holds cp15 registers as an array of u32, but some
+ * of cp15 registers can be viewed either as couple of two u32 registers
+ * or one u64 register. Current u64 register encoding is that least
+ * significant u32 word is followed by most significant u32 word.
+ */
+static inline void vcpu_cp15_reg64_set(struct kvm_vcpu *vcpu,
+                                       const struct coproc_reg *r,
+                                       u64 val)
+{
+        vcpu->arch.cp15[r->reg] = val & 0xffffffff;
+        vcpu->arch.cp15[r->reg + 1] = val >> 32;
+}
+
+static inline u64 vcpu_cp15_reg64_get(struct kvm_vcpu *vcpu,
+                                      const struct coproc_reg *r)
+{
+        u64 val;
+
+        val = vcpu->arch.cp15[r->reg + 1];
+        val = val << 32;
+        val = val | vcpu->arch.cp15[r->reg];
+        return val;
+}
+
 int kvm_handle_cp10_id(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
         kvm_inject_undefined(vcpu);
@@ -682,17 +707,23 @@ static struct coproc_reg invariant_cp15[] = {
         { CRn( 0), CRm( 0), Op1( 1), Op2( 7), is32, NULL, get_AIDR },
 };
 
+/*
+ * Reads a register value from a userspace address to a kernel
+ * variable. Make sure that register size matches sizeof(*__val).
+ */
 static int reg_from_user(void *val, const void __user *uaddr, u64 id)
 {
-        /* This Just Works because we are little endian. */
         if (copy_from_user(val, uaddr, KVM_REG_SIZE(id)) != 0)
                 return -EFAULT;
         return 0;
 }
 
+/*
+ * Writes a register value to a userspace address from a kernel variable.
+ * Make sure that register size matches sizeof(*__val).
+ */
 static int reg_to_user(void __user *uaddr, const void *val, u64 id)
 {
-        /* This Just Works because we are little endian. */
         if (copy_to_user(uaddr, val, KVM_REG_SIZE(id)) != 0)
                 return -EFAULT;
         return 0;
@@ -702,6 +733,7 @@ static int get_invariant_cp15(u64 id, void __user *uaddr)
 {
         struct coproc_params params;
         const struct coproc_reg *r;
+        int ret;
 
         if (!index_to_params(id, &params))
                 return -ENOENT;
@@ -710,7 +742,15 @@ static int get_invariant_cp15(u64 id, void __user *uaddr)
         if (!r)
                 return -ENOENT;
 
-        return reg_to_user(uaddr, &r->val, id);
+        ret = -ENOENT;
+        if (KVM_REG_SIZE(id) == 4) {
+                u32 val = r->val;
+
+                ret = reg_to_user(uaddr, &val, id);
+        } else if (KVM_REG_SIZE(id) == 8) {
+                ret = reg_to_user(uaddr, &r->val, id);
+        }
+        return ret;
 }
 
 static int set_invariant_cp15(u64 id, void __user *uaddr)
@@ -718,7 +758,7 @@ static int set_invariant_cp15(u64 id, void __user *uaddr)
         struct coproc_params params;
         const struct coproc_reg *r;
         int err;
-        u64 val = 0; /* Make sure high bits are 0 for 32-bit regs */
+        u64 val;
 
         if (!index_to_params(id, &params))
                 return -ENOENT;
@@ -726,7 +766,16 @@ static int set_invariant_cp15(u64 id, void __user *uaddr)
         if (!r)
                 return -ENOENT;
 
-        err = reg_from_user(&val, uaddr, id);
+        err = -ENOENT;
+        if (KVM_REG_SIZE(id) == 4) {
+                u32 val32;
+
+                err = reg_from_user(&val32, uaddr, id);
+                if (!err)
+                        val = val32;
+        } else if (KVM_REG_SIZE(id) == 8) {
+                err = reg_from_user(&val, uaddr, id);
+        }
         if (err)
                 return err;
 
@@ -1004,6 +1053,7 @@ int kvm_arm_coproc_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
 {
         const struct coproc_reg *r;
         void __user *uaddr = (void __user *)(long)reg->addr;
+        int ret;
 
         if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_DEMUX)
                 return demux_c15_get(reg->id, uaddr);
@@ -1015,14 +1065,24 @@ int kvm_arm_coproc_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
         if (!r)
                 return get_invariant_cp15(reg->id, uaddr);
 
-        /* Note: copies two regs if size is 64 bit. */
-        return reg_to_user(uaddr, &vcpu->arch.cp15[r->reg], reg->id);
+        ret = -ENOENT;
+        if (KVM_REG_SIZE(reg->id) == 8) {
+                u64 val;
+
+                val = vcpu_cp15_reg64_get(vcpu, r);
+                ret = reg_to_user(uaddr, &val, reg->id);
+        } else if (KVM_REG_SIZE(reg->id) == 4) {
+                ret = reg_to_user(uaddr, &vcpu->arch.cp15[r->reg], reg->id);
+        }
+
+        return ret;
 }
 
 int kvm_arm_coproc_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
 {
         const struct coproc_reg *r;
         void __user *uaddr = (void __user *)(long)reg->addr;
+        int ret;
 
         if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_DEMUX)
                 return demux_c15_set(reg->id, uaddr);
@@ -1034,8 +1094,18 @@ int kvm_arm_coproc_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
         if (!r)
                 return set_invariant_cp15(reg->id, uaddr);
 
-        /* Note: copies two regs if size is 64 bit */
-        return reg_from_user(&vcpu->arch.cp15[r->reg], uaddr, reg->id);
+        ret = -ENOENT;
+        if (KVM_REG_SIZE(reg->id) == 8) {
+                u64 val;
+
+                ret = reg_from_user(&val, uaddr, reg->id);
+                if (!ret)
+                        vcpu_cp15_reg64_set(vcpu, r, val);
+        } else if (KVM_REG_SIZE(reg->id) == 4) {
+                ret = reg_from_user(&vcpu->arch.cp15[r->reg], uaddr, reg->id);
+        }
+
+        return ret;
 }
 
 static unsigned int num_demux_regs(void)
diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c
index b23a59c1c522..813e49258690 100644
--- a/arch/arm/kvm/guest.c
+++ b/arch/arm/kvm/guest.c
@@ -124,16 +124,6 @@ static bool is_timer_reg(u64 index)
         return false;
 }
 
-int kvm_arm_timer_set_reg(struct kvm_vcpu *vcpu, u64 regid, u64 value)
-{
-        return 0;
-}
-
-u64 kvm_arm_timer_get_reg(struct kvm_vcpu *vcpu, u64 regid)
-{
-        return 0;
-}
-
 #else
 
 #define NUM_TIMER_REGS 3
@@ -274,13 +264,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
 
 int __attribute_const__ kvm_target_cpu(void)
 {
-        unsigned long implementor = read_cpuid_implementor();
-        unsigned long part_number = read_cpuid_part_number();
-
-        if (implementor != ARM_CPU_IMP_ARM)
-                return -EINVAL;
-
-        switch (part_number) {
+        switch (read_cpuid_part()) {
         case ARM_CPU_PART_CORTEX_A7:
                 return KVM_ARM_TARGET_CORTEX_A7;
         case ARM_CPU_PART_CORTEX_A15:
diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S
index 1b9844d369cc..991415d978b6 100644
--- a/arch/arm/kvm/init.S
+++ b/arch/arm/kvm/init.S
@@ -17,6 +17,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 #include <asm/unified.h>
 #include <asm/asm-offsets.h>
 #include <asm/kvm_asm.h>
@@ -71,7 +72,7 @@ __do_hyp_init:
         bne     phase2                  @ Yes, second stage init
 
         @ Set the HTTBR to point to the hypervisor PGD pointer passed
-        mcrr    p15, 4, r2, r3, c2
+        mcrr    p15, 4, rr_lo_hi(r2, r3), c2
 
         @ Set the HTCR and VTCR to the same shareability and cacheability
         @ settings as the non-secure TTBCR and with T0SZ == 0.
@@ -134,10 +135,10 @@ phase2:
         ldr     r0, =TRAMPOLINE_VA
         adr     r1, target
         bfi     r0, r1, #0, #PAGE_SHIFT
-        mov     pc, r0
+        ret     r0
 
 target: @ We're now in the trampoline code, switch page tables
-        mcrr    p15, 4, r2, r3, c2
+        mcrr    p15, 4, rr_lo_hi(r2, r3), c2
         isb
 
         @ Invalidate the old TLBs
diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
index 0d68d4073068..01dcb0e752d9 100644
--- a/arch/arm/kvm/interrupts.S
+++ b/arch/arm/kvm/interrupts.S
@@ -52,7 +52,7 @@ ENTRY(__kvm_tlb_flush_vmid_ipa)
         dsb     ishst
         add     r0, r0, #KVM_VTTBR
         ldrd    r2, r3, [r0]
-        mcrr    p15, 6, r2, r3, c2      @ Write VTTBR
+        mcrr    p15, 6, rr_lo_hi(r2, r3), c2    @ Write VTTBR
         isb
         mcr     p15, 0, r0, c8, c3, 0   @ TLBIALLIS (rt ignored)
         dsb     ish
@@ -135,7 +135,7 @@ ENTRY(__kvm_vcpu_run)
         ldr     r1, [vcpu, #VCPU_KVM]
         add     r1, r1, #KVM_VTTBR
         ldrd    r2, r3, [r1]
-        mcrr    p15, 6, r2, r3, c2      @ Write VTTBR
+        mcrr    p15, 6, rr_lo_hi(r2, r3), c2    @ Write VTTBR
 
         @ We're all done, just restore the GPRs and go to the guest
         restore_guest_regs
@@ -199,8 +199,13 @@ after_vfp_restore:
 
         restore_host_regs
         clrex                           @ Clear exclusive monitor
+#ifndef CONFIG_CPU_ENDIAN_BE8
         mov     r0, r1                  @ Return the return code
         mov     r1, #0                  @ Clear upper bits in return value
+#else
+        @ r1 already has return code
+        mov     r0, #0                  @ Clear upper bits in return value
+#endif /* CONFIG_CPU_ENDIAN_BE8 */
         bx      lr                      @ return to IOCTL
 
 /********************************************************************
diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S
index 76af93025574..98c8c5b9a87f 100644
--- a/arch/arm/kvm/interrupts_head.S
+++ b/arch/arm/kvm/interrupts_head.S
@@ -1,4 +1,5 @@
 #include <linux/irqchip/arm-gic.h>
+#include <asm/assembler.h>
 
 #define VCPU_USR_REG(_reg_nr)   (VCPU_USR_REGS + (_reg_nr * 4))
 #define VCPU_USR_SP             (VCPU_USR_REG(13))
@@ -420,15 +421,23 @@ vcpu	.req	r0		@ vcpu pointer always in r0
         ldr     r8, [r2, #GICH_ELRSR0]
         ldr     r9, [r2, #GICH_ELRSR1]
         ldr     r10, [r2, #GICH_APR]
-
-        str     r3, [r11, #VGIC_CPU_HCR]
-        str     r4, [r11, #VGIC_CPU_VMCR]
-        str     r5, [r11, #VGIC_CPU_MISR]
-        str     r6, [r11, #VGIC_CPU_EISR]
-        str     r7, [r11, #(VGIC_CPU_EISR + 4)]
-        str     r8, [r11, #VGIC_CPU_ELRSR]
-        str     r9, [r11, #(VGIC_CPU_ELRSR + 4)]
-        str     r10, [r11, #VGIC_CPU_APR]
+ARM_BE8(rev     r3, r3  )
+ARM_BE8(rev     r4, r4  )
+ARM_BE8(rev     r5, r5  )
+ARM_BE8(rev     r6, r6  )
+ARM_BE8(rev     r7, r7  )
+ARM_BE8(rev     r8, r8  )
+ARM_BE8(rev     r9, r9  )
+ARM_BE8(rev     r10, r10        )
+
+        str     r3, [r11, #VGIC_V2_CPU_HCR]
+        str     r4, [r11, #VGIC_V2_CPU_VMCR]
+        str     r5, [r11, #VGIC_V2_CPU_MISR]
+        str     r6, [r11, #VGIC_V2_CPU_EISR]
+        str     r7, [r11, #(VGIC_V2_CPU_EISR + 4)]
+        str     r8, [r11, #VGIC_V2_CPU_ELRSR]
+        str     r9, [r11, #(VGIC_V2_CPU_ELRSR + 4)]
+        str     r10, [r11, #VGIC_V2_CPU_APR]
 
         /* Clear GICH_HCR */
         mov     r5, #0
@@ -436,9 +445,10 @@ vcpu	.req	r0		@ vcpu pointer always in r0
 
         /* Save list registers */
         add     r2, r2, #GICH_LR0
-        add     r3, r11, #VGIC_CPU_LR
+        add     r3, r11, #VGIC_V2_CPU_LR
         ldr     r4, [r11, #VGIC_CPU_NR_LR]
 1:      ldr     r6, [r2], #4
+ARM_BE8(rev     r6, r6  )
         str     r6, [r3], #4
         subs    r4, r4, #1
         bne     1b
@@ -463,9 +473,12 @@ vcpu	.req	r0		@ vcpu pointer always in r0
         add     r11, vcpu, #VCPU_VGIC_CPU
 
         /* We only restore a minimal set of registers */
-        ldr     r3, [r11, #VGIC_CPU_HCR]
-        ldr     r4, [r11, #VGIC_CPU_VMCR]
-        ldr     r8, [r11, #VGIC_CPU_APR]
+        ldr     r3, [r11, #VGIC_V2_CPU_HCR]
+        ldr     r4, [r11, #VGIC_V2_CPU_VMCR]
+        ldr     r8, [r11, #VGIC_V2_CPU_APR]
+ARM_BE8(rev     r3, r3  )
+ARM_BE8(rev     r4, r4  )
+ARM_BE8(rev     r8, r8  )
 
         str     r3, [r2, #GICH_HCR]
         str     r4, [r2, #GICH_VMCR]
@@ -473,9 +486,10 @@ vcpu	.req	r0		@ vcpu pointer always in r0
 
         /* Restore list registers */
         add     r2, r2, #GICH_LR0
-        add     r3, r11, #VGIC_CPU_LR
+        add     r3, r11, #VGIC_V2_CPU_LR
         ldr     r4, [r11, #VGIC_CPU_NR_LR]
 1:      ldr     r6, [r3], #4
+ARM_BE8(rev     r6, r6  )
         str     r6, [r2], #4
         subs    r4, r4, #1
         bne     1b
@@ -506,7 +520,7 @@ vcpu	.req	r0		@ vcpu pointer always in r0
         mcr     p15, 0, r2, c14, c3, 1  @ CNTV_CTL
         isb
 
-        mrrc    p15, 3, r2, r3, c14     @ CNTV_CVAL
+        mrrc    p15, 3, rr_lo_hi(r2, r3), c14   @ CNTV_CVAL
         ldr     r4, =VCPU_TIMER_CNTV_CVAL
         add     r5, vcpu, r4
         strd    r2, r3, [r5]
@@ -546,12 +560,12 @@ vcpu	.req	r0		@ vcpu pointer always in r0
 
         ldr     r2, [r4, #KVM_TIMER_CNTVOFF]
         ldr     r3, [r4, #(KVM_TIMER_CNTVOFF + 4)]
-        mcrr    p15, 4, r2, r3, c14     @ CNTVOFF
+        mcrr    p15, 4, rr_lo_hi(r2, r3), c14   @ CNTVOFF
 
         ldr     r4, =VCPU_TIMER_CNTV_CVAL
         add     r5, vcpu, r4
         ldrd    r2, r3, [r5]
-        mcrr    p15, 3, r2, r3, c14     @ CNTV_CVAL
+        mcrr    p15, 3, rr_lo_hi(r2, r3), c14   @ CNTV_CVAL
         isb
 
         ldr     r2, [vcpu, #VCPU_TIMER_CNTV_CTL]
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 16f804938b8f..16e7994bf347 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -90,104 +90,115 @@ static void *mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc)
         return p;
 }
 
-static bool page_empty(void *ptr)
+static void clear_pgd_entry(struct kvm *kvm, pgd_t *pgd, phys_addr_t addr)
 {
-        struct page *ptr_page = virt_to_page(ptr);
-        return page_count(ptr_page) == 1;
+        pud_t *pud_table __maybe_unused = pud_offset(pgd, 0);
+        pgd_clear(pgd);
+        kvm_tlb_flush_vmid_ipa(kvm, addr);
+        pud_free(NULL, pud_table);
+        put_page(virt_to_page(pgd));
 }
 
 static void clear_pud_entry(struct kvm *kvm, pud_t *pud, phys_addr_t addr)
 {
-        if (pud_huge(*pud)) {
-                pud_clear(pud);
-                kvm_tlb_flush_vmid_ipa(kvm, addr);
-        } else {
-                pmd_t *pmd_table = pmd_offset(pud, 0);
-                pud_clear(pud);
-                kvm_tlb_flush_vmid_ipa(kvm, addr);
-                pmd_free(NULL, pmd_table);
-        }
+        pmd_t *pmd_table = pmd_offset(pud, 0);
+        VM_BUG_ON(pud_huge(*pud));
+        pud_clear(pud);
+        kvm_tlb_flush_vmid_ipa(kvm, addr);
+        pmd_free(NULL, pmd_table);
         put_page(virt_to_page(pud));
 }
 
 static void clear_pmd_entry(struct kvm *kvm, pmd_t *pmd, phys_addr_t addr)
 {
-        if (kvm_pmd_huge(*pmd)) {
-                pmd_clear(pmd);
-                kvm_tlb_flush_vmid_ipa(kvm, addr);
-        } else {
-                pte_t *pte_table = pte_offset_kernel(pmd, 0);
-                pmd_clear(pmd);
-                kvm_tlb_flush_vmid_ipa(kvm, addr);
-                pte_free_kernel(NULL, pte_table);
-        }
+        pte_t *pte_table = pte_offset_kernel(pmd, 0);
+        VM_BUG_ON(kvm_pmd_huge(*pmd));
+        pmd_clear(pmd);
+        kvm_tlb_flush_vmid_ipa(kvm, addr);
+        pte_free_kernel(NULL, pte_table);
         put_page(virt_to_page(pmd));
 }
 
-static void clear_pte_entry(struct kvm *kvm, pte_t *pte, phys_addr_t addr)
+static void unmap_ptes(struct kvm *kvm, pmd_t *pmd,
+                       phys_addr_t addr, phys_addr_t end)
 {
-        if (pte_present(*pte)) {
-                kvm_set_pte(pte, __pte(0));
-                put_page(virt_to_page(pte));
-                kvm_tlb_flush_vmid_ipa(kvm, addr);
-        }
+        phys_addr_t start_addr = addr;
+        pte_t *pte, *start_pte;
+
+        start_pte = pte = pte_offset_kernel(pmd, addr);
+        do {
+                if (!pte_none(*pte)) {
+                        kvm_set_pte(pte, __pte(0));
+                        put_page(virt_to_page(pte));
+                        kvm_tlb_flush_vmid_ipa(kvm, addr);
+                }
+        } while (pte++, addr += PAGE_SIZE, addr != end);
+
+        if (kvm_pte_table_empty(start_pte))
+                clear_pmd_entry(kvm, pmd, start_addr);
 }
 
-static void unmap_range(struct kvm *kvm, pgd_t *pgdp,
-                        unsigned long long start, u64 size)
+static void unmap_pmds(struct kvm *kvm, pud_t *pud,
+                       phys_addr_t addr, phys_addr_t end)
 {
-        pgd_t *pgd;
-        pud_t *pud;
-        pmd_t *pmd;
-        pte_t *pte;
-        unsigned long long addr = start, end = start + size;
-        u64 next;
-
-        while (addr < end) {
-                pgd = pgdp + pgd_index(addr);
-                pud = pud_offset(pgd, addr);
-                pte = NULL;
-                if (pud_none(*pud)) {
-                        addr = kvm_pud_addr_end(addr, end);
-                        continue;
-                }
+        phys_addr_t next, start_addr = addr;
+        pmd_t *pmd, *start_pmd;
 
-                if (pud_huge(*pud)) {
-                        /*
-                         * If we are dealing with a huge pud, just clear it and
-                         * move on.
-                         */
-                        clear_pud_entry(kvm, pud, addr);
-                        addr = kvm_pud_addr_end(addr, end);
-                        continue;
+        start_pmd = pmd = pmd_offset(pud, addr);
+        do {
+                next = kvm_pmd_addr_end(addr, end);
+                if (!pmd_none(*pmd)) {
+                        if (kvm_pmd_huge(*pmd)) {
+                                pmd_clear(pmd);
+                                kvm_tlb_flush_vmid_ipa(kvm, addr);
+                                put_page(virt_to_page(pmd));
+                        } else {
+                                unmap_ptes(kvm, pmd, addr, next);
+                        }
                 }
+        } while (pmd++, addr = next, addr != end);
 
-                pmd = pmd_offset(pud, addr);
-                if (pmd_none(*pmd)) {
-                        addr = kvm_pmd_addr_end(addr, end);
-                        continue;
-                }
+        if (kvm_pmd_table_empty(start_pmd))
+                clear_pud_entry(kvm, pud, start_addr);
+}
 
-                if (!kvm_pmd_huge(*pmd)) {
-                        pte = pte_offset_kernel(pmd, addr);
-                        clear_pte_entry(kvm, pte, addr);
-                        next = addr + PAGE_SIZE;
-                }
+static void unmap_puds(struct kvm *kvm, pgd_t *pgd,
+                       phys_addr_t addr, phys_addr_t end)
+{
+        phys_addr_t next, start_addr = addr;
+        pud_t *pud, *start_pud;
 
-                /*
-                 * If the pmd entry is to be cleared, walk back up the ladder
-                 */
-                if (kvm_pmd_huge(*pmd) || (pte && page_empty(pte))) {
-                        clear_pmd_entry(kvm, pmd, addr);
-                        next = kvm_pmd_addr_end(addr, end);
-                        if (page_empty(pmd) && !page_empty(pud)) {
-                                clear_pud_entry(kvm, pud, addr);
-                                next = kvm_pud_addr_end(addr, end);
+        start_pud = pud = pud_offset(pgd, addr);
+        do {
+                next = kvm_pud_addr_end(addr, end);
+                if (!pud_none(*pud)) {
+                        if (pud_huge(*pud)) {
+                                pud_clear(pud);
+                                kvm_tlb_flush_vmid_ipa(kvm, addr);
+                                put_page(virt_to_page(pud));
+                        } else {
+                                unmap_pmds(kvm, pud, addr, next);
                         }
                 }
+        } while (pud++, addr = next, addr != end);
 
-                addr = next;
-        }
+        if (kvm_pud_table_empty(start_pud))
+                clear_pgd_entry(kvm, pgd, start_addr);
+}
+
+
+static void unmap_range(struct kvm *kvm, pgd_t *pgdp,
+                        phys_addr_t start, u64 size)
+{
+        pgd_t *pgd;
+        phys_addr_t addr = start, end = start + size;
+        phys_addr_t next;
+
+        pgd = pgdp + pgd_index(addr);
+        do {
+                next = kvm_pgd_addr_end(addr, end);
+                unmap_puds(kvm, pgd, addr, next);
+        } while (pgd++, addr = next, addr != end);
 }
 
 static void stage2_flush_ptes(struct kvm *kvm, pmd_t *pmd,
@@ -748,6 +759,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
         struct kvm_mmu_memory_cache *memcache = &vcpu->arch.mmu_page_cache;
         struct vm_area_struct *vma;
         pfn_t pfn;
+        pgprot_t mem_type = PAGE_S2;
 
         write_fault = kvm_is_write_fault(kvm_vcpu_get_hsr(vcpu));
         if (fault_status == FSC_PERM && !write_fault) {
@@ -798,6 +810,9 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
         if (is_error_pfn(pfn))
                 return -EFAULT;
 
+        if (kvm_is_mmio_pfn(pfn))
+                mem_type = PAGE_S2_DEVICE;
+
         spin_lock(&kvm->mmu_lock);
         if (mmu_notifier_retry(kvm, mmu_seq))
                 goto out_unlock;
@@ -805,7 +820,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
                 hugetlb = transparent_hugepage_adjust(&pfn, &fault_ipa);
 
         if (hugetlb) {
-                pmd_t new_pmd = pfn_pmd(pfn, PAGE_S2);
+                pmd_t new_pmd = pfn_pmd(pfn, mem_type);
                 new_pmd = pmd_mkhuge(new_pmd);
                 if (writable) {
                         kvm_set_s2pmd_writable(&new_pmd);
@@ -814,13 +829,14 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
                 coherent_cache_guest_page(vcpu, hva & PMD_MASK, PMD_SIZE);
                 ret = stage2_set_pmd_huge(kvm, memcache, fault_ipa, &new_pmd);
         } else {
-                pte_t new_pte = pfn_pte(pfn, PAGE_S2);
+                pte_t new_pte = pfn_pte(pfn, mem_type);
                 if (writable) {
                         kvm_set_s2pte_writable(&new_pte);
                         kvm_set_pfn_dirty(pfn);
                 }
                 coherent_cache_guest_page(vcpu, hva, PAGE_SIZE);
-                ret = stage2_set_pte(kvm, memcache, fault_ipa, &new_pte, false);
+                ret = stage2_set_pte(kvm, memcache, fault_ipa, &new_pte,
+                                     mem_type == PAGE_S2_DEVICE);
         }
 
 
@@ -1100,3 +1116,49 @@ out:
         free_hyp_pgds();
         return err;
 }
+
+void kvm_arch_commit_memory_region(struct kvm *kvm,
+                                   struct kvm_userspace_memory_region *mem,
+                                   const struct kvm_memory_slot *old,
+                                   enum kvm_mr_change change)
+{
+        gpa_t gpa = old->base_gfn << PAGE_SHIFT;
+        phys_addr_t size = old->npages << PAGE_SHIFT;
+        if (change == KVM_MR_DELETE || change == KVM_MR_MOVE) {
+                spin_lock(&kvm->mmu_lock);
+                unmap_stage2_range(kvm, gpa, size);
+                spin_unlock(&kvm->mmu_lock);
+        }
+}
+
+int kvm_arch_prepare_memory_region(struct kvm *kvm,
+                                   struct kvm_memory_slot *memslot,
+                                   struct kvm_userspace_memory_region *mem,
+                                   enum kvm_mr_change change)
+{
+        return 0;
+}
+
+void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
+                           struct kvm_memory_slot *dont)
+{
+}
+
+int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
+                            unsigned long npages)
+{
+        return 0;
+}
+
+void kvm_arch_memslots_updated(struct kvm *kvm)
+{
+}
+
+void kvm_arch_flush_shadow_all(struct kvm *kvm)
+{
+}
+
+void kvm_arch_flush_shadow_memslot(struct kvm *kvm,
+                                   struct kvm_memory_slot *slot)
+{
+}
diff --git a/arch/arm/lib/ashldi3.S b/arch/arm/lib/ashldi3.S
index 638deb13da1c..b05e95840651 100644
--- a/arch/arm/lib/ashldi3.S
+++ b/arch/arm/lib/ashldi3.S
@@ -27,6 +27,7 @@ Boston, MA 02110-1301, USA.  */
 
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 #ifdef __ARMEB__
 #define al r1
@@ -47,7 +48,7 @@ ENTRY(__aeabi_llsl)
  THUMB( lsrmi   r3, al, ip              )
  THUMB( orrmi   ah, ah, r3              )
         mov     al, al, lsl r2
-        mov     pc, lr
+        ret     lr
 
 ENDPROC(__ashldi3)
 ENDPROC(__aeabi_llsl)
diff --git a/arch/arm/lib/ashrdi3.S b/arch/arm/lib/ashrdi3.S
index 015e8aa5a1d1..275d7d2341a4 100644
--- a/arch/arm/lib/ashrdi3.S
+++ b/arch/arm/lib/ashrdi3.S
@@ -27,6 +27,7 @@ Boston, MA 02110-1301, USA.  */
 
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 #ifdef __ARMEB__
 #define al r1
@@ -47,7 +48,7 @@ ENTRY(__aeabi_lasr)
  THUMB( lslmi   r3, ah, ip              )
  THUMB( orrmi   al, al, r3              )
         mov     ah, ah, asr r2
-        mov     pc, lr
+        ret     lr
 
 ENDPROC(__ashrdi3)
 ENDPROC(__aeabi_lasr)
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
index 4102be617fce..fab5a50503ae 100644
--- a/arch/arm/lib/backtrace.S
+++ b/arch/arm/lib/backtrace.S
@@ -25,7 +25,7 @@
 ENTRY(c_backtrace)
 
 #if !defined(CONFIG_FRAME_POINTER) || !defined(CONFIG_PRINTK)
-                mov     pc, lr
+                ret     lr
 ENDPROC(c_backtrace)
 #else
                 stmfd   sp!, {r4 - r8, lr}      @ Save an extra register so we have a location...
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index 9f12ed1eea86..7d807cfd8ef5 100644
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -1,3 +1,4 @@
+#include <asm/assembler.h>
 #include <asm/unwind.h>
 
 #if __LINUX_ARM_ARCH__ >= 6
@@ -70,7 +71,7 @@ UNWIND(	.fnstart	)
         \instr  r2, r2, r3
         str     r2, [r1, r0, lsl #2]
         restore_irqs ip
-        mov     pc, lr
+        ret     lr
 UNWIND( .fnend          )
 ENDPROC(\name           )
         .endm
@@ -98,7 +99,7 @@ UNWIND(	.fnstart	)
         \store  r2, [r1]
         moveq   r0, #0
         restore_irqs ip
-        mov     pc, lr
+        ret     lr
 UNWIND( .fnend          )
 ENDPROC(\name           )
         .endm
diff --git a/arch/arm/lib/bswapsdi2.S b/arch/arm/lib/bswapsdi2.S
index 9fcdd154eff9..07cda737bb11 100644
--- a/arch/arm/lib/bswapsdi2.S
+++ b/arch/arm/lib/bswapsdi2.S
@@ -1,4 +1,5 @@
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 #if __LINUX_ARM_ARCH__ >= 6
 ENTRY(__bswapsi2)
@@ -18,7 +19,7 @@ ENTRY(__bswapsi2)
         mov r3, r3, lsr #8
         bic r3, r3, #0xff00
         eor r0, r3, r0, ror #8
-        mov pc, lr
+        ret lr
 ENDPROC(__bswapsi2)
 
 ENTRY(__bswapdi2)
@@ -31,6 +32,6 @@ ENTRY(__bswapdi2)
         bic r1, r1, #0xff00
         eor r1, r1, r0, ror #8
         eor r0, r3, ip, ror #8
-        mov pc, lr
+        ret lr
 ENDPROC(__bswapdi2)
 #endif
diff --git a/arch/arm/lib/call_with_stack.S b/arch/arm/lib/call_with_stack.S
index 916c80f13ae7..ed1a421813cb 100644
--- a/arch/arm/lib/call_with_stack.S
+++ b/arch/arm/lib/call_with_stack.S
@@ -36,9 +36,9 @@ ENTRY(call_with_stack)
         mov     r0, r1
 
         adr     lr, BSYM(1f)
-        mov     pc, r2
+        ret     r2
 
 1:      ldr     lr, [sp]
         ldr     sp, [sp, #4]
-        mov     pc, lr
+        ret     lr
 ENDPROC(call_with_stack)
diff --git a/arch/arm/lib/csumpartial.S b/arch/arm/lib/csumpartial.S
index 31d3cb34740d..984e0f29d548 100644
--- a/arch/arm/lib/csumpartial.S
+++ b/arch/arm/lib/csumpartial.S
@@ -97,7 +97,7 @@ td3	.req	lr
 #endif
 #endif
                 adcnes  sum, sum, td0           @ update checksum
-                mov     pc, lr
+                ret     lr
 
 ENTRY(csum_partial)
                 stmfd   sp!, {buf, lr}
diff --git a/arch/arm/lib/csumpartialcopygeneric.S b/arch/arm/lib/csumpartialcopygeneric.S
index d6e742d24007..10b45909610c 100644
--- a/arch/arm/lib/csumpartialcopygeneric.S
+++ b/arch/arm/lib/csumpartialcopygeneric.S
@@ -7,6 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <asm/assembler.h>
 
 /*
  * unsigned int
@@ -40,7 +41,7 @@ sum	.req	r3
                 adcs    sum, sum, ip, put_byte_1        @ update checksum
                 strb    ip, [dst], #1
                 tst     dst, #2
-                moveq   pc, lr                  @ dst is now 32bit aligned
+                reteq   lr                      @ dst is now 32bit aligned
 
 .Ldst_16bit:    load2b  r8, ip
                 sub     len, len, #2
@@ -48,7 +49,7 @@ sum	.req	r3
                 strb    r8, [dst], #1
                 adcs    sum, sum, ip, put_byte_1
                 strb    ip, [dst], #1
-                mov     pc, lr                  @ dst is now 32bit aligned
+                ret     lr                      @ dst is now 32bit aligned
 
                 /*
                  * Handle 0 to 7 bytes, with any alignment of source and
diff --git a/arch/arm/lib/delay-loop.S b/arch/arm/lib/delay-loop.S
index bc1033b897b4..518bf6e93f78 100644
--- a/arch/arm/lib/delay-loop.S
+++ b/arch/arm/lib/delay-loop.S
@@ -35,7 +35,7 @@ ENTRY(__loop_const_udelay)			@ 0 <= r0 <= 0x7fffff06
                 mul     r0, r2, r0              @ max = 2^32-1
                 add     r0, r0, r1, lsr #32-6
                 movs    r0, r0, lsr #6
-                moveq   pc, lr
+                reteq   lr
 
 /*
  * loops = r0 * HZ * loops_per_jiffy / 1000000
@@ -46,23 +46,23 @@ ENTRY(__loop_const_udelay)			@ 0 <= r0 <= 0x7fffff06
 ENTRY(__loop_delay)
                 subs    r0, r0, #1
 #if 0
-                movls   pc, lr
+                retls   lr
                 subs    r0, r0, #1
-                movls   pc, lr
+                retls   lr
                 subs    r0, r0, #1
-                movls   pc, lr
+                retls   lr
                 subs    r0, r0, #1
-                movls   pc, lr
+                retls   lr
                 subs    r0, r0, #1
-                movls   pc, lr
+                retls   lr
                 subs    r0, r0, #1
-                movls   pc, lr
+                retls   lr
                 subs    r0, r0, #1
-                movls   pc, lr
+                retls   lr
                 subs    r0, r0, #1
 #endif
                 bhi     __loop_delay
-                mov     pc, lr
+                ret     lr
 ENDPROC(__loop_udelay)
 ENDPROC(__loop_const_udelay)
 ENDPROC(__loop_delay)
diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
index 5306de350133..312d43eb686a 100644
--- a/arch/arm/lib/delay.c
+++ b/arch/arm/lib/delay.c
@@ -19,6 +19,7 @@
  * Author: Will Deacon <will.deacon@arm.com>
  */
 
+#include <linux/clocksource.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -36,6 +37,7 @@ struct arm_delay_ops arm_delay_ops = {
 
 static const struct delay_timer *delay_timer;
 static bool delay_calibrated;
+static u64 delay_res;
 
 int read_current_timer(unsigned long *timer_val)
 {
@@ -47,6 +49,11 @@ int read_current_timer(unsigned long *timer_val)
 }
 EXPORT_SYMBOL_GPL(read_current_timer);
 
+static inline u64 cyc_to_ns(u64 cyc, u32 mult, u32 shift)
+{
+        return (cyc * mult) >> shift;
+}
+
 static void __timer_delay(unsigned long cycles)
 {
         cycles_t start = get_cycles();
@@ -69,18 +76,24 @@ static void __timer_udelay(unsigned long usecs)
 
 void __init register_current_timer_delay(const struct delay_timer *timer)
 {
-        if (!delay_calibrated) {
-                pr_info("Switching to timer-based delay loop\n");
+        u32 new_mult, new_shift;
+        u64 res;
+
+        clocks_calc_mult_shift(&new_mult, &new_shift, timer->freq,
+                               NSEC_PER_SEC, 3600);
+        res = cyc_to_ns(1ULL, new_mult, new_shift);
+
+        if (!delay_calibrated && (!delay_res || (res < delay_res))) {
+                pr_info("Switching to timer-based delay loop, resolution %lluns\n", res);
                 delay_timer                     = timer;
                 lpj_fine                        = timer->freq / HZ;
+                delay_res                       = res;
 
                 /* cpufreq may scale loops_per_jiffy, so keep a private copy */
                 arm_delay_ops.ticks_per_jiffy   = lpj_fine;
                 arm_delay_ops.delay             = __timer_delay;
                 arm_delay_ops.const_udelay      = __timer_const_udelay;
                 arm_delay_ops.udelay            = __timer_udelay;
-
-                delay_calibrated                = true;
         } else {
                 pr_info("Ignoring duplicate/late registration of read_current_timer delay\n");
         }
@@ -91,3 +104,8 @@ unsigned long calibrate_delay_is_known(void)
         delay_calibrated = true;
         return lpj_fine;
 }
+
+void calibration_delay_done(void)
+{
+        delay_calibrated = true;
+}
diff --git a/arch/arm/lib/div64.S b/arch/arm/lib/div64.S
index e55c4842c290..a9eafe4981eb 100644
--- a/arch/arm/lib/div64.S
+++ b/arch/arm/lib/div64.S
@@ -13,6 +13,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 #include <asm/unwind.h>
 
 #ifdef __ARMEB__
@@ -97,7 +98,7 @@ UNWIND(.fnstart)
         mov     yl, #0
         cmpeq   xl, r4
         movlo   xh, xl
-        movlo   pc, lr
+        retlo   lr
 
         @ The division loop for lower bit positions.
         @ Here we shift remainer bits leftwards rather than moving the
@@ -111,14 +112,14 @@ UNWIND(.fnstart)
         subcs   xh, xh, r4
         movs    ip, ip, lsr #1
         bne     4b
-        mov     pc, lr
+        ret     lr
 
         @ The top part of remainder became zero.  If carry is set
         @ (the 33th bit) this is a false positive so resume the loop.
         @ Otherwise, if lower part is also null then we are done.
 6:      bcs     5b
         cmp     xl, #0
-        moveq   pc, lr
+        reteq   lr
 
         @ We still have remainer bits in the low part.  Bring them up.
 
@@ -144,7 +145,7 @@ UNWIND(.fnstart)
         movs    ip, ip, lsr #1
         mov     xh, #1
         bne     4b
-        mov     pc, lr
+        ret     lr
 
 8:      @ Division by a power of 2: determine what that divisor order is
         @ then simply shift values around
@@ -184,13 +185,13 @@ UNWIND(.fnstart)
  THUMB( orr     yl, yl, xh              )
         mov     xh, xl, lsl ip
         mov     xh, xh, lsr ip
-        mov     pc, lr
+        ret     lr
 
         @ eq -> division by 1: obvious enough...
 9:      moveq   yl, xl
         moveq   yh, xh
         moveq   xh, #0
-        moveq   pc, lr
+        reteq   lr
 UNWIND(.fnend)
 
 UNWIND(.fnstart)
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S
index 64f6bc1a9132..7848780e8834 100644
--- a/arch/arm/lib/findbit.S
+++ b/arch/arm/lib/findbit.S
@@ -35,7 +35,7 @@ ENTRY(_find_first_zero_bit_le)
 2:              cmp     r2, r1                  @ any more?
                 blo     1b
 3:              mov     r0, r1                  @ no free bits
-                mov     pc, lr
+                ret     lr
 ENDPROC(_find_first_zero_bit_le)
 
 /*
@@ -76,7 +76,7 @@ ENTRY(_find_first_bit_le)
 2:              cmp     r2, r1                  @ any more?
                 blo     1b
 3:              mov     r0, r1                  @ no free bits
-                mov     pc, lr
+                ret     lr
 ENDPROC(_find_first_bit_le)
 
 /*
@@ -114,7 +114,7 @@ ENTRY(_find_first_zero_bit_be)
 2:              cmp     r2, r1                  @ any more?
                 blo     1b
 3:              mov     r0, r1                  @ no free bits
-                mov     pc, lr
+                ret     lr
 ENDPROC(_find_first_zero_bit_be)
 
 ENTRY(_find_next_zero_bit_be)
@@ -148,7 +148,7 @@ ENTRY(_find_first_bit_be)
 2:              cmp     r2, r1                  @ any more?
                 blo     1b
 3:              mov     r0, r1                  @ no free bits
-                mov     pc, lr
+                ret     lr
 ENDPROC(_find_first_bit_be)
 
 ENTRY(_find_next_bit_be)
@@ -192,5 +192,5 @@ ENDPROC(_find_next_bit_be)
 #endif
                 cmp     r1, r0                  @ Clamp to maxbit
                 movlo   r0, r1
-                mov     pc, lr
+                ret     lr
 
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index 9b06bb41fca6..938600098b88 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -18,7 +18,7 @@
  * Inputs:      r0 contains the address
  *              r1 contains the address limit, which must be preserved
  * Outputs:     r0 is the error code
- *              r2 contains the zero-extended value
+ *              r2, r3 contains the zero-extended value
  *              lr corrupted
  *
  * No other registers must be altered.  (see <asm/uaccess.h>
@@ -36,7 +36,7 @@ ENTRY(__get_user_1)
         check_uaccess r0, 1, r1, r2, __get_user_bad
 1: TUSER(ldrb)  r2, [r0]
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(__get_user_1)
 
 ENTRY(__get_user_2)
@@ -56,25 +56,60 @@ rb	.req	r0
         orr     r2, rb, r2, lsl #8
 #endif
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(__get_user_2)
 
 ENTRY(__get_user_4)
         check_uaccess r0, 4, r1, r2, __get_user_bad
 4: TUSER(ldr)   r2, [r0]
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(__get_user_4)
 
+ENTRY(__get_user_8)
+        check_uaccess r0, 8, r1, r2, __get_user_bad
+#ifdef CONFIG_THUMB2_KERNEL
+5: TUSER(ldr)   r2, [r0]
+6: TUSER(ldr)   r3, [r0, #4]
+#else
+5: TUSER(ldr)   r2, [r0], #4
+6: TUSER(ldr)   r3, [r0]
+#endif
+        mov     r0, #0
+        ret     lr
+ENDPROC(__get_user_8)
+
+#ifdef __ARMEB__
+ENTRY(__get_user_lo8)
+        check_uaccess r0, 8, r1, r2, __get_user_bad
+#ifdef CONFIG_CPU_USE_DOMAINS
+        add     r0, r0, #4
+7:      ldrt    r2, [r0]
+#else
+7:      ldr     r2, [r0, #4]
+#endif
+        mov     r0, #0
+        ret     lr
+ENDPROC(__get_user_lo8)
+#endif
+
+__get_user_bad8:
+        mov     r3, #0
 __get_user_bad:
         mov     r2, #0
         mov     r0, #-EFAULT
-        mov     pc, lr
+        ret     lr
 ENDPROC(__get_user_bad)
+ENDPROC(__get_user_bad8)
 
 .pushsection __ex_table, "a"
         .long   1b, __get_user_bad
         .long   2b, __get_user_bad
         .long   3b, __get_user_bad
         .long   4b, __get_user_bad
+        .long   5b, __get_user_bad8
+        .long   6b, __get_user_bad8
+#ifdef __ARMEB__
+        .long   7b, __get_user_bad
+#endif
 .popsection
diff --git a/arch/arm/lib/io-readsb.S b/arch/arm/lib/io-readsb.S
index 9f4238987fe9..c31b2f3153f1 100644
--- a/arch/arm/lib/io-readsb.S
+++ b/arch/arm/lib/io-readsb.S
@@ -25,7 +25,7 @@
 
 ENTRY(__raw_readsb)
                 teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
+                reteq   lr
                 ands    ip, r1, #3
                 bne     .Linsb_align
 
diff --git a/arch/arm/lib/io-readsl.S b/arch/arm/lib/io-readsl.S
index 7a7430950c79..2ed86fa5465f 100644
--- a/arch/arm/lib/io-readsl.S
+++ b/arch/arm/lib/io-readsl.S
@@ -12,7 +12,7 @@
 
 ENTRY(__raw_readsl)
                 teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
+                reteq   lr
                 ands    ip, r1, #3
                 bne     3f
 
@@ -33,7 +33,7 @@ ENTRY(__raw_readsl)
                 stmcsia r1!, {r3, ip}
                 ldrne   r3, [r0, #0]
                 strne   r3, [r1, #0]
-                mov     pc, lr
+                ret     lr
 
 3:              ldr     r3, [r0]
                 cmp     ip, #2
@@ -75,5 +75,5 @@ ENTRY(__raw_readsl)
                 strb    r3, [r1, #1]
 8:              mov     r3, ip, get_byte_0
                 strb    r3, [r1, #0]
-                mov     pc, lr
+                ret     lr
 ENDPROC(__raw_readsl)
diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S
index 88487c8c4f23..413da9914529 100644
--- a/arch/arm/lib/io-readsw-armv3.S
+++ b/arch/arm/lib/io-readsw-armv3.S
@@ -27,11 +27,11 @@
                 strb    r3, [r1], #1
 
                 subs    r2, r2, #1
-                moveq   pc, lr
+                reteq   lr
 
 ENTRY(__raw_readsw)
                 teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
+                reteq   lr
                 tst     r1, #3
                 bne     .Linsw_align
 
diff --git a/arch/arm/lib/io-readsw-armv4.S b/arch/arm/lib/io-readsw-armv4.S
index 1f393d42593d..d9a45e9692ae 100644
--- a/arch/arm/lib/io-readsw-armv4.S
+++ b/arch/arm/lib/io-readsw-armv4.S
@@ -26,7 +26,7 @@
 
 ENTRY(__raw_readsw)
                 teq     r2, #0
-                moveq   pc, lr
+                reteq   lr
                 tst     r1, #3
                 bne     .Linsw_align
 
diff --git a/arch/arm/lib/io-writesb.S b/arch/arm/lib/io-writesb.S
index 68b92f4acaeb..a46bbc9b168b 100644
--- a/arch/arm/lib/io-writesb.S
+++ b/arch/arm/lib/io-writesb.S
@@ -45,7 +45,7 @@
 
 ENTRY(__raw_writesb)
                 teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
+                reteq   lr
                 ands    ip, r1, #3
                 bne     .Loutsb_align
 
diff --git a/arch/arm/lib/io-writesl.S b/arch/arm/lib/io-writesl.S
index d0d104a0dd11..4ea2435988c1 100644
--- a/arch/arm/lib/io-writesl.S
+++ b/arch/arm/lib/io-writesl.S
@@ -12,7 +12,7 @@
 
 ENTRY(__raw_writesl)
                 teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
+                reteq   lr
                 ands    ip, r1, #3
                 bne     3f
 
@@ -33,7 +33,7 @@ ENTRY(__raw_writesl)
                 ldrne   r3, [r1, #0]
                 strcs   ip, [r0, #0]
                 strne   r3, [r0, #0]
-                mov     pc, lr
+                ret     lr
 
 3:              bic     r1, r1, #3
                 ldr     r3, [r1], #4
@@ -47,7 +47,7 @@ ENTRY(__raw_writesl)
                 orr     ip, ip, r3, lspush #16
                 str     ip, [r0]
                 bne     4b
-                mov     pc, lr
+                ret     lr
 
 5:              mov     ip, r3, lspull #8
                 ldr     r3, [r1], #4
@@ -55,7 +55,7 @@ ENTRY(__raw_writesl)
                 orr     ip, ip, r3, lspush #24
                 str     ip, [r0]
                 bne     5b
-                mov     pc, lr
+                ret     lr
 
 6:              mov     ip, r3, lspull #24
                 ldr     r3, [r1], #4
@@ -63,5 +63,5 @@ ENTRY(__raw_writesl)
                 orr     ip, ip, r3, lspush #8
                 str     ip, [r0]
                 bne     6b
-                mov     pc, lr
+                ret     lr
 ENDPROC(__raw_writesl)
diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S
index 49b800419e32..121789eb6802 100644
--- a/arch/arm/lib/io-writesw-armv3.S
+++ b/arch/arm/lib/io-writesw-armv3.S
@@ -28,11 +28,11 @@
                 orr     r3, r3, r3, lsl #16
                 str     r3, [r0]
                 subs    r2, r2, #1
-                moveq   pc, lr
+                reteq   lr
 
 ENTRY(__raw_writesw)
                 teq     r2, #0          @ do we have to check for the zero len?
-                moveq   pc, lr
+                reteq   lr
                 tst     r1, #3
                 bne     .Loutsw_align
 
diff --git a/arch/arm/lib/io-writesw-armv4.S b/arch/arm/lib/io-writesw-armv4.S
index ff4f71b579ee..269f90c51ad2 100644
--- a/arch/arm/lib/io-writesw-armv4.S
+++ b/arch/arm/lib/io-writesw-armv4.S
@@ -31,7 +31,7 @@
 
 ENTRY(__raw_writesw)
                 teq     r2, #0
-                moveq   pc, lr
+                reteq   lr
                 ands    r3, r1, #3
                 bne     .Loutsw_align
 
@@ -96,5 +96,5 @@ ENTRY(__raw_writesw)
                 tst     r2, #1
 3:              movne   ip, r3, lsr #8
                 strneh  ip, [r0]
-                mov     pc, lr
+                ret     lr
 ENDPROC(__raw_writesw)
diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S
index c562f649734c..947567ff67f9 100644
--- a/arch/arm/lib/lib1funcs.S
+++ b/arch/arm/lib/lib1funcs.S
@@ -210,7 +210,7 @@ ENTRY(__aeabi_uidiv)
 UNWIND(.fnstart)
 
         subs    r2, r1, #1
-        moveq   pc, lr
+        reteq   lr
         bcc     Ldiv0
         cmp     r0, r1
         bls     11f
@@ -220,16 +220,16 @@ UNWIND(.fnstart)
         ARM_DIV_BODY r0, r1, r2, r3
 
         mov     r0, r2
-        mov     pc, lr
+        ret     lr
 
 11:     moveq   r0, #1
         movne   r0, #0
-        mov     pc, lr
+        ret     lr
 
 12:     ARM_DIV2_ORDER r1, r2
 
         mov     r0, r0, lsr r2
-        mov     pc, lr
+        ret     lr
 
 UNWIND(.fnend)
 ENDPROC(__udivsi3)
@@ -244,11 +244,11 @@ UNWIND(.fnstart)
         moveq   r0, #0
         tsthi   r1, r2                          @ see if divisor is power of 2
         andeq   r0, r0, r2
-        movls   pc, lr
+        retls   lr
 
         ARM_MOD_BODY r0, r1, r2, r3
 
-        mov     pc, lr
+        ret     lr
 
 UNWIND(.fnend)
 ENDPROC(__umodsi3)
@@ -274,23 +274,23 @@ UNWIND(.fnstart)
 
         cmp     ip, #0
         rsbmi   r0, r0, #0
-        mov     pc, lr
+        ret     lr
 
 10:     teq     ip, r0                          @ same sign ?
         rsbmi   r0, r0, #0
-        mov     pc, lr
+        ret     lr
 
 11:     movlo   r0, #0
         moveq   r0, ip, asr #31
         orreq   r0, r0, #1
-        mov     pc, lr
+        ret     lr
 
 12:     ARM_DIV2_ORDER r1, r2
 
         cmp     ip, #0
         mov     r0, r3, lsr r2
         rsbmi   r0, r0, #0
-        mov     pc, lr
+        ret     lr
 
 UNWIND(.fnend)
 ENDPROC(__divsi3)
@@ -315,7 +315,7 @@ UNWIND(.fnstart)
 
 10:     cmp     ip, #0
         rsbmi   r0, r0, #0
-        mov     pc, lr
+        ret     lr
 
 UNWIND(.fnend)
 ENDPROC(__modsi3)
@@ -331,7 +331,7 @@ UNWIND(.save {r0, r1, ip, lr}	)
         ldmfd   sp!, {r1, r2, ip, lr}
         mul     r3, r0, r2
         sub     r1, r1, r3
-        mov     pc, lr
+        ret     lr
 
 UNWIND(.fnend)
 ENDPROC(__aeabi_uidivmod)
@@ -344,7 +344,7 @@ UNWIND(.save {r0, r1, ip, lr}	)
         ldmfd   sp!, {r1, r2, ip, lr}
         mul     r3, r0, r2
         sub     r1, r1, r3
-        mov     pc, lr
+        ret     lr
 
 UNWIND(.fnend)
 ENDPROC(__aeabi_idivmod)
diff --git a/arch/arm/lib/lshrdi3.S b/arch/arm/lib/lshrdi3.S
index f83d449141f7..922dcd88b02b 100644
--- a/arch/arm/lib/lshrdi3.S
+++ b/arch/arm/lib/lshrdi3.S
@@ -27,6 +27,7 @@ Boston, MA 02110-1301, USA.  */
 
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 #ifdef __ARMEB__
 #define al r1
@@ -47,7 +48,7 @@ ENTRY(__aeabi_llsr)
  THUMB( lslmi   r3, ah, ip              )
  THUMB( orrmi   al, al, r3              )
         mov     ah, ah, lsr r2
-        mov     pc, lr
+        ret     lr
 
 ENDPROC(__lshrdi3)
 ENDPROC(__aeabi_llsr)
diff --git a/arch/arm/lib/memchr.S b/arch/arm/lib/memchr.S
index 1da86991d700..74a5bed6d999 100644
--- a/arch/arm/lib/memchr.S
+++ b/arch/arm/lib/memchr.S
@@ -22,5 +22,5 @@ ENTRY(memchr)
         bne     1b
         sub     r0, r0, #1
 2:      movne   r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(memchr)
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
index 94b0650ea98f..671455c854fa 100644
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
@@ -110,7 +110,7 @@ ENTRY(memset)
         strneb  r1, [ip], #1
         tst     r2, #1
         strneb  r1, [ip], #1
-        mov     pc, lr
+        ret     lr
 
 6:      subs    r2, r2, #4              @ 1 do we have enough
         blt     5b                      @ 1 bytes to align with?
diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S
index 3fbdef5f802a..385ccb306fa2 100644
--- a/arch/arm/lib/memzero.S
+++ b/arch/arm/lib/memzero.S
@@ -121,5 +121,5 @@ ENTRY(__memzero)
         strneb  r2, [r0], #1            @ 1
         tst     r1, #1                  @ 1 a byte left over
         strneb  r2, [r0], #1            @ 1
-        mov     pc, lr                  @ 1
+        ret     lr                      @ 1
 ENDPROC(__memzero)
diff --git a/arch/arm/lib/muldi3.S b/arch/arm/lib/muldi3.S
index 36c91b4957e2..204305956925 100644
--- a/arch/arm/lib/muldi3.S
+++ b/arch/arm/lib/muldi3.S
@@ -11,6 +11,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 #ifdef __ARMEB__
 #define xh r0
@@ -41,7 +42,7 @@ ENTRY(__aeabi_lmul)
         adc     xh, xh, yh, lsr #16
         adds    xl, xl, ip, lsl #16
         adc     xh, xh, ip, lsr #16
-        mov     pc, lr
+        ret     lr
 
 ENDPROC(__muldi3)
 ENDPROC(__aeabi_lmul)
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S
index 3d73dcb959b0..38d660d3705f 100644
--- a/arch/arm/lib/putuser.S
+++ b/arch/arm/lib/putuser.S
@@ -36,7 +36,7 @@ ENTRY(__put_user_1)
         check_uaccess r0, 1, r1, ip, __put_user_bad
 1: TUSER(strb)  r2, [r0]
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(__put_user_1)
 
 ENTRY(__put_user_2)
@@ -60,14 +60,14 @@ ENTRY(__put_user_2)
 #endif
 #endif  /* CONFIG_THUMB2_KERNEL */
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(__put_user_2)
 
 ENTRY(__put_user_4)
         check_uaccess r0, 4, r1, ip, __put_user_bad
 4: TUSER(str)   r2, [r0]
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(__put_user_4)
 
 ENTRY(__put_user_8)
@@ -80,12 +80,12 @@ ENTRY(__put_user_8)
 6: TUSER(str)   r3, [r0]
 #endif
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(__put_user_8)
 
 __put_user_bad:
         mov     r0, #-EFAULT
-        mov     pc, lr
+        ret     lr
 ENDPROC(__put_user_bad)
 
 .pushsection __ex_table, "a"
diff --git a/arch/arm/lib/strchr.S b/arch/arm/lib/strchr.S
index d8f2a1c1aea4..013d64c71e8d 100644
--- a/arch/arm/lib/strchr.S
+++ b/arch/arm/lib/strchr.S
@@ -23,5 +23,5 @@ ENTRY(strchr)
                 teq     r2, r1
                 movne   r0, #0
                 subeq   r0, r0, #1
-                mov     pc, lr
+                ret     lr
 ENDPROC(strchr)
diff --git a/arch/arm/lib/strrchr.S b/arch/arm/lib/strrchr.S
index 302f20cd2423..3cec1c7482c4 100644
--- a/arch/arm/lib/strrchr.S
+++ b/arch/arm/lib/strrchr.S
@@ -22,5 +22,5 @@ ENTRY(strrchr)
                 teq     r2, #0
                 bne     1b
                 mov     r0, r3
-                mov     pc, lr
+                ret     lr
 ENDPROC(strrchr)
diff --git a/arch/arm/lib/ucmpdi2.S b/arch/arm/lib/ucmpdi2.S
index f0df6a91db04..ad4a6309141a 100644
--- a/arch/arm/lib/ucmpdi2.S
+++ b/arch/arm/lib/ucmpdi2.S
@@ -11,6 +11,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 
 #ifdef __ARMEB__
 #define xh r0
@@ -31,7 +32,7 @@ ENTRY(__ucmpdi2)
         movlo   r0, #0
         moveq   r0, #1
         movhi   r0, #2
-        mov     pc, lr
+        ret     lr
 
 ENDPROC(__ucmpdi2)
 
@@ -44,7 +45,7 @@ ENTRY(__aeabi_ulcmp)
         movlo   r0, #-1
         moveq   r0, #0
         movhi   r0, #1
-        mov     pc, lr
+        ret     lr
 
 ENDPROC(__aeabi_ulcmp)
 
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 45b55e0f0db6..6cc6f7aebdae 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -113,14 +113,12 @@ config SOC_AT91RM9200
         select HAVE_AT91_DBGU0
         select MULTI_IRQ_HANDLER
         select SPARSE_IRQ
-        select AT91_USE_OLD_CLK
         select HAVE_AT91_USB_CLK
 
 config SOC_AT91SAM9260
         bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
         select HAVE_AT91_DBGU0
         select SOC_AT91SAM9
-        select AT91_USE_OLD_CLK
         select HAVE_AT91_USB_CLK
         help
           Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
@@ -140,7 +138,6 @@ config SOC_AT91SAM9263
         select HAVE_AT91_DBGU1
         select HAVE_FB_ATMEL
         select SOC_AT91SAM9
-        select AT91_USE_OLD_CLK
         select HAVE_AT91_USB_CLK
 
 config SOC_AT91SAM9RL
@@ -155,7 +152,6 @@ config SOC_AT91SAM9G45
         select HAVE_AT91_DBGU1
         select HAVE_FB_ATMEL
         select SOC_AT91SAM9
-        select AT91_USE_OLD_CLK
         select HAVE_AT91_UTMI
         select HAVE_AT91_USB_CLK
         help
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 787bb50a4dff..038702ee8bc6 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -26,10 +26,11 @@
 #include "at91_aic.h"
 #include "soc.h"
 #include "generic.h"
-#include "clock.h"
 #include "sam9_smc.h"
 #include "pm.h"
 
+#if defined(CONFIG_OLD_CLK_AT91)
+#include "clock.h"
 /* --------------------------------------------------------------------
  *  Clocks
  * -------------------------------------------------------------------- */
@@ -277,6 +278,9 @@ static void __init at91rm9200_register_clocks(void)
         clk_register(&pck2);
         clk_register(&pck3);
 }
+#else
+#define at91rm9200_register_clocks NULL
+#endif
 
 /* --------------------------------------------------------------------
  *  GPIO
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index 3f4bb58aea54..74f1eaf97801 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -15,7 +15,7 @@
 
 #include <linux/dma-mapping.h>
 #include <linux/gpio.h>
-#include <linux/gpio/driver.h>
+#include <linux/gpio/machine.h>
 #include <linux/platform_device.h>
 #include <linux/i2c-gpio.h>
 
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index c3d22be73b7c..3477ba94c4c5 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -27,10 +27,11 @@
 #include "at91_rstc.h"
 #include "soc.h"
 #include "generic.h"
-#include "clock.h"
 #include "sam9_smc.h"
 #include "pm.h"
 
+#if defined(CONFIG_OLD_CLK_AT91)
+#include "clock.h"
 /* --------------------------------------------------------------------
  *  Clocks
  * -------------------------------------------------------------------- */
@@ -288,6 +289,9 @@ static void __init at91sam9260_register_clocks(void)
         clk_register(&pck0);
         clk_register(&pck1);
 }
+#else
+#define at91sam9260_register_clocks NULL
+#endif
 
 /* --------------------------------------------------------------------
  *  GPIO
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index f30290572293..810fa5f15a51 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -25,10 +25,11 @@
 #include "at91_rstc.h"
 #include "soc.h"
 #include "generic.h"
-#include "clock.h"
 #include "sam9_smc.h"
 #include "pm.h"
 
+#if defined(CONFIG_OLD_CLK_AT91)
+#include "clock.h"
 /* --------------------------------------------------------------------
  *  Clocks
  * -------------------------------------------------------------------- */
@@ -199,6 +200,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
         CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
         CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk),
+        CLKDEV_CON_DEV_ID(NULL, "at91sam9rl-pwm", &pwm_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
         CLKDEV_CON_ID("pioA", &pioA_clk),
@@ -280,6 +282,9 @@ static void __init at91sam9263_register_clocks(void)
         clk_register(&pck2);
         clk_register(&pck3);
 }
+#else
+#define at91sam9263_register_clocks NULL
+#endif
 
 /* --------------------------------------------------------------------
  *  GPIO
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 309390d8e2f8..cef0e2f57068 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -1131,9 +1131,7 @@ static void __init at91_add_device_watchdog(void) {}
  *  PWM
  * --------------------------------------------------------------------*/
 
-#if defined(CONFIG_ATMEL_PWM)
-static u32 pwm_mask;
-
+#if IS_ENABLED(CONFIG_PWM_ATMEL)
 static struct resource pwm_resources[] = {
         [0] = {
                 .start  = AT91SAM9263_BASE_PWMC,
@@ -1148,11 +1146,8 @@ static struct resource pwm_resources[] = {
 };
 
 static struct platform_device at91sam9263_pwm0_device = {
-        .name   = "atmel_pwm",
+        .name   = "at91sam9rl-pwm",
         .id     = -1,
-        .dev    = {
-                .platform_data          = &pwm_mask,
-        },
         .resource       = pwm_resources,
         .num_resources  = ARRAY_SIZE(pwm_resources),
 };
@@ -1171,8 +1166,6 @@ void __init at91_add_device_pwm(u32 mask)
         if (mask & (1 << AT91_PWM3))
                 at91_set_B_periph(AT91_PIN_PB29, 1);    /* enable PWM3 */
 
-        pwm_mask = mask;
-
         platform_device_register(&at91sam9263_pwm0_device);
 }
 #else
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 9d3d544ac19c..9d45496e4932 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -25,10 +25,11 @@
 #include "at91_aic.h"
 #include "soc.h"
 #include "generic.h"
-#include "clock.h"
 #include "sam9_smc.h"
 #include "pm.h"
 
+#if defined(CONFIG_OLD_CLK_AT91)
+#include "clock.h"
 /* --------------------------------------------------------------------
  *  Clocks
  * -------------------------------------------------------------------- */
@@ -251,6 +252,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID(NULL, "atmel_sha", &aestdessha_clk),
         CLKDEV_CON_DEV_ID(NULL, "atmel_tdes", &aestdessha_clk),
         CLKDEV_CON_DEV_ID(NULL, "atmel_aes", &aestdessha_clk),
+        CLKDEV_CON_DEV_ID(NULL, "at91sam9rl-pwm", &pwm_clk),
         /* more usart lookup table for DT entries */
         CLKDEV_CON_DEV_ID("usart", "ffffee00.serial", &mck),
         CLKDEV_CON_DEV_ID("usart", "fff8c000.serial", &usart0_clk),
@@ -331,6 +333,9 @@ static void __init at91sam9g45_register_clocks(void)
         clk_register(&pck0);
         clk_register(&pck1);
 }
+#else
+#define at91sam9g45_register_clocks NULL
+#endif
 
 /* --------------------------------------------------------------------
  *  GPIO
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 391ab6bb536a..21ab782cc8e9 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -1334,9 +1334,7 @@ static void __init at91_add_device_watchdog(void) {}
  *  PWM
  * --------------------------------------------------------------------*/
 
-#if defined(CONFIG_ATMEL_PWM) || defined(CONFIG_ATMEL_PWM_MODULE)
-static u32 pwm_mask;
-
+#if IS_ENABLED(CONFIG_PWM_ATMEL)
 static struct resource pwm_resources[] = {
         [0] = {
                 .start  = AT91SAM9G45_BASE_PWMC,
@@ -1351,11 +1349,8 @@ static struct resource pwm_resources[] = {
 };
 
 static struct platform_device at91sam9g45_pwm0_device = {
-        .name   = "atmel_pwm",
+        .name   = "at91sam9rl-pwm",
         .id     = -1,
-        .dev    = {
-                .platform_data          = &pwm_mask,
-        },
         .resource       = pwm_resources,
         .num_resources  = ARRAY_SIZE(pwm_resources),
 };
@@ -1374,8 +1369,6 @@ void __init at91_add_device_pwm(u32 mask)
         if (mask & (1 << AT91_PWM3))
                 at91_set_B_periph(AT91_PIN_PD0, 1);     /* enable PWM3 */
 
-        pwm_mask = mask;
-
         platform_device_register(&at91sam9g45_pwm0_device);
 }
 #else
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index a79960f57e6a..878d5015daab 100644
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -200,6 +200,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("pclk", "fffc4000.ssc", &ssc1_clk),
         CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi0_clk),
         CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.1", &twi1_clk),
+        CLKDEV_CON_DEV_ID(NULL, "at91sam9rl-pwm", &pwm_clk),
         CLKDEV_CON_ID("pioA", &pioA_clk),
         CLKDEV_CON_ID("pioB", &pioB_clk),
         CLKDEV_CON_ID("pioC", &pioC_clk),
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 0b1d71a7d9bf..37d1c9ed4562 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -799,9 +799,7 @@ static void __init at91_add_device_watchdog(void) {}
  *  PWM
  * --------------------------------------------------------------------*/
 
-#if defined(CONFIG_ATMEL_PWM)
-static u32 pwm_mask;
-
+#if IS_ENABLED(CONFIG_PWM_ATMEL)
 static struct resource pwm_resources[] = {
         [0] = {
                 .start  = AT91SAM9RL_BASE_PWMC,
@@ -816,11 +814,8 @@ static struct resource pwm_resources[] = {
 };
 
 static struct platform_device at91sam9rl_pwm0_device = {
-        .name   = "atmel_pwm",
+        .name   = "at91sam9rl-pwm",
         .id     = -1,
-        .dev    = {
-                .platform_data          = &pwm_mask,
-        },
         .resource       = pwm_resources,
         .num_resources  = ARRAY_SIZE(pwm_resources),
 };
@@ -839,8 +834,6 @@ void __init at91_add_device_pwm(u32 mask)
         if (mask & (1 << AT91_PWM3))
                 at91_set_B_periph(AT91_PIN_PD8, 1);     /* enable PWM3 */
 
-        pwm_mask = mask;
-
         platform_device_register(&at91sam9rl_pwm0_device);
 }
 #else
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index cd2726ee5add..fc446097f410 100644
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -32,6 +32,8 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/leds.h>
+#include <linux/pwm.h>
+#include <linux/leds_pwm.h>
 
 #include <video/atmel_lcdc.h>
 
@@ -369,21 +371,47 @@ static struct gpio_led ek_leds[] = {
                 .name                   = "ds3",
                 .gpio                   = AT91_PIN_PB7,
                 .default_trigger        = "heartbeat",
+        },
+#if !IS_ENABLED(CONFIG_LEDS_PWM)
+        {
+                .name                   = "ds1",
+                .gpio                   = AT91_PIN_PB8,
+                .active_low             = 1,
+                .default_trigger        = "none",
         }
+#endif
 };
 
 /*
  * PWM Leds
  */
-static struct gpio_led ek_pwm_led[] = {
-        /* For now only DS1 is PWM-driven (by pwm1) */
+static struct pwm_lookup pwm_lookup[] = {
+        PWM_LOOKUP("at91sam9rl-pwm", 1, "leds_pwm", "ds1",
+                   5000, PWM_POLARITY_INVERSED),
+};
+
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+static struct led_pwm pwm_leds[] = {
         {
-                .name                   = "ds1",
-                .gpio                   = 1,    /* is PWM channel number */
-                .active_low             = 1,
-                .default_trigger        = "none",
-        }
+                .name = "ds1",
+                .max_brightness = 255,
+        },
+};
+
+static struct led_pwm_platform_data pwm_data = {
+        .num_leds       = ARRAY_SIZE(pwm_leds),
+        .leds           = pwm_leds,
+};
+
+static struct platform_device leds_pwm = {
+        .name   = "leds_pwm",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &pwm_data,
+        },
 };
+#endif
+
 
 /*
  * CAN
@@ -403,6 +431,12 @@ static struct at91_can_data ek_can_data = {
         .transceiver_switch = sam9263ek_transceiver_switch,
 };
 
+static struct platform_device *devices[] __initdata = {
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+        &leds_pwm,
+#endif
+};
+
 static void __init ek_board_init(void)
 {
         /* Serial */
@@ -437,9 +471,14 @@ static void __init ek_board_init(void)
         at91_add_device_ac97(&ek_ac97_data);
         /* LEDs */
         at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-        at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led));
+        pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+        at91_add_device_pwm(1 << AT91_PWM1);
+#endif
         /* CAN */
         at91_add_device_can(&ek_can_data);
+        /* Other platform devices */
+        platform_add_devices(devices, ARRAY_SIZE(devices));
 }
 
 MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index 1ea61328f30d..b227732b0c83 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -26,6 +26,8 @@
 #include <linux/leds.h>
 #include <linux/atmel-mci.h>
 #include <linux/delay.h>
+#include <linux/pwm.h>
+#include <linux/leds_pwm.h>
 
 #include <linux/platform_data/at91_adc.h>
 
@@ -416,7 +418,7 @@ static struct gpio_led ek_leds[] = {
                 .active_low             = 1,
                 .default_trigger        = "nand-disk",
         },
-#if !(defined(CONFIG_LEDS_ATMEL_PWM) || defined(CONFIG_LEDS_ATMEL_PWM_MODULE))
+#if !IS_ENABLED(CONFIG_LEDS_PWM)
         {       /* "right" led, green, userled1, pwm1 */
                 .name                   = "d7",
                 .gpio                   = AT91_PIN_PD31,
@@ -430,22 +432,41 @@ static struct gpio_led ek_leds[] = {
 /*
  * PWM Leds
  */
-static struct gpio_led ek_pwm_led[] = {
-#if defined(CONFIG_LEDS_ATMEL_PWM) || defined(CONFIG_LEDS_ATMEL_PWM_MODULE)
+static struct pwm_lookup pwm_lookup[] = {
+        PWM_LOOKUP("at91sam9rl-pwm", 1, "leds_pwm", "d7",
+                   5000, PWM_POLARITY_INVERSED),
+};
+
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+static struct led_pwm pwm_leds[] = {
         {       /* "right" led, green, userled1, pwm1 */
-                .name                   = "d7",
-                .gpio                   = 1,    /* is PWM channel number */
-                .active_low             = 1,
-                .default_trigger        = "none",
+                .name = "d7",
+                .max_brightness = 255,
         },
-#endif
 };
 
+static struct led_pwm_platform_data pwm_data = {
+        .num_leds       = ARRAY_SIZE(pwm_leds),
+        .leds           = pwm_leds,
+};
+
+static struct platform_device leds_pwm = {
+        .name   = "leds_pwm",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &pwm_data,
+        },
+};
+#endif
+
 static struct platform_device *devices[] __initdata = {
 #if defined(CONFIG_SOC_CAMERA_OV2640) || \
         defined(CONFIG_SOC_CAMERA_OV2640_MODULE)
         &isi_ov2640,
 #endif
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+        &leds_pwm,
+#endif
 };
 
 static void __init ek_board_init(void)
@@ -486,7 +507,10 @@ static void __init ek_board_init(void)
         at91_add_device_ac97(&ek_ac97_data);
         /* LEDs */
         at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-        at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led));
+        pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+        at91_add_device_pwm(1 << AT91_PWM1);
+#endif
         /* Other platform devices */
         platform_add_devices(devices, ARRAY_SIZE(devices));
 }
diff --git a/arch/arm/mach-at91/board.h b/arch/arm/mach-at91/board.h
index 4e773b55bc2d..836e9a537e0c 100644
--- a/arch/arm/mach-at91/board.h
+++ b/arch/arm/mach-at91/board.h
@@ -123,6 +123,5 @@ extern void __init at91_add_device_can(struct at91_can_data *data);
 
  /* LEDs */
 extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);
-extern void __init at91_pwm_leds(struct gpio_led *leds, int nr);
 
 #endif
diff --git a/arch/arm/mach-at91/leds.c b/arch/arm/mach-at91/leds.c
index 77c4d8fd03fd..eb22e3357e87 100644
--- a/arch/arm/mach-at91/leds.c
+++ b/arch/arm/mach-at91/leds.c
@@ -54,40 +54,3 @@ void __init at91_gpio_leds(struct gpio_led *leds, int nr)
 void __init at91_gpio_leds(struct gpio_led *leds, int nr) {}
 #endif
 
-
-/* ------------------------------------------------------------------------- */
-
-#if defined (CONFIG_LEDS_ATMEL_PWM)
-
-/*
- * PWM Leds
- */
-
-static struct gpio_led_platform_data pwm_led_data;
-
-static struct platform_device at91_pwm_leds_device = {
-        .name                   = "leds-atmel-pwm",
-        .id                     = -1,
-        .dev.platform_data      = &pwm_led_data,
-};
-
-void __init at91_pwm_leds(struct gpio_led *leds, int nr)
-{
-        int i;
-        u32 pwm_mask = 0;
-
-        if (!nr)
-                return;
-
-        for (i = 0; i < nr; i++)
-                pwm_mask |= (1 << leds[i].gpio);
-
-        pwm_led_data.leds = leds;
-        pwm_led_data.num_leds = nr;
-
-        at91_add_device_pwm(pwm_mask);
-        platform_device_register(&at91_pwm_leds_device);
-}
-#else
-void __init at91_pwm_leds(struct gpio_led *leds, int nr){}
-#endif
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 41c839167e87..fc938005ad39 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -9,7 +9,6 @@ config ARCH_BCM_MOBILE
         bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7
         select ARCH_REQUIRE_GPIOLIB
         select ARM_ERRATA_754322
-        select ARM_ERRATA_764369 if SMP
         select ARM_ERRATA_775420
         select ARM_GIC
         select GPIO_BCM_KONA
@@ -26,16 +25,18 @@ menu "Broadcom Mobile SoC Selection"
 config ARCH_BCM_281XX
         bool "Broadcom BCM281XX SoC family"
         default y
+        select HAVE_SMP
         help
-          Enable support for the the BCM281XX family, which includes
+          Enable support for the BCM281XX family, which includes
           BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155
           variants.
 
 config ARCH_BCM_21664
         bool "Broadcom BCM21664 SoC family"
         default y
+        select HAVE_SMP
         help
-          Enable support for the the BCM21664 family, which includes
+          Enable support for the BCM21664 family, which includes
           BCM21663 and BCM21664 variants.
 
 config ARCH_BCM_MOBILE_L2_CACHE
@@ -49,6 +50,17 @@ config ARCH_BCM_MOBILE_SMC
         bool
         depends on ARCH_BCM_281XX || ARCH_BCM_21664
 
+config ARCH_BCM_MOBILE_SMP
+        bool "Broadcom mobile SoC SMP support"
+        depends on (ARCH_BCM_281XX || ARCH_BCM_21664) && SMP
+        default y
+        select HAVE_ARM_SCU
+        select ARM_ERRATA_764369
+        help
+          SMP support for the BCM281XX and BCM21664 SoC families.
+          Provided as an option so SMP support for SoCs of this type
+          can be disabled for an SMP-enabled kernel.
+
 endmenu
 
 endif
@@ -87,4 +99,20 @@ config ARCH_BCM_5301X
           different SoC or with the older BCM47XX and BCM53XX based
           network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
 
+config ARCH_BRCMSTB
+        bool "Broadcom BCM7XXX based boards" if ARCH_MULTI_V7
+        depends on MMU
+        select ARM_GIC
+        select MIGHT_HAVE_PCI
+        select HAVE_SMP
+        select HAVE_ARM_ARCH_TIMER
+        select BRCMSTB_GISB_ARB
+        select BRCMSTB_L2_IRQ
+        help
+          Say Y if you intend to run the kernel on a Broadcom ARM-based STB
+          chipset.
+
+          This enables support for Broadcom ARM-based set-top box chipsets,
+          including the 7445 family of chips.
+
 endif
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 731292114975..67c492aabf4d 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -16,6 +16,9 @@ obj-$(CONFIG_ARCH_BCM_281XX)	+= board_bcm281xx.o
 # BCM21664
 obj-$(CONFIG_ARCH_BCM_21664)    += board_bcm21664.o
 
+# BCM281XX and BCM21664 SMP support
+obj-$(CONFIG_ARCH_BCM_MOBILE_SMP) += kona_smp.o
+
 # BCM281XX and BCM21664 L2 cache control
 obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o
 
@@ -30,3 +33,8 @@ obj-$(CONFIG_ARCH_BCM2835)	+= board_bcm2835.o
 
 # BCM5301X
 obj-$(CONFIG_ARCH_BCM_5301X)    += bcm_5301x.o
+
+ifeq ($(CONFIG_ARCH_BRCMSTB),y)
+obj-y                           += brcmstb.o
+obj-$(CONFIG_SMP)               += headsmp-brcmstb.o platsmp-brcmstb.o
+endif
diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c
index f0521cc0640d..82ad5687771f 100644
--- a/arch/arm/mach-bcm/board_bcm21664.c
+++ b/arch/arm/mach-bcm/board_bcm21664.c
@@ -60,8 +60,7 @@ static void bcm21664_restart(enum reboot_mode mode, const char *cmd)
 
 static void __init bcm21664_init(void)
 {
-        of_platform_populate(NULL, of_default_bus_match_table, NULL,
-                &platform_bus);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
         kona_l2_cache_init();
 }
 
diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c
index 1ac59fc0cb15..2e367bd7c600 100644
--- a/arch/arm/mach-bcm/board_bcm281xx.c
+++ b/arch/arm/mach-bcm/board_bcm281xx.c
@@ -58,8 +58,7 @@ static void bcm281xx_restart(enum reboot_mode mode, const char *cmd)
 
 static void __init bcm281xx_init(void)
 {
-        of_platform_populate(NULL, of_default_bus_match_table, NULL,
-                &platform_bus);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
         kona_l2_cache_init();
 }
 
diff --git a/arch/arm/mach-bcm/brcmstb.c b/arch/arm/mach-bcm/brcmstb.c
new file mode 100644
index 000000000000..60a5afa06ed7
--- /dev/null
+++ b/arch/arm/mach-bcm/brcmstb.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2013-2014 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/init.h>
+#include <linux/of_platform.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+static const char *brcmstb_match[] __initconst = {
+        "brcm,bcm7445",
+        "brcm,brcmstb",
+        NULL
+};
+
+DT_MACHINE_START(BRCMSTB, "Broadcom STB (Flattened Device Tree)")
+        .dt_compat      = brcmstb_match,
+MACHINE_END
diff --git a/arch/arm/mach-bcm/brcmstb.h b/arch/arm/mach-bcm/brcmstb.h
new file mode 100644
index 000000000000..ec0c3d112b36
--- /dev/null
+++ b/arch/arm/mach-bcm/brcmstb.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2013-2014 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.
+ */
+
+#ifndef __BRCMSTB_H__
+#define __BRCMSTB_H__
+
+void brcmstb_secondary_startup(void);
+
+#endif /* __BRCMSTB_H__ */
diff --git a/arch/arm/mach-bcm/headsmp-brcmstb.S b/arch/arm/mach-bcm/headsmp-brcmstb.S
new file mode 100644
index 000000000000..199c1ea58248
--- /dev/null
+++ b/arch/arm/mach-bcm/headsmp-brcmstb.S
@@ -0,0 +1,33 @@
+/*
+ * SMP boot code for secondary CPUs
+ * Based on arch/arm/mach-tegra/headsmp.S
+ *
+ * Copyright (C) 2010 NVIDIA, Inc.
+ * Copyright (C) 2013-2014 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 <asm/assembler.h>
+#include <linux/linkage.h>
+#include <linux/init.h>
+
+        .section ".text.head", "ax"
+
+ENTRY(brcmstb_secondary_startup)
+        /*
+         * Ensure CPU is in a sane state by disabling all IRQs and switching
+         * into SVC mode.
+         */
+        setmode PSR_I_BIT | PSR_F_BIT | SVC_MODE, r0
+
+        bl      v7_invalidate_l1
+        b       secondary_startup
+ENDPROC(brcmstb_secondary_startup)
diff --git a/arch/arm/mach-bcm/kona_smp.c b/arch/arm/mach-bcm/kona_smp.c
new file mode 100644
index 000000000000..66a0465528a5
--- /dev/null
+++ b/arch/arm/mach-bcm/kona_smp.c
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2014 Broadcom Corporation
+ * Copyright 2014 Linaro Limited
+ *
+ * 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/init.h>
+#include <linux/errno.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/sched.h>
+
+#include <asm/smp.h>
+#include <asm/smp_plat.h>
+#include <asm/smp_scu.h>
+
+/* Size of mapped Cortex A9 SCU address space */
+#define CORTEX_A9_SCU_SIZE      0x58
+
+#define SECONDARY_TIMEOUT_NS    NSEC_PER_MSEC   /* 1 msec (in nanoseconds) */
+#define BOOT_ADDR_CPUID_MASK    0x3
+
+/* Name of device node property defining secondary boot register location */
+#define OF_SECONDARY_BOOT       "secondary-boot-reg"
+
+/* I/O address of register used to coordinate secondary core startup */
+static u32      secondary_boot;
+
+/*
+ * Enable the Cortex A9 Snoop Control Unit
+ *
+ * By the time this is called we already know there are multiple
+ * cores present.  We assume we're running on a Cortex A9 processor,
+ * so any trouble getting the base address register or getting the
+ * SCU base is a problem.
+ *
+ * Return 0 if successful or an error code otherwise.
+ */
+static int __init scu_a9_enable(void)
+{
+        unsigned long config_base;
+        void __iomem *scu_base;
+
+        if (!scu_a9_has_base()) {
+                pr_err("no configuration base address register!\n");
+                return -ENXIO;
+        }
+
+        /* Config base address register value is zero for uniprocessor */
+        config_base = scu_a9_get_base();
+        if (!config_base) {
+                pr_err("hardware reports only one core\n");
+                return -ENOENT;
+        }
+
+        scu_base = ioremap((phys_addr_t)config_base, CORTEX_A9_SCU_SIZE);
+        if (!scu_base) {
+                pr_err("failed to remap config base (%lu/%u) for SCU\n",
+                        config_base, CORTEX_A9_SCU_SIZE);
+                return -ENOMEM;
+        }
+
+        scu_enable(scu_base);
+
+        iounmap(scu_base);      /* That's the last we'll need of this */
+
+        return 0;
+}
+
+static void __init bcm_smp_prepare_cpus(unsigned int max_cpus)
+{
+        static cpumask_t only_cpu_0 = { CPU_BITS_CPU0 };
+        struct device_node *node;
+        int ret;
+
+        BUG_ON(secondary_boot);         /* We're called only once */
+
+        /*
+         * This function is only called via smp_ops->smp_prepare_cpu().
+         * That only happens if a "/cpus" device tree node exists
+         * and has an "enable-method" property that selects the SMP
+         * operations defined herein.
+         */
+        node = of_find_node_by_path("/cpus");
+        BUG_ON(!node);
+
+        /*
+         * Our secondary enable method requires a "secondary-boot-reg"
+         * property to specify a register address used to request the
+         * ROM code boot a secondary code.  If we have any trouble
+         * getting this we fall back to uniprocessor mode.
+         */
+        if (of_property_read_u32(node, OF_SECONDARY_BOOT, &secondary_boot)) {
+                pr_err("%s: missing/invalid " OF_SECONDARY_BOOT " property\n",
+                        node->name);
+                ret = -ENOENT;          /* Arrange to disable SMP */
+                goto out;
+        }
+
+        /*
+         * Enable the SCU on Cortex A9 based SoCs.  If -ENOENT is
+         * returned, the SoC reported a uniprocessor configuration.
+         * We bail on any other error.
+         */
+        ret = scu_a9_enable();
+out:
+        of_node_put(node);
+        if (ret) {
+                /* Update the CPU present map to reflect uniprocessor mode */
+                BUG_ON(ret != -ENOENT);
+                pr_warn("disabling SMP\n");
+                init_cpu_present(&only_cpu_0);
+        }
+}
+
+/*
+ * The ROM code has the secondary cores looping, waiting for an event.
+ * When an event occurs each core examines the bottom two bits of the
+ * secondary boot register.  When a core finds those bits contain its
+ * own core id, it performs initialization, including computing its boot
+ * address by clearing the boot register value's bottom two bits.  The
+ * core signals that it is beginning its execution by writing its boot
+ * address back to the secondary boot register, and finally jumps to
+ * that address.
+ *
+ * So to start a core executing we need to:
+ * - Encode the (hardware) CPU id with the bottom bits of the secondary
+ *   start address.
+ * - Write that value into the secondary boot register.
+ * - Generate an event to wake up the secondary CPU(s).
+ * - Wait for the secondary boot register to be re-written, which
+ *   indicates the secondary core has started.
+ */
+static int bcm_boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+        void __iomem *boot_reg;
+        phys_addr_t boot_func;
+        u64 start_clock;
+        u32 cpu_id;
+        u32 boot_val;
+        bool timeout = false;
+
+        cpu_id = cpu_logical_map(cpu);
+        if (cpu_id & ~BOOT_ADDR_CPUID_MASK) {
+                pr_err("bad cpu id (%u > %u)\n", cpu_id, BOOT_ADDR_CPUID_MASK);
+                return -EINVAL;
+        }
+
+        if (!secondary_boot) {
+                pr_err("required secondary boot register not specified\n");
+                return -EINVAL;
+        }
+
+        boot_reg = ioremap_nocache((phys_addr_t)secondary_boot, sizeof(u32));
+        if (!boot_reg) {
+                pr_err("unable to map boot register for cpu %u\n", cpu_id);
+                return -ENOSYS;
+        }
+
+        /*
+         * Secondary cores will start in secondary_startup(),
+         * defined in "arch/arm/kernel/head.S"
+         */
+        boot_func = virt_to_phys(secondary_startup);
+        BUG_ON(boot_func & BOOT_ADDR_CPUID_MASK);
+        BUG_ON(boot_func > (phys_addr_t)U32_MAX);
+
+        /* The core to start is encoded in the low bits */
+        boot_val = (u32)boot_func | cpu_id;
+        writel_relaxed(boot_val, boot_reg);
+
+        sev();
+
+        /* The low bits will be cleared once the core has started */
+        start_clock = local_clock();
+        while (!timeout && readl_relaxed(boot_reg) == boot_val)
+                timeout = local_clock() - start_clock > SECONDARY_TIMEOUT_NS;
+
+        iounmap(boot_reg);
+
+        if (!timeout)
+                return 0;
+
+        pr_err("timeout waiting for cpu %u to start\n", cpu_id);
+
+        return -ENOSYS;
+}
+
+static struct smp_operations bcm_smp_ops __initdata = {
+        .smp_prepare_cpus       = bcm_smp_prepare_cpus,
+        .smp_boot_secondary     = bcm_boot_secondary,
+};
+CPU_METHOD_OF_DECLARE(bcm_smp_bcm281xx, "brcm,bcm11351-cpu-method",
+                        &bcm_smp_ops);
diff --git a/arch/arm/mach-bcm/platsmp-brcmstb.c b/arch/arm/mach-bcm/platsmp-brcmstb.c
new file mode 100644
index 000000000000..af780e9c23a6
--- /dev/null
+++ b/arch/arm/mach-bcm/platsmp-brcmstb.c
@@ -0,0 +1,363 @@
+/*
+ * Broadcom STB CPU SMP and hotplug support for ARM
+ *
+ * Copyright (C) 2013-2014 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/delay.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/printk.h>
+#include <linux/regmap.h>
+#include <linux/smp.h>
+#include <linux/mfd/syscon.h>
+#include <linux/spinlock.h>
+
+#include <asm/cacheflush.h>
+#include <asm/cp15.h>
+#include <asm/mach-types.h>
+#include <asm/smp_plat.h>
+
+#include "brcmstb.h"
+
+enum {
+        ZONE_MAN_CLKEN_MASK             = BIT(0),
+        ZONE_MAN_RESET_CNTL_MASK        = BIT(1),
+        ZONE_MAN_MEM_PWR_MASK           = BIT(4),
+        ZONE_RESERVED_1_MASK            = BIT(5),
+        ZONE_MAN_ISO_CNTL_MASK          = BIT(6),
+        ZONE_MANUAL_CONTROL_MASK        = BIT(7),
+        ZONE_PWR_DN_REQ_MASK            = BIT(9),
+        ZONE_PWR_UP_REQ_MASK            = BIT(10),
+        ZONE_BLK_RST_ASSERT_MASK        = BIT(12),
+        ZONE_PWR_OFF_STATE_MASK         = BIT(25),
+        ZONE_PWR_ON_STATE_MASK          = BIT(26),
+        ZONE_DPG_PWR_STATE_MASK         = BIT(28),
+        ZONE_MEM_PWR_STATE_MASK         = BIT(29),
+        ZONE_RESET_STATE_MASK           = BIT(31),
+        CPU0_PWR_ZONE_CTRL_REG          = 1,
+        CPU_RESET_CONFIG_REG            = 2,
+};
+
+static void __iomem *cpubiuctrl_block;
+static void __iomem *hif_cont_block;
+static u32 cpu0_pwr_zone_ctrl_reg;
+static u32 cpu_rst_cfg_reg;
+static u32 hif_cont_reg;
+
+#ifdef CONFIG_HOTPLUG_CPU
+static DEFINE_PER_CPU_ALIGNED(int, per_cpu_sw_state);
+
+static int per_cpu_sw_state_rd(u32 cpu)
+{
+        sync_cache_r(SHIFT_PERCPU_PTR(&per_cpu_sw_state, per_cpu_offset(cpu)));
+        return per_cpu(per_cpu_sw_state, cpu);
+}
+
+static void per_cpu_sw_state_wr(u32 cpu, int val)
+{
+        per_cpu(per_cpu_sw_state, cpu) = val;
+        dmb();
+        sync_cache_w(SHIFT_PERCPU_PTR(&per_cpu_sw_state, per_cpu_offset(cpu)));
+        dsb_sev();
+}
+#else
+static inline void per_cpu_sw_state_wr(u32 cpu, int val) { }
+#endif
+
+static void __iomem *pwr_ctrl_get_base(u32 cpu)
+{
+        void __iomem *base = cpubiuctrl_block + cpu0_pwr_zone_ctrl_reg;
+        base += (cpu_logical_map(cpu) * 4);
+        return base;
+}
+
+static u32 pwr_ctrl_rd(u32 cpu)
+{
+        void __iomem *base = pwr_ctrl_get_base(cpu);
+        return readl_relaxed(base);
+}
+
+static void pwr_ctrl_wr(u32 cpu, u32 val)
+{
+        void __iomem *base = pwr_ctrl_get_base(cpu);
+        writel(val, base);
+}
+
+static void cpu_rst_cfg_set(u32 cpu, int set)
+{
+        u32 val;
+        val = readl_relaxed(cpubiuctrl_block + cpu_rst_cfg_reg);
+        if (set)
+                val |= BIT(cpu_logical_map(cpu));
+        else
+                val &= ~BIT(cpu_logical_map(cpu));
+        writel_relaxed(val, cpubiuctrl_block + cpu_rst_cfg_reg);
+}
+
+static void cpu_set_boot_addr(u32 cpu, unsigned long boot_addr)
+{
+        const int reg_ofs = cpu_logical_map(cpu) * 8;
+        writel_relaxed(0, hif_cont_block + hif_cont_reg + reg_ofs);
+        writel_relaxed(boot_addr, hif_cont_block + hif_cont_reg + 4 + reg_ofs);
+}
+
+static void brcmstb_cpu_boot(u32 cpu)
+{
+        pr_info("SMP: Booting CPU%d...\n", cpu);
+
+        /*
+         * set the reset vector to point to the secondary_startup
+         * routine
+         */
+        cpu_set_boot_addr(cpu, virt_to_phys(brcmstb_secondary_startup));
+
+        /* unhalt the cpu */
+        cpu_rst_cfg_set(cpu, 0);
+}
+
+static void brcmstb_cpu_power_on(u32 cpu)
+{
+        /*
+         * The secondary cores power was cut, so we must go through
+         * power-on initialization.
+         */
+        u32 tmp;
+
+        pr_info("SMP: Powering up CPU%d...\n", cpu);
+
+        /* Request zone power up */
+        pwr_ctrl_wr(cpu, ZONE_PWR_UP_REQ_MASK);
+
+        /* Wait for the power up FSM to complete */
+        do {
+                tmp = pwr_ctrl_rd(cpu);
+        } while (!(tmp & ZONE_PWR_ON_STATE_MASK));
+
+        per_cpu_sw_state_wr(cpu, 1);
+}
+
+static int brcmstb_cpu_get_power_state(u32 cpu)
+{
+        int tmp = pwr_ctrl_rd(cpu);
+        return (tmp & ZONE_RESET_STATE_MASK) ? 0 : 1;
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
+
+static void brcmstb_cpu_die(u32 cpu)
+{
+        v7_exit_coherency_flush(all);
+
+        /* Prevent all interrupts from reaching this CPU. */
+        arch_local_irq_disable();
+
+        /*
+         * Final full barrier to ensure everything before this instruction has
+         * quiesced.
+         */
+        isb();
+        dsb();
+
+        per_cpu_sw_state_wr(cpu, 0);
+
+        /* Sit and wait to die */
+        wfi();
+
+        /* We should never get here... */
+        panic("Spurious interrupt on CPU %d received!\n", cpu);
+}
+
+static int brcmstb_cpu_kill(u32 cpu)
+{
+        u32 tmp;
+
+        pr_info("SMP: Powering down CPU%d...\n", cpu);
+
+        while (per_cpu_sw_state_rd(cpu))
+                ;
+
+        /* Program zone reset */
+        pwr_ctrl_wr(cpu, ZONE_RESET_STATE_MASK | ZONE_BLK_RST_ASSERT_MASK |
+                              ZONE_PWR_DN_REQ_MASK);
+
+        /* Verify zone reset */
+        tmp = pwr_ctrl_rd(cpu);
+        if (!(tmp & ZONE_RESET_STATE_MASK))
+                pr_err("%s: Zone reset bit for CPU %d not asserted!\n",
+                        __func__, cpu);
+
+        /* Wait for power down */
+        do {
+                tmp = pwr_ctrl_rd(cpu);
+        } while (!(tmp & ZONE_PWR_OFF_STATE_MASK));
+
+        /* Settle-time from Broadcom-internal DVT reference code */
+        udelay(7);
+
+        /* Assert reset on the CPU */
+        cpu_rst_cfg_set(cpu, 1);
+
+        return 1;
+}
+
+#endif /* CONFIG_HOTPLUG_CPU */
+
+static int __init setup_hifcpubiuctrl_regs(struct device_node *np)
+{
+        int rc = 0;
+        char *name;
+        struct device_node *syscon_np = NULL;
+
+        name = "syscon-cpu";
+
+        syscon_np = of_parse_phandle(np, name, 0);
+        if (!syscon_np) {
+                pr_err("can't find phandle %s\n", name);
+                rc = -EINVAL;
+                goto cleanup;
+        }
+
+        cpubiuctrl_block = of_iomap(syscon_np, 0);
+        if (!cpubiuctrl_block) {
+                pr_err("iomap failed for cpubiuctrl_block\n");
+                rc = -EINVAL;
+                goto cleanup;
+        }
+
+        rc = of_property_read_u32_index(np, name, CPU0_PWR_ZONE_CTRL_REG,
+                                        &cpu0_pwr_zone_ctrl_reg);
+        if (rc) {
+                pr_err("failed to read 1st entry from %s property (%d)\n", name,
+                        rc);
+                rc = -EINVAL;
+                goto cleanup;
+        }
+
+        rc = of_property_read_u32_index(np, name, CPU_RESET_CONFIG_REG,
+                                        &cpu_rst_cfg_reg);
+        if (rc) {
+                pr_err("failed to read 2nd entry from %s property (%d)\n", name,
+                        rc);
+                rc = -EINVAL;
+                goto cleanup;
+        }
+
+cleanup:
+        if (syscon_np)
+                of_node_put(syscon_np);
+
+        return rc;
+}
+
+static int __init setup_hifcont_regs(struct device_node *np)
+{
+        int rc = 0;
+        char *name;
+        struct device_node *syscon_np = NULL;
+
+        name = "syscon-cont";
+
+        syscon_np = of_parse_phandle(np, name, 0);
+        if (!syscon_np) {
+                pr_err("can't find phandle %s\n", name);
+                rc = -EINVAL;
+                goto cleanup;
+        }
+
+        hif_cont_block = of_iomap(syscon_np, 0);
+        if (!hif_cont_block) {
+                pr_err("iomap failed for hif_cont_block\n");
+                rc = -EINVAL;
+                goto cleanup;
+        }
+
+        /* offset is at top of hif_cont_block */
+        hif_cont_reg = 0;
+
+cleanup:
+        if (syscon_np)
+                of_node_put(syscon_np);
+
+        return rc;
+}
+
+static void __init brcmstb_cpu_ctrl_setup(unsigned int max_cpus)
+{
+        int rc;
+        struct device_node *np;
+        char *name;
+
+        name = "brcm,brcmstb-smpboot";
+        np = of_find_compatible_node(NULL, NULL, name);
+        if (!np) {
+                pr_err("can't find compatible node %s\n", name);
+                return;
+        }
+
+        rc = setup_hifcpubiuctrl_regs(np);
+        if (rc)
+                return;
+
+        rc = setup_hifcont_regs(np);
+        if (rc)
+                return;
+}
+
+static DEFINE_SPINLOCK(boot_lock);
+
+static void brcmstb_secondary_init(unsigned int cpu)
+{
+        /*
+         * Synchronise with the boot thread.
+         */
+        spin_lock(&boot_lock);
+        spin_unlock(&boot_lock);
+}
+
+static int brcmstb_boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+        /*
+         * set synchronisation state between this boot processor
+         * and the secondary one
+         */
+        spin_lock(&boot_lock);
+
+        /* Bring up power to the core if necessary */
+        if (brcmstb_cpu_get_power_state(cpu) == 0)
+                brcmstb_cpu_power_on(cpu);
+
+        brcmstb_cpu_boot(cpu);
+
+        /*
+         * now the secondary core is starting up let it run its
+         * calibrations, then wait for it to finish
+         */
+        spin_unlock(&boot_lock);
+
+        return 0;
+}
+
+static struct smp_operations brcmstb_smp_ops __initdata = {
+        .smp_prepare_cpus       = brcmstb_cpu_ctrl_setup,
+        .smp_secondary_init     = brcmstb_secondary_init,
+        .smp_boot_secondary     = brcmstb_boot_secondary,
+#ifdef CONFIG_HOTPLUG_CPU
+        .cpu_kill               = brcmstb_cpu_kill,
+        .cpu_die                = brcmstb_cpu_die,
+#endif
+};
+
+CPU_METHOD_OF_DECLARE(brcmstb_smp, "brcm,brahma-b15", &brcmstb_smp_ops);
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 2631cfc5ab0d..24f85be71671 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -13,7 +13,9 @@ config MACH_BERLIN_BG2
         bool "Marvell Armada 1500 (BG2)"
         select CACHE_L2X0
         select CPU_PJ4B
+        select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
+        select HAVE_SMP
         select PINCTRL_BERLIN_BG2
 
 config MACH_BERLIN_BG2CD
@@ -25,6 +27,7 @@ config MACH_BERLIN_BG2CD
 config MACH_BERLIN_BG2Q
         bool "Marvell Armada 1500 Pro (BG2-Q)"
         select CACHE_L2X0
+        select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
         select PINCTRL_BERLIN_BG2Q
 
diff --git a/arch/arm/mach-berlin/Makefile b/arch/arm/mach-berlin/Makefile
index ab69fe956f49..c0719ecd1890 100644
--- a/arch/arm/mach-berlin/Makefile
+++ b/arch/arm/mach-berlin/Makefile
@@ -1 +1,2 @@
-obj-y += berlin.o
+obj-y                   += berlin.o
+obj-$(CONFIG_SMP)       += headsmp.o platsmp.o
diff --git a/arch/arm/mach-berlin/headsmp.S b/arch/arm/mach-berlin/headsmp.S
new file mode 100644
index 000000000000..4a4c56a58ad3
--- /dev/null
+++ b/arch/arm/mach-berlin/headsmp.S
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2014 Marvell Technology Group Ltd.
+ *
+ * Antoine Ténart <antoine.tenart@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.
+ */
+
+#include <linux/linkage.h>
+#include <linux/init.h>
+#include <asm/assembler.h>
+
+ENTRY(berlin_secondary_startup)
+ ARM_BE8(setend be)
+        bl      v7_invalidate_l1
+        b       secondary_startup
+ENDPROC(berlin_secondary_startup)
+
+/*
+ * If the following instruction is set in the reset exception vector, CPUs
+ * will fetch the value of the software reset address vector when being
+ * reset.
+ */
+.global boot_inst
+boot_inst:
+        ldr     pc, [pc, #140]
+
+        .align
diff --git a/arch/arm/mach-berlin/platsmp.c b/arch/arm/mach-berlin/platsmp.c
new file mode 100644
index 000000000000..702e7982015a
--- /dev/null
+++ b/arch/arm/mach-berlin/platsmp.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2014 Marvell Technology Group Ltd.
+ *
+ * Antoine Ténart <antoine.tenart@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.
+ */
+
+#include <linux/io.h>
+#include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+
+#include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
+#include <asm/smp_scu.h>
+
+#define CPU_RESET               0x00
+
+#define RESET_VECT              0x00
+#define SW_RESET_ADDR           0x94
+
+extern void berlin_secondary_startup(void);
+extern u32 boot_inst;
+
+static void __iomem *cpu_ctrl;
+
+static inline void berlin_perform_reset_cpu(unsigned int cpu)
+{
+        u32 val;
+
+        val = readl(cpu_ctrl + CPU_RESET);
+        val |= BIT(cpu_logical_map(cpu));
+        writel(val, cpu_ctrl + CPU_RESET);
+}
+
+static int berlin_boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+        if (!cpu_ctrl)
+                return -EFAULT;
+
+        /*
+         * Reset the CPU, making it to execute the instruction in the reset
+         * exception vector.
+         */
+        berlin_perform_reset_cpu(cpu);
+
+        return 0;
+}
+
+static void __init berlin_smp_prepare_cpus(unsigned int max_cpus)
+{
+        struct device_node *np;
+        void __iomem *scu_base;
+        void __iomem *vectors_base;
+
+        np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
+        scu_base = of_iomap(np, 0);
+        of_node_put(np);
+        if (!scu_base)
+                return;
+
+        np = of_find_compatible_node(NULL, NULL, "marvell,berlin-cpu-ctrl");
+        cpu_ctrl = of_iomap(np, 0);
+        of_node_put(np);
+        if (!cpu_ctrl)
+                goto unmap_scu;
+
+        vectors_base = ioremap(CONFIG_VECTORS_BASE, SZ_32K);
+        if (!vectors_base)
+                goto unmap_scu;
+
+        scu_enable(scu_base);
+        flush_cache_all();
+
+        /*
+         * Write the first instruction the CPU will execute after being reset
+         * in the reset exception vector.
+         */
+        writel(boot_inst, vectors_base + RESET_VECT);
+
+        /*
+         * Write the secondary startup address into the SW reset address
+         * vector. This is used by boot_inst.
+         */
+        writel(virt_to_phys(berlin_secondary_startup), vectors_base + SW_RESET_ADDR);
+
+        iounmap(vectors_base);
+unmap_scu:
+        iounmap(scu_base);
+}
+
+static struct smp_operations berlin_smp_ops __initdata = {
+        .smp_prepare_cpus       = berlin_smp_prepare_cpus,
+        .smp_boot_secondary     = berlin_boot_secondary,
+};
+CPU_METHOD_OF_DECLARE(berlin_smp, "marvell,berlin-smp", &berlin_smp_ops);
diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c
index d62ca16d5394..45abf6bd5f68 100644
--- a/arch/arm/mach-clps711x/board-autcpu12.c
+++ b/arch/arm/mach-clps711x/board-autcpu12.c
@@ -266,7 +266,6 @@ MACHINE_START(AUTCPU12, "autronix autcpu12")
         /* Maintainer: Thomas Gleixner */
         .atag_offset    = 0x20000,
         .map_io         = clps711x_map_io,
-        .init_early     = clps711x_init_early,
         .init_irq       = clps711x_init_irq,
         .init_time      = clps711x_timer_init,
         .init_machine   = autcpu12_init,
diff --git a/arch/arm/mach-clps711x/board-cdb89712.c b/arch/arm/mach-clps711x/board-cdb89712.c
index e261a47f2aff..1ec378c334e5 100644
--- a/arch/arm/mach-clps711x/board-cdb89712.c
+++ b/arch/arm/mach-clps711x/board-cdb89712.c
@@ -140,7 +140,6 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712")
         /* Maintainer: Ray Lehtiniemi */
         .atag_offset    = 0x100,
         .map_io         = clps711x_map_io,
-        .init_early     = clps711x_init_early,
         .init_irq       = clps711x_init_irq,
         .init_time      = clps711x_timer_init,
         .init_machine   = cdb89712_init,
diff --git a/arch/arm/mach-clps711x/board-clep7312.c b/arch/arm/mach-clps711x/board-clep7312.c
index 94a7add88a3f..f9ca22b646bf 100644
--- a/arch/arm/mach-clps711x/board-clep7312.c
+++ b/arch/arm/mach-clps711x/board-clep7312.c
@@ -25,6 +25,7 @@
 #include <asm/mach/arch.h>
 
 #include "common.h"
+#include "devices.h"
 
 static void __init
 fixup_clep7312(struct tag *tags, char **cmdline)
@@ -37,8 +38,8 @@ MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
         .atag_offset    = 0x0100,
         .fixup          = fixup_clep7312,
         .map_io         = clps711x_map_io,
-        .init_early     = clps711x_init_early,
         .init_irq       = clps711x_init_irq,
         .init_time      = clps711x_timer_init,
+        .init_machine   = clps711x_devices_init,
         .restart        = clps711x_restart,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
index f9828f89972a..fdf54d40909a 100644
--- a/arch/arm/mach-clps711x/board-edb7211.c
+++ b/arch/arm/mach-clps711x/board-edb7211.c
@@ -148,26 +148,21 @@ fixup_edb7211(struct tag *tags, char **cmdline)
         memblock_add(0xc1000000, SZ_8M);
 }
 
-static void __init edb7211_init(void)
-{
-        clps711x_devices_init();
-}
-
 static void __init edb7211_init_late(void)
 {
         gpio_request_array(edb7211_gpios, ARRAY_SIZE(edb7211_gpios));
 
         platform_device_register(&edb7211_flash_pdev);
-        platform_device_register_data(&platform_bus, "platform-lcd", 0,
+        platform_device_register_data(NULL, "platform-lcd", 0,
                                       &edb7211_lcd_power_pdata,
                                       sizeof(edb7211_lcd_power_pdata));
-        platform_device_register_data(&platform_bus, "generic-bl", 0,
+        platform_device_register_data(NULL, "generic-bl", 0,
                                       &edb7211_lcd_backlight_pdata,
                                       sizeof(edb7211_lcd_backlight_pdata));
         platform_device_register_simple("video-clps711x", 0, NULL, 0);
         platform_device_register_simple("cs89x0", 0, edb7211_cs8900_resource,
                                         ARRAY_SIZE(edb7211_cs8900_resource));
-        platform_device_register_data(&platform_bus, "i2c-gpio", 0,
+        platform_device_register_data(NULL, "i2c-gpio", 0,
                                       &edb7211_i2c_pdata,
                                       sizeof(edb7211_i2c_pdata));
 }
@@ -178,10 +173,9 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
         .fixup          = fixup_edb7211,
         .reserve        = edb7211_reserve,
         .map_io         = clps711x_map_io,
-        .init_early     = clps711x_init_early,
         .init_irq       = clps711x_init_irq,
         .init_time      = clps711x_timer_init,
-        .init_machine   = edb7211_init,
+        .init_machine   = clps711x_devices_init,
         .init_late      = edb7211_init_late,
         .restart        = clps711x_restart,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/board-p720t.c b/arch/arm/mach-clps711x/board-p720t.c
index 0cf0e51e6546..e68dd629bda2 100644
--- a/arch/arm/mach-clps711x/board-p720t.c
+++ b/arch/arm/mach-clps711x/board-p720t.c
@@ -348,14 +348,14 @@ static void __init p720t_init_late(void)
 {
         WARN_ON(gpio_request_array(p720t_gpios, ARRAY_SIZE(p720t_gpios)));
 
-        platform_device_register_data(&platform_bus, "platform-lcd", 0,
+        platform_device_register_data(NULL, "platform-lcd", 0,
                                       &p720t_lcd_power_pdata,
                                       sizeof(p720t_lcd_power_pdata));
-        platform_device_register_data(&platform_bus, "generic-bl", 0,
+        platform_device_register_data(NULL, "generic-bl", 0,
                                       &p720t_lcd_backlight_pdata,
                                       sizeof(p720t_lcd_backlight_pdata));
         platform_device_register_simple("video-clps711x", 0, NULL, 0);
-        platform_device_register_data(&platform_bus, "leds-gpio", 0,
+        platform_device_register_data(NULL, "leds-gpio", 0,
                                       &p720t_gpio_led_pdata,
                                       sizeof(p720t_gpio_led_pdata));
 }
@@ -365,7 +365,6 @@ MACHINE_START(P720T, "ARM-Prospector720T")
         .atag_offset    = 0x100,
         .fixup          = fixup_p720t,
         .map_io         = clps711x_map_io,
-        .init_early     = clps711x_init_early,
         .init_irq       = clps711x_init_irq,
         .init_time      = clps711x_timer_init,
         .init_machine   = p720t_init,
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index aee81fa46ccf..2a6323b15782 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -193,15 +193,3 @@ void clps711x_restart(enum reboot_mode mode, const char *cmd)
 {
         soft_restart(0);
 }
-
-static void clps711x_idle(void)
-{
-        clps_writel(1, HALT);
-        asm("mov r0, r0");
-        asm("mov r0, r0");
-}
-
-void __init clps711x_init_early(void)
-{
-        arm_pm_idle = clps711x_idle;
-}
diff --git a/arch/arm/mach-clps711x/common.h b/arch/arm/mach-clps711x/common.h
index 7489139d5d63..f88189963898 100644
--- a/arch/arm/mach-clps711x/common.h
+++ b/arch/arm/mach-clps711x/common.h
@@ -13,7 +13,6 @@ extern void clps711x_map_io(void);
 extern void clps711x_init_irq(void);
 extern void clps711x_timer_init(void);
 extern void clps711x_restart(enum reboot_mode mode, const char *cmd);
-extern void clps711x_init_early(void);
 
 /* drivers/irqchip/irq-clps711x.c */
 void clps711x_intc_init(phys_addr_t, resource_size_t);
diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index 2001488a5ef2..0c689d3a6710 100644
--- a/arch/arm/mach-clps711x/devices.c
+++ b/arch/arm/mach-clps711x/devices.c
@@ -14,6 +14,15 @@
 
 #include <mach/hardware.h>
 
+static const struct resource clps711x_cpuidle_res __initconst =
+        DEFINE_RES_MEM(CLPS711X_PHYS_BASE + HALT, SZ_128);
+
+static void __init clps711x_add_cpuidle(void)
+{
+        platform_device_register_simple("clps711x-cpuidle", PLATFORM_DEVID_NONE,
+                                        &clps711x_cpuidle_res, 1);
+}
+
 static const phys_addr_t clps711x_gpios[][2] __initconst = {
         { PADR, PADDR },
         { PBDR, PBDDR },
@@ -83,6 +92,7 @@ static void __init clps711x_add_uart(void)
 
 void __init clps711x_devices_init(void)
 {
+        clps711x_add_cpuidle();
         clps711x_add_gpio();
         clps711x_add_syscon();
         clps711x_add_uart();
diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S
deleted file mode 100644
index cb3684f8dae0..000000000000
--- a/arch/arm/mach-clps711x/include/mach/debug-macro.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/* arch/arm/mach-clps711x/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.
- *
-*/
-
-#include <mach/hardware.h>
-
-                .macro  addruart, rp, rv, tmp
-#ifndef CONFIG_DEBUG_CLPS711X_UART2
-                mov     \rp, #0x0000    @ UART1
-#else
-                mov     \rp, #0x1000    @ UART2
-#endif
-                orr     \rv, \rp, #CLPS711X_VIRT_BASE
-                orr     \rp, \rp, #CLPS711X_PHYS_BASE
-                .endm
-
-                .macro  senduart,rd,rx
-                str     \rd, [\rx, #0x0480]     @ UARTDR
-                .endm
-
-                .macro  waituart,rd,rx
-                .endm
-
-                .macro  busyuart,rd,rx
-1001:           ldr     \rd, [\rx, #0x0140]     @ SYSFLGx
-                tst     \rd, #1 << 11           @ UBUSYx
-                bne     1001b
-                .endm
-
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index 5d6afda1c0e8..833129c9f798 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -24,10 +24,7 @@
 
 #include <mach/clps711x.h>
 
-#define IO_ADDRESS(x)           (0xdc000000 + (((x) & 0x03ffffff) | \
-                                (((x) >> 2) & 0x3c000000)))
-
-#define CLPS711X_VIRT_BASE      IOMEM(IO_ADDRESS(CLPS711X_PHYS_BASE))
+#define CLPS711X_VIRT_BASE      IOMEM(0xfeff0000)
 
 #ifndef __ASSEMBLY__
 #define clps_readb(off)         readb(CLPS711X_VIRT_BASE + (off))
diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S
index d4e9316ecacb..a5336a5e2739 100644
--- a/arch/arm/mach-davinci/sleep.S
+++ b/arch/arm/mach-davinci/sleep.S
@@ -213,7 +213,7 @@ ddr2clk_stop_done:
         cmp     ip, r0
         bne     ddr2clk_stop_done
 
-        mov     pc, lr
+        ret     lr
 ENDPROC(davinci_ddr_psc_config)
 
 CACHE_FLUSH:
diff --git a/arch/arm/mach-ebsa110/include/mach/memory.h b/arch/arm/mach-ebsa110/include/mach/memory.h
index 8e49066ad850..866f8a1c6ff7 100644
--- a/arch/arm/mach-ebsa110/include/mach/memory.h
+++ b/arch/arm/mach-ebsa110/include/mach/memory.h
@@ -17,11 +17,6 @@
 #define __ASM_ARCH_MEMORY_H
 
 /*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET        UL(0x00000000)
-
-/*
  * Cache flushing area - SRAM
  */
 #define FLUSH_BASE_PHYS         0x40000000
diff --git a/arch/arm/mach-ep93xx/crunch-bits.S b/arch/arm/mach-ep93xx/crunch-bits.S
index e96923a3017b..ee0be2af5c61 100644
--- a/arch/arm/mach-ep93xx/crunch-bits.S
+++ b/arch/arm/mach-ep93xx/crunch-bits.S
@@ -198,7 +198,7 @@ crunch_load:
         get_thread_info r10
 #endif
 2:      dec_preempt_count r10, r3
-        mov     pc, lr
+        ret     lr
 
 /*
  * Back up crunch regs to save area and disable access to them
@@ -277,7 +277,7 @@ ENTRY(crunch_task_copy)
         mov     r3, lr                          @ preserve return address
         bl      crunch_save
         msr     cpsr_c, ip                      @ restore interrupt mode
-        mov     pc, r3
+        ret     r3
 
 /*
  * Restore crunch state from given memory address
@@ -310,4 +310,4 @@ ENTRY(crunch_task_restore)
         mov     r3, lr                          @ preserve return address
         bl      crunch_load
         msr     cpsr_c, ip                      @ restore interrupt mode
-        mov     pc, r3
+        ret     r3
diff --git a/arch/arm/mach-ep93xx/include/mach/memory.h b/arch/arm/mach-ep93xx/include/mach/memory.h
deleted file mode 100644
index c9400cf0051c..000000000000
--- a/arch/arm/mach-ep93xx/include/mach/memory.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * arch/arm/mach-ep93xx/include/mach/memory.h
- */
-
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#if defined(CONFIG_EP93XX_SDCE3_SYNC_PHYS_OFFSET)
-#define PLAT_PHYS_OFFSET                UL(0x00000000)
-#elif defined(CONFIG_EP93XX_SDCE0_PHYS_OFFSET)
-#define PLAT_PHYS_OFFSET                UL(0xc0000000)
-#elif defined(CONFIG_EP93XX_SDCE1_PHYS_OFFSET)
-#define PLAT_PHYS_OFFSET                UL(0xd0000000)
-#elif defined(CONFIG_EP93XX_SDCE2_PHYS_OFFSET)
-#define PLAT_PHYS_OFFSET                UL(0xe0000000)
-#elif defined(CONFIG_EP93XX_SDCE3_ASYNC_PHYS_OFFSET)
-#define PLAT_PHYS_OFFSET                UL(0xf0000000)
-#else
-#error "Kconfig bug: No EP93xx PHYS_OFFSET set"
-#endif
-
-#endif
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 8f9b66c4ac78..2d0240f241b8 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -100,7 +100,6 @@ config SOC_EXYNOS5440
         default y
         depends on ARCH_EXYNOS5
         select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
-        select ARCH_HAS_OPP
         select HAVE_ARM_ARCH_TIMER
         select AUTO_ZRELADDR
         select MIGHT_HAVE_PCI
@@ -119,6 +118,7 @@ config EXYNOS5420_MCPM
         bool "Exynos5420 Multi-Cluster PM support"
         depends on MCPM && SOC_EXYNOS5420
         select ARM_CCI
+        select ARM_CPU_SUSPEND
         help
           This is needed to provide CPU and cluster power management
           on Exynos5420 implementing big.LITTLE.
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 1ee91763fa7c..47b904b3b973 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -111,25 +111,14 @@ IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK)
 #define soc_is_exynos5() (soc_is_exynos5250() || soc_is_exynos5410() || \
                           soc_is_exynos5420() || soc_is_exynos5800())
 
-void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1);
-
-struct map_desc;
 extern void __iomem *sysram_ns_base_addr;
 extern void __iomem *sysram_base_addr;
-void exynos_init_io(void);
-void exynos_restart(enum reboot_mode mode, const char *cmd);
+extern void __iomem *pmu_base_addr;
 void exynos_sysram_init(void);
-void exynos_cpuidle_init(void);
-void exynos_cpufreq_init(void);
-void exynos_init_late(void);
 
 void exynos_firmware_init(void);
 
-#ifdef CONFIG_PINCTRL_EXYNOS
 extern u32 exynos_get_eint_wake_mask(void);
-#else
-static inline u32 exynos_get_eint_wake_mask(void) { return 0xffffffff; }
-#endif
 
 #ifdef CONFIG_PM_SLEEP
 extern void __init exynos_pm_init(void);
@@ -145,7 +134,7 @@ extern void exynos_cpu_die(unsigned int cpu);
 
 /* PMU(Power Management Unit) support */
 
-#define PMU_TABLE_END   NULL
+#define PMU_TABLE_END   (-1U)
 
 enum sys_powerdown {
         SYS_AFTR,
@@ -155,7 +144,7 @@ enum sys_powerdown {
 };
 
 struct exynos_pmu_conf {
-        void __iomem *reg;
+        unsigned int offset;
         unsigned int val[NUM_SYS_POWERDOWN];
 };
 
@@ -171,4 +160,14 @@ extern void exynos_enter_aftr(void);
 extern void s5p_init_cpu(void __iomem *cpuid_addr);
 extern unsigned int samsung_rev(void);
 
+static inline void pmu_raw_writel(u32 val, u32 offset)
+{
+        __raw_writel(val, pmu_base_addr + offset);
+}
+
+static inline u32 pmu_raw_readl(u32 offset)
+{
+        return __raw_readl(pmu_base_addr + offset);
+}
+
 #endif /* __ARCH_ARM_MACH_EXYNOS_COMMON_H */
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 66c9b9614f3c..6a24e111d6e1 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -19,6 +19,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/pm_domain.h>
+#include <linux/irqchip.h>
 
 #include <asm/cacheflush.h>
 #include <asm/hardware/cache-l2x0.h>
@@ -29,6 +30,9 @@
 #include "common.h"
 #include "mfc.h"
 #include "regs-pmu.h"
+#include "regs-sys.h"
+
+void __iomem *pmu_base_addr;
 
 static struct map_desc exynos4_iodesc[] __initdata = {
         {
@@ -57,11 +61,6 @@ static struct map_desc exynos4_iodesc[] __initdata = {
                 .length         = SZ_4K,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = (unsigned long)S5P_VA_PMU,
-                .pfn            = __phys_to_pfn(EXYNOS4_PA_PMU),
-                .length         = SZ_64K,
-                .type           = MT_DEVICE,
-        }, {
                 .virtual        = (unsigned long)S5P_VA_COMBINER_BASE,
                 .pfn            = __phys_to_pfn(EXYNOS4_PA_COMBINER),
                 .length         = SZ_4K,
@@ -135,19 +134,14 @@ static struct map_desc exynos5_iodesc[] __initdata = {
                 .pfn            = __phys_to_pfn(EXYNOS5_PA_CMU),
                 .length         = 144 * SZ_1K,
                 .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_PMU,
-                .pfn            = __phys_to_pfn(EXYNOS5_PA_PMU),
-                .length         = SZ_64K,
-                .type           = MT_DEVICE,
         },
 };
 
-void exynos_restart(enum reboot_mode mode, const char *cmd)
+static void exynos_restart(enum reboot_mode mode, const char *cmd)
 {
         struct device_node *np;
         u32 val = 0x1;
-        void __iomem *addr = EXYNOS_SWRESET;
+        void __iomem *addr = pmu_base_addr + EXYNOS_SWRESET;
 
         if (of_machine_is_compatible("samsung,exynos5440")) {
                 u32 status;
@@ -171,17 +165,6 @@ static struct platform_device exynos_cpuidle = {
         .id                = -1,
 };
 
-void __init exynos_cpuidle_init(void)
-{
-        if (soc_is_exynos4210() || soc_is_exynos5250())
-                platform_device_register(&exynos_cpuidle);
-}
-
-void __init exynos_cpufreq_init(void)
-{
-        platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
-}
-
 void __iomem *sysram_base_addr;
 void __iomem *sysram_ns_base_addr;
 
@@ -204,7 +187,7 @@ void __init exynos_sysram_init(void)
         }
 }
 
-void __init exynos_init_late(void)
+static void __init exynos_init_late(void)
 {
         if (of_machine_is_compatible("samsung,exynos5440"))
                 /* to be supported later */
@@ -251,7 +234,7 @@ static void __init exynos_map_io(void)
                 iotable_init(exynos5_iodesc, ARRAY_SIZE(exynos5_iodesc));
 }
 
-void __init exynos_init_io(void)
+static void __init exynos_init_io(void)
 {
         debug_ll_io_init();
 
@@ -263,6 +246,41 @@ void __init exynos_init_io(void)
         exynos_map_io();
 }
 
+static const struct of_device_id exynos_dt_pmu_match[] = {
+        { .compatible = "samsung,exynos3250-pmu" },
+        { .compatible = "samsung,exynos4210-pmu" },
+        { .compatible = "samsung,exynos4212-pmu" },
+        { .compatible = "samsung,exynos4412-pmu" },
+        { .compatible = "samsung,exynos5250-pmu" },
+        { .compatible = "samsung,exynos5260-pmu" },
+        { .compatible = "samsung,exynos5410-pmu" },
+        { .compatible = "samsung,exynos5420-pmu" },
+        { /*sentinel*/ },
+};
+
+static void exynos_map_pmu(void)
+{
+        struct device_node *np;
+
+        np = of_find_matching_node(NULL, exynos_dt_pmu_match);
+        if (np)
+                pmu_base_addr = of_iomap(np, 0);
+
+        if (!pmu_base_addr)
+                panic("failed to find exynos pmu register\n");
+}
+
+static void __init exynos_init_irq(void)
+{
+        irqchip_init();
+        /*
+         * Since platsmp.c needs pmu base address by the time
+         * DT is not unflatten so we can't use DT APIs before
+         * init_irq
+         */
+        exynos_map_pmu();
+}
+
 static void __init exynos_dt_machine_init(void)
 {
         struct device_node *i2c_np;
@@ -298,8 +316,11 @@ static void __init exynos_dt_machine_init(void)
         if (!IS_ENABLED(CONFIG_SMP))
                 exynos_sysram_init();
 
-        exynos_cpuidle_init();
-        exynos_cpufreq_init();
+        if (of_machine_is_compatible("samsung,exynos4210") ||
+                        of_machine_is_compatible("samsung,exynos5250"))
+                platform_device_register(&exynos_cpuidle);
+
+        platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
@@ -352,6 +373,7 @@ DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)")
         .smp            = smp_ops(exynos_smp_ops),
         .map_io         = exynos_init_io,
         .init_early     = exynos_firmware_init,
+        .init_irq       = exynos_init_irq,
         .init_machine   = exynos_dt_machine_init,
         .init_late      = exynos_init_late,
         .dt_compat      = exynos_dt_compat,
diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S
index cdd9d91e9933..b54f9701e421 100644
--- a/arch/arm/mach-exynos/headsmp.S
+++ b/arch/arm/mach-exynos/headsmp.S
@@ -1,5 +1,4 @@
 /*
- *  linux/arch/arm/mach-exynos4/headsmp.S
  *
  *  Cloned from linux/arch/arm/mach-realview/headsmp.S
  *
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c
index 920a4baa53cd..4d86961a7957 100644
--- a/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@ -1,5 +1,4 @@
-/* linux arch/arm/mach-exynos4/hotplug.c
- *
+/*
  *  Cloned from linux/arch/arm/mach-realview/hotplug.c
  *
  *  Copyright (C) 2002 ARM Ltd.
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 548269a60634..f0b7e92bad6c 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -1,5 +1,4 @@
-/* linux/arch/arm/mach-exynos/include/mach/map.h
- *
+/*
  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com/
  *
@@ -28,9 +27,6 @@
 #define EXYNOS4_PA_SYSCON               0x10010000
 #define EXYNOS5_PA_SYSCON               0x10050100
 
-#define EXYNOS4_PA_PMU                  0x10020000
-#define EXYNOS5_PA_PMU                  0x10040000
-
 #define EXYNOS4_PA_CMU                  0x10030000
 #define EXYNOS5_PA_CMU                  0x10010000
 
diff --git a/arch/arm/mach-exynos/include/mach/memory.h b/arch/arm/mach-exynos/include/mach/memory.h
index 2a4cdb7cb326..e19df1f18c0d 100644
--- a/arch/arm/mach-exynos/include/mach/memory.h
+++ b/arch/arm/mach-exynos/include/mach/memory.h
@@ -1,5 +1,4 @@
-/* linux/arch/arm/mach-exynos4/include/mach/memory.h
- *
+/*
  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com
  *
diff --git a/arch/arm/mach-exynos/mcpm-exynos.c b/arch/arm/mach-exynos/mcpm-exynos.c
index ace0ed617476..b2f8b60cf0e9 100644
--- a/arch/arm/mach-exynos/mcpm-exynos.c
+++ b/arch/arm/mach-exynos/mcpm-exynos.c
@@ -26,6 +26,10 @@
 #define EXYNOS5420_CPUS_PER_CLUSTER     4
 #define EXYNOS5420_NR_CLUSTERS          2
 
+#define EXYNOS5420_ENABLE_AUTOMATIC_CORE_DOWN   BIT(9)
+#define EXYNOS5420_USE_ARM_CORE_DOWN_STATE      BIT(29)
+#define EXYNOS5420_USE_L2_COMMON_UP_STATE       BIT(30)
+
 /*
  * The common v7_exit_coherency_flush API could not be used because of the
  * Erratum 799270 workaround. This macro is the same as the common one (in
@@ -51,7 +55,7 @@
         "dsb\n\t" \
         "ldmfd  sp!, {fp, ip}" \
         : \
-        : "Ir" (S5P_INFORM0) \
+        : "Ir" (pmu_base_addr + S5P_INFORM0) \
         : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", \
           "r9", "r10", "lr", "memory")
 
@@ -73,36 +77,9 @@ cpu_use_count[EXYNOS5420_CPUS_PER_CLUSTER][EXYNOS5420_NR_CLUSTERS];
 
 #define exynos_cluster_unused(cluster) !exynos_cluster_usecnt(cluster)
 
-static int exynos_cluster_power_control(unsigned int cluster, int enable)
-{
-        unsigned int tries = 100;
-        unsigned int val;
-
-        if (enable) {
-                exynos_cluster_power_up(cluster);
-                val = S5P_CORE_LOCAL_PWR_EN;
-        } else {
-                exynos_cluster_power_down(cluster);
-                val = 0;
-        }
-
-        /* Wait until cluster power control is applied */
-        while (tries--) {
-                if (exynos_cluster_power_state(cluster) == val)
-                        return 0;
-
-                cpu_relax();
-        }
-        pr_debug("timed out waiting for cluster %u to power %s\n", cluster,
-                enable ? "on" : "off");
-
-        return -ETIMEDOUT;
-}
-
 static int exynos_power_up(unsigned int cpu, unsigned int cluster)
 {
         unsigned int cpunr = cpu + (cluster * EXYNOS5420_CPUS_PER_CLUSTER);
-        int err = 0;
 
         pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
         if (cpu >= EXYNOS5420_CPUS_PER_CLUSTER ||
@@ -126,12 +103,9 @@ static int exynos_power_up(unsigned int cpu, unsigned int cluster)
                  * cores.
                  */
                 if (was_cluster_down)
-                        err = exynos_cluster_power_control(cluster, 1);
+                        exynos_cluster_power_up(cluster);
 
-                if (!err)
-                        exynos_cpu_power_up(cpunr);
-                else
-                        exynos_cluster_power_control(cluster, 0);
+                exynos_cpu_power_up(cpunr);
         } else if (cpu_use_count[cpu][cluster] != 2) {
                 /*
                  * The only possible values are:
@@ -147,7 +121,7 @@ static int exynos_power_up(unsigned int cpu, unsigned int cluster)
         arch_spin_unlock(&exynos_mcpm_lock);
         local_irq_enable();
 
-        return err;
+        return 0;
 }
 
 /*
@@ -178,9 +152,10 @@ static void exynos_power_down(void)
         if (cpu_use_count[cpu][cluster] == 0) {
                 exynos_cpu_power_down(cpunr);
 
-                if (exynos_cluster_unused(cluster))
-                        /* TODO: Turn off the cluster here to save power. */
+                if (exynos_cluster_unused(cluster)) {
+                        exynos_cluster_power_down(cluster);
                         last_man = true;
+                }
         } else if (cpu_use_count[cpu][cluster] == 1) {
                 /*
                  * A power_up request went ahead of us.
@@ -196,7 +171,7 @@ static void exynos_power_down(void)
         if (last_man && __mcpm_outbound_enter_critical(cpu, cluster)) {
                 arch_spin_unlock(&exynos_mcpm_lock);
 
-                if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A15) {
+                if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A15) {
                         /*
                          * On the Cortex-A15 we need to disable
                          * L2 prefetching before flushing the cache.
@@ -257,10 +232,46 @@ static int exynos_wait_for_powerdown(unsigned int cpu, unsigned int cluster)
         return -ETIMEDOUT; /* timeout */
 }
 
+static void exynos_powered_up(void)
+{
+        unsigned int mpidr, cpu, cluster;
+
+        mpidr = read_cpuid_mpidr();
+        cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+        cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+
+        arch_spin_lock(&exynos_mcpm_lock);
+        if (cpu_use_count[cpu][cluster] == 0)
+                cpu_use_count[cpu][cluster] = 1;
+        arch_spin_unlock(&exynos_mcpm_lock);
+}
+
+static void exynos_suspend(u64 residency)
+{
+        unsigned int mpidr, cpunr;
+
+        exynos_power_down();
+
+        /*
+         * Execution reaches here only if cpu did not power down.
+         * Hence roll back the changes done in exynos_power_down function.
+         *
+         * CAUTION: "This function requires the stack data to be visible through
+         * power down and can only be executed on processors like A15 and A7
+         * that hit the cache with the C bit clear in the SCTLR register."
+        */
+        mpidr = read_cpuid_mpidr();
+        cpunr = exynos_pmu_cpunr(mpidr);
+
+        exynos_cpu_power_up(cpunr);
+}
+
 static const struct mcpm_platform_ops exynos_power_ops = {
         .power_up               = exynos_power_up,
         .power_down             = exynos_power_down,
         .wait_for_powerdown     = exynos_wait_for_powerdown,
+        .suspend                = exynos_suspend,
+        .powered_up             = exynos_powered_up,
 };
 
 static void __init exynos_mcpm_usage_count_init(void)
@@ -289,6 +300,19 @@ static void __naked exynos_pm_power_up_setup(unsigned int affinity_level)
         "b      cci_enable_port_for_self");
 }
 
+static void __init exynos_cache_off(void)
+{
+        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A15) {
+                /* disable L2 prefetching on the Cortex-A15 */
+                asm volatile(
+                "mcr    p15, 1, %0, c15, c0, 3\n\t"
+                "isb\n\t"
+                "dsb"
+                : : "r" (0x400));
+        }
+        exynos_v7_exit_coherency_flush(all);
+}
+
 static const struct of_device_id exynos_dt_mcpm_match[] = {
         { .compatible = "samsung,exynos5420" },
         { .compatible = "samsung,exynos5800" },
@@ -299,6 +323,7 @@ static int __init exynos_mcpm_init(void)
 {
         struct device_node *node;
         void __iomem *ns_sram_base_addr;
+        unsigned int value, i;
         int ret;
 
         node = of_find_matching_node(NULL, exynos_dt_mcpm_match);
@@ -325,13 +350,15 @@ static int __init exynos_mcpm_init(void)
          * To increase the stability of KFC reset we need to program
          * the PMU SPARE3 register
          */
-        __raw_writel(EXYNOS5420_SWRESET_KFC_SEL, S5P_PMU_SPARE3);
+        pmu_raw_writel(EXYNOS5420_SWRESET_KFC_SEL, S5P_PMU_SPARE3);
 
         exynos_mcpm_usage_count_init();
 
         ret = mcpm_platform_register(&exynos_power_ops);
         if (!ret)
                 ret = mcpm_sync_init(exynos_pm_power_up_setup);
+        if (!ret)
+                ret = mcpm_loopback(exynos_cache_off); /* turn on the CCI */
         if (ret) {
                 iounmap(ns_sram_base_addr);
                 return ret;
@@ -342,6 +369,26 @@ static int __init exynos_mcpm_init(void)
         pr_info("Exynos MCPM support installed\n");
 
         /*
+         * On Exynos5420/5800 for the A15 and A7 clusters:
+         *
+         * EXYNOS5420_ENABLE_AUTOMATIC_CORE_DOWN ensures that all the cores
+         * in a cluster are turned off before turning off the cluster L2.
+         *
+         * EXYNOS5420_USE_ARM_CORE_DOWN_STATE ensures that a cores is powered
+         * off before waking it up.
+         *
+         * EXYNOS5420_USE_L2_COMMON_UP_STATE ensures that cluster L2 will be
+         * turned on before the first man is powered up.
+         */
+        for (i = 0; i < EXYNOS5420_NR_CLUSTERS; i++) {
+                value = pmu_raw_readl(EXYNOS_COMMON_OPTION(i));
+                value |= EXYNOS5420_ENABLE_AUTOMATIC_CORE_DOWN |
+                         EXYNOS5420_USE_ARM_CORE_DOWN_STATE    |
+                         EXYNOS5420_USE_L2_COMMON_UP_STATE;
+                pmu_raw_writel(value, EXYNOS_COMMON_OPTION(i));
+        }
+
+        /*
          * U-Boot SPL is hardcoded to jump to the start of ns_sram_base_addr
          * as part of secondary_cpu_start().  Let's redirect it to the
          * mcpm_entry_point().
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 50b9aad5e27b..a9f1cf759949 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -1,5 +1,4 @@
-/* linux/arch/arm/mach-exynos4/platsmp.c
- *
+ /*
  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com
  *
@@ -27,15 +26,83 @@
 #include <asm/smp_scu.h>
 #include <asm/firmware.h>
 
+#include <mach/map.h>
+
 #include "common.h"
 #include "regs-pmu.h"
 
 extern void exynos4_secondary_startup(void);
 
+/**
+ * exynos_core_power_down : power down the specified cpu
+ * @cpu : the cpu to power down
+ *
+ * Power down the specified cpu. The sequence must be finished by a
+ * call to cpu_do_idle()
+ *
+ */
+void exynos_cpu_power_down(int cpu)
+{
+        pmu_raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
+}
+
+/**
+ * exynos_cpu_power_up : power up the specified cpu
+ * @cpu : the cpu to power up
+ *
+ * Power up the specified cpu
+ */
+void exynos_cpu_power_up(int cpu)
+{
+        pmu_raw_writel(S5P_CORE_LOCAL_PWR_EN,
+                        EXYNOS_ARM_CORE_CONFIGURATION(cpu));
+}
+
+/**
+ * exynos_cpu_power_state : returns the power state of the cpu
+ * @cpu : the cpu to retrieve the power state from
+ *
+ */
+int exynos_cpu_power_state(int cpu)
+{
+        return (pmu_raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) &
+                        S5P_CORE_LOCAL_PWR_EN);
+}
+
+/**
+ * exynos_cluster_power_down : power down the specified cluster
+ * @cluster : the cluster to power down
+ */
+void exynos_cluster_power_down(int cluster)
+{
+        pmu_raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
+}
+
+/**
+ * exynos_cluster_power_up : power up the specified cluster
+ * @cluster : the cluster to power up
+ */
+void exynos_cluster_power_up(int cluster)
+{
+        pmu_raw_writel(S5P_CORE_LOCAL_PWR_EN,
+                        EXYNOS_COMMON_CONFIGURATION(cluster));
+}
+
+/**
+ * exynos_cluster_power_state : returns the power state of the cluster
+ * @cluster : the cluster to retrieve the power state from
+ *
+ */
+int exynos_cluster_power_state(int cluster)
+{
+        return (pmu_raw_readl(EXYNOS_COMMON_STATUS(cluster)) &
+                S5P_CORE_LOCAL_PWR_EN);
+}
+
 static inline void __iomem *cpu_boot_reg_base(void)
 {
         if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
-                return S5P_INFORM5;
+                return pmu_base_addr + S5P_INFORM5;
         return sysram_base_addr;
 }
 
@@ -190,7 +257,7 @@ static void __init exynos_smp_init_cpus(void)
         void __iomem *scu_base = scu_base_addr();
         unsigned int i, ncores;
 
-        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                 ncores = scu_base ? scu_get_core_count(scu_base) : 1;
         else
                 /*
@@ -216,7 +283,7 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
 
         exynos_sysram_init();
 
-        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                 scu_enable(scu_base_addr());
 
         /*
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index 202ca73e49c4..abefacb45976 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -28,13 +28,13 @@
 #include <asm/suspend.h>
 
 #include <plat/pm-common.h>
-#include <plat/pll.h>
 #include <plat/regs-srom.h>
 
 #include <mach/map.h>
 
 #include "common.h"
 #include "regs-pmu.h"
+#include "regs-sys.h"
 
 /**
  * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping
@@ -100,102 +100,20 @@ static int exynos_irq_set_wake(struct irq_data *data, unsigned int state)
         return -ENOENT;
 }
 
-/**
- * exynos_core_power_down : power down the specified cpu
- * @cpu : the cpu to power down
- *
- * Power down the specified cpu. The sequence must be finished by a
- * call to cpu_do_idle()
- *
- */
-void exynos_cpu_power_down(int cpu)
-{
-        __raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
-}
-
-/**
- * exynos_cpu_power_up : power up the specified cpu
- * @cpu : the cpu to power up
- *
- * Power up the specified cpu
- */
-void exynos_cpu_power_up(int cpu)
-{
-        __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-                     EXYNOS_ARM_CORE_CONFIGURATION(cpu));
-}
-
-/**
- * exynos_cpu_power_state : returns the power state of the cpu
- * @cpu : the cpu to retrieve the power state from
- *
- */
-int exynos_cpu_power_state(int cpu)
-{
-        return (__raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) &
-                        S5P_CORE_LOCAL_PWR_EN);
-}
-
-/**
- * exynos_cluster_power_down : power down the specified cluster
- * @cluster : the cluster to power down
- */
-void exynos_cluster_power_down(int cluster)
-{
-        __raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
-}
-
-/**
- * exynos_cluster_power_up : power up the specified cluster
- * @cluster : the cluster to power up
- */
-void exynos_cluster_power_up(int cluster)
-{
-        __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-                     EXYNOS_COMMON_CONFIGURATION(cluster));
-}
-
-/**
- * exynos_cluster_power_state : returns the power state of the cluster
- * @cluster : the cluster to retrieve the power state from
- *
- */
-int exynos_cluster_power_state(int cluster)
-{
-        return (__raw_readl(EXYNOS_COMMON_STATUS(cluster)) &
-                        S5P_CORE_LOCAL_PWR_EN);
-}
-
 #define EXYNOS_BOOT_VECTOR_ADDR (samsung_rev() == EXYNOS4210_REV_1_1 ? \
-                        S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \
-                        (sysram_base_addr + 0x24) : S5P_INFORM0))
+                        pmu_base_addr + S5P_INFORM7 : \
+                        (samsung_rev() == EXYNOS4210_REV_1_0 ? \
+                        (sysram_base_addr + 0x24) : \
+                        pmu_base_addr + S5P_INFORM0))
 #define EXYNOS_BOOT_VECTOR_FLAG (samsung_rev() == EXYNOS4210_REV_1_1 ? \
-                        S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \
-                        (sysram_base_addr + 0x20) : S5P_INFORM1))
+                        pmu_base_addr + S5P_INFORM6 : \
+                        (samsung_rev() == EXYNOS4210_REV_1_0 ? \
+                        (sysram_base_addr + 0x20) : \
+                        pmu_base_addr + S5P_INFORM1))
 
 #define S5P_CHECK_AFTR  0xFCBA0D10
 #define S5P_CHECK_SLEEP 0x00000BAD
 
-/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
-static void exynos_set_wakeupmask(long mask)
-{
-        __raw_writel(mask, S5P_WAKEUP_MASK);
-}
-
-static void exynos_cpu_set_boot_vector(long flags)
-{
-        __raw_writel(virt_to_phys(exynos_cpu_resume), EXYNOS_BOOT_VECTOR_ADDR);
-        __raw_writel(flags, EXYNOS_BOOT_VECTOR_FLAG);
-}
-
-void exynos_enter_aftr(void)
-{
-        exynos_set_wakeupmask(0x0000ff3e);
-        exynos_cpu_set_boot_vector(S5P_CHECK_AFTR);
-        /* Set value of power down register for aftr mode */
-        exynos_sys_powerdown_conf(SYS_AFTR);
-}
-
 /* For Cortex-A9 Diagnostic and Power control register */
 static unsigned int save_arm_register[2];
 
@@ -235,6 +153,82 @@ static void exynos_cpu_restore_register(void)
                       : "cc");
 }
 
+static void exynos_pm_central_suspend(void)
+{
+        unsigned long tmp;
+
+        /* Setting Central Sequence Register for power down mode */
+        tmp = pmu_raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
+        tmp &= ~S5P_CENTRAL_LOWPWR_CFG;
+        pmu_raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
+}
+
+static int exynos_pm_central_resume(void)
+{
+        unsigned long tmp;
+
+        /*
+         * If PMU failed while entering sleep mode, WFI will be
+         * ignored by PMU and then exiting cpu_do_idle().
+         * S5P_CENTRAL_LOWPWR_CFG bit will not be set automatically
+         * in this situation.
+         */
+        tmp = pmu_raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
+        if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) {
+                tmp |= S5P_CENTRAL_LOWPWR_CFG;
+                pmu_raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
+                /* clear the wakeup state register */
+                pmu_raw_writel(0x0, S5P_WAKEUP_STAT);
+                /* No need to perform below restore code */
+                return -1;
+        }
+
+        return 0;
+}
+
+/* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
+static void exynos_set_wakeupmask(long mask)
+{
+        pmu_raw_writel(mask, S5P_WAKEUP_MASK);
+}
+
+static void exynos_cpu_set_boot_vector(long flags)
+{
+        __raw_writel(virt_to_phys(exynos_cpu_resume), EXYNOS_BOOT_VECTOR_ADDR);
+        __raw_writel(flags, EXYNOS_BOOT_VECTOR_FLAG);
+}
+
+static int exynos_aftr_finisher(unsigned long flags)
+{
+        exynos_set_wakeupmask(0x0000ff3e);
+        exynos_cpu_set_boot_vector(S5P_CHECK_AFTR);
+        /* Set value of power down register for aftr mode */
+        exynos_sys_powerdown_conf(SYS_AFTR);
+        cpu_do_idle();
+
+        return 1;
+}
+
+void exynos_enter_aftr(void)
+{
+        cpu_pm_enter();
+
+        exynos_pm_central_suspend();
+        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
+                exynos_cpu_save_register();
+
+        cpu_suspend(0, exynos_aftr_finisher);
+
+        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) {
+                scu_enable(S5P_VA_SCU);
+                exynos_cpu_restore_register();
+        }
+
+        exynos_pm_central_resume();
+
+        cpu_pm_exit();
+}
+
 static int exynos_cpu_suspend(unsigned long arg)
 {
 #ifdef CONFIG_CACHE_L2X0
@@ -256,37 +250,27 @@ static void exynos_pm_prepare(void)
         unsigned int tmp;
 
         /* Set wake-up mask registers */
-        __raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
-        __raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
+        pmu_raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
+        pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
 
         s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save));
 
         if (soc_is_exynos5250()) {
                 s3c_pm_do_save(exynos5_sys_save, ARRAY_SIZE(exynos5_sys_save));
                 /* Disable USE_RETENTION of JPEG_MEM_OPTION */
-                tmp = __raw_readl(EXYNOS5_JPEG_MEM_OPTION);
+                tmp = pmu_raw_readl(EXYNOS5_JPEG_MEM_OPTION);
                 tmp &= ~EXYNOS5_OPTION_USE_RETENTION;
-                __raw_writel(tmp, EXYNOS5_JPEG_MEM_OPTION);
+                pmu_raw_writel(tmp, EXYNOS5_JPEG_MEM_OPTION);
         }
 
         /* Set value of power down register for sleep mode */
 
         exynos_sys_powerdown_conf(SYS_SLEEP);
-        __raw_writel(S5P_CHECK_SLEEP, S5P_INFORM1);
+        pmu_raw_writel(S5P_CHECK_SLEEP, S5P_INFORM1);
 
         /* ensure at least INFORM0 has the resume address */
 
-        __raw_writel(virt_to_phys(exynos_cpu_resume), S5P_INFORM0);
-}
-
-static void exynos_pm_central_suspend(void)
-{
-        unsigned long tmp;
-
-        /* Setting Central Sequence Register for power down mode */
-        tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
-        tmp &= ~S5P_CENTRAL_LOWPWR_CFG;
-        __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
+        pmu_raw_writel(virt_to_phys(exynos_cpu_resume), S5P_INFORM0);
 }
 
 static int exynos_pm_suspend(void)
@@ -298,54 +282,31 @@ static int exynos_pm_suspend(void)
         /* Setting SEQ_OPTION register */
 
         tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0);
-        __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);
+        pmu_raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);
 
-        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                 exynos_cpu_save_register();
 
         return 0;
 }
 
-static int exynos_pm_central_resume(void)
-{
-        unsigned long tmp;
-
-        /*
-         * If PMU failed while entering sleep mode, WFI will be
-         * ignored by PMU and then exiting cpu_do_idle().
-         * S5P_CENTRAL_LOWPWR_CFG bit will not be set automatically
-         * in this situation.
-         */
-        tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
-        if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) {
-                tmp |= S5P_CENTRAL_LOWPWR_CFG;
-                __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
-                /* clear the wakeup state register */
-                __raw_writel(0x0, S5P_WAKEUP_STAT);
-                /* No need to perform below restore code */
-                return -1;
-        }
-
-        return 0;
-}
-
 static void exynos_pm_resume(void)
 {
         if (exynos_pm_central_resume())
                 goto early_wakeup;
 
-        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                 exynos_cpu_restore_register();
 
         /* For release retention */
 
-        __raw_writel((1 << 28), S5P_PAD_RET_MAUDIO_OPTION);
-        __raw_writel((1 << 28), S5P_PAD_RET_GPIO_OPTION);
-        __raw_writel((1 << 28), S5P_PAD_RET_UART_OPTION);
-        __raw_writel((1 << 28), S5P_PAD_RET_MMCA_OPTION);
-        __raw_writel((1 << 28), S5P_PAD_RET_MMCB_OPTION);
-        __raw_writel((1 << 28), S5P_PAD_RET_EBIA_OPTION);
-        __raw_writel((1 << 28), S5P_PAD_RET_EBIB_OPTION);
+        pmu_raw_writel((1 << 28), S5P_PAD_RET_MAUDIO_OPTION);
+        pmu_raw_writel((1 << 28), S5P_PAD_RET_GPIO_OPTION);
+        pmu_raw_writel((1 << 28), S5P_PAD_RET_UART_OPTION);
+        pmu_raw_writel((1 << 28), S5P_PAD_RET_MMCA_OPTION);
+        pmu_raw_writel((1 << 28), S5P_PAD_RET_MMCB_OPTION);
+        pmu_raw_writel((1 << 28), S5P_PAD_RET_EBIA_OPTION);
+        pmu_raw_writel((1 << 28), S5P_PAD_RET_EBIB_OPTION);
 
         if (soc_is_exynos5250())
                 s3c_pm_do_restore(exynos5_sys_save,
@@ -353,13 +314,13 @@ static void exynos_pm_resume(void)
 
         s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));
 
-        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                 scu_enable(S5P_VA_SCU);
 
 early_wakeup:
 
         /* Clear SLEEP mode set in INFORM1 */
-        __raw_writel(0x0, S5P_INFORM1);
+        pmu_raw_writel(0x0, S5P_INFORM1);
 
         return;
 }
@@ -403,7 +364,7 @@ static int exynos_suspend_enter(suspend_state_t state)
         s3c_pm_restore_uarts();
 
         S3C_PMDBG("%s: wakeup stat: %08x\n", __func__,
-                        __raw_readl(S5P_WAKEUP_STAT));
+                        pmu_raw_readl(S5P_WAKEUP_STAT));
 
         s3c_pm_check_restore();
 
@@ -431,52 +392,17 @@ static const struct platform_suspend_ops exynos_suspend_ops = {
         .valid          = suspend_valid_only_mem,
 };
 
-static int exynos_cpu_pm_notifier(struct notifier_block *self,
-                                  unsigned long cmd, void *v)
-{
-        int cpu = smp_processor_id();
-
-        switch (cmd) {
-        case CPU_PM_ENTER:
-                if (cpu == 0) {
-                        exynos_pm_central_suspend();
-                        if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
-                                exynos_cpu_save_register();
-                }
-                break;
-
-        case CPU_PM_EXIT:
-                if (cpu == 0) {
-                        if (read_cpuid_part_number() ==
-                                        ARM_CPU_PART_CORTEX_A9) {
-                                scu_enable(S5P_VA_SCU);
-                                exynos_cpu_restore_register();
-                        }
-                        exynos_pm_central_resume();
-                }
-                break;
-        }
-
-        return NOTIFY_OK;
-}
-
-static struct notifier_block exynos_cpu_pm_notifier_block = {
-        .notifier_call = exynos_cpu_pm_notifier,
-};
-
 void __init exynos_pm_init(void)
 {
         u32 tmp;
 
-        cpu_pm_register_notifier(&exynos_cpu_pm_notifier_block);
-
         /* Platform-specific GIC callback */
         gic_arch_extn.irq_set_wake = exynos_irq_set_wake;
 
         /* All wakeup disable */
-        tmp = __raw_readl(S5P_WAKEUP_MASK);
+        tmp = pmu_raw_readl(S5P_WAKEUP_MASK);
         tmp |= ((0xFF << 8) | (0x1F << 1));
-        __raw_writel(tmp, S5P_WAKEUP_MASK);
+        pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
 
         register_syscore_ops(&exynos_pm_syscore_ops);
         suspend_set_ops(&exynos_suspend_ops);
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
index 797cb134bfff..fd76e1b5a471 100644
--- a/arch/arm/mach-exynos/pm_domains.c
+++ b/arch/arm/mach-exynos/pm_domains.c
@@ -23,8 +23,7 @@
 #include <linux/of_platform.h>
 #include <linux/sched.h>
 
-#include "regs-pmu.h"
-
+#define INT_LOCAL_PWR_EN        0x7
 #define MAX_CLK_PER_DOMAIN      4
 
 /*
@@ -63,13 +62,13 @@ static int exynos_pd_power(struct generic_pm_domain *domain, bool power_on)
                 }
         }
 
-        pwr = power_on ? S5P_INT_LOCAL_PWR_EN : 0;
+        pwr = power_on ? INT_LOCAL_PWR_EN : 0;
         __raw_writel(pwr, base);
 
         /* Wait max 1ms */
         timeout = 10;
 
-        while ((__raw_readl(base + 0x4) & S5P_INT_LOCAL_PWR_EN) != pwr) {
+        while ((__raw_readl(base + 0x4) & INT_LOCAL_PWR_EN) != pwr) {
                 if (!timeout) {
                         op = (power_on) ? "enable" : "disable";
                         pr_err("Power domain %s %s failed\n", domain->name, op);
@@ -231,7 +230,7 @@ static __init int exynos4_pm_init_power_domain(void)
 no_clk:
                 platform_set_drvdata(pdev, pd);
 
-                on = __raw_readl(pd->base + 0x4) & S5P_INT_LOCAL_PWR_EN;
+                on = __raw_readl(pd->base + 0x4) & INT_LOCAL_PWR_EN;
 
                 pm_genpd_init(&pd->pd, NULL, !on);
         }
diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c
index fb0deda3b3a4..ff9d23f0a7d9 100644
--- a/arch/arm/mach-exynos/pmu.c
+++ b/arch/arm/mach-exynos/pmu.c
@@ -11,7 +11,6 @@
 
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/bug.h>
 
 #include "common.h"
 #include "regs-pmu.h"
@@ -19,7 +18,7 @@
 static const struct exynos_pmu_conf *exynos_pmu_config;
 
 static const struct exynos_pmu_conf exynos4210_pmu_config[] = {
-        /* { .reg = address, .val = { AFTR, LPA, SLEEP } */
+        /* { .offset = offset, .val = { AFTR, LPA, SLEEP } */
         { S5P_ARM_CORE0_LOWPWR,                 { 0x0, 0x0, 0x2 } },
         { S5P_DIS_IRQ_CORE0,                    { 0x0, 0x0, 0x0 } },
         { S5P_DIS_IRQ_CENTRAL0,                 { 0x0, 0x0, 0x0 } },
@@ -213,7 +212,7 @@ static const struct exynos_pmu_conf exynos4412_pmu_config[] = {
 };
 
 static const struct exynos_pmu_conf exynos5250_pmu_config[] = {
-        /* { .reg = address, .val = { AFTR, LPA, SLEEP } */
+        /* { .offset = offset, .val = { AFTR, LPA, SLEEP } */
         { EXYNOS5_ARM_CORE0_SYS_PWR_REG,                { 0x0, 0x0, 0x2} },
         { EXYNOS5_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG,  { 0x0, 0x0, 0x0} },
         { EXYNOS5_DIS_IRQ_ARM_CORE0_CENTRAL_SYS_PWR_REG,        { 0x0, 0x0, 0x0} },
@@ -316,7 +315,7 @@ static const struct exynos_pmu_conf exynos5250_pmu_config[] = {
         { PMU_TABLE_END,},
 };
 
-static void __iomem * const exynos5_list_both_cnt_feed[] = {
+static unsigned int const exynos5_list_both_cnt_feed[] = {
         EXYNOS5_ARM_CORE0_OPTION,
         EXYNOS5_ARM_CORE1_OPTION,
         EXYNOS5_ARM_COMMON_OPTION,
@@ -330,7 +329,7 @@ static void __iomem * const exynos5_list_both_cnt_feed[] = {
         EXYNOS5_TOP_PWR_SYSMEM_OPTION,
 };
 
-static void __iomem * const exynos5_list_diable_wfi_wfe[] = {
+static unsigned int const exynos5_list_diable_wfi_wfe[] = {
         EXYNOS5_ARM_CORE1_OPTION,
         EXYNOS5_FSYS_ARM_OPTION,
         EXYNOS5_ISP_ARM_OPTION,
@@ -345,27 +344,27 @@ static void exynos5_init_pmu(void)
          * Enable both SC_FEEDBACK and SC_COUNTER
          */
         for (i = 0 ; i < ARRAY_SIZE(exynos5_list_both_cnt_feed) ; i++) {
-                tmp = __raw_readl(exynos5_list_both_cnt_feed[i]);
+                tmp = pmu_raw_readl(exynos5_list_both_cnt_feed[i]);
                 tmp |= (EXYNOS5_USE_SC_FEEDBACK |
                         EXYNOS5_USE_SC_COUNTER);
-                __raw_writel(tmp, exynos5_list_both_cnt_feed[i]);
+                pmu_raw_writel(tmp, exynos5_list_both_cnt_feed[i]);
         }
 
         /*
          * SKIP_DEACTIVATE_ACEACP_IN_PWDN_BITFIELD Enable
          */
-        tmp = __raw_readl(EXYNOS5_ARM_COMMON_OPTION);
+        tmp = pmu_raw_readl(EXYNOS5_ARM_COMMON_OPTION);
         tmp |= EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN;
-        __raw_writel(tmp, EXYNOS5_ARM_COMMON_OPTION);
+        pmu_raw_writel(tmp, EXYNOS5_ARM_COMMON_OPTION);
 
         /*
          * Disable WFI/WFE on XXX_OPTION
          */
         for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) {
-                tmp = __raw_readl(exynos5_list_diable_wfi_wfe[i]);
+                tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]);
                 tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE |
                          EXYNOS5_OPTION_USE_STANDBYWFI);
-                __raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]);
+                pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]);
         }
 }
 
@@ -376,14 +375,14 @@ void exynos_sys_powerdown_conf(enum sys_powerdown mode)
         if (soc_is_exynos5250())
                 exynos5_init_pmu();
 
-        for (i = 0; (exynos_pmu_config[i].reg != PMU_TABLE_END) ; i++)
-                __raw_writel(exynos_pmu_config[i].val[mode],
-                                exynos_pmu_config[i].reg);
+        for (i = 0; (exynos_pmu_config[i].offset != PMU_TABLE_END) ; i++)
+                pmu_raw_writel(exynos_pmu_config[i].val[mode],
+                                exynos_pmu_config[i].offset);
 
         if (soc_is_exynos4412()) {
-                for (i = 0; exynos4412_pmu_config[i].reg != PMU_TABLE_END ; i++)
-                        __raw_writel(exynos4412_pmu_config[i].val[mode],
-                                exynos4412_pmu_config[i].reg);
+                for (i = 0; exynos4412_pmu_config[i].offset != PMU_TABLE_END ; i++)
+                        pmu_raw_writel(exynos4412_pmu_config[i].val[mode],
+                                        exynos4412_pmu_config[i].offset);
         }
 }
 
@@ -404,13 +403,13 @@ static int __init exynos_pmu_init(void)
                  * When SYS_WDTRESET is set, watchdog timer reset request
                  * is ignored by power management unit.
                  */
-                value = __raw_readl(EXYNOS5_AUTO_WDTRESET_DISABLE);
+                value = pmu_raw_readl(EXYNOS5_AUTO_WDTRESET_DISABLE);
                 value &= ~EXYNOS5_SYS_WDTRESET;
-                __raw_writel(value, EXYNOS5_AUTO_WDTRESET_DISABLE);
+                pmu_raw_writel(value, EXYNOS5_AUTO_WDTRESET_DISABLE);
 
-                value = __raw_readl(EXYNOS5_MASK_WDTRESET_REQUEST);
+                value = pmu_raw_readl(EXYNOS5_MASK_WDTRESET_REQUEST);
                 value &= ~EXYNOS5_SYS_WDTRESET;
-                __raw_writel(value, EXYNOS5_MASK_WDTRESET_REQUEST);
+                pmu_raw_writel(value, EXYNOS5_MASK_WDTRESET_REQUEST);
 
                 exynos_pmu_config = exynos5250_pmu_config;
                 pr_info("EXYNOS5250 PMU Initialize\n");
diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h
index 1d13b08708f0..96a1569262b5 100644
--- a/arch/arm/mach-exynos/regs-pmu.h
+++ b/arch/arm/mach-exynos/regs-pmu.h
@@ -12,304 +12,298 @@
 #ifndef __ASM_ARCH_REGS_PMU_H
 #define __ASM_ARCH_REGS_PMU_H __FILE__
 
-#include <mach/map.h>
-
-#define S5P_PMUREG(x)                           (S5P_VA_PMU + (x))
-#define S5P_SYSREG(x)                           (S3C_VA_SYS + (x))
-
-#define S5P_CENTRAL_SEQ_CONFIGURATION           S5P_PMUREG(0x0200)
+#define S5P_CENTRAL_SEQ_CONFIGURATION           0x0200
 
 #define S5P_CENTRAL_LOWPWR_CFG                  (1 << 16)
 
-#define S5P_CENTRAL_SEQ_OPTION                  S5P_PMUREG(0x0208)
+#define S5P_CENTRAL_SEQ_OPTION                  0x0208
 
 #define S5P_USE_STANDBY_WFI0                    (1 << 16)
 #define S5P_USE_STANDBY_WFE0                    (1 << 24)
 
-#define EXYNOS_SWRESET                          S5P_PMUREG(0x0400)
-#define EXYNOS5440_SWRESET                      S5P_PMUREG(0x00C4)
+#define EXYNOS_SWRESET                          0x0400
+#define EXYNOS5440_SWRESET                      0x00C4
 
-#define S5P_WAKEUP_STAT                         S5P_PMUREG(0x0600)
-#define S5P_EINT_WAKEUP_MASK                    S5P_PMUREG(0x0604)
-#define S5P_WAKEUP_MASK                         S5P_PMUREG(0x0608)
+#define S5P_WAKEUP_STAT                         0x0600
+#define S5P_EINT_WAKEUP_MASK                    0x0604
+#define S5P_WAKEUP_MASK                         0x0608
 
-#define S5P_INFORM0                             S5P_PMUREG(0x0800)
-#define S5P_INFORM1                             S5P_PMUREG(0x0804)
-#define S5P_INFORM5                             S5P_PMUREG(0x0814)
-#define S5P_INFORM6                             S5P_PMUREG(0x0818)
-#define S5P_INFORM7                             S5P_PMUREG(0x081C)
-#define S5P_PMU_SPARE3                          S5P_PMUREG(0x090C)
+#define S5P_INFORM0                             0x0800
+#define S5P_INFORM1                             0x0804
+#define S5P_INFORM5                             0x0814
+#define S5P_INFORM6                             0x0818
+#define S5P_INFORM7                             0x081C
+#define S5P_PMU_SPARE3                          0x090C
 
-#define S5P_ARM_CORE0_LOWPWR                    S5P_PMUREG(0x1000)
-#define S5P_DIS_IRQ_CORE0                       S5P_PMUREG(0x1004)
-#define S5P_DIS_IRQ_CENTRAL0                    S5P_PMUREG(0x1008)
-#define S5P_ARM_CORE1_LOWPWR                    S5P_PMUREG(0x1010)
-#define S5P_DIS_IRQ_CORE1                       S5P_PMUREG(0x1014)
-#define S5P_DIS_IRQ_CENTRAL1                    S5P_PMUREG(0x1018)
-#define S5P_ARM_COMMON_LOWPWR                   S5P_PMUREG(0x1080)
-#define S5P_L2_0_LOWPWR                         S5P_PMUREG(0x10C0)
-#define S5P_L2_1_LOWPWR                         S5P_PMUREG(0x10C4)
-#define S5P_CMU_ACLKSTOP_LOWPWR                 S5P_PMUREG(0x1100)
-#define S5P_CMU_SCLKSTOP_LOWPWR                 S5P_PMUREG(0x1104)
-#define S5P_CMU_RESET_LOWPWR                    S5P_PMUREG(0x110C)
-#define S5P_APLL_SYSCLK_LOWPWR                  S5P_PMUREG(0x1120)
-#define S5P_MPLL_SYSCLK_LOWPWR                  S5P_PMUREG(0x1124)
-#define S5P_VPLL_SYSCLK_LOWPWR                  S5P_PMUREG(0x1128)
-#define S5P_EPLL_SYSCLK_LOWPWR                  S5P_PMUREG(0x112C)
-#define S5P_CMU_CLKSTOP_GPS_ALIVE_LOWPWR        S5P_PMUREG(0x1138)
-#define S5P_CMU_RESET_GPSALIVE_LOWPWR           S5P_PMUREG(0x113C)
-#define S5P_CMU_CLKSTOP_CAM_LOWPWR              S5P_PMUREG(0x1140)
-#define S5P_CMU_CLKSTOP_TV_LOWPWR               S5P_PMUREG(0x1144)
-#define S5P_CMU_CLKSTOP_MFC_LOWPWR              S5P_PMUREG(0x1148)
-#define S5P_CMU_CLKSTOP_G3D_LOWPWR              S5P_PMUREG(0x114C)
-#define S5P_CMU_CLKSTOP_LCD0_LOWPWR             S5P_PMUREG(0x1150)
-#define S5P_CMU_CLKSTOP_MAUDIO_LOWPWR           S5P_PMUREG(0x1158)
-#define S5P_CMU_CLKSTOP_GPS_LOWPWR              S5P_PMUREG(0x115C)
-#define S5P_CMU_RESET_CAM_LOWPWR                S5P_PMUREG(0x1160)
-#define S5P_CMU_RESET_TV_LOWPWR                 S5P_PMUREG(0x1164)
-#define S5P_CMU_RESET_MFC_LOWPWR                S5P_PMUREG(0x1168)
-#define S5P_CMU_RESET_G3D_LOWPWR                S5P_PMUREG(0x116C)
-#define S5P_CMU_RESET_LCD0_LOWPWR               S5P_PMUREG(0x1170)
-#define S5P_CMU_RESET_MAUDIO_LOWPWR             S5P_PMUREG(0x1178)
-#define S5P_CMU_RESET_GPS_LOWPWR                S5P_PMUREG(0x117C)
-#define S5P_TOP_BUS_LOWPWR                      S5P_PMUREG(0x1180)
-#define S5P_TOP_RETENTION_LOWPWR                S5P_PMUREG(0x1184)
-#define S5P_TOP_PWR_LOWPWR                      S5P_PMUREG(0x1188)
-#define S5P_LOGIC_RESET_LOWPWR                  S5P_PMUREG(0x11A0)
-#define S5P_ONENAND_MEM_LOWPWR                  S5P_PMUREG(0x11C0)
-#define S5P_G2D_ACP_MEM_LOWPWR                  S5P_PMUREG(0x11C8)
-#define S5P_USBOTG_MEM_LOWPWR                   S5P_PMUREG(0x11CC)
-#define S5P_HSMMC_MEM_LOWPWR                    S5P_PMUREG(0x11D0)
-#define S5P_CSSYS_MEM_LOWPWR                    S5P_PMUREG(0x11D4)
-#define S5P_SECSS_MEM_LOWPWR                    S5P_PMUREG(0x11D8)
-#define S5P_PAD_RETENTION_DRAM_LOWPWR           S5P_PMUREG(0x1200)
-#define S5P_PAD_RETENTION_MAUDIO_LOWPWR         S5P_PMUREG(0x1204)
-#define S5P_PAD_RETENTION_GPIO_LOWPWR           S5P_PMUREG(0x1220)
-#define S5P_PAD_RETENTION_UART_LOWPWR           S5P_PMUREG(0x1224)
-#define S5P_PAD_RETENTION_MMCA_LOWPWR           S5P_PMUREG(0x1228)
-#define S5P_PAD_RETENTION_MMCB_LOWPWR           S5P_PMUREG(0x122C)
-#define S5P_PAD_RETENTION_EBIA_LOWPWR           S5P_PMUREG(0x1230)
-#define S5P_PAD_RETENTION_EBIB_LOWPWR           S5P_PMUREG(0x1234)
-#define S5P_PAD_RETENTION_ISOLATION_LOWPWR      S5P_PMUREG(0x1240)
-#define S5P_PAD_RETENTION_ALV_SEL_LOWPWR        S5P_PMUREG(0x1260)
-#define S5P_XUSBXTI_LOWPWR                      S5P_PMUREG(0x1280)
-#define S5P_XXTI_LOWPWR                         S5P_PMUREG(0x1284)
-#define S5P_EXT_REGULATOR_LOWPWR                S5P_PMUREG(0x12C0)
-#define S5P_GPIO_MODE_LOWPWR                    S5P_PMUREG(0x1300)
-#define S5P_GPIO_MODE_MAUDIO_LOWPWR             S5P_PMUREG(0x1340)
-#define S5P_CAM_LOWPWR                          S5P_PMUREG(0x1380)
-#define S5P_TV_LOWPWR                           S5P_PMUREG(0x1384)
-#define S5P_MFC_LOWPWR                          S5P_PMUREG(0x1388)
-#define S5P_G3D_LOWPWR                          S5P_PMUREG(0x138C)
-#define S5P_LCD0_LOWPWR                         S5P_PMUREG(0x1390)
-#define S5P_MAUDIO_LOWPWR                       S5P_PMUREG(0x1398)
-#define S5P_GPS_LOWPWR                          S5P_PMUREG(0x139C)
-#define S5P_GPS_ALIVE_LOWPWR                    S5P_PMUREG(0x13A0)
+#define S5P_ARM_CORE0_LOWPWR                    0x1000
+#define S5P_DIS_IRQ_CORE0                       0x1004
+#define S5P_DIS_IRQ_CENTRAL0                    0x1008
+#define S5P_ARM_CORE1_LOWPWR                    0x1010
+#define S5P_DIS_IRQ_CORE1                       0x1014
+#define S5P_DIS_IRQ_CENTRAL1                    0x1018
+#define S5P_ARM_COMMON_LOWPWR                   0x1080
+#define S5P_L2_0_LOWPWR                         0x10C0
+#define S5P_L2_1_LOWPWR                         0x10C4
+#define S5P_CMU_ACLKSTOP_LOWPWR                 0x1100
+#define S5P_CMU_SCLKSTOP_LOWPWR                 0x1104
+#define S5P_CMU_RESET_LOWPWR                    0x110C
+#define S5P_APLL_SYSCLK_LOWPWR                  0x1120
+#define S5P_MPLL_SYSCLK_LOWPWR                  0x1124
+#define S5P_VPLL_SYSCLK_LOWPWR                  0x1128
+#define S5P_EPLL_SYSCLK_LOWPWR                  0x112C
+#define S5P_CMU_CLKSTOP_GPS_ALIVE_LOWPWR        0x1138
+#define S5P_CMU_RESET_GPSALIVE_LOWPWR           0x113C
+#define S5P_CMU_CLKSTOP_CAM_LOWPWR              0x1140
+#define S5P_CMU_CLKSTOP_TV_LOWPWR               0x1144
+#define S5P_CMU_CLKSTOP_MFC_LOWPWR              0x1148
+#define S5P_CMU_CLKSTOP_G3D_LOWPWR              0x114C
+#define S5P_CMU_CLKSTOP_LCD0_LOWPWR             0x1150
+#define S5P_CMU_CLKSTOP_MAUDIO_LOWPWR           0x1158
+#define S5P_CMU_CLKSTOP_GPS_LOWPWR              0x115C
+#define S5P_CMU_RESET_CAM_LOWPWR                0x1160
+#define S5P_CMU_RESET_TV_LOWPWR                 0x1164
+#define S5P_CMU_RESET_MFC_LOWPWR                0x1168
+#define S5P_CMU_RESET_G3D_LOWPWR                0x116C
+#define S5P_CMU_RESET_LCD0_LOWPWR               0x1170
+#define S5P_CMU_RESET_MAUDIO_LOWPWR             0x1178
+#define S5P_CMU_RESET_GPS_LOWPWR                0x117C
+#define S5P_TOP_BUS_LOWPWR                      0x1180
+#define S5P_TOP_RETENTION_LOWPWR                0x1184
+#define S5P_TOP_PWR_LOWPWR                      0x1188
+#define S5P_LOGIC_RESET_LOWPWR                  0x11A0
+#define S5P_ONENAND_MEM_LOWPWR                  0x11C0
+#define S5P_G2D_ACP_MEM_LOWPWR                  0x11C8
+#define S5P_USBOTG_MEM_LOWPWR                   0x11CC
+#define S5P_HSMMC_MEM_LOWPWR                    0x11D0
+#define S5P_CSSYS_MEM_LOWPWR                    0x11D4
+#define S5P_SECSS_MEM_LOWPWR                    0x11D8
+#define S5P_PAD_RETENTION_DRAM_LOWPWR           0x1200
+#define S5P_PAD_RETENTION_MAUDIO_LOWPWR         0x1204
+#define S5P_PAD_RETENTION_GPIO_LOWPWR           0x1220
+#define S5P_PAD_RETENTION_UART_LOWPWR           0x1224
+#define S5P_PAD_RETENTION_MMCA_LOWPWR           0x1228
+#define S5P_PAD_RETENTION_MMCB_LOWPWR           0x122C
+#define S5P_PAD_RETENTION_EBIA_LOWPWR           0x1230
+#define S5P_PAD_RETENTION_EBIB_LOWPWR           0x1234
+#define S5P_PAD_RETENTION_ISOLATION_LOWPWR      0x1240
+#define S5P_PAD_RETENTION_ALV_SEL_LOWPWR        0x1260
+#define S5P_XUSBXTI_LOWPWR                      0x1280
+#define S5P_XXTI_LOWPWR                         0x1284
+#define S5P_EXT_REGULATOR_LOWPWR                0x12C0
+#define S5P_GPIO_MODE_LOWPWR                    0x1300
+#define S5P_GPIO_MODE_MAUDIO_LOWPWR             0x1340
+#define S5P_CAM_LOWPWR                          0x1380
+#define S5P_TV_LOWPWR                           0x1384
+#define S5P_MFC_LOWPWR                          0x1388
+#define S5P_G3D_LOWPWR                          0x138C
+#define S5P_LCD0_LOWPWR                         0x1390
+#define S5P_MAUDIO_LOWPWR                       0x1398
+#define S5P_GPS_LOWPWR                          0x139C
+#define S5P_GPS_ALIVE_LOWPWR                    0x13A0
 
-#define EXYNOS_ARM_CORE0_CONFIGURATION          S5P_PMUREG(0x2000)
+#define EXYNOS_ARM_CORE0_CONFIGURATION          0x2000
 #define EXYNOS_ARM_CORE_CONFIGURATION(_nr)      \
                         (EXYNOS_ARM_CORE0_CONFIGURATION + (0x80 * (_nr)))
 #define EXYNOS_ARM_CORE_STATUS(_nr)             \
                         (EXYNOS_ARM_CORE_CONFIGURATION(_nr) + 0x4)
 
-#define EXYNOS_ARM_COMMON_CONFIGURATION         S5P_PMUREG(0x2500)
+#define EXYNOS_ARM_COMMON_CONFIGURATION         0x2500
 #define EXYNOS_COMMON_CONFIGURATION(_nr)        \
                         (EXYNOS_ARM_COMMON_CONFIGURATION + (0x80 * (_nr)))
 #define EXYNOS_COMMON_STATUS(_nr)               \
                         (EXYNOS_COMMON_CONFIGURATION(_nr) + 0x4)
+#define EXYNOS_COMMON_OPTION(_nr)               \
+                        (EXYNOS_COMMON_CONFIGURATION(_nr) + 0x8)
 
-#define S5P_PAD_RET_MAUDIO_OPTION               S5P_PMUREG(0x3028)
-#define S5P_PAD_RET_GPIO_OPTION                 S5P_PMUREG(0x3108)
-#define S5P_PAD_RET_UART_OPTION                 S5P_PMUREG(0x3128)
-#define S5P_PAD_RET_MMCA_OPTION                 S5P_PMUREG(0x3148)
-#define S5P_PAD_RET_MMCB_OPTION                 S5P_PMUREG(0x3168)
-#define S5P_PAD_RET_EBIA_OPTION                 S5P_PMUREG(0x3188)
-#define S5P_PAD_RET_EBIB_OPTION                 S5P_PMUREG(0x31A8)
+#define S5P_PAD_RET_MAUDIO_OPTION               0x3028
+#define S5P_PAD_RET_GPIO_OPTION                 0x3108
+#define S5P_PAD_RET_UART_OPTION                 0x3128
+#define S5P_PAD_RET_MMCA_OPTION                 0x3148
+#define S5P_PAD_RET_MMCB_OPTION                 0x3168
+#define S5P_PAD_RET_EBIA_OPTION                 0x3188
+#define S5P_PAD_RET_EBIB_OPTION                 0x31A8
 
 #define S5P_CORE_LOCAL_PWR_EN                   0x3
-#define S5P_INT_LOCAL_PWR_EN                    0x7
 
 /* Only for EXYNOS4210 */
-#define S5P_CMU_CLKSTOP_LCD1_LOWPWR     S5P_PMUREG(0x1154)
-#define S5P_CMU_RESET_LCD1_LOWPWR       S5P_PMUREG(0x1174)
-#define S5P_MODIMIF_MEM_LOWPWR          S5P_PMUREG(0x11C4)
-#define S5P_PCIE_MEM_LOWPWR             S5P_PMUREG(0x11E0)
-#define S5P_SATA_MEM_LOWPWR             S5P_PMUREG(0x11E4)
-#define S5P_LCD1_LOWPWR                 S5P_PMUREG(0x1394)
+#define S5P_CMU_CLKSTOP_LCD1_LOWPWR     0x1154
+#define S5P_CMU_RESET_LCD1_LOWPWR       0x1174
+#define S5P_MODIMIF_MEM_LOWPWR          0x11C4
+#define S5P_PCIE_MEM_LOWPWR             0x11E0
+#define S5P_SATA_MEM_LOWPWR             0x11E4
+#define S5P_LCD1_LOWPWR                 0x1394
 
 /* Only for EXYNOS4x12 */
-#define S5P_ISP_ARM_LOWPWR                      S5P_PMUREG(0x1050)
-#define S5P_DIS_IRQ_ISP_ARM_LOCAL_LOWPWR        S5P_PMUREG(0x1054)
-#define S5P_DIS_IRQ_ISP_ARM_CENTRAL_LOWPWR      S5P_PMUREG(0x1058)
-#define S5P_CMU_ACLKSTOP_COREBLK_LOWPWR         S5P_PMUREG(0x1110)
-#define S5P_CMU_SCLKSTOP_COREBLK_LOWPWR         S5P_PMUREG(0x1114)
-#define S5P_CMU_RESET_COREBLK_LOWPWR            S5P_PMUREG(0x111C)
-#define S5P_MPLLUSER_SYSCLK_LOWPWR              S5P_PMUREG(0x1130)
-#define S5P_CMU_CLKSTOP_ISP_LOWPWR              S5P_PMUREG(0x1154)
-#define S5P_CMU_RESET_ISP_LOWPWR                S5P_PMUREG(0x1174)
-#define S5P_TOP_BUS_COREBLK_LOWPWR              S5P_PMUREG(0x1190)
-#define S5P_TOP_RETENTION_COREBLK_LOWPWR        S5P_PMUREG(0x1194)
-#define S5P_TOP_PWR_COREBLK_LOWPWR              S5P_PMUREG(0x1198)
-#define S5P_OSCCLK_GATE_LOWPWR                  S5P_PMUREG(0x11A4)
-#define S5P_LOGIC_RESET_COREBLK_LOWPWR          S5P_PMUREG(0x11B0)
-#define S5P_OSCCLK_GATE_COREBLK_LOWPWR          S5P_PMUREG(0x11B4)
-#define S5P_HSI_MEM_LOWPWR                      S5P_PMUREG(0x11C4)
-#define S5P_ROTATOR_MEM_LOWPWR                  S5P_PMUREG(0x11DC)
-#define S5P_PAD_RETENTION_GPIO_COREBLK_LOWPWR   S5P_PMUREG(0x123C)
-#define S5P_PAD_ISOLATION_COREBLK_LOWPWR        S5P_PMUREG(0x1250)
-#define S5P_GPIO_MODE_COREBLK_LOWPWR            S5P_PMUREG(0x1320)
-#define S5P_TOP_ASB_RESET_LOWPWR                S5P_PMUREG(0x1344)
-#define S5P_TOP_ASB_ISOLATION_LOWPWR            S5P_PMUREG(0x1348)
-#define S5P_ISP_LOWPWR                          S5P_PMUREG(0x1394)
-#define S5P_DRAM_FREQ_DOWN_LOWPWR               S5P_PMUREG(0x13B0)
-#define S5P_DDRPHY_DLLOFF_LOWPWR                S5P_PMUREG(0x13B4)
-#define S5P_CMU_SYSCLK_ISP_LOWPWR               S5P_PMUREG(0x13B8)
-#define S5P_CMU_SYSCLK_GPS_LOWPWR               S5P_PMUREG(0x13BC)
-#define S5P_LPDDR_PHY_DLL_LOCK_LOWPWR           S5P_PMUREG(0x13C0)
+#define S5P_ISP_ARM_LOWPWR                      0x1050
+#define S5P_DIS_IRQ_ISP_ARM_LOCAL_LOWPWR        0x1054
+#define S5P_DIS_IRQ_ISP_ARM_CENTRAL_LOWPWR      0x1058
+#define S5P_CMU_ACLKSTOP_COREBLK_LOWPWR         0x1110
+#define S5P_CMU_SCLKSTOP_COREBLK_LOWPWR         0x1114
+#define S5P_CMU_RESET_COREBLK_LOWPWR            0x111C
+#define S5P_MPLLUSER_SYSCLK_LOWPWR              0x1130
+#define S5P_CMU_CLKSTOP_ISP_LOWPWR              0x1154
+#define S5P_CMU_RESET_ISP_LOWPWR                0x1174
+#define S5P_TOP_BUS_COREBLK_LOWPWR              0x1190
+#define S5P_TOP_RETENTION_COREBLK_LOWPWR        0x1194
+#define S5P_TOP_PWR_COREBLK_LOWPWR              0x1198
+#define S5P_OSCCLK_GATE_LOWPWR                  0x11A4
+#define S5P_LOGIC_RESET_COREBLK_LOWPWR          0x11B0
+#define S5P_OSCCLK_GATE_COREBLK_LOWPWR          0x11B4
+#define S5P_HSI_MEM_LOWPWR                      0x11C4
+#define S5P_ROTATOR_MEM_LOWPWR                  0x11DC
+#define S5P_PAD_RETENTION_GPIO_COREBLK_LOWPWR   0x123C
+#define S5P_PAD_ISOLATION_COREBLK_LOWPWR        0x1250
+#define S5P_GPIO_MODE_COREBLK_LOWPWR            0x1320
+#define S5P_TOP_ASB_RESET_LOWPWR                0x1344
+#define S5P_TOP_ASB_ISOLATION_LOWPWR            0x1348
+#define S5P_ISP_LOWPWR                          0x1394
+#define S5P_DRAM_FREQ_DOWN_LOWPWR               0x13B0
+#define S5P_DDRPHY_DLLOFF_LOWPWR                0x13B4
+#define S5P_CMU_SYSCLK_ISP_LOWPWR               0x13B8
+#define S5P_CMU_SYSCLK_GPS_LOWPWR               0x13BC
+#define S5P_LPDDR_PHY_DLL_LOCK_LOWPWR           0x13C0
 
-#define S5P_ARM_L2_0_OPTION                     S5P_PMUREG(0x2608)
-#define S5P_ARM_L2_1_OPTION                     S5P_PMUREG(0x2628)
-#define S5P_ONENAND_MEM_OPTION                  S5P_PMUREG(0x2E08)
-#define S5P_HSI_MEM_OPTION                      S5P_PMUREG(0x2E28)
-#define S5P_G2D_ACP_MEM_OPTION                  S5P_PMUREG(0x2E48)
-#define S5P_USBOTG_MEM_OPTION                   S5P_PMUREG(0x2E68)
-#define S5P_HSMMC_MEM_OPTION                    S5P_PMUREG(0x2E88)
-#define S5P_CSSYS_MEM_OPTION                    S5P_PMUREG(0x2EA8)
-#define S5P_SECSS_MEM_OPTION                    S5P_PMUREG(0x2EC8)
-#define S5P_ROTATOR_MEM_OPTION                  S5P_PMUREG(0x2F48)
+#define S5P_ARM_L2_0_OPTION                     0x2608
+#define S5P_ARM_L2_1_OPTION                     0x2628
+#define S5P_ONENAND_MEM_OPTION                  0x2E08
+#define S5P_HSI_MEM_OPTION                      0x2E28
+#define S5P_G2D_ACP_MEM_OPTION                  0x2E48
+#define S5P_USBOTG_MEM_OPTION                   0x2E68
+#define S5P_HSMMC_MEM_OPTION                    0x2E88
+#define S5P_CSSYS_MEM_OPTION                    0x2EA8
+#define S5P_SECSS_MEM_OPTION                    0x2EC8
+#define S5P_ROTATOR_MEM_OPTION                  0x2F48
 
 /* Only for EXYNOS4412 */
-#define S5P_ARM_CORE2_LOWPWR                    S5P_PMUREG(0x1020)
-#define S5P_DIS_IRQ_CORE2                       S5P_PMUREG(0x1024)
-#define S5P_DIS_IRQ_CENTRAL2                    S5P_PMUREG(0x1028)
-#define S5P_ARM_CORE3_LOWPWR                    S5P_PMUREG(0x1030)
-#define S5P_DIS_IRQ_CORE3                       S5P_PMUREG(0x1034)
-#define S5P_DIS_IRQ_CENTRAL3                    S5P_PMUREG(0x1038)
+#define S5P_ARM_CORE2_LOWPWR                    0x1020
+#define S5P_DIS_IRQ_CORE2                       0x1024
+#define S5P_DIS_IRQ_CENTRAL2                    0x1028
+#define S5P_ARM_CORE3_LOWPWR                    0x1030
+#define S5P_DIS_IRQ_CORE3                       0x1034
+#define S5P_DIS_IRQ_CENTRAL3                    0x1038
 
 /* For EXYNOS5 */
 
-#define EXYNOS5_SYS_I2C_CFG                                     S5P_SYSREG(0x0234)
-
-#define EXYNOS5_AUTO_WDTRESET_DISABLE                           S5P_PMUREG(0x0408)
-#define EXYNOS5_MASK_WDTRESET_REQUEST                           S5P_PMUREG(0x040C)
+#define EXYNOS5_AUTO_WDTRESET_DISABLE                           0x0408
+#define EXYNOS5_MASK_WDTRESET_REQUEST                           0x040C
 
 #define EXYNOS5_SYS_WDTRESET                                    (1 << 20)
 
-#define EXYNOS5_ARM_CORE0_SYS_PWR_REG                           S5P_PMUREG(0x1000)
-#define EXYNOS5_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG             S5P_PMUREG(0x1004)
-#define EXYNOS5_DIS_IRQ_ARM_CORE0_CENTRAL_SYS_PWR_REG           S5P_PMUREG(0x1008)
-#define EXYNOS5_ARM_CORE1_SYS_PWR_REG                           S5P_PMUREG(0x1010)
-#define EXYNOS5_DIS_IRQ_ARM_CORE1_LOCAL_SYS_PWR_REG             S5P_PMUREG(0x1014)
-#define EXYNOS5_DIS_IRQ_ARM_CORE1_CENTRAL_SYS_PWR_REG           S5P_PMUREG(0x1018)
-#define EXYNOS5_FSYS_ARM_SYS_PWR_REG                            S5P_PMUREG(0x1040)
-#define EXYNOS5_DIS_IRQ_FSYS_ARM_CENTRAL_SYS_PWR_REG            S5P_PMUREG(0x1048)
-#define EXYNOS5_ISP_ARM_SYS_PWR_REG                             S5P_PMUREG(0x1050)
-#define EXYNOS5_DIS_IRQ_ISP_ARM_LOCAL_SYS_PWR_REG               S5P_PMUREG(0x1054)
-#define EXYNOS5_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG             S5P_PMUREG(0x1058)
-#define EXYNOS5_ARM_COMMON_SYS_PWR_REG                          S5P_PMUREG(0x1080)
-#define EXYNOS5_ARM_L2_SYS_PWR_REG                              S5P_PMUREG(0x10C0)
-#define EXYNOS5_CMU_ACLKSTOP_SYS_PWR_REG                        S5P_PMUREG(0x1100)
-#define EXYNOS5_CMU_SCLKSTOP_SYS_PWR_REG                        S5P_PMUREG(0x1104)
-#define EXYNOS5_CMU_RESET_SYS_PWR_REG                           S5P_PMUREG(0x110C)
-#define EXYNOS5_CMU_ACLKSTOP_SYSMEM_SYS_PWR_REG                 S5P_PMUREG(0x1120)
-#define EXYNOS5_CMU_SCLKSTOP_SYSMEM_SYS_PWR_REG                 S5P_PMUREG(0x1124)
-#define EXYNOS5_CMU_RESET_SYSMEM_SYS_PWR_REG                    S5P_PMUREG(0x112C)
-#define EXYNOS5_DRAM_FREQ_DOWN_SYS_PWR_REG                      S5P_PMUREG(0x1130)
-#define EXYNOS5_DDRPHY_DLLOFF_SYS_PWR_REG                       S5P_PMUREG(0x1134)
-#define EXYNOS5_DDRPHY_DLLLOCK_SYS_PWR_REG                      S5P_PMUREG(0x1138)
-#define EXYNOS5_APLL_SYSCLK_SYS_PWR_REG                         S5P_PMUREG(0x1140)
-#define EXYNOS5_MPLL_SYSCLK_SYS_PWR_REG                         S5P_PMUREG(0x1144)
-#define EXYNOS5_VPLL_SYSCLK_SYS_PWR_REG                         S5P_PMUREG(0x1148)
-#define EXYNOS5_EPLL_SYSCLK_SYS_PWR_REG                         S5P_PMUREG(0x114C)
-#define EXYNOS5_BPLL_SYSCLK_SYS_PWR_REG                         S5P_PMUREG(0x1150)
-#define EXYNOS5_CPLL_SYSCLK_SYS_PWR_REG                         S5P_PMUREG(0x1154)
-#define EXYNOS5_MPLLUSER_SYSCLK_SYS_PWR_REG                     S5P_PMUREG(0x1164)
-#define EXYNOS5_BPLLUSER_SYSCLK_SYS_PWR_REG                     S5P_PMUREG(0x1170)
-#define EXYNOS5_TOP_BUS_SYS_PWR_REG                             S5P_PMUREG(0x1180)
-#define EXYNOS5_TOP_RETENTION_SYS_PWR_REG                       S5P_PMUREG(0x1184)
-#define EXYNOS5_TOP_PWR_SYS_PWR_REG                             S5P_PMUREG(0x1188)
-#define EXYNOS5_TOP_BUS_SYSMEM_SYS_PWR_REG                      S5P_PMUREG(0x1190)
-#define EXYNOS5_TOP_RETENTION_SYSMEM_SYS_PWR_REG                S5P_PMUREG(0x1194)
-#define EXYNOS5_TOP_PWR_SYSMEM_SYS_PWR_REG                      S5P_PMUREG(0x1198)
-#define EXYNOS5_LOGIC_RESET_SYS_PWR_REG                         S5P_PMUREG(0x11A0)
-#define EXYNOS5_OSCCLK_GATE_SYS_PWR_REG                         S5P_PMUREG(0x11A4)
-#define EXYNOS5_LOGIC_RESET_SYSMEM_SYS_PWR_REG                  S5P_PMUREG(0x11B0)
-#define EXYNOS5_OSCCLK_GATE_SYSMEM_SYS_PWR_REG                  S5P_PMUREG(0x11B4)
-#define EXYNOS5_USBOTG_MEM_SYS_PWR_REG                          S5P_PMUREG(0x11C0)
-#define EXYNOS5_G2D_MEM_SYS_PWR_REG                             S5P_PMUREG(0x11C8)
-#define EXYNOS5_USBDRD_MEM_SYS_PWR_REG                          S5P_PMUREG(0x11CC)
-#define EXYNOS5_SDMMC_MEM_SYS_PWR_REG                           S5P_PMUREG(0x11D0)
-#define EXYNOS5_CSSYS_MEM_SYS_PWR_REG                           S5P_PMUREG(0x11D4)
-#define EXYNOS5_SECSS_MEM_SYS_PWR_REG                           S5P_PMUREG(0x11D8)
-#define EXYNOS5_ROTATOR_MEM_SYS_PWR_REG                         S5P_PMUREG(0x11DC)
-#define EXYNOS5_INTRAM_MEM_SYS_PWR_REG                          S5P_PMUREG(0x11E0)
-#define EXYNOS5_INTROM_MEM_SYS_PWR_REG                          S5P_PMUREG(0x11E4)
-#define EXYNOS5_JPEG_MEM_SYS_PWR_REG                            S5P_PMUREG(0x11E8)
-#define EXYNOS5_HSI_MEM_SYS_PWR_REG                             S5P_PMUREG(0x11EC)
-#define EXYNOS5_MCUIOP_MEM_SYS_PWR_REG                          S5P_PMUREG(0x11F4)
-#define EXYNOS5_SATA_MEM_SYS_PWR_REG                            S5P_PMUREG(0x11FC)
-#define EXYNOS5_PAD_RETENTION_DRAM_SYS_PWR_REG                  S5P_PMUREG(0x1200)
-#define EXYNOS5_PAD_RETENTION_MAU_SYS_PWR_REG                   S5P_PMUREG(0x1204)
-#define EXYNOS5_PAD_RETENTION_EFNAND_SYS_PWR_REG                S5P_PMUREG(0x1208)
-#define EXYNOS5_PAD_RETENTION_GPIO_SYS_PWR_REG                  S5P_PMUREG(0x1220)
-#define EXYNOS5_PAD_RETENTION_UART_SYS_PWR_REG                  S5P_PMUREG(0x1224)
-#define EXYNOS5_PAD_RETENTION_MMCA_SYS_PWR_REG                  S5P_PMUREG(0x1228)
-#define EXYNOS5_PAD_RETENTION_MMCB_SYS_PWR_REG                  S5P_PMUREG(0x122C)
-#define EXYNOS5_PAD_RETENTION_EBIA_SYS_PWR_REG                  S5P_PMUREG(0x1230)
-#define EXYNOS5_PAD_RETENTION_EBIB_SYS_PWR_REG                  S5P_PMUREG(0x1234)
-#define EXYNOS5_PAD_RETENTION_SPI_SYS_PWR_REG                   S5P_PMUREG(0x1238)
-#define EXYNOS5_PAD_RETENTION_GPIO_SYSMEM_SYS_PWR_REG           S5P_PMUREG(0x123C)
-#define EXYNOS5_PAD_ISOLATION_SYS_PWR_REG                       S5P_PMUREG(0x1240)
-#define EXYNOS5_PAD_ISOLATION_SYSMEM_SYS_PWR_REG                S5P_PMUREG(0x1250)
-#define EXYNOS5_PAD_ALV_SEL_SYS_PWR_REG                         S5P_PMUREG(0x1260)
-#define EXYNOS5_XUSBXTI_SYS_PWR_REG                             S5P_PMUREG(0x1280)
-#define EXYNOS5_XXTI_SYS_PWR_REG                                S5P_PMUREG(0x1284)
-#define EXYNOS5_EXT_REGULATOR_SYS_PWR_REG                       S5P_PMUREG(0x12C0)
-#define EXYNOS5_GPIO_MODE_SYS_PWR_REG                           S5P_PMUREG(0x1300)
-#define EXYNOS5_GPIO_MODE_SYSMEM_SYS_PWR_REG                    S5P_PMUREG(0x1320)
-#define EXYNOS5_GPIO_MODE_MAU_SYS_PWR_REG                       S5P_PMUREG(0x1340)
-#define EXYNOS5_TOP_ASB_RESET_SYS_PWR_REG                       S5P_PMUREG(0x1344)
-#define EXYNOS5_TOP_ASB_ISOLATION_SYS_PWR_REG                   S5P_PMUREG(0x1348)
-#define EXYNOS5_GSCL_SYS_PWR_REG                                S5P_PMUREG(0x1400)
-#define EXYNOS5_ISP_SYS_PWR_REG                                 S5P_PMUREG(0x1404)
-#define EXYNOS5_MFC_SYS_PWR_REG                                 S5P_PMUREG(0x1408)
-#define EXYNOS5_G3D_SYS_PWR_REG                                 S5P_PMUREG(0x140C)
-#define EXYNOS5_DISP1_SYS_PWR_REG                               S5P_PMUREG(0x1414)
-#define EXYNOS5_MAU_SYS_PWR_REG                                 S5P_PMUREG(0x1418)
-#define EXYNOS5_CMU_CLKSTOP_GSCL_SYS_PWR_REG                    S5P_PMUREG(0x1480)
-#define EXYNOS5_CMU_CLKSTOP_ISP_SYS_PWR_REG                     S5P_PMUREG(0x1484)
-#define EXYNOS5_CMU_CLKSTOP_MFC_SYS_PWR_REG                     S5P_PMUREG(0x1488)
-#define EXYNOS5_CMU_CLKSTOP_G3D_SYS_PWR_REG                     S5P_PMUREG(0x148C)
-#define EXYNOS5_CMU_CLKSTOP_DISP1_SYS_PWR_REG                   S5P_PMUREG(0x1494)
-#define EXYNOS5_CMU_CLKSTOP_MAU_SYS_PWR_REG                     S5P_PMUREG(0x1498)
-#define EXYNOS5_CMU_SYSCLK_GSCL_SYS_PWR_REG                     S5P_PMUREG(0x14C0)
-#define EXYNOS5_CMU_SYSCLK_ISP_SYS_PWR_REG                      S5P_PMUREG(0x14C4)
-#define EXYNOS5_CMU_SYSCLK_MFC_SYS_PWR_REG                      S5P_PMUREG(0x14C8)
-#define EXYNOS5_CMU_SYSCLK_G3D_SYS_PWR_REG                      S5P_PMUREG(0x14CC)
-#define EXYNOS5_CMU_SYSCLK_DISP1_SYS_PWR_REG                    S5P_PMUREG(0x14D4)
-#define EXYNOS5_CMU_SYSCLK_MAU_SYS_PWR_REG                      S5P_PMUREG(0x14D8)
-#define EXYNOS5_CMU_RESET_GSCL_SYS_PWR_REG                      S5P_PMUREG(0x1580)
-#define EXYNOS5_CMU_RESET_ISP_SYS_PWR_REG                       S5P_PMUREG(0x1584)
-#define EXYNOS5_CMU_RESET_MFC_SYS_PWR_REG                       S5P_PMUREG(0x1588)
-#define EXYNOS5_CMU_RESET_G3D_SYS_PWR_REG                       S5P_PMUREG(0x158C)
-#define EXYNOS5_CMU_RESET_DISP1_SYS_PWR_REG                     S5P_PMUREG(0x1594)
-#define EXYNOS5_CMU_RESET_MAU_SYS_PWR_REG                       S5P_PMUREG(0x1598)
+#define EXYNOS5_ARM_CORE0_SYS_PWR_REG                           0x1000
+#define EXYNOS5_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG             0x1004
+#define EXYNOS5_DIS_IRQ_ARM_CORE0_CENTRAL_SYS_PWR_REG           0x1008
+#define EXYNOS5_ARM_CORE1_SYS_PWR_REG                           0x1010
+#define EXYNOS5_DIS_IRQ_ARM_CORE1_LOCAL_SYS_PWR_REG             0x1014
+#define EXYNOS5_DIS_IRQ_ARM_CORE1_CENTRAL_SYS_PWR_REG           0x1018
+#define EXYNOS5_FSYS_ARM_SYS_PWR_REG                            0x1040
+#define EXYNOS5_DIS_IRQ_FSYS_ARM_CENTRAL_SYS_PWR_REG            0x1048
+#define EXYNOS5_ISP_ARM_SYS_PWR_REG                             0x1050
+#define EXYNOS5_DIS_IRQ_ISP_ARM_LOCAL_SYS_PWR_REG               0x1054
+#define EXYNOS5_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG             0x1058
+#define EXYNOS5_ARM_COMMON_SYS_PWR_REG                          0x1080
+#define EXYNOS5_ARM_L2_SYS_PWR_REG                              0x10C0
+#define EXYNOS5_CMU_ACLKSTOP_SYS_PWR_REG                        0x1100
+#define EXYNOS5_CMU_SCLKSTOP_SYS_PWR_REG                        0x1104
+#define EXYNOS5_CMU_RESET_SYS_PWR_REG                           0x110C
+#define EXYNOS5_CMU_ACLKSTOP_SYSMEM_SYS_PWR_REG                 0x1120
+#define EXYNOS5_CMU_SCLKSTOP_SYSMEM_SYS_PWR_REG                 0x1124
+#define EXYNOS5_CMU_RESET_SYSMEM_SYS_PWR_REG                    0x112C
+#define EXYNOS5_DRAM_FREQ_DOWN_SYS_PWR_REG                      0x1130
+#define EXYNOS5_DDRPHY_DLLOFF_SYS_PWR_REG                       0x1134
+#define EXYNOS5_DDRPHY_DLLLOCK_SYS_PWR_REG                      0x1138
+#define EXYNOS5_APLL_SYSCLK_SYS_PWR_REG                         0x1140
+#define EXYNOS5_MPLL_SYSCLK_SYS_PWR_REG                         0x1144
+#define EXYNOS5_VPLL_SYSCLK_SYS_PWR_REG                         0x1148
+#define EXYNOS5_EPLL_SYSCLK_SYS_PWR_REG                         0x114C
+#define EXYNOS5_BPLL_SYSCLK_SYS_PWR_REG                         0x1150
+#define EXYNOS5_CPLL_SYSCLK_SYS_PWR_REG                         0x1154
+#define EXYNOS5_MPLLUSER_SYSCLK_SYS_PWR_REG                     0x1164
+#define EXYNOS5_BPLLUSER_SYSCLK_SYS_PWR_REG                     0x1170
+#define EXYNOS5_TOP_BUS_SYS_PWR_REG                             0x1180
+#define EXYNOS5_TOP_RETENTION_SYS_PWR_REG                       0x1184
+#define EXYNOS5_TOP_PWR_SYS_PWR_REG                             0x1188
+#define EXYNOS5_TOP_BUS_SYSMEM_SYS_PWR_REG                      0x1190
+#define EXYNOS5_TOP_RETENTION_SYSMEM_SYS_PWR_REG                0x1194
+#define EXYNOS5_TOP_PWR_SYSMEM_SYS_PWR_REG                      0x1198
+#define EXYNOS5_LOGIC_RESET_SYS_PWR_REG                         0x11A0
+#define EXYNOS5_OSCCLK_GATE_SYS_PWR_REG                         0x11A4
+#define EXYNOS5_LOGIC_RESET_SYSMEM_SYS_PWR_REG                  0x11B0
+#define EXYNOS5_OSCCLK_GATE_SYSMEM_SYS_PWR_REG                  0x11B4
+#define EXYNOS5_USBOTG_MEM_SYS_PWR_REG                          0x11C0
+#define EXYNOS5_G2D_MEM_SYS_PWR_REG                             0x11C8
+#define EXYNOS5_USBDRD_MEM_SYS_PWR_REG                          0x11CC
+#define EXYNOS5_SDMMC_MEM_SYS_PWR_REG                           0x11D0
+#define EXYNOS5_CSSYS_MEM_SYS_PWR_REG                           0x11D4
+#define EXYNOS5_SECSS_MEM_SYS_PWR_REG                           0x11D8
+#define EXYNOS5_ROTATOR_MEM_SYS_PWR_REG                         0x11DC
+#define EXYNOS5_INTRAM_MEM_SYS_PWR_REG                          0x11E0
+#define EXYNOS5_INTROM_MEM_SYS_PWR_REG                          0x11E4
+#define EXYNOS5_JPEG_MEM_SYS_PWR_REG                            0x11E8
+#define EXYNOS5_HSI_MEM_SYS_PWR_REG                             0x11EC
+#define EXYNOS5_MCUIOP_MEM_SYS_PWR_REG                          0x11F4
+#define EXYNOS5_SATA_MEM_SYS_PWR_REG                            0x11FC
+#define EXYNOS5_PAD_RETENTION_DRAM_SYS_PWR_REG                  0x1200
+#define EXYNOS5_PAD_RETENTION_MAU_SYS_PWR_REG                   0x1204
+#define EXYNOS5_PAD_RETENTION_EFNAND_SYS_PWR_REG                0x1208
+#define EXYNOS5_PAD_RETENTION_GPIO_SYS_PWR_REG                  0x1220
+#define EXYNOS5_PAD_RETENTION_UART_SYS_PWR_REG                  0x1224
+#define EXYNOS5_PAD_RETENTION_MMCA_SYS_PWR_REG                  0x1228
+#define EXYNOS5_PAD_RETENTION_MMCB_SYS_PWR_REG                  0x122C
+#define EXYNOS5_PAD_RETENTION_EBIA_SYS_PWR_REG                  0x1230
+#define EXYNOS5_PAD_RETENTION_EBIB_SYS_PWR_REG                  0x1234
+#define EXYNOS5_PAD_RETENTION_SPI_SYS_PWR_REG                   0x1238
+#define EXYNOS5_PAD_RETENTION_GPIO_SYSMEM_SYS_PWR_REG           0x123C
+#define EXYNOS5_PAD_ISOLATION_SYS_PWR_REG                       0x1240
+#define EXYNOS5_PAD_ISOLATION_SYSMEM_SYS_PWR_REG                0x1250
+#define EXYNOS5_PAD_ALV_SEL_SYS_PWR_REG                         0x1260
+#define EXYNOS5_XUSBXTI_SYS_PWR_REG                             0x1280
+#define EXYNOS5_XXTI_SYS_PWR_REG                                0x1284
+#define EXYNOS5_EXT_REGULATOR_SYS_PWR_REG                       0x12C0
+#define EXYNOS5_GPIO_MODE_SYS_PWR_REG                           0x1300
+#define EXYNOS5_GPIO_MODE_SYSMEM_SYS_PWR_REG                    0x1320
+#define EXYNOS5_GPIO_MODE_MAU_SYS_PWR_REG                       0x1340
+#define EXYNOS5_TOP_ASB_RESET_SYS_PWR_REG                       0x1344
+#define EXYNOS5_TOP_ASB_ISOLATION_SYS_PWR_REG                   0x1348
+#define EXYNOS5_GSCL_SYS_PWR_REG                                0x1400
+#define EXYNOS5_ISP_SYS_PWR_REG                                 0x1404
+#define EXYNOS5_MFC_SYS_PWR_REG                                 0x1408
+#define EXYNOS5_G3D_SYS_PWR_REG                                 0x140C
+#define EXYNOS5_DISP1_SYS_PWR_REG                               0x1414
+#define EXYNOS5_MAU_SYS_PWR_REG                                 0x1418
+#define EXYNOS5_CMU_CLKSTOP_GSCL_SYS_PWR_REG                    0x1480
+#define EXYNOS5_CMU_CLKSTOP_ISP_SYS_PWR_REG                     0x1484
+#define EXYNOS5_CMU_CLKSTOP_MFC_SYS_PWR_REG                     0x1488
+#define EXYNOS5_CMU_CLKSTOP_G3D_SYS_PWR_REG                     0x148C
+#define EXYNOS5_CMU_CLKSTOP_DISP1_SYS_PWR_REG                   0x1494
+#define EXYNOS5_CMU_CLKSTOP_MAU_SYS_PWR_REG                     0x1498
+#define EXYNOS5_CMU_SYSCLK_GSCL_SYS_PWR_REG                     0x14C0
+#define EXYNOS5_CMU_SYSCLK_ISP_SYS_PWR_REG                      0x14C4
+#define EXYNOS5_CMU_SYSCLK_MFC_SYS_PWR_REG                      0x14C8
+#define EXYNOS5_CMU_SYSCLK_G3D_SYS_PWR_REG                      0x14CC
+#define EXYNOS5_CMU_SYSCLK_DISP1_SYS_PWR_REG                    0x14D4
+#define EXYNOS5_CMU_SYSCLK_MAU_SYS_PWR_REG                      0x14D8
+#define EXYNOS5_CMU_RESET_GSCL_SYS_PWR_REG                      0x1580
+#define EXYNOS5_CMU_RESET_ISP_SYS_PWR_REG                       0x1584
+#define EXYNOS5_CMU_RESET_MFC_SYS_PWR_REG                       0x1588
+#define EXYNOS5_CMU_RESET_G3D_SYS_PWR_REG                       0x158C
+#define EXYNOS5_CMU_RESET_DISP1_SYS_PWR_REG                     0x1594
+#define EXYNOS5_CMU_RESET_MAU_SYS_PWR_REG                       0x1598
 
-#define EXYNOS5_ARM_CORE0_OPTION                                S5P_PMUREG(0x2008)
-#define EXYNOS5_ARM_CORE1_OPTION                                S5P_PMUREG(0x2088)
-#define EXYNOS5_FSYS_ARM_OPTION                                 S5P_PMUREG(0x2208)
-#define EXYNOS5_ISP_ARM_OPTION                                  S5P_PMUREG(0x2288)
-#define EXYNOS5_ARM_COMMON_OPTION                               S5P_PMUREG(0x2408)
-#define EXYNOS5_ARM_L2_OPTION                                   S5P_PMUREG(0x2608)
-#define EXYNOS5_TOP_PWR_OPTION                                  S5P_PMUREG(0x2C48)
-#define EXYNOS5_TOP_PWR_SYSMEM_OPTION                           S5P_PMUREG(0x2CC8)
-#define EXYNOS5_JPEG_MEM_OPTION                                 S5P_PMUREG(0x2F48)
-#define EXYNOS5_GSCL_OPTION                                     S5P_PMUREG(0x4008)
-#define EXYNOS5_ISP_OPTION                                      S5P_PMUREG(0x4028)
-#define EXYNOS5_MFC_OPTION                                      S5P_PMUREG(0x4048)
-#define EXYNOS5_G3D_OPTION                                      S5P_PMUREG(0x4068)
-#define EXYNOS5_DISP1_OPTION                                    S5P_PMUREG(0x40A8)
-#define EXYNOS5_MAU_OPTION                                      S5P_PMUREG(0x40C8)
+#define EXYNOS5_ARM_CORE0_OPTION                                0x2008
+#define EXYNOS5_ARM_CORE1_OPTION                                0x2088
+#define EXYNOS5_FSYS_ARM_OPTION                                 0x2208
+#define EXYNOS5_ISP_ARM_OPTION                                  0x2288
+#define EXYNOS5_ARM_COMMON_OPTION                               0x2408
+#define EXYNOS5_ARM_L2_OPTION                                   0x2608
+#define EXYNOS5_TOP_PWR_OPTION                                  0x2C48
+#define EXYNOS5_TOP_PWR_SYSMEM_OPTION                           0x2CC8
+#define EXYNOS5_JPEG_MEM_OPTION                                 0x2F48
+#define EXYNOS5_GSCL_OPTION                                     0x4008
+#define EXYNOS5_ISP_OPTION                                      0x4028
+#define EXYNOS5_MFC_OPTION                                      0x4048
+#define EXYNOS5_G3D_OPTION                                      0x4068
+#define EXYNOS5_DISP1_OPTION                                    0x40A8
+#define EXYNOS5_MAU_OPTION                                      0x40C8
 
 #define EXYNOS5_USE_SC_FEEDBACK                                 (1 << 1)
 #define EXYNOS5_USE_SC_COUNTER                                  (1 << 0)
@@ -323,4 +317,13 @@
 
 #define EXYNOS5420_SWRESET_KFC_SEL                              0x3
 
+#include <asm/cputype.h>
+#define MAX_CPUS_IN_CLUSTER     4
+
+static inline unsigned int exynos_pmu_cpunr(unsigned int mpidr)
+{
+        return ((MPIDR_AFFINITY_LEVEL(mpidr, 1) * MAX_CPUS_IN_CLUSTER)
+                 + MPIDR_AFFINITY_LEVEL(mpidr, 0));
+}
+
 #endif /* __ASM_ARCH_REGS_PMU_H */
diff --git a/arch/arm/mach-exynos/regs-sys.h b/arch/arm/mach-exynos/regs-sys.h
new file mode 100644
index 000000000000..84332b0dd7a6
--- /dev/null
+++ b/arch/arm/mach-exynos/regs-sys.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *             http://www.samsung.com
+ *
+ * EXYNOS - system register definition
+ *
+ * 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_REGS_SYS_H
+#define __ASM_ARCH_REGS_SYS_H __FILE__
+
+#include <mach/map.h>
+
+#define S5P_SYSREG(x)                          (S3C_VA_SYS + (x))
+
+/* For EXYNOS5 */
+#define EXYNOS5_SYS_I2C_CFG                    S5P_SYSREG(0x0234)
+
+#endif /* __ASM_ARCH_REGS_SYS_H */
diff --git a/arch/arm/mach-footbridge/include/mach/memory.h b/arch/arm/mach-footbridge/include/mach/memory.h
index 5c6df377f969..6f2ecccdf323 100644
--- a/arch/arm/mach-footbridge/include/mach/memory.h
+++ b/arch/arm/mach-footbridge/include/mach/memory.h
@@ -59,11 +59,6 @@ extern unsigned long __bus_to_pfn(unsigned long);
  */
 #define FLUSH_BASE              0xf9000000
 
-/*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET                UL(0x00000000)
-
 #define FLUSH_BASE_PHYS         0x50000000
 
 #endif
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index a5960e2ac090..31aa866c3317 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -2,7 +2,6 @@ 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_HOLES_MEMORYMODEL
-        select ARCH_HAS_OPP
         select ARCH_SUPPORTS_BIG_ENDIAN
         select ARM_AMBA
         select ARM_ERRATA_764369 if SMP
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index feee4dbb0760..984882943f77 100644
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -1,12 +1,36 @@
-config ARCH_HI3xxx
-        bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7
+config ARCH_HISI
+        bool "Hisilicon SoC Support"
+        depends on ARCH_MULTIPLATFORM
         select ARM_AMBA
         select ARM_GIC
         select ARM_TIMER_SP804
+        select POWER_RESET
+        select POWER_RESET_HISI
+        select POWER_SUPPLY
+
+if ARCH_HISI
+
+menu "Hisilicon platform type"
+
+config ARCH_HI3xxx
+        bool "Hisilicon Hi36xx family" if ARCH_MULTI_V7
+        select CACHE_L2X0
+        select HAVE_ARM_SCU if SMP
+        select HAVE_ARM_TWD if SMP
+        select PINCTRL
+        select PINCTRL_SINGLE
+        help
+          Support for Hisilicon Hi36xx SoC family
+
+config ARCH_HIX5HD2
+        bool "Hisilicon X5HD2 family" if ARCH_MULTI_V7
         select CACHE_L2X0
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
         select PINCTRL
         select PINCTRL_SINGLE
         help
-          Support for Hisilicon Hi36xx/Hi37xx processor family
+          Support for Hisilicon HIX5HD2 SoC family
+endmenu
+
+endif
diff --git a/arch/arm/mach-hisi/Makefile b/arch/arm/mach-hisi/Makefile
index 2ae1b59267c2..ee2506b9cde3 100644
--- a/arch/arm/mach-hisi/Makefile
+++ b/arch/arm/mach-hisi/Makefile
@@ -3,4 +3,4 @@
 #
 
 obj-y   += hisilicon.o
-obj-$(CONFIG_SMP)               += platsmp.o hotplug.o
+obj-$(CONFIG_SMP)               += platsmp.o hotplug.o headsmp.o
diff --git a/arch/arm/mach-hisi/core.h b/arch/arm/mach-hisi/core.h
index af23ec204538..88b1f487d065 100644
--- a/arch/arm/mach-hisi/core.h
+++ b/arch/arm/mach-hisi/core.h
@@ -12,4 +12,9 @@ extern void hi3xxx_cpu_die(unsigned int cpu);
 extern int hi3xxx_cpu_kill(unsigned int cpu);
 extern void hi3xxx_set_cpu(int cpu, bool enable);
 
+extern void hix5hd2_secondary_startup(void);
+extern struct smp_operations hix5hd2_smp_ops;
+extern void hix5hd2_set_cpu(int cpu, bool enable);
+extern void hix5hd2_cpu_die(unsigned int cpu);
+
 #endif
diff --git a/arch/arm/mach-hisi/headsmp.S b/arch/arm/mach-hisi/headsmp.S
new file mode 100644
index 000000000000..278889c00b77
--- /dev/null
+++ b/arch/arm/mach-hisi/headsmp.S
@@ -0,0 +1,16 @@
+/*
+ *  Copyright (c) 2014 Hisilicon Limited.
+ *  Copyright (c) 2014 Linaro 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.
+ */
+#include <linux/linkage.h>
+#include <linux/init.h>
+
+        __CPUINIT
+
+ENTRY(hix5hd2_secondary_startup)
+        bl      v7_invalidate_l1
+        b       secondary_startup
diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c
index 741faf3e7100..7cda6dda3cd0 100644
--- a/arch/arm/mach-hisi/hisilicon.c
+++ b/arch/arm/mach-hisi/hisilicon.c
@@ -14,16 +14,10 @@
 #include <linux/clk-provider.h>
 #include <linux/clocksource.h>
 #include <linux/irqchip.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-
-#include <asm/proc-fns.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include "core.h"
-
 #define HI3620_SYSCTRL_PHYS_BASE                0xfc802000
 #define HI3620_SYSCTRL_VIRT_BASE                0xfe802000
 
@@ -51,32 +45,6 @@ static void __init hi3620_map_io(void)
         iotable_init(hi3620_io_desc, ARRAY_SIZE(hi3620_io_desc));
 }
 
-static void hi3xxx_restart(enum reboot_mode mode, const char *cmd)
-{
-        struct device_node *np;
-        void __iomem *base;
-        int offset;
-
-        np = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");
-        if (!np) {
-                pr_err("failed to find hisilicon,sysctrl node\n");
-                return;
-        }
-        base = of_iomap(np, 0);
-        if (!base) {
-                pr_err("failed to map address in hisilicon,sysctrl node\n");
-                return;
-        }
-        if (of_property_read_u32(np, "reboot-offset", &offset) < 0) {
-                pr_err("failed to find reboot-offset property\n");
-                return;
-        }
-        writel_relaxed(0xdeadbeef, base + offset);
-
-        while (1)
-                cpu_do_idle();
-}
-
 static const char *hi3xxx_compat[] __initconst = {
         "hisilicon,hi3620-hi4511",
         NULL,
@@ -85,6 +53,13 @@ static const char *hi3xxx_compat[] __initconst = {
 DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)")
         .map_io         = hi3620_map_io,
         .dt_compat      = hi3xxx_compat,
-        .smp            = smp_ops(hi3xxx_smp_ops),
-        .restart        = hi3xxx_restart,
+MACHINE_END
+
+static const char *hix5hd2_compat[] __initconst = {
+        "hisilicon,hix5hd2",
+        NULL,
+};
+
+DT_MACHINE_START(HIX5HD2_DT, "Hisilicon HIX5HD2 (Flattened Device Tree)")
+        .dt_compat      = hix5hd2_compat,
 MACHINE_END
diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c
index abd441b0c604..84e6919f68c7 100644
--- a/arch/arm/mach-hisi/hotplug.c
+++ b/arch/arm/mach-hisi/hotplug.c
@@ -57,6 +57,14 @@
 #define CPU0_NEON_SRST_REQ_EN           (1 << 4)
 #define CPU0_SRST_REQ_EN                (1 << 0)
 
+#define HIX5HD2_PERI_CRG20              0x50
+#define CRG20_CPU1_RESET                (1 << 17)
+
+#define HIX5HD2_PERI_PMC0               0x1000
+#define PMC0_CPU1_WAIT_MTCOMS_ACK       (1 << 8)
+#define PMC0_CPU1_PMC_ENABLE            (1 << 7)
+#define PMC0_CPU1_POWERDOWN             (1 << 3)
+
 enum {
         HI3620_CTRL,
         ERROR_CTRL,
@@ -157,6 +165,50 @@ void hi3xxx_set_cpu(int cpu, bool enable)
                 set_cpu_hi3620(cpu, enable);
 }
 
+static bool hix5hd2_hotplug_init(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "hisilicon,cpuctrl");
+        if (np) {
+                ctrl_base = of_iomap(np, 0);
+                return true;
+        }
+        return false;
+}
+
+void hix5hd2_set_cpu(int cpu, bool enable)
+{
+        u32 val = 0;
+
+        if (!ctrl_base)
+                if (!hix5hd2_hotplug_init())
+                        BUG();
+
+        if (enable) {
+                /* power on cpu1 */
+                val = readl_relaxed(ctrl_base + HIX5HD2_PERI_PMC0);
+                val &= ~(PMC0_CPU1_WAIT_MTCOMS_ACK | PMC0_CPU1_POWERDOWN);
+                val |= PMC0_CPU1_PMC_ENABLE;
+                writel_relaxed(val, ctrl_base + HIX5HD2_PERI_PMC0);
+                /* unreset */
+                val = readl_relaxed(ctrl_base + HIX5HD2_PERI_CRG20);
+                val &= ~CRG20_CPU1_RESET;
+                writel_relaxed(val, ctrl_base + HIX5HD2_PERI_CRG20);
+        } else {
+                /* power down cpu1 */
+                val = readl_relaxed(ctrl_base + HIX5HD2_PERI_PMC0);
+                val |= PMC0_CPU1_PMC_ENABLE | PMC0_CPU1_POWERDOWN;
+                val &= ~PMC0_CPU1_WAIT_MTCOMS_ACK;
+                writel_relaxed(val, ctrl_base + HIX5HD2_PERI_PMC0);
+
+                /* reset */
+                val = readl_relaxed(ctrl_base + HIX5HD2_PERI_CRG20);
+                val |= CRG20_CPU1_RESET;
+                writel_relaxed(val, ctrl_base + HIX5HD2_PERI_CRG20);
+        }
+}
+
 static inline void cpu_enter_lowpower(void)
 {
         unsigned int v;
@@ -199,4 +251,10 @@ int hi3xxx_cpu_kill(unsigned int cpu)
         hi3xxx_set_cpu(cpu, false);
         return 1;
 }
+
+void hix5hd2_cpu_die(unsigned int cpu)
+{
+        flush_cache_all();
+        hix5hd2_set_cpu(cpu, false);
+}
 #endif
diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c
index 471f1ee3be2b..575dd8285f1f 100644
--- a/arch/arm/mach-hisi/platsmp.c
+++ b/arch/arm/mach-hisi/platsmp.c
@@ -17,6 +17,8 @@
 
 #include "core.h"
 
+#define HIX5HD2_BOOT_ADDRESS            0xffff0000
+
 static void __iomem *ctrl_base;
 
 void hi3xxx_set_cpu_jump(int cpu, void *jump_addr)
@@ -35,11 +37,9 @@ int hi3xxx_get_cpu_jump(int cpu)
         return readl_relaxed(ctrl_base + ((cpu - 1) << 2));
 }
 
-static void __init hi3xxx_smp_prepare_cpus(unsigned int max_cpus)
+static void __init hisi_enable_scu_a9(void)
 {
-        struct device_node *np = NULL;
         unsigned long base = 0;
-        u32 offset = 0;
         void __iomem *scu_base = NULL;
 
         if (scu_a9_has_base()) {
@@ -52,6 +52,14 @@ static void __init hi3xxx_smp_prepare_cpus(unsigned int max_cpus)
                 scu_enable(scu_base);
                 iounmap(scu_base);
         }
+}
+
+static void __init hi3xxx_smp_prepare_cpus(unsigned int max_cpus)
+{
+        struct device_node *np = NULL;
+        u32 offset = 0;
+
+        hisi_enable_scu_a9();
         if (!ctrl_base) {
                 np = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");
                 if (!np) {
@@ -87,3 +95,42 @@ struct smp_operations hi3xxx_smp_ops __initdata = {
         .cpu_kill               = hi3xxx_cpu_kill,
 #endif
 };
+
+static void __init hix5hd2_smp_prepare_cpus(unsigned int max_cpus)
+{
+        hisi_enable_scu_a9();
+}
+
+void hix5hd2_set_scu_boot_addr(phys_addr_t start_addr, phys_addr_t jump_addr)
+{
+        void __iomem *virt;
+
+        virt = ioremap(start_addr, PAGE_SIZE);
+
+        writel_relaxed(0xe51ff004, virt);       /* ldr pc, [rc, #-4] */
+        writel_relaxed(jump_addr, virt + 4);    /* pc jump phy address */
+        iounmap(virt);
+}
+
+static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+        phys_addr_t jumpaddr;
+
+        jumpaddr = virt_to_phys(hix5hd2_secondary_startup);
+        hix5hd2_set_scu_boot_addr(HIX5HD2_BOOT_ADDRESS, jumpaddr);
+        hix5hd2_set_cpu(cpu, true);
+        arch_send_wakeup_ipi_mask(cpumask_of(cpu));
+        return 0;
+}
+
+
+struct smp_operations hix5hd2_smp_ops __initdata = {
+        .smp_prepare_cpus       = hix5hd2_smp_prepare_cpus,
+        .smp_boot_secondary     = hix5hd2_boot_secondary,
+#ifdef CONFIG_HOTPLUG_CPU
+        .cpu_die                = hix5hd2_cpu_die,
+#endif
+};
+
+CPU_METHOD_OF_DECLARE(hi3xxx_smp, "hisilicon,hi3620-smp", &hi3xxx_smp_ops);
+CPU_METHOD_OF_DECLARE(hix5hd2_smp, "hisilicon,hix5hd2-smp", &hix5hd2_smp_ops);
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 4b5185748f74..9de84a215abd 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,6 +1,5 @@
 menuconfig ARCH_MXC
         bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
-        select ARCH_HAS_OPP
         select ARCH_REQUIRE_GPIOLIB
         select ARM_CPU_SUSPEND if PM
         select CLKSRC_MMIO
@@ -65,18 +64,8 @@ config IMX_HAVE_IOMUX_V1
 config ARCH_MXC_IOMUX_V3
         bool
 
-config ARCH_MX1
-        bool
-
-config ARCH_MX25
-        bool
-
-config MACH_MX27
-        bool
-
 config SOC_IMX1
         bool
-        select ARCH_MX1
         select CPU_ARM920T
         select IMX_HAVE_IOMUX_V1
         select MXC_AVIC
@@ -89,7 +78,6 @@ config SOC_IMX21
 
 config SOC_IMX25
         bool
-        select ARCH_MX25
         select ARCH_MXC_IOMUX_V3
         select CPU_ARM926T
         select MXC_AVIC
@@ -100,7 +88,6 @@ config SOC_IMX27
         select ARCH_HAS_OPP
         select CPU_ARM926T
         select IMX_HAVE_IOMUX_V1
-        select MACH_MX27
         select MXC_AVIC
         select PINCTRL_IMX27
 
@@ -119,18 +106,6 @@ config SOC_IMX35
         select PINCTRL_IMX35
         select SMP_ON_UP if SMP
 
-config SOC_IMX5
-        bool
-        select ARCH_HAS_OPP
-        select ARCH_MXC_IOMUX_V3
-        select MXC_TZIC
-
-config  SOC_IMX51
-        bool
-        select HAVE_IMX_SRC
-        select PINCTRL_IMX51
-        select SOC_IMX5
-
 if ARCH_MULTI_V4T
 
 comment "MX1 platforms:"
@@ -366,15 +341,6 @@ config MACH_IMX27_VISSTRIM_M10
           This includes specific configurations for the board and its
           peripherals.
 
-config MACH_IMX27LITE
-        bool "LogicPD MX27 LITEKIT platform"
-        select IMX_HAVE_PLATFORM_IMX_SSI
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select SOC_IMX27
-        help
-          Include support for MX27 LITEKIT platform. This includes specific
-          configurations for the board and its peripherals.
-
 config MACH_PCA100
         bool "Phytec phyCARD-s (pca100)"
         select IMX_HAVE_PLATFORM_FSL_USB2_UDC
@@ -406,15 +372,6 @@ config MACH_MXT_TD60
           Include support for i-MXT (aka td60) platform. This
           includes specific configurations for the module and its peripherals.
 
-config MACH_IMX27IPCAM
-        bool "IMX27 IPCAM platform"
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select SOC_IMX27
-        help
-          Include support for IMX27 IPCAM platform. This includes specific
-          configurations for the board and its peripherals.
-
 config MACH_IMX27_DT
         bool "Support i.MX27 platforms from device tree"
         select SOC_IMX27
@@ -700,24 +657,29 @@ if ARCH_MULTI_V7
 
 comment "Device tree only"
 
+config SOC_IMX5
+        bool
+        select ARCH_HAS_OPP
+        select HAVE_IMX_SRC
+        select MXC_TZIC
+
 config  SOC_IMX50
         bool "i.MX50 support"
-        select HAVE_IMX_SRC
         select PINCTRL_IMX50
         select SOC_IMX5
 
         help
           This enables support for Freescale i.MX50 processor.
 
-config MACH_IMX51_DT
+config SOC_IMX51
         bool "i.MX51 support"
-        select SOC_IMX51
+        select PINCTRL_IMX51
+        select SOC_IMX5
         help
           This enables support for Freescale i.MX51 processor
 
 config  SOC_IMX53
         bool "i.MX53 support"
-        select HAVE_IMX_SRC
         select PINCTRL_IMX53
         select SOC_IMX5
 
@@ -734,8 +696,6 @@ config SOC_IMX6
         select HAVE_IMX_MMDC
         select HAVE_IMX_SRC
         select MFD_SYSCON
-        select PL310_ERRATA_588369 if CACHE_L2X0
-        select PL310_ERRATA_727915 if CACHE_L2X0
         select PL310_ERRATA_769419 if CACHE_L2X0
 
 config SOC_IMX6Q
@@ -771,8 +731,6 @@ config SOC_VF610
         select ARM_GIC
         select PINCTRL_VF610
         select VF_PIT_TIMER
-        select PL310_ERRATA_588369 if CACHE_L2X0
-        select PL310_ERRATA_727915 if CACHE_L2X0
         select PL310_ERRATA_769419 if CACHE_L2X0
 
         help
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index bbe93bbfd003..ac88599ca080 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -12,7 +12,7 @@ obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci-
 obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o
 
 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_SOC_IMX5) += cpu-imx5.o clk-imx51-imx53.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 \
@@ -31,6 +31,8 @@ ifeq ($(CONFIG_CPU_IDLE),y)
 obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
 obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
 obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o
+# i.MX6SX reuses i.MX6Q cpuidle driver
+obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6q.o
 endif
 
 ifdef CONFIG_SND_IMX_SOC
@@ -38,9 +40,6 @@ obj-y += ssi-fiq.o
 obj-y += ssi-fiq-ksym.o
 endif
 
-# Support for CMOS sensor interface
-obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
-
 # i.MX1 based machines
 obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
 obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
@@ -60,13 +59,11 @@ obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o
 obj-$(CONFIG_MACH_PCM038) += mach-pcm038.o
 obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o
 obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o
-obj-$(CONFIG_MACH_IMX27LITE) += mach-imx27lite.o
 obj-$(CONFIG_MACH_IMX27_VISSTRIM_M10) += mach-imx27_visstrim_m10.o
 obj-$(CONFIG_MACH_CPUIMX27) += mach-cpuimx27.o
 obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
 obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
 obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
-obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
 obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
 
 # i.MX31 based machines
@@ -109,8 +106,8 @@ obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
 endif
 obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
 
-obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o
 obj-$(CONFIG_SOC_IMX50) += mach-imx50.o
+obj-$(CONFIG_SOC_IMX51) += mach-imx51.o
 obj-$(CONFIG_SOC_IMX53) += mach-imx53.o
 
 obj-$(CONFIG_SOC_VF610) += clk-vf610.o mach-vf610.o
diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c
index 7f739be3de2c..37c307a8d896 100644
--- a/arch/arm/mach-imx/clk-imx1.c
+++ b/arch/arm/mach-imx/clk-imx1.c
@@ -15,100 +15,103 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/clk.h>
-#include <linux/io.h>
 #include <linux/clkdev.h>
+#include <linux/clk-provider.h>
 #include <linux/err.h>
+#include <linux/init.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <dt-bindings/clock/imx1-clock.h>
 
 #include "clk.h"
 #include "common.h"
 #include "hardware.h"
 
-/* CCM register addresses */
-#define IO_ADDR_CCM(off)        (MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR + (off)))
-
-#define CCM_CSCR        IO_ADDR_CCM(0x0)
-#define CCM_MPCTL0      IO_ADDR_CCM(0x4)
-#define CCM_SPCTL0      IO_ADDR_CCM(0xc)
-#define CCM_PCDR        IO_ADDR_CCM(0x20)
-
-/* SCM register addresses */
-#define IO_ADDR_SCM(off)        (MX1_IO_ADDRESS(MX1_SCM_BASE_ADDR + (off)))
-
-#define SCM_GCCR        IO_ADDR_SCM(0xc)
-
 static const char *prem_sel_clks[] = { "clk32_premult", "clk16m", };
 static const char *clko_sel_clks[] = { "per1", "hclk", "clk48m", "clk16m",
                                        "prem", "fclk", };
 
-enum imx1_clks {
-        dummy, clk32, clk16m_ext, clk16m, clk32_premult, prem, mpll, mpll_gate,
-        spll, spll_gate, mcu, fclk, hclk, clk48m, per1, per2, per3, clko,
-        uart3_gate, ssi2_gate, brom_gate, dma_gate, csi_gate, mma_gate,
-        usbd_gate, clk_max
-};
+static struct clk *clk[IMX1_CLK_MAX];
+static struct clk_onecell_data clk_data;
 
-static struct clk *clk[clk_max];
+static void __iomem *ccm __initdata;
+#define CCM_CSCR        (ccm + 0x0000)
+#define CCM_MPCTL0      (ccm + 0x0004)
+#define CCM_SPCTL0      (ccm + 0x000c)
+#define CCM_PCDR        (ccm + 0x0020)
+#define SCM_GCCR        (ccm + 0x0810)
 
-int __init mx1_clocks_init(unsigned long fref)
+static void __init _mx1_clocks_init(unsigned long fref)
 {
-        int i;
+        clk[IMX1_CLK_DUMMY] = imx_clk_fixed("dummy", 0);
+        clk[IMX1_CLK_CLK32] = imx_obtain_fixed_clock("clk32", fref);
+        clk[IMX1_CLK_CLK16M_EXT] = imx_clk_fixed("clk16m_ext", 16000000);
+        clk[IMX1_CLK_CLK16M] = imx_clk_gate("clk16m", "clk16m_ext", CCM_CSCR, 17);
+        clk[IMX1_CLK_CLK32_PREMULT] = imx_clk_fixed_factor("clk32_premult", "clk32", 512, 1);
+        clk[IMX1_CLK_PREM] = imx_clk_mux("prem", CCM_CSCR, 16, 1, prem_sel_clks, ARRAY_SIZE(prem_sel_clks));
+        clk[IMX1_CLK_MPLL] = imx_clk_pllv1("mpll", "clk32_premult", CCM_MPCTL0);
+        clk[IMX1_CLK_MPLL_GATE] = imx_clk_gate("mpll_gate", "mpll", CCM_CSCR, 0);
+        clk[IMX1_CLK_SPLL] = imx_clk_pllv1("spll", "prem", CCM_SPCTL0);
+        clk[IMX1_CLK_SPLL_GATE] = imx_clk_gate("spll_gate", "spll", CCM_CSCR, 1);
+        clk[IMX1_CLK_MCU] = imx_clk_divider("mcu", "clk32_premult", CCM_CSCR, 15, 1);
+        clk[IMX1_CLK_FCLK] = imx_clk_divider("fclk", "mpll_gate", CCM_CSCR, 15, 1);
+        clk[IMX1_CLK_HCLK] = imx_clk_divider("hclk", "spll_gate", CCM_CSCR, 10, 4);
+        clk[IMX1_CLK_CLK48M] = imx_clk_divider("clk48m", "spll_gate", CCM_CSCR, 26, 3);
+        clk[IMX1_CLK_PER1] = imx_clk_divider("per1", "spll_gate", CCM_PCDR, 0, 4);
+        clk[IMX1_CLK_PER2] = imx_clk_divider("per2", "spll_gate", CCM_PCDR, 4, 4);
+        clk[IMX1_CLK_PER3] = imx_clk_divider("per3", "spll_gate", CCM_PCDR, 16, 7);
+        clk[IMX1_CLK_CLKO] = imx_clk_mux("clko", CCM_CSCR, 29, 3, clko_sel_clks, ARRAY_SIZE(clko_sel_clks));
+        clk[IMX1_CLK_UART3_GATE] = imx_clk_gate("uart3_gate", "hclk", SCM_GCCR, 6);
+        clk[IMX1_CLK_SSI2_GATE] = imx_clk_gate("ssi2_gate", "hclk", SCM_GCCR, 5);
+        clk[IMX1_CLK_BROM_GATE] = imx_clk_gate("brom_gate", "hclk", SCM_GCCR, 4);
+        clk[IMX1_CLK_DMA_GATE] = imx_clk_gate("dma_gate", "hclk", SCM_GCCR, 3);
+        clk[IMX1_CLK_CSI_GATE] = imx_clk_gate("csi_gate", "hclk", SCM_GCCR, 2);
+        clk[IMX1_CLK_MMA_GATE] = imx_clk_gate("mma_gate", "hclk", SCM_GCCR, 1);
+        clk[IMX1_CLK_USBD_GATE] = imx_clk_gate("usbd_gate", "clk48m", SCM_GCCR, 0);
+
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
+}
 
-        clk[dummy] = imx_clk_fixed("dummy", 0);
-        clk[clk32] = imx_clk_fixed("clk32", fref);
-        clk[clk16m_ext] = imx_clk_fixed("clk16m_ext", 16000000);
-        clk[clk16m] = imx_clk_gate("clk16m", "clk16m_ext", CCM_CSCR, 17);
-        clk[clk32_premult] = imx_clk_fixed_factor("clk32_premult", "clk32", 512, 1);
-        clk[prem] = imx_clk_mux("prem", CCM_CSCR, 16, 1, prem_sel_clks,
-                        ARRAY_SIZE(prem_sel_clks));
-        clk[mpll] = imx_clk_pllv1("mpll", "clk32_premult", CCM_MPCTL0);
-        clk[mpll_gate] = imx_clk_gate("mpll_gate", "mpll", CCM_CSCR, 0);
-        clk[spll] = imx_clk_pllv1("spll", "prem", CCM_SPCTL0);
-        clk[spll_gate] = imx_clk_gate("spll_gate", "spll", CCM_CSCR, 1);
-        clk[mcu] = imx_clk_divider("mcu", "clk32_premult", CCM_CSCR, 15, 1);
-        clk[fclk] = imx_clk_divider("fclk", "mpll_gate", CCM_CSCR, 15, 1);
-        clk[hclk] = imx_clk_divider("hclk", "spll_gate", CCM_CSCR, 10, 4);
-        clk[clk48m] = imx_clk_divider("clk48m", "spll_gate", CCM_CSCR, 26, 3);
-        clk[per1] = imx_clk_divider("per1", "spll_gate", CCM_PCDR, 0, 4);
-        clk[per2] = imx_clk_divider("per2", "spll_gate", CCM_PCDR, 4, 4);
-        clk[per3] = imx_clk_divider("per3", "spll_gate", CCM_PCDR, 16, 7);
-        clk[clko] = imx_clk_mux("clko", CCM_CSCR, 29, 3, clko_sel_clks,
-                        ARRAY_SIZE(clko_sel_clks));
-        clk[uart3_gate] = imx_clk_gate("uart3_gate", "hclk", SCM_GCCR, 6);
-        clk[ssi2_gate] = imx_clk_gate("ssi2_gate", "hclk", SCM_GCCR, 5);
-        clk[brom_gate] = imx_clk_gate("brom_gate", "hclk", SCM_GCCR, 4);
-        clk[dma_gate] = imx_clk_gate("dma_gate", "hclk", SCM_GCCR, 3);
-        clk[csi_gate] = imx_clk_gate("csi_gate", "hclk", SCM_GCCR, 2);
-        clk[mma_gate] = imx_clk_gate("mma_gate", "hclk", SCM_GCCR, 1);
-        clk[usbd_gate] = imx_clk_gate("usbd_gate", "clk48m", SCM_GCCR, 0);
+int __init mx1_clocks_init(unsigned long fref)
+{
+        ccm = MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR);
 
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("imx1 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
+        _mx1_clocks_init(fref);
 
-        clk_register_clkdev(clk[dma_gate], "ahb", "imx1-dma");
-        clk_register_clkdev(clk[hclk], "ipg", "imx1-dma");
-        clk_register_clkdev(clk[per1], "per", "imx-gpt.0");
-        clk_register_clkdev(clk[hclk], "ipg", "imx-gpt.0");
-        clk_register_clkdev(clk[per1], "per", "imx1-uart.0");
-        clk_register_clkdev(clk[hclk], "ipg", "imx1-uart.0");
-        clk_register_clkdev(clk[per1], "per", "imx1-uart.1");
-        clk_register_clkdev(clk[hclk], "ipg", "imx1-uart.1");
-        clk_register_clkdev(clk[per1], "per", "imx1-uart.2");
-        clk_register_clkdev(clk[uart3_gate], "ipg", "imx1-uart.2");
-        clk_register_clkdev(clk[hclk], NULL, "imx1-i2c.0");
-        clk_register_clkdev(clk[per2], "per", "imx1-cspi.0");
-        clk_register_clkdev(clk[dummy], "ipg", "imx1-cspi.0");
-        clk_register_clkdev(clk[per2], "per", "imx1-cspi.1");
-        clk_register_clkdev(clk[dummy], "ipg", "imx1-cspi.1");
-        clk_register_clkdev(clk[per2], "per", "imx1-fb.0");
-        clk_register_clkdev(clk[dummy], "ipg", "imx1-fb.0");
-        clk_register_clkdev(clk[dummy], "ahb", "imx1-fb.0");
+        clk_register_clkdev(clk[IMX1_CLK_PER1], "per", "imx-gpt.0");
+        clk_register_clkdev(clk[IMX1_CLK_HCLK], "ipg", "imx-gpt.0");
+        clk_register_clkdev(clk[IMX1_CLK_DMA_GATE], "ahb", "imx1-dma");
+        clk_register_clkdev(clk[IMX1_CLK_HCLK], "ipg", "imx1-dma");
+        clk_register_clkdev(clk[IMX1_CLK_PER1], "per", "imx1-uart.0");
+        clk_register_clkdev(clk[IMX1_CLK_HCLK], "ipg", "imx1-uart.0");
+        clk_register_clkdev(clk[IMX1_CLK_PER1], "per", "imx1-uart.1");
+        clk_register_clkdev(clk[IMX1_CLK_HCLK], "ipg", "imx1-uart.1");
+        clk_register_clkdev(clk[IMX1_CLK_PER1], "per", "imx1-uart.2");
+        clk_register_clkdev(clk[IMX1_CLK_UART3_GATE], "ipg", "imx1-uart.2");
+        clk_register_clkdev(clk[IMX1_CLK_HCLK], NULL, "imx1-i2c.0");
+        clk_register_clkdev(clk[IMX1_CLK_PER2], "per", "imx1-cspi.0");
+        clk_register_clkdev(clk[IMX1_CLK_DUMMY], "ipg", "imx1-cspi.0");
+        clk_register_clkdev(clk[IMX1_CLK_PER2], "per", "imx1-cspi.1");
+        clk_register_clkdev(clk[IMX1_CLK_DUMMY], "ipg", "imx1-cspi.1");
+        clk_register_clkdev(clk[IMX1_CLK_PER2], "per", "imx1-fb.0");
+        clk_register_clkdev(clk[IMX1_CLK_DUMMY], "ipg", "imx1-fb.0");
+        clk_register_clkdev(clk[IMX1_CLK_DUMMY], "ahb", "imx1-fb.0");
 
         mxc_timer_init(MX1_IO_ADDRESS(MX1_TIM1_BASE_ADDR), MX1_TIM1_INT);
 
         return 0;
 }
+
+static void __init mx1_clocks_init_dt(struct device_node *np)
+{
+        ccm = of_iomap(np, 0);
+        BUG_ON(!ccm);
+
+        _mx1_clocks_init(32768);
+
+        clk_data.clks = clk;
+        clk_data.clk_num = ARRAY_SIZE(clk);
+        of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
+}
+CLK_OF_DECLARE(imx1_ccm, "fsl,imx1-ccm", mx1_clocks_init_dt);
diff --git a/arch/arm/mach-imx/clk-imx21.c b/arch/arm/mach-imx/clk-imx21.c
index bdc2e4630a08..4b4c75339aa6 100644
--- a/arch/arm/mach-imx/clk-imx21.c
+++ b/arch/arm/mach-imx/clk-imx21.c
@@ -7,178 +7,165 @@
  * 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/clk.h>
-#include <linux/clkdev.h>
 #include <linux/clk-provider.h>
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/err.h>
+#include <linux/clkdev.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <dt-bindings/clock/imx21-clock.h>
 
 #include "clk.h"
 #include "common.h"
 #include "hardware.h"
 
-#define IO_ADDR_CCM(off)        (MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR + (off)))
+static void __iomem *ccm __initdata;
 
 /* Register offsets */
-#define CCM_CSCR                IO_ADDR_CCM(0x0)
-#define CCM_MPCTL0              IO_ADDR_CCM(0x4)
-#define CCM_MPCTL1              IO_ADDR_CCM(0x8)
-#define CCM_SPCTL0              IO_ADDR_CCM(0xc)
-#define CCM_SPCTL1              IO_ADDR_CCM(0x10)
-#define CCM_OSC26MCTL           IO_ADDR_CCM(0x14)
-#define CCM_PCDR0               IO_ADDR_CCM(0x18)
-#define CCM_PCDR1               IO_ADDR_CCM(0x1c)
-#define CCM_PCCR0               IO_ADDR_CCM(0x20)
-#define CCM_PCCR1               IO_ADDR_CCM(0x24)
-#define CCM_CCSR                IO_ADDR_CCM(0x28)
-#define CCM_PMCTL               IO_ADDR_CCM(0x2c)
-#define CCM_PMCOUNT             IO_ADDR_CCM(0x30)
-#define CCM_WKGDCTL             IO_ADDR_CCM(0x34)
-
-static const char *mpll_sel_clks[] = { "fpm", "ckih", };
-static const char *spll_sel_clks[] = { "fpm", "ckih", };
-
-enum imx21_clks {
-        ckil, ckih, fpm, mpll_sel, spll_sel, mpll, spll, fclk, hclk, ipg, per1,
-        per2, per3, per4, uart1_ipg_gate, uart2_ipg_gate, uart3_ipg_gate,
-        uart4_ipg_gate, gpt1_ipg_gate, gpt2_ipg_gate, gpt3_ipg_gate,
-        pwm_ipg_gate, sdhc1_ipg_gate, sdhc2_ipg_gate, lcdc_ipg_gate,
-        lcdc_hclk_gate, cspi3_ipg_gate, cspi2_ipg_gate, cspi1_ipg_gate,
-        per4_gate, csi_hclk_gate, usb_div, usb_gate, usb_hclk_gate, ssi1_gate,
-        ssi2_gate, nfc_div, nfc_gate, dma_gate, dma_hclk_gate, brom_gate,
-        emma_gate, emma_hclk_gate, slcdc_gate, slcdc_hclk_gate, wdog_gate,
-        gpio_gate, i2c_gate, kpp_gate, owire_gate, rtc_gate, clk_max
-};
-
-static struct clk *clk[clk_max];
+#define CCM_CSCR        (ccm + 0x00)
+#define CCM_MPCTL0      (ccm + 0x04)
+#define CCM_SPCTL0      (ccm + 0x0c)
+#define CCM_PCDR0       (ccm + 0x18)
+#define CCM_PCDR1       (ccm + 0x1c)
+#define CCM_PCCR0       (ccm + 0x20)
+#define CCM_PCCR1       (ccm + 0x24)
+
+static const char *mpll_osc_sel_clks[] = { "ckih_gate", "ckih_div1p5", };
+static const char *mpll_sel_clks[] = { "fpm_gate", "mpll_osc_sel", };
+static const char *spll_sel_clks[] = { "fpm_gate", "mpll_osc_sel", };
+static const char *ssi_sel_clks[] = { "spll_gate", "mpll_gate", };
+
+static struct clk *clk[IMX21_CLK_MAX];
+static struct clk_onecell_data clk_data;
+
+static void __init _mx21_clocks_init(unsigned long lref, unsigned long href)
+{
+        BUG_ON(!ccm);
+
+        clk[IMX21_CLK_DUMMY] = imx_clk_fixed("dummy", 0);
+        clk[IMX21_CLK_CKIL] = imx_obtain_fixed_clock("ckil", lref);
+        clk[IMX21_CLK_CKIH] = imx_obtain_fixed_clock("ckih", href);
+        clk[IMX21_CLK_FPM] = imx_clk_fixed_factor("fpm", "ckil", 512, 1);
+        clk[IMX21_CLK_CKIH_DIV1P5] = imx_clk_fixed_factor("ckih_div1p5", "ckih_gate", 2, 3);
+
+        clk[IMX21_CLK_MPLL_GATE] = imx_clk_gate("mpll_gate", "mpll", CCM_CSCR, 0);
+        clk[IMX21_CLK_SPLL_GATE] = imx_clk_gate("spll_gate", "spll", CCM_CSCR, 1);
+        clk[IMX21_CLK_FPM_GATE] = imx_clk_gate("fpm_gate", "fpm", CCM_CSCR, 2);
+        clk[IMX21_CLK_CKIH_GATE] = imx_clk_gate_dis("ckih_gate", "ckih", CCM_CSCR, 3);
+        clk[IMX21_CLK_MPLL_OSC_SEL] = imx_clk_mux("mpll_osc_sel", CCM_CSCR, 4, 1, mpll_osc_sel_clks, ARRAY_SIZE(mpll_osc_sel_clks));
+        clk[IMX21_CLK_IPG] = imx_clk_divider("ipg", "hclk", CCM_CSCR, 9, 1);
+        clk[IMX21_CLK_HCLK] = imx_clk_divider("hclk", "fclk", CCM_CSCR, 10, 4);
+        clk[IMX21_CLK_MPLL_SEL] = imx_clk_mux("mpll_sel", CCM_CSCR, 16, 1, mpll_sel_clks, ARRAY_SIZE(mpll_sel_clks));
+        clk[IMX21_CLK_SPLL_SEL] = imx_clk_mux("spll_sel", CCM_CSCR, 17, 1, spll_sel_clks, ARRAY_SIZE(spll_sel_clks));
+        clk[IMX21_CLK_SSI1_SEL] = imx_clk_mux("ssi1_sel", CCM_CSCR, 19, 1, ssi_sel_clks, ARRAY_SIZE(ssi_sel_clks));
+        clk[IMX21_CLK_SSI2_SEL] = imx_clk_mux("ssi2_sel", CCM_CSCR, 20, 1, ssi_sel_clks, ARRAY_SIZE(ssi_sel_clks));
+        clk[IMX21_CLK_USB_DIV] = imx_clk_divider("usb_div", "spll_gate", CCM_CSCR, 26, 3);
+        clk[IMX21_CLK_FCLK] = imx_clk_divider("fclk", "mpll_gate", CCM_CSCR, 29, 3);
+
+        clk[IMX21_CLK_MPLL] = imx_clk_pllv1("mpll", "mpll_sel", CCM_MPCTL0);
+
+        clk[IMX21_CLK_SPLL] = imx_clk_pllv1("spll", "spll_sel", CCM_SPCTL0);
+
+        clk[IMX21_CLK_NFC_DIV] = imx_clk_divider("nfc_div", "fclk", CCM_PCDR0, 12, 4);
+        clk[IMX21_CLK_SSI1_DIV] = imx_clk_divider("ssi1_div", "ssi1_sel", CCM_PCDR0, 16, 6);
+        clk[IMX21_CLK_SSI2_DIV] = imx_clk_divider("ssi2_div", "ssi2_sel", CCM_PCDR0, 26, 6);
+
+        clk[IMX21_CLK_PER1] = imx_clk_divider("per1", "mpll_gate", CCM_PCDR1, 0, 6);
+        clk[IMX21_CLK_PER2] = imx_clk_divider("per2", "mpll_gate", CCM_PCDR1, 8, 6);
+        clk[IMX21_CLK_PER3] = imx_clk_divider("per3", "mpll_gate", CCM_PCDR1, 16, 6);
+        clk[IMX21_CLK_PER4] = imx_clk_divider("per4", "mpll_gate", CCM_PCDR1, 24, 6);
+
+        clk[IMX21_CLK_UART1_IPG_GATE] = imx_clk_gate("uart1_ipg_gate", "ipg", CCM_PCCR0, 0);
+        clk[IMX21_CLK_UART2_IPG_GATE] = imx_clk_gate("uart2_ipg_gate", "ipg", CCM_PCCR0, 1);
+        clk[IMX21_CLK_UART3_IPG_GATE] = imx_clk_gate("uart3_ipg_gate", "ipg", CCM_PCCR0, 2);
+        clk[IMX21_CLK_UART4_IPG_GATE] = imx_clk_gate("uart4_ipg_gate", "ipg", CCM_PCCR0, 3);
+        clk[IMX21_CLK_CSPI1_IPG_GATE] = imx_clk_gate("cspi1_ipg_gate", "ipg", CCM_PCCR0, 4);
+        clk[IMX21_CLK_CSPI2_IPG_GATE] = imx_clk_gate("cspi2_ipg_gate", "ipg", CCM_PCCR0, 5);
+        clk[IMX21_CLK_SSI1_GATE] = imx_clk_gate("ssi1_gate", "ipg", CCM_PCCR0, 6);
+        clk[IMX21_CLK_SSI2_GATE] = imx_clk_gate("ssi2_gate", "ipg", CCM_PCCR0, 7);
+        clk[IMX21_CLK_SDHC1_IPG_GATE] = imx_clk_gate("sdhc1_ipg_gate", "ipg", CCM_PCCR0, 9);
+        clk[IMX21_CLK_SDHC2_IPG_GATE] = imx_clk_gate("sdhc2_ipg_gate", "ipg", CCM_PCCR0, 10);
+        clk[IMX21_CLK_GPIO_GATE] = imx_clk_gate("gpio_gate", "ipg", CCM_PCCR0, 11);
+        clk[IMX21_CLK_I2C_GATE] = imx_clk_gate("i2c_gate", "ipg", CCM_PCCR0, 12);
+        clk[IMX21_CLK_DMA_GATE] = imx_clk_gate("dma_gate", "ipg", CCM_PCCR0, 13);
+        clk[IMX21_CLK_USB_GATE] = imx_clk_gate("usb_gate", "usb_div", CCM_PCCR0, 14);
+        clk[IMX21_CLK_EMMA_GATE] = imx_clk_gate("emma_gate", "ipg", CCM_PCCR0, 15);
+        clk[IMX21_CLK_SSI2_BAUD_GATE] = imx_clk_gate("ssi2_baud_gate", "ipg", CCM_PCCR0, 16);
+        clk[IMX21_CLK_SSI1_BAUD_GATE] = imx_clk_gate("ssi1_baud_gate", "ipg", CCM_PCCR0, 17);
+        clk[IMX21_CLK_LCDC_IPG_GATE] = imx_clk_gate("lcdc_ipg_gate", "ipg", CCM_PCCR0, 18);
+        clk[IMX21_CLK_NFC_GATE] = imx_clk_gate("nfc_gate", "nfc_div", CCM_PCCR0, 19);
+        clk[IMX21_CLK_SLCDC_HCLK_GATE] = imx_clk_gate("slcdc_hclk_gate", "hclk", CCM_PCCR0, 21);
+        clk[IMX21_CLK_PER4_GATE] = imx_clk_gate("per4_gate", "per4", CCM_PCCR0, 22);
+        clk[IMX21_CLK_BMI_GATE] = imx_clk_gate("bmi_gate", "hclk", CCM_PCCR0, 23);
+        clk[IMX21_CLK_USB_HCLK_GATE] = imx_clk_gate("usb_hclk_gate", "hclk", CCM_PCCR0, 24);
+        clk[IMX21_CLK_SLCDC_GATE] = imx_clk_gate("slcdc_gate", "hclk", CCM_PCCR0, 25);
+        clk[IMX21_CLK_LCDC_HCLK_GATE] = imx_clk_gate("lcdc_hclk_gate", "hclk", CCM_PCCR0, 26);
+        clk[IMX21_CLK_EMMA_HCLK_GATE] = imx_clk_gate("emma_hclk_gate", "hclk", CCM_PCCR0, 27);
+        clk[IMX21_CLK_BROM_GATE] = imx_clk_gate("brom_gate", "hclk", CCM_PCCR0, 28);
+        clk[IMX21_CLK_DMA_HCLK_GATE] = imx_clk_gate("dma_hclk_gate", "hclk", CCM_PCCR0, 30);
+        clk[IMX21_CLK_CSI_HCLK_GATE] = imx_clk_gate("csi_hclk_gate", "hclk", CCM_PCCR0, 31);
+
+        clk[IMX21_CLK_CSPI3_IPG_GATE] = imx_clk_gate("cspi3_ipg_gate", "ipg", CCM_PCCR1, 23);
+        clk[IMX21_CLK_WDOG_GATE] = imx_clk_gate("wdog_gate", "ipg", CCM_PCCR1, 24);
+        clk[IMX21_CLK_GPT1_IPG_GATE] = imx_clk_gate("gpt1_ipg_gate", "ipg", CCM_PCCR1, 25);
+        clk[IMX21_CLK_GPT2_IPG_GATE] = imx_clk_gate("gpt2_ipg_gate", "ipg", CCM_PCCR1, 26);
+        clk[IMX21_CLK_GPT3_IPG_GATE] = imx_clk_gate("gpt3_ipg_gate", "ipg", CCM_PCCR1, 27);
+        clk[IMX21_CLK_PWM_IPG_GATE] = imx_clk_gate("pwm_ipg_gate", "ipg", CCM_PCCR1, 28);
+        clk[IMX21_CLK_RTC_GATE] = imx_clk_gate("rtc_gate", "ipg", CCM_PCCR1, 29);
+        clk[IMX21_CLK_KPP_GATE] = imx_clk_gate("kpp_gate", "ipg", CCM_PCCR1, 30);
+        clk[IMX21_CLK_OWIRE_GATE] = imx_clk_gate("owire_gate", "ipg", CCM_PCCR1, 31);
+
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
+}
 
-/*
- * must be called very early to get information about the
- * available clock rate when the timer framework starts
- */
 int __init mx21_clocks_init(unsigned long lref, unsigned long href)
 {
-        int i;
-
-        clk[ckil] = imx_clk_fixed("ckil", lref);
-        clk[ckih] = imx_clk_fixed("ckih", href);
-        clk[fpm] = imx_clk_fixed_factor("fpm", "ckil", 512, 1);
-        clk[mpll_sel] = imx_clk_mux("mpll_sel", CCM_CSCR, 16, 1, mpll_sel_clks,
-                        ARRAY_SIZE(mpll_sel_clks));
-        clk[spll_sel] = imx_clk_mux("spll_sel", CCM_CSCR, 17, 1, spll_sel_clks,
-                        ARRAY_SIZE(spll_sel_clks));
-        clk[mpll] = imx_clk_pllv1("mpll", "mpll_sel", CCM_MPCTL0);
-        clk[spll] = imx_clk_pllv1("spll", "spll_sel", CCM_SPCTL0);
-        clk[fclk] = imx_clk_divider("fclk", "mpll", CCM_CSCR, 29, 3);
-        clk[hclk] = imx_clk_divider("hclk", "fclk", CCM_CSCR, 10, 4);
-        clk[ipg] = imx_clk_divider("ipg", "hclk", CCM_CSCR, 9, 1);
-        clk[per1] = imx_clk_divider("per1", "mpll", CCM_PCDR1, 0, 6);
-        clk[per2] = imx_clk_divider("per2", "mpll", CCM_PCDR1, 8, 6);
-        clk[per3] = imx_clk_divider("per3", "mpll", CCM_PCDR1, 16, 6);
-        clk[per4] = imx_clk_divider("per4", "mpll", CCM_PCDR1, 24, 6);
-        clk[uart1_ipg_gate] = imx_clk_gate("uart1_ipg_gate", "ipg", CCM_PCCR0, 0);
-        clk[uart2_ipg_gate] = imx_clk_gate("uart2_ipg_gate", "ipg", CCM_PCCR0, 1);
-        clk[uart3_ipg_gate] = imx_clk_gate("uart3_ipg_gate", "ipg", CCM_PCCR0, 2);
-        clk[uart4_ipg_gate] = imx_clk_gate("uart4_ipg_gate", "ipg", CCM_PCCR0, 3);
-        clk[gpt1_ipg_gate] = imx_clk_gate("gpt1_ipg_gate", "ipg", CCM_PCCR1, 25);
-        clk[gpt2_ipg_gate] = imx_clk_gate("gpt2_ipg_gate", "ipg", CCM_PCCR1, 26);
-        clk[gpt3_ipg_gate] = imx_clk_gate("gpt3_ipg_gate", "ipg", CCM_PCCR1, 27);
-        clk[pwm_ipg_gate] = imx_clk_gate("pwm_ipg_gate", "ipg", CCM_PCCR1, 28);
-        clk[sdhc1_ipg_gate] = imx_clk_gate("sdhc1_ipg_gate", "ipg", CCM_PCCR0, 9);
-        clk[sdhc2_ipg_gate] = imx_clk_gate("sdhc2_ipg_gate", "ipg", CCM_PCCR0, 10);
-        clk[lcdc_ipg_gate] = imx_clk_gate("lcdc_ipg_gate", "ipg", CCM_PCCR0, 18);
-        clk[lcdc_hclk_gate] = imx_clk_gate("lcdc_hclk_gate", "hclk", CCM_PCCR0, 26);
-        clk[cspi3_ipg_gate] = imx_clk_gate("cspi3_ipg_gate", "ipg", CCM_PCCR1, 23);
-        clk[cspi2_ipg_gate] = imx_clk_gate("cspi2_ipg_gate", "ipg", CCM_PCCR0, 5);
-        clk[cspi1_ipg_gate] = imx_clk_gate("cspi1_ipg_gate", "ipg", CCM_PCCR0, 4);
-        clk[per4_gate] = imx_clk_gate("per4_gate", "per4", CCM_PCCR0, 22);
-        clk[csi_hclk_gate] = imx_clk_gate("csi_hclk_gate", "hclk", CCM_PCCR0, 31);
-        clk[usb_div] = imx_clk_divider("usb_div", "spll", CCM_CSCR, 26, 3);
-        clk[usb_gate] = imx_clk_gate("usb_gate", "usb_div", CCM_PCCR0, 14);
-        clk[usb_hclk_gate] = imx_clk_gate("usb_hclk_gate", "hclk", CCM_PCCR0, 24);
-        clk[ssi1_gate] = imx_clk_gate("ssi1_gate", "ipg", CCM_PCCR0, 6);
-        clk[ssi2_gate] = imx_clk_gate("ssi2_gate", "ipg", CCM_PCCR0, 7);
-        clk[nfc_div] = imx_clk_divider("nfc_div", "ipg", CCM_PCDR0, 12, 4);
-        clk[nfc_gate] = imx_clk_gate("nfc_gate", "nfc_div", CCM_PCCR0, 19);
-        clk[dma_gate] = imx_clk_gate("dma_gate", "ipg", CCM_PCCR0, 13);
-        clk[dma_hclk_gate] = imx_clk_gate("dma_hclk_gate", "hclk", CCM_PCCR0, 30);
-        clk[brom_gate] = imx_clk_gate("brom_gate", "hclk", CCM_PCCR0, 28);
-        clk[emma_gate] = imx_clk_gate("emma_gate", "ipg", CCM_PCCR0, 15);
-        clk[emma_hclk_gate] = imx_clk_gate("emma_hclk_gate", "hclk", CCM_PCCR0, 27);
-        clk[slcdc_gate] = imx_clk_gate("slcdc_gate", "ipg", CCM_PCCR0, 25);
-        clk[slcdc_hclk_gate] = imx_clk_gate("slcdc_hclk_gate", "hclk", CCM_PCCR0, 21);
-        clk[wdog_gate] = imx_clk_gate("wdog_gate", "ipg", CCM_PCCR1, 24);
-        clk[gpio_gate] = imx_clk_gate("gpio_gate", "ipg", CCM_PCCR0, 11);
-        clk[i2c_gate] = imx_clk_gate("i2c_gate", "ipg", CCM_PCCR0, 12);
-        clk[kpp_gate] = imx_clk_gate("kpp_gate", "ipg", CCM_PCCR1, 30);
-        clk[owire_gate] = imx_clk_gate("owire_gate", "ipg", CCM_PCCR1, 31);
-        clk[rtc_gate] = imx_clk_gate("rtc_gate", "ipg", CCM_PCCR1, 29);
-
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("i.MX21 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
-
-        clk_register_clkdev(clk[per1], "per1", NULL);
-        clk_register_clkdev(clk[per2], "per2", NULL);
-        clk_register_clkdev(clk[per3], "per3", NULL);
-        clk_register_clkdev(clk[per4], "per4", NULL);
-        clk_register_clkdev(clk[per1], "per", "imx21-uart.0");
-        clk_register_clkdev(clk[uart1_ipg_gate], "ipg", "imx21-uart.0");
-        clk_register_clkdev(clk[per1], "per", "imx21-uart.1");
-        clk_register_clkdev(clk[uart2_ipg_gate], "ipg", "imx21-uart.1");
-        clk_register_clkdev(clk[per1], "per", "imx21-uart.2");
-        clk_register_clkdev(clk[uart3_ipg_gate], "ipg", "imx21-uart.2");
-        clk_register_clkdev(clk[per1], "per", "imx21-uart.3");
-        clk_register_clkdev(clk[uart4_ipg_gate], "ipg", "imx21-uart.3");
-        clk_register_clkdev(clk[gpt1_ipg_gate], "ipg", "imx-gpt.0");
-        clk_register_clkdev(clk[per1], "per", "imx-gpt.0");
-        clk_register_clkdev(clk[gpt2_ipg_gate], "ipg", "imx-gpt.1");
-        clk_register_clkdev(clk[per1], "per", "imx-gpt.1");
-        clk_register_clkdev(clk[gpt3_ipg_gate], "ipg", "imx-gpt.2");
-        clk_register_clkdev(clk[per1], "per", "imx-gpt.2");
-        clk_register_clkdev(clk[per2], "per", "imx21-cspi.0");
-        clk_register_clkdev(clk[cspi1_ipg_gate], "ipg", "imx21-cspi.0");
-        clk_register_clkdev(clk[per2], "per", "imx21-cspi.1");
-        clk_register_clkdev(clk[cspi2_ipg_gate], "ipg", "imx21-cspi.1");
-        clk_register_clkdev(clk[per2], "per", "imx21-cspi.2");
-        clk_register_clkdev(clk[cspi3_ipg_gate], "ipg", "imx21-cspi.2");
-        clk_register_clkdev(clk[per3], "per", "imx21-fb.0");
-        clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0");
-        clk_register_clkdev(clk[lcdc_hclk_gate], "ahb", "imx21-fb.0");
-        clk_register_clkdev(clk[usb_gate], "per", "imx21-hcd.0");
-        clk_register_clkdev(clk[usb_hclk_gate], "ahb", "imx21-hcd.0");
-        clk_register_clkdev(clk[nfc_gate], NULL, "imx21-nand.0");
-        clk_register_clkdev(clk[dma_hclk_gate], "ahb", "imx21-dma");
-        clk_register_clkdev(clk[dma_gate], "ipg", "imx21-dma");
-        clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0");
-        clk_register_clkdev(clk[i2c_gate], NULL, "imx21-i2c.0");
-        clk_register_clkdev(clk[kpp_gate], NULL, "mxc-keypad");
-        clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1.0");
-        clk_register_clkdev(clk[brom_gate], "brom", NULL);
-        clk_register_clkdev(clk[emma_gate], "emma", NULL);
-        clk_register_clkdev(clk[slcdc_gate], "slcdc", NULL);
-        clk_register_clkdev(clk[gpio_gate], "gpio", NULL);
-        clk_register_clkdev(clk[rtc_gate], "rtc", NULL);
-        clk_register_clkdev(clk[csi_hclk_gate], "csi", NULL);
-        clk_register_clkdev(clk[ssi1_gate], "ssi1", NULL);
-        clk_register_clkdev(clk[ssi2_gate], "ssi2", NULL);
-        clk_register_clkdev(clk[sdhc1_ipg_gate], "sdhc1", NULL);
-        clk_register_clkdev(clk[sdhc2_ipg_gate], "sdhc2", NULL);
+        ccm = ioremap(MX21_CCM_BASE_ADDR, SZ_2K);
+
+        _mx21_clocks_init(lref, href);
+
+        clk_register_clkdev(clk[IMX21_CLK_PER1], "per", "imx21-uart.0");
+        clk_register_clkdev(clk[IMX21_CLK_UART1_IPG_GATE], "ipg", "imx21-uart.0");
+        clk_register_clkdev(clk[IMX21_CLK_PER1], "per", "imx21-uart.1");
+        clk_register_clkdev(clk[IMX21_CLK_UART2_IPG_GATE], "ipg", "imx21-uart.1");
+        clk_register_clkdev(clk[IMX21_CLK_PER1], "per", "imx21-uart.2");
+        clk_register_clkdev(clk[IMX21_CLK_UART3_IPG_GATE], "ipg", "imx21-uart.2");
+        clk_register_clkdev(clk[IMX21_CLK_PER1], "per", "imx21-uart.3");
+        clk_register_clkdev(clk[IMX21_CLK_UART4_IPG_GATE], "ipg", "imx21-uart.3");
+        clk_register_clkdev(clk[IMX21_CLK_GPT1_IPG_GATE], "ipg", "imx-gpt.0");
+        clk_register_clkdev(clk[IMX21_CLK_PER1], "per", "imx-gpt.0");
+        clk_register_clkdev(clk[IMX21_CLK_PER2], "per", "imx21-cspi.0");
+        clk_register_clkdev(clk[IMX21_CLK_CSPI1_IPG_GATE], "ipg", "imx21-cspi.0");
+        clk_register_clkdev(clk[IMX21_CLK_PER2], "per", "imx21-cspi.1");
+        clk_register_clkdev(clk[IMX21_CLK_CSPI2_IPG_GATE], "ipg", "imx21-cspi.1");
+        clk_register_clkdev(clk[IMX21_CLK_PER2], "per", "imx21-cspi.2");
+        clk_register_clkdev(clk[IMX21_CLK_CSPI3_IPG_GATE], "ipg", "imx21-cspi.2");
+        clk_register_clkdev(clk[IMX21_CLK_PER3], "per", "imx21-fb.0");
+        clk_register_clkdev(clk[IMX21_CLK_LCDC_IPG_GATE], "ipg", "imx21-fb.0");
+        clk_register_clkdev(clk[IMX21_CLK_LCDC_HCLK_GATE], "ahb", "imx21-fb.0");
+        clk_register_clkdev(clk[IMX21_CLK_USB_GATE], "per", "imx21-hcd.0");
+        clk_register_clkdev(clk[IMX21_CLK_USB_HCLK_GATE], "ahb", "imx21-hcd.0");
+        clk_register_clkdev(clk[IMX21_CLK_NFC_GATE], NULL, "imx21-nand.0");
+        clk_register_clkdev(clk[IMX21_CLK_DMA_HCLK_GATE], "ahb", "imx21-dma");
+        clk_register_clkdev(clk[IMX21_CLK_DMA_GATE], "ipg", "imx21-dma");
+        clk_register_clkdev(clk[IMX21_CLK_WDOG_GATE], NULL, "imx2-wdt.0");
+        clk_register_clkdev(clk[IMX21_CLK_I2C_GATE], NULL, "imx21-i2c.0");
+        clk_register_clkdev(clk[IMX21_CLK_OWIRE_GATE], NULL, "mxc_w1.0");
 
         mxc_timer_init(MX21_IO_ADDRESS(MX21_GPT1_BASE_ADDR), MX21_INT_GPT1);
 
         return 0;
 }
+
+static void __init mx21_clocks_init_dt(struct device_node *np)
+{
+        ccm = of_iomap(np, 0);
+
+        _mx21_clocks_init(32768, 26000000);
+
+        clk_data.clks = clk;
+        clk_data.clk_num = ARRAY_SIZE(clk);
+        of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
+}
+CLK_OF_DECLARE(imx27_ccm, "fsl,imx21-ccm", mx21_clocks_init_dt);
diff --git a/arch/arm/mach-imx/clk-imx25.c b/arch/arm/mach-imx/clk-imx25.c
index ae578c096ad8..59c0c8558c6b 100644
--- a/arch/arm/mach-imx/clk-imx25.c
+++ b/arch/arm/mach-imx/clk-imx25.c
@@ -32,8 +32,6 @@
 #include "hardware.h"
 #include "mx25.h"
 
-#define CRM_BASE        MX25_IO_ADDRESS(MX25_CRM_BASE_ADDR)
-
 #define CCM_MPCTL       0x00
 #define CCM_UPCTL       0x04
 #define CCM_CCTL        0x08
@@ -56,7 +54,7 @@
 #define CCM_LTR3        0x4c
 #define CCM_MCR         0x64
 
-#define ccm(x)  (CRM_BASE + (x))
+#define ccm(x)  (ccm_base + (x))
 
 static struct clk_onecell_data clk_data;
 
@@ -91,9 +89,10 @@ enum mx25_clks {
 
 static struct clk *clk[clk_max];
 
-static int __init __mx25_clocks_init(unsigned long osc_rate)
+static int __init __mx25_clocks_init(unsigned long osc_rate,
+                                     void __iomem *ccm_base)
 {
-        int i;
+        BUG_ON(!ccm_base);
 
         clk[dummy] = imx_clk_fixed("dummy", 0);
         clk[osc] = imx_clk_fixed("osc", osc_rate);
@@ -224,19 +223,13 @@ static int __init __mx25_clocks_init(unsigned long osc_rate)
         /* CCM_CGCR2(19): reserved in datasheet, but used as wdt in FSL kernel */
         clk[wdt_ipg] = imx_clk_gate("wdt_ipg", "ipg", ccm(CCM_CGCR2), 19);
 
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("i.MX25 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
 
         clk_prepare_enable(clk[emi_ahb]);
 
         /* Clock source for gpt must be derived from AHB */
         clk_set_parent(clk[per5_sel], clk[ahb]);
 
-        clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0");
-        clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
-
         /*
          * Let's initially set up CLKO parent as ipg, since this configuration
          * is used on some imx25 board designs to clock the audio codec.
@@ -248,8 +241,14 @@ static int __init __mx25_clocks_init(unsigned long osc_rate)
 
 int __init mx25_clocks_init(void)
 {
-        __mx25_clocks_init(24000000);
+        void __iomem *ccm;
 
+        ccm = ioremap(MX25_CRM_BASE_ADDR, SZ_16K);
+
+        __mx25_clocks_init(24000000, ccm);
+
+        clk_register_clkdev(clk[gpt1_ipg], "ipg", "imx-gpt.0");
+        clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
         /* i.mx25 has the i.mx21 type uart */
         clk_register_clkdev(clk[uart1_ipg], "ipg", "imx21-uart.0");
         clk_register_clkdev(clk[uart_ipg_per], "per", "imx21-uart.0");
@@ -314,29 +313,27 @@ int __init mx25_clocks_init(void)
         return 0;
 }
 
-int __init mx25_clocks_init_dt(void)
+static void __init mx25_clocks_init_dt(struct device_node *np)
 {
-        struct device_node *np;
+        struct device_node *refnp;
         unsigned long osc_rate = 24000000;
+        void __iomem *ccm;
 
         /* retrieve the freqency of fixed clocks from device tree */
-        for_each_compatible_node(np, NULL, "fixed-clock") {
+        for_each_compatible_node(refnp, NULL, "fixed-clock") {
                 u32 rate;
-                if (of_property_read_u32(np, "clock-frequency", &rate))
+                if (of_property_read_u32(refnp, "clock-frequency", &rate))
                         continue;
 
-                if (of_device_is_compatible(np, "fsl,imx-osc"))
+                if (of_device_is_compatible(refnp, "fsl,imx-osc"))
                         osc_rate = rate;
         }
 
-        np = of_find_compatible_node(NULL, NULL, "fsl,imx25-ccm");
+        ccm = of_iomap(np, 0);
+        __mx25_clocks_init(osc_rate, ccm);
+
         clk_data.clks = clk;
         clk_data.clk_num = ARRAY_SIZE(clk);
         of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
-
-        __mx25_clocks_init(osc_rate);
-
-        mxc_timer_init_dt(of_find_compatible_node(NULL, NULL, "fsl,imx25-gpt"));
-
-        return 0;
 }
+CLK_OF_DECLARE(imx25_ccm, "fsl,imx25-ccm", mx25_clocks_init_dt);
diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c
index 317a662626d6..ab6349ec23b9 100644
--- a/arch/arm/mach-imx/clk-imx27.c
+++ b/arch/arm/mach-imx/clk-imx27.c
@@ -1,61 +1,36 @@
 #include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/module.h>
+#include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/err.h>
-#include <linux/clk-provider.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <dt-bindings/clock/imx27-clock.h>
 
 #include "clk.h"
 #include "common.h"
 #include "hardware.h"
 
-#define IO_ADDR_CCM(off)        (MX27_IO_ADDRESS(MX27_CCM_BASE_ADDR + (off)))
+static void __iomem *ccm __initdata;
 
 /* Register offsets */
-#define CCM_CSCR                IO_ADDR_CCM(0x0)
-#define CCM_MPCTL0              IO_ADDR_CCM(0x4)
-#define CCM_MPCTL1              IO_ADDR_CCM(0x8)
-#define CCM_SPCTL0              IO_ADDR_CCM(0xc)
-#define CCM_SPCTL1              IO_ADDR_CCM(0x10)
-#define CCM_OSC26MCTL           IO_ADDR_CCM(0x14)
-#define CCM_PCDR0               IO_ADDR_CCM(0x18)
-#define CCM_PCDR1               IO_ADDR_CCM(0x1c)
-#define CCM_PCCR0               IO_ADDR_CCM(0x20)
-#define CCM_PCCR1               IO_ADDR_CCM(0x24)
-#define CCM_CCSR                IO_ADDR_CCM(0x28)
-#define CCM_PMCTL               IO_ADDR_CCM(0x2c)
-#define CCM_PMCOUNT             IO_ADDR_CCM(0x30)
-#define CCM_WKGDCTL             IO_ADDR_CCM(0x34)
-
-#define CCM_CSCR_UPDATE_DIS     (1 << 31)
-#define CCM_CSCR_SSI2           (1 << 23)
-#define CCM_CSCR_SSI1           (1 << 22)
-#define CCM_CSCR_VPU            (1 << 21)
-#define CCM_CSCR_MSHC           (1 << 20)
-#define CCM_CSCR_SPLLRES        (1 << 19)
-#define CCM_CSCR_MPLLRES        (1 << 18)
-#define CCM_CSCR_SP             (1 << 17)
-#define CCM_CSCR_MCU            (1 << 16)
-#define CCM_CSCR_OSC26MDIV      (1 << 4)
-#define CCM_CSCR_OSC26M         (1 << 3)
-#define CCM_CSCR_FPM            (1 << 2)
-#define CCM_CSCR_SPEN           (1 << 1)
-#define CCM_CSCR_MPEN           (1 << 0)
-
-/* i.MX27 TO 2+ */
-#define CCM_CSCR_ARM_SRC        (1 << 15)
-
-#define CCM_SPCTL1_LF           (1 << 15)
-#define CCM_SPCTL1_BRMO         (1 << 6)
+#define CCM_CSCR                (ccm + 0x00)
+#define CCM_MPCTL0              (ccm + 0x04)
+#define CCM_MPCTL1              (ccm + 0x08)
+#define CCM_SPCTL0              (ccm + 0x0c)
+#define CCM_SPCTL1              (ccm + 0x10)
+#define CCM_PCDR0               (ccm + 0x18)
+#define CCM_PCDR1               (ccm + 0x1c)
+#define CCM_PCCR0               (ccm + 0x20)
+#define CCM_PCCR1               (ccm + 0x24)
+#define CCM_CCSR                (ccm + 0x28)
 
 static const char *vpu_sel_clks[] = { "spll", "mpll_main2", };
 static const char *cpu_sel_clks[] = { "mpll_main2", "mpll", };
 static const char *mpll_sel_clks[] = { "fpm", "mpll_osc_sel", };
-static const char *mpll_osc_sel_clks[] = { "ckih", "ckih_div1p5", };
+static const char *mpll_osc_sel_clks[] = { "ckih_gate", "ckih_div1p5", };
 static const char *clko_sel_clks[] = {
-        "ckil", "fpm", "ckih", "ckih",
-        "ckih", "mpll", "spll", "cpu_div",
+        "ckil", "fpm", "ckih_gate", "ckih_gate",
+        "ckih_gate", "mpll", "spll", "cpu_div",
         "ahb", "ipg", "per1_div", "per2_div",
         "per3_div", "per4_div", "ssi1_div", "ssi2_div",
         "nfc_div", "mshc_div", "vpu_div", "60m",
@@ -64,239 +39,220 @@ static const char *clko_sel_clks[] = {
 
 static const char *ssi_sel_clks[] = { "spll_gate", "mpll", };
 
-enum mx27_clks {
-        dummy, ckih, ckil, mpll, spll, mpll_main2, ahb, ipg, nfc_div, per1_div,
-        per2_div, per3_div, per4_div, vpu_sel, vpu_div, usb_div, cpu_sel,
-        clko_sel, cpu_div, clko_div, ssi1_sel, ssi2_sel, ssi1_div, ssi2_div,
-        clko_en, ssi2_ipg_gate, ssi1_ipg_gate, slcdc_ipg_gate, sdhc3_ipg_gate,
-        sdhc2_ipg_gate, sdhc1_ipg_gate, scc_ipg_gate, sahara_ipg_gate,
-        rtc_ipg_gate, pwm_ipg_gate, owire_ipg_gate, lcdc_ipg_gate,
-        kpp_ipg_gate, iim_ipg_gate, i2c2_ipg_gate, i2c1_ipg_gate,
-        gpt6_ipg_gate, gpt5_ipg_gate, gpt4_ipg_gate, gpt3_ipg_gate,
-        gpt2_ipg_gate, gpt1_ipg_gate, gpio_ipg_gate, fec_ipg_gate,
-        emma_ipg_gate, dma_ipg_gate, cspi3_ipg_gate, cspi2_ipg_gate,
-        cspi1_ipg_gate, nfc_baud_gate, ssi2_baud_gate, ssi1_baud_gate,
-        vpu_baud_gate, per4_gate, per3_gate, per2_gate, per1_gate,
-        usb_ahb_gate, slcdc_ahb_gate, sahara_ahb_gate, lcdc_ahb_gate,
-        vpu_ahb_gate, fec_ahb_gate, emma_ahb_gate, emi_ahb_gate, dma_ahb_gate,
-        csi_ahb_gate, brom_ahb_gate, ata_ahb_gate, wdog_ipg_gate, usb_ipg_gate,
-        uart6_ipg_gate, uart5_ipg_gate, uart4_ipg_gate, uart3_ipg_gate,
-        uart2_ipg_gate, uart1_ipg_gate, ckih_div1p5, fpm, mpll_osc_sel,
-        mpll_sel, spll_gate, mshc_div, rtic_ipg_gate, mshc_ipg_gate,
-        rtic_ahb_gate, mshc_baud_gate, clk_max
-};
-
-static struct clk *clk[clk_max];
+static struct clk *clk[IMX27_CLK_MAX];
 static struct clk_onecell_data clk_data;
 
-int __init mx27_clocks_init(unsigned long fref)
+static void __init _mx27_clocks_init(unsigned long fref)
 {
-        int i;
-        struct device_node *np;
-
-        clk[dummy] = imx_clk_fixed("dummy", 0);
-        clk[ckih] = imx_clk_fixed("ckih", fref);
-        clk[ckil] = imx_clk_fixed("ckil", 32768);
-        clk[fpm] = imx_clk_fixed_factor("fpm", "ckil", 1024, 1);
-        clk[ckih_div1p5] = imx_clk_fixed_factor("ckih_div1p5", "ckih", 2, 3);
+        BUG_ON(!ccm);
 
-        clk[mpll_osc_sel] = imx_clk_mux("mpll_osc_sel", CCM_CSCR, 4, 1,
-                        mpll_osc_sel_clks,
-                        ARRAY_SIZE(mpll_osc_sel_clks));
-        clk[mpll_sel] = imx_clk_mux("mpll_sel", CCM_CSCR, 16, 1, mpll_sel_clks,
-                        ARRAY_SIZE(mpll_sel_clks));
-        clk[mpll] = imx_clk_pllv1("mpll", "mpll_sel", CCM_MPCTL0);
-        clk[spll] = imx_clk_pllv1("spll", "ckih", CCM_SPCTL0);
-        clk[spll_gate] = imx_clk_gate("spll_gate", "spll", CCM_CSCR, 1);
-        clk[mpll_main2] = imx_clk_fixed_factor("mpll_main2", "mpll", 2, 3);
+        clk[IMX27_CLK_DUMMY] = imx_clk_fixed("dummy", 0);
+        clk[IMX27_CLK_CKIH] = imx_clk_fixed("ckih", fref);
+        clk[IMX27_CLK_CKIL] = imx_clk_fixed("ckil", 32768);
+        clk[IMX27_CLK_FPM] = imx_clk_fixed_factor("fpm", "ckil", 1024, 1);
+        clk[IMX27_CLK_CKIH_DIV1P5] = imx_clk_fixed_factor("ckih_div1p5", "ckih_gate", 2, 3);
+        clk[IMX27_CLK_CKIH_GATE] = imx_clk_gate_dis("ckih_gate", "ckih", CCM_CSCR, 3);
+        clk[IMX27_CLK_MPLL_OSC_SEL] = imx_clk_mux("mpll_osc_sel", CCM_CSCR, 4, 1, mpll_osc_sel_clks, ARRAY_SIZE(mpll_osc_sel_clks));
+        clk[IMX27_CLK_MPLL_SEL] = imx_clk_mux("mpll_sel", CCM_CSCR, 16, 1, mpll_sel_clks, ARRAY_SIZE(mpll_sel_clks));
+        clk[IMX27_CLK_MPLL] = imx_clk_pllv1("mpll", "mpll_sel", CCM_MPCTL0);
+        clk[IMX27_CLK_SPLL] = imx_clk_pllv1("spll", "ckih_gate", CCM_SPCTL0);
+        clk[IMX27_CLK_SPLL_GATE] = imx_clk_gate("spll_gate", "spll", CCM_CSCR, 1);
+        clk[IMX27_CLK_MPLL_MAIN2] = imx_clk_fixed_factor("mpll_main2", "mpll", 2, 3);
 
         if (mx27_revision() >= IMX_CHIP_REVISION_2_0) {
-                clk[ahb] = imx_clk_divider("ahb", "mpll_main2", CCM_CSCR, 8, 2);
-                clk[ipg] = imx_clk_fixed_factor("ipg", "ahb", 1, 2);
+                clk[IMX27_CLK_AHB] = imx_clk_divider("ahb", "mpll_main2", CCM_CSCR, 8, 2);
+                clk[IMX27_CLK_IPG] = imx_clk_fixed_factor("ipg", "ahb", 1, 2);
         } else {
-                clk[ahb] = imx_clk_divider("ahb", "mpll_main2", CCM_CSCR, 9, 4);
-                clk[ipg] = imx_clk_divider("ipg", "ahb", CCM_CSCR, 8, 1);
+                clk[IMX27_CLK_AHB] = imx_clk_divider("ahb", "mpll_main2", CCM_CSCR, 9, 4);
+                clk[IMX27_CLK_IPG] = imx_clk_divider("ipg", "ahb", CCM_CSCR, 8, 1);
         }
 
-        clk[mshc_div] = imx_clk_divider("mshc_div", "ahb", CCM_PCDR0, 0, 6);
-        clk[nfc_div] = imx_clk_divider("nfc_div", "ahb", CCM_PCDR0, 6, 4);
-        clk[per1_div] = imx_clk_divider("per1_div", "mpll_main2", CCM_PCDR1, 0, 6);
-        clk[per2_div] = imx_clk_divider("per2_div", "mpll_main2", CCM_PCDR1, 8, 6);
-        clk[per3_div] = imx_clk_divider("per3_div", "mpll_main2", CCM_PCDR1, 16, 6);
-        clk[per4_div] = imx_clk_divider("per4_div", "mpll_main2", CCM_PCDR1, 24, 6);
-        clk[vpu_sel] = imx_clk_mux("vpu_sel", CCM_CSCR, 21, 1, vpu_sel_clks, ARRAY_SIZE(vpu_sel_clks));
-        clk[vpu_div] = imx_clk_divider("vpu_div", "vpu_sel", CCM_PCDR0, 10, 6);
-        clk[usb_div] = imx_clk_divider("usb_div", "spll_gate", CCM_CSCR, 28, 3);
-        clk[cpu_sel] = imx_clk_mux("cpu_sel", CCM_CSCR, 15, 1, cpu_sel_clks, ARRAY_SIZE(cpu_sel_clks));
-        clk[clko_sel] = imx_clk_mux("clko_sel", CCM_CCSR, 0, 5, clko_sel_clks, ARRAY_SIZE(clko_sel_clks));
+        clk[IMX27_CLK_MSHC_DIV] = imx_clk_divider("mshc_div", "ahb", CCM_PCDR0, 0, 6);
+        clk[IMX27_CLK_NFC_DIV] = imx_clk_divider("nfc_div", "ahb", CCM_PCDR0, 6, 4);
+        clk[IMX27_CLK_PER1_DIV] = imx_clk_divider("per1_div", "mpll_main2", CCM_PCDR1, 0, 6);
+        clk[IMX27_CLK_PER2_DIV] = imx_clk_divider("per2_div", "mpll_main2", CCM_PCDR1, 8, 6);
+        clk[IMX27_CLK_PER3_DIV] = imx_clk_divider("per3_div", "mpll_main2", CCM_PCDR1, 16, 6);
+        clk[IMX27_CLK_PER4_DIV] = imx_clk_divider("per4_div", "mpll_main2", CCM_PCDR1, 24, 6);
+        clk[IMX27_CLK_VPU_SEL] = imx_clk_mux("vpu_sel", CCM_CSCR, 21, 1, vpu_sel_clks, ARRAY_SIZE(vpu_sel_clks));
+        clk[IMX27_CLK_VPU_DIV] = imx_clk_divider("vpu_div", "vpu_sel", CCM_PCDR0, 10, 6);
+        clk[IMX27_CLK_USB_DIV] = imx_clk_divider("usb_div", "spll_gate", CCM_CSCR, 28, 3);
+        clk[IMX27_CLK_CPU_SEL] = imx_clk_mux("cpu_sel", CCM_CSCR, 15, 1, cpu_sel_clks, ARRAY_SIZE(cpu_sel_clks));
+        clk[IMX27_CLK_CLKO_SEL] = imx_clk_mux("clko_sel", CCM_CCSR, 0, 5, clko_sel_clks, ARRAY_SIZE(clko_sel_clks));
+
         if (mx27_revision() >= IMX_CHIP_REVISION_2_0)
-                clk[cpu_div] = imx_clk_divider("cpu_div", "cpu_sel", CCM_CSCR, 12, 2);
+                clk[IMX27_CLK_CPU_DIV] = imx_clk_divider("cpu_div", "cpu_sel", CCM_CSCR, 12, 2);
         else
-                clk[cpu_div] = imx_clk_divider("cpu_div", "cpu_sel", CCM_CSCR, 13, 3);
-        clk[clko_div] = imx_clk_divider("clko_div", "clko_sel", CCM_PCDR0, 22, 3);
-        clk[ssi1_sel] = imx_clk_mux("ssi1_sel", CCM_CSCR, 22, 1, ssi_sel_clks, ARRAY_SIZE(ssi_sel_clks));
-        clk[ssi2_sel] = imx_clk_mux("ssi2_sel", CCM_CSCR, 23, 1, ssi_sel_clks, ARRAY_SIZE(ssi_sel_clks));
-        clk[ssi1_div] = imx_clk_divider("ssi1_div", "ssi1_sel", CCM_PCDR0, 16, 6);
-        clk[ssi2_div] = imx_clk_divider("ssi2_div", "ssi2_sel", CCM_PCDR0, 26, 6);
-        clk[clko_en] = imx_clk_gate("clko_en", "clko_div", CCM_PCCR0, 0);
-        clk[ssi2_ipg_gate] = imx_clk_gate("ssi2_ipg_gate", "ipg", CCM_PCCR0, 0);
-        clk[ssi1_ipg_gate] = imx_clk_gate("ssi1_ipg_gate", "ipg", CCM_PCCR0, 1);
-        clk[slcdc_ipg_gate] = imx_clk_gate("slcdc_ipg_gate", "ipg", CCM_PCCR0, 2);
-        clk[sdhc3_ipg_gate] = imx_clk_gate("sdhc3_ipg_gate", "ipg", CCM_PCCR0, 3);
-        clk[sdhc2_ipg_gate] = imx_clk_gate("sdhc2_ipg_gate", "ipg", CCM_PCCR0, 4);
-        clk[sdhc1_ipg_gate] = imx_clk_gate("sdhc1_ipg_gate", "ipg", CCM_PCCR0, 5);
-        clk[scc_ipg_gate] = imx_clk_gate("scc_ipg_gate", "ipg", CCM_PCCR0, 6);
-        clk[sahara_ipg_gate] = imx_clk_gate("sahara_ipg_gate", "ipg", CCM_PCCR0, 7);
-        clk[rtic_ipg_gate] = imx_clk_gate("rtic_ipg_gate", "ipg", CCM_PCCR0, 8);
-        clk[rtc_ipg_gate] = imx_clk_gate("rtc_ipg_gate", "ipg", CCM_PCCR0, 9);
-        clk[pwm_ipg_gate] = imx_clk_gate("pwm_ipg_gate", "ipg", CCM_PCCR0, 11);
-        clk[owire_ipg_gate] = imx_clk_gate("owire_ipg_gate", "ipg", CCM_PCCR0, 12);
-        clk[mshc_ipg_gate] = imx_clk_gate("mshc_ipg_gate", "ipg", CCM_PCCR0, 13);
-        clk[lcdc_ipg_gate] = imx_clk_gate("lcdc_ipg_gate", "ipg", CCM_PCCR0, 14);
-        clk[kpp_ipg_gate] = imx_clk_gate("kpp_ipg_gate", "ipg", CCM_PCCR0, 15);
-        clk[iim_ipg_gate] = imx_clk_gate("iim_ipg_gate", "ipg", CCM_PCCR0, 16);
-        clk[i2c2_ipg_gate] = imx_clk_gate("i2c2_ipg_gate", "ipg", CCM_PCCR0, 17);
-        clk[i2c1_ipg_gate] = imx_clk_gate("i2c1_ipg_gate", "ipg", CCM_PCCR0, 18);
-        clk[gpt6_ipg_gate] = imx_clk_gate("gpt6_ipg_gate", "ipg", CCM_PCCR0, 19);
-        clk[gpt5_ipg_gate] = imx_clk_gate("gpt5_ipg_gate", "ipg", CCM_PCCR0, 20);
-        clk[gpt4_ipg_gate] = imx_clk_gate("gpt4_ipg_gate", "ipg", CCM_PCCR0, 21);
-        clk[gpt3_ipg_gate] = imx_clk_gate("gpt3_ipg_gate", "ipg", CCM_PCCR0, 22);
-        clk[gpt2_ipg_gate] = imx_clk_gate("gpt2_ipg_gate", "ipg", CCM_PCCR0, 23);
-        clk[gpt1_ipg_gate] = imx_clk_gate("gpt1_ipg_gate", "ipg", CCM_PCCR0, 24);
-        clk[gpio_ipg_gate] = imx_clk_gate("gpio_ipg_gate", "ipg", CCM_PCCR0, 25);
-        clk[fec_ipg_gate] = imx_clk_gate("fec_ipg_gate", "ipg", CCM_PCCR0, 26);
-        clk[emma_ipg_gate] = imx_clk_gate("emma_ipg_gate", "ipg", CCM_PCCR0, 27);
-        clk[dma_ipg_gate] = imx_clk_gate("dma_ipg_gate", "ipg", CCM_PCCR0, 28);
-        clk[cspi3_ipg_gate] = imx_clk_gate("cspi3_ipg_gate", "ipg", CCM_PCCR0, 29);
-        clk[cspi2_ipg_gate] = imx_clk_gate("cspi2_ipg_gate", "ipg", CCM_PCCR0, 30);
-        clk[cspi1_ipg_gate] = imx_clk_gate("cspi1_ipg_gate", "ipg", CCM_PCCR0, 31);
-        clk[mshc_baud_gate] = imx_clk_gate("mshc_baud_gate", "mshc_div", CCM_PCCR1, 2);
-        clk[nfc_baud_gate] = imx_clk_gate("nfc_baud_gate", "nfc_div", CCM_PCCR1,  3);
-        clk[ssi2_baud_gate] = imx_clk_gate("ssi2_baud_gate", "ssi2_div", CCM_PCCR1,  4);
-        clk[ssi1_baud_gate] = imx_clk_gate("ssi1_baud_gate", "ssi1_div", CCM_PCCR1,  5);
-        clk[vpu_baud_gate] = imx_clk_gate("vpu_baud_gate", "vpu_div", CCM_PCCR1,  6);
-        clk[per4_gate] = imx_clk_gate("per4_gate", "per4_div", CCM_PCCR1,  7);
-        clk[per3_gate] = imx_clk_gate("per3_gate", "per3_div", CCM_PCCR1,  8);
-        clk[per2_gate] = imx_clk_gate("per2_gate", "per2_div", CCM_PCCR1,  9);
-        clk[per1_gate] = imx_clk_gate("per1_gate", "per1_div", CCM_PCCR1, 10);
-        clk[usb_ahb_gate] = imx_clk_gate("usb_ahb_gate", "ahb", CCM_PCCR1, 11);
-        clk[slcdc_ahb_gate] = imx_clk_gate("slcdc_ahb_gate", "ahb", CCM_PCCR1, 12);
-        clk[sahara_ahb_gate] = imx_clk_gate("sahara_ahb_gate", "ahb", CCM_PCCR1, 13);
-        clk[rtic_ahb_gate] = imx_clk_gate("rtic_ahb_gate", "ahb", CCM_PCCR1, 14);
-        clk[lcdc_ahb_gate] = imx_clk_gate("lcdc_ahb_gate", "ahb", CCM_PCCR1, 15);
-        clk[vpu_ahb_gate] = imx_clk_gate("vpu_ahb_gate", "ahb", CCM_PCCR1, 16);
-        clk[fec_ahb_gate] = imx_clk_gate("fec_ahb_gate", "ahb", CCM_PCCR1, 17);
-        clk[emma_ahb_gate] = imx_clk_gate("emma_ahb_gate", "ahb", CCM_PCCR1, 18);
-        clk[emi_ahb_gate] = imx_clk_gate("emi_ahb_gate", "ahb", CCM_PCCR1, 19);
-        clk[dma_ahb_gate] = imx_clk_gate("dma_ahb_gate", "ahb", CCM_PCCR1, 20);
-        clk[csi_ahb_gate] = imx_clk_gate("csi_ahb_gate", "ahb", CCM_PCCR1, 21);
-        clk[brom_ahb_gate] = imx_clk_gate("brom_ahb_gate", "ahb", CCM_PCCR1, 22);
-        clk[ata_ahb_gate] = imx_clk_gate("ata_ahb_gate", "ahb", CCM_PCCR1, 23);
-        clk[wdog_ipg_gate] = imx_clk_gate("wdog_ipg_gate", "ipg", CCM_PCCR1, 24);
-        clk[usb_ipg_gate] = imx_clk_gate("usb_ipg_gate", "ipg", CCM_PCCR1, 25);
-        clk[uart6_ipg_gate] = imx_clk_gate("uart6_ipg_gate", "ipg", CCM_PCCR1, 26);
-        clk[uart5_ipg_gate] = imx_clk_gate("uart5_ipg_gate", "ipg", CCM_PCCR1, 27);
-        clk[uart4_ipg_gate] = imx_clk_gate("uart4_ipg_gate", "ipg", CCM_PCCR1, 28);
-        clk[uart3_ipg_gate] = imx_clk_gate("uart3_ipg_gate", "ipg", CCM_PCCR1, 29);
-        clk[uart2_ipg_gate] = imx_clk_gate("uart2_ipg_gate", "ipg", CCM_PCCR1, 30);
-        clk[uart1_ipg_gate] = imx_clk_gate("uart1_ipg_gate", "ipg", CCM_PCCR1, 31);
+                clk[IMX27_CLK_CPU_DIV] = imx_clk_divider("cpu_div", "cpu_sel", CCM_CSCR, 13, 3);
 
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("i.MX27 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
+        clk[IMX27_CLK_CLKO_DIV] = imx_clk_divider("clko_div", "clko_sel", CCM_PCDR0, 22, 3);
+        clk[IMX27_CLK_SSI1_SEL] = imx_clk_mux("ssi1_sel", CCM_CSCR, 22, 1, ssi_sel_clks, ARRAY_SIZE(ssi_sel_clks));
+        clk[IMX27_CLK_SSI2_SEL] = imx_clk_mux("ssi2_sel", CCM_CSCR, 23, 1, ssi_sel_clks, ARRAY_SIZE(ssi_sel_clks));
+        clk[IMX27_CLK_SSI1_DIV] = imx_clk_divider("ssi1_div", "ssi1_sel", CCM_PCDR0, 16, 6);
+        clk[IMX27_CLK_SSI2_DIV] = imx_clk_divider("ssi2_div", "ssi2_sel", CCM_PCDR0, 26, 6);
+        clk[IMX27_CLK_CLKO_EN] = imx_clk_gate("clko_en", "clko_div", CCM_PCCR0, 0);
+        clk[IMX27_CLK_SSI2_IPG_GATE] = imx_clk_gate("ssi2_ipg_gate", "ipg", CCM_PCCR0, 0);
+        clk[IMX27_CLK_SSI1_IPG_GATE] = imx_clk_gate("ssi1_ipg_gate", "ipg", CCM_PCCR0, 1);
+        clk[IMX27_CLK_SLCDC_IPG_GATE] = imx_clk_gate("slcdc_ipg_gate", "ipg", CCM_PCCR0, 2);
+        clk[IMX27_CLK_SDHC3_IPG_GATE] = imx_clk_gate("sdhc3_ipg_gate", "ipg", CCM_PCCR0, 3);
+        clk[IMX27_CLK_SDHC2_IPG_GATE] = imx_clk_gate("sdhc2_ipg_gate", "ipg", CCM_PCCR0, 4);
+        clk[IMX27_CLK_SDHC1_IPG_GATE] = imx_clk_gate("sdhc1_ipg_gate", "ipg", CCM_PCCR0, 5);
+        clk[IMX27_CLK_SCC_IPG_GATE] = imx_clk_gate("scc_ipg_gate", "ipg", CCM_PCCR0, 6);
+        clk[IMX27_CLK_SAHARA_IPG_GATE] = imx_clk_gate("sahara_ipg_gate", "ipg", CCM_PCCR0, 7);
+        clk[IMX27_CLK_RTIC_IPG_GATE] = imx_clk_gate("rtic_ipg_gate", "ipg", CCM_PCCR0, 8);
+        clk[IMX27_CLK_RTC_IPG_GATE] = imx_clk_gate("rtc_ipg_gate", "ipg", CCM_PCCR0, 9);
+        clk[IMX27_CLK_PWM_IPG_GATE] = imx_clk_gate("pwm_ipg_gate", "ipg", CCM_PCCR0, 11);
+        clk[IMX27_CLK_OWIRE_IPG_GATE] = imx_clk_gate("owire_ipg_gate", "ipg", CCM_PCCR0, 12);
+        clk[IMX27_CLK_MSHC_IPG_GATE] = imx_clk_gate("mshc_ipg_gate", "ipg", CCM_PCCR0, 13);
+        clk[IMX27_CLK_LCDC_IPG_GATE] = imx_clk_gate("lcdc_ipg_gate", "ipg", CCM_PCCR0, 14);
+        clk[IMX27_CLK_KPP_IPG_GATE] = imx_clk_gate("kpp_ipg_gate", "ipg", CCM_PCCR0, 15);
+        clk[IMX27_CLK_IIM_IPG_GATE] = imx_clk_gate("iim_ipg_gate", "ipg", CCM_PCCR0, 16);
+        clk[IMX27_CLK_I2C2_IPG_GATE] = imx_clk_gate("i2c2_ipg_gate", "ipg", CCM_PCCR0, 17);
+        clk[IMX27_CLK_I2C1_IPG_GATE] = imx_clk_gate("i2c1_ipg_gate", "ipg", CCM_PCCR0, 18);
+        clk[IMX27_CLK_GPT6_IPG_GATE] = imx_clk_gate("gpt6_ipg_gate", "ipg", CCM_PCCR0, 19);
+        clk[IMX27_CLK_GPT5_IPG_GATE] = imx_clk_gate("gpt5_ipg_gate", "ipg", CCM_PCCR0, 20);
+        clk[IMX27_CLK_GPT4_IPG_GATE] = imx_clk_gate("gpt4_ipg_gate", "ipg", CCM_PCCR0, 21);
+        clk[IMX27_CLK_GPT3_IPG_GATE] = imx_clk_gate("gpt3_ipg_gate", "ipg", CCM_PCCR0, 22);
+        clk[IMX27_CLK_GPT2_IPG_GATE] = imx_clk_gate("gpt2_ipg_gate", "ipg", CCM_PCCR0, 23);
+        clk[IMX27_CLK_GPT1_IPG_GATE] = imx_clk_gate("gpt1_ipg_gate", "ipg", CCM_PCCR0, 24);
+        clk[IMX27_CLK_GPIO_IPG_GATE] = imx_clk_gate("gpio_ipg_gate", "ipg", CCM_PCCR0, 25);
+        clk[IMX27_CLK_FEC_IPG_GATE] = imx_clk_gate("fec_ipg_gate", "ipg", CCM_PCCR0, 26);
+        clk[IMX27_CLK_EMMA_IPG_GATE] = imx_clk_gate("emma_ipg_gate", "ipg", CCM_PCCR0, 27);
+        clk[IMX27_CLK_DMA_IPG_GATE] = imx_clk_gate("dma_ipg_gate", "ipg", CCM_PCCR0, 28);
+        clk[IMX27_CLK_CSPI3_IPG_GATE] = imx_clk_gate("cspi3_ipg_gate", "ipg", CCM_PCCR0, 29);
+        clk[IMX27_CLK_CSPI2_IPG_GATE] = imx_clk_gate("cspi2_ipg_gate", "ipg", CCM_PCCR0, 30);
+        clk[IMX27_CLK_CSPI1_IPG_GATE] = imx_clk_gate("cspi1_ipg_gate", "ipg", CCM_PCCR0, 31);
+        clk[IMX27_CLK_MSHC_BAUD_GATE] = imx_clk_gate("mshc_baud_gate", "mshc_div", CCM_PCCR1, 2);
+        clk[IMX27_CLK_NFC_BAUD_GATE] = imx_clk_gate("nfc_baud_gate", "nfc_div", CCM_PCCR1,  3);
+        clk[IMX27_CLK_SSI2_BAUD_GATE] = imx_clk_gate("ssi2_baud_gate", "ssi2_div", CCM_PCCR1,  4);
+        clk[IMX27_CLK_SSI1_BAUD_GATE] = imx_clk_gate("ssi1_baud_gate", "ssi1_div", CCM_PCCR1,  5);
+        clk[IMX27_CLK_VPU_BAUD_GATE] = imx_clk_gate("vpu_baud_gate", "vpu_div", CCM_PCCR1,  6);
+        clk[IMX27_CLK_PER4_GATE] = imx_clk_gate("per4_gate", "per4_div", CCM_PCCR1,  7);
+        clk[IMX27_CLK_PER3_GATE] = imx_clk_gate("per3_gate", "per3_div", CCM_PCCR1,  8);
+        clk[IMX27_CLK_PER2_GATE] = imx_clk_gate("per2_gate", "per2_div", CCM_PCCR1,  9);
+        clk[IMX27_CLK_PER1_GATE] = imx_clk_gate("per1_gate", "per1_div", CCM_PCCR1, 10);
+        clk[IMX27_CLK_USB_AHB_GATE] = imx_clk_gate("usb_ahb_gate", "ahb", CCM_PCCR1, 11);
+        clk[IMX27_CLK_SLCDC_AHB_GATE] = imx_clk_gate("slcdc_ahb_gate", "ahb", CCM_PCCR1, 12);
+        clk[IMX27_CLK_SAHARA_AHB_GATE] = imx_clk_gate("sahara_ahb_gate", "ahb", CCM_PCCR1, 13);
+        clk[IMX27_CLK_RTIC_AHB_GATE] = imx_clk_gate("rtic_ahb_gate", "ahb", CCM_PCCR1, 14);
+        clk[IMX27_CLK_LCDC_AHB_GATE] = imx_clk_gate("lcdc_ahb_gate", "ahb", CCM_PCCR1, 15);
+        clk[IMX27_CLK_VPU_AHB_GATE] = imx_clk_gate("vpu_ahb_gate", "ahb", CCM_PCCR1, 16);
+        clk[IMX27_CLK_FEC_AHB_GATE] = imx_clk_gate("fec_ahb_gate", "ahb", CCM_PCCR1, 17);
+        clk[IMX27_CLK_EMMA_AHB_GATE] = imx_clk_gate("emma_ahb_gate", "ahb", CCM_PCCR1, 18);
+        clk[IMX27_CLK_EMI_AHB_GATE] = imx_clk_gate("emi_ahb_gate", "ahb", CCM_PCCR1, 19);
+        clk[IMX27_CLK_DMA_AHB_GATE] = imx_clk_gate("dma_ahb_gate", "ahb", CCM_PCCR1, 20);
+        clk[IMX27_CLK_CSI_AHB_GATE] = imx_clk_gate("csi_ahb_gate", "ahb", CCM_PCCR1, 21);
+        clk[IMX27_CLK_BROM_AHB_GATE] = imx_clk_gate("brom_ahb_gate", "ahb", CCM_PCCR1, 22);
+        clk[IMX27_CLK_ATA_AHB_GATE] = imx_clk_gate("ata_ahb_gate", "ahb", CCM_PCCR1, 23);
+        clk[IMX27_CLK_WDOG_IPG_GATE] = imx_clk_gate("wdog_ipg_gate", "ipg", CCM_PCCR1, 24);
+        clk[IMX27_CLK_USB_IPG_GATE] = imx_clk_gate("usb_ipg_gate", "ipg", CCM_PCCR1, 25);
+        clk[IMX27_CLK_UART6_IPG_GATE] = imx_clk_gate("uart6_ipg_gate", "ipg", CCM_PCCR1, 26);
+        clk[IMX27_CLK_UART5_IPG_GATE] = imx_clk_gate("uart5_ipg_gate", "ipg", CCM_PCCR1, 27);
+        clk[IMX27_CLK_UART4_IPG_GATE] = imx_clk_gate("uart4_ipg_gate", "ipg", CCM_PCCR1, 28);
+        clk[IMX27_CLK_UART3_IPG_GATE] = imx_clk_gate("uart3_ipg_gate", "ipg", CCM_PCCR1, 29);
+        clk[IMX27_CLK_UART2_IPG_GATE] = imx_clk_gate("uart2_ipg_gate", "ipg", CCM_PCCR1, 30);
+        clk[IMX27_CLK_UART1_IPG_GATE] = imx_clk_gate("uart1_ipg_gate", "ipg", CCM_PCCR1, 31);
 
-        np = of_find_compatible_node(NULL, NULL, "fsl,imx27-ccm");
-        if (np) {
-                clk_data.clks = clk;
-                clk_data.clk_num = ARRAY_SIZE(clk);
-                of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
-        }
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
 
-        clk_register_clkdev(clk[uart1_ipg_gate], "ipg", "imx21-uart.0");
-        clk_register_clkdev(clk[per1_gate], "per", "imx21-uart.0");
-        clk_register_clkdev(clk[uart2_ipg_gate], "ipg", "imx21-uart.1");
-        clk_register_clkdev(clk[per1_gate], "per", "imx21-uart.1");
-        clk_register_clkdev(clk[uart3_ipg_gate], "ipg", "imx21-uart.2");
-        clk_register_clkdev(clk[per1_gate], "per", "imx21-uart.2");
-        clk_register_clkdev(clk[uart4_ipg_gate], "ipg", "imx21-uart.3");
-        clk_register_clkdev(clk[per1_gate], "per", "imx21-uart.3");
-        clk_register_clkdev(clk[uart5_ipg_gate], "ipg", "imx21-uart.4");
-        clk_register_clkdev(clk[per1_gate], "per", "imx21-uart.4");
-        clk_register_clkdev(clk[uart6_ipg_gate], "ipg", "imx21-uart.5");
-        clk_register_clkdev(clk[per1_gate], "per", "imx21-uart.5");
-        clk_register_clkdev(clk[gpt1_ipg_gate], "ipg", "imx-gpt.0");
-        clk_register_clkdev(clk[per1_gate], "per", "imx-gpt.0");
-        clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.0");
-        clk_register_clkdev(clk[sdhc1_ipg_gate], "ipg", "imx21-mmc.0");
-        clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.1");
-        clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.1");
-        clk_register_clkdev(clk[per2_gate], "per", "imx21-mmc.2");
-        clk_register_clkdev(clk[sdhc2_ipg_gate], "ipg", "imx21-mmc.2");
-        clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.0");
-        clk_register_clkdev(clk[cspi1_ipg_gate], "ipg", "imx27-cspi.0");
-        clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.1");
-        clk_register_clkdev(clk[cspi2_ipg_gate], "ipg", "imx27-cspi.1");
-        clk_register_clkdev(clk[per2_gate], "per", "imx27-cspi.2");
-        clk_register_clkdev(clk[cspi3_ipg_gate], "ipg", "imx27-cspi.2");
-        clk_register_clkdev(clk[per3_gate], "per", "imx21-fb.0");
-        clk_register_clkdev(clk[lcdc_ipg_gate], "ipg", "imx21-fb.0");
-        clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0");
-        clk_register_clkdev(clk[csi_ahb_gate], "ahb", "imx27-camera.0");
-        clk_register_clkdev(clk[per4_gate], "per", "imx27-camera.0");
-        clk_register_clkdev(clk[usb_div], "per", "imx-udc-mx27");
-        clk_register_clkdev(clk[usb_ipg_gate], "ipg", "imx-udc-mx27");
-        clk_register_clkdev(clk[usb_ahb_gate], "ahb", "imx-udc-mx27");
-        clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.0");
-        clk_register_clkdev(clk[usb_ipg_gate], "ipg", "mxc-ehci.0");
-        clk_register_clkdev(clk[usb_ahb_gate], "ahb", "mxc-ehci.0");
-        clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.1");
-        clk_register_clkdev(clk[usb_ipg_gate], "ipg", "mxc-ehci.1");
-        clk_register_clkdev(clk[usb_ahb_gate], "ahb", "mxc-ehci.1");
-        clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2");
-        clk_register_clkdev(clk[usb_ipg_gate], "ipg", "mxc-ehci.2");
-        clk_register_clkdev(clk[usb_ahb_gate], "ahb", "mxc-ehci.2");
-        clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0");
-        clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");
-        clk_register_clkdev(clk[nfc_baud_gate], NULL, "imx27-nand.0");
-        clk_register_clkdev(clk[vpu_baud_gate], "per", "coda-imx27.0");
-        clk_register_clkdev(clk[vpu_ahb_gate], "ahb", "coda-imx27.0");
-        clk_register_clkdev(clk[dma_ahb_gate], "ahb", "imx27-dma");
-        clk_register_clkdev(clk[dma_ipg_gate], "ipg", "imx27-dma");
-        clk_register_clkdev(clk[fec_ipg_gate], "ipg", "imx27-fec.0");
-        clk_register_clkdev(clk[fec_ahb_gate], "ahb", "imx27-fec.0");
-        clk_register_clkdev(clk[wdog_ipg_gate], NULL, "imx2-wdt.0");
-        clk_register_clkdev(clk[i2c1_ipg_gate], NULL, "imx21-i2c.0");
-        clk_register_clkdev(clk[i2c2_ipg_gate], NULL, "imx21-i2c.1");
-        clk_register_clkdev(clk[owire_ipg_gate], NULL, "mxc_w1.0");
-        clk_register_clkdev(clk[kpp_ipg_gate], NULL, "imx-keypad");
-        clk_register_clkdev(clk[emma_ahb_gate], "emma-ahb", "imx27-camera.0");
-        clk_register_clkdev(clk[emma_ipg_gate], "emma-ipg", "imx27-camera.0");
-        clk_register_clkdev(clk[emma_ahb_gate], "ahb", "m2m-emmaprp.0");
-        clk_register_clkdev(clk[emma_ipg_gate], "ipg", "m2m-emmaprp.0");
-        clk_register_clkdev(clk[cpu_div], NULL, "cpu0");
+        clk_register_clkdev(clk[IMX27_CLK_CPU_DIV], NULL, "cpu0");
 
-        mxc_timer_init(MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR), MX27_INT_GPT1);
-
-        clk_prepare_enable(clk[emi_ahb_gate]);
+        clk_prepare_enable(clk[IMX27_CLK_EMI_AHB_GATE]);
 
         imx_print_silicon_rev("i.MX27", mx27_revision());
+}
+
+int __init mx27_clocks_init(unsigned long fref)
+{
+        ccm = ioremap(MX27_CCM_BASE_ADDR, SZ_4K);
+
+        _mx27_clocks_init(fref);
+
+        clk_register_clkdev(clk[IMX27_CLK_UART1_IPG_GATE], "ipg", "imx21-uart.0");
+        clk_register_clkdev(clk[IMX27_CLK_PER1_GATE], "per", "imx21-uart.0");
+        clk_register_clkdev(clk[IMX27_CLK_UART2_IPG_GATE], "ipg", "imx21-uart.1");
+        clk_register_clkdev(clk[IMX27_CLK_PER1_GATE], "per", "imx21-uart.1");
+        clk_register_clkdev(clk[IMX27_CLK_UART3_IPG_GATE], "ipg", "imx21-uart.2");
+        clk_register_clkdev(clk[IMX27_CLK_PER1_GATE], "per", "imx21-uart.2");
+        clk_register_clkdev(clk[IMX27_CLK_UART4_IPG_GATE], "ipg", "imx21-uart.3");
+        clk_register_clkdev(clk[IMX27_CLK_PER1_GATE], "per", "imx21-uart.3");
+        clk_register_clkdev(clk[IMX27_CLK_UART5_IPG_GATE], "ipg", "imx21-uart.4");
+        clk_register_clkdev(clk[IMX27_CLK_PER1_GATE], "per", "imx21-uart.4");
+        clk_register_clkdev(clk[IMX27_CLK_UART6_IPG_GATE], "ipg", "imx21-uart.5");
+        clk_register_clkdev(clk[IMX27_CLK_PER1_GATE], "per", "imx21-uart.5");
+        clk_register_clkdev(clk[IMX27_CLK_GPT1_IPG_GATE], "ipg", "imx-gpt.0");
+        clk_register_clkdev(clk[IMX27_CLK_PER1_GATE], "per", "imx-gpt.0");
+        clk_register_clkdev(clk[IMX27_CLK_PER2_GATE], "per", "imx21-mmc.0");
+        clk_register_clkdev(clk[IMX27_CLK_SDHC1_IPG_GATE], "ipg", "imx21-mmc.0");
+        clk_register_clkdev(clk[IMX27_CLK_PER2_GATE], "per", "imx21-mmc.1");
+        clk_register_clkdev(clk[IMX27_CLK_SDHC2_IPG_GATE], "ipg", "imx21-mmc.1");
+        clk_register_clkdev(clk[IMX27_CLK_PER2_GATE], "per", "imx21-mmc.2");
+        clk_register_clkdev(clk[IMX27_CLK_SDHC2_IPG_GATE], "ipg", "imx21-mmc.2");
+        clk_register_clkdev(clk[IMX27_CLK_PER2_GATE], "per", "imx27-cspi.0");
+        clk_register_clkdev(clk[IMX27_CLK_CSPI1_IPG_GATE], "ipg", "imx27-cspi.0");
+        clk_register_clkdev(clk[IMX27_CLK_PER2_GATE], "per", "imx27-cspi.1");
+        clk_register_clkdev(clk[IMX27_CLK_CSPI2_IPG_GATE], "ipg", "imx27-cspi.1");
+        clk_register_clkdev(clk[IMX27_CLK_PER2_GATE], "per", "imx27-cspi.2");
+        clk_register_clkdev(clk[IMX27_CLK_CSPI3_IPG_GATE], "ipg", "imx27-cspi.2");
+        clk_register_clkdev(clk[IMX27_CLK_PER3_GATE], "per", "imx21-fb.0");
+        clk_register_clkdev(clk[IMX27_CLK_LCDC_IPG_GATE], "ipg", "imx21-fb.0");
+        clk_register_clkdev(clk[IMX27_CLK_LCDC_AHB_GATE], "ahb", "imx21-fb.0");
+        clk_register_clkdev(clk[IMX27_CLK_CSI_AHB_GATE], "ahb", "imx27-camera.0");
+        clk_register_clkdev(clk[IMX27_CLK_PER4_GATE], "per", "imx27-camera.0");
+        clk_register_clkdev(clk[IMX27_CLK_USB_DIV], "per", "imx-udc-mx27");
+        clk_register_clkdev(clk[IMX27_CLK_USB_IPG_GATE], "ipg", "imx-udc-mx27");
+        clk_register_clkdev(clk[IMX27_CLK_USB_AHB_GATE], "ahb", "imx-udc-mx27");
+        clk_register_clkdev(clk[IMX27_CLK_USB_DIV], "per", "mxc-ehci.0");
+        clk_register_clkdev(clk[IMX27_CLK_USB_IPG_GATE], "ipg", "mxc-ehci.0");
+        clk_register_clkdev(clk[IMX27_CLK_USB_AHB_GATE], "ahb", "mxc-ehci.0");
+        clk_register_clkdev(clk[IMX27_CLK_USB_DIV], "per", "mxc-ehci.1");
+        clk_register_clkdev(clk[IMX27_CLK_USB_IPG_GATE], "ipg", "mxc-ehci.1");
+        clk_register_clkdev(clk[IMX27_CLK_USB_AHB_GATE], "ahb", "mxc-ehci.1");
+        clk_register_clkdev(clk[IMX27_CLK_USB_DIV], "per", "mxc-ehci.2");
+        clk_register_clkdev(clk[IMX27_CLK_USB_IPG_GATE], "ipg", "mxc-ehci.2");
+        clk_register_clkdev(clk[IMX27_CLK_USB_AHB_GATE], "ahb", "mxc-ehci.2");
+        clk_register_clkdev(clk[IMX27_CLK_SSI1_IPG_GATE], NULL, "imx-ssi.0");
+        clk_register_clkdev(clk[IMX27_CLK_SSI2_IPG_GATE], NULL, "imx-ssi.1");
+        clk_register_clkdev(clk[IMX27_CLK_NFC_BAUD_GATE], NULL, "imx27-nand.0");
+        clk_register_clkdev(clk[IMX27_CLK_VPU_BAUD_GATE], "per", "coda-imx27.0");
+        clk_register_clkdev(clk[IMX27_CLK_VPU_AHB_GATE], "ahb", "coda-imx27.0");
+        clk_register_clkdev(clk[IMX27_CLK_DMA_AHB_GATE], "ahb", "imx27-dma");
+        clk_register_clkdev(clk[IMX27_CLK_DMA_IPG_GATE], "ipg", "imx27-dma");
+        clk_register_clkdev(clk[IMX27_CLK_FEC_IPG_GATE], "ipg", "imx27-fec.0");
+        clk_register_clkdev(clk[IMX27_CLK_FEC_AHB_GATE], "ahb", "imx27-fec.0");
+        clk_register_clkdev(clk[IMX27_CLK_WDOG_IPG_GATE], NULL, "imx2-wdt.0");
+        clk_register_clkdev(clk[IMX27_CLK_I2C1_IPG_GATE], NULL, "imx21-i2c.0");
+        clk_register_clkdev(clk[IMX27_CLK_I2C2_IPG_GATE], NULL, "imx21-i2c.1");
+        clk_register_clkdev(clk[IMX27_CLK_OWIRE_IPG_GATE], NULL, "mxc_w1.0");
+        clk_register_clkdev(clk[IMX27_CLK_KPP_IPG_GATE], NULL, "imx-keypad");
+        clk_register_clkdev(clk[IMX27_CLK_EMMA_AHB_GATE], "emma-ahb", "imx27-camera.0");
+        clk_register_clkdev(clk[IMX27_CLK_EMMA_IPG_GATE], "emma-ipg", "imx27-camera.0");
+        clk_register_clkdev(clk[IMX27_CLK_EMMA_AHB_GATE], "ahb", "m2m-emmaprp.0");
+        clk_register_clkdev(clk[IMX27_CLK_EMMA_IPG_GATE], "ipg", "m2m-emmaprp.0");
+
+        mxc_timer_init(MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR), MX27_INT_GPT1);
 
         return 0;
 }
 
-int __init mx27_clocks_init_dt(void)
+static void __init mx27_clocks_init_dt(struct device_node *np)
 {
-        struct device_node *np;
+        struct device_node *refnp;
         u32 fref = 26000000; /* default */
 
-        for_each_compatible_node(np, NULL, "fixed-clock") {
-                if (!of_device_is_compatible(np, "fsl,imx-osc26m"))
+        for_each_compatible_node(refnp, NULL, "fixed-clock") {
+                if (!of_device_is_compatible(refnp, "fsl,imx-osc26m"))
                         continue;
 
-                if (!of_property_read_u32(np, "clock-frequency", &fref))
+                if (!of_property_read_u32(refnp, "clock-frequency", &fref))
                         break;
         }
 
-        return mx27_clocks_init(fref);
+        ccm = of_iomap(np, 0);
+
+        _mx27_clocks_init(fref);
+
+        clk_data.clks = clk;
+        clk_data.clk_num = ARRAY_SIZE(clk);
+        of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 }
+CLK_OF_DECLARE(imx27_ccm, "fsl,imx27-ccm", mx27_clocks_init_dt);
diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c
index 4a9de0835eb1..286ef422cebc 100644
--- a/arch/arm/mach-imx/clk-imx31.c
+++ b/arch/arm/mach-imx/clk-imx31.c
@@ -51,7 +51,6 @@ static struct clk_onecell_data clk_data;
 int __init mx31_clocks_init(unsigned long fref)
 {
         void __iomem *base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR);
-        int i;
         struct device_node *np;
 
         clk[dummy] = imx_clk_fixed("dummy", 0);
@@ -114,10 +113,7 @@ int __init mx31_clocks_init(unsigned long fref)
         clk[rtic_gate] = imx_clk_gate2("rtic_gate", "ahb", base + MXC_CCM_CGR2, 10);
         clk[firi_gate] = imx_clk_gate2("firi_gate", "upll", base+MXC_CCM_CGR2, 12);
 
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("imx31 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
 
         np = of_find_compatible_node(NULL, NULL, "fsl,imx31-ccm");
 
diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c
index 71c86a2f856d..a0d2b57fd376 100644
--- a/arch/arm/mach-imx/clk-imx35.c
+++ b/arch/arm/mach-imx/clk-imx35.c
@@ -75,7 +75,6 @@ int __init mx35_clocks_init(void)
         u32 pdr0, consumer_sel, hsp_sel;
         struct arm_ahb_div *aad;
         unsigned char *hsp_div;
-        u32 i;
 
         pdr0 = __raw_readl(base + MXC_CCM_PDR0);
         consumer_sel = (pdr0 >> 16) & 0xf;
@@ -200,10 +199,7 @@ int __init mx35_clocks_init(void)
         clk[iim_gate] = imx_clk_gate2("iim_gate", "ipg", base + MX35_CCM_CGR3,  2);
         clk[gpu2d_gate] = imx_clk_gate2("gpu2d_gate", "ahb", base + MX35_CCM_CGR3,  4);
 
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("i.MX35 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
 
         clk_register_clkdev(clk[pata_gate], NULL, "pata_imx");
         clk_register_clkdev(clk[can1_gate], NULL, "flexcan.0");
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index 21d2b111c83d..72d65214223e 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -18,11 +18,54 @@
 #include <linux/of_irq.h>
 #include <dt-bindings/clock/imx5-clock.h>
 
-#include "crm-regs-imx5.h"
 #include "clk.h"
 #include "common.h"
 #include "hardware.h"
 
+#define MX51_DPLL1_BASE         0x83f80000
+#define MX51_DPLL2_BASE         0x83f84000
+#define MX51_DPLL3_BASE         0x83f88000
+
+#define MX53_DPLL1_BASE         0x63f80000
+#define MX53_DPLL2_BASE         0x63f84000
+#define MX53_DPLL3_BASE         0x63f88000
+#define MX53_DPLL4_BASE         0x63f8c000
+
+#define MXC_CCM_CCR             (ccm_base + 0x00)
+#define MXC_CCM_CCDR            (ccm_base + 0x04)
+#define MXC_CCM_CSR             (ccm_base + 0x08)
+#define MXC_CCM_CCSR            (ccm_base + 0x0c)
+#define MXC_CCM_CACRR           (ccm_base + 0x10)
+#define MXC_CCM_CBCDR           (ccm_base + 0x14)
+#define MXC_CCM_CBCMR           (ccm_base + 0x18)
+#define MXC_CCM_CSCMR1          (ccm_base + 0x1c)
+#define MXC_CCM_CSCMR2          (ccm_base + 0x20)
+#define MXC_CCM_CSCDR1          (ccm_base + 0x24)
+#define MXC_CCM_CS1CDR          (ccm_base + 0x28)
+#define MXC_CCM_CS2CDR          (ccm_base + 0x2c)
+#define MXC_CCM_CDCDR           (ccm_base + 0x30)
+#define MXC_CCM_CHSCDR          (ccm_base + 0x34)
+#define MXC_CCM_CSCDR2          (ccm_base + 0x38)
+#define MXC_CCM_CSCDR3          (ccm_base + 0x3c)
+#define MXC_CCM_CSCDR4          (ccm_base + 0x40)
+#define MXC_CCM_CWDR            (ccm_base + 0x44)
+#define MXC_CCM_CDHIPR          (ccm_base + 0x48)
+#define MXC_CCM_CDCR            (ccm_base + 0x4c)
+#define MXC_CCM_CTOR            (ccm_base + 0x50)
+#define MXC_CCM_CLPCR           (ccm_base + 0x54)
+#define MXC_CCM_CISR            (ccm_base + 0x58)
+#define MXC_CCM_CIMR            (ccm_base + 0x5c)
+#define MXC_CCM_CCOSR           (ccm_base + 0x60)
+#define MXC_CCM_CGPR            (ccm_base + 0x64)
+#define MXC_CCM_CCGR0           (ccm_base + 0x68)
+#define MXC_CCM_CCGR1           (ccm_base + 0x6c)
+#define MXC_CCM_CCGR2           (ccm_base + 0x70)
+#define MXC_CCM_CCGR3           (ccm_base + 0x74)
+#define MXC_CCM_CCGR4           (ccm_base + 0x78)
+#define MXC_CCM_CCGR5           (ccm_base + 0x7c)
+#define MXC_CCM_CCGR6           (ccm_base + 0x80)
+#define MXC_CCM_CCGR7           (ccm_base + 0x84)
+
 /* Low-power Audio Playback Mode clock */
 static const char *lp_apm_sel[] = { "osc", };
 
@@ -86,17 +129,15 @@ static const char *mx51_spdif1_com_sel[] = { "spdif1_podf", "ssi2_root_gate", };
 static struct clk *clk[IMX5_CLK_END];
 static struct clk_onecell_data clk_data;
 
-static void __init mx5_clocks_common_init(unsigned long rate_ckil,
-                unsigned long rate_osc, unsigned long rate_ckih1,
-                unsigned long rate_ckih2)
+static void __init mx5_clocks_common_init(void __iomem *ccm_base)
 {
-        int i;
+        imx5_pm_set_ccm_base(ccm_base);
 
         clk[IMX5_CLK_DUMMY]             = imx_clk_fixed("dummy", 0);
-        clk[IMX5_CLK_CKIL]              = imx_obtain_fixed_clock("ckil", rate_ckil);
-        clk[IMX5_CLK_OSC]               = imx_obtain_fixed_clock("osc", rate_osc);
-        clk[IMX5_CLK_CKIH1]             = imx_obtain_fixed_clock("ckih1", rate_ckih1);
-        clk[IMX5_CLK_CKIH2]             = imx_obtain_fixed_clock("ckih2", rate_ckih2);
+        clk[IMX5_CLK_CKIL]              = imx_obtain_fixed_clock("ckil", 0);
+        clk[IMX5_CLK_OSC]               = imx_obtain_fixed_clock("osc", 0);
+        clk[IMX5_CLK_CKIH1]             = imx_obtain_fixed_clock("ckih1", 0);
+        clk[IMX5_CLK_CKIH2]             = imx_obtain_fixed_clock("ckih2", 0);
 
         clk[IMX5_CLK_PERIPH_APM]        = imx_clk_mux("periph_apm", MXC_CCM_CBCMR, 12, 2,
                                                 periph_apm_sel, ARRAY_SIZE(periph_apm_sel));
@@ -244,58 +285,8 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil,
         clk[IMX5_CLK_SAHARA_IPG_GATE]   = imx_clk_gate2("sahara_ipg_gate", "ipg", MXC_CCM_CCGR4, 14);
         clk[IMX5_CLK_SATA_REF]          = imx_clk_fixed_factor("sata_ref", "usb_phy1_gate", 1, 1);
 
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("i.MX5 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
-
-        clk_register_clkdev(clk[IMX5_CLK_GPT_HF_GATE], "per", "imx-gpt.0");
-        clk_register_clkdev(clk[IMX5_CLK_GPT_IPG_GATE], "ipg", "imx-gpt.0");
-        clk_register_clkdev(clk[IMX5_CLK_UART1_PER_GATE], "per", "imx21-uart.0");
-        clk_register_clkdev(clk[IMX5_CLK_UART1_IPG_GATE], "ipg", "imx21-uart.0");
-        clk_register_clkdev(clk[IMX5_CLK_UART2_PER_GATE], "per", "imx21-uart.1");
-        clk_register_clkdev(clk[IMX5_CLK_UART2_IPG_GATE], "ipg", "imx21-uart.1");
-        clk_register_clkdev(clk[IMX5_CLK_UART3_PER_GATE], "per", "imx21-uart.2");
-        clk_register_clkdev(clk[IMX5_CLK_UART3_IPG_GATE], "ipg", "imx21-uart.2");
-        clk_register_clkdev(clk[IMX5_CLK_UART4_PER_GATE], "per", "imx21-uart.3");
-        clk_register_clkdev(clk[IMX5_CLK_UART4_IPG_GATE], "ipg", "imx21-uart.3");
-        clk_register_clkdev(clk[IMX5_CLK_UART5_PER_GATE], "per", "imx21-uart.4");
-        clk_register_clkdev(clk[IMX5_CLK_UART5_IPG_GATE], "ipg", "imx21-uart.4");
-        clk_register_clkdev(clk[IMX5_CLK_ECSPI1_PER_GATE], "per", "imx51-ecspi.0");
-        clk_register_clkdev(clk[IMX5_CLK_ECSPI1_IPG_GATE], "ipg", "imx51-ecspi.0");
-        clk_register_clkdev(clk[IMX5_CLK_ECSPI2_PER_GATE], "per", "imx51-ecspi.1");
-        clk_register_clkdev(clk[IMX5_CLK_ECSPI2_IPG_GATE], "ipg", "imx51-ecspi.1");
-        clk_register_clkdev(clk[IMX5_CLK_CSPI_IPG_GATE], NULL, "imx35-cspi.2");
-        clk_register_clkdev(clk[IMX5_CLK_I2C1_GATE], NULL, "imx21-i2c.0");
-        clk_register_clkdev(clk[IMX5_CLK_I2C2_GATE], NULL, "imx21-i2c.1");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_PER_GATE], "per", "mxc-ehci.0");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_GATE], "ipg", "mxc-ehci.0");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_GATE], "ahb", "mxc-ehci.0");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_PER_GATE], "per", "mxc-ehci.1");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_GATE], "ipg", "mxc-ehci.1");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_GATE], "ahb", "mxc-ehci.1");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_PER_GATE], "per", "mxc-ehci.2");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_GATE], "ipg", "mxc-ehci.2");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_GATE], "ahb", "mxc-ehci.2");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_PER_GATE], "per", "imx-udc-mx51");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_GATE], "ipg", "imx-udc-mx51");
-        clk_register_clkdev(clk[IMX5_CLK_USBOH3_GATE], "ahb", "imx-udc-mx51");
-        clk_register_clkdev(clk[IMX5_CLK_NFC_GATE], NULL, "imx51-nand");
-        clk_register_clkdev(clk[IMX5_CLK_SSI1_IPG_GATE], NULL, "imx-ssi.0");
-        clk_register_clkdev(clk[IMX5_CLK_SSI2_IPG_GATE], NULL, "imx-ssi.1");
-        clk_register_clkdev(clk[IMX5_CLK_SSI3_IPG_GATE], NULL, "imx-ssi.2");
-        clk_register_clkdev(clk[IMX5_CLK_SDMA_GATE], NULL, "imx35-sdma");
         clk_register_clkdev(clk[IMX5_CLK_CPU_PODF], NULL, "cpu0");
-        clk_register_clkdev(clk[IMX5_CLK_IIM_GATE], "iim", NULL);
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], NULL, "imx2-wdt.0");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], NULL, "imx2-wdt.1");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], NULL, "imx-keypad");
-        clk_register_clkdev(clk[IMX5_CLK_IPU_DI1_GATE], "di1", "imx-tve.0");
         clk_register_clkdev(clk[IMX5_CLK_GPC_DVFS], "gpc_dvfs", NULL);
-        clk_register_clkdev(clk[IMX5_CLK_EPIT1_IPG_GATE], "ipg", "imx-epit.0");
-        clk_register_clkdev(clk[IMX5_CLK_EPIT1_HF_GATE], "per", "imx-epit.0");
-        clk_register_clkdev(clk[IMX5_CLK_EPIT2_IPG_GATE], "ipg", "imx-epit.1");
-        clk_register_clkdev(clk[IMX5_CLK_EPIT2_HF_GATE], "per", "imx-epit.1");
 
         /* Set SDHC parents to be PLL2 */
         clk_set_parent(clk[IMX5_CLK_ESDHC_A_SEL], clk[IMX5_CLK_PLL2_SW]);
@@ -322,12 +313,26 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil,
 
 static void __init mx50_clocks_init(struct device_node *np)
 {
+        void __iomem *ccm_base;
+        void __iomem *pll_base;
         unsigned long r;
-        int i;
 
-        clk[IMX5_CLK_PLL1_SW]           = imx_clk_pllv2("pll1_sw", "osc", MX53_DPLL1_BASE);
-        clk[IMX5_CLK_PLL2_SW]           = imx_clk_pllv2("pll2_sw", "osc", MX53_DPLL2_BASE);
-        clk[IMX5_CLK_PLL3_SW]           = imx_clk_pllv2("pll3_sw", "osc", MX53_DPLL3_BASE);
+        pll_base = ioremap(MX53_DPLL1_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL1_SW]           = imx_clk_pllv2("pll1_sw", "osc", pll_base);
+
+        pll_base = ioremap(MX53_DPLL2_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL2_SW]           = imx_clk_pllv2("pll2_sw", "osc", pll_base);
+
+        pll_base = ioremap(MX53_DPLL3_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL3_SW]           = imx_clk_pllv2("pll3_sw", "osc", pll_base);
+
+        ccm_base = of_iomap(np, 0);
+        WARN_ON(!ccm_base);
+
+        mx5_clocks_common_init(ccm_base);
 
         clk[IMX5_CLK_LP_APM]            = imx_clk_mux("lp_apm", MXC_CCM_CCSR, 10, 1,
                                                 lp_apm_sel, ARRAY_SIZE(lp_apm_sel));
@@ -349,17 +354,12 @@ static void __init mx50_clocks_init(struct device_node *np)
         clk[IMX5_CLK_CKO2_PODF]         = imx_clk_divider("cko2_podf", "cko2_sel", MXC_CCM_CCOSR, 21, 3);
         clk[IMX5_CLK_CKO2]              = imx_clk_gate2("cko2", "cko2_podf", MXC_CCM_CCOSR, 24);
 
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("i.MX50 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
 
         clk_data.clks = clk;
         clk_data.clk_num = ARRAY_SIZE(clk);
         of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 
-        mx5_clocks_common_init(0, 0, 0, 0);
-
         /* set SDHC root clock to 200MHZ*/
         clk_set_rate(clk[IMX5_CLK_ESDHC_A_PODF], 200000000);
         clk_set_rate(clk[IMX5_CLK_ESDHC_B_PODF], 200000000);
@@ -370,21 +370,32 @@ static void __init mx50_clocks_init(struct device_node *np)
 
         r = clk_round_rate(clk[IMX5_CLK_USBOH3_PER_GATE], 54000000);
         clk_set_rate(clk[IMX5_CLK_USBOH3_PER_GATE], r);
-
-        mxc_timer_init_dt(of_find_compatible_node(NULL, NULL, "fsl,imx50-gpt"));
 }
 CLK_OF_DECLARE(imx50_ccm, "fsl,imx50-ccm", mx50_clocks_init);
 
-int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
-                        unsigned long rate_ckih1, unsigned long rate_ckih2)
+static void __init mx51_clocks_init(struct device_node *np)
 {
-        int i;
+        void __iomem *ccm_base;
+        void __iomem *pll_base;
         u32 val;
-        struct device_node *np;
 
-        clk[IMX5_CLK_PLL1_SW]           = imx_clk_pllv2("pll1_sw", "osc", MX51_DPLL1_BASE);
-        clk[IMX5_CLK_PLL2_SW]           = imx_clk_pllv2("pll2_sw", "osc", MX51_DPLL2_BASE);
-        clk[IMX5_CLK_PLL3_SW]           = imx_clk_pllv2("pll3_sw", "osc", MX51_DPLL3_BASE);
+        pll_base = ioremap(MX51_DPLL1_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL1_SW]           = imx_clk_pllv2("pll1_sw", "osc", pll_base);
+
+        pll_base = ioremap(MX51_DPLL2_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL2_SW]           = imx_clk_pllv2("pll2_sw", "osc", pll_base);
+
+        pll_base = ioremap(MX51_DPLL3_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL3_SW]           = imx_clk_pllv2("pll3_sw", "osc", pll_base);
+
+        ccm_base = of_iomap(np, 0);
+        WARN_ON(!ccm_base);
+
+        mx5_clocks_common_init(ccm_base);
+
         clk[IMX5_CLK_LP_APM]            = imx_clk_mux("lp_apm", MXC_CCM_CCSR, 9, 1,
                                                 lp_apm_sel, ARRAY_SIZE(lp_apm_sel));
         clk[IMX5_CLK_IPU_DI0_SEL]       = imx_clk_mux("ipu_di0_sel", MXC_CCM_CSCMR2, 26, 3,
@@ -417,35 +428,12 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
                                                 mx51_spdif1_com_sel, ARRAY_SIZE(mx51_spdif1_com_sel));
         clk[IMX5_CLK_SPDIF1_GATE]       = imx_clk_gate2("spdif1_gate", "spdif1_com_sel", MXC_CCM_CCGR5, 28);
 
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("i.MX51 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
 
-        np = of_find_compatible_node(NULL, NULL, "fsl,imx51-ccm");
         clk_data.clks = clk;
         clk_data.clk_num = ARRAY_SIZE(clk);
         of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 
-        mx5_clocks_common_init(rate_ckil, rate_osc, rate_ckih1, rate_ckih2);
-
-        clk_register_clkdev(clk[IMX5_CLK_HSI2C_GATE], NULL, "imx21-i2c.2");
-        clk_register_clkdev(clk[IMX5_CLK_MX51_MIPI], "mipi_hsp", NULL);
-        clk_register_clkdev(clk[IMX5_CLK_FEC_GATE], NULL, "imx27-fec.0");
-        clk_register_clkdev(clk[IMX5_CLK_USB_PHY_GATE], "phy", "mxc-ehci.0");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC1_IPG_GATE], "ipg", "sdhci-esdhc-imx51.0");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], "ahb", "sdhci-esdhc-imx51.0");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC1_PER_GATE], "per", "sdhci-esdhc-imx51.0");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC2_IPG_GATE], "ipg", "sdhci-esdhc-imx51.1");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], "ahb", "sdhci-esdhc-imx51.1");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC2_PER_GATE], "per", "sdhci-esdhc-imx51.1");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC3_IPG_GATE], "ipg", "sdhci-esdhc-imx51.2");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], "ahb", "sdhci-esdhc-imx51.2");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC3_PER_GATE], "per", "sdhci-esdhc-imx51.2");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC4_IPG_GATE], "ipg", "sdhci-esdhc-imx51.3");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], "ahb", "sdhci-esdhc-imx51.3");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC4_PER_GATE], "per", "sdhci-esdhc-imx51.3");
-
         /* set the usboh3 parent to pll2_sw */
         clk_set_parent(clk[IMX5_CLK_USBOH3_SEL], clk[IMX5_CLK_PLL2_SW]);
 
@@ -453,9 +441,6 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
         clk_set_rate(clk[IMX5_CLK_ESDHC_A_PODF], 166250000);
         clk_set_rate(clk[IMX5_CLK_ESDHC_B_PODF], 166250000);
 
-        /* System timer */
-        mxc_timer_init(MX51_IO_ADDRESS(MX51_GPT1_BASE_ADDR), MX51_INT_GPT);
-
         clk_prepare_enable(clk[IMX5_CLK_IIM_GATE]);
         imx_print_silicon_rev("i.MX51", mx51_revision());
         clk_disable_unprepare(clk[IMX5_CLK_IIM_GATE]);
@@ -474,25 +459,35 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
         val = readl(MXC_CCM_CLPCR);
         val |= 1 << 23;
         writel(val, MXC_CCM_CLPCR);
-
-        return 0;
-}
-
-static void __init mx51_clocks_init_dt(struct device_node *np)
-{
-        mx51_clocks_init(0, 0, 0, 0);
 }
-CLK_OF_DECLARE(imx51_ccm, "fsl,imx51-ccm", mx51_clocks_init_dt);
+CLK_OF_DECLARE(imx51_ccm, "fsl,imx51-ccm", mx51_clocks_init);
 
 static void __init mx53_clocks_init(struct device_node *np)
 {
-        int i;
+        void __iomem *ccm_base;
+        void __iomem *pll_base;
         unsigned long r;
 
-        clk[IMX5_CLK_PLL1_SW]           = imx_clk_pllv2("pll1_sw", "osc", MX53_DPLL1_BASE);
-        clk[IMX5_CLK_PLL2_SW]           = imx_clk_pllv2("pll2_sw", "osc", MX53_DPLL2_BASE);
-        clk[IMX5_CLK_PLL3_SW]           = imx_clk_pllv2("pll3_sw", "osc", MX53_DPLL3_BASE);
-        clk[IMX5_CLK_PLL4_SW]           = imx_clk_pllv2("pll4_sw", "osc", MX53_DPLL4_BASE);
+        pll_base = ioremap(MX53_DPLL1_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL1_SW]           = imx_clk_pllv2("pll1_sw", "osc", pll_base);
+
+        pll_base = ioremap(MX53_DPLL2_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL2_SW]           = imx_clk_pllv2("pll2_sw", "osc", pll_base);
+
+        pll_base = ioremap(MX53_DPLL3_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL3_SW]           = imx_clk_pllv2("pll3_sw", "osc", pll_base);
+
+        pll_base = ioremap(MX53_DPLL4_BASE, SZ_16K);
+        WARN_ON(!pll_base);
+        clk[IMX5_CLK_PLL4_SW]           = imx_clk_pllv2("pll4_sw", "osc", pll_base);
+
+        ccm_base = of_iomap(np, 0);
+        WARN_ON(!ccm_base);
+
+        mx5_clocks_common_init(ccm_base);
 
         clk[IMX5_CLK_LP_APM]            = imx_clk_mux("lp_apm", MXC_CCM_CCSR, 10, 1,
                                                 lp_apm_sel, ARRAY_SIZE(lp_apm_sel));
@@ -543,33 +538,12 @@ static void __init mx53_clocks_init(struct device_node *np)
         clk[IMX5_CLK_SPDIF_XTAL_SEL]    = imx_clk_mux("spdif_xtal_sel", MXC_CCM_CSCMR1, 2, 2,
                                                 mx53_spdif_xtal_sel, ARRAY_SIZE(mx53_spdif_xtal_sel));
 
-        for (i = 0; i < ARRAY_SIZE(clk); i++)
-                if (IS_ERR(clk[i]))
-                        pr_err("i.MX53 clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
 
         clk_data.clks = clk;
         clk_data.clk_num = ARRAY_SIZE(clk);
         of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 
-        mx5_clocks_common_init(0, 0, 0, 0);
-
-        clk_register_clkdev(clk[IMX5_CLK_I2C3_GATE], NULL, "imx21-i2c.2");
-        clk_register_clkdev(clk[IMX5_CLK_FEC_GATE], NULL, "imx25-fec.0");
-        clk_register_clkdev(clk[IMX5_CLK_USB_PHY1_GATE], "usb_phy1", "mxc-ehci.0");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC1_IPG_GATE], "ipg", "sdhci-esdhc-imx53.0");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], "ahb", "sdhci-esdhc-imx53.0");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC1_PER_GATE], "per", "sdhci-esdhc-imx53.0");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC2_IPG_GATE], "ipg", "sdhci-esdhc-imx53.1");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], "ahb", "sdhci-esdhc-imx53.1");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC2_PER_GATE], "per", "sdhci-esdhc-imx53.1");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC3_IPG_GATE], "ipg", "sdhci-esdhc-imx53.2");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], "ahb", "sdhci-esdhc-imx53.2");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC3_PER_GATE], "per", "sdhci-esdhc-imx53.2");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC4_IPG_GATE], "ipg", "sdhci-esdhc-imx53.3");
-        clk_register_clkdev(clk[IMX5_CLK_DUMMY], "ahb", "sdhci-esdhc-imx53.3");
-        clk_register_clkdev(clk[IMX5_CLK_ESDHC4_PER_GATE], "per", "sdhci-esdhc-imx53.3");
-
         /* set SDHC root clock to 200MHZ*/
         clk_set_rate(clk[IMX5_CLK_ESDHC_A_PODF], 200000000);
         clk_set_rate(clk[IMX5_CLK_ESDHC_B_PODF], 200000000);
@@ -583,7 +557,5 @@ static void __init mx53_clocks_init(struct device_node *np)
 
         r = clk_round_rate(clk[IMX5_CLK_USBOH3_PER_GATE], 54000000);
         clk_set_rate(clk[IMX5_CLK_USBOH3_PER_GATE], r);
-
-        mxc_timer_init_dt(of_find_compatible_node(NULL, NULL, "fsl,imx53-gpt"));
 }
 CLK_OF_DECLARE(imx53_ccm, "fsl,imx53-ccm", mx53_clocks_init);
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 8556c787e59c..6cceb7765c14 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -19,6 +19,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
+#include <dt-bindings/clock/imx6qdl-clock.h>
 
 #include "clk.h"
 #include "common.h"
@@ -73,48 +74,13 @@ static const char *lvds_sels[] = {
         "pcie_ref_125m", "sata_ref_100m",
 };
 
-enum mx6q_clks {
-        dummy, ckil, ckih, osc, pll2_pfd0_352m, pll2_pfd1_594m, pll2_pfd2_396m,
-        pll3_pfd0_720m, pll3_pfd1_540m, pll3_pfd2_508m, pll3_pfd3_454m,
-        pll2_198m, pll3_120m, pll3_80m, pll3_60m, twd, step, pll1_sw,
-        periph_pre, periph2_pre, periph_clk2_sel, periph2_clk2_sel, axi_sel,
-        esai_sel, asrc_sel, spdif_sel, gpu2d_axi, gpu3d_axi, gpu2d_core_sel,
-        gpu3d_core_sel, gpu3d_shader_sel, ipu1_sel, ipu2_sel, ldb_di0_sel,
-        ldb_di1_sel, ipu1_di0_pre_sel, ipu1_di1_pre_sel, ipu2_di0_pre_sel,
-        ipu2_di1_pre_sel, ipu1_di0_sel, ipu1_di1_sel, ipu2_di0_sel,
-        ipu2_di1_sel, hsi_tx_sel, pcie_axi_sel, ssi1_sel, ssi2_sel, ssi3_sel,
-        usdhc1_sel, usdhc2_sel, usdhc3_sel, usdhc4_sel, enfc_sel, emi_sel,
-        emi_slow_sel, vdo_axi_sel, vpu_axi_sel, cko1_sel, periph, periph2,
-        periph_clk2, periph2_clk2, ipg, ipg_per, esai_pred, esai_podf,
-        asrc_pred, asrc_podf, spdif_pred, spdif_podf, can_root, ecspi_root,
-        gpu2d_core_podf, gpu3d_core_podf, gpu3d_shader, ipu1_podf, ipu2_podf,
-        ldb_di0_podf, ldb_di1_podf, ipu1_di0_pre, ipu1_di1_pre, ipu2_di0_pre,
-        ipu2_di1_pre, hsi_tx_podf, ssi1_pred, ssi1_podf, ssi2_pred, ssi2_podf,
-        ssi3_pred, ssi3_podf, uart_serial_podf, usdhc1_podf, usdhc2_podf,
-        usdhc3_podf, usdhc4_podf, enfc_pred, enfc_podf, emi_podf,
-        emi_slow_podf, vpu_axi_podf, cko1_podf, axi, mmdc_ch0_axi_podf,
-        mmdc_ch1_axi_podf, arm, ahb, apbh_dma, asrc, can1_ipg, can1_serial,
-        can2_ipg, can2_serial, ecspi1, ecspi2, ecspi3, ecspi4, ecspi5, enet,
-        esai, gpt_ipg, gpt_ipg_per, gpu2d_core, gpu3d_core, hdmi_iahb,
-        hdmi_isfr, i2c1, i2c2, i2c3, iim, enfc, ipu1, ipu1_di0, ipu1_di1, ipu2,
-        ipu2_di0, ldb_di0, ldb_di1, ipu2_di1, hsi_tx, mlb, mmdc_ch0_axi,
-        mmdc_ch1_axi, ocram, openvg_axi, pcie_axi, pwm1, pwm2, pwm3, pwm4, per1_bch,
-        gpmi_bch_apb, gpmi_bch, gpmi_io, gpmi_apb, sata, sdma, spba, ssi1,
-        ssi2, ssi3, uart_ipg, uart_serial, usboh3, usdhc1, usdhc2, usdhc3,
-        usdhc4, vdo_axi, vpu_axi, cko1, pll1_sys, pll2_bus, pll3_usb_otg,
-        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,
-        spdif, cko2_sel, cko2_podf, cko2, cko, vdoa, pll4_audio_div,
-        lvds1_sel, lvds2_sel, lvds1_gate, lvds2_gate, esai_ahb, clk_max
-};
-
-static struct clk *clk[clk_max];
+static struct clk *clk[IMX6QDL_CLK_END];
 static struct clk_onecell_data clk_data;
 
-static enum mx6q_clks const clks_init_on[] __initconst = {
-        mmdc_ch0_axi, rom, arm,
+static unsigned int const clks_init_on[] __initconst = {
+        IMX6QDL_CLK_MMDC_CH0_AXI,
+        IMX6QDL_CLK_ROM,
+        IMX6QDL_CLK_ARM,
 };
 
 static struct clk_div_table clk_enet_ref_table[] = {
@@ -149,10 +115,10 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
         int i;
         int ret;
 
-        clk[dummy] = imx_clk_fixed("dummy", 0);
-        clk[ckil] = imx_obtain_fixed_clock("ckil", 0);
-        clk[ckih] = imx_obtain_fixed_clock("ckih1", 0);
-        clk[osc] = imx_obtain_fixed_clock("osc", 0);
+        clk[IMX6QDL_CLK_DUMMY] = imx_clk_fixed("dummy", 0);
+        clk[IMX6QDL_CLK_CKIL] = imx_obtain_fixed_clock("ckil", 0);
+        clk[IMX6QDL_CLK_CKIH] = imx_obtain_fixed_clock("ckih1", 0);
+        clk[IMX6QDL_CLK_OSC] = imx_obtain_fixed_clock("osc", 0);
 
         np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop");
         base = of_iomap(np, 0);
@@ -166,14 +132,14 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
                 video_div_table[2].div = 1;
         };
 
-        /*                   type                               name         parent_name  base     div_mask */
-        clk[pll1_sys]      = imx_clk_pllv3(IMX_PLLV3_SYS,       "pll1_sys",     "osc", base,        0x7f);
-        clk[pll2_bus]      = imx_clk_pllv3(IMX_PLLV3_GENERIC,   "pll2_bus",     "osc", base + 0x30, 0x1);
-        clk[pll3_usb_otg]  = imx_clk_pllv3(IMX_PLLV3_USB,       "pll3_usb_otg", "osc", base + 0x10, 0x3);
-        clk[pll4_audio]    = imx_clk_pllv3(IMX_PLLV3_AV,        "pll4_audio",   "osc", base + 0x70, 0x7f);
-        clk[pll5_video]    = imx_clk_pllv3(IMX_PLLV3_AV,        "pll5_video",   "osc", base + 0xa0, 0x7f);
-        clk[pll6_enet]     = imx_clk_pllv3(IMX_PLLV3_ENET,      "pll6_enet",    "osc", base + 0xe0, 0x3);
-        clk[pll7_usb_host] = imx_clk_pllv3(IMX_PLLV3_USB,       "pll7_usb_host","osc", base + 0x20, 0x3);
+        /*                                             type             name         parent_name  base     div_mask */
+        clk[IMX6QDL_CLK_PLL1_SYS]      = imx_clk_pllv3(IMX_PLLV3_SYS,   "pll1_sys",     "osc", base,        0x7f);
+        clk[IMX6QDL_CLK_PLL2_BUS]      = imx_clk_pllv3(IMX_PLLV3_GENERIC,       "pll2_bus",     "osc", base + 0x30, 0x1);
+        clk[IMX6QDL_CLK_PLL3_USB_OTG]  = imx_clk_pllv3(IMX_PLLV3_USB,   "pll3_usb_otg", "osc", base + 0x10, 0x3);
+        clk[IMX6QDL_CLK_PLL4_AUDIO]    = imx_clk_pllv3(IMX_PLLV3_AV,    "pll4_audio",   "osc", base + 0x70, 0x7f);
+        clk[IMX6QDL_CLK_PLL5_VIDEO]    = imx_clk_pllv3(IMX_PLLV3_AV,    "pll5_video",   "osc", base + 0xa0, 0x7f);
+        clk[IMX6QDL_CLK_PLL6_ENET]     = imx_clk_pllv3(IMX_PLLV3_ENET,  "pll6_enet",    "osc", base + 0xe0, 0x3);
+        clk[IMX6QDL_CLK_PLL7_USB_HOST] = imx_clk_pllv3(IMX_PLLV3_USB,   "pll7_usb_host","osc", base + 0x20, 0x3);
 
         /*
          * Bit 20 is the reserved and read-only bit, we do this only for:
@@ -181,28 +147,28 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
          * - Keep refcount when do usbphy clk_enable/disable, in that case,
          * the clk framework may need to enable/disable usbphy's parent
          */
-        clk[usbphy1] = imx_clk_gate("usbphy1", "pll3_usb_otg", base + 0x10, 20);
-        clk[usbphy2] = imx_clk_gate("usbphy2", "pll7_usb_host", base + 0x20, 20);
+        clk[IMX6QDL_CLK_USBPHY1] = imx_clk_gate("usbphy1", "pll3_usb_otg", base + 0x10, 20);
+        clk[IMX6QDL_CLK_USBPHY2] = imx_clk_gate("usbphy2", "pll7_usb_host", base + 0x20, 20);
 
         /*
          * usbphy*_gate needs to be on after system boots up, and software
          * never needs to control it anymore.
          */
-        clk[usbphy1_gate] = imx_clk_gate("usbphy1_gate", "dummy", base + 0x10, 6);
-        clk[usbphy2_gate] = imx_clk_gate("usbphy2_gate", "dummy", base + 0x20, 6);
+        clk[IMX6QDL_CLK_USBPHY1_GATE] = imx_clk_gate("usbphy1_gate", "dummy", base + 0x10, 6);
+        clk[IMX6QDL_CLK_USBPHY2_GATE] = imx_clk_gate("usbphy2_gate", "dummy", base + 0x20, 6);
 
-        clk[sata_ref] = imx_clk_fixed_factor("sata_ref", "pll6_enet", 1, 5);
-        clk[pcie_ref] = imx_clk_fixed_factor("pcie_ref", "pll6_enet", 1, 4);
+        clk[IMX6QDL_CLK_SATA_REF] = imx_clk_fixed_factor("sata_ref", "pll6_enet", 1, 5);
+        clk[IMX6QDL_CLK_PCIE_REF] = imx_clk_fixed_factor("pcie_ref", "pll6_enet", 1, 4);
 
-        clk[sata_ref_100m] = imx_clk_gate("sata_ref_100m", "sata_ref", base + 0xe0, 20);
-        clk[pcie_ref_125m] = imx_clk_gate("pcie_ref_125m", "pcie_ref", base + 0xe0, 19);
+        clk[IMX6QDL_CLK_SATA_REF_100M] = imx_clk_gate("sata_ref_100m", "sata_ref", base + 0xe0, 20);
+        clk[IMX6QDL_CLK_PCIE_REF_125M] = imx_clk_gate("pcie_ref_125m", "pcie_ref", base + 0xe0, 19);
 
-        clk[enet_ref] = clk_register_divider_table(NULL, "enet_ref", "pll6_enet", 0,
+        clk[IMX6QDL_CLK_ENET_REF] = clk_register_divider_table(NULL, "enet_ref", "pll6_enet", 0,
                         base + 0xe0, 0, 2, 0, clk_enet_ref_table,
                         &imx_ccm_lock);
 
-        clk[lvds1_sel] = imx_clk_mux("lvds1_sel", base + 0x160, 0, 5, lvds_sels, ARRAY_SIZE(lvds_sels));
-        clk[lvds2_sel] = imx_clk_mux("lvds2_sel", base + 0x160, 5, 5, lvds_sels, ARRAY_SIZE(lvds_sels));
+        clk[IMX6QDL_CLK_LVDS1_SEL] = imx_clk_mux("lvds1_sel", base + 0x160, 0, 5, lvds_sels, ARRAY_SIZE(lvds_sels));
+        clk[IMX6QDL_CLK_LVDS2_SEL] = imx_clk_mux("lvds2_sel", base + 0x160, 5, 5, lvds_sels, ARRAY_SIZE(lvds_sels));
 
         /*
          * lvds1_gate and lvds2_gate are pseudo-gates.  Both can be
@@ -210,29 +176,29 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
          * the "output_enable" bit as a gate, even though it's really just
          * enabling clock output.
          */
-        clk[lvds1_gate] = imx_clk_gate("lvds1_gate", "lvds1_sel", base + 0x160, 10);
-        clk[lvds2_gate] = imx_clk_gate("lvds2_gate", "lvds2_sel", base + 0x160, 11);
-
-        /*                                name              parent_name        reg       idx */
-        clk[pll2_pfd0_352m] = imx_clk_pfd("pll2_pfd0_352m", "pll2_bus",     base + 0x100, 0);
-        clk[pll2_pfd1_594m] = imx_clk_pfd("pll2_pfd1_594m", "pll2_bus",     base + 0x100, 1);
-        clk[pll2_pfd2_396m] = imx_clk_pfd("pll2_pfd2_396m", "pll2_bus",     base + 0x100, 2);
-        clk[pll3_pfd0_720m] = imx_clk_pfd("pll3_pfd0_720m", "pll3_usb_otg", base + 0xf0,  0);
-        clk[pll3_pfd1_540m] = imx_clk_pfd("pll3_pfd1_540m", "pll3_usb_otg", base + 0xf0,  1);
-        clk[pll3_pfd2_508m] = imx_clk_pfd("pll3_pfd2_508m", "pll3_usb_otg", base + 0xf0,  2);
-        clk[pll3_pfd3_454m] = imx_clk_pfd("pll3_pfd3_454m", "pll3_usb_otg", base + 0xf0,  3);
-
-        /*                                    name         parent_name     mult div */
-        clk[pll2_198m] = imx_clk_fixed_factor("pll2_198m", "pll2_pfd2_396m", 1, 2);
-        clk[pll3_120m] = imx_clk_fixed_factor("pll3_120m", "pll3_usb_otg",   1, 4);
-        clk[pll3_80m]  = imx_clk_fixed_factor("pll3_80m",  "pll3_usb_otg",   1, 6);
-        clk[pll3_60m]  = imx_clk_fixed_factor("pll3_60m",  "pll3_usb_otg",   1, 8);
-        clk[twd]       = imx_clk_fixed_factor("twd",       "arm",            1, 2);
-
-        clk[pll4_post_div] = clk_register_divider_table(NULL, "pll4_post_div", "pll4_audio", CLK_SET_RATE_PARENT, base + 0x70, 19, 2, 0, post_div_table, &imx_ccm_lock);
-        clk[pll4_audio_div] = clk_register_divider(NULL, "pll4_audio_div", "pll4_post_div", CLK_SET_RATE_PARENT, base + 0x170, 15, 1, 0, &imx_ccm_lock);
-        clk[pll5_post_div] = clk_register_divider_table(NULL, "pll5_post_div", "pll5_video", CLK_SET_RATE_PARENT, base + 0xa0, 19, 2, 0, post_div_table, &imx_ccm_lock);
-        clk[pll5_video_div] = clk_register_divider_table(NULL, "pll5_video_div", "pll5_post_div", CLK_SET_RATE_PARENT, base + 0x170, 30, 2, 0, video_div_table, &imx_ccm_lock);
+        clk[IMX6QDL_CLK_LVDS1_GATE] = imx_clk_gate("lvds1_gate", "lvds1_sel", base + 0x160, 10);
+        clk[IMX6QDL_CLK_LVDS2_GATE] = imx_clk_gate("lvds2_gate", "lvds2_sel", base + 0x160, 11);
+
+        /*                                            name              parent_name        reg       idx */
+        clk[IMX6QDL_CLK_PLL2_PFD0_352M] = imx_clk_pfd("pll2_pfd0_352m", "pll2_bus",     base + 0x100, 0);
+        clk[IMX6QDL_CLK_PLL2_PFD1_594M] = imx_clk_pfd("pll2_pfd1_594m", "pll2_bus",     base + 0x100, 1);
+        clk[IMX6QDL_CLK_PLL2_PFD2_396M] = imx_clk_pfd("pll2_pfd2_396m", "pll2_bus",     base + 0x100, 2);
+        clk[IMX6QDL_CLK_PLL3_PFD0_720M] = imx_clk_pfd("pll3_pfd0_720m", "pll3_usb_otg", base + 0xf0,  0);
+        clk[IMX6QDL_CLK_PLL3_PFD1_540M] = imx_clk_pfd("pll3_pfd1_540m", "pll3_usb_otg", base + 0xf0,  1);
+        clk[IMX6QDL_CLK_PLL3_PFD2_508M] = imx_clk_pfd("pll3_pfd2_508m", "pll3_usb_otg", base + 0xf0,  2);
+        clk[IMX6QDL_CLK_PLL3_PFD3_454M] = imx_clk_pfd("pll3_pfd3_454m", "pll3_usb_otg", base + 0xf0,  3);
+
+        /*                                                name         parent_name     mult div */
+        clk[IMX6QDL_CLK_PLL2_198M] = imx_clk_fixed_factor("pll2_198m", "pll2_pfd2_396m", 1, 2);
+        clk[IMX6QDL_CLK_PLL3_120M] = imx_clk_fixed_factor("pll3_120m", "pll3_usb_otg",   1, 4);
+        clk[IMX6QDL_CLK_PLL3_80M]  = imx_clk_fixed_factor("pll3_80m",  "pll3_usb_otg",   1, 6);
+        clk[IMX6QDL_CLK_PLL3_60M]  = imx_clk_fixed_factor("pll3_60m",  "pll3_usb_otg",   1, 8);
+        clk[IMX6QDL_CLK_TWD]       = imx_clk_fixed_factor("twd",       "arm",            1, 2);
+
+        clk[IMX6QDL_CLK_PLL4_POST_DIV] = clk_register_divider_table(NULL, "pll4_post_div", "pll4_audio", CLK_SET_RATE_PARENT, base + 0x70, 19, 2, 0, post_div_table, &imx_ccm_lock);
+        clk[IMX6QDL_CLK_PLL4_AUDIO_DIV] = clk_register_divider(NULL, "pll4_audio_div", "pll4_post_div", CLK_SET_RATE_PARENT, base + 0x170, 15, 1, 0, &imx_ccm_lock);
+        clk[IMX6QDL_CLK_PLL5_POST_DIV] = clk_register_divider_table(NULL, "pll5_post_div", "pll5_video", CLK_SET_RATE_PARENT, base + 0xa0, 19, 2, 0, post_div_table, &imx_ccm_lock);
+        clk[IMX6QDL_CLK_PLL5_VIDEO_DIV] = clk_register_divider_table(NULL, "pll5_video_div", "pll5_post_div", CLK_SET_RATE_PARENT, base + 0x170, 30, 2, 0, video_div_table, &imx_ccm_lock);
 
         np = ccm_node;
         base = of_iomap(np, 0);
@@ -240,262 +206,254 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
 
         imx6q_pm_set_ccm_base(base);
 
-        /*                                  name                reg       shift width parent_names     num_parents */
-        clk[step]             = imx_clk_mux("step",             base + 0xc,  8,  1, step_sels,         ARRAY_SIZE(step_sels));
-        clk[pll1_sw]          = imx_clk_mux("pll1_sw",          base + 0xc,  2,  1, pll1_sw_sels,      ARRAY_SIZE(pll1_sw_sels));
-        clk[periph_pre]       = imx_clk_mux("periph_pre",       base + 0x18, 18, 2, periph_pre_sels,   ARRAY_SIZE(periph_pre_sels));
-        clk[periph2_pre]      = imx_clk_mux("periph2_pre",      base + 0x18, 21, 2, periph_pre_sels,   ARRAY_SIZE(periph_pre_sels));
-        clk[periph_clk2_sel]  = imx_clk_mux("periph_clk2_sel",  base + 0x18, 12, 2, periph_clk2_sels,  ARRAY_SIZE(periph_clk2_sels));
-        clk[periph2_clk2_sel] = imx_clk_mux("periph2_clk2_sel", base + 0x18, 20, 1, periph2_clk2_sels, ARRAY_SIZE(periph2_clk2_sels));
-        clk[axi_sel]          = imx_clk_mux("axi_sel",          base + 0x14, 6,  2, axi_sels,          ARRAY_SIZE(axi_sels));
-        clk[esai_sel]         = imx_clk_mux("esai_sel",         base + 0x20, 19, 2, audio_sels,        ARRAY_SIZE(audio_sels));
-        clk[asrc_sel]         = imx_clk_mux("asrc_sel",         base + 0x30, 7,  2, audio_sels,        ARRAY_SIZE(audio_sels));
-        clk[spdif_sel]        = imx_clk_mux("spdif_sel",        base + 0x30, 20, 2, audio_sels,        ARRAY_SIZE(audio_sels));
-        clk[gpu2d_axi]        = imx_clk_mux("gpu2d_axi",        base + 0x18, 0,  1, gpu_axi_sels,      ARRAY_SIZE(gpu_axi_sels));
-        clk[gpu3d_axi]        = imx_clk_mux("gpu3d_axi",        base + 0x18, 1,  1, gpu_axi_sels,      ARRAY_SIZE(gpu_axi_sels));
-        clk[gpu2d_core_sel]   = imx_clk_mux("gpu2d_core_sel",   base + 0x18, 16, 2, gpu2d_core_sels,   ARRAY_SIZE(gpu2d_core_sels));
-        clk[gpu3d_core_sel]   = imx_clk_mux("gpu3d_core_sel",   base + 0x18, 4,  2, gpu3d_core_sels,   ARRAY_SIZE(gpu3d_core_sels));
-        clk[gpu3d_shader_sel] = imx_clk_mux("gpu3d_shader_sel", base + 0x18, 8,  2, gpu3d_shader_sels, ARRAY_SIZE(gpu3d_shader_sels));
-        clk[ipu1_sel]         = imx_clk_mux("ipu1_sel",         base + 0x3c, 9,  2, ipu_sels,          ARRAY_SIZE(ipu_sels));
-        clk[ipu2_sel]         = imx_clk_mux("ipu2_sel",         base + 0x3c, 14, 2, ipu_sels,          ARRAY_SIZE(ipu_sels));
-        clk[ldb_di0_sel]      = imx_clk_mux_flags("ldb_di0_sel", base + 0x2c, 9,  3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT);
-        clk[ldb_di1_sel]      = imx_clk_mux_flags("ldb_di1_sel", base + 0x2c, 12, 3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT);
-        clk[ipu1_di0_pre_sel] = imx_clk_mux_flags("ipu1_di0_pre_sel", base + 0x34, 6,  3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);
-        clk[ipu1_di1_pre_sel] = imx_clk_mux_flags("ipu1_di1_pre_sel", base + 0x34, 15, 3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);
-        clk[ipu2_di0_pre_sel] = imx_clk_mux_flags("ipu2_di0_pre_sel", base + 0x38, 6,  3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);
-        clk[ipu2_di1_pre_sel] = imx_clk_mux_flags("ipu2_di1_pre_sel", base + 0x38, 15, 3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);
-        clk[ipu1_di0_sel]     = imx_clk_mux_flags("ipu1_di0_sel",     base + 0x34, 0,  3, ipu1_di0_sels,     ARRAY_SIZE(ipu1_di0_sels), CLK_SET_RATE_PARENT);
-        clk[ipu1_di1_sel]     = imx_clk_mux_flags("ipu1_di1_sel",     base + 0x34, 9,  3, ipu1_di1_sels,     ARRAY_SIZE(ipu1_di1_sels), CLK_SET_RATE_PARENT);
-        clk[ipu2_di0_sel]     = imx_clk_mux_flags("ipu2_di0_sel",     base + 0x38, 0,  3, ipu2_di0_sels,     ARRAY_SIZE(ipu2_di0_sels), CLK_SET_RATE_PARENT);
-        clk[ipu2_di1_sel]     = imx_clk_mux_flags("ipu2_di1_sel",     base + 0x38, 9,  3, ipu2_di1_sels,     ARRAY_SIZE(ipu2_di1_sels), CLK_SET_RATE_PARENT);
-        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_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_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));
-        clk[periph2] = imx_clk_busy_mux("periph2", base + 0x14, 26,  1,   base + 0x48, 3,  periph2_sels, ARRAY_SIZE(periph2_sels));
-
-        /*                                      name                parent_name          reg       shift width */
-        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_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);
-        clk[asrc_podf]        = imx_clk_divider("asrc_podf",        "asrc_pred",         base + 0x30, 9,  3);
-        clk[spdif_pred]       = imx_clk_divider("spdif_pred",       "spdif_sel",         base + 0x30, 25, 3);
-        clk[spdif_podf]       = imx_clk_divider("spdif_podf",       "spdif_pred",        base + 0x30, 22, 3);
-        clk[can_root]         = imx_clk_divider("can_root",         "pll3_60m",          base + 0x20, 2,  6);
-        clk[ecspi_root]       = imx_clk_divider("ecspi_root",       "pll3_60m",          base + 0x38, 19, 6);
-        clk[gpu2d_core_podf]  = imx_clk_divider("gpu2d_core_podf",  "gpu2d_core_sel",    base + 0x18, 23, 3);
-        clk[gpu3d_core_podf]  = imx_clk_divider("gpu3d_core_podf",  "gpu3d_core_sel",    base + 0x18, 26, 3);
-        clk[gpu3d_shader]     = imx_clk_divider("gpu3d_shader",     "gpu3d_shader_sel",  base + 0x18, 29, 3);
-        clk[ipu1_podf]        = imx_clk_divider("ipu1_podf",        "ipu1_sel",          base + 0x3c, 11, 3);
-        clk[ipu2_podf]        = imx_clk_divider("ipu2_podf",        "ipu2_sel",          base + 0x3c, 16, 3);
-        clk[ldb_di0_div_3_5]  = imx_clk_fixed_factor("ldb_di0_div_3_5", "ldb_di0_sel", 2, 7);
-        clk[ldb_di0_podf]     = imx_clk_divider_flags("ldb_di0_podf", "ldb_di0_div_3_5", base + 0x20, 10, 1, 0);
-        clk[ldb_di1_div_3_5]  = imx_clk_fixed_factor("ldb_di1_div_3_5", "ldb_di1_sel", 2, 7);
-        clk[ldb_di1_podf]     = imx_clk_divider_flags("ldb_di1_podf", "ldb_di1_div_3_5", base + 0x20, 11, 1, 0);
-        clk[ipu1_di0_pre]     = imx_clk_divider("ipu1_di0_pre",     "ipu1_di0_pre_sel",  base + 0x34, 3,  3);
-        clk[ipu1_di1_pre]     = imx_clk_divider("ipu1_di1_pre",     "ipu1_di1_pre_sel",  base + 0x34, 12, 3);
-        clk[ipu2_di0_pre]     = imx_clk_divider("ipu2_di0_pre",     "ipu2_di0_pre_sel",  base + 0x38, 3,  3);
-        clk[ipu2_di1_pre]     = imx_clk_divider("ipu2_di1_pre",     "ipu2_di1_pre_sel",  base + 0x38, 12, 3);
-        clk[hsi_tx_podf]      = imx_clk_divider("hsi_tx_podf",      "hsi_tx_sel",        base + 0x30, 29, 3);
-        clk[ssi1_pred]        = imx_clk_divider("ssi1_pred",        "ssi1_sel",          base + 0x28, 6,  3);
-        clk[ssi1_podf]        = imx_clk_divider("ssi1_podf",        "ssi1_pred",         base + 0x28, 0,  6);
-        clk[ssi2_pred]        = imx_clk_divider("ssi2_pred",        "ssi2_sel",          base + 0x2c, 6,  3);
-        clk[ssi2_podf]        = imx_clk_divider("ssi2_podf",        "ssi2_pred",         base + 0x2c, 0,  6);
-        clk[ssi3_pred]        = imx_clk_divider("ssi3_pred",        "ssi3_sel",          base + 0x28, 22, 3);
-        clk[ssi3_podf]        = imx_clk_divider("ssi3_podf",        "ssi3_pred",         base + 0x28, 16, 6);
-        clk[uart_serial_podf] = imx_clk_divider("uart_serial_podf", "pll3_80m",          base + 0x24, 0,  6);
-        clk[usdhc1_podf]      = imx_clk_divider("usdhc1_podf",      "usdhc1_sel",        base + 0x24, 11, 3);
-        clk[usdhc2_podf]      = imx_clk_divider("usdhc2_podf",      "usdhc2_sel",        base + 0x24, 16, 3);
-        clk[usdhc3_podf]      = imx_clk_divider("usdhc3_podf",      "usdhc3_sel",        base + 0x24, 19, 3);
-        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_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);
-        clk[mmdc_ch0_axi_podf] = imx_clk_busy_divider("mmdc_ch0_axi_podf", "periph",      base + 0x14, 19,  3,   base + 0x48, 4);
-        clk[mmdc_ch1_axi_podf] = imx_clk_busy_divider("mmdc_ch1_axi_podf", "periph2",     base + 0x14, 3,   3,   base + 0x48, 2);
-        clk[arm]               = imx_clk_busy_divider("arm",               "pll1_sw",     base + 0x10, 0,   3,   base + 0x48, 16);
-        clk[ahb]               = imx_clk_busy_divider("ahb",               "periph",      base + 0x14, 10,  3,   base + 0x48, 1);
-
-        /*                                name             parent_name          reg         shift */
-        clk[apbh_dma]     = imx_clk_gate2("apbh_dma",      "usdhc3",            base + 0x68, 4);
-        clk[asrc]         = imx_clk_gate2("asrc",          "asrc_podf",         base + 0x68, 6);
-        clk[can1_ipg]     = imx_clk_gate2("can1_ipg",      "ipg",               base + 0x68, 14);
-        clk[can1_serial]  = imx_clk_gate2("can1_serial",   "can_root",          base + 0x68, 16);
-        clk[can2_ipg]     = imx_clk_gate2("can2_ipg",      "ipg",               base + 0x68, 18);
-        clk[can2_serial]  = imx_clk_gate2("can2_serial",   "can_root",          base + 0x68, 20);
-        clk[ecspi1]       = imx_clk_gate2("ecspi1",        "ecspi_root",        base + 0x6c, 0);
-        clk[ecspi2]       = imx_clk_gate2("ecspi2",        "ecspi_root",        base + 0x6c, 2);
-        clk[ecspi3]       = imx_clk_gate2("ecspi3",        "ecspi_root",        base + 0x6c, 4);
-        clk[ecspi4]       = imx_clk_gate2("ecspi4",        "ecspi_root",        base + 0x6c, 6);
+        /*                                              name                reg       shift width parent_names     num_parents */
+        clk[IMX6QDL_CLK_STEP]             = imx_clk_mux("step",             base + 0xc,  8,  1, step_sels,         ARRAY_SIZE(step_sels));
+        clk[IMX6QDL_CLK_PLL1_SW]          = imx_clk_mux("pll1_sw",          base + 0xc,  2,  1, pll1_sw_sels,      ARRAY_SIZE(pll1_sw_sels));
+        clk[IMX6QDL_CLK_PERIPH_PRE]       = imx_clk_mux("periph_pre",       base + 0x18, 18, 2, periph_pre_sels,   ARRAY_SIZE(periph_pre_sels));
+        clk[IMX6QDL_CLK_PERIPH2_PRE]      = imx_clk_mux("periph2_pre",      base + 0x18, 21, 2, periph_pre_sels,   ARRAY_SIZE(periph_pre_sels));
+        clk[IMX6QDL_CLK_PERIPH_CLK2_SEL]  = imx_clk_mux("periph_clk2_sel",  base + 0x18, 12, 2, periph_clk2_sels,  ARRAY_SIZE(periph_clk2_sels));
+        clk[IMX6QDL_CLK_PERIPH2_CLK2_SEL] = imx_clk_mux("periph2_clk2_sel", base + 0x18, 20, 1, periph2_clk2_sels, ARRAY_SIZE(periph2_clk2_sels));
+        clk[IMX6QDL_CLK_AXI_SEL]          = imx_clk_mux("axi_sel",          base + 0x14, 6,  2, axi_sels,          ARRAY_SIZE(axi_sels));
+        clk[IMX6QDL_CLK_ESAI_SEL]         = imx_clk_mux("esai_sel",         base + 0x20, 19, 2, audio_sels,        ARRAY_SIZE(audio_sels));
+        clk[IMX6QDL_CLK_ASRC_SEL]         = imx_clk_mux("asrc_sel",         base + 0x30, 7,  2, audio_sels,        ARRAY_SIZE(audio_sels));
+        clk[IMX6QDL_CLK_SPDIF_SEL]        = imx_clk_mux("spdif_sel",        base + 0x30, 20, 2, audio_sels,        ARRAY_SIZE(audio_sels));
+        clk[IMX6QDL_CLK_GPU2D_AXI]        = imx_clk_mux("gpu2d_axi",        base + 0x18, 0,  1, gpu_axi_sels,      ARRAY_SIZE(gpu_axi_sels));
+        clk[IMX6QDL_CLK_GPU3D_AXI]        = imx_clk_mux("gpu3d_axi",        base + 0x18, 1,  1, gpu_axi_sels,      ARRAY_SIZE(gpu_axi_sels));
+        clk[IMX6QDL_CLK_GPU2D_CORE_SEL]   = imx_clk_mux("gpu2d_core_sel",   base + 0x18, 16, 2, gpu2d_core_sels,   ARRAY_SIZE(gpu2d_core_sels));
+        clk[IMX6QDL_CLK_GPU3D_CORE_SEL]   = imx_clk_mux("gpu3d_core_sel",   base + 0x18, 4,  2, gpu3d_core_sels,   ARRAY_SIZE(gpu3d_core_sels));
+        clk[IMX6QDL_CLK_GPU3D_SHADER_SEL] = imx_clk_mux("gpu3d_shader_sel", base + 0x18, 8,  2, gpu3d_shader_sels, ARRAY_SIZE(gpu3d_shader_sels));
+        clk[IMX6QDL_CLK_IPU1_SEL]         = imx_clk_mux("ipu1_sel",         base + 0x3c, 9,  2, ipu_sels,          ARRAY_SIZE(ipu_sels));
+        clk[IMX6QDL_CLK_IPU2_SEL]         = imx_clk_mux("ipu2_sel",         base + 0x3c, 14, 2, ipu_sels,          ARRAY_SIZE(ipu_sels));
+        clk[IMX6QDL_CLK_LDB_DI0_SEL]      = imx_clk_mux_flags("ldb_di0_sel", base + 0x2c, 9,  3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_LDB_DI1_SEL]      = imx_clk_mux_flags("ldb_di1_sel", base + 0x2c, 12, 3, ldb_di_sels,      ARRAY_SIZE(ldb_di_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_IPU1_DI0_PRE_SEL] = imx_clk_mux_flags("ipu1_di0_pre_sel", base + 0x34, 6,  3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_IPU1_DI1_PRE_SEL] = imx_clk_mux_flags("ipu1_di1_pre_sel", base + 0x34, 15, 3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_IPU2_DI0_PRE_SEL] = imx_clk_mux_flags("ipu2_di0_pre_sel", base + 0x38, 6,  3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_IPU2_DI1_PRE_SEL] = imx_clk_mux_flags("ipu2_di1_pre_sel", base + 0x38, 15, 3, ipu_di_pre_sels,   ARRAY_SIZE(ipu_di_pre_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_IPU1_DI0_SEL]     = imx_clk_mux_flags("ipu1_di0_sel",     base + 0x34, 0,  3, ipu1_di0_sels,     ARRAY_SIZE(ipu1_di0_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_IPU1_DI1_SEL]     = imx_clk_mux_flags("ipu1_di1_sel",     base + 0x34, 9,  3, ipu1_di1_sels,     ARRAY_SIZE(ipu1_di1_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_IPU2_DI0_SEL]     = imx_clk_mux_flags("ipu2_di0_sel",     base + 0x38, 0,  3, ipu2_di0_sels,     ARRAY_SIZE(ipu2_di0_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_IPU2_DI1_SEL]     = imx_clk_mux_flags("ipu2_di1_sel",     base + 0x38, 9,  3, ipu2_di1_sels,     ARRAY_SIZE(ipu2_di1_sels), CLK_SET_RATE_PARENT);
+        clk[IMX6QDL_CLK_HSI_TX_SEL]       = imx_clk_mux("hsi_tx_sel",       base + 0x30, 28, 1, hsi_tx_sels,       ARRAY_SIZE(hsi_tx_sels));
+        clk[IMX6QDL_CLK_PCIE_AXI_SEL]     = imx_clk_mux("pcie_axi_sel",     base + 0x18, 10, 1, pcie_axi_sels,     ARRAY_SIZE(pcie_axi_sels));
+        clk[IMX6QDL_CLK_SSI1_SEL]         = imx_clk_fixup_mux("ssi1_sel",   base + 0x1c, 10, 2, ssi_sels,          ARRAY_SIZE(ssi_sels), imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_SSI2_SEL]         = imx_clk_fixup_mux("ssi2_sel",   base + 0x1c, 12, 2, ssi_sels,          ARRAY_SIZE(ssi_sels), imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_SSI3_SEL]         = imx_clk_fixup_mux("ssi3_sel",   base + 0x1c, 14, 2, ssi_sels,          ARRAY_SIZE(ssi_sels), imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_USDHC1_SEL]       = imx_clk_fixup_mux("usdhc1_sel", base + 0x1c, 16, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels), imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_USDHC2_SEL]       = imx_clk_fixup_mux("usdhc2_sel", base + 0x1c, 17, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels), imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_USDHC3_SEL]       = imx_clk_fixup_mux("usdhc3_sel", base + 0x1c, 18, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels), imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_USDHC4_SEL]       = imx_clk_fixup_mux("usdhc4_sel", base + 0x1c, 19, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels), imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_ENFC_SEL]         = imx_clk_mux("enfc_sel",         base + 0x2c, 16, 2, enfc_sels,         ARRAY_SIZE(enfc_sels));
+        clk[IMX6QDL_CLK_EMI_SEL]          = imx_clk_fixup_mux("emi_sel",      base + 0x1c, 27, 2, emi_sels,        ARRAY_SIZE(emi_sels), imx_cscmr1_fixup);
+        clk[IMX6QDL_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[IMX6QDL_CLK_VDO_AXI_SEL]      = imx_clk_mux("vdo_axi_sel",      base + 0x18, 11, 1, vdo_axi_sels,      ARRAY_SIZE(vdo_axi_sels));
+        clk[IMX6QDL_CLK_VPU_AXI_SEL]      = imx_clk_mux("vpu_axi_sel",      base + 0x18, 14, 2, vpu_axi_sels,      ARRAY_SIZE(vpu_axi_sels));
+        clk[IMX6QDL_CLK_CKO1_SEL]         = imx_clk_mux("cko1_sel",         base + 0x60, 0,  4, cko1_sels,         ARRAY_SIZE(cko1_sels));
+        clk[IMX6QDL_CLK_CKO2_SEL]         = imx_clk_mux("cko2_sel",         base + 0x60, 16, 5, cko2_sels,         ARRAY_SIZE(cko2_sels));
+        clk[IMX6QDL_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[IMX6QDL_CLK_PERIPH]  = imx_clk_busy_mux("periph",  base + 0x14, 25,  1,   base + 0x48, 5,  periph_sels,  ARRAY_SIZE(periph_sels));
+        clk[IMX6QDL_CLK_PERIPH2] = imx_clk_busy_mux("periph2", base + 0x14, 26,  1,   base + 0x48, 3,  periph2_sels, ARRAY_SIZE(periph2_sels));
+
+        /*                                                  name                parent_name          reg       shift width */
+        clk[IMX6QDL_CLK_PERIPH_CLK2]      = imx_clk_divider("periph_clk2",      "periph_clk2_sel",   base + 0x14, 27, 3);
+        clk[IMX6QDL_CLK_PERIPH2_CLK2]     = imx_clk_divider("periph2_clk2",     "periph2_clk2_sel",  base + 0x14, 0,  3);
+        clk[IMX6QDL_CLK_IPG]              = imx_clk_divider("ipg",              "ahb",               base + 0x14, 8,  2);
+        clk[IMX6QDL_CLK_IPG_PER]          = imx_clk_fixup_divider("ipg_per",    "ipg",               base + 0x1c, 0,  6, imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_ESAI_PRED]        = imx_clk_divider("esai_pred",        "esai_sel",          base + 0x28, 9,  3);
+        clk[IMX6QDL_CLK_ESAI_PODF]        = imx_clk_divider("esai_podf",        "esai_pred",         base + 0x28, 25, 3);
+        clk[IMX6QDL_CLK_ASRC_PRED]        = imx_clk_divider("asrc_pred",        "asrc_sel",          base + 0x30, 12, 3);
+        clk[IMX6QDL_CLK_ASRC_PODF]        = imx_clk_divider("asrc_podf",        "asrc_pred",         base + 0x30, 9,  3);
+        clk[IMX6QDL_CLK_SPDIF_PRED]       = imx_clk_divider("spdif_pred",       "spdif_sel",         base + 0x30, 25, 3);
+        clk[IMX6QDL_CLK_SPDIF_PODF]       = imx_clk_divider("spdif_podf",       "spdif_pred",        base + 0x30, 22, 3);
+        clk[IMX6QDL_CLK_CAN_ROOT]         = imx_clk_divider("can_root",         "pll3_60m",          base + 0x20, 2,  6);
+        clk[IMX6QDL_CLK_ECSPI_ROOT]       = imx_clk_divider("ecspi_root",       "pll3_60m",          base + 0x38, 19, 6);
+        clk[IMX6QDL_CLK_GPU2D_CORE_PODF]  = imx_clk_divider("gpu2d_core_podf",  "gpu2d_core_sel",    base + 0x18, 23, 3);
+        clk[IMX6QDL_CLK_GPU3D_CORE_PODF]  = imx_clk_divider("gpu3d_core_podf",  "gpu3d_core_sel",    base + 0x18, 26, 3);
+        clk[IMX6QDL_CLK_GPU3D_SHADER]     = imx_clk_divider("gpu3d_shader",     "gpu3d_shader_sel",  base + 0x18, 29, 3);
+        clk[IMX6QDL_CLK_IPU1_PODF]        = imx_clk_divider("ipu1_podf",        "ipu1_sel",          base + 0x3c, 11, 3);
+        clk[IMX6QDL_CLK_IPU2_PODF]        = imx_clk_divider("ipu2_podf",        "ipu2_sel",          base + 0x3c, 16, 3);
+        clk[IMX6QDL_CLK_LDB_DI0_DIV_3_5]  = imx_clk_fixed_factor("ldb_di0_div_3_5", "ldb_di0_sel", 2, 7);
+        clk[IMX6QDL_CLK_LDB_DI0_PODF]     = imx_clk_divider_flags("ldb_di0_podf", "ldb_di0_div_3_5", base + 0x20, 10, 1, 0);
+        clk[IMX6QDL_CLK_LDB_DI1_DIV_3_5]  = imx_clk_fixed_factor("ldb_di1_div_3_5", "ldb_di1_sel", 2, 7);
+        clk[IMX6QDL_CLK_LDB_DI1_PODF]     = imx_clk_divider_flags("ldb_di1_podf", "ldb_di1_div_3_5", base + 0x20, 11, 1, 0);
+        clk[IMX6QDL_CLK_IPU1_DI0_PRE]     = imx_clk_divider("ipu1_di0_pre",     "ipu1_di0_pre_sel",  base + 0x34, 3,  3);
+        clk[IMX6QDL_CLK_IPU1_DI1_PRE]     = imx_clk_divider("ipu1_di1_pre",     "ipu1_di1_pre_sel",  base + 0x34, 12, 3);
+        clk[IMX6QDL_CLK_IPU2_DI0_PRE]     = imx_clk_divider("ipu2_di0_pre",     "ipu2_di0_pre_sel",  base + 0x38, 3,  3);
+        clk[IMX6QDL_CLK_IPU2_DI1_PRE]     = imx_clk_divider("ipu2_di1_pre",     "ipu2_di1_pre_sel",  base + 0x38, 12, 3);
+        clk[IMX6QDL_CLK_HSI_TX_PODF]      = imx_clk_divider("hsi_tx_podf",      "hsi_tx_sel",        base + 0x30, 29, 3);
+        clk[IMX6QDL_CLK_SSI1_PRED]        = imx_clk_divider("ssi1_pred",        "ssi1_sel",          base + 0x28, 6,  3);
+        clk[IMX6QDL_CLK_SSI1_PODF]        = imx_clk_divider("ssi1_podf",        "ssi1_pred",         base + 0x28, 0,  6);
+        clk[IMX6QDL_CLK_SSI2_PRED]        = imx_clk_divider("ssi2_pred",        "ssi2_sel",          base + 0x2c, 6,  3);
+        clk[IMX6QDL_CLK_SSI2_PODF]        = imx_clk_divider("ssi2_podf",        "ssi2_pred",         base + 0x2c, 0,  6);
+        clk[IMX6QDL_CLK_SSI3_PRED]        = imx_clk_divider("ssi3_pred",        "ssi3_sel",          base + 0x28, 22, 3);
+        clk[IMX6QDL_CLK_SSI3_PODF]        = imx_clk_divider("ssi3_podf",        "ssi3_pred",         base + 0x28, 16, 6);
+        clk[IMX6QDL_CLK_UART_SERIAL_PODF] = imx_clk_divider("uart_serial_podf", "pll3_80m",          base + 0x24, 0,  6);
+        clk[IMX6QDL_CLK_USDHC1_PODF]      = imx_clk_divider("usdhc1_podf",      "usdhc1_sel",        base + 0x24, 11, 3);
+        clk[IMX6QDL_CLK_USDHC2_PODF]      = imx_clk_divider("usdhc2_podf",      "usdhc2_sel",        base + 0x24, 16, 3);
+        clk[IMX6QDL_CLK_USDHC3_PODF]      = imx_clk_divider("usdhc3_podf",      "usdhc3_sel",        base + 0x24, 19, 3);
+        clk[IMX6QDL_CLK_USDHC4_PODF]      = imx_clk_divider("usdhc4_podf",      "usdhc4_sel",        base + 0x24, 22, 3);
+        clk[IMX6QDL_CLK_ENFC_PRED]        = imx_clk_divider("enfc_pred",        "enfc_sel",          base + 0x2c, 18, 3);
+        clk[IMX6QDL_CLK_ENFC_PODF]        = imx_clk_divider("enfc_podf",        "enfc_pred",         base + 0x2c, 21, 6);
+        clk[IMX6QDL_CLK_EMI_PODF]         = imx_clk_fixup_divider("emi_podf",   "emi_sel",           base + 0x1c, 20, 3, imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_EMI_SLOW_PODF]    = imx_clk_fixup_divider("emi_slow_podf", "emi_slow_sel",   base + 0x1c, 23, 3, imx_cscmr1_fixup);
+        clk[IMX6QDL_CLK_VPU_AXI_PODF]     = imx_clk_divider("vpu_axi_podf",     "vpu_axi_sel",       base + 0x24, 25, 3);
+        clk[IMX6QDL_CLK_CKO1_PODF]        = imx_clk_divider("cko1_podf",        "cko1_sel",          base + 0x60, 4,  3);
+        clk[IMX6QDL_CLK_CKO2_PODF]        = imx_clk_divider("cko2_podf",        "cko2_sel",          base + 0x60, 21, 3);
+
+        /*                                                        name                 parent_name    reg        shift width busy: reg, shift */
+        clk[IMX6QDL_CLK_AXI]               = imx_clk_busy_divider("axi",               "axi_sel",     base + 0x14, 16,  3,   base + 0x48, 0);
+        clk[IMX6QDL_CLK_MMDC_CH0_AXI_PODF] = imx_clk_busy_divider("mmdc_ch0_axi_podf", "periph",      base + 0x14, 19,  3,   base + 0x48, 4);
+        clk[IMX6QDL_CLK_MMDC_CH1_AXI_PODF] = imx_clk_busy_divider("mmdc_ch1_axi_podf", "periph2",     base + 0x14, 3,   3,   base + 0x48, 2);
+        clk[IMX6QDL_CLK_ARM]               = imx_clk_busy_divider("arm",               "pll1_sw",     base + 0x10, 0,   3,   base + 0x48, 16);
+        clk[IMX6QDL_CLK_AHB]               = imx_clk_busy_divider("ahb",               "periph",      base + 0x14, 10,  3,   base + 0x48, 1);
+
+        /*                                            name             parent_name          reg         shift */
+        clk[IMX6QDL_CLK_APBH_DMA]     = imx_clk_gate2("apbh_dma",      "usdhc3",            base + 0x68, 4);
+        clk[IMX6QDL_CLK_ASRC]         = imx_clk_gate2("asrc",          "asrc_podf",         base + 0x68, 6);
+        clk[IMX6QDL_CLK_CAN1_IPG]     = imx_clk_gate2("can1_ipg",      "ipg",               base + 0x68, 14);
+        clk[IMX6QDL_CLK_CAN1_SERIAL]  = imx_clk_gate2("can1_serial",   "can_root",          base + 0x68, 16);
+        clk[IMX6QDL_CLK_CAN2_IPG]     = imx_clk_gate2("can2_ipg",      "ipg",               base + 0x68, 18);
+        clk[IMX6QDL_CLK_CAN2_SERIAL]  = imx_clk_gate2("can2_serial",   "can_root",          base + 0x68, 20);
+        clk[IMX6QDL_CLK_ECSPI1]       = imx_clk_gate2("ecspi1",        "ecspi_root",        base + 0x6c, 0);
+        clk[IMX6QDL_CLK_ECSPI2]       = imx_clk_gate2("ecspi2",        "ecspi_root",        base + 0x6c, 2);
+        clk[IMX6QDL_CLK_ECSPI3]       = imx_clk_gate2("ecspi3",        "ecspi_root",        base + 0x6c, 4);
+        clk[IMX6QDL_CLK_ECSPI4]       = imx_clk_gate2("ecspi4",        "ecspi_root",        base + 0x6c, 6);
         if (cpu_is_imx6dl())
-                /* ecspi5 is replaced with i2c4 on imx6dl & imx6s */
-                clk[ecspi5] = imx_clk_gate2("i2c4",        "ipg_per",           base + 0x6c, 8);
+                clk[IMX6DL_CLK_I2C4]  = imx_clk_gate2("i2c4",          "ipg_per",           base + 0x6c, 8);
         else
-                clk[ecspi5] = imx_clk_gate2("ecspi5",      "ecspi_root",        base + 0x6c, 8);
-        clk[enet]         = imx_clk_gate2("enet",          "ipg",               base + 0x6c, 10);
-        clk[esai]         = imx_clk_gate2_shared("esai",   "esai_podf",         base + 0x6c, 16, &share_count_esai);
-        clk[esai_ahb]     = imx_clk_gate2_shared("esai_ahb", "ahb",             base + 0x6c, 16, &share_count_esai);
-        clk[gpt_ipg]      = imx_clk_gate2("gpt_ipg",       "ipg",               base + 0x6c, 20);
-        clk[gpt_ipg_per]  = imx_clk_gate2("gpt_ipg_per",   "ipg_per",           base + 0x6c, 22);
+                clk[IMX6Q_CLK_ECSPI5] = imx_clk_gate2("ecspi5",        "ecspi_root",        base + 0x6c, 8);
+        clk[IMX6QDL_CLK_ENET]         = imx_clk_gate2("enet",          "ipg",               base + 0x6c, 10);
+        clk[IMX6QDL_CLK_ESAI]         = imx_clk_gate2_shared("esai",   "esai_podf",         base + 0x6c, 16, &share_count_esai);
+        clk[IMX6QDL_CLK_ESAI_AHB]     = imx_clk_gate2_shared("esai_ahb", "ahb",             base + 0x6c, 16, &share_count_esai);
+        clk[IMX6QDL_CLK_GPT_IPG]      = imx_clk_gate2("gpt_ipg",       "ipg",               base + 0x6c, 20);
+        clk[IMX6QDL_CLK_GPT_IPG_PER]  = imx_clk_gate2("gpt_ipg_per",   "ipg_per",           base + 0x6c, 22);
         if (cpu_is_imx6dl())
                 /*
                  * The multiplexer and divider of imx6q clock gpu3d_shader get
                  * redefined/reused as gpu2d_core_sel and gpu2d_core_podf on imx6dl.
                  */
-                clk[gpu2d_core] = imx_clk_gate2("gpu2d_core", "gpu3d_shader", base + 0x6c, 24);
+                clk[IMX6QDL_CLK_GPU2D_CORE] = imx_clk_gate2("gpu2d_core", "gpu3d_shader", base + 0x6c, 24);
         else
-                clk[gpu2d_core] = imx_clk_gate2("gpu2d_core", "gpu2d_core_podf", base + 0x6c, 24);
-        clk[gpu3d_core]   = imx_clk_gate2("gpu3d_core",    "gpu3d_core_podf",   base + 0x6c, 26);
-        clk[hdmi_iahb]    = imx_clk_gate2("hdmi_iahb",     "ahb",               base + 0x70, 0);
-        clk[hdmi_isfr]    = imx_clk_gate2("hdmi_isfr",     "pll3_pfd1_540m",    base + 0x70, 4);
-        clk[i2c1]         = imx_clk_gate2("i2c1",          "ipg_per",           base + 0x70, 6);
-        clk[i2c2]         = imx_clk_gate2("i2c2",          "ipg_per",           base + 0x70, 8);
-        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);
-        clk[ipu2]         = imx_clk_gate2("ipu2",          "ipu2_podf",         base + 0x74, 6);
-        clk[ipu2_di0]     = imx_clk_gate2("ipu2_di0",      "ipu2_di0_sel",      base + 0x74, 8);
-        clk[ldb_di0]      = imx_clk_gate2("ldb_di0",       "ldb_di0_podf",      base + 0x74, 12);
-        clk[ldb_di1]      = imx_clk_gate2("ldb_di1",       "ldb_di1_podf",      base + 0x74, 14);
-        clk[ipu2_di1]     = imx_clk_gate2("ipu2_di1",      "ipu2_di1_sel",      base + 0x74, 10);
-        clk[hsi_tx]       = imx_clk_gate2("hsi_tx",        "hsi_tx_podf",       base + 0x74, 16);
+                clk[IMX6QDL_CLK_GPU2D_CORE] = imx_clk_gate2("gpu2d_core", "gpu2d_core_podf", base + 0x6c, 24);
+        clk[IMX6QDL_CLK_GPU3D_CORE]   = imx_clk_gate2("gpu3d_core",    "gpu3d_core_podf",   base + 0x6c, 26);
+        clk[IMX6QDL_CLK_HDMI_IAHB]    = imx_clk_gate2("hdmi_iahb",     "ahb",               base + 0x70, 0);
+        clk[IMX6QDL_CLK_HDMI_ISFR]    = imx_clk_gate2("hdmi_isfr",     "pll3_pfd1_540m",    base + 0x70, 4);
+        clk[IMX6QDL_CLK_I2C1]         = imx_clk_gate2("i2c1",          "ipg_per",           base + 0x70, 6);
+        clk[IMX6QDL_CLK_I2C2]         = imx_clk_gate2("i2c2",          "ipg_per",           base + 0x70, 8);
+        clk[IMX6QDL_CLK_I2C3]         = imx_clk_gate2("i2c3",          "ipg_per",           base + 0x70, 10);
+        clk[IMX6QDL_CLK_IIM]          = imx_clk_gate2("iim",           "ipg",               base + 0x70, 12);
+        clk[IMX6QDL_CLK_ENFC]         = imx_clk_gate2("enfc",          "enfc_podf",         base + 0x70, 14);
+        clk[IMX6QDL_CLK_VDOA]         = imx_clk_gate2("vdoa",          "vdo_axi",           base + 0x70, 26);
+        clk[IMX6QDL_CLK_IPU1]         = imx_clk_gate2("ipu1",          "ipu1_podf",         base + 0x74, 0);
+        clk[IMX6QDL_CLK_IPU1_DI0]     = imx_clk_gate2("ipu1_di0",      "ipu1_di0_sel",      base + 0x74, 2);
+        clk[IMX6QDL_CLK_IPU1_DI1]     = imx_clk_gate2("ipu1_di1",      "ipu1_di1_sel",      base + 0x74, 4);
+        clk[IMX6QDL_CLK_IPU2]         = imx_clk_gate2("ipu2",          "ipu2_podf",         base + 0x74, 6);
+        clk[IMX6QDL_CLK_IPU2_DI0]     = imx_clk_gate2("ipu2_di0",      "ipu2_di0_sel",      base + 0x74, 8);
+        clk[IMX6QDL_CLK_LDB_DI0]      = imx_clk_gate2("ldb_di0",       "ldb_di0_podf",      base + 0x74, 12);
+        clk[IMX6QDL_CLK_LDB_DI1]      = imx_clk_gate2("ldb_di1",       "ldb_di1_podf",      base + 0x74, 14);
+        clk[IMX6QDL_CLK_IPU2_DI1]     = imx_clk_gate2("ipu2_di1",      "ipu2_di1_sel",      base + 0x74, 10);
+        clk[IMX6QDL_CLK_HSI_TX]       = imx_clk_gate2("hsi_tx",        "hsi_tx_podf",       base + 0x74, 16);
         if (cpu_is_imx6dl())
                 /*
                  * The multiplexer and divider of the imx6q clock gpu2d get
                  * redefined/reused as mlb_sys_sel and mlb_sys_clk_podf on imx6dl.
                  */
-                clk[mlb] = imx_clk_gate2("mlb",            "gpu2d_core_podf",   base + 0x74, 18);
+                clk[IMX6QDL_CLK_MLB] = imx_clk_gate2("mlb",            "gpu2d_core_podf",   base + 0x74, 18);
         else
-                clk[mlb] = imx_clk_gate2("mlb",            "axi",               base + 0x74, 18);
-        clk[mmdc_ch0_axi] = imx_clk_gate2("mmdc_ch0_axi",  "mmdc_ch0_axi_podf", base + 0x74, 20);
-        clk[mmdc_ch1_axi] = imx_clk_gate2("mmdc_ch1_axi",  "mmdc_ch1_axi_podf", base + 0x74, 22);
-        clk[ocram]        = imx_clk_gate2("ocram",         "ahb",               base + 0x74, 28);
-        clk[openvg_axi]   = imx_clk_gate2("openvg_axi",    "axi",               base + 0x74, 30);
-        clk[pcie_axi]     = imx_clk_gate2("pcie_axi",      "pcie_axi_sel",      base + 0x78, 0);
-        clk[per1_bch]     = imx_clk_gate2("per1_bch",      "usdhc3",            base + 0x78, 12);
-        clk[pwm1]         = imx_clk_gate2("pwm1",          "ipg_per",           base + 0x78, 16);
-        clk[pwm2]         = imx_clk_gate2("pwm2",          "ipg_per",           base + 0x78, 18);
-        clk[pwm3]         = imx_clk_gate2("pwm3",          "ipg_per",           base + 0x78, 20);
-        clk[pwm4]         = imx_clk_gate2("pwm4",          "ipg_per",           base + 0x78, 22);
-        clk[gpmi_bch_apb] = imx_clk_gate2("gpmi_bch_apb",  "usdhc3",            base + 0x78, 24);
-        clk[gpmi_bch]     = imx_clk_gate2("gpmi_bch",      "usdhc4",            base + 0x78, 26);
-        clk[gpmi_io]      = imx_clk_gate2("gpmi_io",       "enfc",              base + 0x78, 28);
-        clk[gpmi_apb]     = imx_clk_gate2("gpmi_apb",      "usdhc3",            base + 0x78, 30);
-        clk[rom]          = imx_clk_gate2("rom",           "ahb",               base + 0x7c, 0);
-        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);
-        clk[uart_ipg]     = imx_clk_gate2("uart_ipg",      "ipg",               base + 0x7c, 24);
-        clk[uart_serial]  = imx_clk_gate2("uart_serial",   "uart_serial_podf",  base + 0x7c, 26);
-        clk[usboh3]       = imx_clk_gate2("usboh3",        "ipg",               base + 0x80, 0);
-        clk[usdhc1]       = imx_clk_gate2("usdhc1",        "usdhc1_podf",       base + 0x80, 2);
-        clk[usdhc2]       = imx_clk_gate2("usdhc2",        "usdhc2_podf",       base + 0x80, 4);
-        clk[usdhc3]       = imx_clk_gate2("usdhc3",        "usdhc3_podf",       base + 0x80, 6);
-        clk[usdhc4]       = imx_clk_gate2("usdhc4",        "usdhc4_podf",       base + 0x80, 8);
-        clk[eim_slow]     = imx_clk_gate2("eim_slow",      "emi_slow_podf",     base + 0x80, 10);
-        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]))
-                        pr_err("i.MX6q clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clk[i]));
+                clk[IMX6QDL_CLK_MLB] = imx_clk_gate2("mlb",            "axi",               base + 0x74, 18);
+        clk[IMX6QDL_CLK_MMDC_CH0_AXI] = imx_clk_gate2("mmdc_ch0_axi",  "mmdc_ch0_axi_podf", base + 0x74, 20);
+        clk[IMX6QDL_CLK_MMDC_CH1_AXI] = imx_clk_gate2("mmdc_ch1_axi",  "mmdc_ch1_axi_podf", base + 0x74, 22);
+        clk[IMX6QDL_CLK_OCRAM]        = imx_clk_gate2("ocram",         "ahb",               base + 0x74, 28);
+        clk[IMX6QDL_CLK_OPENVG_AXI]   = imx_clk_gate2("openvg_axi",    "axi",               base + 0x74, 30);
+        clk[IMX6QDL_CLK_PCIE_AXI]     = imx_clk_gate2("pcie_axi",      "pcie_axi_sel",      base + 0x78, 0);
+        clk[IMX6QDL_CLK_PER1_BCH]     = imx_clk_gate2("per1_bch",      "usdhc3",            base + 0x78, 12);
+        clk[IMX6QDL_CLK_PWM1]         = imx_clk_gate2("pwm1",          "ipg_per",           base + 0x78, 16);
+        clk[IMX6QDL_CLK_PWM2]         = imx_clk_gate2("pwm2",          "ipg_per",           base + 0x78, 18);
+        clk[IMX6QDL_CLK_PWM3]         = imx_clk_gate2("pwm3",          "ipg_per",           base + 0x78, 20);
+        clk[IMX6QDL_CLK_PWM4]         = imx_clk_gate2("pwm4",          "ipg_per",           base + 0x78, 22);
+        clk[IMX6QDL_CLK_GPMI_BCH_APB] = imx_clk_gate2("gpmi_bch_apb",  "usdhc3",            base + 0x78, 24);
+        clk[IMX6QDL_CLK_GPMI_BCH]     = imx_clk_gate2("gpmi_bch",      "usdhc4",            base + 0x78, 26);
+        clk[IMX6QDL_CLK_GPMI_IO]      = imx_clk_gate2("gpmi_io",       "enfc",              base + 0x78, 28);
+        clk[IMX6QDL_CLK_GPMI_APB]     = imx_clk_gate2("gpmi_apb",      "usdhc3",            base + 0x78, 30);
+        clk[IMX6QDL_CLK_ROM]          = imx_clk_gate2("rom",           "ahb",               base + 0x7c, 0);
+        clk[IMX6QDL_CLK_SATA]         = imx_clk_gate2("sata",          "ipg",               base + 0x7c, 4);
+        clk[IMX6QDL_CLK_SDMA]         = imx_clk_gate2("sdma",          "ahb",               base + 0x7c, 6);
+        clk[IMX6QDL_CLK_SPBA]         = imx_clk_gate2("spba",          "ipg",               base + 0x7c, 12);
+        clk[IMX6QDL_CLK_SPDIF]        = imx_clk_gate2("spdif",         "spdif_podf",        base + 0x7c, 14);
+        clk[IMX6QDL_CLK_SSI1_IPG]     = imx_clk_gate2("ssi1_ipg",      "ipg",               base + 0x7c, 18);
+        clk[IMX6QDL_CLK_SSI2_IPG]     = imx_clk_gate2("ssi2_ipg",      "ipg",               base + 0x7c, 20);
+        clk[IMX6QDL_CLK_SSI3_IPG]     = imx_clk_gate2("ssi3_ipg",      "ipg",               base + 0x7c, 22);
+        clk[IMX6QDL_CLK_UART_IPG]     = imx_clk_gate2("uart_ipg",      "ipg",               base + 0x7c, 24);
+        clk[IMX6QDL_CLK_UART_SERIAL]  = imx_clk_gate2("uart_serial",   "uart_serial_podf",  base + 0x7c, 26);
+        clk[IMX6QDL_CLK_USBOH3]       = imx_clk_gate2("usboh3",        "ipg",               base + 0x80, 0);
+        clk[IMX6QDL_CLK_USDHC1]       = imx_clk_gate2("usdhc1",        "usdhc1_podf",       base + 0x80, 2);
+        clk[IMX6QDL_CLK_USDHC2]       = imx_clk_gate2("usdhc2",        "usdhc2_podf",       base + 0x80, 4);
+        clk[IMX6QDL_CLK_USDHC3]       = imx_clk_gate2("usdhc3",        "usdhc3_podf",       base + 0x80, 6);
+        clk[IMX6QDL_CLK_USDHC4]       = imx_clk_gate2("usdhc4",        "usdhc4_podf",       base + 0x80, 8);
+        clk[IMX6QDL_CLK_EIM_SLOW]     = imx_clk_gate2("eim_slow",      "emi_slow_podf",     base + 0x80, 10);
+        clk[IMX6QDL_CLK_VDO_AXI]      = imx_clk_gate2("vdo_axi",       "vdo_axi_sel",       base + 0x80, 12);
+        clk[IMX6QDL_CLK_VPU_AXI]      = imx_clk_gate2("vpu_axi",       "vpu_axi_podf",      base + 0x80, 14);
+        clk[IMX6QDL_CLK_CKO1]         = imx_clk_gate("cko1",           "cko1_podf",         base + 0x60, 7);
+        clk[IMX6QDL_CLK_CKO2]         = imx_clk_gate("cko2",           "cko2_podf",         base + 0x60, 24);
+
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
 
         clk_data.clks = clk;
         clk_data.clk_num = ARRAY_SIZE(clk);
         of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 
-        clk_register_clkdev(clk[gpt_ipg], "ipg", "imx-gpt.0");
-        clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
-        clk_register_clkdev(clk[enet_ref], "enet_ref", NULL);
+        clk_register_clkdev(clk[IMX6QDL_CLK_ENET_REF], "enet_ref", NULL);
 
         if ((imx_get_soc_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]);
+                clk_set_parent(clk[IMX6QDL_CLK_LDB_DI0_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);
+                clk_set_parent(clk[IMX6QDL_CLK_LDB_DI1_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);
         }
 
-        clk_set_parent(clk[ipu1_di0_pre_sel], clk[pll5_video_div]);
-        clk_set_parent(clk[ipu1_di1_pre_sel], clk[pll5_video_div]);
-        clk_set_parent(clk[ipu2_di0_pre_sel], clk[pll5_video_div]);
-        clk_set_parent(clk[ipu2_di1_pre_sel], clk[pll5_video_div]);
-        clk_set_parent(clk[ipu1_di0_sel], clk[ipu1_di0_pre]);
-        clk_set_parent(clk[ipu1_di1_sel], clk[ipu1_di1_pre]);
-        clk_set_parent(clk[ipu2_di0_sel], clk[ipu2_di0_pre]);
-        clk_set_parent(clk[ipu2_di1_sel], clk[ipu2_di1_pre]);
+        clk_set_parent(clk[IMX6QDL_CLK_IPU1_DI0_PRE_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);
+        clk_set_parent(clk[IMX6QDL_CLK_IPU1_DI1_PRE_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);
+        clk_set_parent(clk[IMX6QDL_CLK_IPU2_DI0_PRE_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);
+        clk_set_parent(clk[IMX6QDL_CLK_IPU2_DI1_PRE_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);
+        clk_set_parent(clk[IMX6QDL_CLK_IPU1_DI0_SEL], clk[IMX6QDL_CLK_IPU1_DI0_PRE]);
+        clk_set_parent(clk[IMX6QDL_CLK_IPU1_DI1_SEL], clk[IMX6QDL_CLK_IPU1_DI1_PRE]);
+        clk_set_parent(clk[IMX6QDL_CLK_IPU2_DI0_SEL], clk[IMX6QDL_CLK_IPU2_DI0_PRE]);
+        clk_set_parent(clk[IMX6QDL_CLK_IPU2_DI1_SEL], clk[IMX6QDL_CLK_IPU2_DI1_PRE]);
 
         /*
          * The gpmi needs 100MHz frequency in the EDO/Sync mode,
          * We can not get the 100MHz from the pll2_pfd0_352m.
          * So choose pll2_pfd2_396m as enfc_sel's parent.
          */
-        clk_set_parent(clk[enfc_sel], clk[pll2_pfd2_396m]);
+        clk_set_parent(clk[IMX6QDL_CLK_ENFC_SEL], clk[IMX6QDL_CLK_PLL2_PFD2_396M]);
 
         for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
                 clk_prepare_enable(clk[clks_init_on[i]]);
 
         if (IS_ENABLED(CONFIG_USB_MXS_PHY)) {
-                clk_prepare_enable(clk[usbphy1_gate]);
-                clk_prepare_enable(clk[usbphy2_gate]);
+                clk_prepare_enable(clk[IMX6QDL_CLK_USBPHY1_GATE]);
+                clk_prepare_enable(clk[IMX6QDL_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]);
+        ret = clk_set_parent(clk[IMX6QDL_CLK_CKO2_SEL], clk[IMX6QDL_CLK_OSC]);
         if (!ret)
-                ret = clk_set_parent(clk[cko], clk[cko2]);
+                ret = clk_set_parent(clk[IMX6QDL_CLK_CKO], clk[IMX6QDL_CLK_CKO2]);
         if (ret)
                 pr_warn("failed to set up CLKO: %d\n", ret);
 
         /* Audio-related clocks configuration */
-        clk_set_parent(clk[spdif_sel], clk[pll3_pfd3_454m]);
+        clk_set_parent(clk[IMX6QDL_CLK_SPDIF_SEL], clk[IMX6QDL_CLK_PLL3_PFD3_454M]);
 
         /* All existing boards with PCIe use LVDS1 */
         if (IS_ENABLED(CONFIG_PCI_IMX6))
-                clk_set_parent(clk[lvds1_sel], clk[sata_ref_100m]);
+                clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]);
 
         /* Set initial power mode */
         imx6q_set_lpm(WAIT_CLOCKED);
-
-        mxc_timer_init_dt(of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt"));
 }
 CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);
diff --git a/arch/arm/mach-imx/clk-imx6sl.c b/arch/arm/mach-imx/clk-imx6sl.c
index 5408ca70c8d6..fef46faf692f 100644
--- a/arch/arm/mach-imx/clk-imx6sl.c
+++ b/arch/arm/mach-imx/clk-imx6sl.c
@@ -348,18 +348,12 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)
         clks[IMX6SL_CLK_USDHC3]       = imx_clk_gate2("usdhc3",       "usdhc3_podf",       base + 0x80, 6);
         clks[IMX6SL_CLK_USDHC4]       = imx_clk_gate2("usdhc4",       "usdhc4_podf",       base + 0x80, 8);
 
-        for (i = 0; i < ARRAY_SIZE(clks); i++)
-                if (IS_ERR(clks[i]))
-                        pr_err("i.MX6SL clk %d: register failed with %ld\n",
-                                i, PTR_ERR(clks[i]));
+        imx_check_clocks(clks, ARRAY_SIZE(clks));
 
         clk_data.clks = clks;
         clk_data.clk_num = ARRAY_SIZE(clks);
         of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 
-        clk_register_clkdev(clks[IMX6SL_CLK_GPT], "ipg", "imx-gpt.0");
-        clk_register_clkdev(clks[IMX6SL_CLK_GPT_SERIAL], "per", "imx-gpt.0");
-
         /* Ensure the AHB clk is at 132MHz. */
         ret = clk_set_rate(clks[IMX6SL_CLK_AHB], 132000000);
         if (ret)
@@ -383,8 +377,5 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)
 
         /* Set initial power mode */
         imx6q_set_lpm(WAIT_CLOCKED);
-
-        np = of_find_compatible_node(NULL, NULL, "fsl,imx6sl-gpt");
-        mxc_timer_init_dt(np);
 }
 CLK_OF_DECLARE(imx6sl, "fsl,imx6sl-ccm", imx6sl_clocks_init);
diff --git a/arch/arm/mach-imx/clk-imx6sx.c b/arch/arm/mach-imx/clk-imx6sx.c
index 72f8902235d1..ecde72bdfe88 100644
--- a/arch/arm/mach-imx/clk-imx6sx.c
+++ b/arch/arm/mach-imx/clk-imx6sx.c
@@ -124,6 +124,9 @@ static struct clk_div_table video_div_table[] = {
 static u32 share_count_asrc;
 static u32 share_count_audio;
 static u32 share_count_esai;
+static u32 share_count_ssi1;
+static u32 share_count_ssi2;
+static u32 share_count_ssi3;
 
 static void __init imx6sx_clocks_init(struct device_node *ccm_node)
 {
@@ -409,12 +412,12 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node)
         clks[IMX6SX_CLK_SPBA]         = imx_clk_gate2("spba",          "ipg",               base + 0x7c, 12);
         clks[IMX6SX_CLK_AUDIO]        = imx_clk_gate2_shared("audio",  "audio_podf",        base + 0x7c, 14, &share_count_audio);
         clks[IMX6SX_CLK_SPDIF]        = imx_clk_gate2_shared("spdif",  "spdif_podf",        base + 0x7c, 14, &share_count_audio);
-        clks[IMX6SX_CLK_SSI1_IPG]     = imx_clk_gate2("ssi1_ipg",      "ipg",               base + 0x7c, 18);
-        clks[IMX6SX_CLK_SSI2_IPG]     = imx_clk_gate2("ssi2_ipg",      "ipg",               base + 0x7c, 20);
-        clks[IMX6SX_CLK_SSI3_IPG]     = imx_clk_gate2("ssi3_ipg",      "ipg",               base + 0x7c, 22);
-        clks[IMX6SX_CLK_SSI1]         = imx_clk_gate2("ssi1",          "ssi1_podf",         base + 0x7c, 18);
-        clks[IMX6SX_CLK_SSI2]         = imx_clk_gate2("ssi2",          "ssi2_podf",         base + 0x7c, 20);
-        clks[IMX6SX_CLK_SSI3]         = imx_clk_gate2("ssi3",          "ssi3_podf",         base + 0x7c, 22);
+        clks[IMX6SX_CLK_SSI1_IPG]     = imx_clk_gate2_shared("ssi1_ipg",      "ipg",        base + 0x7c, 18, &share_count_ssi1);
+        clks[IMX6SX_CLK_SSI2_IPG]     = imx_clk_gate2_shared("ssi2_ipg",      "ipg",        base + 0x7c, 20, &share_count_ssi2);
+        clks[IMX6SX_CLK_SSI3_IPG]     = imx_clk_gate2_shared("ssi3_ipg",      "ipg",        base + 0x7c, 22, &share_count_ssi3);
+        clks[IMX6SX_CLK_SSI1]         = imx_clk_gate2_shared("ssi1",          "ssi1_podf",  base + 0x7c, 18, &share_count_ssi1);
+        clks[IMX6SX_CLK_SSI2]         = imx_clk_gate2_shared("ssi2",          "ssi2_podf",  base + 0x7c, 20, &share_count_ssi2);
+        clks[IMX6SX_CLK_SSI3]         = imx_clk_gate2_shared("ssi3",          "ssi3_podf",  base + 0x7c, 22, &share_count_ssi3);
         clks[IMX6SX_CLK_UART_IPG]     = imx_clk_gate2("uart_ipg",      "ipg",               base + 0x7c, 24);
         clks[IMX6SX_CLK_UART_SERIAL]  = imx_clk_gate2("uart_serial",   "uart_podf",         base + 0x7c, 26);
         clks[IMX6SX_CLK_SAI1_IPG]     = imx_clk_gate2("sai1_ipg",      "ipg",               base + 0x7c, 28);
@@ -443,17 +446,12 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node)
         /* mask handshake of mmdc */
         writel_relaxed(BM_CCM_CCDR_MMDC_CH0_MASK, base + CCDR);
 
-        for (i = 0; i < ARRAY_SIZE(clks); i++)
-                if (IS_ERR(clks[i]))
-                        pr_err("i.MX6sx clk %d: register failed with %ld\n", i, PTR_ERR(clks[i]));
+        imx_check_clocks(clks, ARRAY_SIZE(clks));
 
         clk_data.clks = clks;
         clk_data.clk_num = ARRAY_SIZE(clks);
         of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
 
-        clk_register_clkdev(clks[IMX6SX_CLK_GPT_BUS], "ipg", "imx-gpt.0");
-        clk_register_clkdev(clks[IMX6SX_CLK_GPT_SERIAL], "per", "imx-gpt.0");
-
         for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
                 clk_prepare_enable(clks[clks_init_on[i]]);
 
@@ -517,8 +515,5 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node)
 
         /* Set initial power mode */
         imx6q_set_lpm(WAIT_CLOCKED);
-
-        np = of_find_compatible_node(NULL, NULL, "fsl,imx6sx-gpt");
-        mxc_timer_init_dt(np);
 }
 CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init);
diff --git a/arch/arm/mach-imx/clk-vf610.c b/arch/arm/mach-imx/clk-vf610.c
index 22dc3ee21fd4..f60d6d569ce3 100644
--- a/arch/arm/mach-imx/clk-vf610.c
+++ b/arch/arm/mach-imx/clk-vf610.c
@@ -295,14 +295,18 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)
 
         clk[VF610_CLK_ASRC] = imx_clk_gate2("asrc", "ipg_bus", CCM_CCGR4, CCM_CCGRx_CGn(1));
 
-        clk[VF610_CLK_FLEXCAN0] = imx_clk_gate2("flexcan0", "ipg_bus", CCM_CCGR0, CCM_CCGRx_CGn(0));
-        clk[VF610_CLK_FLEXCAN1] = imx_clk_gate2("flexcan1", "ipg_bus", CCM_CCGR9, CCM_CCGRx_CGn(4));
+        clk[VF610_CLK_FLEXCAN0_EN] = imx_clk_gate("flexcan0_en", "ipg_bus", CCM_CSCDR2, 11);
+        clk[VF610_CLK_FLEXCAN0] = imx_clk_gate2("flexcan0", "flexcan0_en", CCM_CCGR0, CCM_CCGRx_CGn(0));
+        clk[VF610_CLK_FLEXCAN1_EN] = imx_clk_gate("flexcan1_en", "ipg_bus", CCM_CSCDR2, 12);
+        clk[VF610_CLK_FLEXCAN1] = imx_clk_gate2("flexcan1", "flexcan1_en", CCM_CCGR9, CCM_CCGRx_CGn(4));
 
         clk[VF610_CLK_DMAMUX0] = imx_clk_gate2("dmamux0", "platform_bus", CCM_CCGR0, CCM_CCGRx_CGn(4));
         clk[VF610_CLK_DMAMUX1] = imx_clk_gate2("dmamux1", "platform_bus", CCM_CCGR0, CCM_CCGRx_CGn(5));
         clk[VF610_CLK_DMAMUX2] = imx_clk_gate2("dmamux2", "platform_bus", CCM_CCGR6, CCM_CCGRx_CGn(1));
         clk[VF610_CLK_DMAMUX3] = imx_clk_gate2("dmamux3", "platform_bus", CCM_CCGR6, CCM_CCGRx_CGn(2));
 
+        imx_check_clocks(clk, ARRAY_SIZE(clk));
+
         clk_set_parent(clk[VF610_CLK_QSPI0_SEL], clk[VF610_CLK_PLL1_PFD4]);
         clk_set_rate(clk[VF610_CLK_QSPI0_X4_DIV], clk_get_rate(clk[VF610_CLK_QSPI0_SEL]) / 2);
         clk_set_rate(clk[VF610_CLK_QSPI0_X2_DIV], clk_get_rate(clk[VF610_CLK_QSPI0_X4_DIV]) / 2);
diff --git a/arch/arm/mach-imx/clk.c b/arch/arm/mach-imx/clk.c
index edc35df7bed4..df12b5307175 100644
--- a/arch/arm/mach-imx/clk.c
+++ b/arch/arm/mach-imx/clk.c
@@ -7,6 +7,16 @@
 
 DEFINE_SPINLOCK(imx_ccm_lock);
 
+void __init imx_check_clocks(struct clk *clks[], unsigned int count)
+{
+        unsigned i;
+
+        for (i = 0; i < count; i++)
+                if (IS_ERR(clks[i]))
+                        pr_err("i.MX clk %u: register failed with %ld\n",
+                               i, PTR_ERR(clks[i]));
+}
+
 static struct clk * __init imx_obtain_fixed_clock_from_dt(const char *name)
 {
         struct of_phandle_args phandle;
diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h
index e29f6ebe9f39..d5ba76fee115 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;
 
+void imx_check_clocks(struct clk *clks[], unsigned int count);
+
 extern void imx_cscmr1_fixup(u32 *val);
 
 struct clk *imx_clk_pllv1(const char *name, const char *parent,
@@ -95,6 +97,13 @@ static inline struct clk *imx_clk_gate(const char *name, const char *parent,
                         shift, 0, &imx_ccm_lock);
 }
 
+static inline struct clk *imx_clk_gate_dis(const char *name, const char *parent,
+                void __iomem *reg, u8 shift)
+{
+        return clk_register_gate(NULL, name, parent, CLK_SET_RATE_PARENT, reg,
+                        shift, CLK_GATE_SET_TO_DISABLE, &imx_ccm_lock);
+}
+
 static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg,
                 u8 shift, u8 width, const char **parents, int num_parents)
 {
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 9ab785ce13e8..22ba8973bcb9 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -19,6 +19,7 @@ struct pt_regs;
 struct clk;
 struct device_node;
 enum mxc_cpu_pwr_mode;
+struct of_device_id;
 
 void mx1_map_io(void);
 void mx21_map_io(void);
@@ -26,48 +27,34 @@ void mx25_map_io(void);
 void mx27_map_io(void);
 void mx31_map_io(void);
 void mx35_map_io(void);
-void mx51_map_io(void);
-void mx53_map_io(void);
 void imx1_init_early(void);
 void imx21_init_early(void);
 void imx25_init_early(void);
 void imx27_init_early(void);
 void imx31_init_early(void);
 void imx35_init_early(void);
-void imx51_init_early(void);
-void imx53_init_early(void);
 void mxc_init_irq(void __iomem *);
-void tzic_init_irq(void __iomem *);
+void tzic_init_irq(void);
 void mx1_init_irq(void);
 void mx21_init_irq(void);
 void mx25_init_irq(void);
 void mx27_init_irq(void);
 void mx31_init_irq(void);
 void mx35_init_irq(void);
-void mx51_init_irq(void);
-void mx53_init_irq(void);
 void imx1_soc_init(void);
 void imx21_soc_init(void);
 void imx25_soc_init(void);
 void imx27_soc_init(void);
 void imx31_soc_init(void);
 void imx35_soc_init(void);
-void imx51_soc_init(void);
-void imx51_init_late(void);
-void imx53_init_late(void);
 void epit_timer_init(void __iomem *base, int irq);
 void mxc_timer_init(void __iomem *, int);
-void mxc_timer_init_dt(struct device_node *);
 int mx1_clocks_init(unsigned long fref);
 int mx21_clocks_init(unsigned long lref, unsigned long fref);
 int mx25_clocks_init(void);
 int mx27_clocks_init(unsigned long fref);
 int mx31_clocks_init(unsigned long fref);
 int mx35_clocks_init(void);
-int mx51_clocks_init(unsigned long ckil, unsigned long osc,
-                        unsigned long ckih1, unsigned long ckih2);
-int mx25_clocks_init_dt(void);
-int mx27_clocks_init_dt(void);
 int mx31_clocks_init_dt(void);
 struct platform_device *mxc_register_gpio(char *name, int id,
         resource_size_t iobase, resource_size_t iosize, int irq, int irq_high);
@@ -75,8 +62,10 @@ void mxc_set_cpu_type(unsigned int type);
 void mxc_restart(enum reboot_mode, const char *);
 void mxc_arch_reset_init(void __iomem *);
 void mxc_arch_reset_init_dt(void);
+int mx51_revision(void);
 int mx53_revision(void);
 void imx_set_aips(void __iomem *);
+void imx_aips_allow_unprivileged_access(const char *compat);
 int mxc_device_init(void);
 void imx_set_soc_revision(unsigned int rev);
 unsigned int imx_get_soc_revision(void);
@@ -117,7 +106,7 @@ static inline void imx_scu_standby_enable(void) {}
 #endif
 void imx_src_init(void);
 void imx_gpc_init(void);
-void imx_gpc_pre_suspend(void);
+void imx_gpc_pre_suspend(bool arm_power_off);
 void imx_gpc_post_resume(void);
 void imx_gpc_mask_all(void);
 void imx_gpc_restore_all(void);
@@ -127,7 +116,7 @@ void imx_anatop_init(void);
 void imx_anatop_pre_suspend(void);
 void imx_anatop_post_resume(void);
 int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
-void imx6q_set_int_mem_clk_lpm(void);
+void imx6q_set_int_mem_clk_lpm(bool enable);
 void imx6sl_set_wait_clk(bool enter);
 
 void imx_cpu_die(unsigned int cpu);
@@ -144,12 +133,17 @@ static inline void imx6_suspend(void __iomem *ocram_vbase) {}
 void imx6q_pm_init(void);
 void imx6dl_pm_init(void);
 void imx6sl_pm_init(void);
+void imx6sx_pm_init(void);
 void imx6q_pm_set_ccm_base(void __iomem *base);
 
 #ifdef CONFIG_PM
-void imx5_pm_init(void);
+void imx51_pm_init(void);
+void imx53_pm_init(void);
+void imx5_pm_set_ccm_base(void __iomem *base);
 #else
-static inline void imx5_pm_init(void) {}
+static inline void imx51_pm_init(void) {}
+static inline void imx53_pm_init(void) {}
+static inline void imx5_pm_set_ccm_base(void __iomem *base) {}
 #endif
 
 #ifdef CONFIG_NEON
diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c
index c1c99a72c6a1..3403bac94a31 100644
--- a/arch/arm/mach-imx/cpu-imx5.c
+++ b/arch/arm/mach-imx/cpu-imx5.c
@@ -16,6 +16,8 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 
 #include "hardware.h"
 #include "common.h"
@@ -24,10 +26,26 @@ static int mx5_cpu_rev = -1;
 
 #define IIM_SREV 0x24
 
+static u32 imx5_read_srev_reg(const char *compat)
+{
+        void __iomem *iim_base;
+        struct device_node *np;
+        u32 srev;
+
+        np = of_find_compatible_node(NULL, NULL, compat);
+        iim_base = of_iomap(np, 0);
+        WARN_ON(!iim_base);
+
+        srev = readl(iim_base + IIM_SREV) & 0xff;
+
+        iounmap(iim_base);
+
+        return srev;
+}
+
 static int get_mx51_srev(void)
 {
-        void __iomem *iim_base = MX51_IO_ADDRESS(MX51_IIM_BASE_ADDR);
-        u32 rev = readl(iim_base + IIM_SREV) & 0xff;
+        u32 rev = imx5_read_srev_reg("fsl,imx51-iim");
 
         switch (rev) {
         case 0x0:
@@ -77,8 +95,7 @@ int __init mx51_neon_fixup(void)
 
 static int get_mx53_srev(void)
 {
-        void __iomem *iim_base = MX51_IO_ADDRESS(MX53_IIM_BASE_ADDR);
-        u32 rev = readl(iim_base + IIM_SREV) & 0xff;
+        u32 rev = imx5_read_srev_reg("fsl,imx53-iim");
 
         switch (rev) {
         case 0x0:
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index bbe8ff1f0412..df42c14ff749 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -2,6 +2,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/slab.h>
 #include <linux/sys_soc.h>
 
@@ -60,6 +61,18 @@ void __init imx_set_aips(void __iomem *base)
         __raw_writel(reg, base + 0x50);
 }
 
+void __init imx_aips_allow_unprivileged_access(
+                const char *compat)
+{
+        void __iomem *aips_base_addr;
+        struct device_node *np;
+
+        for_each_compatible_node(np, NULL, compat) {
+                aips_base_addr = of_iomap(np, 0);
+                imx_set_aips(aips_base_addr);
+        }
+}
+
 struct device * __init imx_soc_device_init(void)
 {
         struct soc_device_attribute *soc_dev_attr;
diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c
index 6bcae0479049..10844d3bb926 100644
--- a/arch/arm/mach-imx/cpuidle-imx6q.c
+++ b/arch/arm/mach-imx/cpuidle-imx6q.c
@@ -13,6 +13,7 @@
 
 #include "common.h"
 #include "cpuidle.h"
+#include "hardware.h"
 
 static atomic_t master = ATOMIC_INIT(0);
 static DEFINE_SPINLOCK(master_lock);
@@ -66,10 +67,11 @@ static struct cpuidle_driver imx6q_cpuidle_driver = {
 int __init imx6q_cpuidle_init(void)
 {
         /* Need to enable SCU standby for entering WAIT modes */
-        imx_scu_standby_enable();
+        if (!cpu_is_imx6sx())
+                imx_scu_standby_enable();
 
         /* Set INT_MEM_CLK_LPM bit to get a reliable WAIT mode support */
-        imx6q_set_int_mem_clk_lpm();
+        imx6q_set_int_mem_clk_lpm(true);
 
         return cpuidle_register(&imx6q_cpuidle_driver, NULL);
 }
diff --git a/arch/arm/mach-imx/crm-regs-imx5.h b/arch/arm/mach-imx/crm-regs-imx5.h
deleted file mode 100644
index 5e3f1f0f4cab..000000000000
--- a/arch/arm/mach-imx/crm-regs-imx5.h
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * 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
- */
-#ifndef __ARCH_ARM_MACH_MX51_CRM_REGS_H__
-#define __ARCH_ARM_MACH_MX51_CRM_REGS_H__
-
-#define MX51_CCM_BASE           MX51_IO_ADDRESS(MX51_CCM_BASE_ADDR)
-#define MX51_DPLL1_BASE         MX51_IO_ADDRESS(MX51_PLL1_BASE_ADDR)
-#define MX51_DPLL2_BASE         MX51_IO_ADDRESS(MX51_PLL2_BASE_ADDR)
-#define MX51_DPLL3_BASE         MX51_IO_ADDRESS(MX51_PLL3_BASE_ADDR)
-#define MX51_CORTEXA8_BASE      MX51_IO_ADDRESS(MX51_ARM_BASE_ADDR)
-#define MX51_GPC_BASE           MX51_IO_ADDRESS(MX51_GPC_BASE_ADDR)
-
-/*MX53*/
-#define MX53_CCM_BASE           MX53_IO_ADDRESS(MX53_CCM_BASE_ADDR)
-#define MX53_DPLL1_BASE         MX53_IO_ADDRESS(MX53_PLL1_BASE_ADDR)
-#define MX53_DPLL2_BASE         MX53_IO_ADDRESS(MX53_PLL2_BASE_ADDR)
-#define MX53_DPLL3_BASE         MX53_IO_ADDRESS(MX53_PLL3_BASE_ADDR)
-#define MX53_DPLL4_BASE         MX53_IO_ADDRESS(MX53_PLL4_BASE_ADDR)
-
-/* PLL Register Offsets */
-#define MXC_PLL_DP_CTL                  0x00
-#define MXC_PLL_DP_CONFIG               0x04
-#define MXC_PLL_DP_OP                   0x08
-#define MXC_PLL_DP_MFD                  0x0C
-#define MXC_PLL_DP_MFN                  0x10
-#define MXC_PLL_DP_MFNMINUS             0x14
-#define MXC_PLL_DP_MFNPLUS              0x18
-#define MXC_PLL_DP_HFS_OP               0x1C
-#define MXC_PLL_DP_HFS_MFD              0x20
-#define MXC_PLL_DP_HFS_MFN              0x24
-#define MXC_PLL_DP_MFN_TOGC             0x28
-#define MXC_PLL_DP_DESTAT               0x2c
-
-/* PLL Register Bit definitions */
-#define MXC_PLL_DP_CTL_MUL_CTRL         0x2000
-#define MXC_PLL_DP_CTL_DPDCK0_2_EN      0x1000
-#define MXC_PLL_DP_CTL_DPDCK0_2_OFFSET  12
-#define MXC_PLL_DP_CTL_ADE              0x800
-#define MXC_PLL_DP_CTL_REF_CLK_DIV      0x400
-#define MXC_PLL_DP_CTL_REF_CLK_SEL_MASK (3 << 8)
-#define MXC_PLL_DP_CTL_REF_CLK_SEL_OFFSET       8
-#define MXC_PLL_DP_CTL_HFSM             0x80
-#define MXC_PLL_DP_CTL_PRE              0x40
-#define MXC_PLL_DP_CTL_UPEN             0x20
-#define MXC_PLL_DP_CTL_RST              0x10
-#define MXC_PLL_DP_CTL_RCP              0x8
-#define MXC_PLL_DP_CTL_PLM              0x4
-#define MXC_PLL_DP_CTL_BRM0             0x2
-#define MXC_PLL_DP_CTL_LRF              0x1
-
-#define MXC_PLL_DP_CONFIG_BIST          0x8
-#define MXC_PLL_DP_CONFIG_SJC_CE        0x4
-#define MXC_PLL_DP_CONFIG_AREN          0x2
-#define MXC_PLL_DP_CONFIG_LDREQ         0x1
-
-#define MXC_PLL_DP_OP_MFI_OFFSET        4
-#define MXC_PLL_DP_OP_MFI_MASK          (0xF << 4)
-#define MXC_PLL_DP_OP_PDF_OFFSET        0
-#define MXC_PLL_DP_OP_PDF_MASK          0xF
-
-#define MXC_PLL_DP_MFD_OFFSET           0
-#define MXC_PLL_DP_MFD_MASK             0x07FFFFFF
-
-#define MXC_PLL_DP_MFN_OFFSET           0x0
-#define MXC_PLL_DP_MFN_MASK             0x07FFFFFF
-
-#define MXC_PLL_DP_MFN_TOGC_TOG_DIS     (1 << 17)
-#define MXC_PLL_DP_MFN_TOGC_TOG_EN      (1 << 16)
-#define MXC_PLL_DP_MFN_TOGC_CNT_OFFSET  0x0
-#define MXC_PLL_DP_MFN_TOGC_CNT_MASK    0xFFFF
-
-#define MXC_PLL_DP_DESTAT_TOG_SEL       (1 << 31)
-#define MXC_PLL_DP_DESTAT_MFN           0x07FFFFFF
-
-/* Register addresses of CCM*/
-#define MXC_CCM_CCR             (MX51_CCM_BASE + 0x00)
-#define MXC_CCM_CCDR            (MX51_CCM_BASE + 0x04)
-#define MXC_CCM_CSR             (MX51_CCM_BASE + 0x08)
-#define MXC_CCM_CCSR            (MX51_CCM_BASE + 0x0C)
-#define MXC_CCM_CACRR           (MX51_CCM_BASE + 0x10)
-#define MXC_CCM_CBCDR           (MX51_CCM_BASE + 0x14)
-#define MXC_CCM_CBCMR           (MX51_CCM_BASE + 0x18)
-#define MXC_CCM_CSCMR1          (MX51_CCM_BASE + 0x1C)
-#define MXC_CCM_CSCMR2          (MX51_CCM_BASE + 0x20)
-#define MXC_CCM_CSCDR1          (MX51_CCM_BASE + 0x24)
-#define MXC_CCM_CS1CDR          (MX51_CCM_BASE + 0x28)
-#define MXC_CCM_CS2CDR          (MX51_CCM_BASE + 0x2C)
-#define MXC_CCM_CDCDR           (MX51_CCM_BASE + 0x30)
-#define MXC_CCM_CHSCDR          (MX51_CCM_BASE + 0x34)
-#define MXC_CCM_CSCDR2          (MX51_CCM_BASE + 0x38)
-#define MXC_CCM_CSCDR3          (MX51_CCM_BASE + 0x3C)
-#define MXC_CCM_CSCDR4          (MX51_CCM_BASE + 0x40)
-#define MXC_CCM_CWDR            (MX51_CCM_BASE + 0x44)
-#define MXC_CCM_CDHIPR          (MX51_CCM_BASE + 0x48)
-#define MXC_CCM_CDCR            (MX51_CCM_BASE + 0x4C)
-#define MXC_CCM_CTOR            (MX51_CCM_BASE + 0x50)
-#define MXC_CCM_CLPCR           (MX51_CCM_BASE + 0x54)
-#define MXC_CCM_CISR            (MX51_CCM_BASE + 0x58)
-#define MXC_CCM_CIMR            (MX51_CCM_BASE + 0x5C)
-#define MXC_CCM_CCOSR           (MX51_CCM_BASE + 0x60)
-#define MXC_CCM_CGPR            (MX51_CCM_BASE + 0x64)
-#define MXC_CCM_CCGR0           (MX51_CCM_BASE + 0x68)
-#define MXC_CCM_CCGR1           (MX51_CCM_BASE + 0x6C)
-#define MXC_CCM_CCGR2           (MX51_CCM_BASE + 0x70)
-#define MXC_CCM_CCGR3           (MX51_CCM_BASE + 0x74)
-#define MXC_CCM_CCGR4           (MX51_CCM_BASE + 0x78)
-#define MXC_CCM_CCGR5           (MX51_CCM_BASE + 0x7C)
-#define MXC_CCM_CCGR6           (MX51_CCM_BASE + 0x80)
-#define MXC_CCM_CCGR7           (MX51_CCM_BASE + 0x84)
-
-#define MXC_CCM_CMEOR           (MX51_CCM_BASE + 0x84)
-
-/* Define the bits in register CCR */
-#define MXC_CCM_CCR_COSC_EN             (1 << 12)
-#define MXC_CCM_CCR_FPM_MULT_MASK       (1 << 11)
-#define MXC_CCM_CCR_CAMP2_EN            (1 << 10)
-#define MXC_CCM_CCR_CAMP1_EN            (1 << 9)
-#define MXC_CCM_CCR_FPM_EN              (1 << 8)
-#define MXC_CCM_CCR_OSCNT_OFFSET        (0)
-#define MXC_CCM_CCR_OSCNT_MASK  (0xFF)
-
-/* Define the bits in register CCDR */
-#define MXC_CCM_CCDR_HSC_HS_MASK        (0x1 << 18)
-#define MXC_CCM_CCDR_IPU_HS_MASK        (0x1 << 17)
-#define MXC_CCM_CCDR_EMI_HS_MASK        (0x1 << 16)
-
-/* Define the bits in register CSR */
-#define MXC_CCM_CSR_COSR_READY  (1 << 5)
-#define MXC_CCM_CSR_LVS_VALUE   (1 << 4)
-#define MXC_CCM_CSR_CAMP2_READY (1 << 3)
-#define MXC_CCM_CSR_CAMP1_READY (1 << 2)
-#define MXC_CCM_CSR_FPM_READY   (1 << 1)
-#define MXC_CCM_CSR_REF_EN_B    (1 << 0)
-
-/* Define the bits in register CCSR */
-#define MXC_CCM_CCSR_LP_APM_SEL         (0x1 << 9)
-#define MXC_CCM_CCSR_STEP_SEL_OFFSET    (7)
-#define MXC_CCM_CCSR_STEP_SEL_MASK      (0x3 << 7)
-#define MXC_CCM_CCSR_STEP_SEL_LP_APM       0
-#define MXC_CCM_CCSR_STEP_SEL_PLL1_BYPASS  1 /* Only when JTAG connected? */
-#define MXC_CCM_CCSR_STEP_SEL_PLL2_DIVIDED 2
-#define MXC_CCM_CCSR_STEP_SEL_PLL3_DIVIDED 3
-#define MXC_CCM_CCSR_PLL2_PODF_OFFSET   (5)
-#define MXC_CCM_CCSR_PLL2_PODF_MASK     (0x3 << 5)
-#define MXC_CCM_CCSR_PLL3_PODF_OFFSET   (3)
-#define MXC_CCM_CCSR_PLL3_PODF_MASK     (0x3 << 3)
-#define MXC_CCM_CCSR_PLL1_SW_CLK_SEL    (1 << 2) /* 0: pll1_main_clk,
-                                                    1: step_clk */
-#define MXC_CCM_CCSR_PLL2_SW_CLK_SEL    (1 << 1)
-#define MXC_CCM_CCSR_PLL3_SW_CLK_SEL    (1 << 0)
-
-/* Define the bits in register CACRR */
-#define MXC_CCM_CACRR_ARM_PODF_OFFSET   (0)
-#define MXC_CCM_CACRR_ARM_PODF_MASK     (0x7)
-
-/* Define the bits in register CBCDR */
-#define MXC_CCM_CBCDR_EMI_CLK_SEL               (0x1 << 26)
-#define MXC_CCM_CBCDR_PERIPH_CLK_SEL            (0x1 << 25)
-#define MXC_CCM_CBCDR_DDR_HF_SEL_OFFSET         (30)
-#define MXC_CCM_CBCDR_DDR_HF_SEL                (0x1 << 30)
-#define MXC_CCM_CBCDR_DDR_PODF_OFFSET           (27)
-#define MXC_CCM_CBCDR_DDR_PODF_MASK             (0x7 << 27)
-#define MXC_CCM_CBCDR_EMI_PODF_OFFSET           (22)
-#define MXC_CCM_CBCDR_EMI_PODF_MASK             (0x7 << 22)
-#define MXC_CCM_CBCDR_AXI_B_PODF_OFFSET         (19)
-#define MXC_CCM_CBCDR_AXI_B_PODF_MASK           (0x7 << 19)
-#define MXC_CCM_CBCDR_AXI_A_PODF_OFFSET         (16)
-#define MXC_CCM_CBCDR_AXI_A_PODF_MASK           (0x7 << 16)
-#define MXC_CCM_CBCDR_NFC_PODF_OFFSET           (13)
-#define MXC_CCM_CBCDR_NFC_PODF_MASK             (0x7 << 13)
-#define MXC_CCM_CBCDR_AHB_PODF_OFFSET           (10)
-#define MXC_CCM_CBCDR_AHB_PODF_MASK             (0x7 << 10)
-#define MXC_CCM_CBCDR_IPG_PODF_OFFSET           (8)
-#define MXC_CCM_CBCDR_IPG_PODF_MASK             (0x3 << 8)
-#define MXC_CCM_CBCDR_PERCLK_PRED1_OFFSET       (6)
-#define MXC_CCM_CBCDR_PERCLK_PRED1_MASK         (0x3 << 6)
-#define MXC_CCM_CBCDR_PERCLK_PRED2_OFFSET       (3)
-#define MXC_CCM_CBCDR_PERCLK_PRED2_MASK         (0x7 << 3)
-#define MXC_CCM_CBCDR_PERCLK_PODF_OFFSET        (0)
-#define MXC_CCM_CBCDR_PERCLK_PODF_MASK          (0x7)
-
-/* Define the bits in register CBCMR */
-#define MXC_CCM_CBCMR_VPU_AXI_CLK_SEL_OFFSET    (14)
-#define MXC_CCM_CBCMR_VPU_AXI_CLK_SEL_MASK      (0x3 << 14)
-#define MXC_CCM_CBCMR_PERIPH_CLK_SEL_OFFSET     (12)
-#define MXC_CCM_CBCMR_PERIPH_CLK_SEL_MASK       (0x3 << 12)
-#define MXC_CCM_CBCMR_DDR_CLK_SEL_OFFSET        (10)
-#define MXC_CCM_CBCMR_DDR_CLK_SEL_MASK          (0x3 << 10)
-#define MXC_CCM_CBCMR_ARM_AXI_CLK_SEL_OFFSET    (8)
-#define MXC_CCM_CBCMR_ARM_AXI_CLK_SEL_MASK      (0x3 << 8)
-#define MXC_CCM_CBCMR_IPU_HSP_CLK_SEL_OFFSET    (6)
-#define MXC_CCM_CBCMR_IPU_HSP_CLK_SEL_MASK      (0x3 << 6)
-#define MXC_CCM_CBCMR_GPU_CLK_SEL_OFFSET        (4)
-#define MXC_CCM_CBCMR_GPU_CLK_SEL_MASK          (0x3 << 4)
-#define MXC_CCM_CBCMR_GPU2D_CLK_SEL_OFFSET      (14)
-#define MXC_CCM_CBCMR_GPU2D_CLK_SEL_MASK        (0x3 << 14)
-#define MXC_CCM_CBCMR_PERCLK_LP_APM_CLK_SEL     (0x1 << 1)
-#define MXC_CCM_CBCMR_PERCLK_IPG_CLK_SEL        (0x1 << 0)
-
-/* Define the bits in register CSCMR1 */
-#define MXC_CCM_CSCMR1_SSI_EXT2_CLK_SEL_OFFSET          (30)
-#define MXC_CCM_CSCMR1_SSI_EXT2_CLK_SEL_MASK            (0x3 << 30)
-#define MXC_CCM_CSCMR1_SSI_EXT1_CLK_SEL_OFFSET          (28)
-#define MXC_CCM_CSCMR1_SSI_EXT1_CLK_SEL_MASK            (0x3 << 28)
-#define MXC_CCM_CSCMR1_USB_PHY_CLK_SEL_OFFSET           (26)
-#define MXC_CCM_CSCMR1_USB_PHY_CLK_SEL                  (0x1 << 26)
-#define MXC_CCM_CSCMR1_UART_CLK_SEL_OFFSET              (24)
-#define MXC_CCM_CSCMR1_UART_CLK_SEL_MASK                (0x3 << 24)
-#define MXC_CCM_CSCMR1_USBOH3_CLK_SEL_OFFSET            (22)
-#define MXC_CCM_CSCMR1_USBOH3_CLK_SEL_MASK              (0x3 << 22)
-#define MXC_CCM_CSCMR1_ESDHC1_MSHC1_CLK_SEL_OFFSET      (20)
-#define MXC_CCM_CSCMR1_ESDHC1_MSHC1_CLK_SEL_MASK        (0x3 << 20)
-#define MXC_CCM_CSCMR1_ESDHC3_CLK_SEL                   (0x1 << 19)
-#define MXC_CCM_CSCMR1_ESDHC2_MSHC2_MX53_CLK_SEL        (0x1 << 19)
-#define MXC_CCM_CSCMR1_ESDHC4_CLK_SEL                   (0x1 << 18)
-#define MXC_CCM_CSCMR1_ESDHC2_MSHC2_CLK_SEL_OFFSET      (16)
-#define MXC_CCM_CSCMR1_ESDHC2_MSHC2_CLK_SEL_MASK        (0x3 << 16)
-#define MXC_CCM_CSCMR1_ESDHC3_MX53_CLK_SEL_OFFSET       (16)
-#define MXC_CCM_CSCMR1_ESDHC3_MX53_CLK_SEL_MASK         (0x3 << 16)
-#define MXC_CCM_CSCMR1_SSI1_CLK_SEL_OFFSET              (14)
-#define MXC_CCM_CSCMR1_SSI1_CLK_SEL_MASK                (0x3 << 14)
-#define MXC_CCM_CSCMR1_SSI2_CLK_SEL_OFFSET              (12)
-#define MXC_CCM_CSCMR1_SSI2_CLK_SEL_MASK                (0x3 << 12)
-#define MXC_CCM_CSCMR1_SSI3_CLK_SEL                     (0x1 << 11)
-#define MXC_CCM_CSCMR1_VPU_RCLK_SEL                     (0x1 << 10)
-#define MXC_CCM_CSCMR1_SSI_APM_CLK_SEL_OFFSET           (8)
-#define MXC_CCM_CSCMR1_SSI_APM_CLK_SEL_MASK             (0x3 << 8)
-#define MXC_CCM_CSCMR1_TVE_CLK_SEL                      (0x1 << 7)
-#define MXC_CCM_CSCMR1_TVE_EXT_CLK_SEL                  (0x1 << 6)
-#define MXC_CCM_CSCMR1_CSPI_CLK_SEL_OFFSET              (4)
-#define MXC_CCM_CSCMR1_CSPI_CLK_SEL_MASK                (0x3 << 4)
-#define MXC_CCM_CSCMR1_SPDIF_CLK_SEL_OFFSET             (2)
-#define MXC_CCM_CSCMR1_SPDIF_CLK_SEL_MASK               (0x3 << 2)
-#define MXC_CCM_CSCMR1_SSI_EXT2_COM_CLK_SEL             (0x1 << 1)
-#define MXC_CCM_CSCMR1_SSI_EXT1_COM_CLK_SEL             (0x1)
-
-/* Define the bits in register CSCMR2 */
-#define MXC_CCM_CSCMR2_DI_CLK_SEL_OFFSET(n)             (26+n*3)
-#define MXC_CCM_CSCMR2_DI_CLK_SEL_MASK(n)               (0x7 << (26+n*3))
-#define MXC_CCM_CSCMR2_CSI_MCLK2_CLK_SEL_OFFSET         (24)
-#define MXC_CCM_CSCMR2_CSI_MCLK2_CLK_SEL_MASK           (0x3 << 24)
-#define MXC_CCM_CSCMR2_CSI_MCLK1_CLK_SEL_OFFSET         (22)
-#define MXC_CCM_CSCMR2_CSI_MCLK1_CLK_SEL_MASK           (0x3 << 22)
-#define MXC_CCM_CSCMR2_ESC_CLK_SEL_OFFSET               (20)
-#define MXC_CCM_CSCMR2_ESC_CLK_SEL_MASK                 (0x3 << 20)
-#define MXC_CCM_CSCMR2_HSC2_CLK_SEL_OFFSET              (18)
-#define MXC_CCM_CSCMR2_HSC2_CLK_SEL_MASK                (0x3 << 18)
-#define MXC_CCM_CSCMR2_HSC1_CLK_SEL_OFFSET              (16)
-#define MXC_CCM_CSCMR2_HSC1_CLK_SEL_MASK                (0x3 << 16)
-#define MXC_CCM_CSCMR2_HSI2C_CLK_SEL_OFFSET             (14)
-#define MXC_CCM_CSCMR2_HSI2C_CLK_SEL_MASK               (0x3 << 14)
-#define MXC_CCM_CSCMR2_FIRI_CLK_SEL_OFFSET              (12)
-#define MXC_CCM_CSCMR2_FIRI_CLK_SEL_MASK                (0x3 << 12)
-#define MXC_CCM_CSCMR2_SIM_CLK_SEL_OFFSET               (10)
-#define MXC_CCM_CSCMR2_SIM_CLK_SEL_MASK                 (0x3 << 10)
-#define MXC_CCM_CSCMR2_SLIMBUS_COM                      (0x1 << 9)
-#define MXC_CCM_CSCMR2_SLIMBUS_CLK_SEL_OFFSET           (6)
-#define MXC_CCM_CSCMR2_SLIMBUS_CLK_SEL_MASK             (0x7 << 6)
-#define MXC_CCM_CSCMR2_SPDIF1_COM                       (1 << 5)
-#define MXC_CCM_CSCMR2_SPDIF0_COM                       (1 << 4)
-#define MXC_CCM_CSCMR2_SPDIF1_CLK_SEL_OFFSET            (2)
-#define MXC_CCM_CSCMR2_SPDIF1_CLK_SEL_MASK              (0x3 << 2)
-#define MXC_CCM_CSCMR2_SPDIF0_CLK_SEL_OFFSET            (0)
-#define MXC_CCM_CSCMR2_SPDIF0_CLK_SEL_MASK              (0x3)
-
-/* Define the bits in register CSCDR1 */
-#define MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PRED_OFFSET     (22)
-#define MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PRED_MASK       (0x7 << 22)
-#define MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PODF_OFFSET     (19)
-#define MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PODF_MASK       (0x7 << 19)
-#define MXC_CCM_CSCDR1_ESDHC3_MX53_CLK_PRED_OFFSET      (22)
-#define MXC_CCM_CSCDR1_ESDHC3_MX53_CLK_PRED_MASK        (0x7 << 22)
-#define MXC_CCM_CSCDR1_ESDHC3_MX53_CLK_PODF_OFFSET      (19)
-#define MXC_CCM_CSCDR1_ESDHC3_MX53_CLK_PODF_MASK        (0x7 << 19)
-#define MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PRED_OFFSET     (16)
-#define MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PRED_MASK       (0x7 << 16)
-#define MXC_CCM_CSCDR1_PGC_CLK_PODF_OFFSET              (14)
-#define MXC_CCM_CSCDR1_PGC_CLK_PODF_MASK                (0x3 << 14)
-#define MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PODF_OFFSET     (11)
-#define MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PODF_MASK       (0x7 << 11)
-#define MXC_CCM_CSCDR1_USBOH3_CLK_PRED_OFFSET           (8)
-#define MXC_CCM_CSCDR1_USBOH3_CLK_PRED_MASK             (0x7 << 8)
-#define MXC_CCM_CSCDR1_USBOH3_CLK_PODF_OFFSET           (6)
-#define MXC_CCM_CSCDR1_USBOH3_CLK_PODF_MASK             (0x3 << 6)
-#define MXC_CCM_CSCDR1_UART_CLK_PRED_OFFSET             (3)
-#define MXC_CCM_CSCDR1_UART_CLK_PRED_MASK               (0x7 << 3)
-#define MXC_CCM_CSCDR1_UART_CLK_PODF_OFFSET             (0)
-#define MXC_CCM_CSCDR1_UART_CLK_PODF_MASK               (0x7)
-
-/* Define the bits in register CS1CDR and CS2CDR */
-#define MXC_CCM_CS1CDR_SSI_EXT1_CLK_PRED_OFFSET         (22)
-#define MXC_CCM_CS1CDR_SSI_EXT1_CLK_PRED_MASK           (0x7 << 22)
-#define MXC_CCM_CS1CDR_SSI_EXT1_CLK_PODF_OFFSET         (16)
-#define MXC_CCM_CS1CDR_SSI_EXT1_CLK_PODF_MASK           (0x3F << 16)
-#define MXC_CCM_CS1CDR_SSI1_CLK_PRED_OFFSET             (6)
-#define MXC_CCM_CS1CDR_SSI1_CLK_PRED_MASK               (0x7 << 6)
-#define MXC_CCM_CS1CDR_SSI1_CLK_PODF_OFFSET             (0)
-#define MXC_CCM_CS1CDR_SSI1_CLK_PODF_MASK               (0x3F)
-
-#define MXC_CCM_CS2CDR_SSI_EXT2_CLK_PRED_OFFSET         (22)
-#define MXC_CCM_CS2CDR_SSI_EXT2_CLK_PRED_MASK           (0x7 << 22)
-#define MXC_CCM_CS2CDR_SSI_EXT2_CLK_PODF_OFFSET         (16)
-#define MXC_CCM_CS2CDR_SSI_EXT2_CLK_PODF_MASK           (0x3F << 16)
-#define MXC_CCM_CS2CDR_SSI2_CLK_PRED_OFFSET             (6)
-#define MXC_CCM_CS2CDR_SSI2_CLK_PRED_MASK               (0x7 << 6)
-#define MXC_CCM_CS2CDR_SSI2_CLK_PODF_OFFSET             (0)
-#define MXC_CCM_CS2CDR_SSI2_CLK_PODF_MASK               (0x3F)
-
-/* Define the bits in register CDCDR */
-#define MXC_CCM_CDCDR_TVE_CLK_PRED_OFFSET               (28)
-#define MXC_CCM_CDCDR_TVE_CLK_PRED_MASK                 (0x7 << 28)
-#define MXC_CCM_CDCDR_SPDIF0_CLK_PRED_OFFSET            (25)
-#define MXC_CCM_CDCDR_SPDIF0_CLK_PRED_MASK              (0x7 << 25)
-#define MXC_CCM_CDCDR_SPDIF0_CLK_PODF_OFFSET            (19)
-#define MXC_CCM_CDCDR_SPDIF0_CLK_PODF_MASK              (0x3F << 19)
-#define MXC_CCM_CDCDR_SPDIF1_CLK_PRED_OFFSET            (16)
-#define MXC_CCM_CDCDR_SPDIF1_CLK_PRED_MASK              (0x7 << 16)
-#define MXC_CCM_CDCDR_SPDIF1_CLK_PODF_OFFSET            (9)
-#define MXC_CCM_CDCDR_SPDIF1_CLK_PODF_MASK              (0x3F << 9)
-#define MXC_CCM_CDCDR_DI_CLK_PRED_OFFSET                (6)
-#define MXC_CCM_CDCDR_DI_CLK_PRED_MASK                  (0x7 << 6)
-#define MXC_CCM_CDCDR_USB_PHY_PRED_OFFSET               (3)
-#define MXC_CCM_CDCDR_USB_PHY_PRED_MASK                 (0x7 << 3)
-#define MXC_CCM_CDCDR_USB_PHY_PODF_OFFSET               (0)
-#define MXC_CCM_CDCDR_USB_PHY_PODF_MASK                 (0x7)
-
-/* Define the bits in register CHSCCDR */
-#define MXC_CCM_CHSCCDR_ESC_CLK_PRED_OFFSET             (12)
-#define MXC_CCM_CHSCCDR_ESC_CLK_PRED_MASK               (0x7 << 12)
-#define MXC_CCM_CHSCCDR_ESC_CLK_PODF_OFFSET             (6)
-#define MXC_CCM_CHSCCDR_ESC_CLK_PODF_MASK               (0x3F << 6)
-#define MXC_CCM_CHSCCDR_HSC2_CLK_PODF_OFFSET            (3)
-#define MXC_CCM_CHSCCDR_HSC2_CLK_PODF_MASK              (0x7 << 3)
-#define MXC_CCM_CHSCCDR_HSC1_CLK_PODF_OFFSET            (0)
-#define MXC_CCM_CHSCCDR_HSC1_CLK_PODF_MASK              (0x7)
-
-/* Define the bits in register CSCDR2 */
-#define MXC_CCM_CSCDR2_CSPI_CLK_PRED_OFFSET             (25)
-#define MXC_CCM_CSCDR2_CSPI_CLK_PRED_MASK               (0x7 << 25)
-#define MXC_CCM_CSCDR2_CSPI_CLK_PODF_OFFSET             (19)
-#define MXC_CCM_CSCDR2_CSPI_CLK_PODF_MASK               (0x3F << 19)
-#define MXC_CCM_CSCDR2_SIM_CLK_PRED_OFFSET              (16)
-#define MXC_CCM_CSCDR2_SIM_CLK_PRED_MASK                (0x7 << 16)
-#define MXC_CCM_CSCDR2_SIM_CLK_PODF_OFFSET              (9)
-#define MXC_CCM_CSCDR2_SIM_CLK_PODF_MASK                (0x3F << 9)
-#define MXC_CCM_CSCDR2_SLIMBUS_CLK_PRED_OFFSET          (6)
-#define MXC_CCM_CSCDR2_SLIMBUS_PRED_MASK                (0x7 << 6)
-#define MXC_CCM_CSCDR2_SLIMBUS_PODF_OFFSET              (0)
-#define MXC_CCM_CSCDR2_SLIMBUS_PODF_MASK                (0x3F)
-
-/* Define the bits in register CSCDR3 */
-#define MXC_CCM_CSCDR3_HSI2C_CLK_PRED_OFFSET            (16)
-#define MXC_CCM_CSCDR3_HSI2C_CLK_PRED_MASK              (0x7 << 16)
-#define MXC_CCM_CSCDR3_HSI2C_CLK_PODF_OFFSET            (9)
-#define MXC_CCM_CSCDR3_HSI2C_CLK_PODF_MASK              (0x3F << 9)
-#define MXC_CCM_CSCDR3_FIRI_CLK_PRED_OFFSET             (6)
-#define MXC_CCM_CSCDR3_FIRI_CLK_PRED_MASK               (0x7 << 6)
-#define MXC_CCM_CSCDR3_FIRI_CLK_PODF_OFFSET             (0)
-#define MXC_CCM_CSCDR3_FIRI_CLK_PODF_MASK               (0x3F)
-
-/* Define the bits in register CSCDR4 */
-#define MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PRED_OFFSET        (16)
-#define MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PRED_MASK          (0x7 << 16)
-#define MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PODF_OFFSET        (9)
-#define MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PODF_MASK          (0x3F << 9)
-#define MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PRED_OFFSET        (6)
-#define MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PRED_MASK          (0x7 << 6)
-#define MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PODF_OFFSET        (0)
-#define MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PODF_MASK          (0x3F)
-
-/* Define the bits in register CDHIPR */
-#define MXC_CCM_CDHIPR_ARM_PODF_BUSY                    (1 << 16)
-#define MXC_CCM_CDHIPR_DDR_HF_CLK_SEL_BUSY              (1 << 8)
-#define MXC_CCM_CDHIPR_DDR_PODF_BUSY                    (1 << 7)
-#define MXC_CCM_CDHIPR_EMI_CLK_SEL_BUSY                 (1 << 6)
-#define MXC_CCM_CDHIPR_PERIPH_CLK_SEL_BUSY              (1 << 5)
-#define MXC_CCM_CDHIPR_NFC_IPG_INT_MEM_PODF_BUSY        (1 << 4)
-#define MXC_CCM_CDHIPR_AHB_PODF_BUSY                    (1 << 3)
-#define MXC_CCM_CDHIPR_EMI_PODF_BUSY                    (1 << 2)
-#define MXC_CCM_CDHIPR_AXI_B_PODF_BUSY                  (1 << 1)
-#define MXC_CCM_CDHIPR_AXI_A_PODF_BUSY                  (1 << 0)
-
-/* Define the bits in register CDCR */
-#define MXC_CCM_CDCR_ARM_FREQ_SHIFT_DIVIDER             (0x1 << 2)
-#define MXC_CCM_CDCR_PERIPH_CLK_DVFS_PODF_OFFSET        (0)
-#define MXC_CCM_CDCR_PERIPH_CLK_DVFS_PODF_MASK          (0x3)
-
-/* Define the bits in register CLPCR */
-#define MXC_CCM_CLPCR_BYPASS_HSC_LPM_HS         (0x1 << 23)
-#define MXC_CCM_CLPCR_BYPASS_SCC_LPM_HS         (0x1 << 22)
-#define MX51_CCM_CLPCR_BYPASS_MAX_LPM_HS                (0x1 << 21)
-#define MX53_CCM_CLPCR_BYPASS_MAX_LPM_HS                (0x1 << 25)
-#define MXC_CCM_CLPCR_BYPASS_SDMA_LPM_HS        (0x1 << 20)
-#define MXC_CCM_CLPCR_BYPASS_EMI_LPM_HS         (0x1 << 19)
-#define MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS         (0x1 << 18)
-#define MXC_CCM_CLPCR_BYPASS_RTIC_LPM_HS        (0x1 << 17)
-#define MXC_CCM_CLPCR_BYPASS_RNGC_LPM_HS        (0x1 << 16)
-#define MXC_CCM_CLPCR_COSC_PWRDOWN              (0x1 << 11)
-#define MXC_CCM_CLPCR_STBY_COUNT_OFFSET         (9)
-#define MXC_CCM_CLPCR_STBY_COUNT_MASK           (0x3 << 9)
-#define MXC_CCM_CLPCR_VSTBY                     (0x1 << 8)
-#define MXC_CCM_CLPCR_DIS_REF_OSC               (0x1 << 7)
-#define MXC_CCM_CLPCR_SBYOS                     (0x1 << 6)
-#define MXC_CCM_CLPCR_ARM_CLK_DIS_ON_LPM        (0x1 << 5)
-#define MXC_CCM_CLPCR_LPSR_CLK_SEL_OFFSET       (3)
-#define MXC_CCM_CLPCR_LPSR_CLK_SEL_MASK         (0x3 << 3)
-#define MXC_CCM_CLPCR_LPM_OFFSET                (0)
-#define MXC_CCM_CLPCR_LPM_MASK                  (0x3)
-
-/* Define the bits in register CISR */
-#define MXC_CCM_CISR_ARM_PODF_LOADED                    (0x1 << 25)
-#define MXC_CCM_CISR_NFC_IPG_INT_MEM_PODF_LOADED        (0x1 << 21)
-#define MXC_CCM_CISR_AHB_PODF_LOADED                    (0x1 << 20)
-#define MXC_CCM_CISR_EMI_PODF_LOADED                    (0x1 << 19)
-#define MXC_CCM_CISR_AXI_B_PODF_LOADED                  (0x1 << 18)
-#define MXC_CCM_CISR_AXI_A_PODF_LOADED                  (0x1 << 17)
-#define MXC_CCM_CISR_DIVIDER_LOADED                     (0x1 << 16)
-#define MXC_CCM_CISR_COSC_READY                         (0x1 << 6)
-#define MXC_CCM_CISR_CKIH2_READY                        (0x1 << 5)
-#define MXC_CCM_CISR_CKIH_READY                         (0x1 << 4)
-#define MXC_CCM_CISR_FPM_READY                          (0x1 << 3)
-#define MXC_CCM_CISR_LRF_PLL3                           (0x1 << 2)
-#define MXC_CCM_CISR_LRF_PLL2                           (0x1 << 1)
-#define MXC_CCM_CISR_LRF_PLL1                           (0x1)
-
-/* Define the bits in register CIMR */
-#define MXC_CCM_CIMR_MASK_ARM_PODF_LOADED               (0x1 << 25)
-#define MXC_CCM_CIMR_MASK_NFC_IPG_INT_MEM_PODF_LOADED   (0x1 << 21)
-#define MXC_CCM_CIMR_MASK_EMI_PODF_LOADED               (0x1 << 20)
-#define MXC_CCM_CIMR_MASK_AXI_C_PODF_LOADED             (0x1 << 19)
-#define MXC_CCM_CIMR_MASK_AXI_B_PODF_LOADED             (0x1 << 18)
-#define MXC_CCM_CIMR_MASK_AXI_A_PODF_LOADED             (0x1 << 17)
-#define MXC_CCM_CIMR_MASK_DIVIDER_LOADED                (0x1 << 16)
-#define MXC_CCM_CIMR_MASK_COSC_READY                    (0x1 << 5)
-#define MXC_CCM_CIMR_MASK_CKIH_READY                    (0x1 << 4)
-#define MXC_CCM_CIMR_MASK_FPM_READY                     (0x1 << 3)
-#define MXC_CCM_CIMR_MASK_LRF_PLL3                      (0x1 << 2)
-#define MXC_CCM_CIMR_MASK_LRF_PLL2                      (0x1 << 1)
-#define MXC_CCM_CIMR_MASK_LRF_PLL1                      (0x1)
-
-/* Define the bits in register CCOSR */
-#define MXC_CCM_CCOSR_CKO2_EN_OFFSET                    (0x1 << 24)
-#define MXC_CCM_CCOSR_CKO2_DIV_OFFSET                   (21)
-#define MXC_CCM_CCOSR_CKO2_DIV_MASK                     (0x7 << 21)
-#define MXC_CCM_CCOSR_CKO2_SEL_OFFSET                   (16)
-#define MXC_CCM_CCOSR_CKO2_SEL_MASK                     (0x1F << 16)
-#define MXC_CCM_CCOSR_CKOL_EN                           (0x1 << 7)
-#define MXC_CCM_CCOSR_CKOL_DIV_OFFSET                   (4)
-#define MXC_CCM_CCOSR_CKOL_DIV_MASK                     (0x7 << 4)
-#define MXC_CCM_CCOSR_CKOL_SEL_OFFSET                   (0)
-#define MXC_CCM_CCOSR_CKOL_SEL_MASK                     (0xF)
-
-/* Define the bits in registers CGPR */
-#define MXC_CCM_CGPR_EFUSE_PROG_SUPPLY_GATE             (0x1 << 4)
-#define MXC_CCM_CGPR_FPM_SEL                            (0x1 << 3)
-#define MXC_CCM_CGPR_VL_L2BIST_CLKDIV_OFFSET            (0)
-#define MXC_CCM_CGPR_VL_L2BIST_CLKDIV_MASK              (0x7)
-
-/* Define the bits in registers CCGRx */
-#define MXC_CCM_CCGRx_CG_MASK                           0x3
-#define MXC_CCM_CCGRx_MOD_OFF                           0x0
-#define MXC_CCM_CCGRx_MOD_ON                            0x3
-#define MXC_CCM_CCGRx_MOD_IDLE                          0x1
-
-#define MXC_CCM_CCGRx_CG15_MASK                         (0x3 << 30)
-#define MXC_CCM_CCGRx_CG14_MASK                         (0x3 << 28)
-#define MXC_CCM_CCGRx_CG13_MASK                         (0x3 << 26)
-#define MXC_CCM_CCGRx_CG12_MASK                         (0x3 << 24)
-#define MXC_CCM_CCGRx_CG11_MASK                         (0x3 << 22)
-#define MXC_CCM_CCGRx_CG10_MASK                         (0x3 << 20)
-#define MXC_CCM_CCGRx_CG9_MASK                          (0x3 << 18)
-#define MXC_CCM_CCGRx_CG8_MASK                          (0x3 << 16)
-#define MXC_CCM_CCGRx_CG5_MASK                          (0x3 << 10)
-#define MXC_CCM_CCGRx_CG4_MASK                          (0x3 << 8)
-#define MXC_CCM_CCGRx_CG3_MASK                          (0x3 << 6)
-#define MXC_CCM_CCGRx_CG2_MASK                          (0x3 << 4)
-#define MXC_CCM_CCGRx_CG1_MASK                          (0x3 << 2)
-#define MXC_CCM_CCGRx_CG0_MASK                          (0x3 << 0)
-
-#define MXC_CCM_CCGRx_CG15_OFFSET                       30
-#define MXC_CCM_CCGRx_CG14_OFFSET                       28
-#define MXC_CCM_CCGRx_CG13_OFFSET                       26
-#define MXC_CCM_CCGRx_CG12_OFFSET                       24
-#define MXC_CCM_CCGRx_CG11_OFFSET                       22
-#define MXC_CCM_CCGRx_CG10_OFFSET                       20
-#define MXC_CCM_CCGRx_CG9_OFFSET                        18
-#define MXC_CCM_CCGRx_CG8_OFFSET                        16
-#define MXC_CCM_CCGRx_CG7_OFFSET                        14
-#define MXC_CCM_CCGRx_CG6_OFFSET                        12
-#define MXC_CCM_CCGRx_CG5_OFFSET                        10
-#define MXC_CCM_CCGRx_CG4_OFFSET                        8
-#define MXC_CCM_CCGRx_CG3_OFFSET                        6
-#define MXC_CCM_CCGRx_CG2_OFFSET                        4
-#define MXC_CCM_CCGRx_CG1_OFFSET                        2
-#define MXC_CCM_CCGRx_CG0_OFFSET                        0
-
-#define MXC_DPTC_LP_BASE        (MX51_GPC_BASE + 0x80)
-#define MXC_DPTC_GP_BASE        (MX51_GPC_BASE + 0x100)
-#define MXC_DVFS_CORE_BASE      (MX51_GPC_BASE + 0x180)
-#define MXC_DPTC_PER_BASE       (MX51_GPC_BASE + 0x1C0)
-#define MXC_PGC_IPU_BASE        (MX51_GPC_BASE + 0x220)
-#define MXC_PGC_VPU_BASE        (MX51_GPC_BASE + 0x240)
-#define MXC_PGC_GPU_BASE        (MX51_GPC_BASE + 0x260)
-#define MXC_SRPG_NEON_BASE      (MX51_GPC_BASE + 0x280)
-#define MXC_SRPG_ARM_BASE       (MX51_GPC_BASE + 0x2A0)
-#define MXC_SRPG_EMPGC0_BASE    (MX51_GPC_BASE + 0x2C0)
-#define MXC_SRPG_EMPGC1_BASE    (MX51_GPC_BASE + 0x2D0)
-#define MXC_SRPG_MEGAMIX_BASE   (MX51_GPC_BASE + 0x2E0)
-#define MXC_SRPG_EMI_BASE       (MX51_GPC_BASE + 0x300)
-
-/* CORTEXA8 platform */
-#define MXC_CORTEXA8_PLAT_PVID          (MX51_CORTEXA8_BASE + 0x0)
-#define MXC_CORTEXA8_PLAT_GPC           (MX51_CORTEXA8_BASE + 0x4)
-#define MXC_CORTEXA8_PLAT_PIC           (MX51_CORTEXA8_BASE + 0x8)
-#define MXC_CORTEXA8_PLAT_LPC           (MX51_CORTEXA8_BASE + 0xC)
-#define MXC_CORTEXA8_PLAT_NEON_LPC      (MX51_CORTEXA8_BASE + 0x10)
-#define MXC_CORTEXA8_PLAT_ICGC          (MX51_CORTEXA8_BASE + 0x14)
-#define MXC_CORTEXA8_PLAT_AMC           (MX51_CORTEXA8_BASE + 0x18)
-#define MXC_CORTEXA8_PLAT_NMC           (MX51_CORTEXA8_BASE + 0x20)
-#define MXC_CORTEXA8_PLAT_NMS           (MX51_CORTEXA8_BASE + 0x24)
-
-/* DVFS CORE */
-#define MXC_DVFSTHRS            (MXC_DVFS_CORE_BASE + 0x00)
-#define MXC_DVFSCOUN            (MXC_DVFS_CORE_BASE + 0x04)
-#define MXC_DVFSSIG1            (MXC_DVFS_CORE_BASE + 0x08)
-#define MXC_DVFSSIG0            (MXC_DVFS_CORE_BASE + 0x0C)
-#define MXC_DVFSGPC0            (MXC_DVFS_CORE_BASE + 0x10)
-#define MXC_DVFSGPC1            (MXC_DVFS_CORE_BASE + 0x14)
-#define MXC_DVFSGPBT            (MXC_DVFS_CORE_BASE + 0x18)
-#define MXC_DVFSEMAC            (MXC_DVFS_CORE_BASE + 0x1C)
-#define MXC_DVFSCNTR            (MXC_DVFS_CORE_BASE + 0x20)
-#define MXC_DVFSLTR0_0          (MXC_DVFS_CORE_BASE + 0x24)
-#define MXC_DVFSLTR0_1          (MXC_DVFS_CORE_BASE + 0x28)
-#define MXC_DVFSLTR1_0          (MXC_DVFS_CORE_BASE + 0x2C)
-#define MXC_DVFSLTR1_1          (MXC_DVFS_CORE_BASE + 0x30)
-#define MXC_DVFSPT0             (MXC_DVFS_CORE_BASE + 0x34)
-#define MXC_DVFSPT1             (MXC_DVFS_CORE_BASE + 0x38)
-#define MXC_DVFSPT2             (MXC_DVFS_CORE_BASE + 0x3C)
-#define MXC_DVFSPT3             (MXC_DVFS_CORE_BASE + 0x40)
-
-/* GPC */
-#define MXC_GPC_CNTR            (MX51_GPC_BASE + 0x0)
-#define MXC_GPC_PGR             (MX51_GPC_BASE + 0x4)
-#define MXC_GPC_VCR             (MX51_GPC_BASE + 0x8)
-#define MXC_GPC_ALL_PU          (MX51_GPC_BASE + 0xC)
-#define MXC_GPC_NEON            (MX51_GPC_BASE + 0x10)
-#define MXC_GPC_PGR_ARMPG_OFFSET        8
-#define MXC_GPC_PGR_ARMPG_MASK          (3 << 8)
-
-/* PGC */
-#define MXC_PGC_IPU_PGCR        (MXC_PGC_IPU_BASE + 0x0)
-#define MXC_PGC_IPU_PGSR        (MXC_PGC_IPU_BASE + 0xC)
-#define MXC_PGC_VPU_PGCR        (MXC_PGC_VPU_BASE + 0x0)
-#define MXC_PGC_VPU_PGSR        (MXC_PGC_VPU_BASE + 0xC)
-#define MXC_PGC_GPU_PGCR        (MXC_PGC_GPU_BASE + 0x0)
-#define MXC_PGC_GPU_PGSR        (MXC_PGC_GPU_BASE + 0xC)
-
-#define MXC_PGCR_PCR            1
-#define MXC_SRPGCR_PCR          1
-#define MXC_EMPGCR_PCR          1
-#define MXC_PGSR_PSR            1
-
-
-#define MXC_CORTEXA8_PLAT_LPC_DSM       (1 << 0)
-#define MXC_CORTEXA8_PLAT_LPC_DBG_DSM   (1 << 1)
-
-/* SRPG */
-#define MXC_SRPG_NEON_SRPGCR    (MXC_SRPG_NEON_BASE + 0x0)
-#define MXC_SRPG_NEON_PUPSCR    (MXC_SRPG_NEON_BASE + 0x4)
-#define MXC_SRPG_NEON_PDNSCR    (MXC_SRPG_NEON_BASE + 0x8)
-
-#define MXC_SRPG_ARM_SRPGCR     (MXC_SRPG_ARM_BASE + 0x0)
-#define MXC_SRPG_ARM_PUPSCR     (MXC_SRPG_ARM_BASE + 0x4)
-#define MXC_SRPG_ARM_PDNSCR     (MXC_SRPG_ARM_BASE + 0x8)
-
-#define MXC_SRPG_EMPGC0_SRPGCR  (MXC_SRPG_EMPGC0_BASE + 0x0)
-#define MXC_SRPG_EMPGC0_PUPSCR  (MXC_SRPG_EMPGC0_BASE + 0x4)
-#define MXC_SRPG_EMPGC0_PDNSCR  (MXC_SRPG_EMPGC0_BASE + 0x8)
-
-#define MXC_SRPG_EMPGC1_SRPGCR  (MXC_SRPG_EMPGC1_BASE + 0x0)
-#define MXC_SRPG_EMPGC1_PUPSCR  (MXC_SRPG_EMPGC1_BASE + 0x4)
-#define MXC_SRPG_EMPGC1_PDNSCR  (MXC_SRPG_EMPGC1_BASE + 0x8)
-
-#define MXC_SRPG_MEGAMIX_SRPGCR         (MXC_SRPG_MEGAMIX_BASE + 0x0)
-#define MXC_SRPG_MEGAMIX_PUPSCR         (MXC_SRPG_MEGAMIX_BASE + 0x4)
-#define MXC_SRPG_MEGAMIX_PDNSCR         (MXC_SRPG_MEGAMIX_BASE + 0x8)
-
-#define MXC_SRPGC_EMI_SRPGCR    (MXC_SRPGC_EMI_BASE + 0x0)
-#define MXC_SRPGC_EMI_PUPSCR    (MXC_SRPGC_EMI_BASE + 0x4)
-#define MXC_SRPGC_EMI_PDNSCR    (MXC_SRPGC_EMI_BASE + 0x8)
-
-#endif                          /* __ARCH_ARM_MACH_MX51_CRM_REGS_H__ */
diff --git a/arch/arm/mach-imx/devices-imx51.h b/arch/arm/mach-imx/devices-imx51.h
deleted file mode 100644
index 26389f35a2b2..000000000000
--- a/arch/arm/mach-imx/devices-imx51.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2010 Pengutronix
- * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
- *
- * 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 "devices/devices-common.h"
-
-extern const struct imx_fec_data imx51_fec_data;
-#define imx51_add_fec(pdata)    \
-        imx_add_fec(&imx51_fec_data, pdata)
-
-extern const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data;
-#define imx51_add_fsl_usb2_udc(pdata)   \
-        imx_add_fsl_usb2_udc(&imx51_fsl_usb2_udc_data, pdata)
-
-extern const struct imx_imx_i2c_data imx51_imx_i2c_data[];
-#define imx51_add_imx_i2c(id, pdata)    \
-        imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata)
-#define imx51_add_hsi2c(pdata)  \
-        imx51_add_imx_i2c(2, pdata)
-
-extern const struct imx_imx_ssi_data imx51_imx_ssi_data[];
-#define imx51_add_imx_ssi(id, pdata)    \
-        imx_add_imx_ssi(&imx51_imx_ssi_data[id], pdata)
-
-extern const struct imx_imx_uart_1irq_data imx51_imx_uart_data[];
-#define imx51_add_imx_uart(id, pdata)   \
-        imx_add_imx_uart_1irq(&imx51_imx_uart_data[id], pdata)
-
-extern const struct imx_mxc_ehci_data imx51_mxc_ehci_otg_data;
-#define imx51_add_mxc_ehci_otg(pdata)   \
-        imx_add_mxc_ehci(&imx51_mxc_ehci_otg_data, pdata)
-extern const struct imx_mxc_ehci_data imx51_mxc_ehci_hs_data[];
-#define imx51_add_mxc_ehci_hs(id, pdata)        \
-        imx_add_mxc_ehci(&imx51_mxc_ehci_hs_data[id - 1], pdata)
-
-extern const struct imx_mxc_nand_data imx51_mxc_nand_data;
-#define imx51_add_mxc_nand(pdata)       \
-        imx_add_mxc_nand(&imx51_mxc_nand_data, pdata)
-
-extern const struct imx_sdhci_esdhc_imx_data imx51_sdhci_esdhc_imx_data[];
-#define imx51_add_sdhci_esdhc_imx(id, pdata)    \
-        imx_add_sdhci_esdhc_imx(&imx51_sdhci_esdhc_imx_data[id], pdata)
-
-extern const struct imx_spi_imx_data imx51_cspi_data;
-#define imx51_add_cspi(pdata)   \
-        imx_add_spi_imx(&imx51_cspi_data, pdata)
-
-extern const struct imx_spi_imx_data imx51_ecspi_data[];
-#define imx51_add_ecspi(id, pdata)      \
-        imx_add_spi_imx(&imx51_ecspi_data[id], pdata)
-
-extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data[];
-#define imx51_add_imx2_wdt(id)  \
-        imx_add_imx2_wdt(&imx51_imx2_wdt_data[id])
-
-extern const struct imx_imx_keypad_data imx51_imx_keypad_data;
-#define imx51_add_imx_keypad(pdata)     \
-        imx_add_imx_keypad(&imx51_imx_keypad_data, pdata)
-
-extern const struct imx_pata_imx_data imx51_pata_imx_data;
-#define imx51_add_pata_imx() \
-        imx_add_pata_imx(&imx51_pata_imx_data)
diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig
index 2d260a5a307c..1d2cc1805f3e 100644
--- a/arch/arm/mach-imx/devices/Kconfig
+++ b/arch/arm/mach-imx/devices/Kconfig
@@ -1,6 +1,6 @@
 config IMX_HAVE_PLATFORM_FEC
         bool
-        default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
+        default y if SOC_IMX25 || SOC_IMX27 || SOC_IMX35
 
 config IMX_HAVE_PLATFORM_FLEXCAN
         bool
@@ -10,7 +10,6 @@ config IMX_HAVE_PLATFORM_FSL_USB2_UDC
 
 config IMX_HAVE_PLATFORM_GPIO_KEYS
         bool
-        default y if SOC_IMX51
 
 config IMX_HAVE_PLATFORM_IMX21_HCD
         bool
@@ -43,15 +42,9 @@ config IMX_HAVE_PLATFORM_IMX_SSI
 config IMX_HAVE_PLATFORM_IMX_UART
         bool
 
-config IMX_HAVE_PLATFORM_IMX_UDC
-        bool
-
 config IMX_HAVE_PLATFORM_IPU_CORE
         bool
 
-config IMX_HAVE_PLATFORM_MX1_CAMERA
-        bool
-
 config IMX_HAVE_PLATFORM_MX2_CAMERA
         bool
 
diff --git a/arch/arm/mach-imx/devices/Makefile b/arch/arm/mach-imx/devices/Makefile
index 1cbc14cd80d1..8fdb12b4ca7e 100644
--- a/arch/arm/mach-imx/devices/Makefile
+++ b/arch/arm/mach-imx/devices/Makefile
@@ -16,9 +16,7 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_KEYPAD) += platform-imx-keypad.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_PATA_IMX) += platform-pata_imx.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UDC) += platform-imx_udc.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IPU_CORE) += platform-ipu-core.o
-obj-$(CONFIG_IMX_HAVE_PLATFORM_MX1_CAMERA) += platform-mx1-camera.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI) += platform-mxc-ehci.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_MMC) += platform-mxc-mmc.o
diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h
index 61352a80bb59..67f7fb13050d 100644
--- a/arch/arm/mach-imx/devices/devices-common.h
+++ b/arch/arm/mach-imx/devices/devices-common.h
@@ -176,22 +176,6 @@ struct platform_device *__init imx_add_imx_uart_1irq(
                 const struct imx_imx_uart_1irq_data *data,
                 const struct imxuart_platform_data *pdata);
 
-#include <linux/platform_data/usb-imx_udc.h>
-struct imx_imx_udc_data {
-        resource_size_t iobase;
-        resource_size_t iosize;
-        resource_size_t irq0;
-        resource_size_t irq1;
-        resource_size_t irq2;
-        resource_size_t irq3;
-        resource_size_t irq4;
-        resource_size_t irq5;
-        resource_size_t irq6;
-};
-struct platform_device *__init imx_add_imx_udc(
-                const struct imx_imx_udc_data *data,
-                const struct imxusb_platform_data *pdata);
-
 #include <linux/platform_data/video-mx3fb.h>
 #include <linux/platform_data/camera-mx3.h>
 struct imx_ipu_core_data {
@@ -208,16 +192,6 @@ struct platform_device *__init imx_add_mx3_sdc_fb(
                 const struct imx_ipu_core_data *data,
                 struct mx3fb_platform_data *pdata);
 
-#include <linux/platform_data/camera-mx1.h>
-struct imx_mx1_camera_data {
-        resource_size_t iobase;
-        resource_size_t iosize;
-        resource_size_t irq;
-};
-struct platform_device *__init imx_add_mx1_camera(
-                const struct imx_mx1_camera_data *data,
-                const struct mx1_camera_pdata *pdata);
-
 #include <linux/platform_data/camera-mx2.h>
 struct imx_mx2_camera_data {
         const char *devid;
diff --git a/arch/arm/mach-imx/devices/devices.c b/arch/arm/mach-imx/devices/devices.c
index 1b4366a0e7c0..8eab5440da28 100644
--- a/arch/arm/mach-imx/devices/devices.c
+++ b/arch/arm/mach-imx/devices/devices.c
@@ -24,12 +24,10 @@
 
 struct device mxc_aips_bus = {
         .init_name      = "mxc_aips",
-        .parent         = &platform_bus,
 };
 
 struct device mxc_ahb_bus = {
         .init_name      = "mxc_ahb",
-        .parent         = &platform_bus,
 };
 
 int __init mxc_device_init(void)
diff --git a/arch/arm/mach-imx/devices/platform-fec.c b/arch/arm/mach-imx/devices/platform-fec.c
index 63eba08f87b1..d86f9250b4ee 100644
--- a/arch/arm/mach-imx/devices/platform-fec.c
+++ b/arch/arm/mach-imx/devices/platform-fec.c
@@ -35,18 +35,6 @@ const struct imx_fec_data imx35_fec_data __initconst =
         imx_fec_data_entry_single(MX35, "imx27-fec");
 #endif
 
-#ifdef CONFIG_SOC_IMX51
-/* i.mx51 has the i.mx27 type fec */
-const struct imx_fec_data imx51_fec_data __initconst =
-        imx_fec_data_entry_single(MX51, "imx27-fec");
-#endif
-
-#ifdef CONFIG_SOC_IMX53
-/* i.mx53 has the i.mx25 type fec */
-const struct imx_fec_data imx53_fec_data __initconst =
-        imx_fec_data_entry_single(MX53, "imx25-fec");
-#endif
-
 struct platform_device *__init imx_add_fec(
                 const struct imx_fec_data *data,
                 const struct fec_platform_data *pdata)
diff --git a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
index 3c06bd96e9cc..23b0061347cb 100644
--- a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
+++ b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
@@ -38,11 +38,6 @@ const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data __initconst =
         imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx27");
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data __initconst =
-        imx_fsl_usb2_udc_data_entry_single(MX51, "imx-udc-mx51");
-#endif
-
 struct platform_device *__init imx_add_fsl_usb2_udc(
                 const struct imx_fsl_usb2_udc_data *data,
                 const struct fsl_usb2_platform_data *pdata)
diff --git a/arch/arm/mach-imx/devices/platform-imx-i2c.c b/arch/arm/mach-imx/devices/platform-imx-i2c.c
index 57d342e85c2f..644ac2689882 100644
--- a/arch/arm/mach-imx/devices/platform-imx-i2c.c
+++ b/arch/arm/mach-imx/devices/platform-imx-i2c.c
@@ -70,32 +70,6 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = {
-#define imx51_imx_i2c_data_entry(_id, _hwid)                            \
-        imx_imx_i2c_data_entry(MX51, "imx21-i2c", _id, _hwid, SZ_4K)
-        imx51_imx_i2c_data_entry(0, 1),
-        imx51_imx_i2c_data_entry(1, 2),
-        {
-                .devid = "imx21-i2c",
-                .id = 2,
-                .iobase = MX51_HSI2C_DMA_BASE_ADDR,
-                .iosize = SZ_16K,
-                .irq = MX51_INT_HS_I2C,
-        },
-};
-#endif /* ifdef CONFIG_SOC_IMX51 */
-
-#ifdef CONFIG_SOC_IMX53
-const struct imx_imx_i2c_data imx53_imx_i2c_data[] __initconst = {
-#define imx53_imx_i2c_data_entry(_id, _hwid)                            \
-        imx_imx_i2c_data_entry(MX53, "imx21-i2c", _id, _hwid, SZ_4K)
-        imx53_imx_i2c_data_entry(0, 1),
-        imx53_imx_i2c_data_entry(1, 2),
-        imx53_imx_i2c_data_entry(2, 3),
-};
-#endif /* ifdef CONFIG_SOC_IMX53 */
-
 struct platform_device *__init imx_add_imx_i2c(
                 const struct imx_imx_i2c_data *data,
                 const struct imxi2c_platform_data *pdata)
diff --git a/arch/arm/mach-imx/devices/platform-imx-keypad.c b/arch/arm/mach-imx/devices/platform-imx-keypad.c
index 8f22a4c98a4c..f42200b7aca9 100644
--- a/arch/arm/mach-imx/devices/platform-imx-keypad.c
+++ b/arch/arm/mach-imx/devices/platform-imx-keypad.c
@@ -41,16 +41,6 @@ const struct imx_imx_keypad_data imx35_imx_keypad_data __initconst =
         imx_imx_keypad_data_entry_single(MX35, SZ_16);
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_imx_keypad_data imx51_imx_keypad_data __initconst =
-        imx_imx_keypad_data_entry_single(MX51, SZ_16);
-#endif /* ifdef CONFIG_SOC_IMX51 */
-
-#ifdef CONFIG_SOC_IMX53
-const struct imx_imx_keypad_data imx53_imx_keypad_data __initconst =
-        imx_imx_keypad_data_entry_single(MX53, SZ_16);
-#endif /* ifdef CONFIG_SOC_IMX53 */
-
 struct platform_device *__init imx_add_imx_keypad(
                 const struct imx_imx_keypad_data *data,
                 const struct matrix_keymap_data *pdata)
diff --git a/arch/arm/mach-imx/devices/platform-imx-ssi.c b/arch/arm/mach-imx/devices/platform-imx-ssi.c
index bfcb8f3dfa8d..1c7c721ebff1 100644
--- a/arch/arm/mach-imx/devices/platform-imx-ssi.c
+++ b/arch/arm/mach-imx/devices/platform-imx-ssi.c
@@ -66,26 +66,6 @@ const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_imx_ssi_data imx51_imx_ssi_data[] __initconst = {
-#define imx51_imx_ssi_data_entry(_id, _hwid)                            \
-        imx_imx_ssi_data_entry(MX51, _id, _hwid, SZ_16K)
-        imx51_imx_ssi_data_entry(0, 1),
-        imx51_imx_ssi_data_entry(1, 2),
-        imx51_imx_ssi_data_entry(2, 3),
-};
-#endif /* ifdef CONFIG_SOC_IMX51 */
-
-#ifdef CONFIG_SOC_IMX53
-const struct imx_imx_ssi_data imx53_imx_ssi_data[] __initconst = {
-#define imx53_imx_ssi_data_entry(_id, _hwid)                            \
-        imx_imx_ssi_data_entry(MX53, _id, _hwid, SZ_16K)
-        imx53_imx_ssi_data_entry(0, 1),
-        imx53_imx_ssi_data_entry(1, 2),
-        imx53_imx_ssi_data_entry(2, 3),
-};
-#endif /* ifdef CONFIG_SOC_IMX53 */
-
 struct platform_device *__init imx_add_imx_ssi(
                 const struct imx_imx_ssi_data *data,
                 const struct imx_ssi_platform_data *pdata)
diff --git a/arch/arm/mach-imx/devices/platform-imx-uart.c b/arch/arm/mach-imx/devices/platform-imx-uart.c
index faac4aa6ca6d..8c01836bc1d4 100644
--- a/arch/arm/mach-imx/devices/platform-imx-uart.c
+++ b/arch/arm/mach-imx/devices/platform-imx-uart.c
@@ -94,28 +94,6 @@ const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = {
-#define imx51_imx_uart_data_entry(_id, _hwid)                           \
-        imx_imx_uart_1irq_data_entry(MX51, _id, _hwid, SZ_4K)
-        imx51_imx_uart_data_entry(0, 1),
-        imx51_imx_uart_data_entry(1, 2),
-        imx51_imx_uart_data_entry(2, 3),
-};
-#endif /* ifdef CONFIG_SOC_IMX51 */
-
-#ifdef CONFIG_SOC_IMX53
-const struct imx_imx_uart_1irq_data imx53_imx_uart_data[] __initconst = {
-#define imx53_imx_uart_data_entry(_id, _hwid)                           \
-        imx_imx_uart_1irq_data_entry(MX53, _id, _hwid, SZ_4K)
-        imx53_imx_uart_data_entry(0, 1),
-        imx53_imx_uart_data_entry(1, 2),
-        imx53_imx_uart_data_entry(2, 3),
-        imx53_imx_uart_data_entry(3, 4),
-        imx53_imx_uart_data_entry(4, 5),
-};
-#endif /* ifdef CONFIG_SOC_IMX53 */
-
 struct platform_device *__init imx_add_imx_uart_3irq(
                 const struct imx_imx_uart_3irq_data *data,
                 const struct imxuart_platform_data *pdata)
diff --git a/arch/arm/mach-imx/devices/platform-imx2-wdt.c b/arch/arm/mach-imx/devices/platform-imx2-wdt.c
index ec75d6413686..54f63bc25ca4 100644
--- a/arch/arm/mach-imx/devices/platform-imx2-wdt.c
+++ b/arch/arm/mach-imx/devices/platform-imx2-wdt.c
@@ -45,24 +45,6 @@ const struct imx_imx2_wdt_data imx35_imx2_wdt_data __initconst =
         imx_imx2_wdt_data_entry_single(MX35, 0, , SZ_16K);
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_imx2_wdt_data imx51_imx2_wdt_data[] __initconst = {
-#define imx51_imx2_wdt_data_entry(_id, _hwid)                           \
-        imx_imx2_wdt_data_entry(MX51, _id, _hwid, SZ_16K)
-        imx51_imx2_wdt_data_entry(0, 1),
-        imx51_imx2_wdt_data_entry(1, 2),
-};
-#endif /* ifdef CONFIG_SOC_IMX51 */
-
-#ifdef CONFIG_SOC_IMX53
-const struct imx_imx2_wdt_data imx53_imx2_wdt_data[] __initconst = {
-#define imx53_imx2_wdt_data_entry(_id, _hwid)                           \
-        imx_imx2_wdt_data_entry(MX53, _id, _hwid, SZ_16K)
-        imx53_imx2_wdt_data_entry(0, 1),
-        imx53_imx2_wdt_data_entry(1, 2),
-};
-#endif /* ifdef CONFIG_SOC_IMX53 */
-
 struct platform_device *__init imx_add_imx2_wdt(
                 const struct imx_imx2_wdt_data *data)
 {
diff --git a/arch/arm/mach-imx/devices/platform-imx_udc.c b/arch/arm/mach-imx/devices/platform-imx_udc.c
deleted file mode 100644
index 5ced7e4e2c71..000000000000
--- a/arch/arm/mach-imx/devices/platform-imx_udc.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2010 Pengutronix
- * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
- *
- * 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 "../hardware.h"
-#include "devices-common.h"
-
-#define imx_imx_udc_data_entry_single(soc, _size)                       \
-        {                                                               \
-                .iobase = soc ## _USBD_BASE_ADDR,                       \
-                .iosize = _size,                                        \
-                .irq0 = soc ## _INT_USBD0,                              \
-                .irq1 = soc ## _INT_USBD1,                              \
-                .irq2 = soc ## _INT_USBD2,                              \
-                .irq3 = soc ## _INT_USBD3,                              \
-                .irq4 = soc ## _INT_USBD4,                              \
-                .irq5 = soc ## _INT_USBD5,                              \
-                .irq6 = soc ## _INT_USBD6,                              \
-        }
-
-#define imx_imx_udc_data_entry(soc, _size)                              \
-        [_id] = imx_imx_udc_data_entry_single(soc, _size)
-
-#ifdef CONFIG_SOC_IMX1
-const struct imx_imx_udc_data imx1_imx_udc_data __initconst =
-        imx_imx_udc_data_entry_single(MX1, SZ_4K);
-#endif /* ifdef CONFIG_SOC_IMX1 */
-
-struct platform_device *__init imx_add_imx_udc(
-                const struct imx_imx_udc_data *data,
-                const struct imxusb_platform_data *pdata)
-{
-        struct resource res[] = {
-                {
-                        .start = data->iobase,
-                        .end = data->iobase + data->iosize - 1,
-                        .flags = IORESOURCE_MEM,
-                }, {
-                        .start = data->irq0,
-                        .end = data->irq0,
-                        .flags = IORESOURCE_IRQ,
-                }, {
-                        .start = data->irq1,
-                        .end = data->irq1,
-                        .flags = IORESOURCE_IRQ,
-                }, {
-                        .start = data->irq2,
-                        .end = data->irq2,
-                        .flags = IORESOURCE_IRQ,
-                }, {
-                        .start = data->irq3,
-                        .end = data->irq3,
-                        .flags = IORESOURCE_IRQ,
-                }, {
-                        .start = data->irq4,
-                        .end = data->irq4,
-                        .flags = IORESOURCE_IRQ,
-                }, {
-                        .start = data->irq5,
-                        .end = data->irq5,
-                        .flags = IORESOURCE_IRQ,
-                }, {
-                        .start = data->irq6,
-                        .end = data->irq6,
-                        .flags = IORESOURCE_IRQ,
-                },
-        };
-
-        return imx_add_platform_device("imx_udc", 0,
-                        res, ARRAY_SIZE(res), pdata, sizeof(*pdata));
-}
diff --git a/arch/arm/mach-imx/devices/platform-mx1-camera.c b/arch/arm/mach-imx/devices/platform-mx1-camera.c
deleted file mode 100644
index 2c6788131080..000000000000
--- a/arch/arm/mach-imx/devices/platform-mx1-camera.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010 Pengutronix
- * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
- *
- * 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 "../hardware.h"
-#include "devices-common.h"
-
-#define imx_mx1_camera_data_entry_single(soc, _size)                    \
-        {                                                               \
-                .iobase = soc ## _CSI ## _BASE_ADDR,                    \
-                .iosize = _size,                                        \
-                .irq = soc ## _INT_CSI,                                 \
-        }
-
-#ifdef CONFIG_SOC_IMX1
-const struct imx_mx1_camera_data imx1_mx1_camera_data __initconst =
-        imx_mx1_camera_data_entry_single(MX1, 10);
-#endif /* ifdef CONFIG_SOC_IMX1 */
-
-struct platform_device *__init imx_add_mx1_camera(
-                const struct imx_mx1_camera_data *data,
-                const struct mx1_camera_pdata *pdata)
-{
-        struct resource res[] = {
-                {
-                        .start = data->iobase,
-                        .end = data->iobase + data->iosize - 1,
-                        .flags = IORESOURCE_MEM,
-                }, {
-                        .start = data->irq,
-                        .end = data->irq,
-                        .flags = IORESOURCE_IRQ,
-                },
-        };
-        return imx_add_platform_device_dmamask("mx1-camera", 0,
-                        res, ARRAY_SIZE(res),
-                        pdata, sizeof(*pdata), DMA_BIT_MASK(32));
-}
diff --git a/arch/arm/mach-imx/devices/platform-mxc-ehci.c b/arch/arm/mach-imx/devices/platform-mxc-ehci.c
index 5d4bbbfde641..296353662ff0 100644
--- a/arch/arm/mach-imx/devices/platform-mxc-ehci.c
+++ b/arch/arm/mach-imx/devices/platform-mxc-ehci.c
@@ -50,15 +50,6 @@ const struct imx_mxc_ehci_data imx35_mxc_ehci_hs_data __initconst =
         imx_mxc_ehci_data_entry_single(MX35, 1, HS);
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_mxc_ehci_data imx51_mxc_ehci_otg_data __initconst =
-        imx_mxc_ehci_data_entry_single(MX51, 0, OTG);
-const struct imx_mxc_ehci_data imx51_mxc_ehci_hs_data[] __initconst = {
-        imx_mxc_ehci_data_entry_single(MX51, 1, HS1),
-        imx_mxc_ehci_data_entry_single(MX51, 2, HS2),
-};
-#endif /* ifdef CONFIG_SOC_IMX51 */
-
 struct platform_device *__init imx_add_mxc_ehci(
                 const struct imx_mxc_ehci_data *data,
                 const struct mxc_usbh_platform_data *pdata)
diff --git a/arch/arm/mach-imx/devices/platform-mxc_nand.c b/arch/arm/mach-imx/devices/platform-mxc_nand.c
index 7af1c53e42b5..fa618a34f462 100644
--- a/arch/arm/mach-imx/devices/platform-mxc_nand.c
+++ b/arch/arm/mach-imx/devices/platform-mxc_nand.c
@@ -54,11 +54,6 @@ const struct imx_mxc_nand_data imx35_mxc_nand_data __initconst =
         imx_mxc_nand_data_entry_single(MX35, "imx25-nand", SZ_8K);
 #endif
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_mxc_nand_data imx51_mxc_nand_data __initconst =
-        imx_mxc_nandv3_data_entry_single(MX51, "imx51-nand", SZ_16K);
-#endif
-
 struct platform_device *__init imx_add_mxc_nand(
                 const struct imx_mxc_nand_data *data,
                 const struct mxc_nand_platform_data *pdata)
diff --git a/arch/arm/mach-imx/devices/platform-mxc_rnga.c b/arch/arm/mach-imx/devices/platform-mxc_rnga.c
index c58404badb59..851fbc8af7a9 100644
--- a/arch/arm/mach-imx/devices/platform-mxc_rnga.c
+++ b/arch/arm/mach-imx/devices/platform-mxc_rnga.c
@@ -48,9 +48,6 @@ static int __init imxXX_add_mxc_rnga(void)
 #endif /* if defined(CONFIG_SOC_IMX31) */
                 ret = ERR_PTR(-ENODEV);
 
-        if (IS_ERR(ret))
-                return PTR_ERR(ret);
-
-        return 0;
+        return PTR_ERR_OR_ZERO(ret);
 }
 arch_initcall(imxXX_add_mxc_rnga);
diff --git a/arch/arm/mach-imx/devices/platform-pata_imx.c b/arch/arm/mach-imx/devices/platform-pata_imx.c
index e4ec11c8ce55..1c7f895a69d2 100644
--- a/arch/arm/mach-imx/devices/platform-pata_imx.c
+++ b/arch/arm/mach-imx/devices/platform-pata_imx.c
@@ -28,16 +28,6 @@ const struct imx_pata_imx_data imx35_pata_imx_data __initconst =
         imx_pata_imx_data_entry_single(MX35, SZ_16K);
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_pata_imx_data imx51_pata_imx_data __initconst =
-        imx_pata_imx_data_entry_single(MX51, SZ_16K);
-#endif /* ifdef CONFIG_SOC_IMX51 */
-
-#ifdef CONFIG_SOC_IMX53
-const struct imx_pata_imx_data imx53_pata_imx_data __initconst =
-        imx_pata_imx_data_entry_single(MX53, SZ_16K);
-#endif /* ifdef CONFIG_SOC_IMX53 */
-
 struct platform_device *__init imx_add_pata_imx(
                 const struct imx_pata_imx_data *data)
 {
diff --git a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
index e66a4e316311..fb8d4a2ad48c 100644
--- a/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
+++ b/arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
@@ -43,30 +43,6 @@ imx35_sdhci_esdhc_imx_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-const struct imx_sdhci_esdhc_imx_data
-imx51_sdhci_esdhc_imx_data[] __initconst = {
-#define imx51_sdhci_esdhc_imx_data_entry(_id, _hwid)                    \
-        imx_sdhci_esdhc_imx_data_entry(MX51, "sdhci-esdhc-imx51", _id, _hwid)
-        imx51_sdhci_esdhc_imx_data_entry(0, 1),
-        imx51_sdhci_esdhc_imx_data_entry(1, 2),
-        imx51_sdhci_esdhc_imx_data_entry(2, 3),
-        imx51_sdhci_esdhc_imx_data_entry(3, 4),
-};
-#endif /* ifdef CONFIG_SOC_IMX51 */
-
-#ifdef CONFIG_SOC_IMX53
-const struct imx_sdhci_esdhc_imx_data
-imx53_sdhci_esdhc_imx_data[] __initconst = {
-#define imx53_sdhci_esdhc_imx_data_entry(_id, _hwid)                    \
-        imx_sdhci_esdhc_imx_data_entry(MX53, "sdhci-esdhc-imx53", _id, _hwid)
-        imx53_sdhci_esdhc_imx_data_entry(0, 1),
-        imx53_sdhci_esdhc_imx_data_entry(1, 2),
-        imx53_sdhci_esdhc_imx_data_entry(2, 3),
-        imx53_sdhci_esdhc_imx_data_entry(3, 4),
-};
-#endif /* ifdef CONFIG_SOC_IMX53 */
-
 static const struct esdhc_platform_data default_esdhc_pdata __initconst = {
         .wp_type = ESDHC_WP_NONE,
         .cd_type = ESDHC_CD_NONE,
diff --git a/arch/arm/mach-imx/devices/platform-spi_imx.c b/arch/arm/mach-imx/devices/platform-spi_imx.c
index 8880bcb11e05..aca825d74c48 100644
--- a/arch/arm/mach-imx/devices/platform-spi_imx.c
+++ b/arch/arm/mach-imx/devices/platform-spi_imx.c
@@ -79,33 +79,6 @@ const struct imx_spi_imx_data imx35_cspi_data[] __initconst = {
 };
 #endif /* ifdef CONFIG_SOC_IMX35 */
 
-#ifdef CONFIG_SOC_IMX51
-/* i.mx51 has the i.mx35 type cspi */
-const struct imx_spi_imx_data imx51_cspi_data __initconst =
-        imx_spi_imx_data_entry_single(MX51, CSPI, "imx35-cspi", 2, , SZ_4K);
-
-const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = {
-#define imx51_ecspi_data_entry(_id, _hwid)                              \
-        imx_spi_imx_data_entry(MX51, ECSPI, "imx51-ecspi", _id, _hwid, SZ_4K)
-        imx51_ecspi_data_entry(0, 1),
-        imx51_ecspi_data_entry(1, 2),
-};
-#endif /* ifdef CONFIG_SOC_IMX51 */
-
-#ifdef CONFIG_SOC_IMX53
-/* i.mx53 has the i.mx35 type cspi */
-const struct imx_spi_imx_data imx53_cspi_data __initconst =
-        imx_spi_imx_data_entry_single(MX53, CSPI, "imx35-cspi", 2, , SZ_4K);
-
-/* i.mx53 has the i.mx51 type ecspi */
-const struct imx_spi_imx_data imx53_ecspi_data[] __initconst = {
-#define imx53_ecspi_data_entry(_id, _hwid)                              \
-        imx_spi_imx_data_entry(MX53, ECSPI, "imx51-ecspi", _id, _hwid, SZ_4K)
-        imx53_ecspi_data_entry(0, 1),
-        imx53_ecspi_data_entry(1, 2),
-};
-#endif /* ifdef CONFIG_SOC_IMX53 */
-
 struct platform_device *__init imx_add_spi_imx(
                 const struct imx_spi_imx_data *data,
                 const struct spi_imx_master *pdata)
diff --git a/arch/arm/mach-imx/ehci-imx25.c b/arch/arm/mach-imx/ehci-imx25.c
index 134c190e3003..42a5a3d14c5f 100644
--- a/arch/arm/mach-imx/ehci-imx25.c
+++ b/arch/arm/mach-imx/ehci-imx25.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/platform_data/usb-ehci-mxc.h>
 
+#include "ehci.h"
 #include "hardware.h"
 
 #define USBCTRL_OTGBASE_OFFSET  0x600
diff --git a/arch/arm/mach-imx/ehci-imx27.c b/arch/arm/mach-imx/ehci-imx27.c
index 448d9115539d..c56974346c16 100644
--- a/arch/arm/mach-imx/ehci-imx27.c
+++ b/arch/arm/mach-imx/ehci-imx27.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/platform_data/usb-ehci-mxc.h>
 
+#include "ehci.h"
 #include "hardware.h"
 
 #define USBCTRL_OTGBASE_OFFSET  0x600
diff --git a/arch/arm/mach-imx/ehci-imx31.c b/arch/arm/mach-imx/ehci-imx31.c
index 05de4e1e39d7..bede21d9b981 100644
--- a/arch/arm/mach-imx/ehci-imx31.c
+++ b/arch/arm/mach-imx/ehci-imx31.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/platform_data/usb-ehci-mxc.h>
 
+#include "ehci.h"
 #include "hardware.h"
 
 #define USBCTRL_OTGBASE_OFFSET  0x600
diff --git a/arch/arm/mach-imx/ehci-imx35.c b/arch/arm/mach-imx/ehci-imx35.c
index 554e7cccff53..f424a543755c 100644
--- a/arch/arm/mach-imx/ehci-imx35.c
+++ b/arch/arm/mach-imx/ehci-imx35.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/platform_data/usb-ehci-mxc.h>
 
+#include "ehci.h"
 #include "hardware.h"
 
 #define USBCTRL_OTGBASE_OFFSET  0x600
diff --git a/arch/arm/mach-imx/ehci-imx5.c b/arch/arm/mach-imx/ehci-imx5.c
deleted file mode 100644
index e49710b10c68..000000000000
--- a/arch/arm/mach-imx/ehci-imx5.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
- * Copyright (C) 2010 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.
- *
- * 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/platform_device.h>
-#include <linux/io.h>
-#include <linux/platform_data/usb-ehci-mxc.h>
-
-#include "hardware.h"
-
-#define MXC_OTG_OFFSET                  0
-#define MXC_H1_OFFSET                   0x200
-#define MXC_H2_OFFSET                   0x400
-
-/* USB_CTRL */
-#define MXC_OTG_UCTRL_OWIE_BIT          (1 << 27)       /* OTG wakeup intr enable */
-#define MXC_OTG_UCTRL_OPM_BIT           (1 << 24)       /* OTG power mask */
-#define MXC_H1_UCTRL_H1UIE_BIT          (1 << 12)       /* Host1 ULPI interrupt enable */
-#define MXC_H1_UCTRL_H1WIE_BIT          (1 << 11)       /* HOST1 wakeup intr enable */
-#define MXC_H1_UCTRL_H1PM_BIT           (1 <<  8)       /* HOST1 power mask */
-
-/* USB_PHY_CTRL_FUNC */
-#define MXC_OTG_PHYCTRL_OC_POL_BIT      (1 << 9)        /* OTG Polarity of Overcurrent */
-#define MXC_OTG_PHYCTRL_OC_DIS_BIT      (1 << 8)        /* OTG Disable Overcurrent Event */
-#define MXC_H1_OC_POL_BIT               (1 << 6)        /* UH1 Polarity of Overcurrent */
-#define MXC_H1_OC_DIS_BIT               (1 << 5)        /* UH1 Disable Overcurrent Event */
-#define MXC_OTG_PHYCTRL_PWR_POL_BIT     (1 << 3)        /* OTG Power Pin Polarity */
-
-/* USBH2CTRL */
-#define MXC_H2_UCTRL_H2UIE_BIT          (1 << 8)
-#define MXC_H2_UCTRL_H2WIE_BIT          (1 << 7)
-#define MXC_H2_UCTRL_H2PM_BIT           (1 << 4)
-
-#define MXC_USBCMD_OFFSET               0x140
-
-/* USBCMD */
-#define MXC_UCMD_ITC_NO_THRESHOLD_MASK  (~(0xff << 16)) /* Interrupt Threshold Control */
-
-int mx51_initialize_usb_hw(int port, unsigned int flags)
-{
-        unsigned int v;
-        void __iomem *usb_base;
-        void __iomem *usbotg_base;
-        void __iomem *usbother_base;
-        int ret = 0;
-
-        usb_base = ioremap(MX51_USB_OTG_BASE_ADDR, SZ_4K);
-        if (!usb_base) {
-                printk(KERN_ERR "%s(): ioremap failed\n", __func__);
-                return -ENOMEM;
-        }
-
-        switch (port) {
-        case 0: /* OTG port */
-                usbotg_base = usb_base + MXC_OTG_OFFSET;
-                break;
-        case 1: /* Host 1 port */
-                usbotg_base = usb_base + MXC_H1_OFFSET;
-                break;
-        case 2: /* Host 2 port */
-                usbotg_base = usb_base + MXC_H2_OFFSET;
-                break;
-        default:
-                printk(KERN_ERR"%s no such port %d\n", __func__, port);
-                ret = -ENOENT;
-                goto error;
-        }
-        usbother_base = usb_base + MX5_USBOTHER_REGS_OFFSET;
-
-        switch (port) {
-        case 0: /*OTG port */
-                if (flags & MXC_EHCI_INTERNAL_PHY) {
-                        v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC_OFFSET);
-
-                        if (flags & MXC_EHCI_OC_PIN_ACTIVE_LOW)
-                                v |= MXC_OTG_PHYCTRL_OC_POL_BIT;
-                        else
-                                v &= ~MXC_OTG_PHYCTRL_OC_POL_BIT;
-                        if (flags & MXC_EHCI_POWER_PINS_ENABLED) {
-                                /* OC/USBPWR is used */
-                                v &= ~MXC_OTG_PHYCTRL_OC_DIS_BIT;
-                        } else {
-                                /* OC/USBPWR is not used */
-                                v |= MXC_OTG_PHYCTRL_OC_DIS_BIT;
-                        }
-                        if (flags & MXC_EHCI_PWR_PIN_ACTIVE_HIGH)
-                                v |= MXC_OTG_PHYCTRL_PWR_POL_BIT;
-                        else
-                                v &= ~MXC_OTG_PHYCTRL_PWR_POL_BIT;
-                        __raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC_OFFSET);
-
-                        v = __raw_readl(usbother_base + MXC_USBCTRL_OFFSET);
-                        if (flags & MXC_EHCI_WAKEUP_ENABLED)
-                                v |= MXC_OTG_UCTRL_OWIE_BIT;/* OTG wakeup enable */
-                        else
-                                v &= ~MXC_OTG_UCTRL_OWIE_BIT;/* OTG wakeup disable */
-                        if (flags & MXC_EHCI_POWER_PINS_ENABLED)
-                                v &= ~MXC_OTG_UCTRL_OPM_BIT;
-                        else
-                                v |= MXC_OTG_UCTRL_OPM_BIT;
-                        __raw_writel(v, usbother_base + MXC_USBCTRL_OFFSET);
-                }
-                break;
-        case 1: /* Host 1 */
-                /*Host ULPI */
-                v = __raw_readl(usbother_base + MXC_USBCTRL_OFFSET);
-                if (flags & MXC_EHCI_WAKEUP_ENABLED) {
-                        /* HOST1 wakeup/ULPI intr enable */
-                        v |= (MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);
-                } else {
-                        /* HOST1 wakeup/ULPI intr disable */
-                        v &= ~(MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);
-                }
-
-                if (flags & MXC_EHCI_POWER_PINS_ENABLED)
-                        v &= ~MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask unused*/
-                else
-                        v |= MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask used*/
-                __raw_writel(v, usbother_base + MXC_USBCTRL_OFFSET);
-
-                v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC_OFFSET);
-                if (flags & MXC_EHCI_OC_PIN_ACTIVE_LOW)
-                        v |= MXC_H1_OC_POL_BIT;
-                else
-                        v &= ~MXC_H1_OC_POL_BIT;
-                if (flags & MXC_EHCI_POWER_PINS_ENABLED)
-                        v &= ~MXC_H1_OC_DIS_BIT; /* OC is used */
-                else
-                        v |= MXC_H1_OC_DIS_BIT; /* OC is not used */
-                __raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC_OFFSET);
-
-                v = __raw_readl(usbotg_base + MXC_USBCMD_OFFSET);
-                if (flags & MXC_EHCI_ITC_NO_THRESHOLD)
-                        /* Interrupt Threshold Control:Immediate (no threshold) */
-                        v &= MXC_UCMD_ITC_NO_THRESHOLD_MASK;
-                __raw_writel(v, usbotg_base + MXC_USBCMD_OFFSET);
-                break;
-        case 2: /* Host 2 ULPI */
-                v = __raw_readl(usbother_base + MXC_USBH2CTRL_OFFSET);
-                if (flags & MXC_EHCI_WAKEUP_ENABLED) {
-                        /* HOST1 wakeup/ULPI intr enable */
-                        v |= (MXC_H2_UCTRL_H2WIE_BIT | MXC_H2_UCTRL_H2UIE_BIT);
-                } else {
-                        /* HOST1 wakeup/ULPI intr disable */
-                        v &= ~(MXC_H2_UCTRL_H2WIE_BIT | MXC_H2_UCTRL_H2UIE_BIT);
-                }
-
-                if (flags & MXC_EHCI_POWER_PINS_ENABLED)
-                        v &= ~MXC_H2_UCTRL_H2PM_BIT; /* HOST2 power mask unused*/
-                else
-                        v |= MXC_H2_UCTRL_H2PM_BIT; /* HOST2 power mask used*/
-                __raw_writel(v, usbother_base + MXC_USBH2CTRL_OFFSET);
-                break;
-        }
-
-error:
-        iounmap(usb_base);
-        return ret;
-}
-
diff --git a/arch/arm/mach-imx/ehci.h b/arch/arm/mach-imx/ehci.h
new file mode 100644
index 000000000000..0e060023db8b
--- /dev/null
+++ b/arch/arm/mach-imx/ehci.h
@@ -0,0 +1,43 @@
+#ifndef __MACH_IMX_EHCI_H
+#define __MACH_IMX_EHCI_H
+
+/* values for portsc field */
+#define MXC_EHCI_PHY_LOW_POWER_SUSPEND  (1 << 23)
+#define MXC_EHCI_FORCE_FS               (1 << 24)
+#define MXC_EHCI_UTMI_8BIT              (0 << 28)
+#define MXC_EHCI_UTMI_16BIT             (1 << 28)
+#define MXC_EHCI_SERIAL                 (1 << 29)
+#define MXC_EHCI_MODE_UTMI              (0 << 30)
+#define MXC_EHCI_MODE_PHILIPS           (1 << 30)
+#define MXC_EHCI_MODE_ULPI              (2 << 30)
+#define MXC_EHCI_MODE_SERIAL            (3 << 30)
+
+/* values for flags field */
+#define MXC_EHCI_INTERFACE_DIFF_UNI     (0 << 0)
+#define MXC_EHCI_INTERFACE_DIFF_BI      (1 << 0)
+#define MXC_EHCI_INTERFACE_SINGLE_UNI   (2 << 0)
+#define MXC_EHCI_INTERFACE_SINGLE_BI    (3 << 0)
+#define MXC_EHCI_INTERFACE_MASK         (0xf)
+
+#define MXC_EHCI_POWER_PINS_ENABLED     (1 << 5)
+#define MXC_EHCI_PWR_PIN_ACTIVE_HIGH    (1 << 6)
+#define MXC_EHCI_OC_PIN_ACTIVE_LOW      (1 << 7)
+#define MXC_EHCI_TTL_ENABLED            (1 << 8)
+
+#define MXC_EHCI_INTERNAL_PHY           (1 << 9)
+#define MXC_EHCI_IPPUE_DOWN             (1 << 10)
+#define MXC_EHCI_IPPUE_UP               (1 << 11)
+#define MXC_EHCI_WAKEUP_ENABLED         (1 << 12)
+#define MXC_EHCI_ITC_NO_THRESHOLD       (1 << 13)
+
+#define MXC_USBCTRL_OFFSET              0
+#define MXC_USB_PHY_CTR_FUNC_OFFSET     0x8
+#define MXC_USB_PHY_CTR_FUNC2_OFFSET    0xc
+#define MXC_USBH2CTRL_OFFSET            0x14
+
+int mx25_initialize_usb_hw(int port, unsigned int flags);
+int mx31_initialize_usb_hw(int port, unsigned int flags);
+int mx35_initialize_usb_hw(int port, unsigned int flags);
+int mx27_initialize_usb_hw(int port, unsigned int flags);
+
+#endif /* __MACH_IMX_EHCI_H */
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index 586e0171a652..82ea74e68482 100644
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -27,13 +27,14 @@ static void __iomem *gpc_base;
 static u32 gpc_wake_irqs[IMR_NUM];
 static u32 gpc_saved_imrs[IMR_NUM];
 
-void imx_gpc_pre_suspend(void)
+void imx_gpc_pre_suspend(bool arm_power_off)
 {
         void __iomem *reg_imr1 = gpc_base + GPC_IMR1;
         int i;
 
         /* Tell GPC to power off ARM core when suspend */
-        writel_relaxed(0x1, gpc_base + GPC_PGC_CPU_PDN);
+        if (arm_power_off)
+                writel_relaxed(0x1, gpc_base + GPC_PGC_CPU_PDN);
 
         for (i = 0; i < IMR_NUM; i++) {
                 gpc_saved_imrs[i] = readl_relaxed(reg_imr1 + i * 4);
diff --git a/arch/arm/mach-imx/hardware.h b/arch/arm/mach-imx/hardware.h
index abf43bb47eca..66b2b564c463 100644
--- a/arch/arm/mach-imx/hardware.h
+++ b/arch/arm/mach-imx/hardware.h
@@ -105,8 +105,6 @@
 
 #include "mxc.h"
 
-#include "mx51.h"
-#include "mx53.h"
 #include "mx3x.h"
 #include "mx31.h"
 #include "mx35.h"
diff --git a/arch/arm/mach-imx/imx25-dt.c b/arch/arm/mach-imx/imx25-dt.c
index 42a65e067443..cf8032bae277 100644
--- a/arch/arm/mach-imx/imx25-dt.c
+++ b/arch/arm/mach-imx/imx25-dt.c
@@ -29,16 +29,10 @@ static const char * const imx25_dt_board_compat[] __initconst = {
         NULL
 };
 
-static void __init imx25_timer_init(void)
-{
-        mx25_clocks_init_dt();
-}
-
 DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)")
         .map_io         = mx25_map_io,
         .init_early     = imx25_init_early,
         .init_irq       = mx25_init_irq,
-        .init_time      = imx25_timer_init,
         .init_machine   = imx25_dt_init,
         .dt_compat      = imx25_dt_board_compat,
         .restart        = mxc_restart,
diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c
index 17bd4058133d..080e66c6a1d0 100644
--- a/arch/arm/mach-imx/imx27-dt.c
+++ b/arch/arm/mach-imx/imx27-dt.c
@@ -34,16 +34,10 @@ static const char * const imx27_dt_board_compat[] __initconst = {
         NULL
 };
 
-static void __init imx27_timer_init(void)
-{
-        mx27_clocks_init_dt();
-}
-
 DT_MACHINE_START(IMX27_DT, "Freescale i.MX27 (Device Tree Support)")
         .map_io         = mx27_map_io,
         .init_early     = imx27_init_early,
         .init_irq       = mx27_init_irq,
-        .init_time      = imx27_timer_init,
         .init_machine   = imx27_dt_init,
         .dt_compat      = imx27_dt_board_compat,
         .restart        = mxc_restart,
diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c
index 581f4d6c9b8a..418dbc82adc4 100644
--- a/arch/arm/mach-imx/imx31-dt.c
+++ b/arch/arm/mach-imx/imx31-dt.c
@@ -25,7 +25,7 @@ static void __init imx31_dt_init(void)
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-static const char *imx31_dt_board_compat[] __initconst = {
+static const char * const imx31_dt_board_compat[] __initconst = {
         "fsl,imx31",
         NULL
 };
diff --git a/arch/arm/mach-imx/imx35-dt.c b/arch/arm/mach-imx/imx35-dt.c
index a62854c59240..584fbe105579 100644
--- a/arch/arm/mach-imx/imx35-dt.c
+++ b/arch/arm/mach-imx/imx35-dt.c
@@ -34,7 +34,7 @@ static void __init imx35_irq_init(void)
         mx35_init_irq();
 }
 
-static const char *imx35_dt_board_compat[] __initconst = {
+static const char * const imx35_dt_board_compat[] __initconst = {
         "fsl,imx35",
         NULL
 };
diff --git a/arch/arm/mach-imx/iomux-mx51.h b/arch/arm/mach-imx/iomux-mx51.h
deleted file mode 100644
index 75bbcc4aa2d2..000000000000
--- a/arch/arm/mach-imx/iomux-mx51.h
+++ /dev/null
@@ -1,827 +0,0 @@
-/*
- * Copyright (C) 2009-2010 Amit Kucheria <amit.kucheria@canonical.com>
- * Copyright (C) 2010 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
- */
-
-#ifndef __MACH_IOMUX_MX51_H__
-#define __MACH_IOMUX_MX51_H__
-
-#include "iomux-v3.h"
-#define __NA_   0x000
-
-
-/* Pad control groupings */
-#define MX51_UART_PAD_CTRL      (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_DSE_HIGH | \
-                                PAD_CTL_HYS | PAD_CTL_SRE_FAST)
-#define MX51_I2C_PAD_CTRL       (PAD_CTL_SRE_FAST | PAD_CTL_ODE | \
-                                PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP | \
-                                PAD_CTL_HYS)
-#define MX51_ESDHC_PAD_CTRL     (PAD_CTL_SRE_FAST | PAD_CTL_ODE | \
-                                PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP | \
-                                PAD_CTL_HYS)
-#define MX51_USBH1_PAD_CTRL     (PAD_CTL_PKE | PAD_CTL_SRE_FAST | \
-                                PAD_CTL_DSE_HIGH | PAD_CTL_PUS_100K_UP | \
-                                PAD_CTL_HYS | PAD_CTL_PUE)
-#define MX51_ECSPI_PAD_CTRL     (PAD_CTL_PKE | PAD_CTL_HYS | \
-                                PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST)
-#define MX51_SDHCI_PAD_CTRL     (PAD_CTL_PKE | PAD_CTL_DSE_HIGH | \
-                                PAD_CTL_PUS_47K_UP | PAD_CTL_PUE | \
-                                PAD_CTL_SRE_FAST | PAD_CTL_DVS)
-#define MX51_GPIO_PAD_CTRL      (PAD_CTL_DSE_HIGH | PAD_CTL_PKE | PAD_CTL_SRE_FAST)
-
-#define MX51_PAD_CTRL_2         (PAD_CTL_PKE | PAD_CTL_HYS)
-#define MX51_PAD_CTRL_3         (PAD_CTL_PKE | PAD_CTL_PUS_100K_UP)
-#define MX51_PAD_CTRL_4         (PAD_CTL_PKE | PAD_CTL_DVS | PAD_CTL_HYS)
-#define MX51_PAD_CTRL_5         (PAD_CTL_DVS | PAD_CTL_DSE_HIGH)
-
-/*
- * The naming convention for the pad modes is MX51_PAD_<padname>__<padmode>
- * If <padname> or <padmode> refers to a GPIO, it is named GPIO<unit>_<num>
- * See also iomux-v3.h
- */
-
-/* Raw pin modes without pad control */
-/*                                                        PAD    MUX ALT INPSE PATH PADCTRL */
-
-/* The same pins as above but with the default pad control values applied */
-#define MX51_PAD_EIM_D16__AUD4_RXFS             IOMUX_PAD(0x3f0, 0x05c, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D16__AUD5_TXD              IOMUX_PAD(0x3f0, 0x05c, 7, 0x8d8, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D16__EIM_D16               IOMUX_PAD(0x3f0, 0x05c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D16__GPIO2_0               IOMUX_PAD(0x3f0, 0x05c, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D16__I2C1_SDA              IOMUX_PAD(0x3f0, 0x05c, 0x14, 0x9b4, 0, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_EIM_D16__UART2_CTS             IOMUX_PAD(0x3f0, 0x05c, 3, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D16__USBH2_DATA0           IOMUX_PAD(0x3f0, 0x05c, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D17__AUD5_RXD              IOMUX_PAD(0x3f4, 0x060, 7, 0x8d4, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D17__EIM_D17               IOMUX_PAD(0x3f4, 0x060, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D17__GPIO2_1               IOMUX_PAD(0x3f4, 0x060, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D17__UART2_RXD             IOMUX_PAD(0x3f4, 0x060, 3, 0x9ec, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D17__UART3_CTS             IOMUX_PAD(0x3f4, 0x060, 4, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D17__USBH2_DATA1           IOMUX_PAD(0x3f4, 0x060, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D18__AUD5_TXC              IOMUX_PAD(0x3f8, 0x064, 7, 0x8e4, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D18__EIM_D18               IOMUX_PAD(0x3f8, 0x064, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D18__GPIO2_2               IOMUX_PAD(0x3f8, 0x064, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D18__UART2_TXD             IOMUX_PAD(0x3f8, 0x064, 3, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D18__UART3_RTS             IOMUX_PAD(0x3f8, 0x064, 4, 0x9f0, 1, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D18__USBH2_DATA2           IOMUX_PAD(0x3f8, 0x064, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D19__AUD4_RXC              IOMUX_PAD(0x3fc, 0x068, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D19__AUD5_TXFS             IOMUX_PAD(0x3fc, 0x068, 7, 0x8e8, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D19__EIM_D19               IOMUX_PAD(0x3fc, 0x068, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D19__GPIO2_3               IOMUX_PAD(0x3fc, 0x068, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D19__I2C1_SCL              IOMUX_PAD(0x3fc, 0x068, 0x14, 0x9b0, 0, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_EIM_D19__UART2_RTS             IOMUX_PAD(0x3fc, 0x068, 3, 0x9e8, 1, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D19__USBH2_DATA3           IOMUX_PAD(0x3fc, 0x068, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D20__AUD4_TXD              IOMUX_PAD(0x400, 0x06c, 5, 0x8c8, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D20__EIM_D20               IOMUX_PAD(0x400, 0x06c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D20__GPIO2_4               IOMUX_PAD(0x400, 0x06c, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D20__SRTC_ALARM_DEB        IOMUX_PAD(0x400, 0x06c, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D20__USBH2_DATA4           IOMUX_PAD(0x400, 0x06c, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D21__AUD4_RXD              IOMUX_PAD(0x404, 0x070, 5, 0x8c4, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D21__EIM_D21               IOMUX_PAD(0x404, 0x070, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D21__GPIO2_5               IOMUX_PAD(0x404, 0x070, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D21__SRTC_ALARM_DEB        IOMUX_PAD(0x404, 0x070, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D21__USBH2_DATA5           IOMUX_PAD(0x404, 0x070, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D22__AUD4_TXC              IOMUX_PAD(0x408, 0x074, 5, 0x8cc, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D22__EIM_D22               IOMUX_PAD(0x408, 0x074, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D22__GPIO2_6               IOMUX_PAD(0x408, 0x074, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D22__USBH2_DATA6           IOMUX_PAD(0x408, 0x074, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D23__AUD4_TXFS             IOMUX_PAD(0x40c, 0x078, 5, 0x8d0, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D23__EIM_D23               IOMUX_PAD(0x40c, 0x078, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D23__GPIO2_7               IOMUX_PAD(0x40c, 0x078, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D23__SPDIF_OUT1            IOMUX_PAD(0x40c, 0x078, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D23__USBH2_DATA7           IOMUX_PAD(0x40c, 0x078, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D24__AUD6_RXFS             IOMUX_PAD(0x410, 0x07c, 5, 0x8f8, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D24__EIM_D24               IOMUX_PAD(0x410, 0x07c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D24__GPIO2_8               IOMUX_PAD(0x410, 0x07c, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D24__I2C2_SDA              IOMUX_PAD(0x410, 0x07c, 0x14, 0x9bc, 0, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_EIM_D24__UART3_CTS             IOMUX_PAD(0x410, 0x07c, 3, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D24__USBOTG_DATA0          IOMUX_PAD(0x410, 0x07c, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D25__EIM_D25               IOMUX_PAD(0x414, 0x080, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D25__KEY_COL6              IOMUX_PAD(0x414, 0x080, 1, 0x9c8, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D25__UART2_CTS             IOMUX_PAD(0x414, 0x080, 4, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D25__UART3_RXD             IOMUX_PAD(0x414, 0x080, 3, 0x9f4, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D25__USBOTG_DATA1          IOMUX_PAD(0x414, 0x080, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D25__GPT_CMPOUT1           IOMUX_PAD(0x414, 0x080, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D26__EIM_D26               IOMUX_PAD(0x418, 0x084, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D26__KEY_COL7              IOMUX_PAD(0x418, 0x084, 1, 0x9cc, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D26__UART2_RTS             IOMUX_PAD(0x418, 0x084, 4, 0x9e8, 3, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D26__UART3_TXD             IOMUX_PAD(0x418, 0x084, 3, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D26__USBOTG_DATA2          IOMUX_PAD(0x418, 0x084, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D26__GPT_CMPOUT2           IOMUX_PAD(0x418, 0x084, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D27__AUD6_RXC              IOMUX_PAD(0x41c, 0x088, 5, 0x8f4, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D27__EIM_D27               IOMUX_PAD(0x41c, 0x088, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D27__GPIO2_9               IOMUX_PAD(0x41c, 0x088, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_D27__I2C2_SCL              IOMUX_PAD(0x41c, 0x088, 0x14, 0x9b8, 0, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_EIM_D27__UART3_RTS             IOMUX_PAD(0x41c, 0x088, 3, 0x9f0, 3, MX51_UART_PAD_CTRL)
-#define MX51_PAD_EIM_D27__USBOTG_DATA3          IOMUX_PAD(0x41c, 0x088, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D28__AUD6_TXD              IOMUX_PAD(0x420, 0x08c, 5, 0x8f0, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D28__EIM_D28               IOMUX_PAD(0x420, 0x08c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D28__KEY_ROW4              IOMUX_PAD(0x420, 0x08c, 1, 0x9d0, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D28__USBOTG_DATA4          IOMUX_PAD(0x420, 0x08c, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D29__AUD6_RXD              IOMUX_PAD(0x424, 0x090, 5, 0x8ec, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D29__EIM_D29               IOMUX_PAD(0x424, 0x090, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D29__KEY_ROW5              IOMUX_PAD(0x424, 0x090, 1, 0x9d4, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D29__USBOTG_DATA5          IOMUX_PAD(0x424, 0x090, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D30__AUD6_TXC              IOMUX_PAD(0x428, 0x094, 5, 0x8fc, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D30__EIM_D30               IOMUX_PAD(0x428, 0x094, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D30__KEY_ROW6              IOMUX_PAD(0x428, 0x094, 1, 0x9d8, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D30__USBOTG_DATA6          IOMUX_PAD(0x428, 0x094, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D31__AUD6_TXFS             IOMUX_PAD(0x42c, 0x098, 5, 0x900, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D31__EIM_D31               IOMUX_PAD(0x42c, 0x098, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D31__KEY_ROW7              IOMUX_PAD(0x42c, 0x098, 1, 0x9dc, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_D31__USBOTG_DATA7          IOMUX_PAD(0x42c, 0x098, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A16__EIM_A16               IOMUX_PAD(0x430, 0x09c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A16__GPIO2_10              IOMUX_PAD(0x430, 0x09c, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A16__OSC_FREQ_SEL0         IOMUX_PAD(0x430, 0x09c, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A17__EIM_A17               IOMUX_PAD(0x434, 0x0a0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A17__GPIO2_11              IOMUX_PAD(0x434, 0x0a0, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A17__OSC_FREQ_SEL1         IOMUX_PAD(0x434, 0x0a0, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A18__BOOT_LPB0             IOMUX_PAD(0x438, 0x0a4, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A18__EIM_A18               IOMUX_PAD(0x438, 0x0a4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A18__GPIO2_12              IOMUX_PAD(0x438, 0x0a4, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A19__BOOT_LPB1             IOMUX_PAD(0x43c, 0x0a8, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A19__EIM_A19               IOMUX_PAD(0x43c, 0x0a8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A19__GPIO2_13              IOMUX_PAD(0x43c, 0x0a8, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A20__BOOT_UART_SRC0        IOMUX_PAD(0x440, 0x0ac, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A20__EIM_A20               IOMUX_PAD(0x440, 0x0ac, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A20__GPIO2_14              IOMUX_PAD(0x440, 0x0ac, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A21__BOOT_UART_SRC1        IOMUX_PAD(0x444, 0x0b0, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A21__EIM_A21               IOMUX_PAD(0x444, 0x0b0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A21__GPIO2_15              IOMUX_PAD(0x444, 0x0b0, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A22__EIM_A22               IOMUX_PAD(0x448, 0x0b4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A22__GPIO2_16              IOMUX_PAD(0x448, 0x0b4, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A23__BOOT_HPN_EN           IOMUX_PAD(0x44c, 0x0b8, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A23__EIM_A23               IOMUX_PAD(0x44c, 0x0b8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A23__GPIO2_17              IOMUX_PAD(0x44c, 0x0b8, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A24__EIM_A24               IOMUX_PAD(0x450, 0x0bc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A24__GPIO2_18              IOMUX_PAD(0x450, 0x0bc, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A24__USBH2_CLK             IOMUX_PAD(0x450, 0x0bc, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A25__DISP1_PIN4            IOMUX_PAD(0x454, 0x0c0, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A25__EIM_A25               IOMUX_PAD(0x454, 0x0c0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A25__GPIO2_19              IOMUX_PAD(0x454, 0x0c0, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A25__USBH2_DIR             IOMUX_PAD(0x454, 0x0c0, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A26__CSI1_DATA_EN          IOMUX_PAD(0x458, 0x0c4, 5, 0x9a0, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A26__DISP2_EXT_CLK         IOMUX_PAD(0x458, 0x0c4, 6, 0x908, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A26__EIM_A26               IOMUX_PAD(0x458, 0x0c4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A26__GPIO2_20              IOMUX_PAD(0x458, 0x0c4, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A26__USBH2_STP             IOMUX_PAD(0x458, 0x0c4, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A27__CSI2_DATA_EN          IOMUX_PAD(0x45c, 0x0c8, 5, 0x99c, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A27__DISP1_PIN1            IOMUX_PAD(0x45c, 0x0c8, 6, 0x9a4, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A27__EIM_A27               IOMUX_PAD(0x45c, 0x0c8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A27__GPIO2_21              IOMUX_PAD(0x45c, 0x0c8, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_A27__USBH2_NXT             IOMUX_PAD(0x45c, 0x0c8, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB0__EIM_EB0               IOMUX_PAD(0x460, 0x0cc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB1__EIM_EB1               IOMUX_PAD(0x464, 0x0d0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB2__AUD5_RXFS             IOMUX_PAD(0x468, 0x0d4, 6, 0x8e0, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB2__CSI1_D2               IOMUX_PAD(0x468, 0x0d4, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB2__EIM_EB2               IOMUX_PAD(0x468, 0x0d4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB2__FEC_MDIO              (IOMUX_PAD(0x468, 0x0d4, 3, 0x954, 0, 0) | \
-                MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP | PAD_CTL_PKE | PAD_CTL_SRE_FAST | \
-                PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS))
-#define MX51_PAD_EIM_EB2__GPIO2_22              IOMUX_PAD(0x468, 0x0d4, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_EB2__GPT_CMPOUT1           IOMUX_PAD(0x468, 0x0d4, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB3__AUD5_RXC              IOMUX_PAD(0x46c, 0x0d8, 6, 0x8dc, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB3__CSI1_D3               IOMUX_PAD(0x46c, 0x0d8, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB3__EIM_EB3               IOMUX_PAD(0x46c, 0x0d8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB3__FEC_RDATA1            IOMUX_PAD(0x46c, 0x0d8, 3, 0x95c, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_EB3__GPIO2_23              IOMUX_PAD(0x46c, 0x0d8, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_EB3__GPT_CMPOUT2           IOMUX_PAD(0x46c, 0x0d8, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_OE__EIM_OE                 IOMUX_PAD(0x470, 0x0dc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_OE__GPIO2_24               IOMUX_PAD(0x470, 0x0dc, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_CS0__EIM_CS0               IOMUX_PAD(0x474, 0x0e0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS0__GPIO2_25              IOMUX_PAD(0x474, 0x0e0, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_CS1__EIM_CS1               IOMUX_PAD(0x478, 0x0e4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS1__GPIO2_26              IOMUX_PAD(0x478, 0x0e4, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_CS2__AUD5_TXD              IOMUX_PAD(0x47c, 0x0e8, 6, 0x8d8, 1, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS2__CSI1_D4               IOMUX_PAD(0x47c, 0x0e8, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS2__EIM_CS2               IOMUX_PAD(0x47c, 0x0e8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS2__FEC_RDATA2            IOMUX_PAD(0x47c, 0x0e8, 3, 0x960, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS2__GPIO2_27              IOMUX_PAD(0x47c, 0x0e8, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_CS2__USBOTG_STP            IOMUX_PAD(0x47c, 0x0e8, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS3__AUD5_RXD              IOMUX_PAD(0x480, 0x0ec, 6, 0x8d4, 1, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS3__CSI1_D5               IOMUX_PAD(0x480, 0x0ec, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS3__EIM_CS3               IOMUX_PAD(0x480, 0x0ec, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS3__FEC_RDATA3            IOMUX_PAD(0x480, 0x0ec, 3, 0x964, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS3__GPIO2_28              IOMUX_PAD(0x480, 0x0ec, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_CS3__USBOTG_NXT            IOMUX_PAD(0x480, 0x0ec, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS4__AUD5_TXC              IOMUX_PAD(0x484, 0x0f0, 6, 0x8e4, 1, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS4__CSI1_D6               IOMUX_PAD(0x484, 0x0f0, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS4__EIM_CS4               IOMUX_PAD(0x484, 0x0f0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS4__FEC_RX_ER             IOMUX_PAD(0x484, 0x0f0, 3, 0x970, 0, MX51_PAD_CTRL_2)
-#define MX51_PAD_EIM_CS4__GPIO2_29              IOMUX_PAD(0x484, 0x0f0, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_CS4__USBOTG_CLK            IOMUX_PAD(0x484, 0x0f0, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS5__AUD5_TXFS             IOMUX_PAD(0x488, 0x0f4, 6, 0x8e8, 1, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS5__CSI1_D7               IOMUX_PAD(0x488, 0x0f4, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS5__DISP1_EXT_CLK         IOMUX_PAD(0x488, 0x0f4, 4, 0x904, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS5__EIM_CS5               IOMUX_PAD(0x488, 0x0f4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CS5__FEC_CRS               IOMUX_PAD(0x488, 0x0f4, 3, 0x950, 0, MX51_PAD_CTRL_2)
-#define MX51_PAD_EIM_CS5__GPIO2_30              IOMUX_PAD(0x488, 0x0f4, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_CS5__USBOTG_DIR            IOMUX_PAD(0x488, 0x0f4, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DTACK__EIM_DTACK           IOMUX_PAD(0x48c, 0x0f8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DTACK__GPIO2_31            IOMUX_PAD(0x48c, 0x0f8, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_LBA__EIM_LBA               IOMUX_PAD(0x494, 0x0fc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_LBA__GPIO3_1               IOMUX_PAD(0x494, 0x0fc, 1, 0x978, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_EIM_CRE__EIM_CRE               IOMUX_PAD(0x4a0, 0x100, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_CRE__GPIO3_2               IOMUX_PAD(0x4a0, 0x100, 1, 0x97c, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DRAM_CS1__DRAM_CS1             IOMUX_PAD(0x4d0, 0x104, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DRAM_CS1__CCM_CLKO             IOMUX_PAD(0x4d0, 0x104, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_WE_B__GPIO3_3            IOMUX_PAD(0x4e4, 0x108, 3, 0x980, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_WE_B__NANDF_WE_B         IOMUX_PAD(0x4e4, 0x108, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_WE_B__PATA_DIOW          IOMUX_PAD(0x4e4, 0x108, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_WE_B__SD3_DATA0          IOMUX_PAD(0x4e4, 0x108, 2, 0x93c, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_RE_B__GPIO3_4            IOMUX_PAD(0x4e8, 0x10c, 3, 0x984, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_RE_B__NANDF_RE_B         IOMUX_PAD(0x4e8, 0x10c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RE_B__PATA_DIOR          IOMUX_PAD(0x4e8, 0x10c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RE_B__SD3_DATA1          IOMUX_PAD(0x4e8, 0x10c, 2, 0x940, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_ALE__GPIO3_5             IOMUX_PAD(0x4ec, 0x110, 3, 0x988, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_ALE__NANDF_ALE           IOMUX_PAD(0x4ec, 0x110, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_ALE__PATA_BUFFER_EN      IOMUX_PAD(0x4ec, 0x110, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CLE__GPIO3_6             IOMUX_PAD(0x4f0, 0x114, 3, 0x98c, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_CLE__NANDF_CLE           IOMUX_PAD(0x4f0, 0x114, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CLE__PATA_RESET_B        IOMUX_PAD(0x4f0, 0x114, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_WP_B__GPIO3_7            IOMUX_PAD(0x4f4, 0x118, 3, 0x990, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_WP_B__NANDF_WP_B         IOMUX_PAD(0x4f4, 0x118, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_WP_B__PATA_DMACK         IOMUX_PAD(0x4f4, 0x118, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_WP_B__SD3_DATA2          IOMUX_PAD(0x4f4, 0x118, 2, 0x944, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_RB0__ECSPI2_SS1          IOMUX_PAD(0x4f8, 0x11c, 5, 0x930, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_RB0__GPIO3_8             IOMUX_PAD(0x4f8, 0x11c, 3, 0x994, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB0__NANDF_RB0           IOMUX_PAD(0x4f8, 0x11c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB0__PATA_DMARQ          IOMUX_PAD(0x4f8, 0x11c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB0__SD3_DATA3           IOMUX_PAD(0x4f8, 0x11c, 2, 0x948, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_RB1__CSPI_MOSI           IOMUX_PAD(0x4fc, 0x120, 6, 0x91c, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_RB1__ECSPI2_RDY          IOMUX_PAD(0x4fc, 0x120, 2, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_RB1__GPIO3_9             IOMUX_PAD(0x4fc, 0x120, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB1__NANDF_RB1           IOMUX_PAD(0x4fc, 0x120, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB1__PATA_IORDY          IOMUX_PAD(0x4fc, 0x120, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB1__GPT_CMPOUT2         IOMUX_PAD(0x4fc, 0x120, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB1__SD4_CMD             IOMUX_PAD(0x4fc, 0x120, 0x15, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_RB2__DISP2_WAIT          IOMUX_PAD(0x500, 0x124, 5, 0x9a8, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB2__ECSPI2_SCLK         IOMUX_PAD(0x500, 0x124, 2, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_RB2__FEC_COL             IOMUX_PAD(0x500, 0x124, 1, 0x94c, 0, MX51_PAD_CTRL_2)
-#define MX51_PAD_NANDF_RB2__GPIO3_10            IOMUX_PAD(0x500, 0x124, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB2__NANDF_RB2           IOMUX_PAD(0x500, 0x124, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB2__GPT_CMPOUT3         IOMUX_PAD(0x500, 0x124, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB2__USBH3_H3_DP         IOMUX_PAD(0x500, 0x124, 0x17, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB2__USBH3_NXT           IOMUX_PAD(0x500, 0x124, 6, 0xa20, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB3__DISP1_WAIT          IOMUX_PAD(0x504, 0x128, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB3__ECSPI2_MISO         IOMUX_PAD(0x504, 0x128, 2, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_RB3__FEC_RX_CLK          IOMUX_PAD(0x504, 0x128, 1, 0x968, 0, MX51_PAD_CTRL_2)
-#define MX51_PAD_NANDF_RB3__GPIO3_11            IOMUX_PAD(0x504, 0x128, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB3__NANDF_RB3           IOMUX_PAD(0x504, 0x128, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB3__USBH3_CLK           IOMUX_PAD(0x504, 0x128, 6, 0x9f8, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RB3__USBH3_H3_DM         IOMUX_PAD(0x504, 0x128, 0x17, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO_NAND__GPIO_NAND           IOMUX_PAD(0x514, 0x12c, 0, 0x998, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO_NAND__PATA_INTRQ          IOMUX_PAD(0x514, 0x12c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS0__GPIO3_16            IOMUX_PAD(0x518, 0x130, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS0__NANDF_CS0           IOMUX_PAD(0x518, 0x130, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS1__GPIO3_17            IOMUX_PAD(0x51c, 0x134, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS1__NANDF_CS1           IOMUX_PAD(0x51c, 0x134, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS2__CSPI_SCLK           IOMUX_PAD(0x520, 0x138, 6, 0x914, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_CS2__FEC_TX_ER           IOMUX_PAD(0x520, 0x138, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_NANDF_CS2__GPIO3_18            IOMUX_PAD(0x520, 0x138, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS2__NANDF_CS2           IOMUX_PAD(0x520, 0x138, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS2__PATA_CS_0           IOMUX_PAD(0x520, 0x138, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS2__SD4_CLK             IOMUX_PAD(0x520, 0x138, 5, __NA_, 0, MX51_SDHCI_PAD_CTRL | PAD_CTL_HYS)
-#define MX51_PAD_NANDF_CS2__USBH3_H1_DP         IOMUX_PAD(0x520, 0x138, 0x17, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS3__FEC_MDC             IOMUX_PAD(0x524, 0x13c, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_NANDF_CS3__GPIO3_19            IOMUX_PAD(0x524, 0x13c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS3__NANDF_CS3           IOMUX_PAD(0x524, 0x13c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS3__PATA_CS_1           IOMUX_PAD(0x524, 0x13c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS3__SD4_DAT0            IOMUX_PAD(0x524, 0x13c, 5, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_CS3__USBH3_H1_DM         IOMUX_PAD(0x524, 0x13c, 0x17, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS4__FEC_TDATA1          IOMUX_PAD(0x528, 0x140, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_NANDF_CS4__GPIO3_20            IOMUX_PAD(0x528, 0x140, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS4__NANDF_CS4           IOMUX_PAD(0x528, 0x140, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS4__PATA_DA_0           IOMUX_PAD(0x528, 0x140, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS4__SD4_DAT1            IOMUX_PAD(0x528, 0x140, 5, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_CS4__USBH3_STP           IOMUX_PAD(0x528, 0x140, 7, 0xa24, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS5__FEC_TDATA2          IOMUX_PAD(0x52c, 0x144, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_NANDF_CS5__GPIO3_21            IOMUX_PAD(0x52c, 0x144, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS5__NANDF_CS5           IOMUX_PAD(0x52c, 0x144, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS5__PATA_DA_1           IOMUX_PAD(0x52c, 0x144, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS5__SD4_DAT2            IOMUX_PAD(0x52c, 0x144, 5, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_CS5__USBH3_DIR           IOMUX_PAD(0x52c, 0x144, 7, 0xa1c, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS6__CSPI_SS3            IOMUX_PAD(0x530, 0x148, 7, 0x928, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_CS6__FEC_TDATA3          IOMUX_PAD(0x530, 0x148, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_NANDF_CS6__GPIO3_22            IOMUX_PAD(0x530, 0x148, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS6__NANDF_CS6           IOMUX_PAD(0x530, 0x148, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS6__PATA_DA_2           IOMUX_PAD(0x530, 0x148, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS6__SD4_DAT3            IOMUX_PAD(0x530, 0x148, 5, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_CS7__FEC_TX_EN           IOMUX_PAD(0x534, 0x14c, 1, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_NANDF_CS7__GPIO3_23            IOMUX_PAD(0x534, 0x14c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS7__NANDF_CS7           IOMUX_PAD(0x534, 0x14c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_CS7__SD3_CLK             IOMUX_PAD(0x534, 0x14c, 5, __NA_, 0, MX51_SDHCI_PAD_CTRL | PAD_CTL_HYS)
-#define MX51_PAD_NANDF_RDY_INT__ECSPI2_SS0      IOMUX_PAD(0x538, 0x150, 2, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK      IOMUX_PAD(0x538, 0x150, 1, 0x974, 0, MX51_PAD_CTRL_4)
-#define MX51_PAD_NANDF_RDY_INT__GPIO3_24        IOMUX_PAD(0x538, 0x150, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_RDY_INT__NANDF_RDY_INT   IOMUX_PAD(0x538, 0x150, 0, 0x938, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_RDY_INT__SD3_CMD         IOMUX_PAD(0x538, 0x150, 0x15, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_NANDF_D15__ECSPI2_MOSI         IOMUX_PAD(0x53c, 0x154, 2, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_D15__GPIO3_25            IOMUX_PAD(0x53c, 0x154, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D15__NANDF_D15           IOMUX_PAD(0x53c, 0x154, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D15__PATA_DATA15         IOMUX_PAD(0x53c, 0x154, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D15__SD3_DAT7            IOMUX_PAD(0x53c, 0x154, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D14__ECSPI2_SS3          IOMUX_PAD(0x540, 0x158, 2, 0x934, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_D14__GPIO3_26            IOMUX_PAD(0x540, 0x158, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D14__NANDF_D14           IOMUX_PAD(0x540, 0x158, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D14__PATA_DATA14         IOMUX_PAD(0x540, 0x158, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D14__SD3_DAT6            IOMUX_PAD(0x540, 0x158, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D13__ECSPI2_SS2          IOMUX_PAD(0x544, 0x15c, 2, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_D13__GPIO3_27            IOMUX_PAD(0x544, 0x15c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D13__NANDF_D13           IOMUX_PAD(0x544, 0x15c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D13__PATA_DATA13         IOMUX_PAD(0x544, 0x15c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D13__SD3_DAT5            IOMUX_PAD(0x544, 0x15c, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D12__ECSPI2_SS1          IOMUX_PAD(0x548, 0x160, 2, 0x930, 1, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_NANDF_D12__GPIO3_28            IOMUX_PAD(0x548, 0x160, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D12__NANDF_D12           IOMUX_PAD(0x548, 0x160, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D12__PATA_DATA12         IOMUX_PAD(0x548, 0x160, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D12__SD3_DAT4            IOMUX_PAD(0x548, 0x160, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D11__FEC_RX_DV           IOMUX_PAD(0x54c, 0x164, 2, 0x96c, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D11__GPIO3_29            IOMUX_PAD(0x54c, 0x164, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D11__NANDF_D11           IOMUX_PAD(0x54c, 0x164, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D11__PATA_DATA11         IOMUX_PAD(0x54c, 0x164, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D11__SD3_DATA3           IOMUX_PAD(0x54c, 0x164, 5, 0x948, 1, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D10__GPIO3_30            IOMUX_PAD(0x550, 0x168, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D10__NANDF_D10           IOMUX_PAD(0x550, 0x168, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D10__PATA_DATA10         IOMUX_PAD(0x550, 0x168, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D10__SD3_DATA2           IOMUX_PAD(0x550, 0x168, 5, 0x944, 1, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D9__FEC_RDATA0           IOMUX_PAD(0x554, 0x16c, 0x12, 0x958, 0, MX51_PAD_CTRL_4)
-#define MX51_PAD_NANDF_D9__GPIO3_31             IOMUX_PAD(0x554, 0x16c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D9__NANDF_D9             IOMUX_PAD(0x554, 0x16c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D9__PATA_DATA9           IOMUX_PAD(0x554, 0x16c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D9__SD3_DATA1            IOMUX_PAD(0x554, 0x16c, 5, 0x940, 1, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D8__FEC_TDATA0           IOMUX_PAD(0x558, 0x170, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_NANDF_D8__GPIO4_0              IOMUX_PAD(0x558, 0x170, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D8__NANDF_D8             IOMUX_PAD(0x558, 0x170, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D8__PATA_DATA8           IOMUX_PAD(0x558, 0x170, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D8__SD3_DATA0            IOMUX_PAD(0x558, 0x170, 5, 0x93c, 1, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D7__GPIO4_1              IOMUX_PAD(0x55c, 0x174, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D7__NANDF_D7             IOMUX_PAD(0x55c, 0x174, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D7__PATA_DATA7           IOMUX_PAD(0x55c, 0x174, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D7__USBH3_DATA0          IOMUX_PAD(0x55c, 0x174, 5, 0x9fc, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D6__GPIO4_2              IOMUX_PAD(0x560, 0x178, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D6__NANDF_D6             IOMUX_PAD(0x560, 0x178, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D6__PATA_DATA6           IOMUX_PAD(0x560, 0x178, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D6__SD4_LCTL             IOMUX_PAD(0x560, 0x178, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D6__USBH3_DATA1          IOMUX_PAD(0x560, 0x178, 5, 0xa00, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D5__GPIO4_3              IOMUX_PAD(0x564, 0x17c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D5__NANDF_D5             IOMUX_PAD(0x564, 0x17c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D5__PATA_DATA5           IOMUX_PAD(0x564, 0x17c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D5__SD4_WP               IOMUX_PAD(0x564, 0x17c, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D5__USBH3_DATA2          IOMUX_PAD(0x564, 0x17c, 5, 0xa04, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D4__GPIO4_4              IOMUX_PAD(0x568, 0x180, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D4__NANDF_D4             IOMUX_PAD(0x568, 0x180, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D4__PATA_DATA4           IOMUX_PAD(0x568, 0x180, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D4__SD4_CD               IOMUX_PAD(0x568, 0x180, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D4__USBH3_DATA3          IOMUX_PAD(0x568, 0x180, 5, 0xa08, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D3__GPIO4_5              IOMUX_PAD(0x56c, 0x184, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D3__NANDF_D3             IOMUX_PAD(0x56c, 0x184, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D3__PATA_DATA3           IOMUX_PAD(0x56c, 0x184, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D3__SD4_DAT4             IOMUX_PAD(0x56c, 0x184, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D3__USBH3_DATA4          IOMUX_PAD(0x56c, 0x184, 5, 0xa0c, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D2__GPIO4_6              IOMUX_PAD(0x570, 0x188, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D2__NANDF_D2             IOMUX_PAD(0x570, 0x188, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D2__PATA_DATA2           IOMUX_PAD(0x570, 0x188, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D2__SD4_DAT5             IOMUX_PAD(0x570, 0x188, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D2__USBH3_DATA5          IOMUX_PAD(0x570, 0x188, 5, 0xa10, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D1__GPIO4_7              IOMUX_PAD(0x574, 0x18c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D1__NANDF_D1             IOMUX_PAD(0x574, 0x18c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D1__PATA_DATA1           IOMUX_PAD(0x574, 0x18c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D1__SD4_DAT6             IOMUX_PAD(0x574, 0x18c, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D1__USBH3_DATA6          IOMUX_PAD(0x574, 0x18c, 5, 0xa14, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D0__GPIO4_8              IOMUX_PAD(0x578, 0x190, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_NANDF_D0__NANDF_D0             IOMUX_PAD(0x578, 0x190, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D0__PATA_DATA0           IOMUX_PAD(0x578, 0x190, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D0__SD4_DAT7             IOMUX_PAD(0x578, 0x190, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_NANDF_D0__USBH3_DATA7          IOMUX_PAD(0x578, 0x190, 5, 0xa18, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D8__CSI1_D8               IOMUX_PAD(0x57c, 0x194, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D8__GPIO3_12              IOMUX_PAD(0x57c, 0x194, 3, 0x998, 1, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI1_D9__CSI1_D9               IOMUX_PAD(0x580, 0x198, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D9__GPIO3_13              IOMUX_PAD(0x580, 0x198, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI1_D10__CSI1_D10             IOMUX_PAD(0x584, 0x19c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D11__CSI1_D11             IOMUX_PAD(0x588, 0x1a0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D12__CSI1_D12             IOMUX_PAD(0x58c, 0x1a4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D13__CSI1_D13             IOMUX_PAD(0x590, 0x1a8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D14__CSI1_D14             IOMUX_PAD(0x594, 0x1ac, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D15__CSI1_D15             IOMUX_PAD(0x598, 0x1b0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D16__CSI1_D16             IOMUX_PAD(0x59c, 0x1b4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D17__CSI1_D17             IOMUX_PAD(0x5a0, 0x1b8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D18__CSI1_D18             IOMUX_PAD(0x5a4, 0x1bc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_D19__CSI1_D19             IOMUX_PAD(0x5a8, 0x1c0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_VSYNC__CSI1_VSYNC         IOMUX_PAD(0x5ac, 0x1c4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_VSYNC__GPIO3_14           IOMUX_PAD(0x5ac, 0x1c4, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI1_HSYNC__CSI1_HSYNC         IOMUX_PAD(0x5b0, 0x1c8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_HSYNC__GPIO3_15           IOMUX_PAD(0x5b0, 0x1c8, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI1_PIXCLK__CSI1_PIXCLK       IOMUX_PAD(0x5b4, __NA_, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI1_MCLK__CSI1_MCLK           IOMUX_PAD(0x5b8, __NA_, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_D12__CSI2_D12             IOMUX_PAD(0x5bc, 0x1cc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_D12__GPIO4_9              IOMUX_PAD(0x5bc, 0x1cc, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI2_D13__CSI2_D13             IOMUX_PAD(0x5c0, 0x1d0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_D13__GPIO4_10             IOMUX_PAD(0x5c0, 0x1d0, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI2_D14__CSI2_D14             IOMUX_PAD(0x5c4, 0x1d4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_D15__CSI2_D15             IOMUX_PAD(0x5c8, 0x1d8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_D16__CSI2_D16             IOMUX_PAD(0x5cc, 0x1dc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_D17__CSI2_D17             IOMUX_PAD(0x5d0, 0x1e0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_D18__CSI2_D18             IOMUX_PAD(0x5d4, 0x1e4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_D18__GPIO4_11             IOMUX_PAD(0x5d4, 0x1e4, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI2_D19__CSI2_D19             IOMUX_PAD(0x5d8, 0x1e8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_D19__GPIO4_12             IOMUX_PAD(0x5d8, 0x1e8, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI2_VSYNC__CSI2_VSYNC         IOMUX_PAD(0x5dc, 0x1ec, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_VSYNC__GPIO4_13           IOMUX_PAD(0x5dc, 0x1ec, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI2_HSYNC__CSI2_HSYNC         IOMUX_PAD(0x5e0, 0x1f0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_HSYNC__GPIO4_14           IOMUX_PAD(0x5e0, 0x1f0, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSI2_PIXCLK__CSI2_PIXCLK       IOMUX_PAD(0x5e4, 0x1f4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_CSI2_PIXCLK__GPIO4_15          IOMUX_PAD(0x5e4, 0x1f4, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_I2C1_CLK__GPIO4_16             IOMUX_PAD(0x5e8, 0x1f8, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_I2C1_CLK__I2C1_CLK             IOMUX_PAD(0x5e8, 0x1f8, 0x10, __NA_, 0, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_I2C1_DAT__GPIO4_17             IOMUX_PAD(0x5ec, 0x1fc, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_I2C1_DAT__I2C1_DAT             IOMUX_PAD(0x5ec, 0x1fc, 0x10, __NA_, 0, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_TXD__AUD3_TXD          IOMUX_PAD(0x5f0, 0x200, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_TXD__GPIO4_18          IOMUX_PAD(0x5f0, 0x200, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_RXD__AUD3_RXD          IOMUX_PAD(0x5f4, 0x204, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_RXD__GPIO4_19          IOMUX_PAD(0x5f4, 0x204, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_RXD__UART3_RXD         IOMUX_PAD(0x5f4, 0x204, 1, 0x9f4, 2, MX51_UART_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_CK__AUD3_TXC           IOMUX_PAD(0x5f8, 0x208, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_CK__GPIO4_20           IOMUX_PAD(0x5f8, 0x208, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_FS__AUD3_TXFS          IOMUX_PAD(0x5fc, 0x20c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_FS__GPIO4_21           IOMUX_PAD(0x5fc, 0x20c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_AUD3_BB_FS__UART3_TXD          IOMUX_PAD(0x5fc, 0x20c, 1, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI        IOMUX_PAD(0x600, 0x210, 0, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_CSPI1_MOSI__GPIO4_22           IOMUX_PAD(0x600, 0x210, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSPI1_MOSI__I2C1_SDA           IOMUX_PAD(0x600, 0x210, 0x11, 0x9b4, 1, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_CSPI1_MISO__AUD4_RXD           IOMUX_PAD(0x604, 0x214, 1, 0x8c4, 1, NO_PAD_CTRL)
-#define MX51_PAD_CSPI1_MISO__ECSPI1_MISO        IOMUX_PAD(0x604, 0x214, 0, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_CSPI1_MISO__GPIO4_23           IOMUX_PAD(0x604, 0x214, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSPI1_SS0__AUD4_TXC            IOMUX_PAD(0x608, 0x218, 1, 0x8cc, 1, NO_PAD_CTRL)
-#define MX51_PAD_CSPI1_SS0__ECSPI1_SS0          IOMUX_PAD(0x608, 0x218, 0, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_CSPI1_SS0__GPIO4_24            IOMUX_PAD(0x608, 0x218, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSPI1_SS1__AUD4_TXD            IOMUX_PAD(0x60c, 0x21c, 1, 0x8c8, 1, NO_PAD_CTRL)
-#define MX51_PAD_CSPI1_SS1__ECSPI1_SS1          IOMUX_PAD(0x60c, 0x21c, 0, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_CSPI1_SS1__GPIO4_25            IOMUX_PAD(0x60c, 0x21c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSPI1_RDY__AUD4_TXFS           IOMUX_PAD(0x610, 0x220, 1, 0x8d0, 1, NO_PAD_CTRL)
-#define MX51_PAD_CSPI1_RDY__ECSPI1_RDY          IOMUX_PAD(0x610, 0x220, 0, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_CSPI1_RDY__GPIO4_26            IOMUX_PAD(0x610, 0x220, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK        IOMUX_PAD(0x614, 0x224, 0, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_CSPI1_SCLK__GPIO4_27           IOMUX_PAD(0x614, 0x224, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_CSPI1_SCLK__I2C1_SCL           IOMUX_PAD(0x614, 0x224, 0x11, 0x9b0, 1, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_UART1_RXD__GPIO4_28            IOMUX_PAD(0x618, 0x228, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_UART1_RXD__UART1_RXD           IOMUX_PAD(0x618, 0x228, 0, 0x9e4, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_UART1_TXD__GPIO4_29            IOMUX_PAD(0x61c, 0x22c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_UART1_TXD__PWM2_PWMO           IOMUX_PAD(0x61c, 0x22c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_UART1_TXD__UART1_TXD           IOMUX_PAD(0x61c, 0x22c, 0, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_UART1_RTS__GPIO4_30            IOMUX_PAD(0x620, 0x230, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_UART1_RTS__UART1_RTS           IOMUX_PAD(0x620, 0x230, 0, 0x9e0, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_UART1_CTS__GPIO4_31            IOMUX_PAD(0x624, 0x234, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_UART1_CTS__UART1_CTS           IOMUX_PAD(0x624, 0x234, 0, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_UART2_RXD__FIRI_TXD            IOMUX_PAD(0x628, 0x238, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_UART2_RXD__GPIO1_20            IOMUX_PAD(0x628, 0x238, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_UART2_RXD__UART2_RXD           IOMUX_PAD(0x628, 0x238, 0, 0x9ec, 2, MX51_UART_PAD_CTRL)
-#define MX51_PAD_UART2_TXD__FIRI_RXD            IOMUX_PAD(0x62c, 0x23c, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_UART2_TXD__GPIO1_21            IOMUX_PAD(0x62c, 0x23c, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_UART2_TXD__UART2_TXD           IOMUX_PAD(0x62c, 0x23c, 0, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_UART3_RXD__CSI1_D0             IOMUX_PAD(0x630, 0x240, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_UART3_RXD__GPIO1_22            IOMUX_PAD(0x630, 0x240, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_UART3_RXD__UART1_DTR           IOMUX_PAD(0x630, 0x240, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_UART3_RXD__UART3_RXD           IOMUX_PAD(0x630, 0x240, 1, 0x9f4, 4, MX51_UART_PAD_CTRL)
-#define MX51_PAD_UART3_TXD__CSI1_D1             IOMUX_PAD(0x634, 0x244, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_UART3_TXD__GPIO1_23            IOMUX_PAD(0x634, 0x244, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_UART3_TXD__UART1_DSR           IOMUX_PAD(0x634, 0x244, 0, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_UART3_TXD__UART3_TXD           IOMUX_PAD(0x634, 0x244, 1, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_OWIRE_LINE__GPIO1_24           IOMUX_PAD(0x638, 0x248, 3, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_OWIRE_LINE__OWIRE_LINE         IOMUX_PAD(0x638, 0x248, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_OWIRE_LINE__SPDIF_OUT          IOMUX_PAD(0x638, 0x248, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_ROW0__KEY_ROW0             IOMUX_PAD(0x63c, 0x24c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_ROW1__KEY_ROW1             IOMUX_PAD(0x640, 0x250, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_ROW2__KEY_ROW2             IOMUX_PAD(0x644, 0x254, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_ROW3__KEY_ROW3             IOMUX_PAD(0x648, 0x258, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL0__KEY_COL0             IOMUX_PAD(0x64c, 0x25c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL0__PLL1_BYP             IOMUX_PAD(0x64c, 0x25c, 7, 0x90c, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL1__KEY_COL1             IOMUX_PAD(0x650, 0x260, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL1__PLL2_BYP             IOMUX_PAD(0x650, 0x260, 7, 0x910, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL2__KEY_COL2             IOMUX_PAD(0x654, 0x264, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL2__PLL3_BYP             IOMUX_PAD(0x654, 0x264, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL3__KEY_COL3             IOMUX_PAD(0x658, 0x268, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL4__I2C2_SCL             IOMUX_PAD(0x65c, 0x26c, 0x13, 0x9b8, 1, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_KEY_COL4__KEY_COL4             IOMUX_PAD(0x65c, 0x26c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL4__SPDIF_OUT1           IOMUX_PAD(0x65c, 0x26c, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL4__UART1_RI             IOMUX_PAD(0x65c, 0x26c, 1, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_KEY_COL4__UART3_RTS            IOMUX_PAD(0x65c, 0x26c, 2, 0x9f0, 4, MX51_UART_PAD_CTRL)
-#define MX51_PAD_KEY_COL5__I2C2_SDA             IOMUX_PAD(0x660, 0x270, 0x13, 0x9bc, 1, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_KEY_COL5__KEY_COL5             IOMUX_PAD(0x660, 0x270, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_KEY_COL5__UART1_DCD            IOMUX_PAD(0x660, 0x270, 1, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_KEY_COL5__UART3_CTS            IOMUX_PAD(0x660, 0x270, 2, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_USBH1_CLK__CSPI_SCLK           IOMUX_PAD(0x678, 0x278, 1, 0x914, 1, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_USBH1_CLK__GPIO1_25            IOMUX_PAD(0x678, 0x278, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_CLK__I2C2_SCL            IOMUX_PAD(0x678, 0x278, 0x15, 0x9b8, 2, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_USBH1_CLK__USBH1_CLK           IOMUX_PAD(0x678, 0x278, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_DIR__CSPI_MOSI           IOMUX_PAD(0x67c, 0x27c, 1, 0x91c, 1, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_USBH1_DIR__GPIO1_26            IOMUX_PAD(0x67c, 0x27c, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_DIR__I2C2_SDA            IOMUX_PAD(0x67c, 0x27c, 0x15, 0x9bc, 2, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_USBH1_DIR__USBH1_DIR           IOMUX_PAD(0x67c, 0x27c, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_STP__CSPI_RDY            IOMUX_PAD(0x680, 0x280, 1, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_USBH1_STP__GPIO1_27            IOMUX_PAD(0x680, 0x280, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_STP__UART3_RXD           IOMUX_PAD(0x680, 0x280, 5, 0x9f4, 6, MX51_UART_PAD_CTRL)
-#define MX51_PAD_USBH1_STP__USBH1_STP           IOMUX_PAD(0x680, 0x280, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_NXT__CSPI_MISO           IOMUX_PAD(0x684, 0x284, 1, 0x918, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_USBH1_NXT__GPIO1_28            IOMUX_PAD(0x684, 0x284, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_NXT__UART3_TXD           IOMUX_PAD(0x684, 0x284, 5, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_USBH1_NXT__USBH1_NXT           IOMUX_PAD(0x684, 0x284, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA0__GPIO1_11          IOMUX_PAD(0x688, 0x288, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA0__UART2_CTS         IOMUX_PAD(0x688, 0x288, 1, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA0__USBH1_DATA0       IOMUX_PAD(0x688, 0x288, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA1__GPIO1_12          IOMUX_PAD(0x68c, 0x28c, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA1__UART2_RXD         IOMUX_PAD(0x68c, 0x28c, 1, 0x9ec, 4, MX51_UART_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA1__USBH1_DATA1       IOMUX_PAD(0x68c, 0x28c, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA2__GPIO1_13          IOMUX_PAD(0x690, 0x290, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA2__UART2_TXD         IOMUX_PAD(0x690, 0x290, 1, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA2__USBH1_DATA2       IOMUX_PAD(0x690, 0x290, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA3__GPIO1_14          IOMUX_PAD(0x694, 0x294, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA3__UART2_RTS         IOMUX_PAD(0x694, 0x294, 1, 0x9e8, 5, MX51_UART_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA3__USBH1_DATA3       IOMUX_PAD(0x694, 0x294, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA4__CSPI_SS0          IOMUX_PAD(0x698, 0x298, 1, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA4__GPIO1_15          IOMUX_PAD(0x698, 0x298, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA4__USBH1_DATA4       IOMUX_PAD(0x698, 0x298, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA5__CSPI_SS1          IOMUX_PAD(0x69c, 0x29c, 1, 0x920, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA5__GPIO1_16          IOMUX_PAD(0x69c, 0x29c, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA5__USBH1_DATA5       IOMUX_PAD(0x69c, 0x29c, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA6__CSPI_SS3          IOMUX_PAD(0x6a0, 0x2a0, 1, 0x928, 1, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA6__GPIO1_17          IOMUX_PAD(0x6a0, 0x2a0, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA6__USBH1_DATA6       IOMUX_PAD(0x6a0, 0x2a0, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA7__ECSPI1_SS3        IOMUX_PAD(0x6a4, 0x2a4, 1, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA7__ECSPI2_SS3        IOMUX_PAD(0x6a4, 0x2a4, 5, 0x934, 1, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA7__GPIO1_18          IOMUX_PAD(0x6a4, 0x2a4, 2, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_USBH1_DATA7__USBH1_DATA7       IOMUX_PAD(0x6a4, 0x2a4, 0, __NA_, 0, MX51_USBH1_PAD_CTRL)
-#define MX51_PAD_DI1_PIN11__DI1_PIN11           IOMUX_PAD(0x6a8, 0x2a8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_PIN11__ECSPI1_SS2          IOMUX_PAD(0x6a8, 0x2a8, 7, __NA_, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_DI1_PIN11__GPIO3_0             IOMUX_PAD(0x6a8, 0x2a8, 4, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DI1_PIN12__DI1_PIN12           IOMUX_PAD(0x6ac, 0x2ac, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_PIN12__GPIO3_1             IOMUX_PAD(0x6ac, 0x2ac, 4, 0x978, 1, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DI1_PIN13__DI1_PIN13           IOMUX_PAD(0x6b0, 0x2b0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_PIN13__GPIO3_2             IOMUX_PAD(0x6b0, 0x2b0, 4, 0x97c, 1, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DI1_D0_CS__DI1_D0_CS           IOMUX_PAD(0x6b4, 0x2b4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_D0_CS__GPIO3_3             IOMUX_PAD(0x6b4, 0x2b4, 4, 0x980, 1, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DI1_D1_CS__DI1_D1_CS           IOMUX_PAD(0x6b8, 0x2b8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_D1_CS__DISP1_PIN14         IOMUX_PAD(0x6b8, 0x2b8, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_D1_CS__DISP1_PIN5          IOMUX_PAD(0x6b8, 0x2b8, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_D1_CS__GPIO3_4             IOMUX_PAD(0x6b8, 0x2b8, 4, 0x984, 1, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_DIN__DISP1_PIN1     IOMUX_PAD(0x6bc, 0x2bc, 2, 0x9a4, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_DIN__DISPB2_SER_DIN IOMUX_PAD(0x6bc, 0x2bc, 0, 0x9c4, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_DIN__GPIO3_5        IOMUX_PAD(0x6bc, 0x2bc, 4, 0x988, 1, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_DIO__DISP1_PIN6     IOMUX_PAD(0x6c0, 0x2c0, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_DIO__DISPB2_SER_DIO IOMUX_PAD(0x6c0, 0x2c0, 0, 0x9c4, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_DIO__GPIO3_6        IOMUX_PAD(0x6c0, 0x2c0, 4, 0x98c, 1, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_CLK__DISP1_PIN17    IOMUX_PAD(0x6c4, 0x2c4, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_CLK__DISP1_PIN7     IOMUX_PAD(0x6c4, 0x2c4, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_CLK__DISPB2_SER_CLK IOMUX_PAD(0x6c4, 0x2c4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_CLK__GPIO3_7        IOMUX_PAD(0x6c4, 0x2c4, 4, 0x990, 1, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_RS__DISP1_EXT_CLK   IOMUX_PAD(0x6c8, 0x2c8, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_RS__DISP1_PIN16     IOMUX_PAD(0x6c8, 0x2c8, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_RS__DISP1_PIN8      IOMUX_PAD(0x6c8, 0x2c8, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_RS__DISPB2_SER_RS   IOMUX_PAD(0x6c8, 0x2c8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_RS__DISPB2_SER_RS   IOMUX_PAD(0x6c8, 0x2c8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISPB2_SER_RS__GPIO3_8         IOMUX_PAD(0x6c8, 0x2c8, 4, 0x994, 1, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT0__DISP1_DAT0         IOMUX_PAD(0x6cc, 0x2cc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT1__DISP1_DAT1         IOMUX_PAD(0x6d0, 0x2d0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT2__DISP1_DAT2         IOMUX_PAD(0x6d4, 0x2d4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT3__DISP1_DAT3         IOMUX_PAD(0x6d8, 0x2d8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT4__DISP1_DAT4         IOMUX_PAD(0x6dc, 0x2dc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT5__DISP1_DAT5         IOMUX_PAD(0x6e0, 0x2e0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT6__BOOT_USB_SRC       IOMUX_PAD(0x6e4, 0x2e4, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT6__DISP1_DAT6         IOMUX_PAD(0x6e4, 0x2e4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT7__BOOT_EEPROM_CFG    IOMUX_PAD(0x6e8, 0x2e8, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT7__DISP1_DAT7         IOMUX_PAD(0x6e8, 0x2e8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT8__BOOT_SRC0          IOMUX_PAD(0x6ec, 0x2ec, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT8__DISP1_DAT8         IOMUX_PAD(0x6ec, 0x2ec, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT9__BOOT_SRC1          IOMUX_PAD(0x6f0, 0x2f0, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT9__DISP1_DAT9         IOMUX_PAD(0x6f0, 0x2f0, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT10__BOOT_SPARE_SIZE   IOMUX_PAD(0x6f4, 0x2f4, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT10__DISP1_DAT10       IOMUX_PAD(0x6f4, 0x2f4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT11__BOOT_LPB_FREQ2    IOMUX_PAD(0x6f8, 0x2f8, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT11__DISP1_DAT11       IOMUX_PAD(0x6f8, 0x2f8, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT12__BOOT_MLC_SEL      IOMUX_PAD(0x6fc, 0x2fc, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT12__DISP1_DAT12       IOMUX_PAD(0x6fc, 0x2fc, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT13__BOOT_MEM_CTL0     IOMUX_PAD(0x700, 0x300, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT13__DISP1_DAT13       IOMUX_PAD(0x700, 0x300, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT14__BOOT_MEM_CTL1     IOMUX_PAD(0x704, 0x304, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT14__DISP1_DAT14       IOMUX_PAD(0x704, 0x304, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT15__BOOT_BUS_WIDTH    IOMUX_PAD(0x708, 0x308, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT15__DISP1_DAT15       IOMUX_PAD(0x708, 0x308, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT16__BOOT_PAGE_SIZE0   IOMUX_PAD(0x70c, 0x30c, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT16__DISP1_DAT16       IOMUX_PAD(0x70c, 0x30c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT17__BOOT_PAGE_SIZE1   IOMUX_PAD(0x710, 0x310, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT17__DISP1_DAT17       IOMUX_PAD(0x710, 0x310, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT18__BOOT_WEIM_MUXED0  IOMUX_PAD(0x714, 0x314, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT18__DISP1_DAT18       IOMUX_PAD(0x714, 0x314, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT18__DISP2_PIN11       IOMUX_PAD(0x714, 0x314, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT18__DISP2_PIN5        IOMUX_PAD(0x714, 0x314, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT19__BOOT_WEIM_MUXED1  IOMUX_PAD(0x718, 0x318, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT19__DISP1_DAT19       IOMUX_PAD(0x718, 0x318, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT19__DISP2_PIN12       IOMUX_PAD(0x718, 0x318, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT19__DISP2_PIN6        IOMUX_PAD(0x718, 0x318, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT20__BOOT_MEM_TYPE0    IOMUX_PAD(0x71c, 0x31c, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT20__DISP1_DAT20       IOMUX_PAD(0x71c, 0x31c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT20__DISP2_PIN13       IOMUX_PAD(0x71c, 0x31c, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT20__DISP2_PIN7        IOMUX_PAD(0x71c, 0x31c, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT21__BOOT_MEM_TYPE1    IOMUX_PAD(0x720, 0x320, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT21__DISP1_DAT21       IOMUX_PAD(0x720, 0x320, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT21__DISP2_PIN14       IOMUX_PAD(0x720, 0x320, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT21__DISP2_PIN8        IOMUX_PAD(0x720, 0x320, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT22__BOOT_LPB_FREQ0    IOMUX_PAD(0x724, 0x324, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT22__DISP1_DAT22       IOMUX_PAD(0x724, 0x324, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT22__DISP2_D0_CS       IOMUX_PAD(0x724, 0x324, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT22__DISP2_DAT16       IOMUX_PAD(0x724, 0x324, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT23__BOOT_LPB_FREQ1    IOMUX_PAD(0x728, 0x328, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT23__DISP1_DAT23       IOMUX_PAD(0x728, 0x328, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT23__DISP2_D1_CS       IOMUX_PAD(0x728, 0x328, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT23__DISP2_DAT17       IOMUX_PAD(0x728, 0x328, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP1_DAT23__DISP2_SER_CS      IOMUX_PAD(0x728, 0x328, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_PIN3__DI1_PIN3             IOMUX_PAD(0x72c, 0x32c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_DISP_CLK__DI1_DISP_CLK     IOMUX_PAD(0x730, __NA_, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_PIN2__DI1_PIN2             IOMUX_PAD(0x734, 0x330, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI1_PIN15__DI1_PIN15           IOMUX_PAD(0x738, __NA_, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI_GP2__DISP1_SER_CLK          IOMUX_PAD(0x740, 0x338, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI_GP2__DISP2_WAIT             IOMUX_PAD(0x740, 0x338, 2, 0x9a8, 1, NO_PAD_CTRL)
-#define MX51_PAD_DI_GP3__CSI1_DATA_EN           IOMUX_PAD(0x744, 0x33c, 3, 0x9a0, 1, NO_PAD_CTRL)
-#define MX51_PAD_DI_GP3__DISP1_SER_DIO          IOMUX_PAD(0x744, 0x33c, 0, 0x9c0, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI_GP3__FEC_TX_ER              IOMUX_PAD(0x744, 0x33c, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_DI2_PIN4__CSI2_DATA_EN         IOMUX_PAD(0x748, 0x340, 3, 0x99c, 1, NO_PAD_CTRL)
-#define MX51_PAD_DI2_PIN4__DI2_PIN4             IOMUX_PAD(0x748, 0x340, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI2_PIN4__FEC_CRS              IOMUX_PAD(0x748, 0x340, 2, 0x950, 1, NO_PAD_CTRL)
-#define MX51_PAD_DI2_PIN2__DI2_PIN2             IOMUX_PAD(0x74c, 0x344, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI2_PIN2__FEC_MDC              IOMUX_PAD(0x74c, 0x344, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_DI2_PIN3__DI2_PIN3             IOMUX_PAD(0x750, 0x348, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI2_PIN3__FEC_MDIO             IOMUX_PAD(0x750, 0x348, 2, 0x954, 1, NO_PAD_CTRL)
-#define MX51_PAD_DI2_DISP_CLK__DI2_DISP_CLK     IOMUX_PAD(0x754, 0x34c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI2_DISP_CLK__FEC_RDATA1       IOMUX_PAD(0x754, 0x34c, 2, 0x95c, 1, NO_PAD_CTRL)
-#define MX51_PAD_DI_GP4__DI2_PIN15              IOMUX_PAD(0x758, 0x350, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI_GP4__DISP1_SER_DIN          IOMUX_PAD(0x758, 0x350, 0, 0x9c0, 1, NO_PAD_CTRL)
-#define MX51_PAD_DI_GP4__DISP2_PIN1             IOMUX_PAD(0x758, 0x350, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DI_GP4__FEC_RDATA2             IOMUX_PAD(0x758, 0x350, 2, 0x960, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT0__DISP2_DAT0         IOMUX_PAD(0x75c, 0x354, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT0__FEC_RDATA3         IOMUX_PAD(0x75c, 0x354, 2, 0x964, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT0__KEY_COL6           IOMUX_PAD(0x75c, 0x354, 4, 0x9c8, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT0__UART3_RXD          IOMUX_PAD(0x75c, 0x354, 5, 0x9f4, 8, MX51_UART_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT0__USBH3_CLK          IOMUX_PAD(0x75c, 0x354, 3, 0x9f8, 1, MX51_UART_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT1__DISP2_DAT1         IOMUX_PAD(0x760, 0x358, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT1__FEC_RX_ER          IOMUX_PAD(0x760, 0x358, 2, 0x970, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT1__KEY_COL7           IOMUX_PAD(0x760, 0x358, 4, 0x9cc, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT1__UART3_TXD          IOMUX_PAD(0x760, 0x358, 5, __NA_, 0, MX51_UART_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT1__USBH3_DIR          IOMUX_PAD(0x760, 0x358, 3, 0xa1c, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT2__DISP2_DAT2         IOMUX_PAD(0x764, 0x35c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT3__DISP2_DAT3         IOMUX_PAD(0x768, 0x360, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT4__DISP2_DAT4         IOMUX_PAD(0x76c, 0x364, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT5__DISP2_DAT5         IOMUX_PAD(0x770, 0x368, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT6__DISP2_DAT6         IOMUX_PAD(0x774, 0x36c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT6__FEC_TDATA1         IOMUX_PAD(0x774, 0x36c, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_DISP2_DAT6__GPIO1_19           IOMUX_PAD(0x774, 0x36c, 5, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT6__KEY_ROW4           IOMUX_PAD(0x774, 0x36c, 4, 0x9d0, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT6__USBH3_STP          IOMUX_PAD(0x774, 0x36c, 3, 0xa24, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT7__DISP2_DAT7         IOMUX_PAD(0x778, 0x370, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT7__FEC_TDATA2         IOMUX_PAD(0x778, 0x370, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_DISP2_DAT7__GPIO1_29           IOMUX_PAD(0x778, 0x370, 5, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT7__KEY_ROW5           IOMUX_PAD(0x778, 0x370, 4, 0x9d4, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT7__USBH3_NXT          IOMUX_PAD(0x778, 0x370, 3, 0xa20, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT8__DISP2_DAT8         IOMUX_PAD(0x77c, 0x374, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT8__FEC_TDATA3         IOMUX_PAD(0x77c, 0x374, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_DISP2_DAT8__GPIO1_30           IOMUX_PAD(0x77c, 0x374, 5, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT8__KEY_ROW6           IOMUX_PAD(0x77c, 0x374, 4, 0x9d8, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT8__USBH3_DATA0        IOMUX_PAD(0x77c, 0x374, 3, 0x9fc, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT9__AUD6_RXC           IOMUX_PAD(0x780, 0x378, 4, 0x8f4, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT9__DISP2_DAT9         IOMUX_PAD(0x780, 0x378, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT9__FEC_TX_EN          IOMUX_PAD(0x780, 0x378, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_DISP2_DAT9__GPIO1_31           IOMUX_PAD(0x780, 0x378, 5, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT9__USBH3_DATA1        IOMUX_PAD(0x780, 0x378, 3, 0xa00, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT10__DISP2_DAT10       IOMUX_PAD(0x784, 0x37c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT10__DISP2_SER_CS      IOMUX_PAD(0x784, 0x37c, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT10__FEC_COL           IOMUX_PAD(0x784, 0x37c, 2, 0x94c, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT10__KEY_ROW7          IOMUX_PAD(0x784, 0x37c, 4, 0x9dc, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT10__USBH3_DATA2       IOMUX_PAD(0x784, 0x37c, 3, 0xa04, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT11__AUD6_TXD          IOMUX_PAD(0x788, 0x380, 4, 0x8f0, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT11__DISP2_DAT11       IOMUX_PAD(0x788, 0x380, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT11__FEC_RX_CLK        IOMUX_PAD(0x788, 0x380, 2, 0x968, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT11__GPIO1_10          IOMUX_PAD(0x788, 0x380, 7, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT11__USBH3_DATA3       IOMUX_PAD(0x788, 0x380, 3, 0xa08, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT12__AUD6_RXD          IOMUX_PAD(0x78c, 0x384, 4, 0x8ec, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT12__DISP2_DAT12       IOMUX_PAD(0x78c, 0x384, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT12__FEC_RX_DV         IOMUX_PAD(0x78c, 0x384, 2, 0x96c, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT12__USBH3_DATA4       IOMUX_PAD(0x78c, 0x384, 3, 0xa0c, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT13__AUD6_TXC          IOMUX_PAD(0x790, 0x388, 4, 0x8fc, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT13__DISP2_DAT13       IOMUX_PAD(0x790, 0x388, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT13__FEC_TX_CLK        IOMUX_PAD(0x790, 0x388, 2, 0x974, 1, MX51_PAD_CTRL_4)
-#define MX51_PAD_DISP2_DAT13__USBH3_DATA5       IOMUX_PAD(0x790, 0x388, 3, 0xa10, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT14__AUD6_TXFS         IOMUX_PAD(0x794, 0x38c, 4, 0x900, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT14__DISP2_DAT14       IOMUX_PAD(0x794, 0x38c, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT14__FEC_RDATA0        IOMUX_PAD(0x794, 0x38c, 2, 0x958, 1, MX51_PAD_CTRL_4)
-#define MX51_PAD_DISP2_DAT14__USBH3_DATA6       IOMUX_PAD(0x794, 0x38c, 3, 0xa14, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT15__AUD6_RXFS         IOMUX_PAD(0x798, 0x390, 4, 0x8f8, 1, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT15__DISP1_SER_CS      IOMUX_PAD(0x798, 0x390, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT15__DISP2_DAT15       IOMUX_PAD(0x798, 0x390, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_DISP2_DAT15__FEC_TDATA0        IOMUX_PAD(0x798, 0x390, 2, __NA_, 0, MX51_PAD_CTRL_5)
-#define MX51_PAD_DISP2_DAT15__USBH3_DATA7       IOMUX_PAD(0x798, 0x390, 3, 0xa18, 1, NO_PAD_CTRL)
-#define MX51_PAD_SD1_CMD__AUD5_RXFS             IOMUX_PAD(0x79c, 0x394, 1, 0x8e0, 1, NO_PAD_CTRL)
-#define MX51_PAD_SD1_CMD__CSPI_MOSI             IOMUX_PAD(0x79c, 0x394, 2, 0x91c, 2, NO_PAD_CTRL)
-#define MX51_PAD_SD1_CMD__SD1_CMD               IOMUX_PAD(0x79c, 0x394, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_SD1_CLK__AUD5_RXC              IOMUX_PAD(0x7a0, 0x398, 1, 0x8dc, 1, NO_PAD_CTRL)
-#define MX51_PAD_SD1_CLK__CSPI_SCLK             IOMUX_PAD(0x7a0, 0x398, 2, 0x914, 2, NO_PAD_CTRL)
-#define MX51_PAD_SD1_CLK__SD1_CLK               IOMUX_PAD(0x7a0, 0x398, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL | PAD_CTL_HYS)
-#define MX51_PAD_SD1_DATA0__AUD5_TXD            IOMUX_PAD(0x7a4, 0x39c, 1, 0x8d8, 2, NO_PAD_CTRL)
-#define MX51_PAD_SD1_DATA0__CSPI_MISO           IOMUX_PAD(0x7a4, 0x39c, 2, 0x918, 1, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_SD1_DATA0__SD1_DATA0           IOMUX_PAD(0x7a4, 0x39c, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_EIM_DA0__EIM_DA0               IOMUX_PAD(__NA_, 0x01c, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA1__EIM_DA1               IOMUX_PAD(__NA_, 0x020, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA2__EIM_DA2               IOMUX_PAD(__NA_, 0x024, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA3__EIM_DA3               IOMUX_PAD(__NA_, 0x028, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD1_DATA1__AUD5_RXD            IOMUX_PAD(0x7a8, 0x3a0, 1, 0x8d4, 2, NO_PAD_CTRL)
-#define MX51_PAD_SD1_DATA1__SD1_DATA1           IOMUX_PAD(0x7a8, 0x3a0, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_EIM_DA4__EIM_DA4               IOMUX_PAD(__NA_, 0x02c, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA5__EIM_DA5               IOMUX_PAD(__NA_, 0x030, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA6__EIM_DA6               IOMUX_PAD(__NA_, 0x034, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA7__EIM_DA7               IOMUX_PAD(__NA_, 0x038, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD1_DATA2__AUD5_TXC            IOMUX_PAD(0x7ac, 0x3a4, 1, 0x8e4, 2, NO_PAD_CTRL)
-#define MX51_PAD_SD1_DATA2__SD1_DATA2           IOMUX_PAD(0x7ac, 0x3a4, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_EIM_DA10__EIM_DA10             IOMUX_PAD(__NA_, 0x044, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA11__EIM_DA11             IOMUX_PAD(__NA_, 0x048, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA8__EIM_DA8               IOMUX_PAD(__NA_, 0x03c, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA9__EIM_DA9               IOMUX_PAD(__NA_, 0x040, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD1_DATA3__AUD5_TXFS           IOMUX_PAD(0x7b0, 0x3a8, 1, 0x8e8, 2, NO_PAD_CTRL)
-#define MX51_PAD_SD1_DATA3__CSPI_SS1            IOMUX_PAD(0x7b0, 0x3a8, 2, 0x920, 1, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_SD1_DATA3__SD1_DATA3           IOMUX_PAD(0x7b0, 0x3a8, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_GPIO1_0__CSPI_SS2              IOMUX_PAD(0x7b4, 0x3ac, 2, 0x924, 0, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_GPIO1_0__GPIO1_0               IOMUX_PAD(0x7b4, 0x3ac, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_0__SD1_CD                IOMUX_PAD(0x7b4, 0x3ac, 0, __NA_, 0, MX51_ESDHC_PAD_CTRL)
-#define MX51_PAD_GPIO1_1__CSPI_MISO             IOMUX_PAD(0x7b8, 0x3b0, 2, 0x918, 2, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_GPIO1_1__GPIO1_1               IOMUX_PAD(0x7b8, 0x3b0, 1, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_1__SD1_WP                IOMUX_PAD(0x7b8, 0x3b0, 0, __NA_, 0, MX51_ESDHC_PAD_CTRL)
-#define MX51_PAD_EIM_DA12__EIM_DA12             IOMUX_PAD(__NA_, 0x04c, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA13__EIM_DA13             IOMUX_PAD(__NA_, 0x050, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA14__EIM_DA14             IOMUX_PAD(__NA_, 0x054, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_DA15__EIM_DA15             IOMUX_PAD(__NA_, 0x058, 0, 0x000, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD2_CMD__CSPI_MOSI             IOMUX_PAD(0x7bc, 0x3b4, 2, 0x91c, 3, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_SD2_CMD__I2C1_SCL              IOMUX_PAD(0x7bc, 0x3b4, 0x11, 0x9b0, 2, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_SD2_CMD__SD2_CMD               IOMUX_PAD(0x7bc, 0x3b4, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_SD2_CLK__CSPI_SCLK             IOMUX_PAD(0x7c0, 0x3b8, 2, 0x914, 3, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_SD2_CLK__I2C1_SDA              IOMUX_PAD(0x7c0, 0x3b8, 0x11, 0x9b4, 2, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_SD2_CLK__SD2_CLK               IOMUX_PAD(0x7c0, 0x3b8, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL | PAD_CTL_HYS)
-#define MX51_PAD_SD2_DATA0__CSPI_MISO           IOMUX_PAD(0x7c4, 0x3bc, 2, 0x918, 3, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_SD2_DATA0__SD1_DAT4            IOMUX_PAD(0x7c4, 0x3bc, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD2_DATA0__SD2_DATA0           IOMUX_PAD(0x7c4, 0x3bc, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_SD2_DATA1__SD1_DAT5            IOMUX_PAD(0x7c8, 0x3c0, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD2_DATA1__SD2_DATA1           IOMUX_PAD(0x7c8, 0x3c0, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_SD2_DATA1__USBH3_H2_DP         IOMUX_PAD(0x7c8, 0x3c0, 0x12, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD2_DATA2__SD1_DAT6            IOMUX_PAD(0x7cc, 0x3c4, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD2_DATA2__SD2_DATA2           IOMUX_PAD(0x7cc, 0x3c4, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_SD2_DATA2__USBH3_H2_DM         IOMUX_PAD(0x7cc, 0x3c4, 0x12, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD2_DATA3__CSPI_SS2            IOMUX_PAD(0x7d0, 0x3c8, 2, 0x924, 1, MX51_ECSPI_PAD_CTRL)
-#define MX51_PAD_SD2_DATA3__SD1_DAT7            IOMUX_PAD(0x7d0, 0x3c8, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_SD2_DATA3__SD2_DATA3           IOMUX_PAD(0x7d0, 0x3c8, 0x10, __NA_, 0, MX51_SDHCI_PAD_CTRL)
-#define MX51_PAD_GPIO1_2__CCM_OUT_2             IOMUX_PAD(0x7d4, 0x3cc, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_2__GPIO1_2               IOMUX_PAD(0x7d4, 0x3cc, 0, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_2__I2C2_SCL              IOMUX_PAD(0x7d4, 0x3cc, 0x12, 0x9b8, 3, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_GPIO1_2__PLL1_BYP              IOMUX_PAD(0x7d4, 0x3cc, 7, 0x90c, 1, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_2__PWM1_PWMO             IOMUX_PAD(0x7d4, 0x3cc, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_3__GPIO1_3               IOMUX_PAD(0x7d8, 0x3d0, 0, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_3__I2C2_SDA              IOMUX_PAD(0x7d8, 0x3d0, 0x12, 0x9bc, 3, MX51_I2C_PAD_CTRL)
-#define MX51_PAD_GPIO1_3__CCM_CLKO2             IOMUX_PAD(0x7d8, 0x3d0, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_3__GPT_CLKIN             IOMUX_PAD(0x7d8, 0x3d0, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_3__PLL2_BYP              IOMUX_PAD(0x7d8, 0x3d0, 7, 0x910, 1, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_3__PWM2_PWMO             IOMUX_PAD(0x7d8, 0x3d0, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_PMIC_INT_REQ__PMIC_INT_REQ     IOMUX_PAD(0x7fc, 0x3d4, 0, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_PMIC_INT_REQ__PMIC_PMU_IRQ_B   IOMUX_PAD(0x7fc, 0x3d4, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_4__DISP2_EXT_CLK         IOMUX_PAD(0x804, 0x3d8, 4, 0x908, 1, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_4__EIM_RDY               IOMUX_PAD(0x804, 0x3d8, 3, 0x938, 1, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_4__GPIO1_4               IOMUX_PAD(0x804, 0x3d8, 0, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_4__WDOG1_WDOG_B          IOMUX_PAD(0x804, 0x3d8, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_4__GPT_CAPIN1            IOMUX_PAD(0x804, 0x3d8, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_5__CSI2_MCLK             IOMUX_PAD(0x808, 0x3dc, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_5__DISP2_PIN16           IOMUX_PAD(0x808, 0x3dc, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_5__GPIO1_5               IOMUX_PAD(0x808, 0x3dc, 0, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_5__WDOG2_WDOG_B          IOMUX_PAD(0x808, 0x3dc, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_5__CCM_CLKO              IOMUX_PAD(0x808, 0x3dc, 5, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_6__DISP2_PIN17           IOMUX_PAD(0x80c, 0x3e0, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_6__GPIO1_6               IOMUX_PAD(0x80c, 0x3e0, 0, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_6__REF_EN_B              IOMUX_PAD(0x80c, 0x3e0, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_6__GPT_CAPIN2            IOMUX_PAD(0x80c, 0x3e0, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_7__CCM_OUT_0             IOMUX_PAD(0x810, 0x3e4, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_7__GPIO1_7               IOMUX_PAD(0x810, 0x3e4, 0, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_7__SD2_WP                IOMUX_PAD(0x810, 0x3e4, 6, __NA_, 0, MX51_ESDHC_PAD_CTRL)
-#define MX51_PAD_GPIO1_7__SPDIF_OUT1            IOMUX_PAD(0x810, 0x3e4, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_8__CSI2_DATA_EN          IOMUX_PAD(0x814, 0x3e8, 2, 0x99c, 2, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_8__GPIO1_8               IOMUX_PAD(0x814, 0x3e8, 0, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_8__SD2_CD                IOMUX_PAD(0x814, 0x3e8, 6, __NA_, 0, MX51_ESDHC_PAD_CTRL)
-#define MX51_PAD_GPIO1_8__USBH3_PWR             IOMUX_PAD(0x814, 0x3e8, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_8__CCM_CLKO2             IOMUX_PAD(0x814, 0x3e8, 4, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_9__CCM_OUT_1             IOMUX_PAD(0x818, 0x3ec, 3, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_9__DISP2_D1_CS           IOMUX_PAD(0x818, 0x3ec, 2, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_9__DISP2_SER_CS          IOMUX_PAD(0x818, 0x3ec, 7, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_9__GPIO1_9               IOMUX_PAD(0x818, 0x3ec, 0, __NA_, 0, MX51_GPIO_PAD_CTRL)
-#define MX51_PAD_GPIO1_9__SD2_LCTL              IOMUX_PAD(0x818, 0x3ec, 6, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_9__USBH3_OC              IOMUX_PAD(0x818, 0x3ec, 1, __NA_, 0, NO_PAD_CTRL)
-#define MX51_PAD_GPIO1_9__CCM_CLKO              IOMUX_PAD(0x818, 0x3ec, 4, __NA_, 0, NO_PAD_CTRL)
-
-#endif /* __MACH_IOMUX_MX51_H__ */
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c
index 39406b7e3228..a7e9bd26a552 100644
--- a/arch/arm/mach-imx/mach-armadillo5x0.c
+++ b/arch/arm/mach-imx/mach-armadillo5x0.c
@@ -50,6 +50,7 @@
 #include "common.h"
 #include "devices-imx31.h"
 #include "crmregs-imx3.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx3.h"
 #include "ulpi.h"
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
index 75b7b6aa2720..e6d4b9929571 100644
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@ -36,6 +36,7 @@
 
 #include "common.h"
 #include "devices-imx27.h"
+#include "ehci.h"
 #include "eukrea-baseboards.h"
 #include "hardware.h"
 #include "iomux-mx27.h"
diff --git a/arch/arm/mach-imx/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c
index 1ffa27169045..62a6e02f4763 100644
--- a/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@ -39,6 +39,7 @@
 
 #include "common.h"
 #include "devices-imx35.h"
+#include "ehci.h"
 #include "eukrea-baseboards.h"
 #include "hardware.h"
 #include "iomux-mx35.h"
diff --git a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index e978dda1434c..b2ee6e009fe4 100644
--- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@ -35,6 +35,7 @@
 
 #include "common.h"
 #include "devices-imx25.h"
+#include "ehci.h"
 #include "eukrea-baseboards.h"
 #include "hardware.h"
 #include "iomux-mx25.h"
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index b61bd8ed5568..ede2bdbb5dd5 100644
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@ -43,6 +43,7 @@
 
 #include "common.h"
 #include "devices-imx27.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx27.h"
 
diff --git a/arch/arm/mach-imx/mach-imx27ipcam.c b/arch/arm/mach-imx/mach-imx27ipcam.c
deleted file mode 100644
index bb3ca0429680..000000000000
--- a/arch/arm/mach-imx/mach-imx27ipcam.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * 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 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.
- */
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/time.h>
-
-#include "hardware.h"
-#include "common.h"
-#include "devices-imx27.h"
-#include "iomux-mx27.h"
-
-static const int mx27ipcam_pins[] __initconst = {
-        /* UART1 */
-        PE12_PF_UART1_TXD,
-        PE13_PF_UART1_RXD,
-        /* FEC */
-        PD0_AIN_FEC_TXD0,
-        PD1_AIN_FEC_TXD1,
-        PD2_AIN_FEC_TXD2,
-        PD3_AIN_FEC_TXD3,
-        PD4_AOUT_FEC_RX_ER,
-        PD5_AOUT_FEC_RXD1,
-        PD6_AOUT_FEC_RXD2,
-        PD7_AOUT_FEC_RXD3,
-        PD8_AF_FEC_MDIO,
-        PD9_AIN_FEC_MDC,
-        PD10_AOUT_FEC_CRS,
-        PD11_AOUT_FEC_TX_CLK,
-        PD12_AOUT_FEC_RXD0,
-        PD13_AOUT_FEC_RX_DV,
-        PD14_AOUT_FEC_RX_CLK,
-        PD15_AOUT_FEC_COL,
-        PD16_AIN_FEC_TX_ER,
-        PF23_AIN_FEC_TX_EN,
-};
-
-static void __init mx27ipcam_init(void)
-{
-        imx27_soc_init();
-
-        mxc_gpio_setup_multiple_pins(mx27ipcam_pins, ARRAY_SIZE(mx27ipcam_pins),
-                "mx27ipcam");
-
-        imx27_add_imx_uart0(NULL);
-        imx27_add_fec(NULL);
-        imx27_add_imx2_wdt();
-}
-
-static void __init mx27ipcam_timer_init(void)
-{
-        mx27_clocks_init(25000000);
-}
-
-MACHINE_START(IMX27IPCAM, "Freescale IMX27IPCAM")
-        /* maintainer: Freescale Semiconductor, Inc. */
-        .atag_offset = 0x100,
-        .map_io = mx27_map_io,
-        .init_early = imx27_init_early,
-        .init_irq = mx27_init_irq,
-        .init_time      = mx27ipcam_timer_init,
-        .init_machine = mx27ipcam_init,
-        .restart        = mxc_restart,
-MACHINE_END
diff --git a/arch/arm/mach-imx/mach-imx27lite.c b/arch/arm/mach-imx/mach-imx27lite.c
deleted file mode 100644
index 9992089d3ad1..000000000000
--- a/arch/arm/mach-imx/mach-imx27lite.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2007 Robert Schwebel <r.schwebel@pengutronix.de>, Pengutronix
- * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
- * Copyright 2009 Daniel Schaeffer (daniel.schaeffer@timesys.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.
- */
-
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/time.h>
-#include <asm/mach/map.h>
-
-#include "common.h"
-#include "devices-imx27.h"
-#include "hardware.h"
-#include "iomux-mx27.h"
-
-static const int mx27lite_pins[] __initconst = {
-        /* UART1 */
-        PE12_PF_UART1_TXD,
-        PE13_PF_UART1_RXD,
-        PE14_PF_UART1_CTS,
-        PE15_PF_UART1_RTS,
-        /* FEC */
-        PD0_AIN_FEC_TXD0,
-        PD1_AIN_FEC_TXD1,
-        PD2_AIN_FEC_TXD2,
-        PD3_AIN_FEC_TXD3,
-        PD4_AOUT_FEC_RX_ER,
-        PD5_AOUT_FEC_RXD1,
-        PD6_AOUT_FEC_RXD2,
-        PD7_AOUT_FEC_RXD3,
-        PD8_AF_FEC_MDIO,
-        PD9_AIN_FEC_MDC,
-        PD10_AOUT_FEC_CRS,
-        PD11_AOUT_FEC_TX_CLK,
-        PD12_AOUT_FEC_RXD0,
-        PD13_AOUT_FEC_RX_DV,
-        PD14_AOUT_FEC_RX_CLK,
-        PD15_AOUT_FEC_COL,
-        PD16_AIN_FEC_TX_ER,
-        PF23_AIN_FEC_TX_EN,
-};
-
-static const struct imxuart_platform_data uart_pdata __initconst = {
-        .flags = IMXUART_HAVE_RTSCTS,
-};
-
-static void __init mx27lite_init(void)
-{
-        imx27_soc_init();
-
-        mxc_gpio_setup_multiple_pins(mx27lite_pins, ARRAY_SIZE(mx27lite_pins),
-                "imx27lite");
-        imx27_add_imx_uart0(&uart_pdata);
-        imx27_add_fec(NULL);
-}
-
-static void __init mx27lite_timer_init(void)
-{
-        mx27_clocks_init(26000000);
-}
-
-MACHINE_START(IMX27LITE, "LogicPD i.MX27LITE")
-        .atag_offset = 0x100,
-        .map_io = mx27_map_io,
-        .init_early = imx27_init_early,
-        .init_irq = mx27_init_irq,
-        .init_time      = mx27lite_timer_init,
-        .init_machine = mx27lite_init,
-        .restart        = mxc_restart,
-MACHINE_END
diff --git a/arch/arm/mach-imx/mach-imx50.c b/arch/arm/mach-imx/mach-imx50.c
index b899c0b59afd..b1e56a94a382 100644
--- a/arch/arm/mach-imx/mach-imx50.c
+++ b/arch/arm/mach-imx/mach-imx50.c
@@ -23,14 +23,13 @@ static void __init imx50_dt_init(void)
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-static const char *imx50_dt_board_compat[] __initconst = {
+static const char * const imx50_dt_board_compat[] __initconst = {
         "fsl,imx50",
         NULL
 };
 
 DT_MACHINE_START(IMX50_DT, "Freescale i.MX50 (Device Tree Support)")
-        .map_io         = mx53_map_io,
-        .init_irq       = mx53_init_irq,
+        .init_irq       = tzic_init_irq,
         .init_machine   = imx50_dt_init,
         .dt_compat      = imx50_dt_board_compat,
         .restart        = mxc_restart,
diff --git a/arch/arm/mach-imx/imx51-dt.c b/arch/arm/mach-imx/mach-imx51.c
index b8cd968faa52..c77deb3f0893 100644
--- a/arch/arm/mach-imx/imx51-dt.c
+++ b/arch/arm/mach-imx/mach-imx51.c
@@ -10,6 +10,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+#include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
@@ -17,27 +18,63 @@
 #include <asm/mach/time.h>
 
 #include "common.h"
-#include "mx51.h"
+#include "hardware.h"
+
+static void __init imx51_init_early(void)
+{
+        mxc_set_cpu_type(MXC_CPU_MX51);
+}
+
+/*
+ * The MIPI HSC unit has been removed from the i.MX51 Reference Manual by
+ * the Freescale marketing division. However this did not remove the
+ * hardware from the chip which still needs to be configured for proper
+ * IPU support.
+ */
+#define MX51_MIPI_HSC_BASE 0x83fdc000
+static void __init imx51_ipu_mipi_setup(void)
+{
+        void __iomem *hsc_addr;
+
+        hsc_addr = ioremap(MX51_MIPI_HSC_BASE, SZ_16K);
+        WARN_ON(!hsc_addr);
+
+        /* setup MIPI module to legacy mode */
+        __raw_writel(0xf00, hsc_addr);
+
+        /* CSI mode: reserved; DI control mode: legacy (from Freescale BSP) */
+        __raw_writel(__raw_readl(hsc_addr + 0x800) | 0x30ff,
+                hsc_addr + 0x800);
+
+        iounmap(hsc_addr);
+}
 
 static void __init imx51_dt_init(void)
 {
         struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
 
         mxc_arch_reset_init_dt();
+        imx51_ipu_mipi_setup();
+        imx_src_init();
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
         platform_device_register_full(&devinfo);
 }
 
-static const char *imx51_dt_board_compat[] __initconst = {
+static void __init imx51_init_late(void)
+{
+        mx51_neon_fixup();
+        imx51_pm_init();
+}
+
+static const char * const imx51_dt_board_compat[] __initconst = {
         "fsl,imx51",
         NULL
 };
 
 DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)")
-        .map_io         = mx51_map_io,
         .init_early     = imx51_init_early,
-        .init_irq       = mx51_init_irq,
+        .init_irq       = tzic_init_irq,
         .init_machine   = imx51_dt_init,
         .init_late      = imx51_init_late,
         .dt_compat      = imx51_dt_board_compat,
diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c
index 2bad387956c0..03dd6ea13acc 100644
--- a/arch/arm/mach-imx/mach-imx53.c
+++ b/arch/arm/mach-imx/mach-imx53.c
@@ -22,24 +22,35 @@
 
 #include "common.h"
 #include "hardware.h"
-#include "mx53.h"
+
+static void __init imx53_init_early(void)
+{
+        mxc_set_cpu_type(MXC_CPU_MX53);
+}
 
 static void __init imx53_dt_init(void)
 {
         mxc_arch_reset_init_dt();
+        imx_src_init();
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+
+        imx_aips_allow_unprivileged_access("fsl,imx53-aipstz");
+}
+
+static void __init imx53_init_late(void)
+{
+        imx53_pm_init();
 }
 
-static const char *imx53_dt_board_compat[] __initconst = {
+static const char * const imx53_dt_board_compat[] __initconst = {
         "fsl,imx53",
         NULL
 };
 
 DT_MACHINE_START(IMX53_DT, "Freescale i.MX53 (Device Tree Support)")
-        .map_io         = mx53_map_io,
         .init_early     = imx53_init_early,
-        .init_irq       = mx53_init_irq,
+        .init_irq       = tzic_init_irq,
         .init_machine   = imx53_dt_init,
         .init_late      = imx53_init_late,
         .dt_compat      = imx53_dt_board_compat,
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index e60456d85c9d..d51c6e99a2e9 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -320,7 +320,7 @@ static void __init imx6q_opp_check_speed_grading(struct device *cpu_dev)
         val >>= OCOTP_CFG3_SPEED_SHIFT;
         val &= 0x3;
 
-        if (val != OCOTP_CFG3_SPEED_1P2GHZ)
+        if ((val != OCOTP_CFG3_SPEED_1P2GHZ) && cpu_is_imx6q())
                 if (dev_pm_opp_disable(cpu_dev, 1200000000))
                         pr_warn("failed to disable 1.2 GHz OPP\n");
         if (val < OCOTP_CFG3_SPEED_996MHZ)
@@ -396,7 +396,7 @@ static void __init imx6q_init_irq(void)
         irqchip_init();
 }
 
-static const char *imx6q_dt_compat[] __initconst = {
+static const char * const imx6q_dt_compat[] __initconst = {
         "fsl,imx6dl",
         "fsl,imx6q",
         NULL,
diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
index ad323385115c..ed263a21d928 100644
--- a/arch/arm/mach-imx/mach-imx6sl.c
+++ b/arch/arm/mach-imx/mach-imx6sl.c
@@ -70,7 +70,7 @@ static void __init imx6sl_init_irq(void)
         irqchip_init();
 }
 
-static const char *imx6sl_dt_compat[] __initconst = {
+static const char * const imx6sl_dt_compat[] __initconst = {
         "fsl,imx6sl",
         NULL,
 };
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
index 02fccf6033ac..673a734165ba 100644
--- a/arch/arm/mach-imx/mach-imx6sx.c
+++ b/arch/arm/mach-imx/mach-imx6sx.c
@@ -12,6 +12,7 @@
 #include <asm/mach/map.h>
 
 #include "common.h"
+#include "cpuidle.h"
 
 static void __init imx6sx_init_machine(void)
 {
@@ -26,6 +27,7 @@ static void __init imx6sx_init_machine(void)
         of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
 
         imx_anatop_init();
+        imx6sx_pm_init();
 }
 
 static void __init imx6sx_init_irq(void)
@@ -37,7 +39,12 @@ static void __init imx6sx_init_irq(void)
         irqchip_init();
 }
 
-static const char *imx6sx_dt_compat[] __initconst = {
+static void __init imx6sx_init_late(void)
+{
+        imx6q_cpuidle_init();
+}
+
+static const char * const imx6sx_dt_compat[] __initconst = {
         "fsl,imx6sx",
         NULL,
 };
@@ -47,5 +54,6 @@ DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)")
         .init_irq       = imx6sx_init_irq,
         .init_machine   = imx6sx_init_machine,
         .dt_compat      = imx6sx_dt_compat,
+        .init_late      = imx6sx_init_late,
         .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c
index ea1fa199c148..0d01e367b062 100644
--- a/arch/arm/mach-imx/mach-mx25_3ds.c
+++ b/arch/arm/mach-imx/mach-mx25_3ds.c
@@ -39,6 +39,7 @@
 
 #include "common.h"
 #include "devices-imx25.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx25.h"
 #include "mx25.h"
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index 435a5428a678..9ef4640f3660 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -40,6 +40,7 @@
 #include "3ds_debugboard.h"
 #include "common.h"
 #include "devices-imx27.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx27.h"
 #include "ulpi.h"
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c
index 2f834ce8f39c..eb1c3477c48a 100644
--- a/arch/arm/mach-imx/mach-mx27ads.c
+++ b/arch/arm/mach-imx/mach-mx27ads.c
@@ -245,7 +245,7 @@ static void __init mx27ads_regulator_init(void)
         vchip->set              = vgpio_set;
         gpiochip_add(vchip);
 
-        platform_device_register_data(&platform_bus, "reg-fixed-voltage",
+        platform_device_register_data(NULL, "reg-fixed-voltage",
                                       PLATFORM_DEVID_AUTO,
                                       &mx27ads_lcd_regulator_pdata,
                                       sizeof(mx27ads_lcd_regulator_pdata));
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 4217871a9653..453f41a2c5a9 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -40,6 +40,7 @@
 #include "3ds_debugboard.h"
 #include "common.h"
 #include "devices-imx31.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx3.h"
 #include "ulpi.h"
diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c
index eee042fa2768..e9549a3c0223 100644
--- a/arch/arm/mach-imx/mach-mx31lilly.c
+++ b/arch/arm/mach-imx/mach-mx31lilly.c
@@ -45,6 +45,7 @@
 #include "board-mx31lilly.h"
 #include "common.h"
 #include "devices-imx31.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx3.h"
 #include "ulpi.h"
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c
index fa15d0b6118d..57eac6f45fab 100644
--- a/arch/arm/mach-imx/mach-mx31lite.c
+++ b/arch/arm/mach-imx/mach-mx31lite.c
@@ -42,6 +42,7 @@
 #include "board-mx31lite.h"
 #include "common.h"
 #include "devices-imx31.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx3.h"
 #include "ulpi.h"
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index 08730f238449..bb6f8a52a6b8 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -47,6 +47,7 @@
 #include "board-mx31moboard.h"
 #include "common.h"
 #include "devices-imx31.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx3.h"
 #include "ulpi.h"
@@ -434,10 +435,8 @@ static int __init moboard_usbh2_init(void)
                 return -ENODEV;
 
         pdev = imx31_add_mxc_ehci_hs(2, &usbh2_pdata);
-        if (IS_ERR(pdev))
-                return PTR_ERR(pdev);
 
-        return 0;
+        return PTR_ERR_OR_ZERO(pdev);
 }
 
 static const struct gpio_led mx31moboard_leds[] __initconst = {
diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c
index 4e8b184d773b..72cd77d21f63 100644
--- a/arch/arm/mach-imx/mach-mx35_3ds.c
+++ b/arch/arm/mach-imx/mach-mx35_3ds.c
@@ -50,6 +50,7 @@
 #include "3ds_debugboard.h"
 #include "common.h"
 #include "devices-imx35.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx35.h"
 
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index 12212378c672..2d1c50bd8bdf 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -36,6 +36,7 @@
 
 #include "common.h"
 #include "devices-imx27.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx27.h"
 #include "ulpi.h"
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c
index 81b8affb9448..8eb1570f7851 100644
--- a/arch/arm/mach-imx/mach-pcm037.c
+++ b/arch/arm/mach-imx/mach-pcm037.c
@@ -45,6 +45,7 @@
 
 #include "common.h"
 #include "devices-imx31.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx3.h"
 #include "pcm037.h"
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c
index 6c56fb5553c7..ee862ad6b6fc 100644
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@ -36,6 +36,7 @@
 #include "board-pcm038.h"
 #include "common.h"
 #include "devices-imx27.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx27.h"
 #include "ulpi.h"
diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c
index c62b5d261345..b623bcaca76c 100644
--- a/arch/arm/mach-imx/mach-pcm043.c
+++ b/arch/arm/mach-imx/mach-pcm043.c
@@ -35,6 +35,7 @@
 
 #include "common.h"
 #include "devices-imx35.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx35.h"
 #include "ulpi.h"
diff --git a/arch/arm/mach-imx/mach-vf610.c b/arch/arm/mach-imx/mach-vf610.c
index c44602758120..ee7e57b752a7 100644
--- a/arch/arm/mach-imx/mach-vf610.c
+++ b/arch/arm/mach-imx/mach-vf610.c
@@ -20,7 +20,7 @@ static void __init vf610_init_machine(void)
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-static const char *vf610_dt_compat[] __initconst = {
+static const char * const vf610_dt_compat[] __initconst = {
         "fsl,vf610",
         NULL,
 };
diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c
index 872b3c6ba408..97836e94451c 100644
--- a/arch/arm/mach-imx/mach-vpr200.c
+++ b/arch/arm/mach-imx/mach-vpr200.c
@@ -34,6 +34,7 @@
 
 #include "common.h"
 #include "devices-imx35.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx35.h"
 
diff --git a/arch/arm/mach-imx/mm-imx5.c b/arch/arm/mach-imx/mm-imx5.c
deleted file mode 100644
index 4c112021aa4e..000000000000
--- a/arch/arm/mach-imx/mm-imx5.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * 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
- *
- * Create static mapping between physical to virtual memory.
- */
-
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/pinctrl/machine.h>
-#include <linux/of_address.h>
-
-#include <asm/mach/map.h>
-
-#include "common.h"
-#include "devices/devices-common.h"
-#include "hardware.h"
-#include "iomux-v3.h"
-
-/*
- * Define the MX51 memory map.
- */
-static struct map_desc mx51_io_desc[] __initdata = {
-        imx_map_entry(MX51, TZIC, MT_DEVICE),
-        imx_map_entry(MX51, IRAM, MT_DEVICE),
-        imx_map_entry(MX51, AIPS1, MT_DEVICE),
-        imx_map_entry(MX51, SPBA0, MT_DEVICE),
-        imx_map_entry(MX51, AIPS2, MT_DEVICE),
-};
-
-/*
- * Define the MX53 memory map.
- */
-static struct map_desc mx53_io_desc[] __initdata = {
-        imx_map_entry(MX53, TZIC, MT_DEVICE),
-        imx_map_entry(MX53, AIPS1, MT_DEVICE),
-        imx_map_entry(MX53, SPBA0, MT_DEVICE),
-        imx_map_entry(MX53, AIPS2, MT_DEVICE),
-};
-
-/*
- * This function initializes the memory map. It is called during the
- * system startup to create static physical to virtual memory mappings
- * for the IO modules.
- */
-void __init mx51_map_io(void)
-{
-        iotable_init(mx51_io_desc, ARRAY_SIZE(mx51_io_desc));
-}
-
-void __init mx53_map_io(void)
-{
-        iotable_init(mx53_io_desc, ARRAY_SIZE(mx53_io_desc));
-}
-
-/*
- * The MIPI HSC unit has been removed from the i.MX51 Reference Manual by
- * the Freescale marketing division. However this did not remove the
- * hardware from the chip which still needs to be configured for proper
- * IPU support.
- */
-static void __init imx51_ipu_mipi_setup(void)
-{
-        void __iomem *hsc_addr;
-        hsc_addr = MX51_IO_ADDRESS(MX51_MIPI_HSC_BASE_ADDR);
-
-        /* setup MIPI module to legacy mode */
-        __raw_writel(0xf00, hsc_addr);
-
-        /* CSI mode: reserved; DI control mode: legacy (from Freescale BSP) */
-        __raw_writel(__raw_readl(hsc_addr + 0x800) | 0x30ff,
-                hsc_addr + 0x800);
-}
-
-void __init imx51_init_early(void)
-{
-        imx51_ipu_mipi_setup();
-        mxc_set_cpu_type(MXC_CPU_MX51);
-        mxc_iomux_v3_init(MX51_IO_ADDRESS(MX51_IOMUXC_BASE_ADDR));
-        imx_src_init();
-}
-
-void __init imx53_init_early(void)
-{
-        mxc_set_cpu_type(MXC_CPU_MX53);
-        imx_src_init();
-}
-
-void __init mx51_init_irq(void)
-{
-        tzic_init_irq(MX51_IO_ADDRESS(MX51_TZIC_BASE_ADDR));
-}
-
-void __init mx53_init_irq(void)
-{
-        struct device_node *np;
-        void __iomem *base;
-
-        np = of_find_compatible_node(NULL, NULL, "fsl,imx53-tzic");
-        base = of_iomap(np, 0);
-        WARN_ON(!base);
-
-        tzic_init_irq(base);
-}
-
-static struct sdma_platform_data imx51_sdma_pdata __initdata = {
-        .fw_name = "sdma-imx51.bin",
-};
-
-static const struct resource imx51_audmux_res[] __initconst = {
-        DEFINE_RES_MEM(MX51_AUDMUX_BASE_ADDR, SZ_16K),
-};
-
-void __init imx51_soc_init(void)
-{
-        mxc_arch_reset_init(MX51_IO_ADDRESS(MX51_WDOG1_BASE_ADDR));
-        mxc_device_init();
-
-        /* i.mx51 has the i.mx35 type gpio */
-        mxc_register_gpio("imx35-gpio", 0, MX51_GPIO1_BASE_ADDR, SZ_16K, MX51_INT_GPIO1_LOW, MX51_INT_GPIO1_HIGH);
-        mxc_register_gpio("imx35-gpio", 1, MX51_GPIO2_BASE_ADDR, SZ_16K, MX51_INT_GPIO2_LOW, MX51_INT_GPIO2_HIGH);
-        mxc_register_gpio("imx35-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_INT_GPIO3_LOW, MX51_INT_GPIO3_HIGH);
-        mxc_register_gpio("imx35-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_INT_GPIO4_LOW, MX51_INT_GPIO4_HIGH);
-
-        pinctrl_provide_dummies();
-
-        /* i.mx51 has the i.mx35 type sdma */
-        imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata);
-
-        /* Setup AIPS registers */
-        imx_set_aips(MX51_IO_ADDRESS(MX51_AIPS1_BASE_ADDR));
-        imx_set_aips(MX51_IO_ADDRESS(MX51_AIPS2_BASE_ADDR));
-
-        /* i.mx51 has the i.mx31 type audmux */
-        platform_device_register_simple("imx31-audmux", 0, imx51_audmux_res,
-                                        ARRAY_SIZE(imx51_audmux_res));
-}
-
-void __init imx51_init_late(void)
-{
-        mx51_neon_fixup();
-        imx5_pm_init();
-}
-
-void __init imx53_init_late(void)
-{
-        imx5_pm_init();
-}
diff --git a/arch/arm/mach-imx/mx1-camera-fiq-ksym.c b/arch/arm/mach-imx/mx1-camera-fiq-ksym.c
deleted file mode 100644
index fb38436ca67f..000000000000
--- a/arch/arm/mach-imx/mx1-camera-fiq-ksym.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Exported ksyms of ARCH_MX1
- *
- * Copyright (C) 2008, Darius Augulis <augulis.darius@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/platform_device.h>
-#include <linux/module.h>
-
-#include <linux/platform_data/camera-mx1.h>
-
-/* IMX camera FIQ handler */
-EXPORT_SYMBOL(mx1_camera_sof_fiq_start);
-EXPORT_SYMBOL(mx1_camera_sof_fiq_end);
diff --git a/arch/arm/mach-imx/mx1-camera-fiq.S b/arch/arm/mach-imx/mx1-camera-fiq.S
deleted file mode 100644
index 9c69aa65bf17..000000000000
--- a/arch/arm/mach-imx/mx1-camera-fiq.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (C) 2008 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
- *
- *  Based on linux/arch/arm/lib/floppydma.S
- *      Copyright (C) 1995, 1996 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/linkage.h>
-#include <asm/assembler.h>
-
-                .text
-                .global mx1_camera_sof_fiq_end
-                .global mx1_camera_sof_fiq_start
-mx1_camera_sof_fiq_start:
-                @ enable dma
-                ldr     r12, [r9]
-                orr     r12, r12, #0x00000001
-                str     r12, [r9]
-                @ unmask DMA interrupt
-                ldr     r12, [r8]
-                bic     r12, r12, r13
-                str     r12, [r8]
-                @ disable SOF interrupt
-                ldr     r12, [r10]
-                bic     r12, r12, #0x00010000
-                str     r12, [r10]
-                @ clear SOF flag
-                mov     r12, #0x00010000
-                str     r12, [r11]
-                @ return from FIQ
-                subs    pc, lr, #4
-mx1_camera_sof_fiq_end:
diff --git a/arch/arm/mach-imx/mx31moboard-devboard.c b/arch/arm/mach-imx/mx31moboard-devboard.c
index 52d5b1574721..1e91a0918e83 100644
--- a/arch/arm/mach-imx/mx31moboard-devboard.c
+++ b/arch/arm/mach-imx/mx31moboard-devboard.c
@@ -24,6 +24,7 @@
 
 #include "common.h"
 #include "devices-imx31.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx3.h"
 #include "ulpi.h"
@@ -213,10 +214,8 @@ static int __init devboard_usbh1_init(void)
         usbh1_pdata.otg = phy;
 
         pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);
-        if (IS_ERR(pdev))
-                return PTR_ERR(pdev);
 
-        return 0;
+        return PTR_ERR_OR_ZERO(pdev);
 }
 
 
diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c
index a4f43e90f3c1..2e895a82a6eb 100644
--- a/arch/arm/mach-imx/mx31moboard-marxbot.c
+++ b/arch/arm/mach-imx/mx31moboard-marxbot.c
@@ -28,6 +28,7 @@
 
 #include "common.h"
 #include "devices-imx31.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx3.h"
 #include "ulpi.h"
@@ -327,10 +328,8 @@ static int __init marxbot_usbh1_init(void)
         usbh1_pdata.otg = phy;
 
         pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);
-        if (IS_ERR(pdev))
-                return PTR_ERR(pdev);
 
-        return 0;
+        return PTR_ERR_OR_ZERO(pdev);
 }
 
 static const struct fsl_usb2_platform_data usb_pdata __initconst = {
diff --git a/arch/arm/mach-imx/mx31moboard-smartbot.c b/arch/arm/mach-imx/mx31moboard-smartbot.c
index 04ae45dbfaa7..89fc35a64448 100644
--- a/arch/arm/mach-imx/mx31moboard-smartbot.c
+++ b/arch/arm/mach-imx/mx31moboard-smartbot.c
@@ -28,6 +28,7 @@
 #include "board-mx31moboard.h"
 #include "common.h"
 #include "devices-imx31.h"
+#include "ehci.h"
 #include "hardware.h"
 #include "iomux-mx3.h"
 #include "ulpi.h"
@@ -141,10 +142,8 @@ static int __init smartbot_otg_host_init(void)
                 return -ENODEV;
 
         pdev = imx31_add_mxc_ehci_otg(&otg_host_pdata);
-        if (IS_ERR(pdev))
-                return PTR_ERR(pdev);
 
-        return 0;
+        return PTR_ERR_OR_ZERO(pdev);
 }
 #else
 static inline int smartbot_otg_host_init(void) { return 0; }
diff --git a/arch/arm/mach-imx/mx51.h b/arch/arm/mach-imx/mx51.h
deleted file mode 100644
index af844f76261a..000000000000
--- a/arch/arm/mach-imx/mx51.h
+++ /dev/null
@@ -1,346 +0,0 @@
-#ifndef __MACH_MX51_H__
-#define __MACH_MX51_H__
-
-/*
- * IROM
- */
-#define MX51_IROM_BASE_ADDR             0x0
-#define MX51_IROM_SIZE                  SZ_64K
-
-/*
- * IRAM
- */
-#define MX51_IRAM_BASE_ADDR             0x1ffe0000      /* internal ram */
-#define MX51_IRAM_PARTITIONS            16
-#define MX51_IRAM_SIZE          (MX51_IRAM_PARTITIONS * SZ_8K)  /* 128KB */
-
-#define MX51_GPU_BASE_ADDR              0x20000000
-#define MX51_GPU_CTRL_BASE_ADDR         0x30000000
-#define MX51_IPU_CTRL_BASE_ADDR         0x40000000
-
-/*
- * SPBA global module enabled #0
- */
-#define MX51_SPBA0_BASE_ADDR            0x70000000
-#define MX51_SPBA0_SIZE                 SZ_1M
-
-#define MX51_ESDHC1_BASE_ADDR           (MX51_SPBA0_BASE_ADDR + 0x04000)
-#define MX51_ESDHC2_BASE_ADDR           (MX51_SPBA0_BASE_ADDR + 0x08000)
-#define MX51_UART3_BASE_ADDR            (MX51_SPBA0_BASE_ADDR + 0x0c000)
-#define MX51_ECSPI1_BASE_ADDR           (MX51_SPBA0_BASE_ADDR + 0x10000)
-#define MX51_SSI2_BASE_ADDR             (MX51_SPBA0_BASE_ADDR + 0x14000)
-#define MX51_ESDHC3_BASE_ADDR           (MX51_SPBA0_BASE_ADDR + 0x20000)
-#define MX51_ESDHC4_BASE_ADDR           (MX51_SPBA0_BASE_ADDR + 0x24000)
-#define MX51_SPDIF_BASE_ADDR            (MX51_SPBA0_BASE_ADDR + 0x28000)
-#define MX51_ATA_DMA_BASE_ADDR          (MX51_SPBA0_BASE_ADDR + 0x30000)
-#define MX51_SLIM_DMA_BASE_ADDR         (MX51_SPBA0_BASE_ADDR + 0x34000)
-#define MX51_HSI2C_DMA_BASE_ADDR        (MX51_SPBA0_BASE_ADDR + 0x38000)
-#define MX51_SPBA_CTRL_BASE_ADDR        (MX51_SPBA0_BASE_ADDR + 0x3c000)
-
-/*
- * AIPS 1
- */
-#define MX51_AIPS1_BASE_ADDR            0x73f00000
-#define MX51_AIPS1_SIZE                 SZ_1M
-
-#define MX51_USB_BASE_ADDR              (MX51_AIPS1_BASE_ADDR + 0x80000)
-#define MX51_USB_OTG_BASE_ADDR          (MX51_USB_BASE_ADDR + 0x0000)
-#define MX51_USB_HS1_BASE_ADDR          (MX51_USB_BASE_ADDR + 0x0200)
-#define MX51_USB_HS2_BASE_ADDR          (MX51_USB_BASE_ADDR + 0x0400)
-#define MX51_GPIO1_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0x84000)
-#define MX51_GPIO2_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0x88000)
-#define MX51_GPIO3_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0x8c000)
-#define MX51_GPIO4_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0x90000)
-#define MX51_KPP_BASE_ADDR              (MX51_AIPS1_BASE_ADDR + 0x94000)
-#define MX51_WDOG1_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0x98000)
-#define MX51_WDOG2_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0x9c000)
-#define MX51_GPT1_BASE_ADDR             (MX51_AIPS1_BASE_ADDR + 0xa0000)
-#define MX51_SRTC_BASE_ADDR             (MX51_AIPS1_BASE_ADDR + 0xa4000)
-#define MX51_IOMUXC_BASE_ADDR           (MX51_AIPS1_BASE_ADDR + 0xa8000)
-#define MX51_EPIT1_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0xac000)
-#define MX51_EPIT2_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0xb0000)
-#define MX51_PWM1_BASE_ADDR             (MX51_AIPS1_BASE_ADDR + 0xb4000)
-#define MX51_PWM2_BASE_ADDR             (MX51_AIPS1_BASE_ADDR + 0xb8000)
-#define MX51_UART1_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0xbc000)
-#define MX51_UART2_BASE_ADDR            (MX51_AIPS1_BASE_ADDR + 0xc0000)
-#define MX51_SRC_BASE_ADDR              (MX51_AIPS1_BASE_ADDR + 0xd0000)
-#define MX51_CCM_BASE_ADDR              (MX51_AIPS1_BASE_ADDR + 0xd4000)
-#define MX51_GPC_BASE_ADDR              (MX51_AIPS1_BASE_ADDR + 0xd8000)
-
-/*
- * AIPS 2
- */
-#define MX51_AIPS2_BASE_ADDR            0x83f00000
-#define MX51_AIPS2_SIZE                 SZ_1M
-
-#define MX51_PLL1_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0x80000)
-#define MX51_PLL2_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0x84000)
-#define MX51_PLL3_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0x88000)
-#define MX51_AHBMAX_BASE_ADDR           (MX51_AIPS2_BASE_ADDR + 0x94000)
-#define MX51_IIM_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0x98000)
-#define MX51_CSU_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0x9c000)
-#define MX51_ARM_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0xa0000)
-#define MX51_OWIRE_BASE_ADDR            (MX51_AIPS2_BASE_ADDR + 0xa4000)
-#define MX51_FIRI_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xa8000)
-#define MX51_ECSPI2_BASE_ADDR           (MX51_AIPS2_BASE_ADDR + 0xac000)
-#define MX51_SDMA_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xb0000)
-#define MX51_SCC_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0xb4000)
-#define MX51_ROMCP_BASE_ADDR            (MX51_AIPS2_BASE_ADDR + 0xb8000)
-#define MX51_RTIC_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xbc000)
-#define MX51_CSPI_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xc0000)
-#define MX51_I2C2_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xc4000)
-#define MX51_I2C1_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xc8000)
-#define MX51_SSI1_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xcc000)
-#define MX51_AUDMUX_BASE_ADDR           (MX51_AIPS2_BASE_ADDR + 0xd0000)
-#define MX51_M4IF_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xd8000)
-#define MX51_ESDCTL_BASE_ADDR           (MX51_AIPS2_BASE_ADDR + 0xd9000)
-#define MX51_WEIM_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xda000)
-#define MX51_NFC_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0xdb000)
-#define MX51_EMI_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0xdbf00)
-#define MX51_MIPI_HSC_BASE_ADDR         (MX51_AIPS2_BASE_ADDR + 0xdc000)
-#define MX51_ATA_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0xe0000)
-#define MX51_SIM_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0xe4000)
-#define MX51_SSI3_BASE_ADDR             (MX51_AIPS2_BASE_ADDR + 0xe8000)
-#define MX51_FEC_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0xec000)
-#define MX51_TVE_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0xf0000)
-#define MX51_VPU_BASE_ADDR              (MX51_AIPS2_BASE_ADDR + 0xf4000)
-#define MX51_SAHARA_BASE_ADDR           (MX51_AIPS2_BASE_ADDR + 0xf8000)
-
-#define MX51_CSD0_BASE_ADDR             0x90000000
-#define MX51_CSD1_BASE_ADDR             0xa0000000
-#define MX51_CS0_BASE_ADDR              0xb0000000
-#define MX51_CS1_BASE_ADDR              0xb8000000
-#define MX51_CS2_BASE_ADDR              0xc0000000
-#define MX51_CS3_BASE_ADDR              0xc8000000
-#define MX51_CS4_BASE_ADDR              0xcc000000
-#define MX51_CS5_BASE_ADDR              0xce000000
-
-/*
- * NFC
- */
-#define MX51_NFC_AXI_BASE_ADDR          0xcfff0000      /* NAND flash AXI */
-#define MX51_NFC_AXI_SIZE               SZ_64K
-
-#define MX51_GPU2D_BASE_ADDR            0xd0000000
-#define MX51_TZIC_BASE_ADDR             0xe0000000
-#define MX51_TZIC_SIZE                  SZ_16K
-
-#define MX51_IO_P2V(x)                  IMX_IO_P2V(x)
-#define MX51_IO_ADDRESS(x)              IOMEM(MX51_IO_P2V(x))
-
-/*
- * defines for SPBA modules
- */
-#define MX51_SPBA_SDHC1 0x04
-#define MX51_SPBA_SDHC2 0x08
-#define MX51_SPBA_UART3 0x0c
-#define MX51_SPBA_CSPI1 0x10
-#define MX51_SPBA_SSI2  0x14
-#define MX51_SPBA_SDHC3 0x20
-#define MX51_SPBA_SDHC4 0x24
-#define MX51_SPBA_SPDIF 0x28
-#define MX51_SPBA_ATA   0x30
-#define MX51_SPBA_SLIM  0x34
-#define MX51_SPBA_HSI2C 0x38
-#define MX51_SPBA_CTRL  0x3c
-
-/*
- * Defines for modules using static and dynamic DMA channels
- */
-#define MX51_MXC_DMA_CHANNEL_IRAM       30
-#define MX51_MXC_DMA_CHANNEL_SPDIF_TX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART1_RX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART1_TX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART2_RX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART2_TX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART3_RX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_UART3_TX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_MMC1       MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_MMC2       MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_SSI1_RX    MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_SSI1_TX    MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_SSI2_RX    MXC_DMA_DYNAMIC_CHANNEL
-#ifdef CONFIG_SDMA_IRAM
-#define MX51_MXC_DMA_CHANNEL_SSI2_TX    (MX51_MXC_DMA_CHANNEL_IRAM + 1)
-#else                           /*CONFIG_SDMA_IRAM */
-#define MX51_MXC_DMA_CHANNEL_SSI2_TX    MXC_DMA_DYNAMIC_CHANNEL
-#endif                          /*CONFIG_SDMA_IRAM */
-#define MX51_MXC_DMA_CHANNEL_CSPI1_RX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_CSPI1_TX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_CSPI2_RX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_CSPI2_TX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_CSPI3_RX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_CSPI3_TX   MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_ATA_RX     MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_ATA_TX     MXC_DMA_DYNAMIC_CHANNEL
-#define MX51_MXC_DMA_CHANNEL_MEMORY     MXC_DMA_DYNAMIC_CHANNEL
-
-#define MX51_IS_MEM_DEVICE_NONSHARED(x)         0
-
-/*
- * DMA request assignments
- */
-#define MX51_DMA_REQ_VPU                0
-#define MX51_DMA_REQ_GPC                1
-#define MX51_DMA_REQ_ATA_RX             2
-#define MX51_DMA_REQ_ATA_TX             3
-#define MX51_DMA_REQ_ATA_TX_END         4
-#define MX51_DMA_REQ_SLIM_B             5
-#define MX51_DMA_REQ_CSPI1_RX           6
-#define MX51_DMA_REQ_CSPI1_TX           7
-#define MX51_DMA_REQ_CSPI2_RX           8
-#define MX51_DMA_REQ_CSPI2_TX           9
-#define MX51_DMA_REQ_HS_I2C_TX          10
-#define MX51_DMA_REQ_HS_I2C_RX          11
-#define MX51_DMA_REQ_FIRI_RX            12
-#define MX51_DMA_REQ_FIRI_TX            13
-#define MX51_DMA_REQ_EXTREQ1            14
-#define MX51_DMA_REQ_GPU                15
-#define MX51_DMA_REQ_UART2_RX           16
-#define MX51_DMA_REQ_UART2_TX           17
-#define MX51_DMA_REQ_UART1_RX           18
-#define MX51_DMA_REQ_UART1_TX           19
-#define MX51_DMA_REQ_SDHC1              20
-#define MX51_DMA_REQ_SDHC2              21
-#define MX51_DMA_REQ_SSI2_RX1           22
-#define MX51_DMA_REQ_SSI2_TX1           23
-#define MX51_DMA_REQ_SSI2_RX0           24
-#define MX51_DMA_REQ_SSI2_TX0           25
-#define MX51_DMA_REQ_SSI1_RX1           26
-#define MX51_DMA_REQ_SSI1_TX1           27
-#define MX51_DMA_REQ_SSI1_RX0           28
-#define MX51_DMA_REQ_SSI1_TX0           29
-#define MX51_DMA_REQ_EMI_RD             30
-#define MX51_DMA_REQ_CTI2_0             31
-#define MX51_DMA_REQ_EMI_WR             32
-#define MX51_DMA_REQ_CTI2_1             33
-#define MX51_DMA_REQ_EPIT2              34
-#define MX51_DMA_REQ_SSI3_RX1           35
-#define MX51_DMA_REQ_IPU                36
-#define MX51_DMA_REQ_SSI3_TX1           37
-#define MX51_DMA_REQ_CSPI_RX            38
-#define MX51_DMA_REQ_CSPI_TX            39
-#define MX51_DMA_REQ_SDHC3              40
-#define MX51_DMA_REQ_SDHC4              41
-#define MX51_DMA_REQ_SLIM_B_TX          42
-#define MX51_DMA_REQ_UART3_RX           43
-#define MX51_DMA_REQ_UART3_TX           44
-#define MX51_DMA_REQ_SPDIF              45
-#define MX51_DMA_REQ_SSI3_RX0           46
-#define MX51_DMA_REQ_SSI3_TX0           47
-
-/*
- * Interrupt numbers
- */
-#include <asm/irq.h>
-#define MX51_INT_BASE                   (NR_IRQS_LEGACY + 0)
-#define MX51_INT_RESV0                  (NR_IRQS_LEGACY + 0)
-#define MX51_INT_ESDHC1                 (NR_IRQS_LEGACY + 1)
-#define MX51_INT_ESDHC2                 (NR_IRQS_LEGACY + 2)
-#define MX51_INT_ESDHC3                 (NR_IRQS_LEGACY + 3)
-#define MX51_INT_ESDHC4                 (NR_IRQS_LEGACY + 4)
-#define MX51_INT_RESV5                  (NR_IRQS_LEGACY + 5)
-#define MX51_INT_SDMA                   (NR_IRQS_LEGACY + 6)
-#define MX51_INT_IOMUX                  (NR_IRQS_LEGACY + 7)
-#define MX51_INT_NFC                    (NR_IRQS_LEGACY + 8)
-#define MX51_INT_VPU                    (NR_IRQS_LEGACY + 9)
-#define MX51_INT_IPU_ERR                (NR_IRQS_LEGACY + 10)
-#define MX51_INT_IPU_SYN                (NR_IRQS_LEGACY + 11)
-#define MX51_INT_GPU                    (NR_IRQS_LEGACY + 12)
-#define MX51_INT_RESV13                 (NR_IRQS_LEGACY + 13)
-#define MX51_INT_USB_HS1                (NR_IRQS_LEGACY + 14)
-#define MX51_INT_EMI                    (NR_IRQS_LEGACY + 15)
-#define MX51_INT_USB_HS2                (NR_IRQS_LEGACY + 16)
-#define MX51_INT_USB_HS3                (NR_IRQS_LEGACY + 17)
-#define MX51_INT_USB_OTG                (NR_IRQS_LEGACY + 18)
-#define MX51_INT_SAHARA_H0              (NR_IRQS_LEGACY + 19)
-#define MX51_INT_SAHARA_H1              (NR_IRQS_LEGACY + 20)
-#define MX51_INT_SCC_SMN                (NR_IRQS_LEGACY + 21)
-#define MX51_INT_SCC_STZ                (NR_IRQS_LEGACY + 22)
-#define MX51_INT_SCC_SCM                (NR_IRQS_LEGACY + 23)
-#define MX51_INT_SRTC_NTZ               (NR_IRQS_LEGACY + 24)
-#define MX51_INT_SRTC_TZ                (NR_IRQS_LEGACY + 25)
-#define MX51_INT_RTIC                   (NR_IRQS_LEGACY + 26)
-#define MX51_INT_CSU                    (NR_IRQS_LEGACY + 27)
-#define MX51_INT_SLIM_B                 (NR_IRQS_LEGACY + 28)
-#define MX51_INT_SSI1                   (NR_IRQS_LEGACY + 29)
-#define MX51_INT_SSI2                   (NR_IRQS_LEGACY + 30)
-#define MX51_INT_UART1                  (NR_IRQS_LEGACY + 31)
-#define MX51_INT_UART2                  (NR_IRQS_LEGACY + 32)
-#define MX51_INT_UART3                  (NR_IRQS_LEGACY + 33)
-#define MX51_INT_RESV34                 (NR_IRQS_LEGACY + 34)
-#define MX51_INT_RESV35                 (NR_IRQS_LEGACY + 35)
-#define MX51_INT_ECSPI1                 (NR_IRQS_LEGACY + 36)
-#define MX51_INT_ECSPI2                 (NR_IRQS_LEGACY + 37)
-#define MX51_INT_CSPI                   (NR_IRQS_LEGACY + 38)
-#define MX51_INT_GPT                    (NR_IRQS_LEGACY + 39)
-#define MX51_INT_EPIT1                  (NR_IRQS_LEGACY + 40)
-#define MX51_INT_EPIT2                  (NR_IRQS_LEGACY + 41)
-#define MX51_INT_GPIO1_INT7             (NR_IRQS_LEGACY + 42)
-#define MX51_INT_GPIO1_INT6             (NR_IRQS_LEGACY + 43)
-#define MX51_INT_GPIO1_INT5             (NR_IRQS_LEGACY + 44)
-#define MX51_INT_GPIO1_INT4             (NR_IRQS_LEGACY + 45)
-#define MX51_INT_GPIO1_INT3             (NR_IRQS_LEGACY + 46)
-#define MX51_INT_GPIO1_INT2             (NR_IRQS_LEGACY + 47)
-#define MX51_INT_GPIO1_INT1             (NR_IRQS_LEGACY + 48)
-#define MX51_INT_GPIO1_INT0             (NR_IRQS_LEGACY + 49)
-#define MX51_INT_GPIO1_LOW              (NR_IRQS_LEGACY + 50)
-#define MX51_INT_GPIO1_HIGH             (NR_IRQS_LEGACY + 51)
-#define MX51_INT_GPIO2_LOW              (NR_IRQS_LEGACY + 52)
-#define MX51_INT_GPIO2_HIGH             (NR_IRQS_LEGACY + 53)
-#define MX51_INT_GPIO3_LOW              (NR_IRQS_LEGACY + 54)
-#define MX51_INT_GPIO3_HIGH             (NR_IRQS_LEGACY + 55)
-#define MX51_INT_GPIO4_LOW              (NR_IRQS_LEGACY + 56)
-#define MX51_INT_GPIO4_HIGH             (NR_IRQS_LEGACY + 57)
-#define MX51_INT_WDOG1                  (NR_IRQS_LEGACY + 58)
-#define MX51_INT_WDOG2                  (NR_IRQS_LEGACY + 59)
-#define MX51_INT_KPP                    (NR_IRQS_LEGACY + 60)
-#define MX51_INT_PWM1                   (NR_IRQS_LEGACY + 61)
-#define MX51_INT_I2C1                   (NR_IRQS_LEGACY + 62)
-#define MX51_INT_I2C2                   (NR_IRQS_LEGACY + 63)
-#define MX51_INT_HS_I2C                 (NR_IRQS_LEGACY + 64)
-#define MX51_INT_RESV65                 (NR_IRQS_LEGACY + 65)
-#define MX51_INT_RESV66                 (NR_IRQS_LEGACY + 66)
-#define MX51_INT_SIM_IPB                (NR_IRQS_LEGACY + 67)
-#define MX51_INT_SIM_DAT                (NR_IRQS_LEGACY + 68)
-#define MX51_INT_IIM                    (NR_IRQS_LEGACY + 69)
-#define MX51_INT_ATA                    (NR_IRQS_LEGACY + 70)
-#define MX51_INT_CCM1                   (NR_IRQS_LEGACY + 71)
-#define MX51_INT_CCM2                   (NR_IRQS_LEGACY + 72)
-#define MX51_INT_GPC1                   (NR_IRQS_LEGACY + 73)
-#define MX51_INT_GPC2                   (NR_IRQS_LEGACY + 74)
-#define MX51_INT_SRC                    (NR_IRQS_LEGACY + 75)
-#define MX51_INT_NM                     (NR_IRQS_LEGACY + 76)
-#define MX51_INT_PMU                    (NR_IRQS_LEGACY + 77)
-#define MX51_INT_CTI_IRQ                (NR_IRQS_LEGACY + 78)
-#define MX51_INT_CTI1_TG0               (NR_IRQS_LEGACY + 79)
-#define MX51_INT_CTI1_TG1               (NR_IRQS_LEGACY + 80)
-#define MX51_INT_MCG_ERR                (NR_IRQS_LEGACY + 81)
-#define MX51_INT_MCG_TMR                (NR_IRQS_LEGACY + 82)
-#define MX51_INT_MCG_FUNC               (NR_IRQS_LEGACY + 83)
-#define MX51_INT_GPU2_IRQ               (NR_IRQS_LEGACY + 84)
-#define MX51_INT_GPU2_BUSY              (NR_IRQS_LEGACY + 85)
-#define MX51_INT_RESV86                 (NR_IRQS_LEGACY + 86)
-#define MX51_INT_FEC                    (NR_IRQS_LEGACY + 87)
-#define MX51_INT_OWIRE                  (NR_IRQS_LEGACY + 88)
-#define MX51_INT_CTI1_TG2               (NR_IRQS_LEGACY + 89)
-#define MX51_INT_SJC                    (NR_IRQS_LEGACY + 90)
-#define MX51_INT_SPDIF                  (NR_IRQS_LEGACY + 91)
-#define MX51_INT_TVE                    (NR_IRQS_LEGACY + 92)
-#define MX51_INT_FIRI                   (NR_IRQS_LEGACY + 93)
-#define MX51_INT_PWM2                   (NR_IRQS_LEGACY + 94)
-#define MX51_INT_SLIM_EXP               (NR_IRQS_LEGACY + 95)
-#define MX51_INT_SSI3                   (NR_IRQS_LEGACY + 96)
-#define MX51_INT_EMI_BOOT               (NR_IRQS_LEGACY + 97)
-#define MX51_INT_CTI1_TG3               (NR_IRQS_LEGACY + 98)
-#define MX51_INT_SMC_RX                 (NR_IRQS_LEGACY + 99)
-#define MX51_INT_VPU_IDLE               (NR_IRQS_LEGACY + 100)
-#define MX51_INT_EMI_NFC                (NR_IRQS_LEGACY + 101)
-#define MX51_INT_GPU_IDLE               (NR_IRQS_LEGACY + 102)
-
-#if !defined(__ASSEMBLY__) && !defined(__MXC_BOOT_UNCOMPRESS)
-extern int mx51_revision(void);
-extern void mx51_display_revision(void);
-#endif
-
-#endif  /* ifndef __MACH_MX51_H__ */
diff --git a/arch/arm/mach-imx/mx53.h b/arch/arm/mach-imx/mx53.h
deleted file mode 100644
index f829d1c22501..000000000000
--- a/arch/arm/mach-imx/mx53.h
+++ /dev/null
@@ -1,342 +0,0 @@
-#ifndef __MACH_MX53_H__
-#define __MACH_MX53_H__
-
-/*
- * IROM
- */
-#define MX53_IROM_BASE_ADDR             0x0
-#define MX53_IROM_SIZE                  SZ_64K
-
-/* TZIC */
-#define MX53_TZIC_BASE_ADDR             0x0FFFC000
-#define MX53_TZIC_SIZE                  SZ_16K
-
-/*
- * AHCI SATA
- */
-#define MX53_SATA_BASE_ADDR             0x10000000
-
-/*
- * NFC
- */
-#define MX53_NFC_AXI_BASE_ADDR  0xF7FF0000      /* NAND flash AXI */
-#define MX53_NFC_AXI_SIZE               SZ_64K
-
-/*
- * IRAM
- */
-#define MX53_IRAM_BASE_ADDR     0xF8000000      /* internal ram */
-#define MX53_IRAM_PARTITIONS    16
-#define MX53_IRAM_SIZE          (MX53_IRAM_PARTITIONS * SZ_8K)  /* 128KB */
-
-/*
- * Graphics Memory of GPU
- */
-#define MX53_IPU_CTRL_BASE_ADDR 0x18000000
-#define MX53_GPU2D_BASE_ADDR            0x20000000
-#define MX53_GPU_BASE_ADDR              0x30000000
-#define MX53_GPU_GMEM_BASE_ADDR 0xF8020000
-
-#define MX53_DEBUG_BASE_ADDR            0x40000000
-#define MX53_DEBUG_SIZE         SZ_1M
-#define MX53_ETB_BASE_ADDR              (MX53_DEBUG_BASE_ADDR + 0x00001000)
-#define MX53_ETM_BASE_ADDR              (MX53_DEBUG_BASE_ADDR + 0x00002000)
-#define MX53_TPIU_BASE_ADDR             (MX53_DEBUG_BASE_ADDR + 0x00003000)
-#define MX53_CTI0_BASE_ADDR             (MX53_DEBUG_BASE_ADDR + 0x00004000)
-#define MX53_CTI1_BASE_ADDR             (MX53_DEBUG_BASE_ADDR + 0x00005000)
-#define MX53_CTI2_BASE_ADDR             (MX53_DEBUG_BASE_ADDR + 0x00006000)
-#define MX53_CTI3_BASE_ADDR             (MX53_DEBUG_BASE_ADDR + 0x00007000)
-#define MX53_CORTEX_DBG_BASE_ADDR       (MX53_DEBUG_BASE_ADDR + 0x00008000)
-
-/*
- * SPBA global module enabled #0
- */
-#define MX53_SPBA0_BASE_ADDR            0x50000000
-#define MX53_SPBA0_SIZE         SZ_1M
-
-#define MX53_ESDHC1_BASE_ADDR   (MX53_SPBA0_BASE_ADDR + 0x00004000)
-#define MX53_ESDHC2_BASE_ADDR   (MX53_SPBA0_BASE_ADDR + 0x00008000)
-#define MX53_UART3_BASE_ADDR            (MX53_SPBA0_BASE_ADDR + 0x0000C000)
-#define MX53_ECSPI1_BASE_ADDR           (MX53_SPBA0_BASE_ADDR + 0x00010000)
-#define MX53_SSI2_BASE_ADDR             (MX53_SPBA0_BASE_ADDR + 0x00014000)
-#define MX53_ESDHC3_BASE_ADDR   (MX53_SPBA0_BASE_ADDR + 0x00020000)
-#define MX53_ESDHC4_BASE_ADDR   (MX53_SPBA0_BASE_ADDR + 0x00024000)
-#define MX53_SPDIF_BASE_ADDR            (MX53_SPBA0_BASE_ADDR + 0x00028000)
-#define MX53_ASRC_BASE_ADDR             (MX53_SPBA0_BASE_ADDR + 0x0002C000)
-#define MX53_ATA_DMA_BASE_ADDR  (MX53_SPBA0_BASE_ADDR + 0x00030000)
-#define MX53_SLIM_DMA_BASE_ADDR (MX53_SPBA0_BASE_ADDR + 0x00034000)
-#define MX53_HSI2C_DMA_BASE_ADDR        (MX53_SPBA0_BASE_ADDR + 0x00038000)
-#define MX53_SPBA_CTRL_BASE_ADDR        (MX53_SPBA0_BASE_ADDR + 0x0003C000)
-
-/*
- * AIPS 1
- */
-#define MX53_AIPS1_BASE_ADDR    0x53F00000
-#define MX53_AIPS1_SIZE         SZ_1M
-
-#define MX53_OTG_BASE_ADDR      (MX53_AIPS1_BASE_ADDR + 0x00080000)
-#define MX53_GPIO1_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x00084000)
-#define MX53_GPIO2_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x00088000)
-#define MX53_GPIO3_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x0008C000)
-#define MX53_GPIO4_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x00090000)
-#define MX53_KPP_BASE_ADDR      (MX53_AIPS1_BASE_ADDR + 0x00094000)
-#define MX53_WDOG1_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x00098000)
-#define MX53_WDOG2_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x0009C000)
-#define MX53_GPT1_BASE_ADDR     (MX53_AIPS1_BASE_ADDR + 0x000A0000)
-#define MX53_SRTC_BASE_ADDR     (MX53_AIPS1_BASE_ADDR + 0x000A4000)
-#define MX53_IOMUXC_BASE_ADDR   (MX53_AIPS1_BASE_ADDR + 0x000A8000)
-#define MX53_EPIT1_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x000AC000)
-#define MX53_EPIT2_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x000B0000)
-#define MX53_PWM1_BASE_ADDR     (MX53_AIPS1_BASE_ADDR + 0x000B4000)
-#define MX53_PWM2_BASE_ADDR     (MX53_AIPS1_BASE_ADDR + 0x000B8000)
-#define MX53_UART1_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x000BC000)
-#define MX53_UART2_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x000C0000)
-#define MX53_SRC_BASE_ADDR      (MX53_AIPS1_BASE_ADDR + 0x000D0000)
-#define MX53_CCM_BASE_ADDR      (MX53_AIPS1_BASE_ADDR + 0x000D4000)
-#define MX53_GPC_BASE_ADDR      (MX53_AIPS1_BASE_ADDR + 0x000D8000)
-#define MX53_GPIO5_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x000DC000)
-#define MX53_GPIO6_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x000E0000)
-#define MX53_GPIO7_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x000E4000)
-#define MX53_ATA_BASE_ADDR      (MX53_AIPS1_BASE_ADDR + 0x000E8000)
-#define MX53_I2C3_BASE_ADDR     (MX53_AIPS1_BASE_ADDR + 0x000EC000)
-#define MX53_UART4_BASE_ADDR    (MX53_AIPS1_BASE_ADDR + 0x000F0000)
-
-/*
- * AIPS 2
- */
-#define MX53_AIPS2_BASE_ADDR            0x63F00000
-#define MX53_AIPS2_SIZE                 SZ_1M
-
-#define MX53_PLL1_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x00080000)
-#define MX53_PLL2_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x00084000)
-#define MX53_PLL3_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x00088000)
-#define MX53_PLL4_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x0008C000)
-#define MX53_UART5_BASE_ADDR    (MX53_AIPS2_BASE_ADDR + 0x00090000)
-#define MX53_AHBMAX_BASE_ADDR   (MX53_AIPS2_BASE_ADDR + 0x00094000)
-#define MX53_IIM_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x00098000)
-#define MX53_CSU_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x0009C000)
-#define MX53_ARM_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000A0000)
-#define MX53_OWIRE_BASE_ADDR    (MX53_AIPS2_BASE_ADDR + 0x000A4000)
-#define MX53_FIRI_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000A8000)
-#define MX53_ECSPI2_BASE_ADDR   (MX53_AIPS2_BASE_ADDR + 0x000AC000)
-#define MX53_SDMA_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000B0000)
-#define MX53_SCC_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000B4000)
-#define MX53_ROMCP_BASE_ADDR    (MX53_AIPS2_BASE_ADDR + 0x000B8000)
-#define MX53_RTIC_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000BC000)
-#define MX53_CSPI_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000C0000)
-#define MX53_I2C2_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000C4000)
-#define MX53_I2C1_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000C8000)
-#define MX53_SSI1_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000CC000)
-#define MX53_AUDMUX_BASE_ADDR   (MX53_AIPS2_BASE_ADDR + 0x000D0000)
-#define MX53_RTC_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000D4000)
-#define MX53_M4IF_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000D8000)
-#define MX53_ESDCTL_BASE_ADDR   (MX53_AIPS2_BASE_ADDR + 0x000D9000)
-#define MX53_WEIM_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000DA000)
-#define MX53_NFC_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000DB000)
-#define MX53_EMI_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000DBF00)
-#define MX53_MIPI_HSC_BASE_ADDR (MX53_AIPS2_BASE_ADDR + 0x000DC000)
-#define MX53_MLB_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000E4000)
-#define MX53_SSI3_BASE_ADDR     (MX53_AIPS2_BASE_ADDR + 0x000E8000)
-#define MX53_FEC_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000EC000)
-#define MX53_TVE_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000F0000)
-#define MX53_VPU_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000F4000)
-#define MX53_SAHARA_BASE_ADDR   (MX53_AIPS2_BASE_ADDR + 0x000F8000)
-#define MX53_PTP_BASE_ADDR      (MX53_AIPS2_BASE_ADDR + 0x000FC000)
-
-/*
- * Memory regions and CS
- */
-#define MX53_CSD0_BASE_ADDR             0x70000000
-#define MX53_CSD1_BASE_ADDR             0xB0000000
-#define MX53_CS0_BASE_ADDR              0xF0000000
-#define MX53_CS1_32MB_BASE_ADDR 0xF2000000
-#define MX53_CS1_64MB_BASE_ADDR         0xF4000000
-#define MX53_CS2_64MB_BASE_ADDR         0xF4000000
-#define MX53_CS2_96MB_BASE_ADDR         0xF6000000
-#define MX53_CS3_BASE_ADDR              0xF6000000
-
-#define MX53_IO_P2V(x)                  IMX_IO_P2V(x)
-#define MX53_IO_ADDRESS(x)              IOMEM(MX53_IO_P2V(x))
-
-/*
- * defines for SPBA modules
- */
-#define MX53_SPBA_SDHC1 0x04
-#define MX53_SPBA_SDHC2 0x08
-#define MX53_SPBA_UART3 0x0C
-#define MX53_SPBA_CSPI1 0x10
-#define MX53_SPBA_SSI2          0x14
-#define MX53_SPBA_SDHC3 0x20
-#define MX53_SPBA_SDHC4 0x24
-#define MX53_SPBA_SPDIF 0x28
-#define MX53_SPBA_ATA           0x30
-#define MX53_SPBA_SLIM          0x34
-#define MX53_SPBA_HSI2C 0x38
-#define MX53_SPBA_CTRL          0x3C
-
-/*
- * DMA request assignments
- */
-#define MX53_DMA_REQ_SSI3_TX0           47
-#define MX53_DMA_REQ_SSI3_RX0           46
-#define MX53_DMA_REQ_SSI3_TX1           45
-#define MX53_DMA_REQ_SSI3_RX1           44
-#define MX53_DMA_REQ_UART3_TX   43
-#define MX53_DMA_REQ_UART3_RX   42
-#define MX53_DMA_REQ_ESAI_TX            41
-#define MX53_DMA_REQ_ESAI_RX            40
-#define MX53_DMA_REQ_CSPI_TX            39
-#define MX53_DMA_REQ_CSPI_RX            38
-#define MX53_DMA_REQ_ASRC_DMA6  37
-#define MX53_DMA_REQ_ASRC_DMA5  36
-#define MX53_DMA_REQ_ASRC_DMA4  35
-#define MX53_DMA_REQ_ASRC_DMA3  34
-#define MX53_DMA_REQ_ASRC_DMA2  33
-#define MX53_DMA_REQ_ASRC_DMA1  32
-#define MX53_DMA_REQ_EMI_WR             31
-#define MX53_DMA_REQ_EMI_RD             30
-#define MX53_DMA_REQ_SSI1_TX0           29
-#define MX53_DMA_REQ_SSI1_RX0           28
-#define MX53_DMA_REQ_SSI1_TX1           27
-#define MX53_DMA_REQ_SSI1_RX1           26
-#define MX53_DMA_REQ_SSI2_TX0           25
-#define MX53_DMA_REQ_SSI2_RX0           24
-#define MX53_DMA_REQ_SSI2_TX1           23
-#define MX53_DMA_REQ_SSI2_RX1           22
-#define MX53_DMA_REQ_I2C2_SDHC2 21
-#define MX53_DMA_REQ_I2C1_SDHC1 20
-#define MX53_DMA_REQ_UART1_TX   19
-#define MX53_DMA_REQ_UART1_RX   18
-#define MX53_DMA_REQ_UART5_TX   17
-#define MX53_DMA_REQ_UART5_RX   16
-#define MX53_DMA_REQ_SPDIF_TX           15
-#define MX53_DMA_REQ_SPDIF_RX           14
-#define MX53_DMA_REQ_UART2_FIRI_TX      13
-#define MX53_DMA_REQ_UART2_FIRI_RX      12
-#define MX53_DMA_REQ_SDHC4              11
-#define MX53_DMA_REQ_I2C3_SDHC3 10
-#define MX53_DMA_REQ_CSPI2_TX           9
-#define MX53_DMA_REQ_CSPI2_RX           8
-#define MX53_DMA_REQ_CSPI1_TX           7
-#define MX53_DMA_REQ_CSPI1_RX           6
-#define MX53_DMA_REQ_IPU                5
-#define MX53_DMA_REQ_ATA_TX_END 4
-#define MX53_DMA_REQ_ATA_UART4_TX       3
-#define MX53_DMA_REQ_ATA_UART4_RX       2
-#define MX53_DMA_REQ_GPC                1
-#define MX53_DMA_REQ_VPU                0
-
-/*
- * Interrupt numbers
- */
-#include <asm/irq.h>
-#define MX53_INT_RESV0          (NR_IRQS_LEGACY + 0)
-#define MX53_INT_ESDHC1         (NR_IRQS_LEGACY + 1)
-#define MX53_INT_ESDHC2         (NR_IRQS_LEGACY + 2)
-#define MX53_INT_ESDHC3         (NR_IRQS_LEGACY + 3)
-#define MX53_INT_ESDHC4         (NR_IRQS_LEGACY + 4)
-#define MX53_INT_DAP            (NR_IRQS_LEGACY + 5)
-#define MX53_INT_SDMA           (NR_IRQS_LEGACY + 6)
-#define MX53_INT_IOMUX          (NR_IRQS_LEGACY + 7)
-#define MX53_INT_NFC            (NR_IRQS_LEGACY + 8)
-#define MX53_INT_VPU            (NR_IRQS_LEGACY + 9)
-#define MX53_INT_IPU_ERR        (NR_IRQS_LEGACY + 10)
-#define MX53_INT_IPU_SYN        (NR_IRQS_LEGACY + 11)
-#define MX53_INT_GPU            (NR_IRQS_LEGACY + 12)
-#define MX53_INT_UART4          (NR_IRQS_LEGACY + 13)
-#define MX53_INT_USB_H1         (NR_IRQS_LEGACY + 14)
-#define MX53_INT_EMI            (NR_IRQS_LEGACY + 15)
-#define MX53_INT_USB_H2         (NR_IRQS_LEGACY + 16)
-#define MX53_INT_USB_H3         (NR_IRQS_LEGACY + 17)
-#define MX53_INT_USB_OTG        (NR_IRQS_LEGACY + 18)
-#define MX53_INT_SAHARA_H0      (NR_IRQS_LEGACY + 19)
-#define MX53_INT_SAHARA_H1      (NR_IRQS_LEGACY + 20)
-#define MX53_INT_SCC_SMN        (NR_IRQS_LEGACY + 21)
-#define MX53_INT_SCC_STZ        (NR_IRQS_LEGACY + 22)
-#define MX53_INT_SCC_SCM        (NR_IRQS_LEGACY + 23)
-#define MX53_INT_SRTC_NTZ       (NR_IRQS_LEGACY + 24)
-#define MX53_INT_SRTC_TZ        (NR_IRQS_LEGACY + 25)
-#define MX53_INT_RTIC           (NR_IRQS_LEGACY + 26)
-#define MX53_INT_CSU            (NR_IRQS_LEGACY + 27)
-#define MX53_INT_SATA           (NR_IRQS_LEGACY + 28)
-#define MX53_INT_SSI1           (NR_IRQS_LEGACY + 29)
-#define MX53_INT_SSI2           (NR_IRQS_LEGACY + 30)
-#define MX53_INT_UART1          (NR_IRQS_LEGACY + 31)
-#define MX53_INT_UART2          (NR_IRQS_LEGACY + 32)
-#define MX53_INT_UART3          (NR_IRQS_LEGACY + 33)
-#define MX53_INT_RTC            (NR_IRQS_LEGACY + 34)
-#define MX53_INT_PTP            (NR_IRQS_LEGACY + 35)
-#define MX53_INT_ECSPI1         (NR_IRQS_LEGACY + 36)
-#define MX53_INT_ECSPI2         (NR_IRQS_LEGACY + 37)
-#define MX53_INT_CSPI           (NR_IRQS_LEGACY + 38)
-#define MX53_INT_GPT            (NR_IRQS_LEGACY + 39)
-#define MX53_INT_EPIT1          (NR_IRQS_LEGACY + 40)
-#define MX53_INT_EPIT2          (NR_IRQS_LEGACY + 41)
-#define MX53_INT_GPIO1_INT7     (NR_IRQS_LEGACY + 42)
-#define MX53_INT_GPIO1_INT6     (NR_IRQS_LEGACY + 43)
-#define MX53_INT_GPIO1_INT5     (NR_IRQS_LEGACY + 44)
-#define MX53_INT_GPIO1_INT4     (NR_IRQS_LEGACY + 45)
-#define MX53_INT_GPIO1_INT3     (NR_IRQS_LEGACY + 46)
-#define MX53_INT_GPIO1_INT2     (NR_IRQS_LEGACY + 47)
-#define MX53_INT_GPIO1_INT1     (NR_IRQS_LEGACY + 48)
-#define MX53_INT_GPIO1_INT0     (NR_IRQS_LEGACY + 49)
-#define MX53_INT_GPIO1_LOW      (NR_IRQS_LEGACY + 50)
-#define MX53_INT_GPIO1_HIGH     (NR_IRQS_LEGACY + 51)
-#define MX53_INT_GPIO2_LOW      (NR_IRQS_LEGACY + 52)
-#define MX53_INT_GPIO2_HIGH     (NR_IRQS_LEGACY + 53)
-#define MX53_INT_GPIO3_LOW      (NR_IRQS_LEGACY + 54)
-#define MX53_INT_GPIO3_HIGH     (NR_IRQS_LEGACY + 55)
-#define MX53_INT_GPIO4_LOW      (NR_IRQS_LEGACY + 56)
-#define MX53_INT_GPIO4_HIGH     (NR_IRQS_LEGACY + 57)
-#define MX53_INT_WDOG1          (NR_IRQS_LEGACY + 58)
-#define MX53_INT_WDOG2          (NR_IRQS_LEGACY + 59)
-#define MX53_INT_KPP            (NR_IRQS_LEGACY + 60)
-#define MX53_INT_PWM1           (NR_IRQS_LEGACY + 61)
-#define MX53_INT_I2C1           (NR_IRQS_LEGACY + 62)
-#define MX53_INT_I2C2           (NR_IRQS_LEGACY + 63)
-#define MX53_INT_I2C3           (NR_IRQS_LEGACY + 64)
-#define MX53_INT_MLB            (NR_IRQS_LEGACY + 65)
-#define MX53_INT_ASRC           (NR_IRQS_LEGACY + 66)
-#define MX53_INT_SPDIF          (NR_IRQS_LEGACY + 67)
-#define MX53_INT_SIM_DAT        (NR_IRQS_LEGACY + 68)
-#define MX53_INT_IIM            (NR_IRQS_LEGACY + 69)
-#define MX53_INT_ATA            (NR_IRQS_LEGACY + 70)
-#define MX53_INT_CCM1           (NR_IRQS_LEGACY + 71)
-#define MX53_INT_CCM2           (NR_IRQS_LEGACY + 72)
-#define MX53_INT_GPC1           (NR_IRQS_LEGACY + 73)
-#define MX53_INT_GPC2           (NR_IRQS_LEGACY + 74)
-#define MX53_INT_SRC            (NR_IRQS_LEGACY + 75)
-#define MX53_INT_NM             (NR_IRQS_LEGACY + 76)
-#define MX53_INT_PMU            (NR_IRQS_LEGACY + 77)
-#define MX53_INT_CTI_IRQ        (NR_IRQS_LEGACY + 78)
-#define MX53_INT_CTI1_TG0       (NR_IRQS_LEGACY + 79)
-#define MX53_INT_CTI1_TG1       (NR_IRQS_LEGACY + 80)
-#define MX53_INT_ESAI           (NR_IRQS_LEGACY + 81)
-#define MX53_INT_CAN1           (NR_IRQS_LEGACY + 82)
-#define MX53_INT_CAN2           (NR_IRQS_LEGACY + 83)
-#define MX53_INT_GPU2_IRQ       (NR_IRQS_LEGACY + 84)
-#define MX53_INT_GPU2_BUSY      (NR_IRQS_LEGACY + 85)
-#define MX53_INT_UART5          (NR_IRQS_LEGACY + 86)
-#define MX53_INT_FEC            (NR_IRQS_LEGACY + 87)
-#define MX53_INT_OWIRE          (NR_IRQS_LEGACY + 88)
-#define MX53_INT_CTI1_TG2       (NR_IRQS_LEGACY + 89)
-#define MX53_INT_SJC            (NR_IRQS_LEGACY + 90)
-#define MX53_INT_TVE            (NR_IRQS_LEGACY + 92)
-#define MX53_INT_FIRI           (NR_IRQS_LEGACY + 93)
-#define MX53_INT_PWM2           (NR_IRQS_LEGACY + 94)
-#define MX53_INT_SLIM_EXP       (NR_IRQS_LEGACY + 95)
-#define MX53_INT_SSI3           (NR_IRQS_LEGACY + 96)
-#define MX53_INT_EMI_BOOT       (NR_IRQS_LEGACY + 97)
-#define MX53_INT_CTI1_TG3       (NR_IRQS_LEGACY + 98)
-#define MX53_INT_SMC_RX         (NR_IRQS_LEGACY + 99)
-#define MX53_INT_VPU_IDLE       (NR_IRQS_LEGACY + 100)
-#define MX53_INT_EMI_NFC        (NR_IRQS_LEGACY + 101)
-#define MX53_INT_GPU_IDLE       (NR_IRQS_LEGACY + 102)
-#define MX53_INT_GPIO5_LOW      (NR_IRQS_LEGACY + 103)
-#define MX53_INT_GPIO5_HIGH     (NR_IRQS_LEGACY + 104)
-#define MX53_INT_GPIO6_LOW      (NR_IRQS_LEGACY + 105)
-#define MX53_INT_GPIO6_HIGH     (NR_IRQS_LEGACY + 106)
-#define MX53_INT_GPIO7_LOW      (NR_IRQS_LEGACY + 107)
-#define MX53_INT_GPIO7_HIGH     (NR_IRQS_LEGACY + 108)
-
-#endif /* ifndef __MACH_MX53_H__ */
diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
index 75d6a37e1ae4..a39b69ef4301 100644
--- a/arch/arm/mach-imx/mxc.h
+++ b/arch/arm/mach-imx/mxc.h
@@ -154,10 +154,17 @@ extern unsigned int __mxc_cpu_type;
 #endif
 
 #ifndef __ASSEMBLY__
+#ifdef CONFIG_SOC_IMX6SL
 static inline bool cpu_is_imx6sl(void)
 {
         return __mxc_cpu_type == MXC_CPU_IMX6SL;
 }
+#else
+static inline bool cpu_is_imx6sl(void)
+{
+        return false;
+}
+#endif
 
 static inline bool cpu_is_imx6dl(void)
 {
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index 58aeaf5baaf6..f1f80ab73e69 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -19,9 +19,26 @@
 
 #include "common.h"
 #include "cpuidle.h"
-#include "crm-regs-imx5.h"
 #include "hardware.h"
 
+#define MXC_CCM_CLPCR                   0x54
+#define MXC_CCM_CLPCR_LPM_OFFSET        0
+#define MXC_CCM_CLPCR_LPM_MASK          0x3
+#define MXC_CCM_CLPCR_STBY_COUNT_OFFSET 9
+#define MXC_CCM_CLPCR_VSTBY             (0x1 << 8)
+#define MXC_CCM_CLPCR_SBYOS             (0x1 << 6)
+
+#define MXC_CORTEXA8_PLAT_LPC           0xc
+#define MXC_CORTEXA8_PLAT_LPC_DSM       (1 << 0)
+#define MXC_CORTEXA8_PLAT_LPC_DBG_DSM   (1 << 1)
+
+#define MXC_SRPG_NEON_SRPGCR            0x280
+#define MXC_SRPG_ARM_SRPGCR             0x2a0
+#define MXC_SRPG_EMPGC0_SRPGCR          0x2c0
+#define MXC_SRPG_EMPGC1_SRPGCR          0x2d0
+
+#define MXC_SRPGCR_PCR                  1
+
 /*
  * The WAIT_UNCLOCKED_POWER_OFF state only requires <= 500ns to exit.
  * This is also the lowest power state possible without affecting
@@ -32,6 +49,30 @@
  */
 #define IMX5_DEFAULT_CPU_IDLE_STATE WAIT_UNCLOCKED_POWER_OFF
 
+struct imx5_pm_data {
+        phys_addr_t cortex_addr;
+        phys_addr_t gpc_addr;
+};
+
+static const struct imx5_pm_data imx51_pm_data __initconst = {
+        .cortex_addr = 0x83fa0000,
+        .gpc_addr = 0x73fd8000,
+};
+
+static const struct imx5_pm_data imx53_pm_data __initconst = {
+        .cortex_addr = 0x63fa0000,
+        .gpc_addr = 0x53fd8000,
+};
+
+static void __iomem *ccm_base;
+static void __iomem *cortex_base;
+static void __iomem *gpc_base;
+
+void __init imx5_pm_set_ccm_base(void __iomem *base)
+{
+        ccm_base = base;
+}
+
 /*
  * set cpu low power mode before WFI instruction. This function is called
  * mx5 because it can be used for mx51, and mx53.
@@ -43,12 +84,16 @@ static void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode)
         int stop_mode = 0;
 
         /* always allow platform to issue a deep sleep mode request */
-        plat_lpc = __raw_readl(MXC_CORTEXA8_PLAT_LPC) &
+        plat_lpc = __raw_readl(cortex_base + MXC_CORTEXA8_PLAT_LPC) &
             ~(MXC_CORTEXA8_PLAT_LPC_DSM);
-        ccm_clpcr = __raw_readl(MXC_CCM_CLPCR) & ~(MXC_CCM_CLPCR_LPM_MASK);
-        arm_srpgcr = __raw_readl(MXC_SRPG_ARM_SRPGCR) & ~(MXC_SRPGCR_PCR);
-        empgc0 = __raw_readl(MXC_SRPG_EMPGC0_SRPGCR) & ~(MXC_SRPGCR_PCR);
-        empgc1 = __raw_readl(MXC_SRPG_EMPGC1_SRPGCR) & ~(MXC_SRPGCR_PCR);
+        ccm_clpcr = __raw_readl(ccm_base + MXC_CCM_CLPCR) &
+                    ~(MXC_CCM_CLPCR_LPM_MASK);
+        arm_srpgcr = __raw_readl(gpc_base + MXC_SRPG_ARM_SRPGCR) &
+                     ~(MXC_SRPGCR_PCR);
+        empgc0 = __raw_readl(gpc_base + MXC_SRPG_EMPGC0_SRPGCR) &
+                 ~(MXC_SRPGCR_PCR);
+        empgc1 = __raw_readl(gpc_base + MXC_SRPG_EMPGC1_SRPGCR) &
+                 ~(MXC_SRPGCR_PCR);
 
         switch (mode) {
         case WAIT_CLOCKED:
@@ -82,17 +127,17 @@ static void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode)
                 return;
         }
 
-        __raw_writel(plat_lpc, MXC_CORTEXA8_PLAT_LPC);
-        __raw_writel(ccm_clpcr, MXC_CCM_CLPCR);
-        __raw_writel(arm_srpgcr, MXC_SRPG_ARM_SRPGCR);
-        __raw_writel(arm_srpgcr, MXC_SRPG_NEON_SRPGCR);
+        __raw_writel(plat_lpc, cortex_base + MXC_CORTEXA8_PLAT_LPC);
+        __raw_writel(ccm_clpcr, ccm_base + MXC_CCM_CLPCR);
+        __raw_writel(arm_srpgcr, gpc_base + MXC_SRPG_ARM_SRPGCR);
+        __raw_writel(arm_srpgcr, gpc_base + MXC_SRPG_NEON_SRPGCR);
 
         if (stop_mode) {
                 empgc0 |= MXC_SRPGCR_PCR;
                 empgc1 |= MXC_SRPGCR_PCR;
 
-                __raw_writel(empgc0, MXC_SRPG_EMPGC0_SRPGCR);
-                __raw_writel(empgc1, MXC_SRPG_EMPGC1_SRPGCR);
+                __raw_writel(empgc0, gpc_base + MXC_SRPG_EMPGC0_SRPGCR);
+                __raw_writel(empgc1, gpc_base + MXC_SRPG_EMPGC1_SRPGCR);
         }
 }
 
@@ -114,8 +159,8 @@ static int mx5_suspend_enter(suspend_state_t state)
                 flush_cache_all();
 
                 /*clear the EMPGC0/1 bits */
-                __raw_writel(0, MXC_SRPG_EMPGC0_SRPGCR);
-                __raw_writel(0, MXC_SRPG_EMPGC1_SRPGCR);
+                __raw_writel(0, gpc_base + MXC_SRPG_EMPGC0_SRPGCR);
+                __raw_writel(0, gpc_base + MXC_SRPG_EMPGC1_SRPGCR);
         }
         cpu_do_idle();
 
@@ -149,7 +194,7 @@ static void imx5_pm_idle(void)
         imx5_cpu_do_idle();
 }
 
-static int __init imx5_pm_common_init(void)
+static int __init imx5_pm_common_init(const struct imx5_pm_data *data)
 {
         int ret;
         struct clk *gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs");
@@ -163,15 +208,28 @@ static int __init imx5_pm_common_init(void)
 
         arm_pm_idle = imx5_pm_idle;
 
+        cortex_base = ioremap(data->cortex_addr, SZ_16K);
+        gpc_base = ioremap(data->gpc_addr, SZ_16K);
+        WARN_ON(!ccm_base || !cortex_base || !gpc_base);
+
         /* Set the registers to the default cpu idle state. */
         mx5_cpu_lp_set(IMX5_DEFAULT_CPU_IDLE_STATE);
 
-        return imx5_cpuidle_init();
+        ret = imx5_cpuidle_init();
+        if (ret)
+                pr_warn("%s: cpuidle init failed %d\n", __func__, ret);
+
+        suspend_set_ops(&mx5_suspend_ops);
+
+        return 0;
+}
+
+void __init imx51_pm_init(void)
+{
+        imx5_pm_common_init(&imx51_pm_data);
 }
 
-void __init imx5_pm_init(void)
+void __init imx53_pm_init(void)
 {
-        int ret = imx5_pm_common_init();
-        if (!ret)
-                suspend_set_ops(&mx5_suspend_ops);
+        imx5_pm_common_init(&imx53_pm_data);
 }
diff --git a/arch/arm/mach-imx/pm-imx6.c b/arch/arm/mach-imx/pm-imx6.c
index 9392a8f4ef24..5c3af8f993d0 100644
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@ -129,6 +129,14 @@ static const u32 imx6sl_mmdc_io_offset[] __initconst = {
         0x330, 0x334, 0x320,        /* SDCKE0, SDCKE1, RESET */
 };
 
+static const u32 imx6sx_mmdc_io_offset[] __initconst = {
+        0x2ec, 0x2f0, 0x2f4, 0x2f8, /* DQM0 ~ DQM3 */
+        0x60c, 0x610, 0x61c, 0x620, /* GPR_B0DS ~ GPR_B3DS */
+        0x300, 0x2fc, 0x32c, 0x5f4, /* CAS, RAS, SDCLK_0, GPR_ADDS */
+        0x310, 0x314, 0x5f8, 0x608, /* SODT0, SODT1, MODE_CTL, MODE */
+        0x330, 0x334, 0x338, 0x33c, /* SDQS0 ~ SDQS3 */
+};
+
 static const struct imx6_pm_socdata imx6q_pm_data __initconst = {
         .cpu_type = MXC_CPU_IMX6Q,
         .mmdc_compat = "fsl,imx6q-mmdc",
@@ -159,6 +167,16 @@ static const struct imx6_pm_socdata imx6sl_pm_data __initconst = {
         .mmdc_io_offset = imx6sl_mmdc_io_offset,
 };
 
+static const struct imx6_pm_socdata imx6sx_pm_data __initconst = {
+        .cpu_type = MXC_CPU_IMX6SX,
+        .mmdc_compat = "fsl,imx6sx-mmdc",
+        .src_compat = "fsl,imx6sx-src",
+        .iomuxc_compat = "fsl,imx6sx-iomuxc",
+        .gpc_compat = "fsl,imx6sx-gpc",
+        .mmdc_io_num = ARRAY_SIZE(imx6sx_mmdc_io_offset),
+        .mmdc_io_offset = imx6sx_mmdc_io_offset,
+};
+
 /*
  * This structure is for passing necessary data for low level ocram
  * suspend code(arch/arm/mach-imx/suspend-imx6.S), if this struct
@@ -181,11 +199,13 @@ struct imx6_cpu_pm_info {
         u32 mmdc_io_val[MX6_MAX_MMDC_IO_NUM][2]; /* To save offset and value */
 } __aligned(8);
 
-void imx6q_set_int_mem_clk_lpm(void)
+void imx6q_set_int_mem_clk_lpm(bool enable)
 {
         u32 val = readl_relaxed(ccm_base + CGPR);
 
-        val |= BM_CGPR_INT_MEM_CLK_LPM;
+        val &= ~BM_CGPR_INT_MEM_CLK_LPM;
+        if (enable)
+                val |= BM_CGPR_INT_MEM_CLK_LPM;
         writel_relaxed(val, ccm_base + CGPR);
 }
 
@@ -254,6 +274,14 @@ int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
                 break;
         case STOP_POWER_ON:
                 val |= 0x2 << BP_CLPCR_LPM;
+                val &= ~BM_CLPCR_VSTBY;
+                val &= ~BM_CLPCR_SBYOS;
+                if (cpu_is_imx6sl())
+                        val |= BM_CLPCR_BYPASS_PMIC_READY;
+                if (cpu_is_imx6sl() || cpu_is_imx6sx())
+                        val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS;
+                else
+                        val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;
                 break;
         case WAIT_UNCLOCKED_POWER_OFF:
                 val |= 0x1 << BP_CLPCR_LPM;
@@ -265,12 +293,12 @@ int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
                 val |= 0x3 << BP_CLPCR_STBY_COUNT;
                 val |= BM_CLPCR_VSTBY;
                 val |= BM_CLPCR_SBYOS;
-                if (cpu_is_imx6sl()) {
+                if (cpu_is_imx6sl())
                         val |= BM_CLPCR_BYPASS_PMIC_READY;
+                if (cpu_is_imx6sl() || cpu_is_imx6sx())
                         val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS;
-                } else {
+                else
                         val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS;
-                }
                 break;
         default:
                 return -EINVAL;
@@ -314,8 +342,22 @@ static int imx6q_suspend_finish(unsigned long val)
 static int imx6q_pm_enter(suspend_state_t state)
 {
         switch (state) {
+        case PM_SUSPEND_STANDBY:
+                imx6q_set_lpm(STOP_POWER_ON);
+                imx6q_set_int_mem_clk_lpm(true);
+                imx_gpc_pre_suspend(false);
+                if (cpu_is_imx6sl())
+                        imx6sl_set_wait_clk(true);
+                /* Zzz ... */
+                cpu_do_idle();
+                if (cpu_is_imx6sl())
+                        imx6sl_set_wait_clk(false);
+                imx_gpc_post_resume();
+                imx6q_set_lpm(WAIT_CLOCKED);
+                break;
         case PM_SUSPEND_MEM:
                 imx6q_set_lpm(STOP_POWER_OFF);
+                imx6q_set_int_mem_clk_lpm(false);
                 imx6q_enable_wb(true);
                 /*
                  * For suspend into ocram, asm code already take care of
@@ -323,7 +365,7 @@ static int imx6q_pm_enter(suspend_state_t state)
                  */
                 if (!imx6_suspend_in_ocram_fn)
                         imx6q_enable_rbc(true);
-                imx_gpc_pre_suspend();
+                imx_gpc_pre_suspend(true);
                 imx_anatop_pre_suspend();
                 imx_set_cpu_jump(0, v7_cpu_resume);
                 /* Zzz ... */
@@ -334,6 +376,7 @@ static int imx6q_pm_enter(suspend_state_t state)
                 imx_gpc_post_resume();
                 imx6q_enable_rbc(false);
                 imx6q_enable_wb(false);
+                imx6q_set_int_mem_clk_lpm(true);
                 imx6q_set_lpm(WAIT_CLOCKED);
                 break;
         default:
@@ -343,9 +386,14 @@ static int imx6q_pm_enter(suspend_state_t state)
         return 0;
 }
 
+static int imx6q_pm_valid(suspend_state_t state)
+{
+        return (state == PM_SUSPEND_STANDBY || state == PM_SUSPEND_MEM);
+}
+
 static const struct platform_suspend_ops imx6q_pm_ops = {
         .enter = imx6q_pm_enter,
-        .valid = suspend_valid_only_mem,
+        .valid = imx6q_pm_valid,
 };
 
 void __init imx6q_pm_set_ccm_base(void __iomem *base)
@@ -549,3 +597,8 @@ void __init imx6sl_pm_init(void)
 {
         imx6_pm_common_init(&imx6sl_pm_data);
 }
+
+void __init imx6sx_pm_init(void)
+{
+        imx6_pm_common_init(&imx6sx_pm_data);
+}
diff --git a/arch/arm/mach-imx/suspend-imx6.S b/arch/arm/mach-imx/suspend-imx6.S
index fe123b079c05..74b50f1982db 100644
--- a/arch/arm/mach-imx/suspend-imx6.S
+++ b/arch/arm/mach-imx/suspend-imx6.S
@@ -10,6 +10,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 #include <asm/asm-offsets.h>
 #include <asm/hardware/cache-l2x0.h>
 #include "hardware.h"
@@ -301,7 +302,7 @@ rbc_loop:
         resume_mmdc
 
         /* return to suspend finish */
-        mov     pc, lr
+        ret     lr
 
 resume:
         /* invalidate L1 I-cache first */
@@ -325,7 +326,7 @@ resume:
         mov     r5, #0x1
         resume_mmdc
 
-        mov     pc, lr
+        ret     lr
 ENDPROC(imx6_suspend)
 
 /*
diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c
index 3b0733edb68c..d14c33fd6b03 100644
--- a/arch/arm/mach-imx/system.c
+++ b/arch/arm/mach-imx/system.c
@@ -42,7 +42,10 @@ void mxc_restart(enum reboot_mode mode, const char *cmd)
 {
         unsigned int wcr_enable;
 
-        if (wdog_clk)
+        if (!wdog_base)
+                goto reset_fallback;
+
+        if (!IS_ERR(wdog_clk))
                 clk_enable(wdog_clk);
 
         if (cpu_is_mx1())
@@ -70,6 +73,7 @@ void mxc_restart(enum reboot_mode mode, const char *cmd)
         /* delay to allow the serial port to show the message */
         mdelay(50);
 
+reset_fallback:
         /* we'll take a jump through zero as a poor second */
         soft_restart(0);
 }
@@ -79,13 +83,10 @@ void __init mxc_arch_reset_init(void __iomem *base)
         wdog_base = base;
 
         wdog_clk = clk_get_sys("imx2-wdt.0", NULL);
-        if (IS_ERR(wdog_clk)) {
+        if (IS_ERR(wdog_clk))
                 pr_warn("%s: failed to get wdog clock\n", __func__);
-                wdog_clk = NULL;
-                return;
-        }
-
-        clk_prepare(wdog_clk);
+        else
+                clk_prepare(wdog_clk);
 }
 
 void __init mxc_arch_reset_init_dt(void)
@@ -97,13 +98,10 @@ void __init mxc_arch_reset_init_dt(void)
         WARN_ON(!wdog_base);
 
         wdog_clk = of_clk_get(np, 0);
-        if (IS_ERR(wdog_clk)) {
+        if (IS_ERR(wdog_clk))
                 pr_warn("%s: failed to get wdog clock\n", __func__);
-                wdog_clk = NULL;
-                return;
-        }
-
-        clk_prepare(wdog_clk);
+        else
+                clk_prepare(wdog_clk);
 }
 
 #ifdef CONFIG_CACHE_L2X0
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index bed081e58262..bf92e5a351c0 100644
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -290,25 +290,20 @@ static int __init mxc_clockevent_init(struct clk *timer_clk)
         return 0;
 }
 
-void __init mxc_timer_init(void __iomem *base, int irq)
+static void __init _mxc_timer_init(int irq,
+                                   struct clk *clk_per, struct clk *clk_ipg)
 {
         uint32_t tctl_val;
-        struct clk *timer_clk;
-        struct clk *timer_ipg_clk;
 
-        timer_clk = clk_get_sys("imx-gpt.0", "per");
-        if (IS_ERR(timer_clk)) {
+        if (IS_ERR(clk_per)) {
                 pr_err("i.MX timer: unable to get clk\n");
                 return;
         }
 
-        timer_ipg_clk = clk_get_sys("imx-gpt.0", "ipg");
-        if (!IS_ERR(timer_ipg_clk))
-                clk_prepare_enable(timer_ipg_clk);
-
-        clk_prepare_enable(timer_clk);
+        if (!IS_ERR(clk_ipg))
+                clk_prepare_enable(clk_ipg);
 
-        timer_base = base;
+        clk_prepare_enable(clk_per);
 
         /*
          * Initialise to a known state (all timers off, and timing reset)
@@ -325,21 +320,45 @@ void __init mxc_timer_init(void __iomem *base, int irq)
         __raw_writel(tctl_val, timer_base + MXC_TCTL);
 
         /* init and register the timer to the framework */
-        mxc_clocksource_init(timer_clk);
-        mxc_clockevent_init(timer_clk);
+        mxc_clocksource_init(clk_per);
+        mxc_clockevent_init(clk_per);
 
         /* Make irqs happen */
         setup_irq(irq, &mxc_timer_irq);
 }
 
-void __init mxc_timer_init_dt(struct device_node *np)
+void __init mxc_timer_init(void __iomem *base, int irq)
 {
-        void __iomem *base;
+        struct clk *clk_per = clk_get_sys("imx-gpt.0", "per");
+        struct clk *clk_ipg = clk_get_sys("imx-gpt.0", "ipg");
+
+        timer_base = base;
+
+        _mxc_timer_init(irq, clk_per, clk_ipg);
+}
+
+static void __init mxc_timer_init_dt(struct device_node *np)
+{
+        struct clk *clk_per, *clk_ipg;
         int irq;
 
-        base = of_iomap(np, 0);
-        WARN_ON(!base);
+        if (timer_base)
+                return;
+
+        timer_base = of_iomap(np, 0);
+        WARN_ON(!timer_base);
         irq = irq_of_parse_and_map(np, 0);
 
-        mxc_timer_init(base, irq);
+        clk_per = of_clk_get_by_name(np, "per");
+        clk_ipg = of_clk_get_by_name(np, "ipg");
+
+        _mxc_timer_init(irq, clk_per, clk_ipg);
 }
+CLOCKSOURCE_OF_DECLARE(mx1_timer, "fsl,imx1-gpt", mxc_timer_init_dt);
+CLOCKSOURCE_OF_DECLARE(mx25_timer, "fsl,imx25-gpt", mxc_timer_init_dt);
+CLOCKSOURCE_OF_DECLARE(mx50_timer, "fsl,imx50-gpt", mxc_timer_init_dt);
+CLOCKSOURCE_OF_DECLARE(mx51_timer, "fsl,imx51-gpt", mxc_timer_init_dt);
+CLOCKSOURCE_OF_DECLARE(mx53_timer, "fsl,imx53-gpt", mxc_timer_init_dt);
+CLOCKSOURCE_OF_DECLARE(mx6q_timer, "fsl,imx6q-gpt", mxc_timer_init_dt);
+CLOCKSOURCE_OF_DECLARE(mx6sl_timer, "fsl,imx6sl-gpt", mxc_timer_init_dt);
+CLOCKSOURCE_OF_DECLARE(mx6sx_timer, "fsl,imx6sx-gpt", mxc_timer_init_dt);
diff --git a/arch/arm/mach-imx/tzic.c b/arch/arm/mach-imx/tzic.c
index 7828af4b2022..1d4f384ca773 100644
--- a/arch/arm/mach-imx/tzic.c
+++ b/arch/arm/mach-imx/tzic.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/irqdomain.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 
 #include <asm/mach/irq.h>
 #include <asm/exception.h>
@@ -153,13 +154,16 @@ static void __exception_irq_entry tzic_handle_irq(struct pt_regs *regs)
  * interrupts. It registers the interrupt enable and disable functions
  * to the kernel for each interrupt source.
  */
-void __init tzic_init_irq(void __iomem *irqbase)
+void __init tzic_init_irq(void)
 {
         struct device_node *np;
         int irq_base;
         int i;
 
-        tzic_base = irqbase;
+        np = of_find_compatible_node(NULL, NULL, "fsl,tzic");
+        tzic_base = of_iomap(np, 0);
+        WARN_ON(!tzic_base);
+
         /* put the TZIC into the reset value with
          * all interrupts disabled
          */
@@ -181,7 +185,6 @@ void __init tzic_init_irq(void __iomem *irqbase)
         irq_base = irq_alloc_descs(-1, 0, TZIC_NUM_IRQS, numa_node_id());
         WARN_ON(irq_base < 0);
 
-        np = of_find_compatible_node(NULL, NULL, "fsl,tzic");
         domain = irq_domain_add_legacy(np, TZIC_NUM_IRQS, irq_base, 0,
                                        &irq_domain_simple_ops, NULL);
         WARN_ON(!domain);
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index 64f8e2564a37..c455e974bbfe 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -17,7 +17,6 @@ config ARCH_INTEGRATOR_CP
         bool "Support Integrator/CP platform"
         select ARCH_CINTEGRATOR
         select ARM_TIMER_SP804
-        select PLAT_VERSATILE_CLCD
         select SERIAL_AMBA_PL011 if TTY
         select SERIAL_AMBA_PL011_CONSOLE if TTY
         select SOC_BUS
diff --git a/arch/arm/mach-integrator/include/mach/memory.h b/arch/arm/mach-integrator/include/mach/memory.h
deleted file mode 100644
index 334d5e271889..000000000000
--- a/arch/arm/mach-integrator/include/mach/memory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  arch/arm/mach-integrator/include/mach/memory.h
- *
- *  Copyright (C) 1999 ARM Limited
- *
- * 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
- */
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET        UL(0x00000000)
-
-#define BUS_OFFSET      UL(0x80000000)
-#define __virt_to_bus(x)        ((x) - PAGE_OFFSET + BUS_OFFSET)
-#define __bus_to_virt(x)        ((x) - BUS_OFFSET + PAGE_OFFSET)
-#define __pfn_to_bus(x)         (__pfn_to_phys(x) + (BUS_OFFSET - PHYS_OFFSET))
-#define __bus_to_pfn(x)         __phys_to_pfn((x) - (BUS_OFFSET - PHYS_OFFSET))
-
-#endif
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 660ca6feff40..8ca290b479b1 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -31,7 +31,7 @@
 #include <linux/clockchips.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-#include <linux/irqchip/versatile-fpga.h>
+#include <linux/irqchip.h>
 #include <linux/mtd/physmap.h>
 #include <linux/clk.h>
 #include <linux/platform_data/clk-integrator.h>
@@ -439,15 +439,10 @@ static void __init ap_of_timer_init(void)
         integrator_clockevent_init(rate, base, irq);
 }
 
-static const struct of_device_id fpga_irq_of_match[] __initconst = {
-        { .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },
-        { /* Sentinel */ }
-};
-
 static void __init ap_init_irq_of(void)
 {
         cm_init();
-        of_irq_init(fpga_irq_of_match);
+        irqchip_init();
 }
 
 /* For the Device Tree, add in the UART callbacks as AUXDATA */
@@ -558,7 +553,6 @@ DT_MACHINE_START(INTEGRATOR_AP_DT, "ARM Integrator/AP (Device Tree)")
         .map_io         = ap_map_io,
         .init_early     = ap_init_early,
         .init_irq       = ap_init_irq_of,
-        .handle_irq     = fpga_handle_irq,
         .init_time      = ap_of_timer_init,
         .init_machine   = ap_init_of,
         .restart        = integrator_restart,
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 0e57f8f820a5..cca02eb75eb5 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -18,9 +18,10 @@
 #include <linux/amba/bus.h>
 #include <linux/amba/kmi.h>
 #include <linux/amba/clcd.h>
+#include <linux/platform_data/video-clcd-versatile.h>
 #include <linux/amba/mmci.h>
 #include <linux/io.h>
-#include <linux/irqchip/versatile-fpga.h>
+#include <linux/irqchip.h>
 #include <linux/gfp.h>
 #include <linux/mtd/physmap.h>
 #include <linux/of_irq.h>
@@ -36,8 +37,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
 
-#include <plat/clcd.h>
-
 #include "hardware.h"
 #include "cm.h"
 #include "common.h"
@@ -235,15 +234,10 @@ static void __init intcp_init_early(void)
         sched_clock_register(intcp_read_sched_clock, 32, 24000000);
 }
 
-static const struct of_device_id fpga_irq_of_match[] __initconst = {
-        { .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },
-        { /* Sentinel */ }
-};
-
 static void __init intcp_init_irq_of(void)
 {
         cm_init();
-        of_irq_init(fpga_irq_of_match);
+        irqchip_init();
 }
 
 /*
@@ -329,7 +323,6 @@ DT_MACHINE_START(INTEGRATOR_CP_DT, "ARM Integrator/CP (Device Tree)")
         .map_io         = intcp_map_io,
         .init_early     = intcp_init_early,
         .init_irq       = intcp_init_irq_of,
-        .handle_irq     = fpga_handle_irq,
         .init_machine   = intcp_init_of,
         .restart        = integrator_restart,
         .dt_compat      = intcp_dt_board_compat,
diff --git a/arch/arm/mach-iop13xx/include/mach/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h
index 17b40279e0a4..9311ee2126d6 100644
--- a/arch/arm/mach-iop13xx/include/mach/iop13xx.h
+++ b/arch/arm/mach-iop13xx/include/mach/iop13xx.h
@@ -3,7 +3,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <linux/reboot.h>
+enum reboot_mode;
 
 /* The ATU offsets can change based on the strapping */
 extern u32 iop13xx_atux_pmmr_offset;
diff --git a/arch/arm/mach-iop13xx/include/mach/memory.h b/arch/arm/mach-iop13xx/include/mach/memory.h
index 7c032d0ab24a..59307e787588 100644
--- a/arch/arm/mach-iop13xx/include/mach/memory.h
+++ b/arch/arm/mach-iop13xx/include/mach/memory.h
@@ -3,11 +3,6 @@
 
 #include <mach/hardware.h>
 
-/*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET        UL(0x00000000)
-
 #ifndef __ASSEMBLY__
 
 #if defined(CONFIG_ARCH_IOP13XX)
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index bca96f433495..53c316f7301e 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -20,6 +20,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/serial_8250.h>
 #include <linux/io.h>
+#include <linux/reboot.h>
 #ifdef CONFIG_MTD_PHYSMAP
 #include <linux/mtd/physmap.h>
 #endif
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
deleted file mode 100644
index df4b26340ae4..000000000000
--- a/arch/arm/mach-kirkwood/Kconfig
+++ /dev/null
@@ -1,111 +0,0 @@
-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_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_OPENRD
-        select KIRKWOOD_LEGACY
-        bool
-
-config MACH_OPENRD_BASE
-        bool "Marvell OpenRD Base Board"
-        select MACH_OPENRD
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell OpenRD Base Board.
-
-config MACH_OPENRD_CLIENT
-        bool "Marvell OpenRD Client Board"
-        select MACH_OPENRD
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell OpenRD Client Board.
-
-config MACH_OPENRD_ULTIMATE
-        bool "Marvell OpenRD Ultimate Board"
-        select MACH_OPENRD
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell OpenRD Ultimate Board.
-
-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_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
-          TS-219P+ Turbo NAS devices.
-
-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
-          NAS devices.
-
-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
-        select REGULATOR
-        select REGULATOR_FIXED_VOLTAGE
-        select USE_OF
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell Kirkwood using flattened device tree.
-
-endmenu
-
-endif
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
deleted file mode 100644
index 3a72c5c6e747..000000000000
--- a/arch/arm/mach-kirkwood/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-obj-$(CONFIG_KIRKWOOD_LEGACY)   += irq.o mpp.o common.o pcie.o
-obj-$(CONFIG_PM)                += pm.o
-
-obj-$(CONFIG_MACH_D2NET_V2)             += d2net_v2-setup.o lacie_v2-common.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_OPENRD)               += openrd-setup.o
-obj-$(CONFIG_MACH_RD88F6192_NAS)        += rd88f6192-nas-setup.o
-obj-$(CONFIG_MACH_RD88F6281)            += rd88f6281-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
diff --git a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
deleted file mode 100644
index 760a0efe7580..000000000000
--- a/arch/arm/mach-kirkwood/Makefile.boot
+++ /dev/null
@@ -1,3 +0,0 @@
-   zreladdr-y   += 0x00008000
-params_phys-y   := 0x00000100
-initrd_phys-y   := 0x00800000
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
deleted file mode 100644
index ff18ff20f71f..000000000000
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
- *
- * arch/arm/mach-kirkwood/board-dt.c
- *
- * Flattened Device Tree board initialization
- *
- * 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/clk.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_net.h>
-#include <linux/of_platform.h>
-#include <linux/dma-mapping.h>
-#include <linux/irqchip.h>
-#include <asm/hardware/cache-feroceon-l2.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <mach/bridge-regs.h>
-#include <plat/common.h>
-#include <plat/pcie.h>
-#include "pm.h"
-
-static struct map_desc kirkwood_io_desc[] __initdata = {
-        {
-                .virtual        = (unsigned long) KIRKWOOD_REGS_VIRT_BASE,
-                .pfn            = __phys_to_pfn(KIRKWOOD_REGS_PHYS_BASE),
-                .length         = KIRKWOOD_REGS_SIZE,
-                .type           = MT_DEVICE,
-        },
-};
-
-static void __init kirkwood_map_io(void)
-{
-        iotable_init(kirkwood_io_desc, ARRAY_SIZE(kirkwood_io_desc));
-}
-
-static struct resource kirkwood_cpufreq_resources[] = {
-        [0] = {
-                .start  = CPU_CONTROL_PHYS,
-                .end    = CPU_CONTROL_PHYS + 3,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device kirkwood_cpufreq_device = {
-        .name           = "kirkwood-cpufreq",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(kirkwood_cpufreq_resources),
-        .resource       = kirkwood_cpufreq_resources,
-};
-
-static void __init kirkwood_cpufreq_init(void)
-{
-        platform_device_register(&kirkwood_cpufreq_device);
-}
-
-static struct resource kirkwood_cpuidle_resource[] = {
-        {
-                .flags  = IORESOURCE_MEM,
-                .start  = DDR_OPERATION_BASE,
-                .end    = DDR_OPERATION_BASE + 3,
-        },
-};
-
-static struct platform_device kirkwood_cpuidle = {
-        .name           = "kirkwood_cpuidle",
-        .id             = -1,
-        .resource       = kirkwood_cpuidle_resource,
-        .num_resources  = 1,
-};
-
-static void __init kirkwood_cpuidle_init(void)
-{
-        platform_device_register(&kirkwood_cpuidle);
-}
-
-/* Temporary here since mach-mvebu has a function we can use */
-static void kirkwood_restart(enum reboot_mode mode, const char *cmd)
-{
-        /*
-         * Enable soft reset to assert RSTOUTn.
-         */
-        writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);
-
-        /*
-         * Assert soft reset.
-         */
-        writel(SOFT_RESET, SYSTEM_SOFT_RESET);
-
-        while (1)
-                ;
-}
-
-#define MV643XX_ETH_MAC_ADDR_LOW        0x0414
-#define MV643XX_ETH_MAC_ADDR_HIGH       0x0418
-
-static void __init kirkwood_dt_eth_fixup(void)
-{
-        struct device_node *np;
-
-        /*
-         * The ethernet interfaces forget the MAC address assigned by u-boot
-         * if the clocks are turned off. Usually, u-boot on kirkwood boards
-         * has no DT support to properly set local-mac-address property.
-         * As a workaround, we get the MAC address from mv643xx_eth registers
-         * and update the port device node if no valid MAC address is set.
-         */
-        for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
-                struct device_node *pnp = of_get_parent(np);
-                struct clk *clk;
-                struct property *pmac;
-                void __iomem *io;
-                u8 *macaddr;
-                u32 reg;
-
-                if (!pnp)
-                        continue;
-
-                /* skip disabled nodes or nodes with valid MAC address*/
-                if (!of_device_is_available(pnp) || of_get_mac_address(np))
-                        goto eth_fixup_skip;
-
-                clk = of_clk_get(pnp, 0);
-                if (IS_ERR(clk))
-                        goto eth_fixup_skip;
-
-                io = of_iomap(pnp, 0);
-                if (!io)
-                        goto eth_fixup_no_map;
-
-                /* ensure port clock is not gated to not hang CPU */
-                clk_prepare_enable(clk);
-
-                /* store MAC address register contents in local-mac-address */
-                pr_err(FW_INFO "%s: local-mac-address is not set\n",
-                       np->full_name);
-
-                pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
-                if (!pmac)
-                        goto eth_fixup_no_mem;
-
-                pmac->value = pmac + 1;
-                pmac->length = 6;
-                pmac->name = kstrdup("local-mac-address", GFP_KERNEL);
-                if (!pmac->name) {
-                        kfree(pmac);
-                        goto eth_fixup_no_mem;
-                }
-
-                macaddr = pmac->value;
-                reg = readl(io + MV643XX_ETH_MAC_ADDR_HIGH);
-                macaddr[0] = (reg >> 24) & 0xff;
-                macaddr[1] = (reg >> 16) & 0xff;
-                macaddr[2] = (reg >> 8) & 0xff;
-                macaddr[3] = reg & 0xff;
-
-                reg = readl(io + MV643XX_ETH_MAC_ADDR_LOW);
-                macaddr[4] = (reg >> 8) & 0xff;
-                macaddr[5] = reg & 0xff;
-
-                of_update_property(np, pmac);
-
-eth_fixup_no_mem:
-                iounmap(io);
-                clk_disable_unprepare(clk);
-eth_fixup_no_map:
-                clk_put(clk);
-eth_fixup_skip:
-                of_node_put(pnp);
-        }
-}
-
-/*
- * Disable propagation of mbus errors to the CPU local bus, as this
- * causes mbus errors (which can occur for example for PCI aborts) to
- * throw CPU aborts, which we're not set up to deal with.
- */
-static void __init kirkwood_disable_mbus_error_propagation(void)
-{
-        void __iomem *cpu_config;
-
-        cpu_config = ioremap(CPU_CONFIG_PHYS, 4);
-        writel(readl(cpu_config) & ~CPU_CONFIG_ERROR_PROP, cpu_config);
-        iounmap(cpu_config);
-}
-
-static void __init kirkwood_dt_init(void)
-{
-        kirkwood_disable_mbus_error_propagation();
-
-        BUG_ON(mvebu_mbus_dt_init(false));
-
-#ifdef CONFIG_CACHE_FEROCEON_L2
-        feroceon_of_init();
-#endif
-        kirkwood_cpufreq_init();
-        kirkwood_cpuidle_init();
-
-        kirkwood_pm_init();
-        kirkwood_dt_eth_fixup();
-
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
-static const char * const kirkwood_dt_board_compat[] = {
-        "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_machine   = kirkwood_dt_init,
-        .restart        = kirkwood_restart,
-        .dt_compat      = kirkwood_dt_board_compat,
-MACHINE_END
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
deleted file mode 100644
index 255f33a3903c..000000000000
--- a/arch/arm/mach-kirkwood/common.c
+++ /dev/null
@@ -1,746 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/common.c
- *
- * Core functions for Marvell Kirkwood SoCs
- *
- * 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/serial_8250.h>
-#include <linux/ata_platform.h>
-#include <linux/mtd/nand.h>
-#include <linux/dma-mapping.h>
-#include <linux/clk-provider.h>
-#include <linux/spinlock.h>
-#include <linux/mv643xx_i2c.h>
-#include <linux/timex.h>
-#include <linux/kexec.h>
-#include <linux/reboot.h>
-#include <net/dsa.h>
-#include <asm/page.h>
-#include <asm/mach/map.h>
-#include <asm/mach/time.h>
-#include <asm/hardware/cache-feroceon-l2.h>
-#include <mach/kirkwood.h>
-#include <mach/bridge-regs.h>
-#include <linux/platform_data/asoc-kirkwood.h>
-#include <linux/platform_data/mmc-mvsdio.h>
-#include <linux/platform_data/mtd-orion_nand.h>
-#include <linux/platform_data/usb-ehci-orion.h>
-#include <plat/common.h>
-#include <plat/time.h>
-#include <linux/platform_data/dma-mv_xor.h>
-#include "common.h"
-#include "pm.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
- ****************************************************************************/
-static struct map_desc kirkwood_io_desc[] __initdata = {
-        {
-                .virtual        = (unsigned long) KIRKWOOD_REGS_VIRT_BASE,
-                .pfn            = __phys_to_pfn(KIRKWOOD_REGS_PHYS_BASE),
-                .length         = KIRKWOOD_REGS_SIZE,
-                .type           = MT_DEVICE,
-        },
-};
-
-void __init kirkwood_map_io(void)
-{
-        iotable_init(kirkwood_io_desc, ARRAY_SIZE(kirkwood_io_desc));
-}
-
-/*****************************************************************************
- * CLK tree
- ****************************************************************************/
-
-static void enable_sata0(void)
-{
-        /* Enable PLL and IVREF */
-        writel(readl(SATA0_PHY_MODE_2) | 0xf, SATA0_PHY_MODE_2);
-        /* Enable PHY */
-        writel(readl(SATA0_IF_CTRL) & ~0x200, SATA0_IF_CTRL);
-}
-
-static void disable_sata0(void)
-{
-        /* Disable PLL and IVREF */
-        writel(readl(SATA0_PHY_MODE_2) & ~0xf, SATA0_PHY_MODE_2);
-        /* Disable PHY */
-        writel(readl(SATA0_IF_CTRL) | 0x200, SATA0_IF_CTRL);
-}
-
-static void enable_sata1(void)
-{
-        /* Enable PLL and IVREF */
-        writel(readl(SATA1_PHY_MODE_2) | 0xf, SATA1_PHY_MODE_2);
-        /* Enable PHY */
-        writel(readl(SATA1_IF_CTRL) & ~0x200, SATA1_IF_CTRL);
-}
-
-static void disable_sata1(void)
-{
-        /* Disable PLL and IVREF */
-        writel(readl(SATA1_PHY_MODE_2) & ~0xf, SATA1_PHY_MODE_2);
-        /* Disable PHY */
-        writel(readl(SATA1_IF_CTRL) | 0x200, SATA1_IF_CTRL);
-}
-
-static void disable_pcie0(void)
-{
-        writel(readl(PCIE_LINK_CTRL) | 0x10, PCIE_LINK_CTRL);
-        while (1)
-                if (readl(PCIE_STATUS) & 0x1)
-                        break;
-        writel(readl(PCIE_LINK_CTRL) & ~0x10, PCIE_LINK_CTRL);
-}
-
-static void disable_pcie1(void)
-{
-        u32 dev, rev;
-
-        kirkwood_pcie_id(&dev, &rev);
-
-        if (dev == MV88F6282_DEV_ID) {
-                writel(readl(PCIE1_LINK_CTRL) | 0x10, PCIE1_LINK_CTRL);
-                while (1)
-                        if (readl(PCIE1_STATUS) & 0x1)
-                                break;
-                writel(readl(PCIE1_LINK_CTRL) & ~0x10, PCIE1_LINK_CTRL);
-        }
-}
-
-/* An extended version of the gated clk. This calls fn_en()/fn_dis
- * before enabling/disabling the clock.  We use this to turn on/off
- * PHYs etc.  */
-struct clk_gate_fn {
-        struct clk_gate gate;
-        void (*fn_en)(void);
-        void (*fn_dis)(void);
-};
-
-#define to_clk_gate_fn(_gate) container_of(_gate, struct clk_gate_fn, gate)
-#define to_clk_gate(_hw) container_of(_hw, struct clk_gate, hw)
-
-static int clk_gate_fn_enable(struct clk_hw *hw)
-{
-        struct clk_gate *gate = to_clk_gate(hw);
-        struct clk_gate_fn *gate_fn = to_clk_gate_fn(gate);
-        int ret;
-
-        ret = clk_gate_ops.enable(hw);
-        if (!ret && gate_fn->fn_en)
-                gate_fn->fn_en();
-
-        return ret;
-}
-
-static void clk_gate_fn_disable(struct clk_hw *hw)
-{
-        struct clk_gate *gate = to_clk_gate(hw);
-        struct clk_gate_fn *gate_fn = to_clk_gate_fn(gate);
-
-        if (gate_fn->fn_dis)
-                gate_fn->fn_dis();
-
-        clk_gate_ops.disable(hw);
-}
-
-static struct clk_ops clk_gate_fn_ops;
-
-static struct clk __init *clk_register_gate_fn(struct device *dev,
-                const char *name,
-                const char *parent_name, unsigned long flags,
-                void __iomem *reg, u8 bit_idx,
-                u8 clk_gate_flags, spinlock_t *lock,
-                void (*fn_en)(void), void (*fn_dis)(void))
-{
-        struct clk_gate_fn *gate_fn;
-        struct clk *clk;
-        struct clk_init_data init;
-
-        gate_fn = kzalloc(sizeof(struct clk_gate_fn), GFP_KERNEL);
-        if (!gate_fn) {
-                pr_err("%s: could not allocate gated clk\n", __func__);
-                return ERR_PTR(-ENOMEM);
-        }
-
-        init.name = name;
-        init.ops = &clk_gate_fn_ops;
-        init.flags = flags;
-        init.parent_names = (parent_name ? &parent_name : NULL);
-        init.num_parents = (parent_name ? 1 : 0);
-
-        /* struct clk_gate assignments */
-        gate_fn->gate.reg = reg;
-        gate_fn->gate.bit_idx = bit_idx;
-        gate_fn->gate.flags = clk_gate_flags;
-        gate_fn->gate.lock = lock;
-        gate_fn->gate.hw.init = &init;
-        gate_fn->fn_en = fn_en;
-        gate_fn->fn_dis = fn_dis;
-
-        /* ops is the gate ops, but with our enable/disable functions */
-        if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
-            clk_gate_fn_ops.disable != clk_gate_fn_disable) {
-                clk_gate_fn_ops = clk_gate_ops;
-                clk_gate_fn_ops.enable = clk_gate_fn_enable;
-                clk_gate_fn_ops.disable = clk_gate_fn_disable;
-        }
-
-        clk = clk_register(dev, &gate_fn->gate.hw);
-
-        if (IS_ERR(clk))
-                kfree(gate_fn);
-
-        return clk;
-}
-
-static DEFINE_SPINLOCK(gating_lock);
-static struct clk *tclk;
-
-static struct clk __init *kirkwood_register_gate(const char *name, u8 bit_idx)
-{
-        return clk_register_gate(NULL, name, "tclk", 0, CLOCK_GATING_CTRL,
-                                 bit_idx, 0, &gating_lock);
-}
-
-static struct clk __init *kirkwood_register_gate_fn(const char *name,
-                                                    u8 bit_idx,
-                                                    void (*fn_en)(void),
-                                                    void (*fn_dis)(void))
-{
-        return clk_register_gate_fn(NULL, name, "tclk", 0, CLOCK_GATING_CTRL,
-                                    bit_idx, 0, &gating_lock, fn_en, fn_dis);
-}
-
-static struct clk *ge0, *ge1;
-
-void __init kirkwood_clk_init(void)
-{
-        struct clk *runit, *sata0, *sata1, *usb0, *sdio;
-        struct clk *crypto, *xor0, *xor1, *pex0, *pex1, *audio;
-
-        tclk = clk_register_fixed_rate(NULL, "tclk", NULL,
-                                       CLK_IS_ROOT, kirkwood_tclk);
-
-        runit = kirkwood_register_gate("runit",  CGC_BIT_RUNIT);
-        ge0 = kirkwood_register_gate("ge0",    CGC_BIT_GE0);
-        ge1 = kirkwood_register_gate("ge1",    CGC_BIT_GE1);
-        sata0 = kirkwood_register_gate_fn("sata0",  CGC_BIT_SATA0,
-                                          enable_sata0, disable_sata0);
-        sata1 = kirkwood_register_gate_fn("sata1",  CGC_BIT_SATA1,
-                                          enable_sata1, disable_sata1);
-        usb0 = kirkwood_register_gate("usb0",   CGC_BIT_USB0);
-        sdio = kirkwood_register_gate("sdio",   CGC_BIT_SDIO);
-        crypto = kirkwood_register_gate("crypto", CGC_BIT_CRYPTO);
-        xor0 = kirkwood_register_gate("xor0",   CGC_BIT_XOR0);
-        xor1 = kirkwood_register_gate("xor1",   CGC_BIT_XOR1);
-        pex0 = kirkwood_register_gate_fn("pex0",   CGC_BIT_PEX0,
-                                         NULL, disable_pcie0);
-        pex1 = kirkwood_register_gate_fn("pex1",   CGC_BIT_PEX1,
-                                         NULL, disable_pcie1);
-        audio = kirkwood_register_gate("audio",  CGC_BIT_AUDIO);
-        kirkwood_register_gate("tdm",    CGC_BIT_TDM);
-        kirkwood_register_gate("tsu",    CGC_BIT_TSU);
-
-        /* clkdev entries, mapping clks to devices */
-        orion_clkdev_add(NULL, "orion_spi.0", runit);
-        orion_clkdev_add(NULL, "orion_spi.1", runit);
-        orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0);
-        orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1);
-        orion_clkdev_add(NULL, "orion_wdt", tclk);
-        orion_clkdev_add("0", "sata_mv.0", sata0);
-        orion_clkdev_add("1", "sata_mv.0", sata1);
-        orion_clkdev_add(NULL, "orion-ehci.0", usb0);
-        orion_clkdev_add(NULL, "orion_nand", runit);
-        orion_clkdev_add(NULL, "mvsdio", sdio);
-        orion_clkdev_add(NULL, "mv_crypto", crypto);
-        orion_clkdev_add(NULL, MV_XOR_NAME ".0", xor0);
-        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, "mvebu-audio", audio);
-        orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".0", runit);
-        orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".1", runit);
-
-        /* Marvell says runit is used by SPI, UART, NAND, TWSI, ...,
-         * so should never be gated.
-         */
-        clk_prepare_enable(runit);
-}
-
-/*****************************************************************************
- * EHCI0
- ****************************************************************************/
-void __init kirkwood_ehci_init(void)
-{
-        orion_ehci_init(USB_PHYS_BASE, IRQ_KIRKWOOD_USB, EHCI_PHY_NA);
-}
-
-
-/*****************************************************************************
- * GE00
- ****************************************************************************/
-void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
-{
-        orion_ge00_init(eth_data,
-                        GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM,
-                        IRQ_KIRKWOOD_GE00_ERR, 1600);
-        /* The interface forgets the MAC address assigned by u-boot if
-        the clock is turned off, so claim the clk now. */
-        clk_prepare_enable(ge0);
-}
-
-
-/*****************************************************************************
- * GE01
- ****************************************************************************/
-void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data)
-{
-        orion_ge01_init(eth_data,
-                        GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,
-                        IRQ_KIRKWOOD_GE01_ERR, 1600);
-        clk_prepare_enable(ge1);
-}
-
-
-/*****************************************************************************
- * Ethernet switch
- ****************************************************************************/
-void __init kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq)
-{
-        orion_ge00_switch_init(d, irq);
-}
-
-
-/*****************************************************************************
- * NAND flash
- ****************************************************************************/
-static struct resource kirkwood_nand_resource = {
-        .flags          = IORESOURCE_MEM,
-        .start          = KIRKWOOD_NAND_MEM_PHYS_BASE,
-        .end            = KIRKWOOD_NAND_MEM_PHYS_BASE +
-                                KIRKWOOD_NAND_MEM_SIZE - 1,
-};
-
-static struct orion_nand_data kirkwood_nand_data = {
-        .cle            = 0,
-        .ale            = 1,
-        .width          = 8,
-};
-
-static struct platform_device kirkwood_nand_flash = {
-        .name           = "orion_nand",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &kirkwood_nand_data,
-        },
-        .resource       = &kirkwood_nand_resource,
-        .num_resources  = 1,
-};
-
-void __init kirkwood_nand_init(struct mtd_partition *parts, int nr_parts,
-                               int chip_delay)
-{
-        kirkwood_nand_data.parts = parts;
-        kirkwood_nand_data.nr_parts = nr_parts;
-        kirkwood_nand_data.chip_delay = chip_delay;
-        platform_device_register(&kirkwood_nand_flash);
-}
-
-void __init kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
-                                   int (*dev_ready)(struct mtd_info *))
-{
-        kirkwood_nand_data.parts = parts;
-        kirkwood_nand_data.nr_parts = nr_parts;
-        kirkwood_nand_data.dev_ready = dev_ready;
-        platform_device_register(&kirkwood_nand_flash);
-}
-
-/*****************************************************************************
- * SoC RTC
- ****************************************************************************/
-static void __init kirkwood_rtc_init(void)
-{
-        orion_rtc_init(RTC_PHYS_BASE, IRQ_KIRKWOOD_RTC);
-}
-
-
-/*****************************************************************************
- * SATA
- ****************************************************************************/
-void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data)
-{
-        orion_sata_init(sata_data, SATA_PHYS_BASE, IRQ_KIRKWOOD_SATA);
-}
-
-
-/*****************************************************************************
- * SD/SDIO/MMC
- ****************************************************************************/
-static struct resource mvsdio_resources[] = {
-        [0] = {
-                .start  = SDIO_PHYS_BASE,
-                .end    = SDIO_PHYS_BASE + SZ_1K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = IRQ_KIRKWOOD_SDIO,
-                .end    = IRQ_KIRKWOOD_SDIO,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static u64 mvsdio_dmamask = DMA_BIT_MASK(32);
-
-static struct platform_device kirkwood_sdio = {
-        .name           = "mvsdio",
-        .id             = -1,
-        .dev            = {
-                .dma_mask = &mvsdio_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-        .num_resources  = ARRAY_SIZE(mvsdio_resources),
-        .resource       = mvsdio_resources,
-};
-
-void __init kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data)
-{
-        u32 dev, rev;
-
-        kirkwood_pcie_id(&dev, &rev);
-        if (rev == 0 && dev != MV88F6282_DEV_ID) /* catch all Kirkwood Z0's */
-                mvsdio_data->clock = 100000000;
-        else
-                mvsdio_data->clock = 200000000;
-        kirkwood_sdio.dev.platform_data = mvsdio_data;
-        platform_device_register(&kirkwood_sdio);
-}
-
-
-/*****************************************************************************
- * SPI
- ****************************************************************************/
-void __init kirkwood_spi_init(void)
-{
-        orion_spi_init(SPI_PHYS_BASE);
-}
-
-
-/*****************************************************************************
- * I2C
- ****************************************************************************/
-void __init kirkwood_i2c_init(void)
-{
-        orion_i2c_init(I2C_PHYS_BASE, IRQ_KIRKWOOD_TWSI, 8);
-}
-
-
-/*****************************************************************************
- * UART0
- ****************************************************************************/
-
-void __init kirkwood_uart0_init(void)
-{
-        orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
-                         IRQ_KIRKWOOD_UART_0, tclk);
-}
-
-
-/*****************************************************************************
- * UART1
- ****************************************************************************/
-void __init kirkwood_uart1_init(void)
-{
-        orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
-                         IRQ_KIRKWOOD_UART_1, tclk);
-}
-
-/*****************************************************************************
- * Cryptographic Engines and Security Accelerator (CESA)
- ****************************************************************************/
-void __init kirkwood_crypto_init(void)
-{
-        orion_crypto_init(CRYPTO_PHYS_BASE, KIRKWOOD_SRAM_PHYS_BASE,
-                          KIRKWOOD_SRAM_SIZE, IRQ_KIRKWOOD_CRYPTO);
-}
-
-
-/*****************************************************************************
- * XOR0
- ****************************************************************************/
-void __init kirkwood_xor0_init(void)
-{
-        orion_xor0_init(XOR0_PHYS_BASE, XOR0_HIGH_PHYS_BASE,
-                        IRQ_KIRKWOOD_XOR_00, IRQ_KIRKWOOD_XOR_01);
-}
-
-
-/*****************************************************************************
- * XOR1
- ****************************************************************************/
-void __init kirkwood_xor1_init(void)
-{
-        orion_xor1_init(XOR1_PHYS_BASE, XOR1_HIGH_PHYS_BASE,
-                        IRQ_KIRKWOOD_XOR_10, IRQ_KIRKWOOD_XOR_11);
-}
-
-
-/*****************************************************************************
- * Watchdog
- ****************************************************************************/
-void __init kirkwood_wdt_init(void)
-{
-        orion_wdt_init();
-}
-
-/*****************************************************************************
- * CPU idle
- ****************************************************************************/
-static struct resource kirkwood_cpuidle_resource[] = {
-        {
-                .flags  = IORESOURCE_MEM,
-                .start  = DDR_OPERATION_BASE,
-                .end    = DDR_OPERATION_BASE + 3,
-        },
-};
-
-static struct platform_device kirkwood_cpuidle = {
-        .name           = "kirkwood_cpuidle",
-        .id             = -1,
-        .resource       = kirkwood_cpuidle_resource,
-        .num_resources  = 1,
-};
-
-void __init kirkwood_cpuidle_init(void)
-{
-        platform_device_register(&kirkwood_cpuidle);
-}
-
-/*****************************************************************************
- * Time handling
- ****************************************************************************/
-void __init kirkwood_init_early(void)
-{
-        orion_time_set_base(TIMER_VIRT_BASE);
-}
-
-int kirkwood_tclk;
-
-static int __init kirkwood_find_tclk(void)
-{
-        u32 dev, rev;
-
-        kirkwood_pcie_id(&dev, &rev);
-
-        if (dev == MV88F6281_DEV_ID || dev == MV88F6282_DEV_ID)
-                if (((readl(SAMPLE_AT_RESET) >> 21) & 1) == 0)
-                        return 200000000;
-
-        return 166666667;
-}
-
-void __init kirkwood_timer_init(void)
-{
-        kirkwood_tclk = kirkwood_find_tclk();
-
-        orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
-                        IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
-}
-
-/*****************************************************************************
- * Audio
- ****************************************************************************/
-static struct resource kirkwood_audio_resources[] = {
-        [0] = {
-                .start  = AUDIO_PHYS_BASE,
-                .end    = AUDIO_PHYS_BASE + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = IRQ_KIRKWOOD_I2S,
-                .end    = IRQ_KIRKWOOD_I2S,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct kirkwood_asoc_platform_data kirkwood_audio_data = {
-        .burst       = 128,
-};
-
-static struct platform_device kirkwood_audio_device = {
-        .name           = "mvebu-audio",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(kirkwood_audio_resources),
-        .resource       = kirkwood_audio_resources,
-        .dev            = {
-                .platform_data  = &kirkwood_audio_data,
-        },
-};
-
-void __init kirkwood_audio_init(void)
-{
-        platform_device_register(&kirkwood_audio_device);
-}
-
-/*****************************************************************************
- * CPU Frequency
- ****************************************************************************/
-static struct resource kirkwood_cpufreq_resources[] = {
-        [0] = {
-                .start  = CPU_CONTROL_PHYS,
-                .end    = CPU_CONTROL_PHYS + 3,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device kirkwood_cpufreq_device = {
-        .name           = "kirkwood-cpufreq",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(kirkwood_cpufreq_resources),
-        .resource       = kirkwood_cpufreq_resources,
-};
-
-void __init kirkwood_cpufreq_init(void)
-{
-        platform_device_register(&kirkwood_cpufreq_device);
-}
-
-/*****************************************************************************
- * General
- ****************************************************************************/
-/*
- * Identify device ID and revision.
- */
-char * __init kirkwood_id(void)
-{
-        u32 dev, rev;
-
-        kirkwood_pcie_id(&dev, &rev);
-
-        if (dev == MV88F6281_DEV_ID) {
-                if (rev == MV88F6281_REV_Z0)
-                        return "MV88F6281-Z0";
-                else if (rev == MV88F6281_REV_A0)
-                        return "MV88F6281-A0";
-                else if (rev == MV88F6281_REV_A1)
-                        return "MV88F6281-A1";
-                else
-                        return "MV88F6281-Rev-Unsupported";
-        } else if (dev == MV88F6192_DEV_ID) {
-                if (rev == MV88F6192_REV_Z0)
-                        return "MV88F6192-Z0";
-                else if (rev == MV88F6192_REV_A0)
-                        return "MV88F6192-A0";
-                else if (rev == MV88F6192_REV_A1)
-                        return "MV88F6192-A1";
-                else
-                        return "MV88F6192-Rev-Unsupported";
-        } else if (dev == MV88F6180_DEV_ID) {
-                if (rev == MV88F6180_REV_A0)
-                        return "MV88F6180-Rev-A0";
-                else if (rev == MV88F6180_REV_A1)
-                        return "MV88F6180-Rev-A1";
-                else
-                        return "MV88F6180-Rev-Unsupported";
-        } else if (dev == MV88F6282_DEV_ID) {
-                if (rev == MV88F6282_REV_A0)
-                        return "MV88F6282-Rev-A0";
-                else if (rev == MV88F6282_REV_A1)
-                        return "MV88F6282-Rev-A1";
-                else
-                        return "MV88F6282-Rev-Unsupported";
-        } else {
-                return "Device-Unknown";
-        }
-}
-
-void __init kirkwood_setup_wins(void)
-{
-        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)
-{
-#ifdef CONFIG_CACHE_FEROCEON_L2
-#ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH
-        writel(readl(L2_CONFIG_REG) | L2_WRITETHROUGH, L2_CONFIG_REG);
-        feroceon_l2_init(1);
-#else
-        writel(readl(L2_CONFIG_REG) & ~L2_WRITETHROUGH, L2_CONFIG_REG);
-        feroceon_l2_init(0);
-#endif
-#endif
-}
-
-void __init kirkwood_init(void)
-{
-        pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
-
-        /*
-         * Disable propagation of mbus errors to the CPU local bus,
-         * as this causes mbus errors (which can occur for example
-         * for PCI aborts) to throw CPU aborts, which we're not set
-         * up to deal with.
-         */
-        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();
-
-        /* Setup root of clk tree */
-        kirkwood_clk_init();
-
-        /* internal devices that every board has */
-        kirkwood_rtc_init();
-        kirkwood_wdt_init();
-        kirkwood_xor0_init();
-        kirkwood_xor1_init();
-        kirkwood_crypto_init();
-
-        kirkwood_pm_init();
-        kirkwood_cpuidle_init();
-#ifdef CONFIG_KEXEC
-        kexec_reinit = kirkwood_enable_pcie;
-#endif
-}
-
-void kirkwood_restart(enum reboot_mode mode, const char *cmd)
-{
-        /*
-         * Enable soft reset to assert RSTOUTn.
-         */
-        writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);
-
-        /*
-         * Assert soft reset.
-         */
-        writel(SOFT_RESET, SYSTEM_SOFT_RESET);
-
-        while (1)
-                ;
-}
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
deleted file mode 100644
index 832a4e2ab8d7..000000000000
--- a/arch/arm/mach-kirkwood/common.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/common.h
- *
- * Core functions for Marvell Kirkwood SoCs
- *
- * 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.
- */
-
-#ifndef __ARCH_KIRKWOOD_COMMON_H
-#define __ARCH_KIRKWOOD_COMMON_H
-
-#include <linux/reboot.h>
-
-struct dsa_platform_data;
-struct mv643xx_eth_platform_data;
-struct mv_sata_platform_data;
-struct mvsdio_platform_data;
-struct mtd_partition;
-struct mtd_info;
-struct kirkwood_asoc_platform_data;
-
-#define KW_PCIE0        (1 << 0)
-#define KW_PCIE1        (1 << 1)
-
-/*
- * Basic Kirkwood init functions used early by machine-setup.
- */
-void kirkwood_map_io(void);
-void kirkwood_init(void);
-void kirkwood_init_early(void);
-void kirkwood_init_irq(void);
-
-void kirkwood_setup_wins(void);
-
-void kirkwood_enable_pcie(void);
-void kirkwood_pcie_id(u32 *dev, u32 *rev);
-
-void kirkwood_ehci_init(void);
-void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data);
-void kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data);
-void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq);
-void kirkwood_pcie_init(unsigned int portmask);
-void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);
-void kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data);
-void kirkwood_spi_init(void);
-void kirkwood_i2c_init(void);
-void kirkwood_uart0_init(void);
-void kirkwood_uart1_init(void);
-void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);
-void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
-                            int (*dev_ready)(struct mtd_info *));
-void kirkwood_audio_init(void);
-void kirkwood_cpuidle_init(void);
-void kirkwood_cpufreq_init(void);
-
-void kirkwood_restart(enum reboot_mode, const char *);
-void kirkwood_clk_init(void);
-
-/* early init functions not converted to fdt yet */
-char *kirkwood_id(void);
-void kirkwood_l2_init(void);
-void kirkwood_wdt_init(void);
-void kirkwood_xor0_init(void);
-void kirkwood_xor1_init(void);
-void kirkwood_crypto_init(void);
-
-extern int kirkwood_tclk;
-extern void kirkwood_timer_init(void);
-
-#define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)
-
-#endif
diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c
deleted file mode 100644
index 453418063c1e..000000000000
--- a/arch/arm/mach-kirkwood/d2net_v2-setup.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/d2net_v2-setup.c
- *
- * LaCie d2 Network Space v2 Board Setup
- *
- * Copyright (C) 2010 Simon Guinot <sguinot@lacie.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 <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 d2net_v2_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-/*****************************************************************************
- * SATA
- ****************************************************************************/
-
-static struct mv_sata_platform_data d2net_v2_sata_data = {
-        .n_ports        = 2,
-};
-
-/*****************************************************************************
- * GPIO keys
- ****************************************************************************/
-
-#define D2NET_V2_GPIO_PUSH_BUTTON          34
-#define D2NET_V2_GPIO_POWER_SWITCH_ON      13
-#define D2NET_V2_GPIO_POWER_SWITCH_OFF     15
-
-#define D2NET_V2_SWITCH_POWER_ON           0x1
-#define D2NET_V2_SWITCH_POWER_OFF          0x2
-
-static struct gpio_keys_button d2net_v2_buttons[] = {
-        [0] = {
-                .type           = EV_SW,
-                .code           = D2NET_V2_SWITCH_POWER_ON,
-                .gpio           = D2NET_V2_GPIO_POWER_SWITCH_ON,
-                .desc           = "Back power switch (on|auto)",
-                .active_low     = 0,
-        },
-        [1] = {
-                .type           = EV_SW,
-                .code           = D2NET_V2_SWITCH_POWER_OFF,
-                .gpio           = D2NET_V2_GPIO_POWER_SWITCH_OFF,
-                .desc           = "Back power switch (auto|off)",
-                .active_low     = 0,
-        },
-        [2] = {
-                .code           = KEY_POWER,
-                .gpio           = D2NET_V2_GPIO_PUSH_BUTTON,
-                .desc           = "Front Push Button",
-                .active_low     = 1,
-        },
-};
-
-static struct gpio_keys_platform_data d2net_v2_button_data = {
-        .buttons        = d2net_v2_buttons,
-        .nbuttons       = ARRAY_SIZE(d2net_v2_buttons),
-};
-
-static struct platform_device d2net_v2_gpio_buttons = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &d2net_v2_button_data,
-        },
-};
-
-/*****************************************************************************
- * GPIO LEDs
- ****************************************************************************/
-
-#define D2NET_V2_GPIO_RED_LED           12
-
-static struct gpio_led d2net_v2_gpio_led_pins[] = {
-        {
-                .name   = "d2net_v2:red:fail",
-                .gpio   = D2NET_V2_GPIO_RED_LED,
-        },
-};
-
-static struct gpio_led_platform_data d2net_v2_gpio_leds_data = {
-        .num_leds       = ARRAY_SIZE(d2net_v2_gpio_led_pins),
-        .leds           = d2net_v2_gpio_led_pins,
-};
-
-static struct platform_device d2net_v2_gpio_leds = {
-        .name           = "leds-gpio",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &d2net_v2_gpio_leds_data,
-        },
-};
-
-/*****************************************************************************
- * Dual-GPIO CPLD LEDs
- ****************************************************************************/
-
-#define D2NET_V2_GPIO_BLUE_LED_SLOW     29
-#define D2NET_V2_GPIO_BLUE_LED_CMD      30
-
-static struct ns2_led d2net_v2_led_pins[] = {
-        {
-                .name   = "d2net_v2:blue:sata",
-                .cmd    = D2NET_V2_GPIO_BLUE_LED_CMD,
-                .slow   = D2NET_V2_GPIO_BLUE_LED_SLOW,
-        },
-};
-
-static struct ns2_led_platform_data d2net_v2_leds_data = {
-        .num_leds       = ARRAY_SIZE(d2net_v2_led_pins),
-        .leds           = d2net_v2_led_pins,
-};
-
-static struct platform_device d2net_v2_leds = {
-        .name           = "leds-ns2",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &d2net_v2_leds_data,
-        },
-};
-
-/*****************************************************************************
- * General Setup
- ****************************************************************************/
-
-static unsigned int d2net_v2_mpp_config[] __initdata = {
-        MPP0_SPI_SCn,
-        MPP1_SPI_MOSI,
-        MPP2_SPI_SCK,
-        MPP3_SPI_MISO,
-        MPP6_SYSRST_OUTn,
-        MPP7_GPO,               /* Request power-off */
-        MPP8_TW0_SDA,
-        MPP9_TW0_SCK,
-        MPP10_UART0_TXD,
-        MPP11_UART0_RXD,
-        MPP12_GPO,              /* Red led */
-        MPP13_GPIO,             /* Rear power switch (on|auto) */
-        MPP14_GPIO,             /* USB fuse */
-        MPP15_GPIO,             /* Rear power switch (auto|off) */
-        MPP16_GPIO,             /* SATA 0 power */
-        MPP21_SATA0_ACTn,
-        MPP24_GPIO,             /* USB mode select */
-        MPP26_GPIO,             /* USB device vbus */
-        MPP28_GPIO,             /* USB enable host vbus */
-        MPP29_GPIO,             /* Blue led (slow register) */
-        MPP30_GPIO,             /* Blue led (command register) */
-        MPP34_GPIO,             /* Power button (1 = Released, 0 = Pushed) */
-        MPP35_GPIO,             /* Inhibit power-off */
-        0
-};
-
-#define D2NET_V2_GPIO_POWER_OFF         7
-
-static void d2net_v2_power_off(void)
-{
-        gpio_set_value(D2NET_V2_GPIO_POWER_OFF, 1);
-}
-
-static void __init d2net_v2_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        kirkwood_mpp_conf(d2net_v2_mpp_config);
-
-        lacie_v2_hdd_power_init(1);
-
-        kirkwood_ehci_init();
-        kirkwood_ge00_init(&d2net_v2_ge00_data);
-        kirkwood_sata_init(&d2net_v2_sata_data);
-        kirkwood_uart0_init();
-        lacie_v2_register_flash();
-        lacie_v2_register_i2c_devices();
-
-        platform_device_register(&d2net_v2_leds);
-        platform_device_register(&d2net_v2_gpio_leds);
-        platform_device_register(&d2net_v2_gpio_buttons);
-
-        if (gpio_request(D2NET_V2_GPIO_POWER_OFF, "power-off") == 0 &&
-            gpio_direction_output(D2NET_V2_GPIO_POWER_OFF, 0) == 0)
-                pm_power_off = d2net_v2_power_off;
-        else
-                pr_err("d2net_v2: failed to configure power-off GPIO\n");
-}
-
-MACHINE_START(D2NET_V2, "LaCie d2 Network v2")
-        .atag_offset    = 0x100,
-        .init_machine   = d2net_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
diff --git a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h
deleted file mode 100644
index 1c37082c8b39..000000000000
--- a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/bridge-regs.h
- *
- * Mbus-L to Mbus Bridge Registers
- *
- * 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.
- */
-
-#ifndef __ASM_ARCH_BRIDGE_REGS_H
-#define __ASM_ARCH_BRIDGE_REGS_H
-
-#include <mach/kirkwood.h>
-
-#define CPU_CONFIG              (BRIDGE_VIRT_BASE + 0x0100)
-#define CPU_CONFIG_PHYS         (BRIDGE_PHYS_BASE + 0x0100)
-#define CPU_CONFIG_ERROR_PROP   0x00000004
-
-#define CPU_CONTROL             (BRIDGE_VIRT_BASE + 0x0104)
-#define CPU_CONTROL_PHYS        (BRIDGE_PHYS_BASE + 0x0104)
-#define CPU_RESET               0x00000002
-
-#define RSTOUTn_MASK            (BRIDGE_VIRT_BASE + 0x0108)
-#define RSTOUTn_MASK_PHYS       (BRIDGE_PHYS_BASE + 0x0108)
-#define SOFT_RESET_OUT_EN       0x00000004
-
-#define SYSTEM_SOFT_RESET       (BRIDGE_VIRT_BASE + 0x010c)
-#define SOFT_RESET              0x00000001
-
-#define BRIDGE_CAUSE            (BRIDGE_VIRT_BASE + 0x0110)
-
-#define BRIDGE_INT_TIMER1_CLR   (~0x0004)
-
-#define IRQ_VIRT_BASE           (BRIDGE_VIRT_BASE + 0x0200)
-#define IRQ_CAUSE_LOW_OFF       0x0000
-#define IRQ_MASK_LOW_OFF        0x0004
-#define IRQ_CAUSE_HIGH_OFF      0x0010
-#define IRQ_MASK_HIGH_OFF       0x0014
-
-#define TIMER_VIRT_BASE         (BRIDGE_VIRT_BASE + 0x0300)
-#define TIMER_PHYS_BASE         (BRIDGE_PHYS_BASE + 0x0300)
-
-#define L2_CONFIG_REG           (BRIDGE_VIRT_BASE + 0x0128)
-#define L2_WRITETHROUGH         0x00000010
-
-#define CLOCK_GATING_CTRL       (BRIDGE_VIRT_BASE + 0x11c)
-#define CGC_BIT_GE0             (0)
-#define CGC_BIT_PEX0            (2)
-#define CGC_BIT_USB0            (3)
-#define CGC_BIT_SDIO            (4)
-#define CGC_BIT_TSU             (5)
-#define CGC_BIT_DUNIT           (6)
-#define CGC_BIT_RUNIT           (7)
-#define CGC_BIT_XOR0            (8)
-#define CGC_BIT_AUDIO           (9)
-#define CGC_BIT_SATA0           (14)
-#define CGC_BIT_SATA1           (15)
-#define CGC_BIT_XOR1            (16)
-#define CGC_BIT_CRYPTO          (17)
-#define CGC_BIT_PEX1            (18)
-#define CGC_BIT_GE1             (19)
-#define CGC_BIT_TDM             (20)
-#define CGC_GE0                 (1 << 0)
-#define CGC_PEX0                (1 << 2)
-#define CGC_USB0                (1 << 3)
-#define CGC_SDIO                (1 << 4)
-#define CGC_TSU                 (1 << 5)
-#define CGC_DUNIT               (1 << 6)
-#define CGC_RUNIT               (1 << 7)
-#define CGC_XOR0                (1 << 8)
-#define CGC_AUDIO               (1 << 9)
-#define CGC_POWERSAVE           (1 << 11)
-#define CGC_SATA0               (1 << 14)
-#define CGC_SATA1               (1 << 15)
-#define CGC_XOR1                (1 << 16)
-#define CGC_CRYPTO              (1 << 17)
-#define CGC_PEX1                (1 << 18)
-#define CGC_GE1                 (1 << 19)
-#define CGC_TDM                 (1 << 20)
-#define CGC_RESERVED            (0x6 << 21)
-
-#define MEMORY_PM_CTRL          (BRIDGE_VIRT_BASE + 0x118)
-#define MEMORY_PM_CTRL_PHYS     (BRIDGE_PHYS_BASE + 0x118)
-
-#endif
diff --git a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S
deleted file mode 100644
index 82db29f7af8f..000000000000
--- a/arch/arm/mach-kirkwood/include/mach/entry-macro.S
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/entry-macro.S
- *
- * Low-level IRQ helper macros for Marvell Kirkwood platforms
- *
- * 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 <mach/bridge-regs.h>
-
-        .macro  get_irqnr_preamble, base, tmp
-        ldr     \base, =IRQ_VIRT_BASE
-        .endm
-
-        .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-        @ check low interrupts
-        ldr     \irqstat, [\base, #IRQ_CAUSE_LOW_OFF]
-        ldr     \tmp, [\base, #IRQ_MASK_LOW_OFF]
-        mov     \irqnr, #31
-        ands    \irqstat, \irqstat, \tmp
-        bne     1001f
-
-        @ if no low interrupts set, check high interrupts
-        ldr     \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]
-        ldr     \tmp, [\base, #IRQ_MASK_HIGH_OFF]
-        mov     \irqnr, #63
-        ands    \irqstat, \irqstat, \tmp
-
-        @ find first active interrupt source
-1001:   clzne   \irqstat, \irqstat
-        subne   \irqnr, \irqnr, \irqstat
-        .endm
diff --git a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h
deleted file mode 100644
index 742b74f43e41..000000000000
--- a/arch/arm/mach-kirkwood/include/mach/hardware.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/hardware.h
- *
- * 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_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
-
-#include "kirkwood.h"
-
-#endif
diff --git a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h
deleted file mode 100644
index 2bf8161e3b51..000000000000
--- a/arch/arm/mach-kirkwood/include/mach/irqs.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/irqs.h
- *
- * IRQ definitions for Marvell Kirkwood SoCs
- *
- * 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.
- */
-
-#ifndef __ASM_ARCH_IRQS_H
-#define __ASM_ARCH_IRQS_H
-
-/*
- * Low Interrupt Controller
- */
-#define IRQ_KIRKWOOD_HIGH_SUM   0
-#define IRQ_KIRKWOOD_BRIDGE     1
-#define IRQ_KIRKWOOD_HOST2CPU   2
-#define IRQ_KIRKWOOD_CPU2HOST   3
-#define IRQ_KIRKWOOD_XOR_00     5
-#define IRQ_KIRKWOOD_XOR_01     6
-#define IRQ_KIRKWOOD_XOR_10     7
-#define IRQ_KIRKWOOD_XOR_11     8
-#define IRQ_KIRKWOOD_PCIE       9
-#define IRQ_KIRKWOOD_PCIE1      10
-#define IRQ_KIRKWOOD_GE00_SUM   11
-#define IRQ_KIRKWOOD_GE01_SUM   15
-#define IRQ_KIRKWOOD_USB        19
-#define IRQ_KIRKWOOD_SATA       21
-#define IRQ_KIRKWOOD_CRYPTO     22
-#define IRQ_KIRKWOOD_SPI        23
-#define IRQ_KIRKWOOD_I2S        24
-#define IRQ_KIRKWOOD_TS_0       26
-#define IRQ_KIRKWOOD_SDIO       28
-#define IRQ_KIRKWOOD_TWSI       29
-#define IRQ_KIRKWOOD_AVB        30
-#define IRQ_KIRKWOOD_TDMI       31
-
-/*
- * High Interrupt Controller
- */
-#define IRQ_KIRKWOOD_UART_0     33
-#define IRQ_KIRKWOOD_UART_1     34
-#define IRQ_KIRKWOOD_GPIO_LOW_0_7       35
-#define IRQ_KIRKWOOD_GPIO_LOW_8_15      36
-#define IRQ_KIRKWOOD_GPIO_LOW_16_23     37
-#define IRQ_KIRKWOOD_GPIO_LOW_24_31     38
-#define IRQ_KIRKWOOD_GPIO_HIGH_0_7      39
-#define IRQ_KIRKWOOD_GPIO_HIGH_8_15     40
-#define IRQ_KIRKWOOD_GPIO_HIGH_16_23    41
-#define IRQ_KIRKWOOD_GE00_ERR   46
-#define IRQ_KIRKWOOD_GE01_ERR   47
-#define IRQ_KIRKWOOD_RTC        53
-
-/*
- * KIRKWOOD General Purpose Pins
- */
-#define IRQ_KIRKWOOD_GPIO_START 64
-#define NR_GPIO_IRQS            50
-
-#define NR_IRQS                 (IRQ_KIRKWOOD_GPIO_START + NR_GPIO_IRQS)
-
-
-#endif
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
deleted file mode 100644
index 92976cef3910..000000000000
--- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/kirkwood.h
- *
- * Generic definitions for Marvell Kirkwood SoC flavors:
- *  88F6180, 88F6192 and 88F6281.
- *
- * 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.
- */
-
-#ifndef __ASM_ARCH_KIRKWOOD_H
-#define __ASM_ARCH_KIRKWOOD_H
-
-/*
- * Marvell Kirkwood address maps.
- *
- * phys
- * e0000000     PCIe #0 Memory space
- * e8000000     PCIe #1 Memory space
- * f1000000     on-chip peripheral registers
- * f2000000     PCIe #0 I/O space
- * f3000000     PCIe #1 I/O space
- * f4000000     NAND controller address window
- * f5000000     Security Accelerator SRAM
- *
- * virt         phys            size
- * fed00000     f1000000        1M      on-chip peripheral registers
- * fee00000     f2000000        1M      PCIe #0 I/O space
- * fef00000     f3000000        1M      PCIe #1 I/O space
- */
-
-#define KIRKWOOD_SRAM_PHYS_BASE         0xf5000000
-#define KIRKWOOD_SRAM_SIZE              SZ_2K
-
-#define KIRKWOOD_NAND_MEM_PHYS_BASE     0xf4000000
-#define KIRKWOOD_NAND_MEM_SIZE          SZ_1K
-
-#define KIRKWOOD_PCIE1_IO_PHYS_BASE     0xf3000000
-#define KIRKWOOD_PCIE1_IO_BUS_BASE      0x00010000
-#define KIRKWOOD_PCIE1_IO_SIZE          SZ_64K
-
-#define KIRKWOOD_PCIE_IO_PHYS_BASE      0xf2000000
-#define KIRKWOOD_PCIE_IO_BUS_BASE       0x00000000
-#define KIRKWOOD_PCIE_IO_SIZE           SZ_64K
-
-#define KIRKWOOD_REGS_PHYS_BASE         0xf1000000
-#define KIRKWOOD_REGS_VIRT_BASE         IOMEM(0xfed00000)
-#define KIRKWOOD_REGS_SIZE              SZ_1M
-
-#define KIRKWOOD_PCIE_MEM_PHYS_BASE     0xe0000000
-#define KIRKWOOD_PCIE_MEM_BUS_BASE      0xe0000000
-#define KIRKWOOD_PCIE_MEM_SIZE          SZ_128M
-
-#define KIRKWOOD_PCIE1_MEM_PHYS_BASE    0xe8000000
-#define KIRKWOOD_PCIE1_MEM_BUS_BASE     0xe8000000
-#define KIRKWOOD_PCIE1_MEM_SIZE         SZ_128M
-
-/*
- * Register Map
- */
-#define DDR_VIRT_BASE           (KIRKWOOD_REGS_VIRT_BASE + 0x00000)
-#define DDR_PHYS_BASE           (KIRKWOOD_REGS_PHYS_BASE + 0x00000)
-#define  DDR_WINDOW_CPU_BASE    (DDR_PHYS_BASE + 0x1500)
-#define  DDR_WINDOW_CPU_SZ      (0x20)
-#define DDR_OPERATION_BASE      (DDR_PHYS_BASE + 0x1418)
-
-#define DEV_BUS_PHYS_BASE       (KIRKWOOD_REGS_PHYS_BASE + 0x10000)
-#define DEV_BUS_VIRT_BASE       (KIRKWOOD_REGS_VIRT_BASE + 0x10000)
-#define  SAMPLE_AT_RESET        (DEV_BUS_VIRT_BASE + 0x0030)
-#define  DEVICE_ID              (DEV_BUS_VIRT_BASE + 0x0034)
-#define  GPIO_LOW_VIRT_BASE     (DEV_BUS_VIRT_BASE + 0x0100)
-#define  GPIO_HIGH_VIRT_BASE    (DEV_BUS_VIRT_BASE + 0x0140)
-#define  RTC_PHYS_BASE          (DEV_BUS_PHYS_BASE + 0x0300)
-#define  SPI_PHYS_BASE          (DEV_BUS_PHYS_BASE + 0x0600)
-#define  I2C_PHYS_BASE          (DEV_BUS_PHYS_BASE + 0x1000)
-#define  UART0_PHYS_BASE        (DEV_BUS_PHYS_BASE + 0x2000)
-#define  UART0_VIRT_BASE        (DEV_BUS_VIRT_BASE + 0x2000)
-#define  UART1_PHYS_BASE        (DEV_BUS_PHYS_BASE + 0x2100)
-#define  UART1_VIRT_BASE        (DEV_BUS_VIRT_BASE + 0x2100)
-
-#define BRIDGE_VIRT_BASE        (KIRKWOOD_REGS_VIRT_BASE + 0x20000)
-#define BRIDGE_PHYS_BASE        (KIRKWOOD_REGS_PHYS_BASE + 0x20000)
-#define  BRIDGE_WINS_BASE       (BRIDGE_PHYS_BASE)
-#define  BRIDGE_WINS_SZ         (0x80)
-
-#define CRYPTO_PHYS_BASE        (KIRKWOOD_REGS_PHYS_BASE + 0x30000)
-
-#define PCIE_VIRT_BASE          (KIRKWOOD_REGS_VIRT_BASE + 0x40000)
-#define PCIE_LINK_CTRL          (PCIE_VIRT_BASE + 0x70)
-#define PCIE_STATUS             (PCIE_VIRT_BASE + 0x1a04)
-#define PCIE1_VIRT_BASE         (KIRKWOOD_REGS_VIRT_BASE + 0x44000)
-#define PCIE1_LINK_CTRL         (PCIE1_VIRT_BASE + 0x70)
-#define PCIE1_STATUS            (PCIE1_VIRT_BASE + 0x1a04)
-
-#define USB_PHYS_BASE           (KIRKWOOD_REGS_PHYS_BASE + 0x50000)
-
-#define XOR0_PHYS_BASE          (KIRKWOOD_REGS_PHYS_BASE + 0x60800)
-#define XOR0_VIRT_BASE          (KIRKWOOD_REGS_VIRT_BASE + 0x60800)
-#define XOR1_PHYS_BASE          (KIRKWOOD_REGS_PHYS_BASE + 0x60900)
-#define XOR1_VIRT_BASE          (KIRKWOOD_REGS_VIRT_BASE + 0x60900)
-#define XOR0_HIGH_PHYS_BASE     (KIRKWOOD_REGS_PHYS_BASE + 0x60A00)
-#define XOR0_HIGH_VIRT_BASE     (KIRKWOOD_REGS_VIRT_BASE + 0x60A00)
-#define XOR1_HIGH_PHYS_BASE     (KIRKWOOD_REGS_PHYS_BASE + 0x60B00)
-#define XOR1_HIGH_VIRT_BASE     (KIRKWOOD_REGS_VIRT_BASE + 0x60B00)
-
-#define GE00_PHYS_BASE          (KIRKWOOD_REGS_PHYS_BASE + 0x70000)
-#define GE01_PHYS_BASE          (KIRKWOOD_REGS_PHYS_BASE + 0x74000)
-
-#define SATA_PHYS_BASE          (KIRKWOOD_REGS_PHYS_BASE + 0x80000)
-#define SATA_VIRT_BASE          (KIRKWOOD_REGS_VIRT_BASE + 0x80000)
-#define SATA0_IF_CTRL           (SATA_VIRT_BASE + 0x2050)
-#define SATA0_PHY_MODE_2        (SATA_VIRT_BASE + 0x2330)
-#define SATA1_IF_CTRL           (SATA_VIRT_BASE + 0x4050)
-#define SATA1_PHY_MODE_2        (SATA_VIRT_BASE + 0x4330)
-
-#define SDIO_PHYS_BASE          (KIRKWOOD_REGS_PHYS_BASE + 0x90000)
-
-#define AUDIO_PHYS_BASE         (KIRKWOOD_REGS_PHYS_BASE + 0xA0000)
-#define AUDIO_VIRT_BASE         (KIRKWOOD_REGS_VIRT_BASE + 0xA0000)
-
-/*
- * Supported devices and revisions.
- */
-#define MV88F6281_DEV_ID        0x6281
-#define MV88F6281_REV_Z0        0
-#define MV88F6281_REV_A0        2
-#define MV88F6281_REV_A1        3
-
-#define MV88F6192_DEV_ID        0x6192
-#define MV88F6192_REV_Z0        0
-#define MV88F6192_REV_A0        2
-#define MV88F6192_REV_A1        3
-
-#define MV88F6180_DEV_ID        0x6180
-#define MV88F6180_REV_A0        2
-#define MV88F6180_REV_A1        3
-
-#define MV88F6282_DEV_ID        0x6282
-#define MV88F6282_REV_A0        0
-#define MV88F6282_REV_A1        1
-#endif
diff --git a/arch/arm/mach-kirkwood/include/mach/uncompress.h b/arch/arm/mach-kirkwood/include/mach/uncompress.h
deleted file mode 100644
index 5bca5534021f..000000000000
--- a/arch/arm/mach-kirkwood/include/mach/uncompress.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/uncompress.h
- *
- * 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/serial_reg.h>
-#include <mach/kirkwood.h>
-
-#define SERIAL_BASE     ((unsigned char *)UART0_PHYS_BASE)
-
-static void putc(const char c)
-{
-        unsigned char *base = SERIAL_BASE;
-        int i;
-
-        for (i = 0; i < 0x1000; i++) {
-                if (base[UART_LSR << 2] & UART_LSR_THRE)
-                        break;
-                barrier();
-        }
-
-        base[UART_TX << 2] = c;
-}
-
-static void flush(void)
-{
-        unsigned char *base = SERIAL_BASE;
-        unsigned char mask;
-        int i;
-
-        mask = UART_LSR_TEMT | UART_LSR_THRE;
-
-        for (i = 0; i < 0x1000; i++) {
-                if ((base[UART_LSR << 2] & mask) == mask)
-                        break;
-                barrier();
-        }
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_setup()
diff --git a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
deleted file mode 100644
index 2c47a8ad0e27..000000000000
--- a/arch/arm/mach-kirkwood/irq.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/irq.c
- *
- * Kirkwood IRQ handling.
- *
- * 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 <asm/exception.h>
-#include <linux/gpio.h>
-#include <linux/kernel.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <mach/bridge-regs.h>
-#include <plat/orion-gpio.h>
-#include <plat/irq.h>
-#include "common.h"
-
-static int __initdata gpio0_irqs[4] = {
-        IRQ_KIRKWOOD_GPIO_LOW_0_7,
-        IRQ_KIRKWOOD_GPIO_LOW_8_15,
-        IRQ_KIRKWOOD_GPIO_LOW_16_23,
-        IRQ_KIRKWOOD_GPIO_LOW_24_31,
-};
-
-static int __initdata gpio1_irqs[4] = {
-        IRQ_KIRKWOOD_GPIO_HIGH_0_7,
-        IRQ_KIRKWOOD_GPIO_HIGH_8_15,
-        IRQ_KIRKWOOD_GPIO_HIGH_16_23,
-        0,
-};
-
-#ifdef CONFIG_MULTI_IRQ_HANDLER
-/*
- * Compiling with both non-DT and DT support enabled, will
- * break asm irq handler used by non-DT boards. Therefore,
- * we provide a C-style irq handler even for non-DT boards,
- * if MULTI_IRQ_HANDLER is set.
- */
-
-static void __iomem *kirkwood_irq_base = IRQ_VIRT_BASE;
-
-asmlinkage void
-__exception_irq_entry kirkwood_legacy_handle_irq(struct pt_regs *regs)
-{
-        u32 stat;
-
-        stat = readl_relaxed(kirkwood_irq_base + IRQ_CAUSE_LOW_OFF);
-        stat &= readl_relaxed(kirkwood_irq_base + IRQ_MASK_LOW_OFF);
-        if (stat) {
-                unsigned int hwirq = __fls(stat);
-                handle_IRQ(hwirq, regs);
-                return;
-        }
-        stat = readl_relaxed(kirkwood_irq_base + IRQ_CAUSE_HIGH_OFF);
-        stat &= readl_relaxed(kirkwood_irq_base + IRQ_MASK_HIGH_OFF);
-        if (stat) {
-                unsigned int hwirq = 32 + __fls(stat);
-                handle_IRQ(hwirq, regs);
-                return;
-        }
-}
-#endif
-
-void __init kirkwood_init_irq(void)
-{
-        orion_irq_init(0, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF);
-        orion_irq_init(32, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF);
-
-#ifdef CONFIG_MULTI_IRQ_HANDLER
-        set_handle_irq(kirkwood_legacy_handle_irq);
-#endif
-
-        /*
-         * Initialize gpiolib for GPIOs 0-49.
-         */
-        orion_gpio_init(NULL, 0, 32, GPIO_LOW_VIRT_BASE, 0,
-                        IRQ_KIRKWOOD_GPIO_START, gpio0_irqs);
-        orion_gpio_init(NULL, 32, 18, GPIO_HIGH_VIRT_BASE, 0,
-                        IRQ_KIRKWOOD_GPIO_START + 32, gpio1_irqs);
-}
diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/lacie_v2-common.c
deleted file mode 100644
index 8e3e4331c380..000000000000
--- a/arch/arm/mach-kirkwood/lacie_v2-common.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/lacie_v2-common.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/mtd/physmap.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/spi.h>
-#include <linux/i2c.h>
-#include <linux/platform_data/at24.h>
-#include <linux/gpio.h>
-#include <asm/mach/time.h>
-#include <mach/kirkwood.h>
-#include <mach/irqs.h>
-#include <plat/time.h>
-#include "common.h"
-#include "lacie_v2-common.h"
-
-/*****************************************************************************
- * 512KB SPI Flash on Boot Device (MACRONIX MX25L4005)
- ****************************************************************************/
-
-static struct mtd_partition lacie_v2_flash_parts[] = {
-        {
-                .name = "u-boot",
-                .size = MTDPART_SIZ_FULL,
-                .offset = 0,
-                .mask_flags = MTD_WRITEABLE, /* force read-only */
-        },
-};
-
-static const struct flash_platform_data lacie_v2_flash = {
-        .type           = "mx25l4005a",
-        .name           = "spi_flash",
-        .parts          = lacie_v2_flash_parts,
-        .nr_parts       = ARRAY_SIZE(lacie_v2_flash_parts),
-};
-
-static struct spi_board_info __initdata lacie_v2_spi_slave_info[] = {
-        {
-                .modalias       = "m25p80",
-                .platform_data  = &lacie_v2_flash,
-                .irq            = -1,
-                .max_speed_hz   = 20000000,
-                .bus_num        = 0,
-                .chip_select    = 0,
-        },
-};
-
-void __init lacie_v2_register_flash(void)
-{
-        spi_register_board_info(lacie_v2_spi_slave_info,
-                                ARRAY_SIZE(lacie_v2_spi_slave_info));
-        kirkwood_spi_init();
-}
-
-/*****************************************************************************
- * I2C devices
- ****************************************************************************/
-
-static struct at24_platform_data at24c04 = {
-        .byte_len       = SZ_4K / 8,
-        .page_size      = 16,
-};
-
-/*
- * i2c addr | chip         | description
- * 0x50     | HT24LC04     | eeprom (512B)
- */
-
-static struct i2c_board_info __initdata lacie_v2_i2c_info[] = {
-        {
-                I2C_BOARD_INFO("24c04", 0x50),
-                .platform_data  = &at24c04,
-        }
-};
-
-void __init lacie_v2_register_i2c_devices(void)
-{
-        kirkwood_i2c_init();
-        i2c_register_board_info(0, lacie_v2_i2c_info,
-                                ARRAY_SIZE(lacie_v2_i2c_info));
-}
-
-/*****************************************************************************
- * Hard Disk power
- ****************************************************************************/
-
-static int __initdata lacie_v2_gpio_hdd_power[] = { 16, 17, 41, 42, 43 };
-
-void __init lacie_v2_hdd_power_init(int hdd_num)
-{
-        int i;
-        int err;
-
-        /* Power up all hard disks. */
-        for (i = 0; i < hdd_num; i++) {
-                err = gpio_request(lacie_v2_gpio_hdd_power[i], NULL);
-                if (err == 0) {
-                        err = gpio_direction_output(
-                                        lacie_v2_gpio_hdd_power[i], 1);
-                        /* Free the HDD power GPIOs. This allow user-space to
-                         * configure them via the gpiolib sysfs interface. */
-                        gpio_free(lacie_v2_gpio_hdd_power[i]);
-                }
-                if (err)
-                        pr_err("Failed to power up HDD%d\n", i + 1);
-        }
-}
diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.h b/arch/arm/mach-kirkwood/lacie_v2-common.h
deleted file mode 100644
index fc64f578536e..000000000000
--- a/arch/arm/mach-kirkwood/lacie_v2-common.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/lacie_v2-common.h
- *
- * 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.
- */
-
-#ifndef __ARCH_KIRKWOOD_LACIE_V2_COMMON_H
-#define __ARCH_KIRKWOOD_LACIE_V2_COMMON_H
-
-void lacie_v2_register_flash(void);
-void lacie_v2_register_i2c_devices(void);
-void lacie_v2_hdd_power_init(int hdd_num);
-
-#endif
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
deleted file mode 100644
index e96fd71abd76..000000000000
--- a/arch/arm/mach-kirkwood/mpp.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/mpp.c
- *
- * MPP functions for Marvell Kirkwood SoCs
- *
- * 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/gpio.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <mach/hardware.h>
-#include <plat/mpp.h>
-#include "common.h"
-#include "mpp.h"
-
-static unsigned int __init kirkwood_variant(void)
-{
-        u32 dev, rev;
-
-        kirkwood_pcie_id(&dev, &rev);
-
-        if (dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0)
-                return MPP_F6281_MASK;
-        if (dev == MV88F6282_DEV_ID)
-                return MPP_F6282_MASK;
-        if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0)
-                return MPP_F6192_MASK;
-        if (dev == MV88F6180_DEV_ID)
-                return MPP_F6180_MASK;
-
-        pr_err("MPP setup: unknown kirkwood variant (dev %#x rev %#x)\n",
-               dev, rev);
-        return 0;
-}
-
-void __init kirkwood_mpp_conf(unsigned int *mpp_list)
-{
-        orion_mpp_conf(mpp_list, kirkwood_variant(),
-                       MPP_MAX, DEV_BUS_VIRT_BASE);
-}
diff --git a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
deleted file mode 100644
index d5a0d1da2e0e..000000000000
--- a/arch/arm/mach-kirkwood/mpp.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * linux/arch/arm/mach-kirkwood/mpp.h -- Multi Purpose Pins
- *
- * Copyright 2009: Marvell Technology Group Ltd.
- *
- * 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.
- */
-
-#ifndef __KIRKWOOD_MPP_H
-#define __KIRKWOOD_MPP_H
-
-#define MPP(_num, _sel, _in, _out, _F6180, _F6190, _F6192, _F6281, _F6282) ( \
-        /* MPP number */                ((_num) & 0xff) | \
-        /* MPP select value */          (((_sel) & 0xf) << 8) | \
-        /* may be input signal */       ((!!(_in)) << 12) | \
-        /* may be output signal */      ((!!(_out)) << 13) | \
-        /* available on F6180 */        ((!!(_F6180)) << 14) | \
-        /* available on F6190 */        ((!!(_F6190)) << 15) | \
-        /* available on F6192 */        ((!!(_F6192)) << 16) | \
-        /* available on F6281 */        ((!!(_F6281)) << 17) | \
-        /* available on F6282 */        ((!!(_F6282)) << 18))
-
-                                /*   num sel  i  o  6180 6190 6192 6281 6282 */
-
-#define MPP_F6180_MASK          MPP(  0, 0x0, 0, 0, 1,   0,   0,   0,   0 )
-#define MPP_F6190_MASK          MPP(  0, 0x0, 0, 0, 0,   1,   0,   0,   0 )
-#define MPP_F6192_MASK          MPP(  0, 0x0, 0, 0, 0,   0,   1,   0,   0 )
-#define MPP_F6281_MASK          MPP(  0, 0x0, 0, 0, 0,   0,   0,   1,   0 )
-#define MPP_F6282_MASK          MPP(  0, 0x0, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP0_GPIO               MPP(  0, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP0_NF_IO2             MPP(  0, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP0_SPI_SCn            MPP(  0, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP1_GPO                MPP(  1, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP1_NF_IO3             MPP(  1, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP1_SPI_MOSI           MPP(  1, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP2_GPO                MPP(  2, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP2_NF_IO4             MPP(  2, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP2_SPI_SCK            MPP(  2, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP3_GPO                MPP(  3, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP3_NF_IO5             MPP(  3, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP3_SPI_MISO           MPP(  3, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP4_GPIO               MPP(  4, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP4_NF_IO6             MPP(  4, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP4_UART0_RXD          MPP(  4, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP4_SATA1_ACTn         MPP(  4, 0x5, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP4_LCD_VGA_HSYNC      MPP(  4, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP4_PTP_CLK            MPP(  4, 0xd, 0, 0, 1,   1,   1,   1,   0 )
-
-#define MPP5_GPO                MPP(  5, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP5_NF_IO7             MPP(  5, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP5_UART0_TXD          MPP(  5, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP5_PTP_TRIG_GEN       MPP(  5, 0x4, 0, 0, 1,   1,   1,   1,   0 )
-#define MPP5_SATA0_ACTn         MPP(  5, 0x5, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP5_LCD_VGA_VSYNC      MPP(  5, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP6_SYSRST_OUTn        MPP(  6, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP6_SPI_MOSI           MPP(  6, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP6_PTP_TRIG_GEN       MPP(  6, 0x3, 0, 0, 1,   1,   1,   1,   0 )
-
-#define MPP7_GPO                MPP(  7, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP7_PEX_RST_OUTn       MPP(  7, 0x1, 0, 0, 1,   1,   1,   1,   0 )
-#define MPP7_SPI_SCn            MPP(  7, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP7_PTP_TRIG_GEN       MPP(  7, 0x3, 0, 0, 1,   1,   1,   1,   0 )
-#define MPP7_LCD_PWM            MPP(  7, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP8_GPIO               MPP(  8, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP8_TW0_SDA            MPP(  8, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP8_UART0_RTS          MPP(  8, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP8_UART1_RTS          MPP(  8, 0x3, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP8_MII0_RXERR         MPP(  8, 0x4, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP8_SATA1_PRESENTn     MPP(  8, 0x5, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP8_PTP_CLK            MPP(  8, 0xc, 0, 0, 1,   1,   1,   1,   0 )
-#define MPP8_MII0_COL           MPP(  8, 0xd, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP9_GPIO               MPP(  9, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP9_TW0_SCK            MPP(  9, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP9_UART0_CTS          MPP(  9, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP9_UART1_CTS          MPP(  9, 0x3, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP9_SATA0_PRESENTn     MPP(  9, 0x5, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP9_PTP_EVENT_REQ      MPP(  9, 0xc, 0, 0, 1,   1,   1,   1,   0 )
-#define MPP9_MII0_CRS           MPP(  9, 0xd, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP10_GPO               MPP( 10, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP10_SPI_SCK           MPP( 10, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP10_UART0_TXD         MPP( 10, 0X3, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP10_SATA1_ACTn        MPP( 10, 0x5, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP10_PTP_TRIG_GEN      MPP( 10, 0xc, 0, 0, 1,   1,   1,   1,   0 )
-
-#define MPP11_GPIO              MPP( 11, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP11_SPI_MISO          MPP( 11, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP11_UART0_RXD         MPP( 11, 0x3, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP11_PTP_EVENT_REQ     MPP( 11, 0x4, 0, 0, 1,   1,   1,   1,   0 )
-#define MPP11_PTP_TRIG_GEN      MPP( 11, 0xc, 0, 0, 1,   1,   1,   1,   0 )
-#define MPP11_PTP_CLK           MPP( 11, 0xd, 0, 0, 1,   1,   1,   1,   0 )
-#define MPP11_SATA0_ACTn        MPP( 11, 0x5, 0, 0, 0,   1,   1,   1,   1 )
-
-#define MPP12_GPO               MPP( 12, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP12_GPIO              MPP( 12, 0x0, 1, 1, 0,   0,   0,   1,   0 )
-#define MPP12_SD_CLK            MPP( 12, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP12_AU_SPDIF0         MPP( 12, 0xa, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP12_SPI_MOSI          MPP( 12, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP12_TW1_SDA           MPP( 12, 0xd, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP13_GPIO              MPP( 13, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP13_SD_CMD            MPP( 13, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP13_UART1_TXD         MPP( 13, 0x3, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP13_AU_SPDIFRMCLK     MPP( 13, 0xa, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP13_LCDPWM            MPP( 13, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP14_GPIO              MPP( 14, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP14_SD_D0             MPP( 14, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP14_UART1_RXD         MPP( 14, 0x3, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP14_SATA1_PRESENTn    MPP( 14, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP14_AU_SPDIFI         MPP( 14, 0xa, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP14_AU_I2SDI          MPP( 14, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP14_MII0_COL          MPP( 14, 0xd, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP15_GPIO              MPP( 15, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP15_SD_D1             MPP( 15, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP15_UART0_RTS         MPP( 15, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP15_UART1_TXD         MPP( 15, 0x3, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP15_SATA0_ACTn        MPP( 15, 0x4, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP15_SPI_CSn           MPP( 15, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP16_GPIO              MPP( 16, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP16_SD_D2             MPP( 16, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP16_UART0_CTS         MPP( 16, 0x2, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP16_UART1_RXD         MPP( 16, 0x3, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP16_SATA1_ACTn        MPP( 16, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP16_LCD_EXT_REF_CLK   MPP( 16, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP16_MII0_CRS          MPP( 16, 0xd, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP17_GPIO              MPP( 17, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP17_SD_D3             MPP( 17, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP17_SATA0_PRESENTn    MPP( 17, 0x4, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP17_SATA1_ACTn        MPP( 17, 0xa, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP17_TW1_SCK           MPP( 17, 0xd, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP18_GPO               MPP( 18, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP18_NF_IO0            MPP( 18, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-#define MPP18_PEX0_CLKREQ       MPP( 18, 0x2, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP19_GPO               MPP( 19, 0x0, 0, 1, 1,   1,   1,   1,   1 )
-#define MPP19_NF_IO1            MPP( 19, 0x1, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP20_GPIO              MPP( 20, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP20_TSMP0             MPP( 20, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP20_TDM_CH0_TX_QL     MPP( 20, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP20_GE1_TXD0          MPP( 20, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP20_AU_SPDIFI         MPP( 20, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP20_SATA1_ACTn        MPP( 20, 0x5, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP20_LCD_D0            MPP( 20, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP21_GPIO              MPP( 21, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP21_TSMP1             MPP( 21, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP21_TDM_CH0_RX_QL     MPP( 21, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP21_GE1_TXD1          MPP( 21, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP21_AU_SPDIFO         MPP( 21, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP21_SATA0_ACTn        MPP( 21, 0x5, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP21_LCD_D1            MPP( 21, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP22_GPIO              MPP( 22, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP22_TSMP2             MPP( 22, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP22_TDM_CH2_TX_QL     MPP( 22, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP22_GE1_TXD2          MPP( 22, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP22_AU_SPDIFRMKCLK    MPP( 22, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP22_SATA1_PRESENTn    MPP( 22, 0x5, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP22_LCD_D2            MPP( 22, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP23_GPIO              MPP( 23, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP23_TSMP3             MPP( 23, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP23_TDM_CH2_RX_QL     MPP( 23, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP23_GE1_TXD3          MPP( 23, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP23_AU_I2SBCLK        MPP( 23, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP23_SATA0_PRESENTn    MPP( 23, 0x5, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP23_LCD_D3            MPP( 23, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP24_GPIO              MPP( 24, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP24_TSMP4             MPP( 24, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP24_TDM_SPI_CS0       MPP( 24, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP24_GE1_RXD0          MPP( 24, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP24_AU_I2SDO          MPP( 24, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP24_LCD_D4            MPP( 24, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP25_GPIO              MPP( 25, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP25_TSMP5             MPP( 25, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP25_TDM_SPI_SCK       MPP( 25, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP25_GE1_RXD1          MPP( 25, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP25_AU_I2SLRCLK       MPP( 25, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP25_LCD_D5            MPP( 25, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP26_GPIO              MPP( 26, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP26_TSMP6             MPP( 26, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP26_TDM_SPI_MISO      MPP( 26, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP26_GE1_RXD2          MPP( 26, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP26_AU_I2SMCLK        MPP( 26, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP26_LCD_D6            MPP( 26, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP27_GPIO              MPP( 27, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP27_TSMP7             MPP( 27, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP27_TDM_SPI_MOSI      MPP( 27, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP27_GE1_RXD3          MPP( 27, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP27_AU_I2SDI          MPP( 27, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP27_LCD_D7            MPP( 27, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP28_GPIO              MPP( 28, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP28_TSMP8             MPP( 28, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP28_TDM_CODEC_INTn    MPP( 28, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP28_GE1_COL           MPP( 28, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP28_AU_EXTCLK         MPP( 28, 0x4, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP28_LCD_D8            MPP( 28, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP29_GPIO              MPP( 29, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP29_TSMP9             MPP( 29, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP29_TDM_CODEC_RSTn    MPP( 29, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP29_GE1_TCLK          MPP( 29, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP29_LCD_D9            MPP( 29, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP30_GPIO              MPP( 30, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP30_TSMP10            MPP( 30, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP30_TDM_PCLK          MPP( 30, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP30_GE1_RXCTL         MPP( 30, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP30_LCD_D10           MPP( 30, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP31_GPIO              MPP( 31, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP31_TSMP11            MPP( 31, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP31_TDM_FS            MPP( 31, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP31_GE1_RXCLK         MPP( 31, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP31_LCD_D11           MPP( 31, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP32_GPIO              MPP( 32, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP32_TSMP12            MPP( 32, 0x1, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP32_TDM_DRX           MPP( 32, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP32_GE1_TCLKOUT       MPP( 32, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP32_LCD_D12           MPP( 32, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP33_GPO               MPP( 33, 0x0, 0, 1, 0,   1,   1,   1,   1 )
-#define MPP33_TDM_DTX           MPP( 33, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP33_GE1_TXCTL         MPP( 33, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP33_LCD_D13           MPP( 33, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP34_GPIO              MPP( 34, 0x0, 1, 1, 0,   1,   1,   1,   1 )
-#define MPP34_TDM_SPI_CS1       MPP( 34, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP34_GE1_TXEN          MPP( 34, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP34_SATA1_ACTn        MPP( 34, 0x5, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP34_LCD_D14           MPP( 34, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP35_GPIO              MPP( 35, 0x0, 1, 1, 1,   1,   1,   1,   1 )
-#define MPP35_TDM_CH0_TX_QL     MPP( 35, 0x2, 0, 0, 0,   0,   1,   1,   1 )
-#define MPP35_GE1_RXERR         MPP( 35, 0x3, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP35_SATA0_ACTn        MPP( 35, 0x5, 0, 0, 0,   1,   1,   1,   1 )
-#define MPP35_LCD_D15           MPP( 22, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP35_MII0_RXERR        MPP( 35, 0xc, 0, 0, 1,   1,   1,   1,   1 )
-
-#define MPP36_GPIO              MPP( 36, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP36_TSMP0             MPP( 36, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP36_TDM_SPI_CS1       MPP( 36, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP36_AU_SPDIFI         MPP( 36, 0x4, 0, 0, 1,   0,   0,   1,   1 )
-#define MPP36_TW1_SDA           MPP( 36, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP37_GPIO              MPP( 37, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP37_TSMP1             MPP( 37, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP37_TDM_CH2_TX_QL     MPP( 37, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP37_AU_SPDIFO         MPP( 37, 0x4, 0, 0, 1,   0,   0,   1,   1 )
-#define MPP37_TW1_SCK           MPP( 37, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP38_GPIO              MPP( 38, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP38_TSMP2             MPP( 38, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP38_TDM_CH2_RX_QL     MPP( 38, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP38_AU_SPDIFRMLCLK    MPP( 38, 0x4, 0, 0, 1,   0,   0,   1,   1 )
-#define MPP38_LCD_D18           MPP( 38, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP39_GPIO              MPP( 39, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP39_TSMP3             MPP( 39, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP39_TDM_SPI_CS0       MPP( 39, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP39_AU_I2SBCLK        MPP( 39, 0x4, 0, 0, 1,   0,   0,   1,   1 )
-#define MPP39_LCD_D19           MPP( 39, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP40_GPIO              MPP( 40, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP40_TSMP4             MPP( 40, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP40_TDM_SPI_SCK       MPP( 40, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP40_AU_I2SDO          MPP( 40, 0x4, 0, 0, 1,   0,   0,   1,   1 )
-#define MPP40_LCD_D20           MPP( 40, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP41_GPIO              MPP( 41, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP41_TSMP5             MPP( 41, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP41_TDM_SPI_MISO      MPP( 41, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP41_AU_I2SLRCLK       MPP( 41, 0x4, 0, 0, 1,   0,   0,   1,   1 )
-#define MPP41_LCD_D21           MPP( 41, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP42_GPIO              MPP( 42, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP42_TSMP6             MPP( 42, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP42_TDM_SPI_MOSI      MPP( 42, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP42_AU_I2SMCLK        MPP( 42, 0x4, 0, 0, 1,   0,   0,   1,   1 )
-#define MPP42_LCD_D22           MPP( 42, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP43_GPIO              MPP( 43, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP43_TSMP7             MPP( 43, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP43_TDM_CODEC_INTn    MPP( 43, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP43_AU_I2SDI          MPP( 43, 0x4, 0, 0, 1,   0,   0,   1,   1 )
-#define MPP43_LCD_D23           MPP( 22, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP44_GPIO              MPP( 44, 0x0, 1, 1, 1,   0,   0,   1,   1 )
-#define MPP44_TSMP8             MPP( 44, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP44_TDM_CODEC_RSTn    MPP( 44, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP44_AU_EXTCLK         MPP( 44, 0x4, 0, 0, 1,   0,   0,   1,   1 )
-#define MPP44_LCD_CLK           MPP( 44, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP45_GPIO              MPP( 45, 0x0, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP45_TSMP9             MPP( 45, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP45_TDM_PCLK          MPP( 45, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP245_LCD_E            MPP( 45, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP46_GPIO              MPP( 46, 0x0, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP46_TSMP10            MPP( 46, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP46_TDM_FS            MPP( 46, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP46_LCD_HSYNC         MPP( 46, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP47_GPIO              MPP( 47, 0x0, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP47_TSMP11            MPP( 47, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP47_TDM_DRX           MPP( 47, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP47_LCD_VSYNC         MPP( 47, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP48_GPIO              MPP( 48, 0x0, 1, 1, 0,   0,   0,   1,   1 )
-#define MPP48_TSMP12            MPP( 48, 0x1, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP48_TDM_DTX           MPP( 48, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP48_LCD_D16           MPP( 22, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP49_GPIO              MPP( 49, 0x0, 1, 1, 0,   0,   0,   1,   0 )
-#define MPP49_GPO               MPP( 49, 0x0, 0, 1, 0,   0,   0,   0,   1 )
-#define MPP49_TSMP9             MPP( 49, 0x1, 0, 0, 0,   0,   0,   1,   0 )
-#define MPP49_TDM_CH0_RX_QL     MPP( 49, 0x2, 0, 0, 0,   0,   0,   1,   1 )
-#define MPP49_PTP_CLK           MPP( 49, 0x5, 0, 0, 0,   0,   0,   1,   0 )
-#define MPP49_PEX0_CLKREQ       MPP( 49, 0xa, 0, 0, 0,   0,   0,   0,   1 )
-#define MPP49_LCD_D17           MPP( 49, 0xb, 0, 0, 0,   0,   0,   0,   1 )
-
-#define MPP_MAX                 49
-
-void kirkwood_mpp_conf(unsigned int *mpp_list);
-
-#endif
diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
deleted file mode 100644
index 913d032cdb19..000000000000
--- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/netxbig_v2-setup.c
- *
- * LaCie 2Big and 5Big Network v2 board setup
- *
- * Copyright (C) 2010 Simon Guinot <sguinot@lacie.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 <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/kirkwood.h>
-#include <linux/platform_data/leds-kirkwood-netxbig.h>
-#include "common.h"
-#include "mpp.h"
-#include "lacie_v2-common.h"
-
-/*****************************************************************************
- * Ethernet
- ****************************************************************************/
-
-static struct mv643xx_eth_platform_data netxbig_v2_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-static struct mv643xx_eth_platform_data netxbig_v2_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-/*****************************************************************************
- * SATA
- ****************************************************************************/
-
-static struct mv_sata_platform_data netxbig_v2_sata_data = {
-        .n_ports        = 2,
-};
-
-/*****************************************************************************
- * GPIO keys
- ****************************************************************************/
-
-#define NETXBIG_V2_GPIO_SWITCH_POWER_ON         13
-#define NETXBIG_V2_GPIO_SWITCH_POWER_OFF        15
-#define NETXBIG_V2_GPIO_FUNC_BUTTON             34
-
-#define NETXBIG_V2_SWITCH_POWER_ON              0x1
-#define NETXBIG_V2_SWITCH_POWER_OFF             0x2
-
-static struct gpio_keys_button netxbig_v2_buttons[] = {
-        [0] = {
-                .type           = EV_SW,
-                .code           = NETXBIG_V2_SWITCH_POWER_ON,
-                .gpio           = NETXBIG_V2_GPIO_SWITCH_POWER_ON,
-                .desc           = "Back power switch (on|auto)",
-                .active_low     = 1,
-        },
-        [1] = {
-                .type           = EV_SW,
-                .code           = NETXBIG_V2_SWITCH_POWER_OFF,
-                .gpio           = NETXBIG_V2_GPIO_SWITCH_POWER_OFF,
-                .desc           = "Back power switch (auto|off)",
-                .active_low     = 1,
-        },
-        [2] = {
-                .code           = KEY_OPTION,
-                .gpio           = NETXBIG_V2_GPIO_FUNC_BUTTON,
-                .desc           = "Function button",
-                .active_low     = 1,
-        },
-};
-
-static struct gpio_keys_platform_data netxbig_v2_button_data = {
-        .buttons        = netxbig_v2_buttons,
-        .nbuttons       = ARRAY_SIZE(netxbig_v2_buttons),
-};
-
-static struct platform_device netxbig_v2_gpio_buttons = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &netxbig_v2_button_data,
-        },
-};
-
-/*****************************************************************************
- * GPIO extension LEDs
- ****************************************************************************/
-
-/*
- * The LEDs are controlled by a CPLD and can be configured through a GPIO
- * extension bus:
- *
- * - address register : bit [0-2] -> GPIO [47-49]
- * - data register    : bit [0-2] -> GPIO [44-46]
- * - enable register  : GPIO 29
- */
-
-static int netxbig_v2_gpio_ext_addr[] = { 47, 48, 49 };
-static int netxbig_v2_gpio_ext_data[] = { 44, 45, 46 };
-
-static struct netxbig_gpio_ext netxbig_v2_gpio_ext = {
-        .addr           = netxbig_v2_gpio_ext_addr,
-        .num_addr       = ARRAY_SIZE(netxbig_v2_gpio_ext_addr),
-        .data           = netxbig_v2_gpio_ext_data,
-        .num_data       = ARRAY_SIZE(netxbig_v2_gpio_ext_data),
-        .enable         = 29,
-};
-
-/*
- * Address register selection:
- *
- * addr | register
- * ----------------------------
- *   0  | front LED
- *   1  | front LED brightness
- *   2  | SATA LED brightness
- *   3  | SATA0 LED
- *   4  | SATA1 LED
- *   5  | SATA2 LED
- *   6  | SATA3 LED
- *   7  | SATA4 LED
- *
- * Data register configuration:
- *
- * data | LED brightness
- * -------------------------------------------------
- *   0  | min (off)
- *   -  | -
- *   7  | max
- *
- * data | front LED mode
- * -------------------------------------------------
- *   0  | fix off
- *   1  | fix blue on
- *   2  | fix red on
- *   3  | blink blue on=1 sec and blue off=1 sec
- *   4  | blink red on=1 sec and red off=1 sec
- *   5  | blink blue on=2.5 sec and red on=0.5 sec
- *   6  | blink blue on=1 sec and red on=1 sec
- *   7  | blink blue on=0.5 sec and blue off=2.5 sec
- *
- * data | SATA LED mode
- * -------------------------------------------------
- *   0  | fix off
- *   1  | SATA activity blink
- *   2  | fix red on
- *   3  | blink blue on=1 sec and blue off=1 sec
- *   4  | blink red on=1 sec and red off=1 sec
- *   5  | blink blue on=2.5 sec and red on=0.5 sec
- *   6  | blink blue on=1 sec and red on=1 sec
- *   7  | fix blue on
- */
-
-static int netxbig_v2_red_mled[NETXBIG_LED_MODE_NUM] = {
-        [NETXBIG_LED_OFF]       = 0,
-        [NETXBIG_LED_ON]        = 2,
-        [NETXBIG_LED_SATA]      = NETXBIG_LED_INVALID_MODE,
-        [NETXBIG_LED_TIMER1]    = 4,
-        [NETXBIG_LED_TIMER2]    = NETXBIG_LED_INVALID_MODE,
-};
-
-static int netxbig_v2_blue_pwr_mled[NETXBIG_LED_MODE_NUM] = {
-        [NETXBIG_LED_OFF]       = 0,
-        [NETXBIG_LED_ON]        = 1,
-        [NETXBIG_LED_SATA]      = NETXBIG_LED_INVALID_MODE,
-        [NETXBIG_LED_TIMER1]    = 3,
-        [NETXBIG_LED_TIMER2]    = 7,
-};
-
-static int netxbig_v2_blue_sata_mled[NETXBIG_LED_MODE_NUM] = {
-        [NETXBIG_LED_OFF]       = 0,
-        [NETXBIG_LED_ON]        = 7,
-        [NETXBIG_LED_SATA]      = 1,
-        [NETXBIG_LED_TIMER1]    = 3,
-        [NETXBIG_LED_TIMER2]    = NETXBIG_LED_INVALID_MODE,
-};
-
-static struct netxbig_led_timer netxbig_v2_led_timer[] = {
-        [0] = {
-                .delay_on       = 500,
-                .delay_off      = 500,
-                .mode           = NETXBIG_LED_TIMER1,
-        },
-        [1] = {
-                .delay_on       = 500,
-                .delay_off      = 1000,
-                .mode           = NETXBIG_LED_TIMER2,
-        },
-};
-
-#define NETXBIG_LED(_name, maddr, mval, baddr)                  \
-        { .name         = _name,                                \
-          .mode_addr    = maddr,                                \
-          .mode_val     = mval,                                 \
-          .bright_addr  = baddr }
-
-static struct netxbig_led net2big_v2_leds_ctrl[] = {
-        NETXBIG_LED("net2big-v2:blue:power", 0, netxbig_v2_blue_pwr_mled,  1),
-        NETXBIG_LED("net2big-v2:red:power",  0, netxbig_v2_red_mled,       1),
-        NETXBIG_LED("net2big-v2:blue:sata0", 3, netxbig_v2_blue_sata_mled, 2),
-        NETXBIG_LED("net2big-v2:red:sata0",  3, netxbig_v2_red_mled,       2),
-        NETXBIG_LED("net2big-v2:blue:sata1", 4, netxbig_v2_blue_sata_mled, 2),
-        NETXBIG_LED("net2big-v2:red:sata1",  4, netxbig_v2_red_mled,       2),
-};
-
-static struct netxbig_led_platform_data net2big_v2_leds_data = {
-        .gpio_ext       = &netxbig_v2_gpio_ext,
-        .timer          = netxbig_v2_led_timer,
-        .num_timer      = ARRAY_SIZE(netxbig_v2_led_timer),
-        .leds           = net2big_v2_leds_ctrl,
-        .num_leds       = ARRAY_SIZE(net2big_v2_leds_ctrl),
-};
-
-static struct netxbig_led net5big_v2_leds_ctrl[] = {
-        NETXBIG_LED("net5big-v2:blue:power", 0, netxbig_v2_blue_pwr_mled,  1),
-        NETXBIG_LED("net5big-v2:red:power",  0, netxbig_v2_red_mled,       1),
-        NETXBIG_LED("net5big-v2:blue:sata0", 3, netxbig_v2_blue_sata_mled, 2),
-        NETXBIG_LED("net5big-v2:red:sata0",  3, netxbig_v2_red_mled,       2),
-        NETXBIG_LED("net5big-v2:blue:sata1", 4, netxbig_v2_blue_sata_mled, 2),
-        NETXBIG_LED("net5big-v2:red:sata1",  4, netxbig_v2_red_mled,       2),
-        NETXBIG_LED("net5big-v2:blue:sata2", 5, netxbig_v2_blue_sata_mled, 2),
-        NETXBIG_LED("net5big-v2:red:sata2",  5, netxbig_v2_red_mled,       2),
-        NETXBIG_LED("net5big-v2:blue:sata3", 6, netxbig_v2_blue_sata_mled, 2),
-        NETXBIG_LED("net5big-v2:red:sata3",  6, netxbig_v2_red_mled,       2),
-        NETXBIG_LED("net5big-v2:blue:sata4", 7, netxbig_v2_blue_sata_mled, 2),
-        NETXBIG_LED("net5big-v2:red:sata5",  7, netxbig_v2_red_mled,       2),
-};
-
-static struct netxbig_led_platform_data net5big_v2_leds_data = {
-        .gpio_ext       = &netxbig_v2_gpio_ext,
-        .timer          = netxbig_v2_led_timer,
-        .num_timer      = ARRAY_SIZE(netxbig_v2_led_timer),
-        .leds           = net5big_v2_leds_ctrl,
-        .num_leds       = ARRAY_SIZE(net5big_v2_leds_ctrl),
-};
-
-static struct platform_device netxbig_v2_leds = {
-        .name           = "leds-netxbig",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &net2big_v2_leds_data,
-        },
-};
-
-/*****************************************************************************
- * General Setup
- ****************************************************************************/
-
-static unsigned int net2big_v2_mpp_config[] __initdata = {
-        MPP0_SPI_SCn,
-        MPP1_SPI_MOSI,
-        MPP2_SPI_SCK,
-        MPP3_SPI_MISO,
-        MPP6_SYSRST_OUTn,
-        MPP7_GPO,               /* Request power-off */
-        MPP8_TW0_SDA,
-        MPP9_TW0_SCK,
-        MPP10_UART0_TXD,
-        MPP11_UART0_RXD,
-        MPP13_GPIO,             /* Rear power switch (on|auto) */
-        MPP14_GPIO,             /* USB fuse alarm */
-        MPP15_GPIO,             /* Rear power switch (auto|off) */
-        MPP16_GPIO,             /* SATA HDD1 power */
-        MPP17_GPIO,             /* SATA HDD2 power */
-        MPP20_SATA1_ACTn,
-        MPP21_SATA0_ACTn,
-        MPP24_GPIO,             /* USB mode select */
-        MPP26_GPIO,             /* USB device vbus */
-        MPP28_GPIO,             /* USB enable host vbus */
-        MPP29_GPIO,             /* GPIO extension ALE */
-        MPP34_GPIO,             /* Rear Push button */
-        MPP35_GPIO,             /* Inhibit switch power-off */
-        MPP36_GPIO,             /* SATA HDD1 presence */
-        MPP37_GPIO,             /* SATA HDD2 presence */
-        MPP40_GPIO,             /* eSATA presence */
-        MPP44_GPIO,             /* GPIO extension (data 0) */
-        MPP45_GPIO,             /* GPIO extension (data 1) */
-        MPP46_GPIO,             /* GPIO extension (data 2) */
-        MPP47_GPIO,             /* GPIO extension (addr 0) */
-        MPP48_GPIO,             /* GPIO extension (addr 1) */
-        MPP49_GPIO,             /* GPIO extension (addr 2) */
-        0
-};
-
-static unsigned int net5big_v2_mpp_config[] __initdata = {
-        MPP0_SPI_SCn,
-        MPP1_SPI_MOSI,
-        MPP2_SPI_SCK,
-        MPP3_SPI_MISO,
-        MPP6_SYSRST_OUTn,
-        MPP7_GPO,               /* Request power-off */
-        MPP8_TW0_SDA,
-        MPP9_TW0_SCK,
-        MPP10_UART0_TXD,
-        MPP11_UART0_RXD,
-        MPP13_GPIO,             /* Rear power switch (on|auto) */
-        MPP14_GPIO,             /* USB fuse alarm */
-        MPP15_GPIO,             /* Rear power switch (auto|off) */
-        MPP16_GPIO,             /* SATA HDD1 power */
-        MPP17_GPIO,             /* SATA HDD2 power */
-        MPP20_GE1_TXD0,
-        MPP21_GE1_TXD1,
-        MPP22_GE1_TXD2,
-        MPP23_GE1_TXD3,
-        MPP24_GE1_RXD0,
-        MPP25_GE1_RXD1,
-        MPP26_GE1_RXD2,
-        MPP27_GE1_RXD3,
-        MPP28_GPIO,             /* USB enable host vbus */
-        MPP29_GPIO,             /* GPIO extension ALE */
-        MPP30_GE1_RXCTL,
-        MPP31_GE1_RXCLK,
-        MPP32_GE1_TCLKOUT,
-        MPP33_GE1_TXCTL,
-        MPP34_GPIO,             /* Rear Push button */
-        MPP35_GPIO,             /* Inhibit switch power-off */
-        MPP36_GPIO,             /* SATA HDD1 presence */
-        MPP37_GPIO,             /* SATA HDD2 presence */
-        MPP38_GPIO,             /* SATA HDD3 presence */
-        MPP39_GPIO,             /* SATA HDD4 presence */
-        MPP40_GPIO,             /* SATA HDD5 presence */
-        MPP41_GPIO,             /* SATA HDD3 power */
-        MPP42_GPIO,             /* SATA HDD4 power */
-        MPP43_GPIO,             /* SATA HDD5 power */
-        MPP44_GPIO,             /* GPIO extension (data 0) */
-        MPP45_GPIO,             /* GPIO extension (data 1) */
-        MPP46_GPIO,             /* GPIO extension (data 2) */
-        MPP47_GPIO,             /* GPIO extension (addr 0) */
-        MPP48_GPIO,             /* GPIO extension (addr 1) */
-        MPP49_GPIO,             /* GPIO extension (addr 2) */
-        0
-};
-
-#define NETXBIG_V2_GPIO_POWER_OFF               7
-
-static void netxbig_v2_power_off(void)
-{
-        gpio_set_value(NETXBIG_V2_GPIO_POWER_OFF, 1);
-}
-
-static void __init netxbig_v2_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        if (machine_is_net2big_v2())
-                kirkwood_mpp_conf(net2big_v2_mpp_config);
-        else
-                kirkwood_mpp_conf(net5big_v2_mpp_config);
-
-        if (machine_is_net2big_v2())
-                lacie_v2_hdd_power_init(2);
-        else
-                lacie_v2_hdd_power_init(5);
-
-        kirkwood_ehci_init();
-        kirkwood_ge00_init(&netxbig_v2_ge00_data);
-        if (machine_is_net5big_v2())
-                kirkwood_ge01_init(&netxbig_v2_ge01_data);
-        kirkwood_sata_init(&netxbig_v2_sata_data);
-        kirkwood_uart0_init();
-        lacie_v2_register_flash();
-        lacie_v2_register_i2c_devices();
-
-        if (machine_is_net5big_v2())
-                netxbig_v2_leds.dev.platform_data = &net5big_v2_leds_data;
-        platform_device_register(&netxbig_v2_leds);
-        platform_device_register(&netxbig_v2_gpio_buttons);
-
-        if (gpio_request(NETXBIG_V2_GPIO_POWER_OFF, "power-off") == 0 &&
-            gpio_direction_output(NETXBIG_V2_GPIO_POWER_OFF, 0) == 0)
-                pm_power_off = netxbig_v2_power_off;
-        else
-                pr_err("netxbig_v2: failed to configure power-off GPIO\n");
-}
-
-#ifdef CONFIG_MACH_NET2BIG_V2
-MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2")
-        .atag_offset    = 0x100,
-        .init_machine   = netxbig_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_NET5BIG_V2
-MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2")
-        .atag_offset    = 0x100,
-        .init_machine   = netxbig_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
deleted file mode 100644
index e5cf84103583..000000000000
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/openrd-setup.c
- *
- * Marvell OpenRD (Base|Client|Ultimate) 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/nand.h>
-#include <linux/mtd/partitions.h>
-#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/i2c.h>
-#include <linux/gpio.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 openrd_nand_parts[] = {
-        {
-                .name           = "u-boot",
-                .offset         = 0,
-                .size           = SZ_1M,
-                .mask_flags     = MTD_WRITEABLE
-        }, {
-                .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 openrd_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-static struct mv643xx_eth_platform_data openrd_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(24),
-};
-
-static struct mv_sata_platform_data openrd_sata_data = {
-        .n_ports        = 2,
-};
-
-static struct mvsdio_platform_data openrd_mvsdio_data = {
-        .gpio_card_detect = 29, /* MPP29 used as SD card detect */
-        .gpio_write_protect = -1,
-};
-
-static unsigned int openrd_mpp_config[] __initdata = {
-        MPP12_SD_CLK,
-        MPP13_SD_CMD,
-        MPP14_SD_D0,
-        MPP15_SD_D1,
-        MPP16_SD_D2,
-        MPP17_SD_D3,
-        MPP28_GPIO,
-        MPP29_GPIO,
-        MPP34_GPIO,
-        0
-};
-
-/* Configure MPP for UART1 */
-static unsigned int openrd_uart1_mpp_config[] __initdata = {
-        MPP13_UART1_TXD,
-        MPP14_UART1_RXD,
-        0
-};
-
-static struct i2c_board_info i2c_board_info[] __initdata = {
-        {
-                I2C_BOARD_INFO("cs42l51", 0x4a),
-        },
-};
-
-static struct platform_device openrd_client_audio_device = {
-        .name           = "openrd-client-audio",
-        .id             = -1,
-};
-
-static int __initdata uart1;
-
-static int __init sd_uart_selection(char *str)
-{
-        uart1 = -EINVAL;
-
-        /* Default is SD. Change if required, for UART */
-        if (!str)
-                return 0;
-
-        if (!strncmp(str, "232", 3)) {
-                uart1 = 232;
-        } else if (!strncmp(str, "485", 3)) {
-                /* OpenRD-Base doesn't have RS485. Treat is as an
-                 * unknown argument & just have default setting -
-                 * which is SD */
-                if (machine_is_openrd_base()) {
-                        uart1 = -ENODEV;
-                        return 1;
-                }
-
-                uart1 = 485;
-        }
-        return 1;
-}
-/* Parse boot_command_line string kw_openrd_init_uart1=232/485 */
-__setup("kw_openrd_init_uart1=", sd_uart_selection);
-
-static int __init uart1_mpp_config(void)
-{
-        kirkwood_mpp_conf(openrd_uart1_mpp_config);
-
-        if (gpio_request(34, "SD_UART1_SEL")) {
-                pr_err("GPIO request 34 failed for SD/UART1 selection\n");
-                return -EIO;
-        }
-
-        if (gpio_request(28, "RS232_RS485_SEL")) {
-                pr_err("GPIO request 28 failed for RS232/RS485 selection\n");
-                gpio_free(34);
-                return -EIO;
-        }
-
-        /* Select UART1
-         * Pin # 34: 0 => UART1, 1 => SD */
-        gpio_direction_output(34, 0);
-
-        /* Select RS232 OR RS485
-         * Pin # 28: 0 => RS232, 1 => RS485 */
-        if (uart1 == 232)
-                gpio_direction_output(28, 0);
-        else
-                gpio_direction_output(28, 1);
-
-        gpio_free(34);
-        gpio_free(28);
-
-        return 0;
-}
-
-static void __init openrd_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        kirkwood_mpp_conf(openrd_mpp_config);
-
-        kirkwood_uart0_init();
-        kirkwood_nand_init(openrd_nand_parts, ARRAY_SIZE(openrd_nand_parts),
-                           25);
-
-        kirkwood_ehci_init();
-
-        if (machine_is_openrd_ultimate()) {
-                openrd_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
-                openrd_ge01_data.phy_addr = MV643XX_ETH_PHY_ADDR(1);
-        }
-
-        kirkwood_ge00_init(&openrd_ge00_data);
-        if (!machine_is_openrd_base())
-                kirkwood_ge01_init(&openrd_ge01_data);
-
-        kirkwood_sata_init(&openrd_sata_data);
-
-        kirkwood_i2c_init();
-
-        if (machine_is_openrd_client() || machine_is_openrd_ultimate()) {
-                platform_device_register(&openrd_client_audio_device);
-                i2c_register_board_info(0, i2c_board_info,
-                        ARRAY_SIZE(i2c_board_info));
-                kirkwood_audio_init();
-        }
-
-        if (uart1 <= 0) {
-                if (uart1 < 0)
-                        pr_err("Invalid kernel parameter to select UART1. Defaulting to SD. ERROR CODE: %d\n",
-                               uart1);
-
-                /* Select SD
-                 * Pin # 34: 0 => UART1, 1 => SD */
-                if (gpio_request(34, "SD_UART1_SEL")) {
-                        pr_err("GPIO request 34 failed for SD/UART1 selection\n");
-                } else {
-
-                        gpio_direction_output(34, 1);
-                        gpio_free(34);
-                        kirkwood_sdio_init(&openrd_mvsdio_data);
-                }
-        } else {
-                if (!uart1_mpp_config())
-                        kirkwood_uart1_init();
-        }
-}
-
-static int __init openrd_pci_init(void)
-{
-        if (machine_is_openrd_base() ||
-            machine_is_openrd_client() ||
-            machine_is_openrd_ultimate())
-                kirkwood_pcie_init(KW_PCIE0);
-
-        return 0;
-}
-subsys_initcall(openrd_pci_init);
-
-#ifdef CONFIG_MACH_OPENRD_BASE
-MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")
-        /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = openrd_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_OPENRD_CLIENT
-MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board")
-        /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = openrd_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_OPENRD_ULTIMATE
-MACHINE_START(OPENRD_ULTIMATE, "Marvell OpenRD Ultimate Board")
-        /* Maintainer: Dhaval Vasa <dhaval.vasa@einfochips.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = openrd_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/pcie.c b/arch/arm/mach-kirkwood/pcie.c
deleted file mode 100644
index 12d86f39f380..000000000000
--- a/arch/arm/mach-kirkwood/pcie.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/pcie.c
- *
- * PCIe functions for Marvell Kirkwood SoCs
- *
- * 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/pci.h>
-#include <linux/slab.h>
-#include <linux/clk.h>
-#include <linux/mbus.h>
-#include <video/vga.h>
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-#include <plat/pcie.h>
-#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;
-
-        clk = clk_get_sys("pcie", port);
-        if (IS_ERR(clk)) {
-                pr_err("PCIE clock %s missing\n", port);
-                return;
-        }
-        clk_prepare_enable(clk);
-        clk_put(clk);
-}
-
-/* This function is called very early in the boot when probing the
-   hardware to determine what we actually are, and what rate tclk is
-   ticking at. Hence calling kirkwood_enable_pcie_clk() is not
-   possible since the clk tree has not been created yet. */
-void kirkwood_enable_pcie(void)
-{
-        u32 curr = readl(CLOCK_GATING_CTRL);
-        if (!(curr & CGC_PEX0))
-                writel(curr | CGC_PEX0, CLOCK_GATING_CTRL);
-}
-
-void kirkwood_pcie_id(u32 *dev, u32 *rev)
-{
-        kirkwood_enable_pcie();
-        *dev = orion_pcie_dev_id(PCIE_VIRT_BASE);
-        *rev = orion_pcie_rev(PCIE_VIRT_BASE);
-}
-
-struct pcie_port {
-        u8                      root_bus_nr;
-        void __iomem            *base;
-        spinlock_t              conf_lock;
-        int                     irq;
-        struct resource         res;
-};
-
-static int pcie_port_map[2];
-static int num_pcie_ports;
-
-static int pcie_valid_config(struct pcie_port *pp, int bus, int dev)
-{
-        /*
-         * Don't go out when trying to access --
-         * 1. nonexisting device on local bus
-         * 2. where there's no device connected (no link)
-         */
-        if (bus == pp->root_bus_nr && dev == 0)
-                return 1;
-
-        if (!orion_pcie_link_up(pp->base))
-                return 0;
-
-        if (bus == pp->root_bus_nr && dev != 1)
-                return 0;
-
-        return 1;
-}
-
-
-/*
- * PCIe config cycles are done by programming the PCIE_CONF_ADDR register
- * and then reading the PCIE_CONF_DATA register. Need to make sure these
- * transactions are atomic.
- */
-
-static int pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where,
-                        int size, u32 *val)
-{
-        struct pci_sys_data *sys = bus->sysdata;
-        struct pcie_port *pp = sys->private_data;
-        unsigned long flags;
-        int ret;
-
-        if (pcie_valid_config(pp, bus->number, PCI_SLOT(devfn)) == 0) {
-                *val = 0xffffffff;
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        }
-
-        spin_lock_irqsave(&pp->conf_lock, flags);
-        ret = orion_pcie_rd_conf(pp->base, bus, devfn, where, size, val);
-        spin_unlock_irqrestore(&pp->conf_lock, flags);
-
-        return ret;
-}
-
-static int pcie_wr_conf(struct pci_bus *bus, u32 devfn,
-                        int where, int size, u32 val)
-{
-        struct pci_sys_data *sys = bus->sysdata;
-        struct pcie_port *pp = sys->private_data;
-        unsigned long flags;
-        int ret;
-
-        if (pcie_valid_config(pp, bus->number, PCI_SLOT(devfn)) == 0)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-
-        spin_lock_irqsave(&pp->conf_lock, flags);
-        ret = orion_pcie_wr_conf(pp->base, bus, devfn, where, size, val);
-        spin_unlock_irqrestore(&pp->conf_lock, flags);
-
-        return ret;
-}
-
-static struct pci_ops pcie_ops = {
-        .read = pcie_rd_conf,
-        .write = pcie_wr_conf,
-};
-
-static void __init pcie0_ioresources_init(struct pcie_port *pp)
-{
-        pp->base = PCIE_VIRT_BASE;
-        pp->irq = IRQ_KIRKWOOD_PCIE;
-
-        /*
-         * IORESOURCE_MEM
-         */
-        pp->res.name = "PCIe 0 MEM";
-        pp->res.start = KIRKWOOD_PCIE_MEM_PHYS_BASE;
-        pp->res.end = pp->res.start + KIRKWOOD_PCIE_MEM_SIZE - 1;
-        pp->res.flags = IORESOURCE_MEM;
-}
-
-static void __init pcie1_ioresources_init(struct pcie_port *pp)
-{
-        pp->base = PCIE1_VIRT_BASE;
-        pp->irq = IRQ_KIRKWOOD_PCIE1;
-
-        /*
-         * IORESOURCE_MEM
-         */
-        pp->res.name = "PCIe 1 MEM";
-        pp->res.start = KIRKWOOD_PCIE1_MEM_PHYS_BASE;
-        pp->res.end = pp->res.start + KIRKWOOD_PCIE1_MEM_SIZE - 1;
-        pp->res.flags = IORESOURCE_MEM;
-}
-
-static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
-{
-        struct pcie_port *pp;
-        int index;
-
-        if (nr >= num_pcie_ports)
-                return 0;
-
-        index = pcie_port_map[nr];
-        pr_info("PCI: bus%d uses PCIe port %d\n", sys->busnr, index);
-
-        pp = kzalloc(sizeof(*pp), GFP_KERNEL);
-        if (!pp)
-                panic("PCIe: failed to allocate pcie_port data");
-        sys->private_data = pp;
-        pp->root_bus_nr = sys->busnr;
-        spin_lock_init(&pp->conf_lock);
-
-        switch (index) {
-        case 0:
-                kirkwood_enable_pcie_clk("0");
-                pcie0_ioresources_init(pp);
-                pci_ioremap_io(SZ_64K * sys->busnr, KIRKWOOD_PCIE_IO_PHYS_BASE);
-                break;
-        case 1:
-                kirkwood_enable_pcie_clk("1");
-                pcie1_ioresources_init(pp);
-                pci_ioremap_io(SZ_64K * sys->busnr,
-                               KIRKWOOD_PCIE1_IO_PHYS_BASE);
-                break;
-        default:
-                panic("PCIe setup: invalid controller %d", index);
-        }
-
-        if (request_resource(&iomem_resource, &pp->res))
-                panic("Request PCIe%d Memory resource failed\n", index);
-
-        pci_add_resource_offset(&sys->resources, &pp->res, sys->mem_offset);
-
-        /*
-         * Generic PCIe unit setup.
-         */
-        orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
-
-        orion_pcie_setup(pp->base);
-
-        return 1;
-}
-
-/*
- * The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it
- * is operating as a root complex this needs to be switched to
- * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on
- * the device. Decoding setup is handled by the orion code.
- */
-static void rc_pci_fixup(struct pci_dev *dev)
-{
-        if (dev->bus->parent == NULL && dev->devfn == 0) {
-                int i;
-
-                dev->class &= 0xff;
-                dev->class |= PCI_CLASS_BRIDGE_HOST << 8;
-                for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
-                        dev->resource[i].start = 0;
-                        dev->resource[i].end   = 0;
-                        dev->resource[i].flags = 0;
-                }
-        }
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup);
-
-static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot,
-        u8 pin)
-{
-        struct pci_sys_data *sys = dev->sysdata;
-        struct pcie_port *pp = sys->private_data;
-
-        return pp->irq;
-}
-
-static struct hw_pci kirkwood_pci __initdata = {
-        .setup          = kirkwood_pcie_setup,
-        .map_irq        = kirkwood_pcie_map_irq,
-        .ops            = &pcie_ops,
-};
-
-static void __init add_pcie_port(int index, void __iomem *base)
-{
-        pcie_port_map[num_pcie_ports++] = index;
-        pr_info("Kirkwood PCIe port %d: link %s\n", index,
-                orion_pcie_link_up(base) ? "up" : "down");
-}
-
-void __init kirkwood_pcie_init(unsigned int portmask)
-{
-        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_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_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;
-
-        if (portmask & KW_PCIE0)
-                add_pcie_port(0, PCIE_VIRT_BASE);
-
-        if (portmask & KW_PCIE1)
-                add_pcie_port(1, PCIE1_VIRT_BASE);
-
-        kirkwood_pci.nr_controllers = num_pcie_ports;
-        pci_common_init(&kirkwood_pci);
-}
diff --git a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c
deleted file mode 100644
index 8e5e0329d04c..000000000000
--- a/arch/arm/mach-kirkwood/pm.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Power Management driver for Marvell Kirkwood SoCs
- *
- * Copyright (C) 2013 Ezequiel Garcia <ezequiel@free-electrons.com>
- * Copyright (C) 2010 Simon Guinot <sguinot@lacie.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 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/suspend.h>
-#include <linux/io.h>
-#include <mach/bridge-regs.h>
-#include "common.h"
-
-static void __iomem *ddr_operation_base;
-static void __iomem *memory_pm_ctrl;
-
-static void kirkwood_low_power(void)
-{
-        u32 mem_pm_ctrl;
-
-        mem_pm_ctrl = readl(memory_pm_ctrl);
-
-        /* Set peripherals to low-power mode */
-        writel_relaxed(~0, memory_pm_ctrl);
-
-        /* Set DDR in self-refresh */
-        writel_relaxed(0x7, ddr_operation_base);
-
-        /*
-         * Set CPU in wait-for-interrupt state.
-         * This disables the CPU core clocks,
-         * the array clocks, and also the L2 controller.
-         */
-        cpu_do_idle();
-
-        writel_relaxed(mem_pm_ctrl, memory_pm_ctrl);
-}
-
-static int kirkwood_suspend_enter(suspend_state_t state)
-{
-        switch (state) {
-        case PM_SUSPEND_STANDBY:
-                kirkwood_low_power();
-                break;
-        default:
-                return -EINVAL;
-        }
-        return 0;
-}
-
-static int kirkwood_pm_valid_standby(suspend_state_t state)
-{
-        return state == PM_SUSPEND_STANDBY;
-}
-
-static const struct platform_suspend_ops kirkwood_suspend_ops = {
-        .enter = kirkwood_suspend_enter,
-        .valid = kirkwood_pm_valid_standby,
-};
-
-void __init kirkwood_pm_init(void)
-{
-        ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4);
-        memory_pm_ctrl = ioremap(MEMORY_PM_CTRL_PHYS, 4);
-
-        suspend_set_ops(&kirkwood_suspend_ops);
-}
diff --git a/arch/arm/mach-kirkwood/pm.h b/arch/arm/mach-kirkwood/pm.h
deleted file mode 100644
index 21e7530f368b..000000000000
--- a/arch/arm/mach-kirkwood/pm.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Power Management driver for Marvell Kirkwood SoCs
- *
- * Copyright (C) 2013 Ezequiel Garcia <ezequiel@free-electrons.com>
- * Copyright (C) 2010 Simon Guinot <sguinot@lacie.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 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.
- */
-
-#ifndef __ARCH_KIRKWOOD_PM_H
-#define __ARCH_KIRKWOOD_PM_H
-
-#ifdef CONFIG_PM
-void kirkwood_pm_init(void);
-#else
-static inline void kirkwood_pm_init(void) {};
-#endif
-
-#endif
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
deleted file mode 100644
index e4fd3129d36f..000000000000
--- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
- *
- * Marvell RD-88F6192-NAS 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/mv643xx_eth.h>
-#include <linux/gpio.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/spi.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/kirkwood.h>
-#include <plat/orion-gpio.h>
-#include "common.h"
-
-#define RD88F6192_GPIO_USB_VBUS         10
-
-static struct mv643xx_eth_platform_data rd88f6192_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-static struct mv_sata_platform_data rd88f6192_sata_data = {
-        .n_ports        = 2,
-};
-
-static const struct flash_platform_data rd88F6192_spi_slave_data = {
-        .type           = "m25p128",
-};
-
-static struct spi_board_info __initdata rd88F6192_spi_slave_info[] = {
-        {
-                .modalias       = "m25p80",
-                .platform_data  = &rd88F6192_spi_slave_data,
-                .irq            = -1,
-                .max_speed_hz   = 20000000,
-                .bus_num        = 0,
-                .chip_select    = 0,
-        },
-};
-
-static void __init rd88f6192_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-
-        orion_gpio_set_valid(RD88F6192_GPIO_USB_VBUS, 1);
-        if (gpio_request(RD88F6192_GPIO_USB_VBUS, "USB VBUS") != 0 ||
-            gpio_direction_output(RD88F6192_GPIO_USB_VBUS, 1) != 0)
-                pr_err("RD-88F6192-NAS: failed to setup USB VBUS GPIO\n");
-
-        kirkwood_ehci_init();
-        kirkwood_ge00_init(&rd88f6192_ge00_data);
-        kirkwood_sata_init(&rd88f6192_sata_data);
-        spi_register_board_info(rd88F6192_spi_slave_info,
-                                ARRAY_SIZE(rd88F6192_spi_slave_info));
-        kirkwood_spi_init();
-        kirkwood_uart0_init();
-}
-
-static int __init rd88f6192_pci_init(void)
-{
-        if (machine_is_rd88f6192_nas())
-                kirkwood_pcie_init(KW_PCIE0);
-
-        return 0;
-}
-subsys_initcall(rd88f6192_pci_init);
-
-MACHINE_START(RD88F6192_NAS, "Marvell RD-88F6192-NAS Development Board")
-        /* Maintainer: Saeed Bishara <saeed@marvell.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = rd88f6192_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/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
deleted file mode 100644
index 5154bd2a3ad3..000000000000
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/rd88f6281-setup.c
- *
- * Marvell RD-88F6281 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/irq.h>
-#include <linux/mtd/partitions.h>
-#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/ethtool.h>
-#include <net/dsa.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 rd88f6281_nand_parts[] = {
-        {
-                .name = "u-boot",
-                .offset = 0,
-                .size = SZ_1M
-        }, {
-                .name = "uImage",
-                .offset = MTDPART_OFS_NXTBLK,
-                .size = SZ_2M
-        }, {
-                .name = "root",
-                .offset = MTDPART_OFS_NXTBLK,
-                .size = MTDPART_SIZ_FULL
-        },
-};
-
-static struct mv643xx_eth_platform_data rd88f6281_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_NONE,
-        .speed          = SPEED_1000,
-        .duplex         = DUPLEX_FULL,
-};
-
-static struct dsa_chip_data rd88f6281_switch_chip_data = {
-        .port_names[0]  = "lan1",
-        .port_names[1]  = "lan2",
-        .port_names[2]  = "lan3",
-        .port_names[3]  = "lan4",
-        .port_names[5]  = "cpu",
-};
-
-static struct dsa_platform_data rd88f6281_switch_plat_data = {
-        .nr_chips       = 1,
-        .chip           = &rd88f6281_switch_chip_data,
-};
-
-static struct mv643xx_eth_platform_data rd88f6281_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(11),
-};
-
-static struct mv_sata_platform_data rd88f6281_sata_data = {
-        .n_ports        = 2,
-};
-
-static struct mvsdio_platform_data rd88f6281_mvsdio_data = {
-        .gpio_card_detect = 28,
-        .gpio_write_protect = -1,
-};
-
-static unsigned int rd88f6281_mpp_config[] __initdata = {
-        MPP28_GPIO,
-        0
-};
-
-static void __init rd88f6281_init(void)
-{
-        u32 dev, rev;
-
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        kirkwood_mpp_conf(rd88f6281_mpp_config);
-
-        kirkwood_nand_init(rd88f6281_nand_parts,
-                           ARRAY_SIZE(rd88f6281_nand_parts),
-                           25);
-        kirkwood_ehci_init();
-
-        kirkwood_ge00_init(&rd88f6281_ge00_data);
-        kirkwood_pcie_id(&dev, &rev);
-        if (rev == MV88F6281_REV_A0) {
-                rd88f6281_switch_chip_data.sw_addr = 10;
-                kirkwood_ge01_init(&rd88f6281_ge01_data);
-        } else {
-                rd88f6281_switch_chip_data.port_names[4] = "wan";
-        }
-        kirkwood_ge00_switch_init(&rd88f6281_switch_plat_data, NO_IRQ);
-
-        kirkwood_sata_init(&rd88f6281_sata_data);
-        kirkwood_sdio_init(&rd88f6281_mvsdio_data);
-        kirkwood_uart0_init();
-}
-
-static int __init rd88f6281_pci_init(void)
-{
-        if (machine_is_rd88f6281())
-                kirkwood_pcie_init(KW_PCIE0);
-
-        return 0;
-}
-subsys_initcall(rd88f6281_pci_init);
-
-MACHINE_START(RD88F6281, "Marvell RD-88F6281 Reference Board")
-        /* Maintainer: Saeed Bishara <saeed@marvell.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = rd88f6281_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/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c
deleted file mode 100644
index 8736f8c97518..000000000000
--- a/arch/arm/mach-kirkwood/t5325-setup.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- *
- * HP t5325 Thin Client setup
- *
- * Copyright (C) 2010  Martin Michlmayr <tbm@cyrius.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/mtd/physmap.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/spi.h>
-#include <linux/i2c.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/ata_platform.h>
-#include <linux/gpio.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <sound/alc5623.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 hp_t5325_partitions[] = {
-        {
-                .name           = "u-boot env",
-                .size           = SZ_64K,
-                .offset         = SZ_512K + SZ_256K,
-        },
-        {
-                .name           = "permanent u-boot env",
-                .size           = SZ_64K,
-                .offset         = MTDPART_OFS_APPEND,
-                .mask_flags     = MTD_WRITEABLE,
-        },
-        {
-                .name           = "HP env",
-                .size           = SZ_64K,
-                .offset         = MTDPART_OFS_APPEND,
-        },
-        {
-                .name           = "u-boot",
-                .size           = SZ_512K,
-                .offset         = 0,
-                .mask_flags     = MTD_WRITEABLE,
-        },
-        {
-                .name           = "SSD firmware",
-                .size           = SZ_256K,
-                .offset         = SZ_512K,
-        },
-};
-
-static const struct flash_platform_data hp_t5325_flash = {
-        .type           = "mx25l8005",
-        .name           = "spi_flash",
-        .parts          = hp_t5325_partitions,
-        .nr_parts       = ARRAY_SIZE(hp_t5325_partitions),
-};
-
-static struct spi_board_info __initdata hp_t5325_spi_slave_info[] = {
-        {
-                .modalias       = "m25p80",
-                .platform_data  = &hp_t5325_flash,
-                .irq            = -1,
-        },
-};
-
-static struct mv643xx_eth_platform_data hp_t5325_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-static struct mv_sata_platform_data hp_t5325_sata_data = {
-        .n_ports        = 2,
-};
-
-static struct gpio_keys_button hp_t5325_buttons[] = {
-        {
-                .code           = KEY_POWER,
-                .gpio           = 45,
-                .desc           = "Power",
-                .active_low     = 1,
-        },
-};
-
-static struct gpio_keys_platform_data hp_t5325_button_data = {
-        .buttons        = hp_t5325_buttons,
-        .nbuttons       = ARRAY_SIZE(hp_t5325_buttons),
-};
-
-static struct platform_device hp_t5325_button_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &hp_t5325_button_data,
-        }
-};
-
-static struct platform_device hp_t5325_audio_device = {
-        .name           = "t5325-audio",
-        .id             = -1,
-};
-
-static unsigned int hp_t5325_mpp_config[] __initdata = {
-        MPP0_NF_IO2,
-        MPP1_SPI_MOSI,
-        MPP2_SPI_SCK,
-        MPP3_SPI_MISO,
-        MPP4_NF_IO6,
-        MPP5_NF_IO7,
-        MPP6_SYSRST_OUTn,
-        MPP7_SPI_SCn,
-        MPP8_TW0_SDA,
-        MPP9_TW0_SCK,
-        MPP10_UART0_TXD,
-        MPP11_UART0_RXD,
-        MPP12_SD_CLK,
-        MPP13_GPIO,
-        MPP14_GPIO,
-        MPP15_GPIO,
-        MPP16_GPIO,
-        MPP17_GPIO,
-        MPP18_NF_IO0,
-        MPP19_NF_IO1,
-        MPP20_GPIO,
-        MPP21_GPIO,
-        MPP22_GPIO,
-        MPP23_GPIO,
-        MPP32_GPIO,
-        MPP33_GE1_TXCTL,
-        MPP39_AU_I2SBCLK,
-        MPP40_AU_I2SDO,
-        MPP43_AU_I2SDI,
-        MPP41_AU_I2SLRCLK,
-        MPP42_AU_I2SMCLK,
-        MPP45_GPIO,             /* Power button */
-        MPP48_GPIO,             /* Board power off */
-        0
-};
-
-static struct alc5623_platform_data alc5621_data = {
-        .add_ctrl = 0x3700,
-        .jack_det_ctrl = 0x4810,
-};
-
-static struct i2c_board_info i2c_board_info[] __initdata = {
-        {
-                I2C_BOARD_INFO("alc5621", 0x1a),
-                .platform_data = &alc5621_data,
-        },
-};
-
-#define HP_T5325_GPIO_POWER_OFF         48
-
-static void hp_t5325_power_off(void)
-{
-        gpio_set_value(HP_T5325_GPIO_POWER_OFF, 1);
-}
-
-static void __init hp_t5325_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        kirkwood_mpp_conf(hp_t5325_mpp_config);
-
-        kirkwood_uart0_init();
-        spi_register_board_info(hp_t5325_spi_slave_info,
-                                ARRAY_SIZE(hp_t5325_spi_slave_info));
-        kirkwood_spi_init();
-        kirkwood_i2c_init();
-        kirkwood_ge00_init(&hp_t5325_ge00_data);
-        kirkwood_sata_init(&hp_t5325_sata_data);
-        kirkwood_ehci_init();
-        platform_device_register(&hp_t5325_button_device);
-        platform_device_register(&hp_t5325_audio_device);
-
-        i2c_register_board_info(0, i2c_board_info, ARRAY_SIZE(i2c_board_info));
-        kirkwood_audio_init();
-
-        if (gpio_request(HP_T5325_GPIO_POWER_OFF, "power-off") == 0 &&
-            gpio_direction_output(HP_T5325_GPIO_POWER_OFF, 0) == 0)
-                pm_power_off = hp_t5325_power_off;
-        else
-                pr_err("t5325: failed to configure power-off GPIO\n");
-}
-
-static int __init hp_t5325_pci_init(void)
-{
-        if (machine_is_t5325())
-                kirkwood_pcie_init(KW_PCIE0);
-
-        return 0;
-}
-subsys_initcall(hp_t5325_pci_init);
-
-MACHINE_START(T5325, "HP t5325 Thin Client")
-        /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = hp_t5325_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/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
deleted file mode 100644
index e1267d6b468f..000000000000
--- a/arch/arm/mach-kirkwood/ts219-setup.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *
- * QNAP TS-11x/TS-21x Turbo NAS Board Setup
- *
- * 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/i2c.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/ata_platform.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/kirkwood.h>
-#include "common.h"
-#include "mpp.h"
-#include "tsx1x-common.h"
-
-static struct i2c_board_info __initdata qnap_ts219_i2c_rtc = {
-        I2C_BOARD_INFO("s35390a", 0x30),
-};
-
-static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-static struct mv_sata_platform_data qnap_ts219_sata_data = {
-        .n_ports        = 2,
-};
-
-static struct gpio_keys_button qnap_ts219_buttons[] = {
-        {
-                .code           = KEY_COPY,
-                .gpio           = 15,
-                .desc           = "USB Copy",
-                .active_low     = 1,
-        },
-        {
-                .code           = KEY_RESTART,
-                .gpio           = 16,
-                .desc           = "Reset",
-                .active_low     = 1,
-        },
-};
-
-static struct gpio_keys_platform_data qnap_ts219_button_data = {
-        .buttons        = qnap_ts219_buttons,
-        .nbuttons       = ARRAY_SIZE(qnap_ts219_buttons),
-};
-
-static struct platform_device qnap_ts219_button_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &qnap_ts219_button_data,
-        }
-};
-
-static unsigned int qnap_ts219_mpp_config[] __initdata = {
-        MPP0_SPI_SCn,
-        MPP1_SPI_MOSI,
-        MPP2_SPI_SCK,
-        MPP3_SPI_MISO,
-        MPP4_SATA1_ACTn,
-        MPP5_SATA0_ACTn,
-        MPP8_TW0_SDA,
-        MPP9_TW0_SCK,
-        MPP10_UART0_TXD,
-        MPP11_UART0_RXD,
-        MPP13_UART1_TXD,        /* PIC controller */
-        MPP14_UART1_RXD,        /* PIC controller */
-        MPP15_GPIO,             /* USB Copy button (on devices with 88F6281) */
-        MPP16_GPIO,             /* Reset button (on devices with 88F6281) */
-        MPP36_GPIO,             /* RAM: 0: 256 MB, 1: 512 MB */
-        MPP37_GPIO,             /* Reset button (on devices with 88F6282) */
-        MPP43_GPIO,             /* USB Copy button (on devices with 88F6282) */
-        MPP44_GPIO,             /* Board ID: 0: TS-11x, 1: TS-21x */
-        0
-};
-
-static void __init qnap_ts219_init(void)
-{
-        u32 dev, rev;
-
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        kirkwood_mpp_conf(qnap_ts219_mpp_config);
-
-        kirkwood_uart0_init();
-        kirkwood_uart1_init(); /* A PIC controller is connected here. */
-        qnap_tsx1x_register_flash();
-        kirkwood_i2c_init();
-        i2c_register_board_info(0, &qnap_ts219_i2c_rtc, 1);
-
-        kirkwood_pcie_id(&dev, &rev);
-        if (dev == MV88F6282_DEV_ID) {
-                qnap_ts219_buttons[0].gpio = 43; /* USB Copy button */
-                qnap_ts219_buttons[1].gpio = 37; /* Reset button */
-                qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
-        }
-
-        kirkwood_ge00_init(&qnap_ts219_ge00_data);
-        kirkwood_sata_init(&qnap_ts219_sata_data);
-        kirkwood_ehci_init();
-        platform_device_register(&qnap_ts219_button_device);
-
-        pm_power_off = qnap_tsx1x_power_off;
-
-}
-
-static int __init ts219_pci_init(void)
-{
-        if (machine_is_ts219())
-                kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0);
-
-        return 0;
-}
-subsys_initcall(ts219_pci_init);
-
-MACHINE_START(TS219, "QNAP TS-119/TS-219")
-        /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = qnap_ts219_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/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
deleted file mode 100644
index 81d585806b2f..000000000000
--- a/arch/arm/mach-kirkwood/ts41x-setup.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- *
- * QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS Board Setup
- *
- * Copyright (C) 2009-2010  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/i2c.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/ata_platform.h>
-#include <linux/gpio.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/io.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/kirkwood.h>
-#include "common.h"
-#include "mpp.h"
-#include "tsx1x-common.h"
-
-/* for the PCIe reset workaround */
-#include <plat/pcie.h>
-
-
-#define QNAP_TS41X_JUMPER_JP1   45
-
-static struct i2c_board_info __initdata qnap_ts41x_i2c_rtc = {
-        I2C_BOARD_INFO("s35390a", 0x30),
-};
-
-static struct mv643xx_eth_platform_data qnap_ts41x_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-static struct mv643xx_eth_platform_data qnap_ts41x_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-static struct mv_sata_platform_data qnap_ts41x_sata_data = {
-        .n_ports        = 2,
-};
-
-static struct gpio_keys_button qnap_ts41x_buttons[] = {
-        {
-                .code           = KEY_COPY,
-                .gpio           = 43,
-                .desc           = "USB Copy",
-                .active_low     = 1,
-        },
-        {
-                .code           = KEY_RESTART,
-                .gpio           = 37,
-                .desc           = "Reset",
-                .active_low     = 1,
-        },
-};
-
-static struct gpio_keys_platform_data qnap_ts41x_button_data = {
-        .buttons        = qnap_ts41x_buttons,
-        .nbuttons       = ARRAY_SIZE(qnap_ts41x_buttons),
-};
-
-static struct platform_device qnap_ts41x_button_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &qnap_ts41x_button_data,
-        }
-};
-
-static unsigned int qnap_ts41x_mpp_config[] __initdata = {
-        MPP0_SPI_SCn,
-        MPP1_SPI_MOSI,
-        MPP2_SPI_SCK,
-        MPP3_SPI_MISO,
-        MPP6_SYSRST_OUTn,
-        MPP7_PEX_RST_OUTn,
-        MPP8_TW0_SDA,
-        MPP9_TW0_SCK,
-        MPP10_UART0_TXD,
-        MPP11_UART0_RXD,
-        MPP13_UART1_TXD,        /* PIC controller */
-        MPP14_UART1_RXD,        /* PIC controller */
-        MPP15_SATA0_ACTn,
-        MPP16_SATA1_ACTn,
-        MPP20_GE1_TXD0,
-        MPP21_GE1_TXD1,
-        MPP22_GE1_TXD2,
-        MPP23_GE1_TXD3,
-        MPP24_GE1_RXD0,
-        MPP25_GE1_RXD1,
-        MPP26_GE1_RXD2,
-        MPP27_GE1_RXD3,
-        MPP30_GE1_RXCTL,
-        MPP31_GE1_RXCLK,
-        MPP32_GE1_TCLKOUT,
-        MPP33_GE1_TXCTL,
-        MPP36_GPIO,             /* RAM: 0: 256 MB, 1: 512 MB */
-        MPP37_GPIO,             /* Reset button */
-        MPP43_GPIO,             /* USB Copy button */
-        MPP44_GPIO,             /* Board ID: 0: TS-419U, 1: TS-419 */
-        MPP45_GPIO,             /* JP1: 0: LCD, 1: serial console */
-        MPP46_GPIO,             /* External SATA HDD1 error indicator */
-        MPP47_GPIO,             /* External SATA HDD2 error indicator */
-        MPP48_GPIO,             /* External SATA HDD3 error indicator */
-        MPP49_GPIO,             /* External SATA HDD4 error indicator */
-        0
-};
-
-static void __init qnap_ts41x_init(void)
-{
-        u32 dev, rev;
-
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        kirkwood_mpp_conf(qnap_ts41x_mpp_config);
-
-        kirkwood_uart0_init();
-        kirkwood_uart1_init(); /* A PIC controller is connected here. */
-        qnap_tsx1x_register_flash();
-        kirkwood_i2c_init();
-        i2c_register_board_info(0, &qnap_ts41x_i2c_rtc, 1);
-
-        kirkwood_pcie_id(&dev, &rev);
-        if (dev == MV88F6282_DEV_ID) {
-                qnap_ts41x_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
-                qnap_ts41x_ge01_data.phy_addr = MV643XX_ETH_PHY_ADDR(1);
-        }
-        kirkwood_ge00_init(&qnap_ts41x_ge00_data);
-        kirkwood_ge01_init(&qnap_ts41x_ge01_data);
-
-        kirkwood_sata_init(&qnap_ts41x_sata_data);
-        kirkwood_ehci_init();
-        platform_device_register(&qnap_ts41x_button_device);
-
-        pm_power_off = qnap_tsx1x_power_off;
-
-        if (gpio_request(QNAP_TS41X_JUMPER_JP1, "JP1") == 0)
-                gpio_export(QNAP_TS41X_JUMPER_JP1, 0);
-}
-
-static int __init ts41x_pci_init(void)
-{
-        if (machine_is_ts41x()) {
-                u32 dev, rev;
-
-                /*
-                 * Without this explicit reset, the PCIe SATA controller
-                 * (Marvell 88sx7042/sata_mv) is known to stop working
-                 * after a few minutes.
-                 */
-                orion_pcie_reset(PCIE_VIRT_BASE);
-
-                kirkwood_pcie_id(&dev, &rev);
-                if (dev == MV88F6282_DEV_ID)
-                        kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0);
-                else
-                        kirkwood_pcie_init(KW_PCIE0);
-        }
-        return 0;
-}
-subsys_initcall(ts41x_pci_init);
-
-MACHINE_START(TS41X, "QNAP TS-41x")
-        /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = qnap_ts41x_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/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x-common.c
deleted file mode 100644
index cec87cef76ca..000000000000
--- a/arch/arm/mach-kirkwood/tsx1x-common.c
+++ /dev/null
@@ -1,113 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/physmap.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/spi.h>
-#include <linux/serial_reg.h>
-#include <mach/kirkwood.h>
-#include "common.h"
-#include "tsx1x-common.h"
-
-/*
- * QNAP TS-x1x Boards flash
- */
-
-/****************************************************************************
- * 16 MiB NOR flash. The struct mtd_partition is not in the same order as the
- *     partitions on the device because we want to keep compatibility with
- *     the QNAP firmware.
- * Layout as used by QNAP:
- *  0x00000000-0x00080000 : "U-Boot"
- *  0x00200000-0x00400000 : "Kernel"
- *  0x00400000-0x00d00000 : "RootFS"
- *  0x00d00000-0x01000000 : "RootFS2"
- *  0x00080000-0x000c0000 : "U-Boot Config"
- *  0x000c0000-0x00200000 : "NAS Config"
- *
- * We'll use "RootFS1" instead of "RootFS" to stay compatible with the layout
- * used by the QNAP TS-109/TS-209.
- *
- ***************************************************************************/
-
-static struct mtd_partition qnap_tsx1x_partitions[] = {
-        {
-                .name           = "U-Boot",
-                .size           = 0x00080000,
-                .offset         = 0,
-                .mask_flags     = MTD_WRITEABLE,
-        }, {
-                .name           = "Kernel",
-                .size           = 0x00200000,
-                .offset         = 0x00200000,
-        }, {
-                .name           = "RootFS1",
-                .size           = 0x00900000,
-                .offset         = 0x00400000,
-        }, {
-                .name           = "RootFS2",
-                .size           = 0x00300000,
-                .offset         = 0x00d00000,
-        }, {
-                .name           = "U-Boot Config",
-                .size           = 0x00040000,
-                .offset         = 0x00080000,
-        }, {
-                .name           = "NAS Config",
-                .size           = 0x00140000,
-                .offset         = 0x000c0000,
-        },
-};
-
-static const struct flash_platform_data qnap_tsx1x_flash = {
-        .type           = "m25p128",
-        .name           = "spi_flash",
-        .parts          = qnap_tsx1x_partitions,
-        .nr_parts       = ARRAY_SIZE(qnap_tsx1x_partitions),
-};
-
-static struct spi_board_info __initdata qnap_tsx1x_spi_slave_info[] = {
-        {
-                .modalias       = "m25p80",
-                .platform_data  = &qnap_tsx1x_flash,
-                .irq            = -1,
-                .max_speed_hz   = 20000000,
-                .bus_num        = 0,
-                .chip_select    = 0,
-        },
-};
-
-void __init qnap_tsx1x_register_flash(void)
-{
-        spi_register_board_info(qnap_tsx1x_spi_slave_info,
-                                ARRAY_SIZE(qnap_tsx1x_spi_slave_info));
-        kirkwood_spi_init();
-}
-
-
-/*****************************************************************************
- * QNAP TS-x1x specific power off method via UART1-attached PIC
- ****************************************************************************/
-
-#define UART1_REG(x)    (UART1_VIRT_BASE + ((UART_##x) << 2))
-
-void qnap_tsx1x_power_off(void)
-{
-        /* 19200 baud divisor */
-        const unsigned divisor = ((kirkwood_tclk + (8 * 19200)) / (16 * 19200));
-
-        pr_info("%s: triggering power-off...\n", __func__);
-
-        /* hijack UART1 and reset into sane state (19200,8n1) */
-        writel(0x83, UART1_REG(LCR));
-        writel(divisor & 0xff, UART1_REG(DLL));
-        writel((divisor >> 8) & 0xff, UART1_REG(DLM));
-        writel(0x03, UART1_REG(LCR));
-        writel(0x00, UART1_REG(IER));
-        writel(0x00, UART1_REG(FCR));
-        writel(0x00, UART1_REG(MCR));
-
-        /* send the power-off command 'A' to PIC */
-        writel('A', UART1_REG(TX));
-}
-
diff --git a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x-common.h
deleted file mode 100644
index 7fa037361b55..000000000000
--- a/arch/arm/mach-kirkwood/tsx1x-common.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ARCH_KIRKWOOD_TSX1X_COMMON_H
-#define __ARCH_KIRKWOOD_TSX1X_COMMON_H
-
-extern void __init qnap_tsx1x_register_flash(void);
-extern void qnap_tsx1x_power_off(void);
-
-#endif
diff --git a/arch/arm/mach-ks8695/include/mach/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h
index 95e731a7ed6a..ab0d27fa8969 100644
--- a/arch/arm/mach-ks8695/include/mach/memory.h
+++ b/arch/arm/mach-ks8695/include/mach/memory.h
@@ -15,11 +15,6 @@
 
 #include <mach/hardware.h>
 
-/*
- * Physical SRAM offset.
- */
-#define PLAT_PHYS_OFFSET                KS8695_SDRAM_PA
-
 #ifndef __ASSEMBLY__
 
 #ifdef CONFIG_PCI
diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig
new file mode 100644
index 000000000000..2c043a210db0
--- /dev/null
+++ b/arch/arm/mach-mediatek/Kconfig
@@ -0,0 +1,6 @@
+config ARCH_MEDIATEK
+        bool "Mediatek MT6589 SoC" if ARCH_MULTI_V7
+        select ARM_GIC
+        select MTK_TIMER
+        help
+          Support for Mediatek Cortex-A7 Quad-Core-SoC MT6589.
diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/mach-mediatek/Makefile
new file mode 100644
index 000000000000..43e619f56172
--- /dev/null
+++ b/arch/arm/mach-mediatek/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ARCH_MEDIATEK) += mediatek.o
diff --git a/arch/arm/mach-s5pc100/include/mach/dma.h b/arch/arm/mach-mediatek/mediatek.c
index 201842a3769e..f2acf075350d 100644
--- a/arch/arm/mach-s5pc100/include/mach/dma.h
+++ b/arch/arm/mach-mediatek/mediatek.c
@@ -1,6 +1,8 @@
 /*
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.com>
+ * Device Tree support for Mediatek SoCs
+ *
+ * Copyright (c) 2014 MundoReader S.L.
+ * Author: Matthias Brugger <matthias.bgg@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
@@ -11,16 +13,15 @@
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include <linux/init.h>
+#include <asm/mach/arch.h>
 
-#ifndef __MACH_DMA_H
-#define __MACH_DMA_H
-
-/* This platform uses the common DMA API driver for PL330 */
-#include <plat/dma-pl330.h>
+static const char * const mediatek_board_dt_compat[] = {
+        "mediatek,mt6589",
+        NULL,
+};
 
-#endif /* __MACH_DMA_H */
+DT_MACHINE_START(MEDIATEK_DT, "Mediatek Cortex-A7 (Device Tree)")
+        .dt_compat      = mediatek_board_dt_compat,
+MACHINE_END
diff --git a/arch/arm/mach-mmp/include/mach/mfp-pxa910.h b/arch/arm/mach-mmp/include/mach/mfp-pxa910.h
index fbd7ee8e4897..8c78f2b16452 100644
--- a/arch/arm/mach-mmp/include/mach/mfp-pxa910.h
+++ b/arch/arm/mach-mmp/include/mach/mfp-pxa910.h
@@ -23,7 +23,6 @@
 #define SM_nCS0_nCS0            MFP_CFG(SM_nCS0, AF0)
 #define SM_ADV_SM_ADV           MFP_CFG(SM_ADV, AF0)
 #define SM_SCLK_SM_SCLK         MFP_CFG(SM_SCLK, AF0)
-#define SM_SCLK_SM_SCLK         MFP_CFG(SM_SCLK, AF0)
 #define SM_BE0_SM_BE0           MFP_CFG(SM_BE0, AF1)
 #define SM_BE1_SM_BE1           MFP_CFG(SM_BE1, AF1)
 
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 9b26976fb084..a6b50e62a495 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -106,7 +106,4 @@ config MSM_GPIOMUX
         help
           Support for MSM V1 TLMM GPIOMUX architecture.
 
-config MSM_SCM
-        bool
-
 endif
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index b9bc599a5fd0..c1e4567a5ab3 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -14,11 +14,15 @@ menuconfig ARCH_MVEBU
 
 if ARCH_MVEBU
 
+config MACH_MVEBU_ANY
+        bool
+
 config MACH_MVEBU_V7
         bool
         select ARMADA_370_XP_TIMER
         select CACHE_L2X0
         select ARM_CPU_SUSPEND
+        select MACH_MVEBU_ANY
 
 config MACH_ARMADA_370
         bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
@@ -75,6 +79,7 @@ config MACH_DOVE
         select CACHE_L2X0
         select CPU_PJ4
         select DOVE_CLK
+        select MACH_MVEBU_ANY
         select ORION_IRQCHIP
         select ORION_TIMER
         select PINCTRL_DOVE
@@ -87,6 +92,7 @@ config MACH_KIRKWOOD
         select ARCH_REQUIRE_GPIOLIB
         select CPU_FEROCEON
         select KIRKWOOD_CLK
+        select MACH_MVEBU_ANY
         select ORION_IRQCHIP
         select ORION_TIMER
         select PCI
@@ -96,4 +102,11 @@ config MACH_KIRKWOOD
           Say 'Y' here if you want your kernel to support boards based
           on the Marvell Kirkwood device tree.
 
+config MACH_NETXBIG
+        bool "LaCie 2Big and 5Big Network v2"
+        depends on MACH_KIRKWOOD
+        help
+          Say 'Y' here if you want your kernel to support the
+          LaCie 2Big and 5Big Network v2
+
 endif
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index 1636cdbef01a..e24136b42765 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -4,13 +4,13 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
 AFLAGS_coherency_ll.o           := -Wa,-march=armv7-a
 CFLAGS_pmsu.o                   := -march=armv7-a
 
-obj-y                            += system-controller.o mvebu-soc-id.o
+obj-$(CONFIG_MACH_MVEBU_ANY)     += system-controller.o mvebu-soc-id.o
 
 ifeq ($(CONFIG_MACH_MVEBU_V7),y)
 obj-y                            += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o
 obj-$(CONFIG_SMP)                += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
-obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
 endif
 
 obj-$(CONFIG_MACH_DOVE)          += dove.o
 obj-$(CONFIG_MACH_KIRKWOOD)      += kirkwood.o kirkwood-pm.o
+obj-$(CONFIG_MACH_NETXBIG)       += netxbig.o
diff --git a/arch/arm/mach-mvebu/armada-370-xp.h b/arch/arm/mach-mvebu/armada-370-xp.h
index c3465f5b1250..84cd90d9b860 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.h
+++ b/arch/arm/mach-mvebu/armada-370-xp.h
@@ -24,4 +24,6 @@ void armada_xp_secondary_startup(void);
 extern struct smp_operations armada_xp_smp_ops;
 #endif
 
+int armada_370_xp_pmsu_idle_enter(unsigned long deepidle);
+
 #endif /* __MACH_ARMADA_370_XP_H */
diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c
index b2524d689f21..6478626e3ff6 100644
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@ -34,14 +34,14 @@
 #include "coherency.h"
 #include "mvebu-soc-id.h"
 
+static void __iomem *scu_base;
+
 /*
  * Enables the SCU when available. Obviously, this is only useful on
  * Cortex-A based SOCs, not on PJ4B based ones.
  */
 static void __init mvebu_scu_enable(void)
 {
-        void __iomem *scu_base;
-
         struct device_node *np =
                 of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
         if (np) {
@@ -51,6 +51,11 @@ static void __init mvebu_scu_enable(void)
         }
 }
 
+void __iomem *mvebu_get_scu_base(void)
+{
+        return scu_base;
+}
+
 /*
  * Early versions of Armada 375 SoC have a bug where the BootROM
  * leaves an external data abort pending. The kernel is hit by this
@@ -125,8 +130,16 @@ static void __init thermal_quirk(void)
 {
         struct device_node *np;
         u32 dev, rev;
+        int res;
 
-        if (mvebu_get_soc_id(&dev, &rev) == 0 && rev > ARMADA_375_Z1_REV)
+        /*
+         * The early SoC Z1 revision needs a quirk to be applied in order
+         * for the thermal controller to work properly. This quirk breaks
+         * the thermal support if applied on a SoC that doesn't need it,
+         * so we enforce the SoC revision to be known.
+         */
+        res = mvebu_get_soc_id(&dev, &rev);
+        if (res < 0 || (res == 0 && rev > ARMADA_375_Z1_REV))
                 return;
 
         for_each_compatible_node(np, NULL, "marvell,armada375-thermal") {
@@ -160,7 +173,8 @@ static void __init thermal_quirk(void)
 
                 /*
                  * The thermal controller needs some quirk too, so let's change
-                 * the compatible string to reflect this.
+                 * the compatible string to reflect this and allow the driver
+                 * the take the necessary action.
                  */
                 prop = kzalloc(sizeof(*prop), GFP_KERNEL);
                 prop->name = kstrdup("compatible", GFP_KERNEL);
diff --git a/arch/arm/mach-mvebu/board.h b/arch/arm/mach-mvebu/board.h
index 9c7bb4386f8b..98e32cc2ef3d 100644
--- a/arch/arm/mach-mvebu/board.h
+++ b/arch/arm/mach-mvebu/board.h
@@ -13,4 +13,9 @@
 #ifndef __ARCH_MVEBU_BOARD_H
 #define __ARCH_MVEBU_BOARD_H
 
+#ifdef CONFIG_MACH_NETXBIG
+void netxbig_init(void);
+#else
+static inline void netxbig_init(void) {};
+#endif
 #endif
diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coherency_ll.S
index 510c29e079ca..f5d881b5d0f7 100644
--- a/arch/arm/mach-mvebu/coherency_ll.S
+++ b/arch/arm/mach-mvebu/coherency_ll.S
@@ -46,7 +46,7 @@ ENTRY(ll_get_coherency_base)
         ldr     r1, =coherency_base
         ldr     r1, [r1]
 2:
-        mov     pc, lr
+        ret     lr
 ENDPROC(ll_get_coherency_base)
 
 /*
@@ -63,7 +63,7 @@ ENTRY(ll_get_coherency_cpumask)
         mov     r2, #(1 << 24)
         lsl     r3, r2, r3
 ARM_BE8(rev     r3, r3)
-        mov     pc, lr
+        ret     lr
 ENDPROC(ll_get_coherency_cpumask)
 
 /*
@@ -94,7 +94,7 @@ ENTRY(ll_add_cpu_to_smp_group)
         strex   r1, r2, [r0]
         cmp     r1, #0
         bne     1b
-        mov     pc, lr
+        ret     lr
 ENDPROC(ll_add_cpu_to_smp_group)
 
 ENTRY(ll_enable_coherency)
@@ -118,7 +118,7 @@ ENTRY(ll_enable_coherency)
         bne     1b
         dsb
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(ll_enable_coherency)
 
 ENTRY(ll_disable_coherency)
@@ -141,7 +141,7 @@ ENTRY(ll_disable_coherency)
         cmp     r1, #0
         bne     1b
         dsb
-        mov     pc, lr
+        ret     lr
 ENDPROC(ll_disable_coherency)
 
         .align 2
diff --git a/arch/arm/mach-mvebu/common.h b/arch/arm/mach-mvebu/common.h
index b67fb7a10d8b..3ccb40c3bf94 100644
--- a/arch/arm/mach-mvebu/common.h
+++ b/arch/arm/mach-mvebu/common.h
@@ -21,7 +21,8 @@ void mvebu_restart(enum reboot_mode mode, const char *cmd);
 int mvebu_cpu_reset_deassert(int cpu);
 void mvebu_pmsu_set_cpu_boot_addr(int hw_cpu, void *boot_addr);
 void mvebu_system_controller_set_cpu_boot_addr(void *boot_addr);
+int mvebu_system_controller_get_soc_id(u32 *dev, u32 *rev);
 
-void armada_xp_cpu_die(unsigned int cpu);
+void __iomem *mvebu_get_scu_base(void);
 
 #endif
diff --git a/arch/arm/mach-mvebu/cpu-reset.c b/arch/arm/mach-mvebu/cpu-reset.c
index 4a8f9eebebea..60fb53787004 100644
--- a/arch/arm/mach-mvebu/cpu-reset.c
+++ b/arch/arm/mach-mvebu/cpu-reset.c
@@ -67,7 +67,7 @@ static int mvebu_cpu_reset_map(struct device_node *np, int res_idx)
         return 0;
 }
 
-int __init mvebu_cpu_reset_init(void)
+static int __init mvebu_cpu_reset_init(void)
 {
         struct device_node *np;
         int res_idx;
diff --git a/arch/arm/mach-mvebu/headsmp-a9.S b/arch/arm/mach-mvebu/headsmp-a9.S
index da5bb292b91c..be51c998c0cd 100644
--- a/arch/arm/mach-mvebu/headsmp-a9.S
+++ b/arch/arm/mach-mvebu/headsmp-a9.S
@@ -18,21 +18,6 @@
 #include <asm/assembler.h>
 
         __CPUINIT
-#define CPU_RESUME_ADDR_REG 0xf10182d4
-
-.global armada_375_smp_cpu1_enable_code_start
-.global armada_375_smp_cpu1_enable_code_end
-
-armada_375_smp_cpu1_enable_code_start:
-ARM_BE8(setend  be)
-        adr     r0, 1f
-        ldr     r0, [r0]
-        ldr     r1, [r0]
-ARM_BE8(rev     r1, r1)
-        mov     pc, r1
-1:
-        .word   CPU_RESUME_ADDR_REG
-armada_375_smp_cpu1_enable_code_end:
 
 ENTRY(mvebu_cortex_a9_secondary_startup)
 ARM_BE8(setend  be)
diff --git a/arch/arm/mach-mvebu/hotplug.c b/arch/arm/mach-mvebu/hotplug.c
deleted file mode 100644
index d95e91047168..000000000000
--- a/arch/arm/mach-mvebu/hotplug.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Symmetric Multi Processing (SMP) support for Armada XP
- *
- * Copyright (C) 2012 Marvell
- *
- * Lior Amsalem <alior@marvell.com>
- * Gregory CLEMENT <gregory.clement@free-electrons.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.
- */
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/smp.h>
-#include <asm/proc-fns.h>
-#include "common.h"
-
-/*
- * platform-specific code to shutdown a CPU
- *
- * Called with IRQs disabled
- */
-void __ref armada_xp_cpu_die(unsigned int cpu)
-{
-        cpu_do_idle();
-
-        /* We should never return from idle */
-        panic("mvebu: cpu %d unexpectedly exit from shutdown\n", cpu);
-}
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
index 46f105913c84..6b5310828eb2 100644
--- a/arch/arm/mach-mvebu/kirkwood.c
+++ b/arch/arm/mach-mvebu/kirkwood.c
@@ -180,6 +180,9 @@ static void __init kirkwood_dt_init(void)
         kirkwood_pm_init();
         kirkwood_dt_eth_fixup();
 
+        if (of_machine_is_compatible("lacie,netxbig"))
+                netxbig_init();
+
         of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL);
 }
 
diff --git a/arch/arm/mach-mvebu/mvebu-soc-id.c b/arch/arm/mach-mvebu/mvebu-soc-id.c
index d0f35b4d4a23..a99434bcee84 100644
--- a/arch/arm/mach-mvebu/mvebu-soc-id.c
+++ b/arch/arm/mach-mvebu/mvebu-soc-id.c
@@ -25,6 +25,7 @@
 #include <linux/of_address.h>
 #include <linux/slab.h>
 #include <linux/sys_soc.h>
+#include "common.h"
 #include "mvebu-soc-id.h"
 
 #define PCIE_DEV_ID_OFF         0x0
@@ -51,10 +52,10 @@ int mvebu_get_soc_id(u32 *dev, u32 *rev)
                 *rev = soc_rev;
                 return 0;
         } else
-                return -1;
+                return -ENODEV;
 }
 
-static int __init mvebu_soc_id_init(void)
+static int __init get_soc_id_by_pci(void)
 {
         struct device_node *np;
         int ret = 0;
@@ -129,6 +130,22 @@ clk_err:
 
         return ret;
 }
+
+static int __init mvebu_soc_id_init(void)
+{
+
+        /*
+         * First try to get the ID and the revision by the system
+         * register and use PCI registers only if it is not possible
+         */
+        if (!mvebu_system_controller_get_soc_id(&soc_dev_id, &soc_rev)) {
+                is_id_valid = true;
+                pr_info("MVEBU SoC ID=0x%X, Rev=0x%X\n", soc_dev_id, soc_rev);
+                return 0;
+        }
+
+        return get_soc_id_by_pci();
+}
 early_initcall(mvebu_soc_id_init);
 
 static int __init mvebu_soc_device(void)
diff --git a/arch/arm/mach-mvebu/netxbig.c b/arch/arm/mach-mvebu/netxbig.c
new file mode 100644
index 000000000000..94b11b6585a4
--- /dev/null
+++ b/arch/arm/mach-mvebu/netxbig.c
@@ -0,0 +1,191 @@
+/*
+ * arch/arm/mach-mvbu/board-netxbig.c
+ *
+ * LaCie 2Big and 5Big Network v2 board setup
+ *
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/leds-kirkwood-netxbig.h>
+#include "common.h"
+
+/*****************************************************************************
+ * GPIO extension LEDs
+ ****************************************************************************/
+
+/*
+ * The LEDs are controlled by a CPLD and can be configured through a GPIO
+ * extension bus:
+ *
+ * - address register : bit [0-2] -> GPIO [47-49]
+ * - data register    : bit [0-2] -> GPIO [44-46]
+ * - enable register  : GPIO 29
+ */
+
+static int netxbig_v2_gpio_ext_addr[] = { 47, 48, 49 };
+static int netxbig_v2_gpio_ext_data[] = { 44, 45, 46 };
+
+static struct netxbig_gpio_ext netxbig_v2_gpio_ext = {
+        .addr           = netxbig_v2_gpio_ext_addr,
+        .num_addr       = ARRAY_SIZE(netxbig_v2_gpio_ext_addr),
+        .data           = netxbig_v2_gpio_ext_data,
+        .num_data       = ARRAY_SIZE(netxbig_v2_gpio_ext_data),
+        .enable         = 29,
+};
+
+/*
+ * Address register selection:
+ *
+ * addr | register
+ * ----------------------------
+ *   0  | front LED
+ *   1  | front LED brightness
+ *   2  | SATA LED brightness
+ *   3  | SATA0 LED
+ *   4  | SATA1 LED
+ *   5  | SATA2 LED
+ *   6  | SATA3 LED
+ *   7  | SATA4 LED
+ *
+ * Data register configuration:
+ *
+ * data | LED brightness
+ * -------------------------------------------------
+ *   0  | min (off)
+ *   -  | -
+ *   7  | max
+ *
+ * data | front LED mode
+ * -------------------------------------------------
+ *   0  | fix off
+ *   1  | fix blue on
+ *   2  | fix red on
+ *   3  | blink blue on=1 sec and blue off=1 sec
+ *   4  | blink red on=1 sec and red off=1 sec
+ *   5  | blink blue on=2.5 sec and red on=0.5 sec
+ *   6  | blink blue on=1 sec and red on=1 sec
+ *   7  | blink blue on=0.5 sec and blue off=2.5 sec
+ *
+ * data | SATA LED mode
+ * -------------------------------------------------
+ *   0  | fix off
+ *   1  | SATA activity blink
+ *   2  | fix red on
+ *   3  | blink blue on=1 sec and blue off=1 sec
+ *   4  | blink red on=1 sec and red off=1 sec
+ *   5  | blink blue on=2.5 sec and red on=0.5 sec
+ *   6  | blink blue on=1 sec and red on=1 sec
+ *   7  | fix blue on
+ */
+
+static int netxbig_v2_red_mled[NETXBIG_LED_MODE_NUM] = {
+        [NETXBIG_LED_OFF]       = 0,
+        [NETXBIG_LED_ON]        = 2,
+        [NETXBIG_LED_SATA]      = NETXBIG_LED_INVALID_MODE,
+        [NETXBIG_LED_TIMER1]    = 4,
+        [NETXBIG_LED_TIMER2]    = NETXBIG_LED_INVALID_MODE,
+};
+
+static int netxbig_v2_blue_pwr_mled[NETXBIG_LED_MODE_NUM] = {
+        [NETXBIG_LED_OFF]       = 0,
+        [NETXBIG_LED_ON]        = 1,
+        [NETXBIG_LED_SATA]      = NETXBIG_LED_INVALID_MODE,
+        [NETXBIG_LED_TIMER1]    = 3,
+        [NETXBIG_LED_TIMER2]    = 7,
+};
+
+static int netxbig_v2_blue_sata_mled[NETXBIG_LED_MODE_NUM] = {
+        [NETXBIG_LED_OFF]       = 0,
+        [NETXBIG_LED_ON]        = 7,
+        [NETXBIG_LED_SATA]      = 1,
+        [NETXBIG_LED_TIMER1]    = 3,
+        [NETXBIG_LED_TIMER2]    = NETXBIG_LED_INVALID_MODE,
+};
+
+static struct netxbig_led_timer netxbig_v2_led_timer[] = {
+        [0] = {
+                .delay_on       = 500,
+                .delay_off      = 500,
+                .mode           = NETXBIG_LED_TIMER1,
+        },
+        [1] = {
+                .delay_on       = 500,
+                .delay_off      = 1000,
+                .mode           = NETXBIG_LED_TIMER2,
+        },
+};
+
+#define NETXBIG_LED(_name, maddr, mval, baddr)                  \
+        { .name         = _name,                                \
+          .mode_addr    = maddr,                                \
+          .mode_val     = mval,                                 \
+          .bright_addr  = baddr }
+
+static struct netxbig_led net2big_v2_leds_ctrl[] = {
+        NETXBIG_LED("net2big-v2:blue:power", 0, netxbig_v2_blue_pwr_mled,  1),
+        NETXBIG_LED("net2big-v2:red:power",  0, netxbig_v2_red_mled,       1),
+        NETXBIG_LED("net2big-v2:blue:sata0", 3, netxbig_v2_blue_sata_mled, 2),
+        NETXBIG_LED("net2big-v2:red:sata0",  3, netxbig_v2_red_mled,       2),
+        NETXBIG_LED("net2big-v2:blue:sata1", 4, netxbig_v2_blue_sata_mled, 2),
+        NETXBIG_LED("net2big-v2:red:sata1",  4, netxbig_v2_red_mled,       2),
+};
+
+static struct netxbig_led_platform_data net2big_v2_leds_data = {
+        .gpio_ext       = &netxbig_v2_gpio_ext,
+        .timer          = netxbig_v2_led_timer,
+        .num_timer      = ARRAY_SIZE(netxbig_v2_led_timer),
+        .leds           = net2big_v2_leds_ctrl,
+        .num_leds       = ARRAY_SIZE(net2big_v2_leds_ctrl),
+};
+
+static struct netxbig_led net5big_v2_leds_ctrl[] = {
+        NETXBIG_LED("net5big-v2:blue:power", 0, netxbig_v2_blue_pwr_mled,  1),
+        NETXBIG_LED("net5big-v2:red:power",  0, netxbig_v2_red_mled,       1),
+        NETXBIG_LED("net5big-v2:blue:sata0", 3, netxbig_v2_blue_sata_mled, 2),
+        NETXBIG_LED("net5big-v2:red:sata0",  3, netxbig_v2_red_mled,       2),
+        NETXBIG_LED("net5big-v2:blue:sata1", 4, netxbig_v2_blue_sata_mled, 2),
+        NETXBIG_LED("net5big-v2:red:sata1",  4, netxbig_v2_red_mled,       2),
+        NETXBIG_LED("net5big-v2:blue:sata2", 5, netxbig_v2_blue_sata_mled, 2),
+        NETXBIG_LED("net5big-v2:red:sata2",  5, netxbig_v2_red_mled,       2),
+        NETXBIG_LED("net5big-v2:blue:sata3", 6, netxbig_v2_blue_sata_mled, 2),
+        NETXBIG_LED("net5big-v2:red:sata3",  6, netxbig_v2_red_mled,       2),
+        NETXBIG_LED("net5big-v2:blue:sata4", 7, netxbig_v2_blue_sata_mled, 2),
+        NETXBIG_LED("net5big-v2:red:sata4",  7, netxbig_v2_red_mled,       2),
+};
+
+static struct netxbig_led_platform_data net5big_v2_leds_data = {
+        .gpio_ext       = &netxbig_v2_gpio_ext,
+        .timer          = netxbig_v2_led_timer,
+        .num_timer      = ARRAY_SIZE(netxbig_v2_led_timer),
+        .leds           = net5big_v2_leds_ctrl,
+        .num_leds       = ARRAY_SIZE(net5big_v2_leds_ctrl),
+};
+
+static struct platform_device netxbig_v2_leds = {
+        .name           = "leds-netxbig",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &net2big_v2_leds_data,
+        },
+};
+
+void __init netxbig_init(void)
+{
+
+        if (of_machine_is_compatible("lacie,net5big_v2"))
+                netxbig_v2_leds.dev.platform_data = &net5big_v2_leds_data;
+        platform_device_register(&netxbig_v2_leds);
+}
diff --git a/arch/arm/mach-mvebu/platsmp-a9.c b/arch/arm/mach-mvebu/platsmp-a9.c
index 96c2c59e34b6..47a71a924b96 100644
--- a/arch/arm/mach-mvebu/platsmp-a9.c
+++ b/arch/arm/mach-mvebu/platsmp-a9.c
@@ -20,33 +20,8 @@
 #include <asm/smp_scu.h>
 #include <asm/smp_plat.h>
 #include "common.h"
-#include "mvebu-soc-id.h"
 #include "pmsu.h"
 
-#define CRYPT0_ENG_ID   41
-#define CRYPT0_ENG_ATTR 0x1
-#define SRAM_PHYS_BASE  0xFFFF0000
-
-#define BOOTROM_BASE    0xFFF00000
-#define BOOTROM_SIZE    0x100000
-
-extern unsigned char armada_375_smp_cpu1_enable_code_end;
-extern unsigned char armada_375_smp_cpu1_enable_code_start;
-
-void armada_375_smp_cpu1_enable_wa(void)
-{
-        void __iomem *sram_virt_base;
-
-        mvebu_mbus_del_window(BOOTROM_BASE, BOOTROM_SIZE);
-        mvebu_mbus_add_window_by_id(CRYPT0_ENG_ID, CRYPT0_ENG_ATTR,
-                                SRAM_PHYS_BASE, SZ_64K);
-        sram_virt_base = ioremap(SRAM_PHYS_BASE, SZ_64K);
-
-        memcpy(sram_virt_base, &armada_375_smp_cpu1_enable_code_start,
-               &armada_375_smp_cpu1_enable_code_end
-               - &armada_375_smp_cpu1_enable_code_start);
-}
-
 extern void mvebu_cortex_a9_secondary_startup(void);
 
 static int __cpuinit mvebu_cortex_a9_boot_secondary(unsigned int cpu,
@@ -63,21 +38,10 @@ static int __cpuinit mvebu_cortex_a9_boot_secondary(unsigned int cpu,
          * address.
          */
         hw_cpu = cpu_logical_map(cpu);
-
-        if (of_machine_is_compatible("marvell,armada375")) {
-                u32 dev, rev;
-
-                if (mvebu_get_soc_id(&dev, &rev) == 0 &&
-                    rev == ARMADA_375_Z1_REV)
-                        armada_375_smp_cpu1_enable_wa();
-
+        if (of_machine_is_compatible("marvell,armada375"))
                 mvebu_system_controller_set_cpu_boot_addr(mvebu_cortex_a9_secondary_startup);
-        }
-        else {
-                mvebu_pmsu_set_cpu_boot_addr(hw_cpu,
-                                             mvebu_cortex_a9_secondary_startup);
-        }
-
+        else
+                mvebu_pmsu_set_cpu_boot_addr(hw_cpu, mvebu_cortex_a9_secondary_startup);
         smp_wmb();
         ret = mvebu_cpu_reset_deassert(hw_cpu);
         if (ret) {
@@ -91,9 +55,6 @@ static int __cpuinit mvebu_cortex_a9_boot_secondary(unsigned int cpu,
 
 static struct smp_operations mvebu_cortex_a9_smp_ops __initdata = {
         .smp_boot_secondary     = mvebu_cortex_a9_boot_secondary,
-#ifdef CONFIG_HOTPLUG_CPU
-        .cpu_die                = armada_xp_cpu_die,
-#endif
 };
 
 CPU_METHOD_OF_DECLARE(mvebu_armada_375_smp, "marvell,armada-375-smp",
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index 88b976b31719..895dc373c8a1 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -67,6 +67,7 @@ static void __init set_secondary_cpus_clock(void)
                 if (!cpu_clk)
                         return;
                 clk_set_rate(cpu_clk, rate);
+                clk_prepare_enable(cpu_clk);
         }
 }
 
@@ -78,6 +79,17 @@ static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
 
         hw_cpu = cpu_logical_map(cpu);
         mvebu_pmsu_set_cpu_boot_addr(hw_cpu, armada_xp_secondary_startup);
+
+        /*
+         * This is needed to wake up CPUs in the offline state after
+         * using CPU hotplug.
+         */
+        arch_send_wakeup_ipi_mask(cpumask_of(cpu));
+
+        /*
+         * This is needed to take secondary CPUs out of reset on the
+         * initial boot.
+         */
         ret = mvebu_cpu_reset_deassert(hw_cpu);
         if (ret) {
                 pr_warn("unable to boot CPU: %d\n", ret);
@@ -87,6 +99,19 @@ static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
         return 0;
 }
 
+/*
+ * When a CPU is brought back online, either through CPU hotplug, or
+ * because of the boot of a kexec'ed kernel, the PMSU configuration
+ * for this CPU might be in the deep idle state, preventing this CPU
+ * from receiving interrupts. Here, we therefore take out the current
+ * CPU from this state, which was entered by armada_xp_cpu_die()
+ * below.
+ */
+static void armada_xp_secondary_init(unsigned int cpu)
+{
+        mvebu_v7_pmsu_idle_exit();
+}
+
 static void __init armada_xp_smp_init_cpus(void)
 {
         unsigned int ncores = num_possible_cpus();
@@ -122,12 +147,36 @@ static void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)
                 panic("The address for the BootROM is incorrect");
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
+static void armada_xp_cpu_die(unsigned int cpu)
+{
+        /*
+         * CPU hotplug is implemented by putting offline CPUs into the
+         * deep idle sleep state.
+         */
+        armada_370_xp_pmsu_idle_enter(true);
+}
+
+/*
+ * We need a dummy function, so that platform_can_cpu_hotplug() knows
+ * we support CPU hotplug. However, the function does not need to do
+ * anything, because CPUs going offline can enter the deep idle state
+ * by themselves, without any help from a still alive CPU.
+ */
+static int armada_xp_cpu_kill(unsigned int cpu)
+{
+        return 1;
+}
+#endif
+
 struct smp_operations armada_xp_smp_ops __initdata = {
         .smp_init_cpus          = armada_xp_smp_init_cpus,
         .smp_prepare_cpus       = armada_xp_smp_prepare_cpus,
         .smp_boot_secondary     = armada_xp_boot_secondary,
+        .smp_secondary_init     = armada_xp_secondary_init,
 #ifdef CONFIG_HOTPLUG_CPU
         .cpu_die                = armada_xp_cpu_die,
+        .cpu_kill               = armada_xp_cpu_kill,
 #endif
 };
 
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index 25aa8237d668..8a70a51533fd 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@ -18,22 +18,29 @@
 
 #define pr_fmt(fmt) "mvebu-pmsu: " fmt
 
+#include <linux/clk.h>
 #include <linux/cpu_pm.h>
-#include <linux/kernel.h>
+#include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/of_address.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/mbus.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
-#include <linux/smp.h>
+#include <linux/pm_opp.h>
 #include <linux/resource.h>
+#include <linux/slab.h>
+#include <linux/smp.h>
 #include <asm/cacheflush.h>
 #include <asm/cp15.h>
+#include <asm/smp_scu.h>
 #include <asm/smp_plat.h>
 #include <asm/suspend.h>
 #include <asm/tlbflush.h>
 #include "common.h"
+#include "armada-370-xp.h"
 
-static void __iomem *pmsu_mp_base;
 
 #define PMSU_BASE_OFFSET    0x100
 #define PMSU_REG_SIZE       0x1000
@@ -57,20 +64,45 @@ static void __iomem *pmsu_mp_base;
 #define PMSU_STATUS_AND_MASK_IRQ_MASK           BIT(24)
 #define PMSU_STATUS_AND_MASK_FIQ_MASK           BIT(25)
 
+#define PMSU_EVENT_STATUS_AND_MASK(cpu)     ((cpu * 0x100) + 0x120)
+#define PMSU_EVENT_STATUS_AND_MASK_DFS_DONE        BIT(1)
+#define PMSU_EVENT_STATUS_AND_MASK_DFS_DONE_MASK   BIT(17)
+
 #define PMSU_BOOT_ADDR_REDIRECT_OFFSET(cpu) ((cpu * 0x100) + 0x124)
 
 /* PMSU fabric registers */
 #define L2C_NFABRIC_PM_CTL                  0x4
 #define L2C_NFABRIC_PM_CTL_PWR_DOWN             BIT(20)
 
+/* PMSU delay registers */
+#define PMSU_POWERDOWN_DELAY                0xF04
+#define PMSU_POWERDOWN_DELAY_PMU                BIT(1)
+#define PMSU_POWERDOWN_DELAY_MASK               0xFFFE
+#define PMSU_DFLT_ARMADA38X_DELAY               0x64
+
+/* CA9 MPcore SoC Control registers */
+
+#define MPCORE_RESET_CTL                    0x64
+#define MPCORE_RESET_CTL_L2                     BIT(0)
+#define MPCORE_RESET_CTL_DEBUG                  BIT(16)
+
+#define SRAM_PHYS_BASE  0xFFFF0000
+#define BOOTROM_BASE    0xFFF00000
+#define BOOTROM_SIZE    0x100000
+
+#define ARMADA_370_CRYPT0_ENG_TARGET   0x9
+#define ARMADA_370_CRYPT0_ENG_ATTR     0x1
+
 extern void ll_disable_coherency(void);
 extern void ll_enable_coherency(void);
 
 extern void armada_370_xp_cpu_resume(void);
+extern void armada_38x_cpu_resume(void);
 
-static struct platform_device armada_xp_cpuidle_device = {
-        .name = "cpuidle-armada-370-xp",
-};
+static phys_addr_t pmsu_mp_phys_base;
+static void __iomem *pmsu_mp_base;
+
+static void *mvebu_cpu_resume;
 
 static struct of_device_id of_pmsu_table[] = {
         { .compatible = "marvell,armada-370-pmsu", },
@@ -85,7 +117,49 @@ void mvebu_pmsu_set_cpu_boot_addr(int hw_cpu, void *boot_addr)
                 PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu));
 }
 
-static int __init armada_370_xp_pmsu_init(void)
+extern unsigned char mvebu_boot_wa_start;
+extern unsigned char mvebu_boot_wa_end;
+
+/*
+ * This function sets up the boot address workaround needed for SMP
+ * boot on Armada 375 Z1 and cpuidle on Armada 370. It unmaps the
+ * BootROM Mbus window, and instead remaps a crypto SRAM into which a
+ * custom piece of code is copied to replace the problematic BootROM.
+ */
+int mvebu_setup_boot_addr_wa(unsigned int crypto_eng_target,
+                             unsigned int crypto_eng_attribute,
+                             phys_addr_t resume_addr_reg)
+{
+        void __iomem *sram_virt_base;
+        u32 code_len = &mvebu_boot_wa_end - &mvebu_boot_wa_start;
+
+        mvebu_mbus_del_window(BOOTROM_BASE, BOOTROM_SIZE);
+        mvebu_mbus_add_window_by_id(crypto_eng_target, crypto_eng_attribute,
+                                    SRAM_PHYS_BASE, SZ_64K);
+
+        sram_virt_base = ioremap(SRAM_PHYS_BASE, SZ_64K);
+        if (!sram_virt_base) {
+                pr_err("Unable to map SRAM to setup the boot address WA\n");
+                return -ENOMEM;
+        }
+
+        memcpy(sram_virt_base, &mvebu_boot_wa_start, code_len);
+
+        /*
+         * The last word of the code copied in SRAM must contain the
+         * physical base address of the PMSU register. We
+         * intentionally store this address in the native endianness
+         * of the system.
+         */
+        __raw_writel((unsigned long)resume_addr_reg,
+                     sram_virt_base + code_len - 4);
+
+        iounmap(sram_virt_base);
+
+        return 0;
+}
+
+static int __init mvebu_v7_pmsu_init(void)
 {
         struct device_node *np;
         struct resource res;
@@ -116,6 +190,8 @@ static int __init armada_370_xp_pmsu_init(void)
                 goto out;
         }
 
+        pmsu_mp_phys_base = res.start;
+
         pmsu_mp_base = ioremap(res.start, resource_size(&res));
         if (!pmsu_mp_base) {
                 pr_err("unable to map registers\n");
@@ -129,7 +205,7 @@ static int __init armada_370_xp_pmsu_init(void)
         return ret;
 }
 
-static void armada_370_xp_pmsu_enable_l2_powerdown_onidle(void)
+static void mvebu_v7_pmsu_enable_l2_powerdown_onidle(void)
 {
         u32 reg;
 
@@ -142,14 +218,20 @@ static void armada_370_xp_pmsu_enable_l2_powerdown_onidle(void)
         writel(reg, pmsu_mp_base + L2C_NFABRIC_PM_CTL);
 }
 
+enum pmsu_idle_prepare_flags {
+        PMSU_PREPARE_NORMAL = 0,
+        PMSU_PREPARE_DEEP_IDLE = BIT(0),
+        PMSU_PREPARE_SNOOP_DISABLE = BIT(1),
+};
+
 /* No locking is needed because we only access per-CPU registers */
-void armada_370_xp_pmsu_idle_prepare(bool deepidle)
+static int mvebu_v7_pmsu_idle_prepare(unsigned long flags)
 {
         unsigned int hw_cpu = cpu_logical_map(smp_processor_id());
         u32 reg;
 
         if (pmsu_mp_base == NULL)
-                return;
+                return -EINVAL;
 
         /*
          * Adjust the PMSU configuration to wait for WFI signal, enable
@@ -167,22 +249,34 @@ void armada_370_xp_pmsu_idle_prepare(bool deepidle)
 
         reg = readl(pmsu_mp_base + PMSU_CONTROL_AND_CONFIG(hw_cpu));
         /* ask HW to power down the L2 Cache if needed */
-        if (deepidle)
+        if (flags & PMSU_PREPARE_DEEP_IDLE)
                 reg |= PMSU_CONTROL_AND_CONFIG_L2_PWDDN;
 
         /* request power down */
         reg |= PMSU_CONTROL_AND_CONFIG_PWDDN_REQ;
         writel(reg, pmsu_mp_base + PMSU_CONTROL_AND_CONFIG(hw_cpu));
 
-        /* Disable snoop disable by HW - SW is taking care of it */
-        reg = readl(pmsu_mp_base + PMSU_CPU_POWER_DOWN_CONTROL(hw_cpu));
-        reg |= PMSU_CPU_POWER_DOWN_DIS_SNP_Q_SKIP;
-        writel(reg, pmsu_mp_base + PMSU_CPU_POWER_DOWN_CONTROL(hw_cpu));
+        if (flags & PMSU_PREPARE_SNOOP_DISABLE) {
+                /* Disable snoop disable by HW - SW is taking care of it */
+                reg = readl(pmsu_mp_base + PMSU_CPU_POWER_DOWN_CONTROL(hw_cpu));
+                reg |= PMSU_CPU_POWER_DOWN_DIS_SNP_Q_SKIP;
+                writel(reg, pmsu_mp_base + PMSU_CPU_POWER_DOWN_CONTROL(hw_cpu));
+        }
+
+        return 0;
 }
 
-static noinline int do_armada_370_xp_cpu_suspend(unsigned long deepidle)
+int armada_370_xp_pmsu_idle_enter(unsigned long deepidle)
 {
-        armada_370_xp_pmsu_idle_prepare(deepidle);
+        unsigned long flags = PMSU_PREPARE_SNOOP_DISABLE;
+        int ret;
+
+        if (deepidle)
+                flags |= PMSU_PREPARE_DEEP_IDLE;
+
+        ret = mvebu_v7_pmsu_idle_prepare(flags);
+        if (ret)
+                return ret;
 
         v7_exit_coherency_flush(all);
 
@@ -208,25 +302,50 @@ static noinline int do_armada_370_xp_cpu_suspend(unsigned long deepidle)
         "isb    "
         : : : "r0");
 
-        pr_warn("Failed to suspend the system\n");
+        pr_debug("Failed to suspend the system\n");
 
         return 0;
 }
 
 static int armada_370_xp_cpu_suspend(unsigned long deepidle)
 {
-        return cpu_suspend(deepidle, do_armada_370_xp_cpu_suspend);
+        return cpu_suspend(deepidle, armada_370_xp_pmsu_idle_enter);
+}
+
+static int armada_38x_do_cpu_suspend(unsigned long deepidle)
+{
+        unsigned long flags = 0;
+
+        if (deepidle)
+                flags |= PMSU_PREPARE_DEEP_IDLE;
+
+        mvebu_v7_pmsu_idle_prepare(flags);
+        /*
+         * Already flushed cache, but do it again as the outer cache
+         * functions dirty the cache with spinlocks
+         */
+        v7_exit_coherency_flush(louis);
+
+        scu_power_mode(mvebu_get_scu_base(), SCU_PM_POWEROFF);
+
+        cpu_do_idle();
+
+        return 1;
+}
+
+static int armada_38x_cpu_suspend(unsigned long deepidle)
+{
+        return cpu_suspend(false, armada_38x_do_cpu_suspend);
 }
 
 /* No locking is needed because we only access per-CPU registers */
-static noinline void armada_370_xp_pmsu_idle_restore(void)
+void mvebu_v7_pmsu_idle_exit(void)
 {
         unsigned int hw_cpu = cpu_logical_map(smp_processor_id());
         u32 reg;
 
         if (pmsu_mp_base == NULL)
                 return;
-
         /* cancel ask HW to power down the L2 Cache if possible */
         reg = readl(pmsu_mp_base + PMSU_CONTROL_AND_CONFIG(hw_cpu));
         reg &= ~PMSU_CONTROL_AND_CONFIG_L2_PWDDN;
@@ -241,53 +360,292 @@ static noinline void armada_370_xp_pmsu_idle_restore(void)
         writel(reg, pmsu_mp_base + PMSU_STATUS_AND_MASK(hw_cpu));
 }
 
-static int armada_370_xp_cpu_pm_notify(struct notifier_block *self,
+static int mvebu_v7_cpu_pm_notify(struct notifier_block *self,
                                     unsigned long action, void *hcpu)
 {
         if (action == CPU_PM_ENTER) {
                 unsigned int hw_cpu = cpu_logical_map(smp_processor_id());
-                mvebu_pmsu_set_cpu_boot_addr(hw_cpu, armada_370_xp_cpu_resume);
+                mvebu_pmsu_set_cpu_boot_addr(hw_cpu, mvebu_cpu_resume);
         } else if (action == CPU_PM_EXIT) {
-                armada_370_xp_pmsu_idle_restore();
+                mvebu_v7_pmsu_idle_exit();
         }
 
         return NOTIFY_OK;
 }
 
-static struct notifier_block armada_370_xp_cpu_pm_notifier = {
-        .notifier_call = armada_370_xp_cpu_pm_notify,
+static struct notifier_block mvebu_v7_cpu_pm_notifier = {
+        .notifier_call = mvebu_v7_cpu_pm_notify,
 };
 
-int __init armada_370_xp_cpu_pm_init(void)
+static struct platform_device mvebu_v7_cpuidle_device;
+
+static __init int armada_370_cpuidle_init(void)
 {
         struct device_node *np;
+        phys_addr_t redirect_reg;
+
+        np = of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric");
+        if (!np)
+                return -ENODEV;
+        of_node_put(np);
 
         /*
-         * Check that all the requirements are available to enable
-         * cpuidle. So far, it is only supported on Armada XP, cpuidle
-         * needs the coherency fabric and the PMSU enabled
+         * On Armada 370, there is "a slow exit process from the deep
+         * idle state due to heavy L1/L2 cache cleanup operations
+         * performed by the BootROM software". To avoid this, we
+         * replace the restart code of the bootrom by a a simple jump
+         * to the boot address. Then the code located at this boot
+         * address will take care of the initialization.
          */
+        redirect_reg = pmsu_mp_phys_base + PMSU_BOOT_ADDR_REDIRECT_OFFSET(0);
+        mvebu_setup_boot_addr_wa(ARMADA_370_CRYPT0_ENG_TARGET,
+                                 ARMADA_370_CRYPT0_ENG_ATTR,
+                                 redirect_reg);
 
-        if (!of_machine_is_compatible("marvell,armadaxp"))
-                return 0;
+        mvebu_cpu_resume = armada_370_xp_cpu_resume;
+        mvebu_v7_cpuidle_device.dev.platform_data = armada_370_xp_cpu_suspend;
+        mvebu_v7_cpuidle_device.name = "cpuidle-armada-370";
+
+        return 0;
+}
+
+static __init int armada_38x_cpuidle_init(void)
+{
+        struct device_node *np;
+        void __iomem *mpsoc_base;
+        u32 reg;
+
+        np = of_find_compatible_node(NULL, NULL,
+                                     "marvell,armada-380-coherency-fabric");
+        if (!np)
+                return -ENODEV;
+        of_node_put(np);
+
+        np = of_find_compatible_node(NULL, NULL,
+                                     "marvell,armada-380-mpcore-soc-ctrl");
+        if (!np)
+                return -ENODEV;
+        mpsoc_base = of_iomap(np, 0);
+        BUG_ON(!mpsoc_base);
+        of_node_put(np);
+
+        /* Set up reset mask when powering down the cpus */
+        reg = readl(mpsoc_base + MPCORE_RESET_CTL);
+        reg |= MPCORE_RESET_CTL_L2;
+        reg |= MPCORE_RESET_CTL_DEBUG;
+        writel(reg, mpsoc_base + MPCORE_RESET_CTL);
+        iounmap(mpsoc_base);
+
+        /* Set up delay */
+        reg = readl(pmsu_mp_base + PMSU_POWERDOWN_DELAY);
+        reg &= ~PMSU_POWERDOWN_DELAY_MASK;
+        reg |= PMSU_DFLT_ARMADA38X_DELAY;
+        reg |= PMSU_POWERDOWN_DELAY_PMU;
+        writel(reg, pmsu_mp_base + PMSU_POWERDOWN_DELAY);
+
+        mvebu_cpu_resume = armada_38x_cpu_resume;
+        mvebu_v7_cpuidle_device.dev.platform_data = armada_38x_cpu_suspend;
+        mvebu_v7_cpuidle_device.name = "cpuidle-armada-38x";
+
+        return 0;
+}
+
+static __init int armada_xp_cpuidle_init(void)
+{
+        struct device_node *np;
 
         np = of_find_compatible_node(NULL, NULL, "marvell,coherency-fabric");
         if (!np)
-                return 0;
+                return -ENODEV;
         of_node_put(np);
 
+        mvebu_cpu_resume = armada_370_xp_cpu_resume;
+        mvebu_v7_cpuidle_device.dev.platform_data = armada_370_xp_cpu_suspend;
+        mvebu_v7_cpuidle_device.name = "cpuidle-armada-xp";
+
+        return 0;
+}
+
+static int __init mvebu_v7_cpu_pm_init(void)
+{
+        struct device_node *np;
+        int ret;
+
         np = of_find_matching_node(NULL, of_pmsu_table);
         if (!np)
                 return 0;
         of_node_put(np);
 
-        armada_370_xp_pmsu_enable_l2_powerdown_onidle();
-        armada_xp_cpuidle_device.dev.platform_data = armada_370_xp_cpu_suspend;
-        platform_device_register(&armada_xp_cpuidle_device);
-        cpu_pm_register_notifier(&armada_370_xp_cpu_pm_notifier);
+        if (of_machine_is_compatible("marvell,armadaxp"))
+                ret = armada_xp_cpuidle_init();
+        else if (of_machine_is_compatible("marvell,armada370"))
+                ret = armada_370_cpuidle_init();
+        else if (of_machine_is_compatible("marvell,armada380"))
+                ret = armada_38x_cpuidle_init();
+        else
+                return 0;
+
+        if (ret)
+                return ret;
+
+        mvebu_v7_pmsu_enable_l2_powerdown_onidle();
+        platform_device_register(&mvebu_v7_cpuidle_device);
+        cpu_pm_register_notifier(&mvebu_v7_cpu_pm_notifier);
+
+        return 0;
+}
+
+arch_initcall(mvebu_v7_cpu_pm_init);
+early_initcall(mvebu_v7_pmsu_init);
+
+static void mvebu_pmsu_dfs_request_local(void *data)
+{
+        u32 reg;
+        u32 cpu = smp_processor_id();
+        unsigned long flags;
+
+        local_irq_save(flags);
+
+        /* Prepare to enter idle */
+        reg = readl(pmsu_mp_base + PMSU_STATUS_AND_MASK(cpu));
+        reg |= PMSU_STATUS_AND_MASK_CPU_IDLE_WAIT |
+               PMSU_STATUS_AND_MASK_IRQ_MASK     |
+               PMSU_STATUS_AND_MASK_FIQ_MASK;
+        writel(reg, pmsu_mp_base + PMSU_STATUS_AND_MASK(cpu));
+
+        /* Request the DFS transition */
+        reg = readl(pmsu_mp_base + PMSU_CONTROL_AND_CONFIG(cpu));
+        reg |= PMSU_CONTROL_AND_CONFIG_DFS_REQ;
+        writel(reg, pmsu_mp_base + PMSU_CONTROL_AND_CONFIG(cpu));
+
+        /* The fact of entering idle will trigger the DFS transition */
+        wfi();
+
+        /*
+         * We're back from idle, the DFS transition has completed,
+         * clear the idle wait indication.
+         */
+        reg = readl(pmsu_mp_base + PMSU_STATUS_AND_MASK(cpu));
+        reg &= ~PMSU_STATUS_AND_MASK_CPU_IDLE_WAIT;
+        writel(reg, pmsu_mp_base + PMSU_STATUS_AND_MASK(cpu));
+
+        local_irq_restore(flags);
+}
+
+int mvebu_pmsu_dfs_request(int cpu)
+{
+        unsigned long timeout;
+        int hwcpu = cpu_logical_map(cpu);
+        u32 reg;
+
+        /* Clear any previous DFS DONE event */
+        reg = readl(pmsu_mp_base + PMSU_EVENT_STATUS_AND_MASK(hwcpu));
+        reg &= ~PMSU_EVENT_STATUS_AND_MASK_DFS_DONE;
+        writel(reg, pmsu_mp_base + PMSU_EVENT_STATUS_AND_MASK(hwcpu));
+
+        /* Mask the DFS done interrupt, since we are going to poll */
+        reg = readl(pmsu_mp_base + PMSU_EVENT_STATUS_AND_MASK(hwcpu));
+        reg |= PMSU_EVENT_STATUS_AND_MASK_DFS_DONE_MASK;
+        writel(reg, pmsu_mp_base + PMSU_EVENT_STATUS_AND_MASK(hwcpu));
+
+        /* Trigger the DFS on the appropriate CPU */
+        smp_call_function_single(cpu, mvebu_pmsu_dfs_request_local,
+                                 NULL, false);
+
+        /* Poll until the DFS done event is generated */
+        timeout = jiffies + HZ;
+        while (time_before(jiffies, timeout)) {
+                reg = readl(pmsu_mp_base + PMSU_EVENT_STATUS_AND_MASK(hwcpu));
+                if (reg & PMSU_EVENT_STATUS_AND_MASK_DFS_DONE)
+                        break;
+                udelay(10);
+        }
+
+        if (time_after(jiffies, timeout))
+                return -ETIME;
+
+        /* Restore the DFS mask to its original state */
+        reg = readl(pmsu_mp_base + PMSU_EVENT_STATUS_AND_MASK(hwcpu));
+        reg &= ~PMSU_EVENT_STATUS_AND_MASK_DFS_DONE_MASK;
+        writel(reg, pmsu_mp_base + PMSU_EVENT_STATUS_AND_MASK(hwcpu));
+
+        return 0;
+}
+
+static int __init armada_xp_pmsu_cpufreq_init(void)
+{
+        struct device_node *np;
+        struct resource res;
+        int ret, cpu;
+
+        if (!of_machine_is_compatible("marvell,armadaxp"))
+                return 0;
+
+        /*
+         * In order to have proper cpufreq handling, we need to ensure
+         * that the Device Tree description of the CPU clock includes
+         * the definition of the PMU DFS registers. If not, we do not
+         * register the clock notifier and the cpufreq driver. This
+         * piece of code is only for compatibility with old Device
+         * Trees.
+         */
+        np = of_find_compatible_node(NULL, NULL, "marvell,armada-xp-cpu-clock");
+        if (!np)
+                return 0;
+
+        ret = of_address_to_resource(np, 1, &res);
+        if (ret) {
+                pr_warn(FW_WARN "not enabling cpufreq, deprecated armada-xp-cpu-clock binding\n");
+                of_node_put(np);
+                return 0;
+        }
+
+        of_node_put(np);
+
+        /*
+         * For each CPU, this loop registers the operating points
+         * supported (which are the nominal CPU frequency and half of
+         * it), and registers the clock notifier that will take care
+         * of doing the PMSU part of a frequency transition.
+         */
+        for_each_possible_cpu(cpu) {
+                struct device *cpu_dev;
+                struct clk *clk;
+                int ret;
+
+                cpu_dev = get_cpu_device(cpu);
+                if (!cpu_dev) {
+                        pr_err("Cannot get CPU %d\n", cpu);
+                        continue;
+                }
+
+                clk = clk_get(cpu_dev, 0);
+                if (IS_ERR(clk)) {
+                        pr_err("Cannot get clock for CPU %d\n", cpu);
+                        return PTR_ERR(clk);
+                }
+
+                /*
+                 * In case of a failure of dev_pm_opp_add(), we don't
+                 * bother with cleaning up the registered OPP (there's
+                 * no function to do so), and simply cancel the
+                 * registration of the cpufreq device.
+                 */
+                ret = dev_pm_opp_add(cpu_dev, clk_get_rate(clk), 0);
+                if (ret) {
+                        clk_put(clk);
+                        return ret;
+                }
+
+                ret = dev_pm_opp_add(cpu_dev, clk_get_rate(clk) / 2, 0);
+                if (ret) {
+                        clk_put(clk);
+                        return ret;
+                }
+        }
 
+        platform_device_register_simple("cpufreq-generic", -1, NULL, 0);
         return 0;
 }
 
-arch_initcall(armada_370_xp_cpu_pm_init);
-early_initcall(armada_370_xp_pmsu_init);
+device_initcall(armada_xp_pmsu_cpufreq_init);
diff --git a/arch/arm/mach-mvebu/pmsu.h b/arch/arm/mach-mvebu/pmsu.h
index 07a737c6b95d..6b58c1fe2b0d 100644
--- a/arch/arm/mach-mvebu/pmsu.h
+++ b/arch/arm/mach-mvebu/pmsu.h
@@ -12,5 +12,10 @@
 #define __MACH_MVEBU_PMSU_H
 
 int armada_xp_boot_cpu(unsigned int cpu_id, void *phys_addr);
+int mvebu_setup_boot_addr_wa(unsigned int crypto_eng_target,
+                             unsigned int crypto_eng_attribute,
+                             phys_addr_t resume_addr_reg);
+
+void mvebu_v7_pmsu_idle_exit(void);
 
 #endif  /* __MACH_370_XP_PMSU_H */
diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
index fc3de68d8c54..a945756cfb45 100644
--- a/arch/arm/mach-mvebu/pmsu_ll.S
+++ b/arch/arm/mach-mvebu/pmsu_ll.S
@@ -23,3 +23,39 @@ ARM_BE8(setend	be )			@ go BE8 if entered LE
         b       cpu_resume
 ENDPROC(armada_370_xp_cpu_resume)
 
+ENTRY(armada_38x_cpu_resume)
+        /* do we need it for Armada 38x*/
+ARM_BE8(setend  be )                    @ go BE8 if entered LE
+        bl      v7_invalidate_l1
+        mrc     p15, 4, r1, c15, c0     @ get SCU base address
+        orr     r1, r1, #0x8            @ SCU CPU Power Status Register
+        mrc     15, 0, r0, cr0, cr0, 5  @ get the CPU ID
+        and     r0, r0, #15
+        add     r1, r1, r0
+        mov     r0, #0x0
+        strb    r0, [r1]                @ switch SCU power state to Normal mode
+        b       cpu_resume
+ENDPROC(armada_38x_cpu_resume)
+
+.global mvebu_boot_wa_start
+.global mvebu_boot_wa_end
+
+/* The following code will be executed from SRAM */
+ENTRY(mvebu_boot_wa_start)
+mvebu_boot_wa_start:
+ARM_BE8(setend  be)
+        adr     r0, 1f
+        ldr     r0, [r0]                @ load the address of the
+                                        @ resume register
+        ldr     r0, [r0]                @ load the value in the
+                                        @ resume register
+ARM_BE8(rev     r0, r0)                 @ the value is stored LE
+        mov     pc, r0                  @ jump to this value
+/*
+ * the last word of this piece of code will be filled by the physical
+ * address of the boot address register just after being copied in SRAM
+ */
+1:
+        .long   .
+mvebu_boot_wa_end:
+ENDPROC(mvebu_boot_wa_end)
diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c
index 0c5524ac75b7..a068cb5c2ce8 100644
--- a/arch/arm/mach-mvebu/system-controller.c
+++ b/arch/arm/mach-mvebu/system-controller.c
@@ -28,8 +28,14 @@
 #include <linux/io.h>
 #include <linux/reboot.h>
 #include "common.h"
+#include "mvebu-soc-id.h"
+#include "pmsu.h"
+
+#define ARMADA_375_CRYPT0_ENG_TARGET 41
+#define ARMADA_375_CRYPT0_ENG_ATTR    1
 
 static void __iomem *system_controller_base;
+static phys_addr_t system_controller_phys_base;
 
 struct mvebu_system_controller {
         u32 rstoutn_mask_offset;
@@ -39,6 +45,9 @@ struct mvebu_system_controller {
         u32 system_soft_reset;
 
         u32 resume_boot_addr;
+
+        u32 dev_id;
+        u32 rev_id;
 };
 static struct mvebu_system_controller *mvebu_sc;
 
@@ -47,6 +56,8 @@ static const struct mvebu_system_controller armada_370_xp_system_controller = {
         .system_soft_reset_offset = 0x64,
         .rstoutn_mask_reset_out_en = 0x1,
         .system_soft_reset = 0x1,
+        .dev_id = 0x38,
+        .rev_id = 0x3c,
 };
 
 static const struct mvebu_system_controller armada_375_system_controller = {
@@ -55,6 +66,8 @@ static const struct mvebu_system_controller armada_375_system_controller = {
         .rstoutn_mask_reset_out_en = 0x1,
         .system_soft_reset = 0x1,
         .resume_boot_addr = 0xd4,
+        .dev_id = 0x38,
+        .rev_id = 0x3c,
 };
 
 static const struct mvebu_system_controller orion_system_controller = {
@@ -101,11 +114,45 @@ void mvebu_restart(enum reboot_mode mode, const char *cmd)
                 ;
 }
 
+int mvebu_system_controller_get_soc_id(u32 *dev, u32 *rev)
+{
+        if (of_machine_is_compatible("marvell,armada380") &&
+                system_controller_base) {
+                *dev = readl(system_controller_base + mvebu_sc->dev_id) >> 16;
+                *rev = (readl(system_controller_base + mvebu_sc->rev_id) >> 8)
+                        & 0xF;
+                return 0;
+        } else
+                return -ENODEV;
+}
+
 #ifdef CONFIG_SMP
+void mvebu_armada375_smp_wa_init(void)
+{
+        u32 dev, rev;
+        phys_addr_t resume_addr_reg;
+
+        if (mvebu_get_soc_id(&dev, &rev) != 0)
+                return;
+
+        if (rev != ARMADA_375_Z1_REV)
+                return;
+
+        resume_addr_reg = system_controller_phys_base +
+                mvebu_sc->resume_boot_addr;
+        mvebu_setup_boot_addr_wa(ARMADA_375_CRYPT0_ENG_TARGET,
+                                 ARMADA_375_CRYPT0_ENG_ATTR,
+                                 resume_addr_reg);
+}
+
 void mvebu_system_controller_set_cpu_boot_addr(void *boot_addr)
 {
         BUG_ON(system_controller_base == NULL);
         BUG_ON(mvebu_sc->resume_boot_addr == 0);
+
+        if (of_machine_is_compatible("marvell,armada375"))
+                mvebu_armada375_smp_wa_init();
+
         writel(virt_to_phys(boot_addr), system_controller_base +
                mvebu_sc->resume_boot_addr);
 }
@@ -119,7 +166,10 @@ static int __init mvebu_system_controller_init(void)
         np = of_find_matching_node_and_match(NULL, of_system_controller_table,
                                              &match);
         if (np) {
+                struct resource res;
                 system_controller_base = of_iomap(np, 0);
+                of_address_to_resource(np, 0, &res);
+                system_controller_phys_base = res.start;
                 mvebu_sc = (struct mvebu_system_controller *)match->data;
                 of_node_put(np);
         }
diff --git a/arch/arm/mach-omap1/include/mach/memory.h b/arch/arm/mach-omap1/include/mach/memory.h
index 3c2530523111..058a4f7d44c5 100644
--- a/arch/arm/mach-omap1/include/mach/memory.h
+++ b/arch/arm/mach-omap1/include/mach/memory.h
@@ -6,11 +6,6 @@
 #define __ASM_ARCH_MEMORY_H
 
 /*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET                UL(0x10000000)
-
-/*
  * Bus address is physical address, except for OMAP-1510 Local Bus.
  * OMAP-1510 bus address is translated into a Local Bus address if the
  * OMAP bus type is lbus. We do the address translation based on the
diff --git a/arch/arm/mach-omap1/ocpi.c b/arch/arm/mach-omap1/ocpi.c
index 238170cab5b7..44a3d19eb481 100644
--- a/arch/arm/mach-omap1/ocpi.c
+++ b/arch/arm/mach-omap1/ocpi.c
@@ -55,7 +55,6 @@ static struct clk *ocpi_ck;
 
 /*
  * Enables device access to OMAP buses via the OCPI bridge
- * FIXME: Add locking
  */
 int ocpi_enable(void)
 {
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 1c1ed737f7ab..e7189dcc9309 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -15,7 +15,6 @@ config ARCH_OMAP3
         bool "TI OMAP3"
         depends on ARCH_MULTI_V7
         select ARCH_OMAP2PLUS
-        select ARCH_HAS_OPP
         select ARM_CPU_SUSPEND if PM
         select OMAP_INTERCONNECT
         select PM_OPP if PM
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 8ca99e9321e3..69bbcba8842f 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -176,13 +176,11 @@ obj-$(CONFIG_SOC_DRA7XX)		+= clockdomains7xx_data.o
 
 # Clock framework
 obj-$(CONFIG_ARCH_OMAP2)                += $(clock-common) clock2xxx.o
-obj-$(CONFIG_ARCH_OMAP2)                += clkt2xxx_sys.o
 obj-$(CONFIG_ARCH_OMAP2)                += clkt2xxx_dpllcore.o
 obj-$(CONFIG_ARCH_OMAP2)                += clkt2xxx_virt_prcm_set.o
-obj-$(CONFIG_ARCH_OMAP2)                += clkt2xxx_apll.o clkt2xxx_osc.o
+obj-$(CONFIG_ARCH_OMAP2)                += clkt2xxx_apll.o
 obj-$(CONFIG_ARCH_OMAP2)                += clkt2xxx_dpll.o clkt_iclk.o
-obj-$(CONFIG_SOC_OMAP2420)              += cclock2420_data.o
-obj-$(CONFIG_SOC_OMAP2430)              += clock2430.o cclock2430_data.o
+obj-$(CONFIG_SOC_OMAP2430)              += clock2430.o
 obj-$(CONFIG_ARCH_OMAP3)                += $(clock-common) clock3xxx.o
 obj-$(CONFIG_ARCH_OMAP3)                += clock34xx.o clkt34xx_dpll3m2.o
 obj-$(CONFIG_ARCH_OMAP3)                += clock3517.o clock36xx.o
@@ -202,6 +200,7 @@ obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o
 obj-$(CONFIG_SOC_OMAP2430)              += opp2430_data.o
 
 # hwmod data
+obj-y                                   += omap_hwmod_common_ipblock_data.o
 obj-$(CONFIG_SOC_OMAP2420)              += omap_hwmod_2xxx_ipblock_data.o
 obj-$(CONFIG_SOC_OMAP2420)              += omap_hwmod_2xxx_3xxx_ipblock_data.o
 obj-$(CONFIG_SOC_OMAP2420)              += omap_hwmod_2xxx_interconnect_data.o
@@ -232,10 +231,6 @@ obj-$(CONFIG_HW_PERF_EVENTS)		+= pmu.o
 iommu-$(CONFIG_OMAP_IOMMU)              := omap-iommu.o
 obj-y                                   += $(iommu-m) $(iommu-y)
 
-ifneq ($(CONFIG_TIDSPBRIDGE),)
-obj-y                                   += dsp.o
-endif
-
 # OMAP2420 MSDI controller integration support ("MMC")
 obj-$(CONFIG_SOC_OMAP2420)              += msdi.o
 
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 7da48bc42bbf..70b904c010c6 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -336,7 +336,7 @@ static int __init early_touchbook_revision(char *p)
         if (!p)
                 return 0;
 
-        return strict_strtoul(p, 10, &touchbook_revision);
+        return kstrtoul(p, 10, &touchbook_revision);
 }
 early_param("tbr", early_touchbook_revision);
 
diff --git a/arch/arm/mach-omap2/cclock2420_data.c b/arch/arm/mach-omap2/cclock2420_data.c
deleted file mode 100644
index 3662f4d4c8ea..000000000000
--- a/arch/arm/mach-omap2/cclock2420_data.c
+++ /dev/null
@@ -1,1931 +0,0 @@
-/*
- * OMAP2420 clock data
- *
- * Copyright (C) 2005-2012 Texas Instruments, Inc.
- * Copyright (C) 2004-2011 Nokia Corporation
- *
- * Contacts:
- * Richard Woodruff <r-woodruff2@ti.com>
- * Paul Walmsley
- * Updated to COMMON clk format by Rajendra Nayak <rnayak@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.
- */
-
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/clk.h>
-#include <linux/clk-private.h>
-#include <linux/list.h>
-
-#include "soc.h"
-#include "iomap.h"
-#include "clock.h"
-#include "clock2xxx.h"
-#include "opp2xxx.h"
-#include "cm2xxx.h"
-#include "prm2xxx.h"
-#include "prm-regbits-24xx.h"
-#include "cm-regbits-24xx.h"
-#include "sdrc.h"
-#include "control.h"
-
-#define OMAP_CM_REGADDR                 OMAP2420_CM_REGADDR
-
-/*
- * 2420 clock tree.
- *
- * NOTE:In many cases here we are assigning a 'default' parent. In
- *      many cases the parent is selectable. The set parent calls will
- *      also switch sources.
- *
- *      Several sources are given initial rates which may be wrong, this will
- *      be fixed up in the init func.
- *
- *      Things are broadly separated below by clock domains. It is
- *      noteworthy that most peripherals have dependencies on multiple clock
- *      domains. Many get their interface clocks from the L4 domain, but get
- *      functional clocks from fixed sources or other core domain derived
- *      clocks.
- */
-
-DEFINE_CLK_FIXED_RATE(alt_ck, CLK_IS_ROOT, 54000000, 0x0);
-
-DEFINE_CLK_FIXED_RATE(func_32k_ck, CLK_IS_ROOT, 32768, 0x0);
-
-DEFINE_CLK_FIXED_RATE(mcbsp_clks, CLK_IS_ROOT, 0x0, 0x0);
-
-static struct clk osc_ck;
-
-static const struct clk_ops osc_ck_ops = {
-        .recalc_rate    = &omap2_osc_clk_recalc,
-};
-
-static struct clk_hw_omap osc_ck_hw = {
-        .hw = {
-                .clk = &osc_ck,
-        },
-};
-
-static struct clk osc_ck = {
-        .name   = "osc_ck",
-        .ops    = &osc_ck_ops,
-        .hw     = &osc_ck_hw.hw,
-        .flags  = CLK_IS_ROOT,
-};
-
-DEFINE_CLK_FIXED_RATE(secure_32k_ck, CLK_IS_ROOT, 32768, 0x0);
-
-static struct clk sys_ck;
-
-static const char *sys_ck_parent_names[] = {
-        "osc_ck",
-};
-
-static const struct clk_ops sys_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .recalc_rate    = &omap2xxx_sys_clk_recalc,
-};
-
-DEFINE_STRUCT_CLK_HW_OMAP(sys_ck, "wkup_clkdm");
-DEFINE_STRUCT_CLK(sys_ck, sys_ck_parent_names, sys_ck_ops);
-
-static struct dpll_data dpll_dd = {
-        .mult_div1_reg  = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),
-        .mult_mask      = OMAP24XX_DPLL_MULT_MASK,
-        .div1_mask      = OMAP24XX_DPLL_DIV_MASK,
-        .clk_bypass     = &sys_ck,
-        .clk_ref        = &sys_ck,
-        .control_reg    = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),
-        .enable_mask    = OMAP24XX_EN_DPLL_MASK,
-        .max_multiplier = 1023,
-        .min_divider    = 1,
-        .max_divider    = 16,
-};
-
-static struct clk dpll_ck;
-
-static const char *dpll_ck_parent_names[] = {
-        "sys_ck",
-};
-
-static const struct clk_ops dpll_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .get_parent     = &omap2_init_dpll_parent,
-        .recalc_rate    = &omap2_dpllcore_recalc,
-        .round_rate     = &omap2_dpll_round_rate,
-        .set_rate       = &omap2_reprogram_dpllcore,
-};
-
-static struct clk_hw_omap dpll_ck_hw = {
-        .hw = {
-                .clk = &dpll_ck,
-        },
-        .ops            = &clkhwops_omap2xxx_dpll,
-        .dpll_data      = &dpll_dd,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(dpll_ck, dpll_ck_parent_names, dpll_ck_ops);
-
-static struct clk core_ck;
-
-static const char *core_ck_parent_names[] = {
-        "dpll_ck",
-};
-
-static const struct clk_ops core_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-};
-
-DEFINE_STRUCT_CLK_HW_OMAP(core_ck, "wkup_clkdm");
-DEFINE_STRUCT_CLK(core_ck, core_ck_parent_names, core_ck_ops);
-
-DEFINE_CLK_DIVIDER(core_l3_ck, "core_ck", &core_ck, 0x0,
-                   OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                   OMAP24XX_CLKSEL_L3_SHIFT, OMAP24XX_CLKSEL_L3_WIDTH,
-                   CLK_DIVIDER_ONE_BASED, NULL);
-
-DEFINE_CLK_DIVIDER(l4_ck, "core_l3_ck", &core_l3_ck, 0x0,
-                   OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                   OMAP24XX_CLKSEL_L4_SHIFT, OMAP24XX_CLKSEL_L4_WIDTH,
-                   CLK_DIVIDER_ONE_BASED, NULL);
-
-static struct clk aes_ick;
-
-static const char *aes_ick_parent_names[] = {
-        "l4_ck",
-};
-
-static const struct clk_ops aes_ick_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_dflt_clk_enable,
-        .disable        = &omap2_dflt_clk_disable,
-        .is_enabled     = &omap2_dflt_clk_is_enabled,
-};
-
-static struct clk_hw_omap aes_ick_hw = {
-        .hw = {
-                .clk = &aes_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_AES_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(aes_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk apll54_ck;
-
-static const struct clk_ops apll54_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_clk_apll54_enable,
-        .disable        = &omap2_clk_apll54_disable,
-        .recalc_rate    = &omap2_clk_apll54_recalc,
-};
-
-static struct clk_hw_omap apll54_ck_hw = {
-        .hw = {
-                .clk = &apll54_ck,
-        },
-        .ops            = &clkhwops_apll54,
-        .enable_reg     = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),
-        .enable_bit     = OMAP24XX_EN_54M_PLL_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(apll54_ck, dpll_ck_parent_names, apll54_ck_ops);
-
-static struct clk apll96_ck;
-
-static const struct clk_ops apll96_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_clk_apll96_enable,
-        .disable        = &omap2_clk_apll96_disable,
-        .recalc_rate    = &omap2_clk_apll96_recalc,
-};
-
-static struct clk_hw_omap apll96_ck_hw = {
-        .hw = {
-                .clk = &apll96_ck,
-        },
-        .ops            = &clkhwops_apll96,
-        .enable_reg     = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),
-        .enable_bit     = OMAP24XX_EN_96M_PLL_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(apll96_ck, dpll_ck_parent_names, apll96_ck_ops);
-
-static struct clk func_96m_ck;
-
-static const char *func_96m_ck_parent_names[] = {
-        "apll96_ck",
-};
-
-DEFINE_STRUCT_CLK_HW_OMAP(func_96m_ck, "wkup_clkdm");
-DEFINE_STRUCT_CLK(func_96m_ck, func_96m_ck_parent_names, core_ck_ops);
-
-static struct clk cam_fck;
-
-static const char *cam_fck_parent_names[] = {
-        "func_96m_ck",
-};
-
-static struct clk_hw_omap cam_fck_hw = {
-        .hw = {
-                .clk = &cam_fck,
-        },
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_CAM_SHIFT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(cam_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk cam_ick;
-
-static struct clk_hw_omap cam_ick_hw = {
-        .hw = {
-                .clk = &cam_ick,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_CAM_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(cam_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk des_ick;
-
-static struct clk_hw_omap des_ick_hw = {
-        .hw = {
-                .clk = &des_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_DES_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(des_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clksel_rate dsp_fck_core_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 2, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 3, .val = 3, .flags = RATE_IN_24XX },
-        { .div = 4, .val = 4, .flags = RATE_IN_24XX },
-        { .div = 6, .val = 6, .flags = RATE_IN_242X },
-        { .div = 8, .val = 8, .flags = RATE_IN_242X },
-        { .div = 12, .val = 12, .flags = RATE_IN_242X },
-        { .div = 0 }
-};
-
-static const struct clksel dsp_fck_clksel[] = {
-        { .parent = &core_ck, .rates = dsp_fck_core_rates },
-        { .parent = NULL },
-};
-
-static const char *dsp_fck_parent_names[] = {
-        "core_ck",
-};
-
-static const struct clk_ops dsp_fck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_dflt_clk_enable,
-        .disable        = &omap2_dflt_clk_disable,
-        .is_enabled     = &omap2_dflt_clk_is_enabled,
-        .recalc_rate    = &omap2_clksel_recalc,
-        .set_rate       = &omap2_clksel_set_rate,
-        .round_rate     = &omap2_clksel_round_rate,
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(dsp_fck, "dsp_clkdm", dsp_fck_clksel,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_CLKSEL),
-                         OMAP24XX_CLKSEL_DSP_MASK,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN),
-                         OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT, &clkhwops_wait,
-                         dsp_fck_parent_names, dsp_fck_ops);
-
-static const struct clksel dsp_ick_clksel[] = {
-        { .parent = &dsp_fck, .rates = dsp_ick_rates },
-        { .parent = NULL },
-};
-
-static const char *dsp_ick_parent_names[] = {
-        "dsp_fck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(dsp_ick, "dsp_clkdm", dsp_ick_clksel,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_CLKSEL),
-                         OMAP24XX_CLKSEL_DSP_IF_MASK,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_ICLKEN),
-                         OMAP2420_EN_DSP_IPI_SHIFT, &clkhwops_iclk_wait,
-                         dsp_ick_parent_names, dsp_fck_ops);
-
-static const struct clksel_rate dss1_fck_sys_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate dss1_fck_core_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 2, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 3, .val = 3, .flags = RATE_IN_24XX },
-        { .div = 4, .val = 4, .flags = RATE_IN_24XX },
-        { .div = 5, .val = 5, .flags = RATE_IN_24XX },
-        { .div = 6, .val = 6, .flags = RATE_IN_24XX },
-        { .div = 8, .val = 8, .flags = RATE_IN_24XX },
-        { .div = 9, .val = 9, .flags = RATE_IN_24XX },
-        { .div = 12, .val = 12, .flags = RATE_IN_24XX },
-        { .div = 16, .val = 16, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel dss1_fck_clksel[] = {
-        { .parent = &sys_ck, .rates = dss1_fck_sys_rates },
-        { .parent = &core_ck, .rates = dss1_fck_core_rates },
-        { .parent = NULL },
-};
-
-static const char *dss1_fck_parent_names[] = {
-        "sys_ck", "core_ck",
-};
-
-static struct clk dss1_fck;
-
-static const struct clk_ops dss1_fck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_dflt_clk_enable,
-        .disable        = &omap2_dflt_clk_disable,
-        .is_enabled     = &omap2_dflt_clk_is_enabled,
-        .recalc_rate    = &omap2_clksel_recalc,
-        .get_parent     = &omap2_clksel_find_parent_index,
-        .set_parent     = &omap2_clksel_set_parent,
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(dss1_fck, "dss_clkdm", dss1_fck_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_DSS1_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_DSS1_SHIFT, NULL,
-                         dss1_fck_parent_names, dss1_fck_ops);
-
-static const struct clksel_rate dss2_fck_sys_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate dss2_fck_48m_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate func_48m_apll96_rates[] = {
-        { .div = 2, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate func_48m_alt_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel func_48m_clksel[] = {
-        { .parent = &apll96_ck, .rates = func_48m_apll96_rates },
-        { .parent = &alt_ck, .rates = func_48m_alt_rates },
-        { .parent = NULL },
-};
-
-static const char *func_48m_ck_parent_names[] = {
-        "apll96_ck", "alt_ck",
-};
-
-static struct clk func_48m_ck;
-
-static const struct clk_ops func_48m_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .recalc_rate    = &omap2_clksel_recalc,
-        .set_rate       = &omap2_clksel_set_rate,
-        .round_rate     = &omap2_clksel_round_rate,
-        .get_parent     = &omap2_clksel_find_parent_index,
-        .set_parent     = &omap2_clksel_set_parent,
-};
-
-static struct clk_hw_omap func_48m_ck_hw = {
-        .hw = {
-                .clk = &func_48m_ck,
-        },
-        .clksel         = func_48m_clksel,
-        .clksel_reg     = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),
-        .clksel_mask    = OMAP24XX_48M_SOURCE_MASK,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(func_48m_ck, func_48m_ck_parent_names, func_48m_ck_ops);
-
-static const struct clksel dss2_fck_clksel[] = {
-        { .parent = &sys_ck, .rates = dss2_fck_sys_rates },
-        { .parent = &func_48m_ck, .rates = dss2_fck_48m_rates },
-        { .parent = NULL },
-};
-
-static const char *dss2_fck_parent_names[] = {
-        "sys_ck", "func_48m_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(dss2_fck, "dss_clkdm", dss2_fck_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_DSS2_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_DSS2_SHIFT, NULL,
-                         dss2_fck_parent_names, dss1_fck_ops);
-
-static const char *func_54m_ck_parent_names[] = {
-        "apll54_ck", "alt_ck",
-};
-
-DEFINE_CLK_MUX(func_54m_ck, func_54m_ck_parent_names, NULL, 0x0,
-               OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),
-               OMAP24XX_54M_SOURCE_SHIFT, OMAP24XX_54M_SOURCE_WIDTH,
-               0x0, NULL);
-
-static struct clk dss_54m_fck;
-
-static const char *dss_54m_fck_parent_names[] = {
-        "func_54m_ck",
-};
-
-static struct clk_hw_omap dss_54m_fck_hw = {
-        .hw = {
-                .clk = &dss_54m_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_TV_SHIFT,
-        .clkdm_name     = "dss_clkdm",
-};
-
-DEFINE_STRUCT_CLK(dss_54m_fck, dss_54m_fck_parent_names, aes_ick_ops);
-
-static struct clk dss_ick;
-
-static struct clk_hw_omap dss_ick_hw = {
-        .hw = {
-                .clk = &dss_ick,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_DSS1_SHIFT,
-        .clkdm_name     = "dss_clkdm",
-};
-
-DEFINE_STRUCT_CLK(dss_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk eac_fck;
-
-static struct clk_hw_omap eac_fck_hw = {
-        .hw = {
-                .clk = &eac_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP2420_EN_EAC_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(eac_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk eac_ick;
-
-static struct clk_hw_omap eac_ick_hw = {
-        .hw = {
-                .clk = &eac_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP2420_EN_EAC_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(eac_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk emul_ck;
-
-static struct clk_hw_omap emul_ck_hw = {
-        .hw = {
-                .clk = &emul_ck,
-        },
-        .enable_reg     = OMAP2420_PRCM_CLKEMUL_CTRL,
-        .enable_bit     = OMAP24XX_EMULATION_EN_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(emul_ck, dss_54m_fck_parent_names, aes_ick_ops);
-
-DEFINE_CLK_FIXED_FACTOR(func_12m_ck, "func_48m_ck", &func_48m_ck, 0x0, 1, 4);
-
-static struct clk fac_fck;
-
-static const char *fac_fck_parent_names[] = {
-        "func_12m_ck",
-};
-
-static struct clk_hw_omap fac_fck_hw = {
-        .hw = {
-                .clk = &fac_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_FAC_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(fac_fck, fac_fck_parent_names, aes_ick_ops);
-
-static struct clk fac_ick;
-
-static struct clk_hw_omap fac_ick_hw = {
-        .hw = {
-                .clk = &fac_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_FAC_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(fac_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clksel gfx_fck_clksel[] = {
-        { .parent = &core_l3_ck, .rates = gfx_l3_rates },
-        { .parent = NULL },
-};
-
-static const char *gfx_2d_fck_parent_names[] = {
-        "core_l3_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(gfx_2d_fck, "gfx_clkdm", gfx_fck_clksel,
-                         OMAP_CM_REGADDR(GFX_MOD, CM_CLKSEL),
-                         OMAP_CLKSEL_GFX_MASK,
-                         OMAP_CM_REGADDR(GFX_MOD, CM_FCLKEN),
-                         OMAP24XX_EN_2D_SHIFT, &clkhwops_wait,
-                         gfx_2d_fck_parent_names, dsp_fck_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gfx_3d_fck, "gfx_clkdm", gfx_fck_clksel,
-                         OMAP_CM_REGADDR(GFX_MOD, CM_CLKSEL),
-                         OMAP_CLKSEL_GFX_MASK,
-                         OMAP_CM_REGADDR(GFX_MOD, CM_FCLKEN),
-                         OMAP24XX_EN_3D_SHIFT, &clkhwops_wait,
-                         gfx_2d_fck_parent_names, dsp_fck_ops);
-
-static struct clk gfx_ick;
-
-static const char *gfx_ick_parent_names[] = {
-        "core_l3_ck",
-};
-
-static struct clk_hw_omap gfx_ick_hw = {
-        .hw = {
-                .clk = &gfx_ick,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP_EN_GFX_SHIFT,
-        .clkdm_name     = "gfx_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gfx_ick, gfx_ick_parent_names, aes_ick_ops);
-
-static struct clk gpios_fck;
-
-static const char *gpios_fck_parent_names[] = {
-        "func_32k_ck",
-};
-
-static struct clk_hw_omap gpios_fck_hw = {
-        .hw = {
-                .clk = &gpios_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
-        .enable_bit     = OMAP24XX_EN_GPIOS_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpios_fck, gpios_fck_parent_names, aes_ick_ops);
-
-static struct clk gpios_ick;
-
-static const char *gpios_ick_parent_names[] = {
-        "sys_ck",
-};
-
-static struct clk_hw_omap gpios_ick_hw = {
-        .hw = {
-                .clk = &gpios_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_GPIOS_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpios_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static struct clk gpmc_fck;
-
-static struct clk_hw_omap gpmc_fck_hw = {
-        .hw = {
-                .clk = &gpmc_fck,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),
-        .enable_bit     = OMAP24XX_AUTO_GPMC_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpmc_fck, gfx_ick_parent_names, core_ck_ops);
-
-static const struct clksel_rate gpt_alt_rates[] = {
-        { .div = 1, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel omap24xx_gpt_clksel[] = {
-        { .parent = &func_32k_ck, .rates = gpt_32k_rates },
-        { .parent = &sys_ck, .rates = gpt_sys_rates },
-        { .parent = &alt_ck, .rates = gpt_alt_rates },
-        { .parent = NULL },
-};
-
-static const char *gpt10_fck_parent_names[] = {
-        "func_32k_ck", "sys_ck", "alt_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt10_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT10_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT10_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt10_ick;
-
-static struct clk_hw_omap gpt10_ick_hw = {
-        .hw = {
-                .clk = &gpt10_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT10_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt10_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt11_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT11_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT11_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt11_ick;
-
-static struct clk_hw_omap gpt11_ick_hw = {
-        .hw = {
-                .clk = &gpt11_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT11_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt11_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt12_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT12_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT12_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt12_ick;
-
-static struct clk_hw_omap gpt12_ick_hw = {
-        .hw = {
-                .clk = &gpt12_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT12_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt12_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clk_ops gpt1_fck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_dflt_clk_enable,
-        .disable        = &omap2_dflt_clk_disable,
-        .is_enabled     = &omap2_dflt_clk_is_enabled,
-        .recalc_rate    = &omap2_clksel_recalc,
-        .set_rate       = &omap2_clksel_set_rate,
-        .round_rate     = &omap2_clksel_round_rate,
-        .get_parent     = &omap2_clksel_find_parent_index,
-        .set_parent     = &omap2_clksel_set_parent,
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt1_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(WKUP_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_GPT1_MASK,
-                         OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
-                         OMAP24XX_EN_GPT1_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, gpt1_fck_ops);
-
-static struct clk gpt1_ick;
-
-static struct clk_hw_omap gpt1_ick_hw = {
-        .hw = {
-                .clk = &gpt1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_GPT1_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt1_ick, gpios_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt2_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT2_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT2_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt2_ick;
-
-static struct clk_hw_omap gpt2_ick_hw = {
-        .hw = {
-                .clk = &gpt2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt2_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt3_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT3_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT3_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt3_ick;
-
-static struct clk_hw_omap gpt3_ick_hw = {
-        .hw = {
-                .clk = &gpt3_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt3_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt4_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT4_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT4_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt4_ick;
-
-static struct clk_hw_omap gpt4_ick_hw = {
-        .hw = {
-                .clk = &gpt4_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT4_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt4_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt5_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT5_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT5_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt5_ick;
-
-static struct clk_hw_omap gpt5_ick_hw = {
-        .hw = {
-                .clk = &gpt5_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT5_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt5_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt6_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT6_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT6_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt6_ick;
-
-static struct clk_hw_omap gpt6_ick_hw = {
-        .hw = {
-                .clk = &gpt6_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT6_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt6_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt7_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT7_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT7_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt7_ick;
-
-static struct clk_hw_omap gpt7_ick_hw = {
-        .hw = {
-                .clk = &gpt7_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT7_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt7_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt8_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT8_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT8_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt8_ick;
-
-static struct clk_hw_omap gpt8_ick_hw = {
-        .hw = {
-                .clk = &gpt8_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT8_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt8_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt9_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT9_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT9_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt9_ick;
-
-static struct clk_hw_omap gpt9_ick_hw = {
-        .hw = {
-                .clk = &gpt9_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT9_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt9_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk hdq_fck;
-
-static struct clk_hw_omap hdq_fck_hw = {
-        .hw = {
-                .clk = &hdq_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_HDQ_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(hdq_fck, fac_fck_parent_names, aes_ick_ops);
-
-static struct clk hdq_ick;
-
-static struct clk_hw_omap hdq_ick_hw = {
-        .hw = {
-                .clk = &hdq_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_HDQ_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(hdq_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk i2c1_fck;
-
-static struct clk_hw_omap i2c1_fck_hw = {
-        .hw = {
-                .clk = &i2c1_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP2420_EN_I2C1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(i2c1_fck, fac_fck_parent_names, aes_ick_ops);
-
-static struct clk i2c1_ick;
-
-static struct clk_hw_omap i2c1_ick_hw = {
-        .hw = {
-                .clk = &i2c1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP2420_EN_I2C1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(i2c1_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk i2c2_fck;
-
-static struct clk_hw_omap i2c2_fck_hw = {
-        .hw = {
-                .clk = &i2c2_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP2420_EN_I2C2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(i2c2_fck, fac_fck_parent_names, aes_ick_ops);
-
-static struct clk i2c2_ick;
-
-static struct clk_hw_omap i2c2_ick_hw = {
-        .hw = {
-                .clk = &i2c2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP2420_EN_I2C2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(i2c2_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(iva1_ifck, "iva1_clkdm", dsp_fck_clksel,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_CLKSEL),
-                         OMAP2420_CLKSEL_IVA_MASK,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN),
-                         OMAP2420_EN_IVA_COP_SHIFT, &clkhwops_wait,
-                         dsp_fck_parent_names, dsp_fck_ops);
-
-static struct clk iva1_mpu_int_ifck;
-
-static const char *iva1_mpu_int_ifck_parent_names[] = {
-        "iva1_ifck",
-};
-
-static const struct clk_ops iva1_mpu_int_ifck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_dflt_clk_enable,
-        .disable        = &omap2_dflt_clk_disable,
-        .is_enabled     = &omap2_dflt_clk_is_enabled,
-        .recalc_rate    = &omap_fixed_divisor_recalc,
-};
-
-static struct clk_hw_omap iva1_mpu_int_ifck_hw = {
-        .hw = {
-                .clk = &iva1_mpu_int_ifck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN),
-        .enable_bit     = OMAP2420_EN_IVA_MPU_SHIFT,
-        .clkdm_name     = "iva1_clkdm",
-        .fixed_div      = 2,
-};
-
-DEFINE_STRUCT_CLK(iva1_mpu_int_ifck, iva1_mpu_int_ifck_parent_names,
-                  iva1_mpu_int_ifck_ops);
-
-static struct clk mailboxes_ick;
-
-static struct clk_hw_omap mailboxes_ick_hw = {
-        .hw = {
-                .clk = &mailboxes_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MAILBOXES_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mailboxes_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clksel_rate common_mcbsp_96m_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate common_mcbsp_mcbsp_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel mcbsp_fck_clksel[] = {
-        { .parent = &func_96m_ck, .rates = common_mcbsp_96m_rates },
-        { .parent = &mcbsp_clks, .rates = common_mcbsp_mcbsp_rates },
-        { .parent = NULL },
-};
-
-static const char *mcbsp1_fck_parent_names[] = {
-        "func_96m_ck", "mcbsp_clks",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(mcbsp1_fck, "core_l4_clkdm", mcbsp_fck_clksel,
-                         OMAP242X_CTRL_REGADDR(OMAP2_CONTROL_DEVCONF0),
-                         OMAP2_MCBSP1_CLKS_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_MCBSP1_SHIFT, &clkhwops_wait,
-                         mcbsp1_fck_parent_names, dss1_fck_ops);
-
-static struct clk mcbsp1_ick;
-
-static struct clk_hw_omap mcbsp1_ick_hw = {
-        .hw = {
-                .clk = &mcbsp1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCBSP1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcbsp1_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(mcbsp2_fck, "core_l4_clkdm", mcbsp_fck_clksel,
-                         OMAP242X_CTRL_REGADDR(OMAP2_CONTROL_DEVCONF0),
-                         OMAP2_MCBSP2_CLKS_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_MCBSP2_SHIFT, &clkhwops_wait,
-                         mcbsp1_fck_parent_names, dss1_fck_ops);
-
-static struct clk mcbsp2_ick;
-
-static struct clk_hw_omap mcbsp2_ick_hw = {
-        .hw = {
-                .clk = &mcbsp2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCBSP2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcbsp2_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk mcspi1_fck;
-
-static const char *mcspi1_fck_parent_names[] = {
-        "func_48m_ck",
-};
-
-static struct clk_hw_omap mcspi1_fck_hw = {
-        .hw = {
-                .clk = &mcspi1_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCSPI1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi1_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk mcspi1_ick;
-
-static struct clk_hw_omap mcspi1_ick_hw = {
-        .hw = {
-                .clk = &mcspi1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCSPI1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi1_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk mcspi2_fck;
-
-static struct clk_hw_omap mcspi2_fck_hw = {
-        .hw = {
-                .clk = &mcspi2_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCSPI2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi2_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk mcspi2_ick;
-
-static struct clk_hw_omap mcspi2_ick_hw = {
-        .hw = {
-                .clk = &mcspi2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCSPI2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi2_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk mmc_fck;
-
-static struct clk_hw_omap mmc_fck_hw = {
-        .hw = {
-                .clk = &mmc_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP2420_EN_MMC_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mmc_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk mmc_ick;
-
-static struct clk_hw_omap mmc_ick_hw = {
-        .hw = {
-                .clk = &mmc_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP2420_EN_MMC_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mmc_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_DIVIDER(mpu_ck, "core_ck", &core_ck, 0x0,
-                   OMAP_CM_REGADDR(MPU_MOD, CM_CLKSEL),
-                   OMAP24XX_CLKSEL_MPU_SHIFT, OMAP24XX_CLKSEL_MPU_WIDTH,
-                   CLK_DIVIDER_ONE_BASED, NULL);
-
-static struct clk mpu_wdt_fck;
-
-static struct clk_hw_omap mpu_wdt_fck_hw = {
-        .hw = {
-                .clk = &mpu_wdt_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
-        .enable_bit     = OMAP24XX_EN_MPU_WDT_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mpu_wdt_fck, gpios_fck_parent_names, aes_ick_ops);
-
-static struct clk mpu_wdt_ick;
-
-static struct clk_hw_omap mpu_wdt_ick_hw = {
-        .hw = {
-                .clk = &mpu_wdt_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_MPU_WDT_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mpu_wdt_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static struct clk mspro_fck;
-
-static struct clk_hw_omap mspro_fck_hw = {
-        .hw = {
-                .clk = &mspro_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_MSPRO_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mspro_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk mspro_ick;
-
-static struct clk_hw_omap mspro_ick_hw = {
-        .hw = {
-                .clk = &mspro_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MSPRO_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mspro_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk omapctrl_ick;
-
-static struct clk_hw_omap omapctrl_ick_hw = {
-        .hw = {
-                .clk = &omapctrl_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_OMAPCTRL_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(omapctrl_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static struct clk pka_ick;
-
-static struct clk_hw_omap pka_ick_hw = {
-        .hw = {
-                .clk = &pka_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_PKA_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(pka_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk rng_ick;
-
-static struct clk_hw_omap rng_ick_hw = {
-        .hw = {
-                .clk = &rng_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_RNG_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(rng_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk sdma_fck;
-
-DEFINE_STRUCT_CLK_HW_OMAP(sdma_fck, "core_l3_clkdm");
-DEFINE_STRUCT_CLK(sdma_fck, gfx_ick_parent_names, core_ck_ops);
-
-static struct clk sdma_ick;
-
-static struct clk_hw_omap sdma_ick_hw = {
-        .hw = {
-                .clk = &sdma_ick,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),
-        .enable_bit     = OMAP24XX_AUTO_SDMA_SHIFT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(sdma_ick, gfx_ick_parent_names, core_ck_ops);
-
-static struct clk sdrc_ick;
-
-static struct clk_hw_omap sdrc_ick_hw = {
-        .hw = {
-                .clk = &sdrc_ick,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),
-        .enable_bit     = OMAP24XX_AUTO_SDRC_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(sdrc_ick, gfx_ick_parent_names, core_ck_ops);
-
-static struct clk sha_ick;
-
-static struct clk_hw_omap sha_ick_hw = {
-        .hw = {
-                .clk = &sha_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_SHA_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(sha_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk ssi_l4_ick;
-
-static struct clk_hw_omap ssi_l4_ick_hw = {
-        .hw = {
-                .clk = &ssi_l4_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP24XX_EN_SSI_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(ssi_l4_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clksel_rate ssi_ssr_sst_fck_core_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 2, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 3, .val = 3, .flags = RATE_IN_24XX },
-        { .div = 4, .val = 4, .flags = RATE_IN_24XX },
-        { .div = 6, .val = 6, .flags = RATE_IN_242X },
-        { .div = 8, .val = 8, .flags = RATE_IN_242X },
-        { .div = 0 }
-};
-
-static const struct clksel ssi_ssr_sst_fck_clksel[] = {
-        { .parent = &core_ck, .rates = ssi_ssr_sst_fck_core_rates },
-        { .parent = NULL },
-};
-
-static const char *ssi_ssr_sst_fck_parent_names[] = {
-        "core_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(ssi_ssr_sst_fck, "core_l3_clkdm",
-                         ssi_ssr_sst_fck_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_SSI_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-                         OMAP24XX_EN_SSI_SHIFT, &clkhwops_wait,
-                         ssi_ssr_sst_fck_parent_names, dsp_fck_ops);
-
-static struct clk sync_32k_ick;
-
-static struct clk_hw_omap sync_32k_ick_hw = {
-        .hw = {
-                .clk = &sync_32k_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_32KSYNC_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(sync_32k_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static const struct clksel_rate common_clkout_src_core_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate common_clkout_src_sys_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate common_clkout_src_96m_rates[] = {
-        { .div = 1, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate common_clkout_src_54m_rates[] = {
-        { .div = 1, .val = 3, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel common_clkout_src_clksel[] = {
-        { .parent = &core_ck, .rates = common_clkout_src_core_rates },
-        { .parent = &sys_ck, .rates = common_clkout_src_sys_rates },
-        { .parent = &func_96m_ck, .rates = common_clkout_src_96m_rates },
-        { .parent = &func_54m_ck, .rates = common_clkout_src_54m_rates },
-        { .parent = NULL },
-};
-
-static const char *sys_clkout_src_parent_names[] = {
-        "core_ck", "sys_ck", "func_96m_ck", "func_54m_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(sys_clkout_src, "wkup_clkdm", common_clkout_src_clksel,
-                         OMAP2420_PRCM_CLKOUT_CTRL, OMAP24XX_CLKOUT_SOURCE_MASK,
-                         OMAP2420_PRCM_CLKOUT_CTRL, OMAP24XX_CLKOUT_EN_SHIFT,
-                         NULL, sys_clkout_src_parent_names, gpt1_fck_ops);
-
-DEFINE_CLK_DIVIDER(sys_clkout, "sys_clkout_src", &sys_clkout_src, 0x0,
-                   OMAP2420_PRCM_CLKOUT_CTRL, OMAP24XX_CLKOUT_DIV_SHIFT,
-                   OMAP24XX_CLKOUT_DIV_WIDTH, CLK_DIVIDER_POWER_OF_TWO, NULL);
-
-DEFINE_CLK_OMAP_MUX_GATE(sys_clkout2_src, "wkup_clkdm",
-                         common_clkout_src_clksel, OMAP2420_PRCM_CLKOUT_CTRL,
-                         OMAP2420_CLKOUT2_SOURCE_MASK,
-                         OMAP2420_PRCM_CLKOUT_CTRL, OMAP2420_CLKOUT2_EN_SHIFT,
-                         NULL, sys_clkout_src_parent_names, gpt1_fck_ops);
-
-DEFINE_CLK_DIVIDER(sys_clkout2, "sys_clkout2_src", &sys_clkout2_src, 0x0,
-                   OMAP2420_PRCM_CLKOUT_CTRL, OMAP2420_CLKOUT2_DIV_SHIFT,
-                   OMAP2420_CLKOUT2_DIV_WIDTH, CLK_DIVIDER_POWER_OF_TWO, NULL);
-
-static struct clk uart1_fck;
-
-static struct clk_hw_omap uart1_fck_hw = {
-        .hw = {
-                .clk = &uart1_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_UART1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart1_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk uart1_ick;
-
-static struct clk_hw_omap uart1_ick_hw = {
-        .hw = {
-                .clk = &uart1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_UART1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart1_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk uart2_fck;
-
-static struct clk_hw_omap uart2_fck_hw = {
-        .hw = {
-                .clk = &uart2_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_UART2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart2_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk uart2_ick;
-
-static struct clk_hw_omap uart2_ick_hw = {
-        .hw = {
-                .clk = &uart2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_UART2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart2_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk uart3_fck;
-
-static struct clk_hw_omap uart3_fck_hw = {
-        .hw = {
-                .clk = &uart3_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP24XX_EN_UART3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart3_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk uart3_ick;
-
-static struct clk_hw_omap uart3_ick_hw = {
-        .hw = {
-                .clk = &uart3_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP24XX_EN_UART3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart3_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk usb_fck;
-
-static struct clk_hw_omap usb_fck_hw = {
-        .hw = {
-                .clk = &usb_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP24XX_EN_USB_SHIFT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(usb_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static const struct clksel_rate usb_l4_ick_core_l3_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 2, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 4, .val = 4, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel usb_l4_ick_clksel[] = {
-        { .parent = &core_l3_ck, .rates = usb_l4_ick_core_l3_rates },
-        { .parent = NULL },
-};
-
-static const char *usb_l4_ick_parent_names[] = {
-        "core_l3_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(usb_l4_ick, "core_l4_clkdm", usb_l4_ick_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_USB_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-                         OMAP24XX_EN_USB_SHIFT, &clkhwops_iclk_wait,
-                         usb_l4_ick_parent_names, dsp_fck_ops);
-
-static struct clk virt_prcm_set;
-
-static const char *virt_prcm_set_parent_names[] = {
-        "mpu_ck",
-};
-
-static const struct clk_ops virt_prcm_set_ops = {
-        .recalc_rate    = &omap2_table_mpu_recalc,
-        .set_rate       = &omap2_select_table_rate,
-        .round_rate     = &omap2_round_to_table_rate,
-};
-
-DEFINE_STRUCT_CLK_HW_OMAP(virt_prcm_set, NULL);
-DEFINE_STRUCT_CLK(virt_prcm_set, virt_prcm_set_parent_names, virt_prcm_set_ops);
-
-static const struct clksel_rate vlynq_fck_96m_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_242X },
-        { .div = 0 }
-};
-
-static const struct clksel_rate vlynq_fck_core_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_242X },
-        { .div = 2, .val = 2, .flags = RATE_IN_242X },
-        { .div = 3, .val = 3, .flags = RATE_IN_242X },
-        { .div = 4, .val = 4, .flags = RATE_IN_242X },
-        { .div = 6, .val = 6, .flags = RATE_IN_242X },
-        { .div = 8, .val = 8, .flags = RATE_IN_242X },
-        { .div = 9, .val = 9, .flags = RATE_IN_242X },
-        { .div = 12, .val = 12, .flags = RATE_IN_242X },
-        { .div = 16, .val = 16, .flags = RATE_IN_242X },
-        { .div = 18, .val = 18, .flags = RATE_IN_242X },
-        { .div = 0 }
-};
-
-static const struct clksel vlynq_fck_clksel[] = {
-        { .parent = &func_96m_ck, .rates = vlynq_fck_96m_rates },
-        { .parent = &core_ck, .rates = vlynq_fck_core_rates },
-        { .parent = NULL },
-};
-
-static const char *vlynq_fck_parent_names[] = {
-        "func_96m_ck", "core_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(vlynq_fck, "core_l3_clkdm", vlynq_fck_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                         OMAP2420_CLKSEL_VLYNQ_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP2420_EN_VLYNQ_SHIFT, &clkhwops_wait,
-                         vlynq_fck_parent_names, dss1_fck_ops);
-
-static struct clk vlynq_ick;
-
-static struct clk_hw_omap vlynq_ick_hw = {
-        .hw = {
-                .clk = &vlynq_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP2420_EN_VLYNQ_SHIFT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(vlynq_ick, gfx_ick_parent_names, aes_ick_ops);
-
-static struct clk wdt1_ick;
-
-static struct clk_hw_omap wdt1_ick_hw = {
-        .hw = {
-                .clk = &wdt1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_WDT1_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(wdt1_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static struct clk wdt3_fck;
-
-static struct clk_hw_omap wdt3_fck_hw = {
-        .hw = {
-                .clk = &wdt3_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP2420_EN_WDT3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(wdt3_fck, gpios_fck_parent_names, aes_ick_ops);
-
-static struct clk wdt3_ick;
-
-static struct clk_hw_omap wdt3_ick_hw = {
-        .hw = {
-                .clk = &wdt3_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP2420_EN_WDT3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(wdt3_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk wdt4_fck;
-
-static struct clk_hw_omap wdt4_fck_hw = {
-        .hw = {
-                .clk = &wdt4_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_WDT4_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(wdt4_fck, gpios_fck_parent_names, aes_ick_ops);
-
-static struct clk wdt4_ick;
-
-static struct clk_hw_omap wdt4_ick_hw = {
-        .hw = {
-                .clk = &wdt4_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_WDT4_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(wdt4_ick, aes_ick_parent_names, aes_ick_ops);
-
-/*
- * clkdev integration
- */
-
-static struct omap_clk omap2420_clks[] = {
-        /* external root sources */
-        CLK(NULL,       "func_32k_ck",  &func_32k_ck),
-        CLK(NULL,       "secure_32k_ck", &secure_32k_ck),
-        CLK(NULL,       "osc_ck",       &osc_ck),
-        CLK(NULL,       "sys_ck",       &sys_ck),
-        CLK(NULL,       "alt_ck",       &alt_ck),
-        CLK(NULL,       "mcbsp_clks",   &mcbsp_clks),
-        /* internal analog sources */
-        CLK(NULL,       "dpll_ck",      &dpll_ck),
-        CLK(NULL,       "apll96_ck",    &apll96_ck),
-        CLK(NULL,       "apll54_ck",    &apll54_ck),
-        /* internal prcm root sources */
-        CLK(NULL,       "func_54m_ck",  &func_54m_ck),
-        CLK(NULL,       "core_ck",      &core_ck),
-        CLK(NULL,       "func_96m_ck",  &func_96m_ck),
-        CLK(NULL,       "func_48m_ck",  &func_48m_ck),
-        CLK(NULL,       "func_12m_ck",  &func_12m_ck),
-        CLK(NULL,       "sys_clkout_src", &sys_clkout_src),
-        CLK(NULL,       "sys_clkout",   &sys_clkout),
-        CLK(NULL,       "sys_clkout2_src", &sys_clkout2_src),
-        CLK(NULL,       "sys_clkout2",  &sys_clkout2),
-        CLK(NULL,       "emul_ck",      &emul_ck),
-        /* mpu domain clocks */
-        CLK(NULL,       "mpu_ck",       &mpu_ck),
-        /* dsp domain clocks */
-        CLK(NULL,       "dsp_fck",      &dsp_fck),
-        CLK(NULL,       "dsp_ick",      &dsp_ick),
-        CLK(NULL,       "iva1_ifck",    &iva1_ifck),
-        CLK(NULL,       "iva1_mpu_int_ifck", &iva1_mpu_int_ifck),
-        /* GFX domain clocks */
-        CLK(NULL,       "gfx_3d_fck",   &gfx_3d_fck),
-        CLK(NULL,       "gfx_2d_fck",   &gfx_2d_fck),
-        CLK(NULL,       "gfx_ick",      &gfx_ick),
-        /* DSS domain clocks */
-        CLK("omapdss_dss",      "ick",          &dss_ick),
-        CLK(NULL,       "dss_ick",              &dss_ick),
-        CLK(NULL,       "dss1_fck",             &dss1_fck),
-        CLK(NULL,       "dss2_fck",     &dss2_fck),
-        CLK(NULL,       "dss_54m_fck",  &dss_54m_fck),
-        /* L3 domain clocks */
-        CLK(NULL,       "core_l3_ck",   &core_l3_ck),
-        CLK(NULL,       "ssi_fck",      &ssi_ssr_sst_fck),
-        CLK(NULL,       "usb_l4_ick",   &usb_l4_ick),
-        /* L4 domain clocks */
-        CLK(NULL,       "l4_ck",        &l4_ck),
-        CLK(NULL,       "ssi_l4_ick",   &ssi_l4_ick),
-        /* virtual meta-group clock */
-        CLK(NULL,       "virt_prcm_set", &virt_prcm_set),
-        /* general l4 interface ck, multi-parent functional clk */
-        CLK(NULL,       "gpt1_ick",     &gpt1_ick),
-        CLK(NULL,       "gpt1_fck",     &gpt1_fck),
-        CLK(NULL,       "gpt2_ick",     &gpt2_ick),
-        CLK(NULL,       "gpt2_fck",     &gpt2_fck),
-        CLK(NULL,       "gpt3_ick",     &gpt3_ick),
-        CLK(NULL,       "gpt3_fck",     &gpt3_fck),
-        CLK(NULL,       "gpt4_ick",     &gpt4_ick),
-        CLK(NULL,       "gpt4_fck",     &gpt4_fck),
-        CLK(NULL,       "gpt5_ick",     &gpt5_ick),
-        CLK(NULL,       "gpt5_fck",     &gpt5_fck),
-        CLK(NULL,       "gpt6_ick",     &gpt6_ick),
-        CLK(NULL,       "gpt6_fck",     &gpt6_fck),
-        CLK(NULL,       "gpt7_ick",     &gpt7_ick),
-        CLK(NULL,       "gpt7_fck",     &gpt7_fck),
-        CLK(NULL,       "gpt8_ick",     &gpt8_ick),
-        CLK(NULL,       "gpt8_fck",     &gpt8_fck),
-        CLK(NULL,       "gpt9_ick",     &gpt9_ick),
-        CLK(NULL,       "gpt9_fck",     &gpt9_fck),
-        CLK(NULL,       "gpt10_ick",    &gpt10_ick),
-        CLK(NULL,       "gpt10_fck",    &gpt10_fck),
-        CLK(NULL,       "gpt11_ick",    &gpt11_ick),
-        CLK(NULL,       "gpt11_fck",    &gpt11_fck),
-        CLK(NULL,       "gpt12_ick",    &gpt12_ick),
-        CLK(NULL,       "gpt12_fck",    &gpt12_fck),
-        CLK("omap-mcbsp.1", "ick",      &mcbsp1_ick),
-        CLK(NULL,       "mcbsp1_ick",   &mcbsp1_ick),
-        CLK(NULL,       "mcbsp1_fck",   &mcbsp1_fck),
-        CLK("omap-mcbsp.2", "ick",      &mcbsp2_ick),
-        CLK(NULL,       "mcbsp2_ick",   &mcbsp2_ick),
-        CLK(NULL,       "mcbsp2_fck",   &mcbsp2_fck),
-        CLK("omap2_mcspi.1", "ick",     &mcspi1_ick),
-        CLK(NULL,       "mcspi1_ick",   &mcspi1_ick),
-        CLK(NULL,       "mcspi1_fck",   &mcspi1_fck),
-        CLK("omap2_mcspi.2", "ick",     &mcspi2_ick),
-        CLK(NULL,       "mcspi2_ick",   &mcspi2_ick),
-        CLK(NULL,       "mcspi2_fck",   &mcspi2_fck),
-        CLK(NULL,       "uart1_ick",    &uart1_ick),
-        CLK(NULL,       "uart1_fck",    &uart1_fck),
-        CLK(NULL,       "uart2_ick",    &uart2_ick),
-        CLK(NULL,       "uart2_fck",    &uart2_fck),
-        CLK(NULL,       "uart3_ick",    &uart3_ick),
-        CLK(NULL,       "uart3_fck",    &uart3_fck),
-        CLK(NULL,       "gpios_ick",    &gpios_ick),
-        CLK(NULL,       "gpios_fck",    &gpios_fck),
-        CLK("omap_wdt", "ick",          &mpu_wdt_ick),
-        CLK(NULL,       "mpu_wdt_ick",          &mpu_wdt_ick),
-        CLK(NULL,       "mpu_wdt_fck",  &mpu_wdt_fck),
-        CLK(NULL,       "sync_32k_ick", &sync_32k_ick),
-        CLK(NULL,       "wdt1_ick",     &wdt1_ick),
-        CLK(NULL,       "omapctrl_ick", &omapctrl_ick),
-        CLK("omap24xxcam", "fck",       &cam_fck),
-        CLK(NULL,       "cam_fck",      &cam_fck),
-        CLK("omap24xxcam", "ick",       &cam_ick),
-        CLK(NULL,       "cam_ick",      &cam_ick),
-        CLK(NULL,       "mailboxes_ick", &mailboxes_ick),
-        CLK(NULL,       "wdt4_ick",     &wdt4_ick),
-        CLK(NULL,       "wdt4_fck",     &wdt4_fck),
-        CLK(NULL,       "wdt3_ick",     &wdt3_ick),
-        CLK(NULL,       "wdt3_fck",     &wdt3_fck),
-        CLK(NULL,       "mspro_ick",    &mspro_ick),
-        CLK(NULL,       "mspro_fck",    &mspro_fck),
-        CLK("mmci-omap.0", "ick",       &mmc_ick),
-        CLK(NULL,       "mmc_ick",      &mmc_ick),
-        CLK("mmci-omap.0", "fck",       &mmc_fck),
-        CLK(NULL,       "mmc_fck",      &mmc_fck),
-        CLK(NULL,       "fac_ick",      &fac_ick),
-        CLK(NULL,       "fac_fck",      &fac_fck),
-        CLK(NULL,       "eac_ick",      &eac_ick),
-        CLK(NULL,       "eac_fck",      &eac_fck),
-        CLK("omap_hdq.0", "ick",        &hdq_ick),
-        CLK(NULL,       "hdq_ick",      &hdq_ick),
-        CLK("omap_hdq.0", "fck",        &hdq_fck),
-        CLK(NULL,       "hdq_fck",      &hdq_fck),
-        CLK("omap_i2c.1", "ick",        &i2c1_ick),
-        CLK(NULL,       "i2c1_ick",     &i2c1_ick),
-        CLK(NULL,       "i2c1_fck",     &i2c1_fck),
-        CLK("omap_i2c.2", "ick",        &i2c2_ick),
-        CLK(NULL,       "i2c2_ick",     &i2c2_ick),
-        CLK(NULL,       "i2c2_fck",     &i2c2_fck),
-        CLK(NULL,       "gpmc_fck",     &gpmc_fck),
-        CLK(NULL,       "sdma_fck",     &sdma_fck),
-        CLK(NULL,       "sdma_ick",     &sdma_ick),
-        CLK(NULL,       "sdrc_ick",     &sdrc_ick),
-        CLK(NULL,       "vlynq_ick",    &vlynq_ick),
-        CLK(NULL,       "vlynq_fck",    &vlynq_fck),
-        CLK(NULL,       "des_ick",      &des_ick),
-        CLK("omap-sham",        "ick",  &sha_ick),
-        CLK(NULL,       "sha_ick",      &sha_ick),
-        CLK("omap_rng", "ick",          &rng_ick),
-        CLK(NULL,       "rng_ick",              &rng_ick),
-        CLK("omap-aes", "ick",  &aes_ick),
-        CLK(NULL,       "aes_ick",      &aes_ick),
-        CLK(NULL,       "pka_ick",      &pka_ick),
-        CLK(NULL,       "usb_fck",      &usb_fck),
-        CLK("musb-hdrc",        "fck",  &osc_ck),
-        CLK(NULL,       "timer_32k_ck", &func_32k_ck),
-        CLK(NULL,       "timer_sys_ck", &sys_ck),
-        CLK(NULL,       "timer_ext_ck", &alt_ck),
-        CLK(NULL,       "cpufreq_ck",   &virt_prcm_set),
-};
-
-
-static const char *enable_init_clks[] = {
-        "apll96_ck",
-        "apll54_ck",
-        "sync_32k_ick",
-        "omapctrl_ick",
-        "gpmc_fck",
-        "sdrc_ick",
-};
-
-/*
- * init code
- */
-
-int __init omap2420_clk_init(void)
-{
-        prcm_clksrc_ctrl = OMAP2420_PRCM_CLKSRC_CTRL;
-        cpu_mask = RATE_IN_242X;
-        rate_table = omap2420_rate_table;
-
-        omap2xxx_clkt_dpllcore_init(&dpll_ck_hw.hw);
-
-        omap2xxx_clkt_vps_check_bootloader_rates();
-
-        omap_clocks_register(omap2420_clks, ARRAY_SIZE(omap2420_clks));
-
-        omap2xxx_clkt_vps_late_init();
-
-        omap2_clk_disable_autoidle_all();
-
-        omap2_clk_enable_init_clocks(enable_init_clks,
-                                     ARRAY_SIZE(enable_init_clks));
-
-        pr_info("Clocking rate (Crystal/DPLL/MPU): %ld.%01ld/%ld/%ld MHz\n",
-                (clk_get_rate(&sys_ck) / 1000000),
-                (clk_get_rate(&sys_ck) / 100000) % 10,
-                (clk_get_rate(&dpll_ck) / 1000000),
-                (clk_get_rate(&mpu_ck) / 1000000));
-
-        return 0;
-}
diff --git a/arch/arm/mach-omap2/cclock2430_data.c b/arch/arm/mach-omap2/cclock2430_data.c
deleted file mode 100644
index 5e4b037bb24c..000000000000
--- a/arch/arm/mach-omap2/cclock2430_data.c
+++ /dev/null
@@ -1,2048 +0,0 @@
-/*
- * OMAP2430 clock data
- *
- * Copyright (C) 2005-2009, 2012 Texas Instruments, Inc.
- * Copyright (C) 2004-2011 Nokia Corporation
- *
- * Contacts:
- * Richard Woodruff <r-woodruff2@ti.com>
- * Paul Walmsley
- *
- * 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/clk.h>
-#include <linux/clk-private.h>
-#include <linux/list.h>
-
-#include "soc.h"
-#include "iomap.h"
-#include "clock.h"
-#include "clock2xxx.h"
-#include "opp2xxx.h"
-#include "cm2xxx.h"
-#include "prm2xxx.h"
-#include "prm-regbits-24xx.h"
-#include "cm-regbits-24xx.h"
-#include "sdrc.h"
-#include "control.h"
-
-#define OMAP_CM_REGADDR                 OMAP2430_CM_REGADDR
-
-/*
- * 2430 clock tree.
- *
- * NOTE:In many cases here we are assigning a 'default' parent. In
- *      many cases the parent is selectable. The set parent calls will
- *      also switch sources.
- *
- *      Several sources are given initial rates which may be wrong, this will
- *      be fixed up in the init func.
- *
- *      Things are broadly separated below by clock domains. It is
- *      noteworthy that most peripherals have dependencies on multiple clock
- *      domains. Many get their interface clocks from the L4 domain, but get
- *      functional clocks from fixed sources or other core domain derived
- *      clocks.
- */
-
-DEFINE_CLK_FIXED_RATE(alt_ck, CLK_IS_ROOT, 54000000, 0x0);
-
-DEFINE_CLK_FIXED_RATE(func_32k_ck, CLK_IS_ROOT, 32768, 0x0);
-
-DEFINE_CLK_FIXED_RATE(mcbsp_clks, CLK_IS_ROOT, 0x0, 0x0);
-
-static struct clk osc_ck;
-
-static const struct clk_ops osc_ck_ops = {
-        .enable         = &omap2_enable_osc_ck,
-        .disable        = omap2_disable_osc_ck,
-        .recalc_rate    = &omap2_osc_clk_recalc,
-};
-
-static struct clk_hw_omap osc_ck_hw = {
-        .hw = {
-                .clk = &osc_ck,
-        },
-};
-
-static struct clk osc_ck = {
-        .name   = "osc_ck",
-        .ops    = &osc_ck_ops,
-        .hw     = &osc_ck_hw.hw,
-        .flags  = CLK_IS_ROOT,
-};
-
-DEFINE_CLK_FIXED_RATE(secure_32k_ck, CLK_IS_ROOT, 32768, 0x0);
-
-static struct clk sys_ck;
-
-static const char *sys_ck_parent_names[] = {
-        "osc_ck",
-};
-
-static const struct clk_ops sys_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .recalc_rate    = &omap2xxx_sys_clk_recalc,
-};
-
-DEFINE_STRUCT_CLK_HW_OMAP(sys_ck, "wkup_clkdm");
-DEFINE_STRUCT_CLK(sys_ck, sys_ck_parent_names, sys_ck_ops);
-
-static struct dpll_data dpll_dd = {
-        .mult_div1_reg  = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),
-        .mult_mask      = OMAP24XX_DPLL_MULT_MASK,
-        .div1_mask      = OMAP24XX_DPLL_DIV_MASK,
-        .clk_bypass     = &sys_ck,
-        .clk_ref        = &sys_ck,
-        .control_reg    = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),
-        .enable_mask    = OMAP24XX_EN_DPLL_MASK,
-        .max_multiplier = 1023,
-        .min_divider    = 1,
-        .max_divider    = 16,
-};
-
-static struct clk dpll_ck;
-
-static const char *dpll_ck_parent_names[] = {
-        "sys_ck",
-};
-
-static const struct clk_ops dpll_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .get_parent     = &omap2_init_dpll_parent,
-        .recalc_rate    = &omap2_dpllcore_recalc,
-        .round_rate     = &omap2_dpll_round_rate,
-        .set_rate       = &omap2_reprogram_dpllcore,
-};
-
-static struct clk_hw_omap dpll_ck_hw = {
-        .hw = {
-                .clk = &dpll_ck,
-        },
-        .ops            = &clkhwops_omap2xxx_dpll,
-        .dpll_data      = &dpll_dd,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(dpll_ck, dpll_ck_parent_names, dpll_ck_ops);
-
-static struct clk core_ck;
-
-static const char *core_ck_parent_names[] = {
-        "dpll_ck",
-};
-
-static const struct clk_ops core_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-};
-
-DEFINE_STRUCT_CLK_HW_OMAP(core_ck, "wkup_clkdm");
-DEFINE_STRUCT_CLK(core_ck, core_ck_parent_names, core_ck_ops);
-
-DEFINE_CLK_DIVIDER(core_l3_ck, "core_ck", &core_ck, 0x0,
-                   OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                   OMAP24XX_CLKSEL_L3_SHIFT, OMAP24XX_CLKSEL_L3_WIDTH,
-                   CLK_DIVIDER_ONE_BASED, NULL);
-
-DEFINE_CLK_DIVIDER(l4_ck, "core_l3_ck", &core_l3_ck, 0x0,
-                   OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                   OMAP24XX_CLKSEL_L4_SHIFT, OMAP24XX_CLKSEL_L4_WIDTH,
-                   CLK_DIVIDER_ONE_BASED, NULL);
-
-static struct clk aes_ick;
-
-static const char *aes_ick_parent_names[] = {
-        "l4_ck",
-};
-
-static const struct clk_ops aes_ick_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_dflt_clk_enable,
-        .disable        = &omap2_dflt_clk_disable,
-        .is_enabled     = &omap2_dflt_clk_is_enabled,
-};
-
-static struct clk_hw_omap aes_ick_hw = {
-        .hw = {
-                .clk = &aes_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_AES_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(aes_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk apll54_ck;
-
-static const struct clk_ops apll54_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_clk_apll54_enable,
-        .disable        = &omap2_clk_apll54_disable,
-        .recalc_rate    = &omap2_clk_apll54_recalc,
-};
-
-static struct clk_hw_omap apll54_ck_hw = {
-        .hw = {
-                .clk = &apll54_ck,
-        },
-        .ops            = &clkhwops_apll54,
-        .enable_reg     = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),
-        .enable_bit     = OMAP24XX_EN_54M_PLL_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(apll54_ck, dpll_ck_parent_names, apll54_ck_ops);
-
-static struct clk apll96_ck;
-
-static const struct clk_ops apll96_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_clk_apll96_enable,
-        .disable        = &omap2_clk_apll96_disable,
-        .recalc_rate    = &omap2_clk_apll96_recalc,
-};
-
-static struct clk_hw_omap apll96_ck_hw = {
-        .hw = {
-                .clk = &apll96_ck,
-        },
-        .ops            = &clkhwops_apll96,
-        .enable_reg     = OMAP_CM_REGADDR(PLL_MOD, CM_CLKEN),
-        .enable_bit     = OMAP24XX_EN_96M_PLL_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(apll96_ck, dpll_ck_parent_names, apll96_ck_ops);
-
-static const char *func_96m_ck_parent_names[] = {
-        "apll96_ck", "alt_ck",
-};
-
-DEFINE_CLK_MUX(func_96m_ck, func_96m_ck_parent_names, NULL, 0x0,
-               OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1), OMAP2430_96M_SOURCE_SHIFT,
-               OMAP2430_96M_SOURCE_WIDTH, 0x0, NULL);
-
-static struct clk cam_fck;
-
-static const char *cam_fck_parent_names[] = {
-        "func_96m_ck",
-};
-
-static struct clk_hw_omap cam_fck_hw = {
-        .hw = {
-                .clk = &cam_fck,
-        },
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_CAM_SHIFT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(cam_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk cam_ick;
-
-static struct clk_hw_omap cam_ick_hw = {
-        .hw = {
-                .clk = &cam_ick,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_CAM_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(cam_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk des_ick;
-
-static struct clk_hw_omap des_ick_hw = {
-        .hw = {
-                .clk = &des_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_DES_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(des_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clksel_rate dsp_fck_core_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 2, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 3, .val = 3, .flags = RATE_IN_24XX },
-        { .div = 4, .val = 4, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel dsp_fck_clksel[] = {
-        { .parent = &core_ck, .rates = dsp_fck_core_rates },
-        { .parent = NULL },
-};
-
-static const char *dsp_fck_parent_names[] = {
-        "core_ck",
-};
-
-static struct clk dsp_fck;
-
-static const struct clk_ops dsp_fck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_dflt_clk_enable,
-        .disable        = &omap2_dflt_clk_disable,
-        .is_enabled     = &omap2_dflt_clk_is_enabled,
-        .recalc_rate    = &omap2_clksel_recalc,
-        .set_rate       = &omap2_clksel_set_rate,
-        .round_rate     = &omap2_clksel_round_rate,
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(dsp_fck, "dsp_clkdm", dsp_fck_clksel,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_CLKSEL),
-                         OMAP24XX_CLKSEL_DSP_MASK,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN),
-                         OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT, &clkhwops_wait,
-                         dsp_fck_parent_names, dsp_fck_ops);
-
-static const struct clksel_rate dss1_fck_sys_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate dss1_fck_core_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 2, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 3, .val = 3, .flags = RATE_IN_24XX },
-        { .div = 4, .val = 4, .flags = RATE_IN_24XX },
-        { .div = 5, .val = 5, .flags = RATE_IN_24XX },
-        { .div = 6, .val = 6, .flags = RATE_IN_24XX },
-        { .div = 8, .val = 8, .flags = RATE_IN_24XX },
-        { .div = 9, .val = 9, .flags = RATE_IN_24XX },
-        { .div = 12, .val = 12, .flags = RATE_IN_24XX },
-        { .div = 16, .val = 16, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel dss1_fck_clksel[] = {
-        { .parent = &sys_ck, .rates = dss1_fck_sys_rates },
-        { .parent = &core_ck, .rates = dss1_fck_core_rates },
-        { .parent = NULL },
-};
-
-static const char *dss1_fck_parent_names[] = {
-        "sys_ck", "core_ck",
-};
-
-static const struct clk_ops dss1_fck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_dflt_clk_enable,
-        .disable        = &omap2_dflt_clk_disable,
-        .is_enabled     = &omap2_dflt_clk_is_enabled,
-        .recalc_rate    = &omap2_clksel_recalc,
-        .get_parent     = &omap2_clksel_find_parent_index,
-        .set_parent     = &omap2_clksel_set_parent,
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(dss1_fck, "dss_clkdm", dss1_fck_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_DSS1_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_DSS1_SHIFT, NULL,
-                         dss1_fck_parent_names, dss1_fck_ops);
-
-static const struct clksel_rate dss2_fck_sys_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate dss2_fck_48m_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate func_48m_apll96_rates[] = {
-        { .div = 2, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate func_48m_alt_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel func_48m_clksel[] = {
-        { .parent = &apll96_ck, .rates = func_48m_apll96_rates },
-        { .parent = &alt_ck, .rates = func_48m_alt_rates },
-        { .parent = NULL },
-};
-
-static const char *func_48m_ck_parent_names[] = {
-        "apll96_ck", "alt_ck",
-};
-
-static struct clk func_48m_ck;
-
-static const struct clk_ops func_48m_ck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .recalc_rate    = &omap2_clksel_recalc,
-        .set_rate       = &omap2_clksel_set_rate,
-        .round_rate     = &omap2_clksel_round_rate,
-        .get_parent     = &omap2_clksel_find_parent_index,
-        .set_parent     = &omap2_clksel_set_parent,
-};
-
-static struct clk_hw_omap func_48m_ck_hw = {
-        .hw = {
-                .clk = &func_48m_ck,
-        },
-        .clksel         = func_48m_clksel,
-        .clksel_reg     = OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),
-        .clksel_mask    = OMAP24XX_48M_SOURCE_MASK,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(func_48m_ck, func_48m_ck_parent_names, func_48m_ck_ops);
-
-static const struct clksel dss2_fck_clksel[] = {
-        { .parent = &sys_ck, .rates = dss2_fck_sys_rates },
-        { .parent = &func_48m_ck, .rates = dss2_fck_48m_rates },
-        { .parent = NULL },
-};
-
-static const char *dss2_fck_parent_names[] = {
-        "sys_ck", "func_48m_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(dss2_fck, "dss_clkdm", dss2_fck_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_DSS2_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_DSS2_SHIFT, NULL,
-                         dss2_fck_parent_names, dss1_fck_ops);
-
-static const char *func_54m_ck_parent_names[] = {
-        "apll54_ck", "alt_ck",
-};
-
-DEFINE_CLK_MUX(func_54m_ck, func_54m_ck_parent_names, NULL, 0x0,
-               OMAP_CM_REGADDR(PLL_MOD, CM_CLKSEL1),
-               OMAP24XX_54M_SOURCE_SHIFT, OMAP24XX_54M_SOURCE_WIDTH, 0x0, NULL);
-
-static struct clk dss_54m_fck;
-
-static const char *dss_54m_fck_parent_names[] = {
-        "func_54m_ck",
-};
-
-static struct clk_hw_omap dss_54m_fck_hw = {
-        .hw = {
-                .clk = &dss_54m_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_TV_SHIFT,
-        .clkdm_name     = "dss_clkdm",
-};
-
-DEFINE_STRUCT_CLK(dss_54m_fck, dss_54m_fck_parent_names, aes_ick_ops);
-
-static struct clk dss_ick;
-
-static struct clk_hw_omap dss_ick_hw = {
-        .hw = {
-                .clk = &dss_ick,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_DSS1_SHIFT,
-        .clkdm_name     = "dss_clkdm",
-};
-
-DEFINE_STRUCT_CLK(dss_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk emul_ck;
-
-static struct clk_hw_omap emul_ck_hw = {
-        .hw = {
-                .clk = &emul_ck,
-        },
-        .enable_reg     = OMAP2430_PRCM_CLKEMUL_CTRL,
-        .enable_bit     = OMAP24XX_EMULATION_EN_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(emul_ck, dss_54m_fck_parent_names, aes_ick_ops);
-
-DEFINE_CLK_FIXED_FACTOR(func_12m_ck, "func_48m_ck", &func_48m_ck, 0x0, 1, 4);
-
-static struct clk fac_fck;
-
-static const char *fac_fck_parent_names[] = {
-        "func_12m_ck",
-};
-
-static struct clk_hw_omap fac_fck_hw = {
-        .hw = {
-                .clk = &fac_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_FAC_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(fac_fck, fac_fck_parent_names, aes_ick_ops);
-
-static struct clk fac_ick;
-
-static struct clk_hw_omap fac_ick_hw = {
-        .hw = {
-                .clk = &fac_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_FAC_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(fac_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clksel gfx_fck_clksel[] = {
-        { .parent = &core_l3_ck, .rates = gfx_l3_rates },
-        { .parent = NULL },
-};
-
-static const char *gfx_2d_fck_parent_names[] = {
-        "core_l3_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(gfx_2d_fck, "gfx_clkdm", gfx_fck_clksel,
-                         OMAP_CM_REGADDR(GFX_MOD, CM_CLKSEL),
-                         OMAP_CLKSEL_GFX_MASK,
-                         OMAP_CM_REGADDR(GFX_MOD, CM_FCLKEN),
-                         OMAP24XX_EN_2D_SHIFT, &clkhwops_wait,
-                         gfx_2d_fck_parent_names, dsp_fck_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gfx_3d_fck, "gfx_clkdm", gfx_fck_clksel,
-                         OMAP_CM_REGADDR(GFX_MOD, CM_CLKSEL),
-                         OMAP_CLKSEL_GFX_MASK,
-                         OMAP_CM_REGADDR(GFX_MOD, CM_FCLKEN),
-                         OMAP24XX_EN_3D_SHIFT, &clkhwops_wait,
-                         gfx_2d_fck_parent_names, dsp_fck_ops);
-
-static struct clk gfx_ick;
-
-static const char *gfx_ick_parent_names[] = {
-        "core_l3_ck",
-};
-
-static struct clk_hw_omap gfx_ick_hw = {
-        .hw = {
-                .clk = &gfx_ick,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(GFX_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP_EN_GFX_SHIFT,
-        .clkdm_name     = "gfx_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gfx_ick, gfx_ick_parent_names, aes_ick_ops);
-
-static struct clk gpio5_fck;
-
-static const char *gpio5_fck_parent_names[] = {
-        "func_32k_ck",
-};
-
-static struct clk_hw_omap gpio5_fck_hw = {
-        .hw = {
-                .clk = &gpio5_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP2430_EN_GPIO5_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpio5_fck, gpio5_fck_parent_names, aes_ick_ops);
-
-static struct clk gpio5_ick;
-
-static struct clk_hw_omap gpio5_ick_hw = {
-        .hw = {
-                .clk = &gpio5_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP2430_EN_GPIO5_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpio5_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk gpios_fck;
-
-static struct clk_hw_omap gpios_fck_hw = {
-        .hw = {
-                .clk = &gpios_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
-        .enable_bit     = OMAP24XX_EN_GPIOS_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpios_fck, gpio5_fck_parent_names, aes_ick_ops);
-
-static struct clk gpios_ick;
-
-static const char *gpios_ick_parent_names[] = {
-        "sys_ck",
-};
-
-static struct clk_hw_omap gpios_ick_hw = {
-        .hw = {
-                .clk = &gpios_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_GPIOS_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpios_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static struct clk gpmc_fck;
-
-static struct clk_hw_omap gpmc_fck_hw = {
-        .hw = {
-                .clk = &gpmc_fck,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),
-        .enable_bit     = OMAP24XX_AUTO_GPMC_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpmc_fck, gfx_ick_parent_names, core_ck_ops);
-
-static const struct clksel_rate gpt_alt_rates[] = {
-        { .div = 1, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel omap24xx_gpt_clksel[] = {
-        { .parent = &func_32k_ck, .rates = gpt_32k_rates },
-        { .parent = &sys_ck, .rates = gpt_sys_rates },
-        { .parent = &alt_ck, .rates = gpt_alt_rates },
-        { .parent = NULL },
-};
-
-static const char *gpt10_fck_parent_names[] = {
-        "func_32k_ck", "sys_ck", "alt_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt10_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT10_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT10_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt10_ick;
-
-static struct clk_hw_omap gpt10_ick_hw = {
-        .hw = {
-                .clk = &gpt10_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT10_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt10_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt11_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT11_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT11_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt11_ick;
-
-static struct clk_hw_omap gpt11_ick_hw = {
-        .hw = {
-                .clk = &gpt11_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT11_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt11_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt12_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT12_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT12_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt12_ick;
-
-static struct clk_hw_omap gpt12_ick_hw = {
-        .hw = {
-                .clk = &gpt12_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT12_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt12_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clk_ops gpt1_fck_ops = {
-        .init           = &omap2_init_clk_clkdm,
-        .enable         = &omap2_dflt_clk_enable,
-        .disable        = &omap2_dflt_clk_disable,
-        .is_enabled     = &omap2_dflt_clk_is_enabled,
-        .recalc_rate    = &omap2_clksel_recalc,
-        .set_rate       = &omap2_clksel_set_rate,
-        .round_rate     = &omap2_clksel_round_rate,
-        .get_parent     = &omap2_clksel_find_parent_index,
-        .set_parent     = &omap2_clksel_set_parent,
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt1_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(WKUP_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_GPT1_MASK,
-                         OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
-                         OMAP24XX_EN_GPT1_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, gpt1_fck_ops);
-
-static struct clk gpt1_ick;
-
-static struct clk_hw_omap gpt1_ick_hw = {
-        .hw = {
-                .clk = &gpt1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_GPT1_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt1_ick, gpios_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt2_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT2_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT2_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt2_ick;
-
-static struct clk_hw_omap gpt2_ick_hw = {
-        .hw = {
-                .clk = &gpt2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt2_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt3_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT3_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT3_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt3_ick;
-
-static struct clk_hw_omap gpt3_ick_hw = {
-        .hw = {
-                .clk = &gpt3_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt3_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt4_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT4_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT4_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt4_ick;
-
-static struct clk_hw_omap gpt4_ick_hw = {
-        .hw = {
-                .clk = &gpt4_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT4_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt4_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt5_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT5_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT5_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt5_ick;
-
-static struct clk_hw_omap gpt5_ick_hw = {
-        .hw = {
-                .clk = &gpt5_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT5_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt5_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt6_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT6_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT6_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt6_ick;
-
-static struct clk_hw_omap gpt6_ick_hw = {
-        .hw = {
-                .clk = &gpt6_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT6_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt6_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt7_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT7_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT7_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt7_ick;
-
-static struct clk_hw_omap gpt7_ick_hw = {
-        .hw = {
-                .clk = &gpt7_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT7_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt7_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk gpt8_fck;
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt8_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT8_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT8_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt8_ick;
-
-static struct clk_hw_omap gpt8_ick_hw = {
-        .hw = {
-                .clk = &gpt8_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT8_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt8_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(gpt9_fck, "core_l4_clkdm", omap24xx_gpt_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL2),
-                         OMAP24XX_CLKSEL_GPT9_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_GPT9_SHIFT, &clkhwops_wait,
-                         gpt10_fck_parent_names, dss1_fck_ops);
-
-static struct clk gpt9_ick;
-
-static struct clk_hw_omap gpt9_ick_hw = {
-        .hw = {
-                .clk = &gpt9_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_GPT9_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(gpt9_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk hdq_fck;
-
-static struct clk_hw_omap hdq_fck_hw = {
-        .hw = {
-                .clk = &hdq_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_HDQ_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(hdq_fck, fac_fck_parent_names, aes_ick_ops);
-
-static struct clk hdq_ick;
-
-static struct clk_hw_omap hdq_ick_hw = {
-        .hw = {
-                .clk = &hdq_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_HDQ_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(hdq_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk i2c1_ick;
-
-static struct clk_hw_omap i2c1_ick_hw = {
-        .hw = {
-                .clk = &i2c1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP2420_EN_I2C1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(i2c1_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk i2c2_ick;
-
-static struct clk_hw_omap i2c2_ick_hw = {
-        .hw = {
-                .clk = &i2c2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP2420_EN_I2C2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(i2c2_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk i2chs1_fck;
-
-static struct clk_hw_omap i2chs1_fck_hw = {
-        .hw = {
-                .clk = &i2chs1_fck,
-        },
-        .ops            = &clkhwops_omap2430_i2chs_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP2430_EN_I2CHS1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(i2chs1_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk i2chs2_fck;
-
-static struct clk_hw_omap i2chs2_fck_hw = {
-        .hw = {
-                .clk = &i2chs2_fck,
-        },
-        .ops            = &clkhwops_omap2430_i2chs_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP2430_EN_I2CHS2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(i2chs2_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk icr_ick;
-
-static struct clk_hw_omap icr_ick_hw = {
-        .hw = {
-                .clk = &icr_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP2430_EN_ICR_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(icr_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static const struct clksel dsp_ick_clksel[] = {
-        { .parent = &dsp_fck, .rates = dsp_ick_rates },
-        { .parent = NULL },
-};
-
-static const char *iva2_1_ick_parent_names[] = {
-        "dsp_fck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(iva2_1_ick, "dsp_clkdm", dsp_ick_clksel,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_CLKSEL),
-                         OMAP24XX_CLKSEL_DSP_IF_MASK,
-                         OMAP_CM_REGADDR(OMAP24XX_DSP_MOD, CM_FCLKEN),
-                         OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT, &clkhwops_wait,
-                         iva2_1_ick_parent_names, dsp_fck_ops);
-
-static struct clk mailboxes_ick;
-
-static struct clk_hw_omap mailboxes_ick_hw = {
-        .hw = {
-                .clk = &mailboxes_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MAILBOXES_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mailboxes_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clksel_rate common_mcbsp_96m_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate common_mcbsp_mcbsp_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel mcbsp_fck_clksel[] = {
-        { .parent = &func_96m_ck, .rates = common_mcbsp_96m_rates },
-        { .parent = &mcbsp_clks, .rates = common_mcbsp_mcbsp_rates },
-        { .parent = NULL },
-};
-
-static const char *mcbsp1_fck_parent_names[] = {
-        "func_96m_ck", "mcbsp_clks",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(mcbsp1_fck, "core_l4_clkdm", mcbsp_fck_clksel,
-                         OMAP243X_CTRL_REGADDR(OMAP2_CONTROL_DEVCONF0),
-                         OMAP2_MCBSP1_CLKS_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_MCBSP1_SHIFT, &clkhwops_wait,
-                         mcbsp1_fck_parent_names, dss1_fck_ops);
-
-static struct clk mcbsp1_ick;
-
-static struct clk_hw_omap mcbsp1_ick_hw = {
-        .hw = {
-                .clk = &mcbsp1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCBSP1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcbsp1_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(mcbsp2_fck, "core_l4_clkdm", mcbsp_fck_clksel,
-                         OMAP243X_CTRL_REGADDR(OMAP2_CONTROL_DEVCONF0),
-                         OMAP2_MCBSP2_CLKS_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-                         OMAP24XX_EN_MCBSP2_SHIFT, &clkhwops_wait,
-                         mcbsp1_fck_parent_names, dss1_fck_ops);
-
-static struct clk mcbsp2_ick;
-
-static struct clk_hw_omap mcbsp2_ick_hw = {
-        .hw = {
-                .clk = &mcbsp2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCBSP2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcbsp2_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(mcbsp3_fck, "core_l4_clkdm", mcbsp_fck_clksel,
-                         OMAP243X_CTRL_REGADDR(OMAP243X_CONTROL_DEVCONF1),
-                         OMAP2_MCBSP3_CLKS_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-                         OMAP2430_EN_MCBSP3_SHIFT, &clkhwops_wait,
-                         mcbsp1_fck_parent_names, dss1_fck_ops);
-
-static struct clk mcbsp3_ick;
-
-static struct clk_hw_omap mcbsp3_ick_hw = {
-        .hw = {
-                .clk = &mcbsp3_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP2430_EN_MCBSP3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcbsp3_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(mcbsp4_fck, "core_l4_clkdm", mcbsp_fck_clksel,
-                         OMAP243X_CTRL_REGADDR(OMAP243X_CONTROL_DEVCONF1),
-                         OMAP2_MCBSP4_CLKS_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-                         OMAP2430_EN_MCBSP4_SHIFT, &clkhwops_wait,
-                         mcbsp1_fck_parent_names, dss1_fck_ops);
-
-static struct clk mcbsp4_ick;
-
-static struct clk_hw_omap mcbsp4_ick_hw = {
-        .hw = {
-                .clk = &mcbsp4_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP2430_EN_MCBSP4_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcbsp4_ick, aes_ick_parent_names, aes_ick_ops);
-
-DEFINE_CLK_OMAP_MUX_GATE(mcbsp5_fck, "core_l4_clkdm", mcbsp_fck_clksel,
-                         OMAP243X_CTRL_REGADDR(OMAP243X_CONTROL_DEVCONF1),
-                         OMAP2_MCBSP5_CLKS_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-                         OMAP2430_EN_MCBSP5_SHIFT, &clkhwops_wait,
-                         mcbsp1_fck_parent_names, dss1_fck_ops);
-
-static struct clk mcbsp5_ick;
-
-static struct clk_hw_omap mcbsp5_ick_hw = {
-        .hw = {
-                .clk = &mcbsp5_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP2430_EN_MCBSP5_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcbsp5_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk mcspi1_fck;
-
-static const char *mcspi1_fck_parent_names[] = {
-        "func_48m_ck",
-};
-
-static struct clk_hw_omap mcspi1_fck_hw = {
-        .hw = {
-                .clk = &mcspi1_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCSPI1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi1_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk mcspi1_ick;
-
-static struct clk_hw_omap mcspi1_ick_hw = {
-        .hw = {
-                .clk = &mcspi1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCSPI1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi1_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk mcspi2_fck;
-
-static struct clk_hw_omap mcspi2_fck_hw = {
-        .hw = {
-                .clk = &mcspi2_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCSPI2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi2_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk mcspi2_ick;
-
-static struct clk_hw_omap mcspi2_ick_hw = {
-        .hw = {
-                .clk = &mcspi2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MCSPI2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi2_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk mcspi3_fck;
-
-static struct clk_hw_omap mcspi3_fck_hw = {
-        .hw = {
-                .clk = &mcspi3_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP2430_EN_MCSPI3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi3_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk mcspi3_ick;
-
-static struct clk_hw_omap mcspi3_ick_hw = {
-        .hw = {
-                .clk = &mcspi3_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP2430_EN_MCSPI3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mcspi3_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clksel_rate mdm_ick_core_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_243X },
-        { .div = 4, .val = 4, .flags = RATE_IN_243X },
-        { .div = 6, .val = 6, .flags = RATE_IN_243X },
-        { .div = 9, .val = 9, .flags = RATE_IN_243X },
-        { .div = 0 }
-};
-
-static const struct clksel mdm_ick_clksel[] = {
-        { .parent = &core_ck, .rates = mdm_ick_core_rates },
-        { .parent = NULL },
-};
-
-static const char *mdm_ick_parent_names[] = {
-        "core_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(mdm_ick, "mdm_clkdm", mdm_ick_clksel,
-                         OMAP_CM_REGADDR(OMAP2430_MDM_MOD, CM_CLKSEL),
-                         OMAP2430_CLKSEL_MDM_MASK,
-                         OMAP_CM_REGADDR(OMAP2430_MDM_MOD, CM_ICLKEN),
-                         OMAP2430_CM_ICLKEN_MDM_EN_MDM_SHIFT,
-                         &clkhwops_iclk_wait, mdm_ick_parent_names,
-                         dsp_fck_ops);
-
-static struct clk mdm_intc_ick;
-
-static struct clk_hw_omap mdm_intc_ick_hw = {
-        .hw = {
-                .clk = &mdm_intc_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP2430_EN_MDM_INTC_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mdm_intc_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk mdm_osc_ck;
-
-static struct clk_hw_omap mdm_osc_ck_hw = {
-        .hw = {
-                .clk = &mdm_osc_ck,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(OMAP2430_MDM_MOD, CM_FCLKEN),
-        .enable_bit     = OMAP2430_EN_OSC_SHIFT,
-        .clkdm_name     = "mdm_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mdm_osc_ck, sys_ck_parent_names, aes_ick_ops);
-
-static struct clk mmchs1_fck;
-
-static struct clk_hw_omap mmchs1_fck_hw = {
-        .hw = {
-                .clk = &mmchs1_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP2430_EN_MMCHS1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mmchs1_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk mmchs1_ick;
-
-static struct clk_hw_omap mmchs1_ick_hw = {
-        .hw = {
-                .clk = &mmchs1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP2430_EN_MMCHS1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mmchs1_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk mmchs2_fck;
-
-static struct clk_hw_omap mmchs2_fck_hw = {
-        .hw = {
-                .clk = &mmchs2_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP2430_EN_MMCHS2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mmchs2_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk mmchs2_ick;
-
-static struct clk_hw_omap mmchs2_ick_hw = {
-        .hw = {
-                .clk = &mmchs2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP2430_EN_MMCHS2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mmchs2_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk mmchsdb1_fck;
-
-static struct clk_hw_omap mmchsdb1_fck_hw = {
-        .hw = {
-                .clk = &mmchsdb1_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP2430_EN_MMCHSDB1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mmchsdb1_fck, gpio5_fck_parent_names, aes_ick_ops);
-
-static struct clk mmchsdb2_fck;
-
-static struct clk_hw_omap mmchsdb2_fck_hw = {
-        .hw = {
-                .clk = &mmchsdb2_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP2430_EN_MMCHSDB2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mmchsdb2_fck, gpio5_fck_parent_names, aes_ick_ops);
-
-DEFINE_CLK_DIVIDER(mpu_ck, "core_ck", &core_ck, 0x0,
-                   OMAP_CM_REGADDR(MPU_MOD, CM_CLKSEL),
-                   OMAP24XX_CLKSEL_MPU_SHIFT, OMAP24XX_CLKSEL_MPU_WIDTH,
-                   CLK_DIVIDER_ONE_BASED, NULL);
-
-static struct clk mpu_wdt_fck;
-
-static struct clk_hw_omap mpu_wdt_fck_hw = {
-        .hw = {
-                .clk = &mpu_wdt_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_FCLKEN),
-        .enable_bit     = OMAP24XX_EN_MPU_WDT_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mpu_wdt_fck, gpio5_fck_parent_names, aes_ick_ops);
-
-static struct clk mpu_wdt_ick;
-
-static struct clk_hw_omap mpu_wdt_ick_hw = {
-        .hw = {
-                .clk = &mpu_wdt_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_MPU_WDT_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mpu_wdt_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static struct clk mspro_fck;
-
-static struct clk_hw_omap mspro_fck_hw = {
-        .hw = {
-                .clk = &mspro_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_MSPRO_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mspro_fck, cam_fck_parent_names, aes_ick_ops);
-
-static struct clk mspro_ick;
-
-static struct clk_hw_omap mspro_ick_hw = {
-        .hw = {
-                .clk = &mspro_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_MSPRO_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(mspro_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk omapctrl_ick;
-
-static struct clk_hw_omap omapctrl_ick_hw = {
-        .hw = {
-                .clk = &omapctrl_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_OMAPCTRL_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(omapctrl_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static struct clk pka_ick;
-
-static struct clk_hw_omap pka_ick_hw = {
-        .hw = {
-                .clk = &pka_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_PKA_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(pka_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk rng_ick;
-
-static struct clk_hw_omap rng_ick_hw = {
-        .hw = {
-                .clk = &rng_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_RNG_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(rng_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk sdma_fck;
-
-DEFINE_STRUCT_CLK_HW_OMAP(sdma_fck, "core_l3_clkdm");
-DEFINE_STRUCT_CLK(sdma_fck, gfx_ick_parent_names, core_ck_ops);
-
-static struct clk sdma_ick;
-
-static struct clk_hw_omap sdma_ick_hw = {
-        .hw = {
-                .clk = &sdma_ick,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),
-        .enable_bit     = OMAP24XX_AUTO_SDMA_SHIFT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(sdma_ick, gfx_ick_parent_names, core_ck_ops);
-
-static struct clk sdrc_ick;
-
-static struct clk_hw_omap sdrc_ick_hw = {
-        .hw = {
-                .clk = &sdrc_ick,
-        },
-        .ops            = &clkhwops_iclk,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3),
-        .enable_bit     = OMAP2430_EN_SDRC_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(sdrc_ick, gfx_ick_parent_names, core_ck_ops);
-
-static struct clk sha_ick;
-
-static struct clk_hw_omap sha_ick_hw = {
-        .hw = {
-                .clk = &sha_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_ICLKEN4),
-        .enable_bit     = OMAP24XX_EN_SHA_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(sha_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk ssi_l4_ick;
-
-static struct clk_hw_omap ssi_l4_ick_hw = {
-        .hw = {
-                .clk = &ssi_l4_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP24XX_EN_SSI_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(ssi_l4_ick, aes_ick_parent_names, aes_ick_ops);
-
-static const struct clksel_rate ssi_ssr_sst_fck_core_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 2, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 3, .val = 3, .flags = RATE_IN_24XX },
-        { .div = 4, .val = 4, .flags = RATE_IN_24XX },
-        { .div = 5, .val = 5, .flags = RATE_IN_243X },
-        { .div = 0 }
-};
-
-static const struct clksel ssi_ssr_sst_fck_clksel[] = {
-        { .parent = &core_ck, .rates = ssi_ssr_sst_fck_core_rates },
-        { .parent = NULL },
-};
-
-static const char *ssi_ssr_sst_fck_parent_names[] = {
-        "core_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(ssi_ssr_sst_fck, "core_l3_clkdm",
-                         ssi_ssr_sst_fck_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_SSI_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-                         OMAP24XX_EN_SSI_SHIFT, &clkhwops_wait,
-                         ssi_ssr_sst_fck_parent_names, dsp_fck_ops);
-
-static struct clk sync_32k_ick;
-
-static struct clk_hw_omap sync_32k_ick_hw = {
-        .hw = {
-                .clk = &sync_32k_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_32KSYNC_SHIFT,
-        .flags          = ENABLE_ON_INIT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(sync_32k_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static const struct clksel_rate common_clkout_src_core_rates[] = {
-        { .div = 1, .val = 0, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate common_clkout_src_sys_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate common_clkout_src_96m_rates[] = {
-        { .div = 1, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel_rate common_clkout_src_54m_rates[] = {
-        { .div = 1, .val = 3, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel common_clkout_src_clksel[] = {
-        { .parent = &core_ck, .rates = common_clkout_src_core_rates },
-        { .parent = &sys_ck, .rates = common_clkout_src_sys_rates },
-        { .parent = &func_96m_ck, .rates = common_clkout_src_96m_rates },
-        { .parent = &func_54m_ck, .rates = common_clkout_src_54m_rates },
-        { .parent = NULL },
-};
-
-static const char *sys_clkout_src_parent_names[] = {
-        "core_ck", "sys_ck", "func_96m_ck", "func_54m_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(sys_clkout_src, "wkup_clkdm", common_clkout_src_clksel,
-                         OMAP2430_PRCM_CLKOUT_CTRL, OMAP24XX_CLKOUT_SOURCE_MASK,
-                         OMAP2430_PRCM_CLKOUT_CTRL, OMAP24XX_CLKOUT_EN_SHIFT,
-                         NULL, sys_clkout_src_parent_names, gpt1_fck_ops);
-
-DEFINE_CLK_DIVIDER(sys_clkout, "sys_clkout_src", &sys_clkout_src, 0x0,
-                   OMAP2430_PRCM_CLKOUT_CTRL, OMAP24XX_CLKOUT_DIV_SHIFT,
-                   OMAP24XX_CLKOUT_DIV_WIDTH, CLK_DIVIDER_POWER_OF_TWO, NULL);
-
-static struct clk uart1_fck;
-
-static struct clk_hw_omap uart1_fck_hw = {
-        .hw = {
-                .clk = &uart1_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_UART1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart1_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk uart1_ick;
-
-static struct clk_hw_omap uart1_ick_hw = {
-        .hw = {
-                .clk = &uart1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_UART1_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart1_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk uart2_fck;
-
-static struct clk_hw_omap uart2_fck_hw = {
-        .hw = {
-                .clk = &uart2_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_UART2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart2_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk uart2_ick;
-
-static struct clk_hw_omap uart2_ick_hw = {
-        .hw = {
-                .clk = &uart2_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_UART2_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart2_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk uart3_fck;
-
-static struct clk_hw_omap uart3_fck_hw = {
-        .hw = {
-                .clk = &uart3_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP24XX_EN_UART3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart3_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static struct clk uart3_ick;
-
-static struct clk_hw_omap uart3_ick_hw = {
-        .hw = {
-                .clk = &uart3_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP24XX_EN_UART3_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(uart3_ick, aes_ick_parent_names, aes_ick_ops);
-
-static struct clk usb_fck;
-
-static struct clk_hw_omap usb_fck_hw = {
-        .hw = {
-                .clk = &usb_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, OMAP24XX_CM_FCLKEN2),
-        .enable_bit     = OMAP24XX_EN_USB_SHIFT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(usb_fck, mcspi1_fck_parent_names, aes_ick_ops);
-
-static const struct clksel_rate usb_l4_ick_core_l3_rates[] = {
-        { .div = 1, .val = 1, .flags = RATE_IN_24XX },
-        { .div = 2, .val = 2, .flags = RATE_IN_24XX },
-        { .div = 4, .val = 4, .flags = RATE_IN_24XX },
-        { .div = 0 }
-};
-
-static const struct clksel usb_l4_ick_clksel[] = {
-        { .parent = &core_l3_ck, .rates = usb_l4_ick_core_l3_rates },
-        { .parent = NULL },
-};
-
-static const char *usb_l4_ick_parent_names[] = {
-        "core_l3_ck",
-};
-
-DEFINE_CLK_OMAP_MUX_GATE(usb_l4_ick, "core_l4_clkdm", usb_l4_ick_clksel,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_CLKSEL1),
-                         OMAP24XX_CLKSEL_USB_MASK,
-                         OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-                         OMAP24XX_EN_USB_SHIFT, &clkhwops_iclk_wait,
-                         usb_l4_ick_parent_names, dsp_fck_ops);
-
-static struct clk usbhs_ick;
-
-static struct clk_hw_omap usbhs_ick_hw = {
-        .hw = {
-                .clk = &usbhs_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN2),
-        .enable_bit     = OMAP2430_EN_USBHS_SHIFT,
-        .clkdm_name     = "core_l3_clkdm",
-};
-
-DEFINE_STRUCT_CLK(usbhs_ick, gfx_ick_parent_names, aes_ick_ops);
-
-static struct clk virt_prcm_set;
-
-static const char *virt_prcm_set_parent_names[] = {
-        "mpu_ck",
-};
-
-static const struct clk_ops virt_prcm_set_ops = {
-        .recalc_rate    = &omap2_table_mpu_recalc,
-        .set_rate       = &omap2_select_table_rate,
-        .round_rate     = &omap2_round_to_table_rate,
-};
-
-DEFINE_STRUCT_CLK_HW_OMAP(virt_prcm_set, NULL);
-DEFINE_STRUCT_CLK(virt_prcm_set, virt_prcm_set_parent_names, virt_prcm_set_ops);
-
-static struct clk wdt1_ick;
-
-static struct clk_hw_omap wdt1_ick_hw = {
-        .hw = {
-                .clk = &wdt1_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(WKUP_MOD, CM_ICLKEN),
-        .enable_bit     = OMAP24XX_EN_WDT1_SHIFT,
-        .clkdm_name     = "wkup_clkdm",
-};
-
-DEFINE_STRUCT_CLK(wdt1_ick, gpios_ick_parent_names, aes_ick_ops);
-
-static struct clk wdt4_fck;
-
-static struct clk_hw_omap wdt4_fck_hw = {
-        .hw = {
-                .clk = &wdt4_fck,
-        },
-        .ops            = &clkhwops_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
-        .enable_bit     = OMAP24XX_EN_WDT4_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(wdt4_fck, gpio5_fck_parent_names, aes_ick_ops);
-
-static struct clk wdt4_ick;
-
-static struct clk_hw_omap wdt4_ick_hw = {
-        .hw = {
-                .clk = &wdt4_ick,
-        },
-        .ops            = &clkhwops_iclk_wait,
-        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1),
-        .enable_bit     = OMAP24XX_EN_WDT4_SHIFT,
-        .clkdm_name     = "core_l4_clkdm",
-};
-
-DEFINE_STRUCT_CLK(wdt4_ick, aes_ick_parent_names, aes_ick_ops);
-
-/*
- * clkdev integration
- */
-
-static struct omap_clk omap2430_clks[] = {
-        /* external root sources */
-        CLK(NULL,       "func_32k_ck",  &func_32k_ck),
-        CLK(NULL,       "secure_32k_ck", &secure_32k_ck),
-        CLK(NULL,       "osc_ck",       &osc_ck),
-        CLK("twl",      "fck",          &osc_ck),
-        CLK(NULL,       "sys_ck",       &sys_ck),
-        CLK(NULL,       "alt_ck",       &alt_ck),
-        CLK(NULL,       "mcbsp_clks",   &mcbsp_clks),
-        /* internal analog sources */
-        CLK(NULL,       "dpll_ck",      &dpll_ck),
-        CLK(NULL,       "apll96_ck",    &apll96_ck),
-        CLK(NULL,       "apll54_ck",    &apll54_ck),
-        /* internal prcm root sources */
-        CLK(NULL,       "func_54m_ck",  &func_54m_ck),
-        CLK(NULL,       "core_ck",      &core_ck),
-        CLK(NULL,       "func_96m_ck",  &func_96m_ck),
-        CLK(NULL,       "func_48m_ck",  &func_48m_ck),
-        CLK(NULL,       "func_12m_ck",  &func_12m_ck),
-        CLK(NULL,       "sys_clkout_src", &sys_clkout_src),
-        CLK(NULL,       "sys_clkout",   &sys_clkout),
-        CLK(NULL,       "emul_ck",      &emul_ck),
-        /* mpu domain clocks */
-        CLK(NULL,       "mpu_ck",       &mpu_ck),
-        /* dsp domain clocks */
-        CLK(NULL,       "dsp_fck",      &dsp_fck),
-        CLK(NULL,       "iva2_1_ick",   &iva2_1_ick),
-        /* GFX domain clocks */
-        CLK(NULL,       "gfx_3d_fck",   &gfx_3d_fck),
-        CLK(NULL,       "gfx_2d_fck",   &gfx_2d_fck),
-        CLK(NULL,       "gfx_ick",      &gfx_ick),
-        /* Modem domain clocks */
-        CLK(NULL,       "mdm_ick",      &mdm_ick),
-        CLK(NULL,       "mdm_osc_ck",   &mdm_osc_ck),
-        /* DSS domain clocks */
-        CLK("omapdss_dss",      "ick",          &dss_ick),
-        CLK(NULL,       "dss_ick",              &dss_ick),
-        CLK(NULL,       "dss1_fck",             &dss1_fck),
-        CLK(NULL,       "dss2_fck",     &dss2_fck),
-        CLK(NULL,       "dss_54m_fck",  &dss_54m_fck),
-        /* L3 domain clocks */
-        CLK(NULL,       "core_l3_ck",   &core_l3_ck),
-        CLK(NULL,       "ssi_fck",      &ssi_ssr_sst_fck),
-        CLK(NULL,       "usb_l4_ick",   &usb_l4_ick),
-        /* L4 domain clocks */
-        CLK(NULL,       "l4_ck",        &l4_ck),
-        CLK(NULL,       "ssi_l4_ick",   &ssi_l4_ick),
-        /* virtual meta-group clock */
-        CLK(NULL,       "virt_prcm_set", &virt_prcm_set),
-        /* general l4 interface ck, multi-parent functional clk */
-        CLK(NULL,       "gpt1_ick",     &gpt1_ick),
-        CLK(NULL,       "gpt1_fck",     &gpt1_fck),
-        CLK(NULL,       "gpt2_ick",     &gpt2_ick),
-        CLK(NULL,       "gpt2_fck",     &gpt2_fck),
-        CLK(NULL,       "gpt3_ick",     &gpt3_ick),
-        CLK(NULL,       "gpt3_fck",     &gpt3_fck),
-        CLK(NULL,       "gpt4_ick",     &gpt4_ick),
-        CLK(NULL,       "gpt4_fck",     &gpt4_fck),
-        CLK(NULL,       "gpt5_ick",     &gpt5_ick),
-        CLK(NULL,       "gpt5_fck",     &gpt5_fck),
-        CLK(NULL,       "gpt6_ick",     &gpt6_ick),
-        CLK(NULL,       "gpt6_fck",     &gpt6_fck),
-        CLK(NULL,       "gpt7_ick",     &gpt7_ick),
-        CLK(NULL,       "gpt7_fck",     &gpt7_fck),
-        CLK(NULL,       "gpt8_ick",     &gpt8_ick),
-        CLK(NULL,       "gpt8_fck",     &gpt8_fck),
-        CLK(NULL,       "gpt9_ick",     &gpt9_ick),
-        CLK(NULL,       "gpt9_fck",     &gpt9_fck),
-        CLK(NULL,       "gpt10_ick",    &gpt10_ick),
-        CLK(NULL,       "gpt10_fck",    &gpt10_fck),
-        CLK(NULL,       "gpt11_ick",    &gpt11_ick),
-        CLK(NULL,       "gpt11_fck",    &gpt11_fck),
-        CLK(NULL,       "gpt12_ick",    &gpt12_ick),
-        CLK(NULL,       "gpt12_fck",    &gpt12_fck),
-        CLK("omap-mcbsp.1", "ick",      &mcbsp1_ick),
-        CLK(NULL,       "mcbsp1_ick",   &mcbsp1_ick),
-        CLK(NULL,       "mcbsp1_fck",   &mcbsp1_fck),
-        CLK("omap-mcbsp.2", "ick",      &mcbsp2_ick),
-        CLK(NULL,       "mcbsp2_ick",   &mcbsp2_ick),
-        CLK(NULL,       "mcbsp2_fck",   &mcbsp2_fck),
-        CLK("omap-mcbsp.3", "ick",      &mcbsp3_ick),
-        CLK(NULL,       "mcbsp3_ick",   &mcbsp3_ick),
-        CLK(NULL,       "mcbsp3_fck",   &mcbsp3_fck),
-        CLK("omap-mcbsp.4", "ick",      &mcbsp4_ick),
-        CLK(NULL,       "mcbsp4_ick",   &mcbsp4_ick),
-        CLK(NULL,       "mcbsp4_fck",   &mcbsp4_fck),
-        CLK("omap-mcbsp.5", "ick",      &mcbsp5_ick),
-        CLK(NULL,       "mcbsp5_ick",   &mcbsp5_ick),
-        CLK(NULL,       "mcbsp5_fck",   &mcbsp5_fck),
-        CLK("omap2_mcspi.1", "ick",     &mcspi1_ick),
-        CLK(NULL,       "mcspi1_ick",   &mcspi1_ick),
-        CLK(NULL,       "mcspi1_fck",   &mcspi1_fck),
-        CLK("omap2_mcspi.2", "ick",     &mcspi2_ick),
-        CLK(NULL,       "mcspi2_ick",   &mcspi2_ick),
-        CLK(NULL,       "mcspi2_fck",   &mcspi2_fck),
-        CLK("omap2_mcspi.3", "ick",     &mcspi3_ick),
-        CLK(NULL,       "mcspi3_ick",   &mcspi3_ick),
-        CLK(NULL,       "mcspi3_fck",   &mcspi3_fck),
-        CLK(NULL,       "uart1_ick",    &uart1_ick),
-        CLK(NULL,       "uart1_fck",    &uart1_fck),
-        CLK(NULL,       "uart2_ick",    &uart2_ick),
-        CLK(NULL,       "uart2_fck",    &uart2_fck),
-        CLK(NULL,       "uart3_ick",    &uart3_ick),
-        CLK(NULL,       "uart3_fck",    &uart3_fck),
-        CLK(NULL,       "gpios_ick",    &gpios_ick),
-        CLK(NULL,       "gpios_fck",    &gpios_fck),
-        CLK("omap_wdt", "ick",          &mpu_wdt_ick),
-        CLK(NULL,       "mpu_wdt_ick",  &mpu_wdt_ick),
-        CLK(NULL,       "mpu_wdt_fck",  &mpu_wdt_fck),
-        CLK(NULL,       "sync_32k_ick", &sync_32k_ick),
-        CLK(NULL,       "wdt1_ick",     &wdt1_ick),
-        CLK(NULL,       "omapctrl_ick", &omapctrl_ick),
-        CLK(NULL,       "icr_ick",      &icr_ick),
-        CLK("omap24xxcam", "fck",       &cam_fck),
-        CLK(NULL,       "cam_fck",      &cam_fck),
-        CLK("omap24xxcam", "ick",       &cam_ick),
-        CLK(NULL,       "cam_ick",      &cam_ick),
-        CLK(NULL,       "mailboxes_ick", &mailboxes_ick),
-        CLK(NULL,       "wdt4_ick",     &wdt4_ick),
-        CLK(NULL,       "wdt4_fck",     &wdt4_fck),
-        CLK(NULL,       "mspro_ick",    &mspro_ick),
-        CLK(NULL,       "mspro_fck",    &mspro_fck),
-        CLK(NULL,       "fac_ick",      &fac_ick),
-        CLK(NULL,       "fac_fck",      &fac_fck),
-        CLK("omap_hdq.0", "ick",        &hdq_ick),
-        CLK(NULL,       "hdq_ick",      &hdq_ick),
-        CLK("omap_hdq.1", "fck",        &hdq_fck),
-        CLK(NULL,       "hdq_fck",      &hdq_fck),
-        CLK("omap_i2c.1", "ick",        &i2c1_ick),
-        CLK(NULL,       "i2c1_ick",     &i2c1_ick),
-        CLK(NULL,       "i2chs1_fck",   &i2chs1_fck),
-        CLK("omap_i2c.2", "ick",        &i2c2_ick),
-        CLK(NULL,       "i2c2_ick",     &i2c2_ick),
-        CLK(NULL,       "i2chs2_fck",   &i2chs2_fck),
-        CLK(NULL,       "gpmc_fck",     &gpmc_fck),
-        CLK(NULL,       "sdma_fck",     &sdma_fck),
-        CLK(NULL,       "sdma_ick",     &sdma_ick),
-        CLK(NULL,       "sdrc_ick",     &sdrc_ick),
-        CLK(NULL,       "des_ick",      &des_ick),
-        CLK("omap-sham",        "ick",  &sha_ick),
-        CLK(NULL,       "sha_ick",      &sha_ick),
-        CLK("omap_rng", "ick",          &rng_ick),
-        CLK(NULL,       "rng_ick",      &rng_ick),
-        CLK("omap-aes", "ick",  &aes_ick),
-        CLK(NULL,       "aes_ick",      &aes_ick),
-        CLK(NULL,       "pka_ick",      &pka_ick),
-        CLK(NULL,       "usb_fck",      &usb_fck),
-        CLK("musb-omap2430",    "ick",  &usbhs_ick),
-        CLK(NULL,       "usbhs_ick",    &usbhs_ick),
-        CLK("omap_hsmmc.0", "ick",      &mmchs1_ick),
-        CLK(NULL,       "mmchs1_ick",   &mmchs1_ick),
-        CLK(NULL,       "mmchs1_fck",   &mmchs1_fck),
-        CLK("omap_hsmmc.1", "ick",      &mmchs2_ick),
-        CLK(NULL,       "mmchs2_ick",   &mmchs2_ick),
-        CLK(NULL,       "mmchs2_fck",   &mmchs2_fck),
-        CLK(NULL,       "gpio5_ick",    &gpio5_ick),
-        CLK(NULL,       "gpio5_fck",    &gpio5_fck),
-        CLK(NULL,       "mdm_intc_ick", &mdm_intc_ick),
-        CLK("omap_hsmmc.0", "mmchsdb_fck",      &mmchsdb1_fck),
-        CLK(NULL,        "mmchsdb1_fck",        &mmchsdb1_fck),
-        CLK("omap_hsmmc.1", "mmchsdb_fck",      &mmchsdb2_fck),
-        CLK(NULL,        "mmchsdb2_fck",        &mmchsdb2_fck),
-        CLK(NULL,       "timer_32k_ck",  &func_32k_ck),
-        CLK(NULL,       "timer_sys_ck", &sys_ck),
-        CLK(NULL,       "timer_ext_ck", &alt_ck),
-        CLK(NULL,       "cpufreq_ck",   &virt_prcm_set),
-};
-
-static const char *enable_init_clks[] = {
-        "apll96_ck",
-        "apll54_ck",
-        "sync_32k_ick",
-        "omapctrl_ick",
-        "gpmc_fck",
-        "sdrc_ick",
-};
-
-/*
- * init code
- */
-
-int __init omap2430_clk_init(void)
-{
-        prcm_clksrc_ctrl = OMAP2430_PRCM_CLKSRC_CTRL;
-        cpu_mask = RATE_IN_243X;
-        rate_table = omap2430_rate_table;
-
-        omap2xxx_clkt_dpllcore_init(&dpll_ck_hw.hw);
-
-        omap2xxx_clkt_vps_check_bootloader_rates();
-
-        omap_clocks_register(omap2430_clks, ARRAY_SIZE(omap2430_clks));
-
-        omap2xxx_clkt_vps_late_init();
-
-        omap2_clk_disable_autoidle_all();
-
-        omap2_clk_enable_init_clocks(enable_init_clks,
-                                     ARRAY_SIZE(enable_init_clks));
-
-        pr_info("Clocking rate (Crystal/DPLL/MPU): %ld.%01ld/%ld/%ld MHz\n",
-                (clk_get_rate(&sys_ck) / 1000000),
-                (clk_get_rate(&sys_ck) / 100000) % 10,
-                (clk_get_rate(&dpll_ck) / 1000000),
-                (clk_get_rate(&mpu_ck) / 1000000));
-
-        return 0;
-}
diff --git a/arch/arm/mach-omap2/clkt2xxx_osc.c b/arch/arm/mach-omap2/clkt2xxx_osc.c
deleted file mode 100644
index 0717dff1bc04..000000000000
--- a/arch/arm/mach-omap2/clkt2xxx_osc.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * OMAP2xxx osc_clk-specific clock code
- *
- * Copyright (C) 2005-2008 Texas Instruments, Inc.
- * Copyright (C) 2004-2010 Nokia Corporation
- *
- * Contacts:
- * Richard Woodruff <r-woodruff2@ti.com>
- * Paul Walmsley
- *
- * Based on earlier work by Tuukka Tikkanen, Tony Lindgren,
- * Gordon McNutt and RidgeRun, Inc.
- *
- * 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.
- */
-#undef DEBUG
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-
-#include "clock.h"
-#include "clock2xxx.h"
-#include "prm2xxx_3xxx.h"
-#include "prm-regbits-24xx.h"
-
-/*
- * XXX This does not actually enable the osc_ck, since the osc_ck must
- * be running for this function to be called.  Instead, this function
- * is used to disable an autoidle mode on the osc_ck.  The existing
- * clk_enable/clk_disable()-based usecounting for osc_ck should be
- * replaced with autoidle-based usecounting.
- */
-int omap2_enable_osc_ck(struct clk_hw *clk)
-{
-        u32 pcc;
-
-        pcc = readl_relaxed(prcm_clksrc_ctrl);
-
-        writel_relaxed(pcc & ~OMAP_AUTOEXTCLKMODE_MASK, prcm_clksrc_ctrl);
-
-        return 0;
-}
-
-/*
- * XXX This does not actually disable the osc_ck, since doing so would
- * immediately halt the system.  Instead, this function is used to
- * enable an autoidle mode on the osc_ck.  The existing
- * clk_enable/clk_disable()-based usecounting for osc_ck should be
- * replaced with autoidle-based usecounting.
- */
-void omap2_disable_osc_ck(struct clk_hw *clk)
-{
-        u32 pcc;
-
-        pcc = readl_relaxed(prcm_clksrc_ctrl);
-
-        writel_relaxed(pcc | OMAP_AUTOEXTCLKMODE_MASK, prcm_clksrc_ctrl);
-}
-
-unsigned long omap2_osc_clk_recalc(struct clk_hw *clk,
-                                   unsigned long parent_rate)
-{
-        return omap2xxx_get_apll_clkin() * omap2xxx_get_sysclkdiv();
-}
diff --git a/arch/arm/mach-omap2/clkt2xxx_sys.c b/arch/arm/mach-omap2/clkt2xxx_sys.c
deleted file mode 100644
index 58dd3a9b726c..000000000000
--- a/arch/arm/mach-omap2/clkt2xxx_sys.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * OMAP2xxx sys_clk-specific clock code
- *
- * Copyright (C) 2005-2008 Texas Instruments, Inc.
- * Copyright (C) 2004-2010 Nokia Corporation
- *
- * Contacts:
- * Richard Woodruff <r-woodruff2@ti.com>
- * Paul Walmsley
- *
- * Based on earlier work by Tuukka Tikkanen, Tony Lindgren,
- * Gordon McNutt and RidgeRun, Inc.
- *
- * 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.
- */
-#undef DEBUG
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-
-#include "clock.h"
-#include "clock2xxx.h"
-#include "prm2xxx_3xxx.h"
-#include "prm-regbits-24xx.h"
-
-void __iomem *prcm_clksrc_ctrl;
-
-u32 omap2xxx_get_sysclkdiv(void)
-{
-        u32 div;
-
-        div = readl_relaxed(prcm_clksrc_ctrl);
-        div &= OMAP_SYSCLKDIV_MASK;
-        div >>= OMAP_SYSCLKDIV_SHIFT;
-
-        return div;
-}
-
-unsigned long omap2xxx_sys_clk_recalc(struct clk_hw *clk,
-                                      unsigned long parent_rate)
-{
-        return parent_rate / omap2xxx_get_sysclkdiv();
-}
diff --git a/arch/arm/mach-omap2/clkt_dpll.c b/arch/arm/mach-omap2/clkt_dpll.c
index 67fd26a18441..f251a14cbf16 100644
--- a/arch/arm/mach-omap2/clkt_dpll.c
+++ b/arch/arm/mach-omap2/clkt_dpll.c
@@ -21,10 +21,7 @@
 
 #include <asm/div64.h>
 
-#include "soc.h"
 #include "clock.h"
-#include "cm-regbits-24xx.h"
-#include "cm-regbits-34xx.h"
 
 /* DPLL rate rounding: minimum DPLL multiplier, divider values */
 #define DPLL_MIN_MULTIPLIER             2
@@ -44,20 +41,12 @@
 #define DPLL_ROUNDING_VAL               ((DPLL_SCALE_BASE / 2) * \
                                          (DPLL_SCALE_FACTOR / DPLL_SCALE_BASE))
 
-/* DPLL valid Fint frequency band limits - from 34xx TRM Section 4.7.6.2 */
-#define OMAP3430_DPLL_FINT_BAND1_MIN    750000
-#define OMAP3430_DPLL_FINT_BAND1_MAX    2100000
-#define OMAP3430_DPLL_FINT_BAND2_MIN    7500000
-#define OMAP3430_DPLL_FINT_BAND2_MAX    21000000
-
 /*
  * DPLL valid Fint frequency range for OMAP36xx and OMAP4xxx.
  * From device data manual section 4.3 "DPLL and DLL Specifications".
  */
 #define OMAP3PLUS_DPLL_FINT_JTYPE_MIN   500000
 #define OMAP3PLUS_DPLL_FINT_JTYPE_MAX   2500000
-#define OMAP3PLUS_DPLL_FINT_MIN         32000
-#define OMAP3PLUS_DPLL_FINT_MAX         52000000
 
 /* _dpll_test_fint() return codes */
 #define DPLL_FINT_UNDERFLOW             -1
@@ -87,33 +76,31 @@ static int _dpll_test_fint(struct clk_hw_omap *clk, unsigned int n)
         /* DPLL divider must result in a valid jitter correction val */
         fint = __clk_get_rate(__clk_get_parent(clk->hw.clk)) / n;
 
-        if (cpu_is_omap24xx()) {
-                /* Should not be called for OMAP2, so warn if it is called */
-                WARN(1, "No fint limits available for OMAP2!\n");
-                return DPLL_FINT_INVALID;
-        } else if (cpu_is_omap3430()) {
-                fint_min = OMAP3430_DPLL_FINT_BAND1_MIN;
-                fint_max = OMAP3430_DPLL_FINT_BAND2_MAX;
-        } else if (dd->flags & DPLL_J_TYPE) {
+        if (dd->flags & DPLL_J_TYPE) {
                 fint_min = OMAP3PLUS_DPLL_FINT_JTYPE_MIN;
                 fint_max = OMAP3PLUS_DPLL_FINT_JTYPE_MAX;
         } else {
-                fint_min = OMAP3PLUS_DPLL_FINT_MIN;
-                fint_max = OMAP3PLUS_DPLL_FINT_MAX;
+                fint_min = ti_clk_features.fint_min;
+                fint_max = ti_clk_features.fint_max;
+        }
+
+        if (!fint_min || !fint_max) {
+                WARN(1, "No fint limits available!\n");
+                return DPLL_FINT_INVALID;
         }
 
-        if (fint < fint_min) {
+        if (fint < ti_clk_features.fint_min) {
                 pr_debug("rejecting n=%d due to Fint failure, lowering max_divider\n",
                          n);
                 dd->max_divider = n;
                 ret = DPLL_FINT_UNDERFLOW;
-        } else if (fint > fint_max) {
+        } else if (fint > ti_clk_features.fint_max) {
                 pr_debug("rejecting n=%d due to Fint failure, boosting min_divider\n",
                          n);
                 dd->min_divider = n;
                 ret = DPLL_FINT_INVALID;
-        } else if (cpu_is_omap3430() && fint > OMAP3430_DPLL_FINT_BAND1_MAX &&
-                   fint < OMAP3430_DPLL_FINT_BAND2_MIN) {
+        } else if (fint > ti_clk_features.fint_band1_max &&
+                   fint < ti_clk_features.fint_band2_min) {
                 pr_debug("rejecting n=%d due to Fint failure\n", n);
                 ret = DPLL_FINT_INVALID;
         }
@@ -185,6 +172,34 @@ static int _dpll_test_mult(int *m, int n, unsigned long *new_rate,
         return r;
 }
 
+/**
+ * _omap2_dpll_is_in_bypass - check if DPLL is in bypass mode or not
+ * @v: bitfield value of the DPLL enable
+ *
+ * Checks given DPLL enable bitfield to see whether the DPLL is in bypass
+ * mode or not. Returns 1 if the DPLL is in bypass, 0 otherwise.
+ */
+static int _omap2_dpll_is_in_bypass(u32 v)
+{
+        u8 mask, val;
+
+        mask = ti_clk_features.dpll_bypass_vals;
+
+        /*
+         * Each set bit in the mask corresponds to a bypass value equal
+         * to the bitshift. Go through each set-bit in the mask and
+         * compare against the given register value.
+         */
+        while (mask) {
+                val = __ffs(mask);
+                mask ^= (1 << val);
+                if (v == val)
+                        return 1;
+        }
+
+        return 0;
+}
+
 /* Public functions */
 u8 omap2_init_dpll_parent(struct clk_hw *hw)
 {
@@ -201,20 +216,9 @@ u8 omap2_init_dpll_parent(struct clk_hw *hw)
         v >>= __ffs(dd->enable_mask);
 
         /* Reparent the struct clk in case the dpll is in bypass */
-        if (cpu_is_omap24xx()) {
-                if (v == OMAP2XXX_EN_DPLL_LPBYPASS ||
-                    v == OMAP2XXX_EN_DPLL_FRBYPASS)
-                        return 1;
-        } else if (cpu_is_omap34xx()) {
-                if (v == OMAP3XXX_EN_DPLL_LPBYPASS ||
-                    v == OMAP3XXX_EN_DPLL_FRBYPASS)
-                        return 1;
-        } else if (soc_is_am33xx() || cpu_is_omap44xx() || soc_is_am43xx()) {
-                if (v == OMAP4XXX_EN_DPLL_LPBYPASS ||
-                    v == OMAP4XXX_EN_DPLL_FRBYPASS ||
-                    v == OMAP4XXX_EN_DPLL_MNBYPASS)
-                        return 1;
-        }
+        if (_omap2_dpll_is_in_bypass(v))
+                return 1;
+
         return 0;
 }
 
@@ -247,20 +251,8 @@ unsigned long omap2_get_dpll_rate(struct clk_hw_omap *clk)
         v &= dd->enable_mask;
         v >>= __ffs(dd->enable_mask);
 
-        if (cpu_is_omap24xx()) {
-                if (v == OMAP2XXX_EN_DPLL_LPBYPASS ||
-                    v == OMAP2XXX_EN_DPLL_FRBYPASS)
-                        return __clk_get_rate(dd->clk_bypass);
-        } else if (cpu_is_omap34xx()) {
-                if (v == OMAP3XXX_EN_DPLL_LPBYPASS ||
-                    v == OMAP3XXX_EN_DPLL_FRBYPASS)
-                        return __clk_get_rate(dd->clk_bypass);
-        } else if (soc_is_am33xx() || cpu_is_omap44xx() || soc_is_am43xx()) {
-                if (v == OMAP4XXX_EN_DPLL_LPBYPASS ||
-                    v == OMAP4XXX_EN_DPLL_FRBYPASS ||
-                    v == OMAP4XXX_EN_DPLL_MNBYPASS)
-                        return __clk_get_rate(dd->clk_bypass);
-        }
+        if (_omap2_dpll_is_in_bypass(v))
+                return __clk_get_rate(dd->clk_bypass);
 
         v = omap2_clk_readl(clk, dd->mult_div1_reg);
         dpll_mult = v & dd->mult_mask;
@@ -293,10 +285,13 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate,
 {
         struct clk_hw_omap *clk = to_clk_hw_omap(hw);
         int m, n, r, scaled_max_m;
+        int min_delta_m = INT_MAX, min_delta_n = INT_MAX;
         unsigned long scaled_rt_rp;
         unsigned long new_rate = 0;
         struct dpll_data *dd;
         unsigned long ref_rate;
+        long delta;
+        long prev_min_delta = LONG_MAX;
         const char *clk_name;
 
         if (!clk || !clk->dpll_data)
@@ -342,23 +337,34 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate,
                 if (r == DPLL_MULT_UNDERFLOW)
                         continue;
 
+                /* skip rates above our target rate */
+                delta = target_rate - new_rate;
+                if (delta < 0)
+                        continue;
+
+                if (delta < prev_min_delta) {
+                        prev_min_delta = delta;
+                        min_delta_m = m;
+                        min_delta_n = n;
+                }
+
                 pr_debug("clock: %s: m = %d: n = %d: new_rate = %lu\n",
                          clk_name, m, n, new_rate);
 
-                if (target_rate == new_rate) {
-                        dd->last_rounded_m = m;
-                        dd->last_rounded_n = n;
-                        dd->last_rounded_rate = target_rate;
+                if (delta == 0)
                         break;
-                }
         }
 
-        if (target_rate != new_rate) {
+        if (prev_min_delta == LONG_MAX) {
                 pr_debug("clock: %s: cannot round to rate %lu\n",
                          clk_name, target_rate);
                 return ~0;
         }
 
-        return target_rate;
+        dd->last_rounded_m = min_delta_m;
+        dd->last_rounded_n = min_delta_n;
+        dd->last_rounded_rate = target_rate - prev_min_delta;
+
+        return dd->last_rounded_rate;
 }
 
diff --git a/arch/arm/mach-omap2/clkt_iclk.c b/arch/arm/mach-omap2/clkt_iclk.c
index 333f0a666171..55eb579aeae1 100644
--- a/arch/arm/mach-omap2/clkt_iclk.c
+++ b/arch/arm/mach-omap2/clkt_iclk.c
@@ -14,11 +14,11 @@
 #include <linux/clk-provider.h>
 #include <linux/io.h>
 
-
 #include "clock.h"
-#include "clock2xxx.h"
-#include "cm2xxx_3xxx.h"
-#include "cm-regbits-24xx.h"
+
+/* Register offsets */
+#define CM_AUTOIDLE                     0x30
+#define CM_ICLKEN                       0x10
 
 /* Private functions */
 
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 591581a66532..500530d1364a 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -47,6 +47,24 @@
 u16 cpu_mask;
 
 /*
+ * Clock features setup. Used instead of CPU type checks.
+ */
+struct ti_clk_features ti_clk_features;
+
+/* DPLL valid Fint frequency band limits - from 34xx TRM Section 4.7.6.2 */
+#define OMAP3430_DPLL_FINT_BAND1_MIN    750000
+#define OMAP3430_DPLL_FINT_BAND1_MAX    2100000
+#define OMAP3430_DPLL_FINT_BAND2_MIN    7500000
+#define OMAP3430_DPLL_FINT_BAND2_MAX    21000000
+
+/*
+ * DPLL valid Fint frequency range for OMAP36xx and OMAP4xxx.
+ * From device data manual section 4.3 "DPLL and DLL Specifications".
+ */
+#define OMAP3PLUS_DPLL_FINT_MIN         32000
+#define OMAP3PLUS_DPLL_FINT_MAX         52000000
+
+/*
  * clkdm_control: if true, then when a clock is enabled in the
  * hardware, its clockdomain will first be enabled; and when a clock
  * is disabled in the hardware, its clockdomain will be disabled
@@ -82,27 +100,6 @@ u32 omap2_clk_readl(struct clk_hw_omap *clk, void __iomem *reg)
 }
 
 /*
- * Used for clocks that have the same value as the parent clock,
- * divided by some factor
- */
-unsigned long omap_fixed_divisor_recalc(struct clk_hw *hw,
-                unsigned long parent_rate)
-{
-        struct clk_hw_omap *oclk;
-
-        if (!hw) {
-                pr_warn("%s: hw is NULL\n", __func__);
-                return -EINVAL;
-        }
-
-        oclk = to_clk_hw_omap(hw);
-
-        WARN_ON(!oclk->fixed_div);
-
-        return parent_rate / oclk->fixed_div;
-}
-
-/*
  * OMAP2+ specific clock functions
  */
 
@@ -287,13 +284,7 @@ void omap2_clk_dflt_find_idlest(struct clk_hw_omap *clk,
          * 34xx reverses this, just to keep us on our toes
          * AM35xx uses both, depending on the module.
          */
-        if (cpu_is_omap24xx())
-                *idlest_val = OMAP24XX_CM_IDLEST_VAL;
-        else if (cpu_is_omap34xx())
-                *idlest_val = OMAP34XX_CM_IDLEST_VAL;
-        else
-                BUG();
-
+        *idlest_val = ti_clk_features.cm_idlest_val;
 }
 
 /**
@@ -731,3 +722,53 @@ void __init omap2_clk_print_new_rates(const char *hfclkin_ck_name,
                 (clk_get_rate(core_ck) / 1000000),
                 (clk_get_rate(mpu_ck) / 1000000));
 }
+
+/**
+ * ti_clk_init_features - init clock features struct for the SoC
+ *
+ * Initializes the clock features struct based on the SoC type.
+ */
+void __init ti_clk_init_features(void)
+{
+        /* Fint setup for DPLLs */
+        if (cpu_is_omap3430()) {
+                ti_clk_features.fint_min = OMAP3430_DPLL_FINT_BAND1_MIN;
+                ti_clk_features.fint_max = OMAP3430_DPLL_FINT_BAND2_MAX;
+                ti_clk_features.fint_band1_max = OMAP3430_DPLL_FINT_BAND1_MAX;
+                ti_clk_features.fint_band2_min = OMAP3430_DPLL_FINT_BAND2_MIN;
+        } else {
+                ti_clk_features.fint_min = OMAP3PLUS_DPLL_FINT_MIN;
+                ti_clk_features.fint_max = OMAP3PLUS_DPLL_FINT_MAX;
+        }
+
+        /* Bypass value setup for DPLLs */
+        if (cpu_is_omap24xx()) {
+                ti_clk_features.dpll_bypass_vals |=
+                        (1 << OMAP2XXX_EN_DPLL_LPBYPASS) |
+                        (1 << OMAP2XXX_EN_DPLL_FRBYPASS);
+        } else if (cpu_is_omap34xx()) {
+                ti_clk_features.dpll_bypass_vals |=
+                        (1 << OMAP3XXX_EN_DPLL_LPBYPASS) |
+                        (1 << OMAP3XXX_EN_DPLL_FRBYPASS);
+        } else if (soc_is_am33xx() || cpu_is_omap44xx() || soc_is_am43xx() ||
+                   soc_is_omap54xx() || soc_is_dra7xx()) {
+                ti_clk_features.dpll_bypass_vals |=
+                        (1 << OMAP4XXX_EN_DPLL_LPBYPASS) |
+                        (1 << OMAP4XXX_EN_DPLL_FRBYPASS) |
+                        (1 << OMAP4XXX_EN_DPLL_MNBYPASS);
+        }
+
+        /* Jitter correction only available on OMAP343X */
+        if (cpu_is_omap343x())
+                ti_clk_features.flags |= TI_CLK_DPLL_HAS_FREQSEL;
+
+        /* Idlest value for interface clocks.
+         * 24xx uses 0 to indicate not ready, and 1 to indicate ready.
+         * 34xx reverses this, just to keep us on our toes
+         * AM35xx uses both, depending on the module.
+         */
+        if (cpu_is_omap24xx())
+                ti_clk_features.cm_idlest_val = OMAP24XX_CM_IDLEST_VAL;
+        else if (cpu_is_omap34xx())
+                ti_clk_features.cm_idlest_val = OMAP34XX_CM_IDLEST_VAL;
+}
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index 12f54d428d7c..4592a2762592 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -101,31 +101,6 @@ struct clockdomain;
         };                                                      \
         DEFINE_STRUCT_CLK(_name, _parent_names, _ops);
 
-#define DEFINE_CLK_OMAP_HSDIVIDER(_name, _parent_name,          \
-                                _parent_ptr, _flags,            \
-                                _clksel_reg, _clksel_mask)      \
-        static const struct clksel _name##_div[] = {            \
-                {                                               \
-                        .parent = _parent_ptr,                  \
-                        .rates = div31_1to31_rates              \
-                },                                              \
-                { .parent = NULL },                             \
-        };                                                      \
-        static struct clk _name;                                \
-        static const char *_name##_parent_names[] = {           \
-                _parent_name,                                   \
-        };                                                      \
-        static struct clk_hw_omap _name##_hw = {                \
-                .hw = {                                         \
-                        .clk = &_name,                          \
-                },                                              \
-                .clksel         = _name##_div,                  \
-                .clksel_reg     = _clksel_reg,                  \
-                .clksel_mask    = _clksel_mask,                 \
-                .ops            = &clkhwops_omap4_dpllmx,       \
-        };                                                      \
-        DEFINE_STRUCT_CLK(_name, _name##_parent_names, omap_hsdivider_ops);
-
 /* struct clksel_rate.flags possibilities */
 #define RATE_IN_242X            (1 << 0)
 #define RATE_IN_243X            (1 << 1)
@@ -178,9 +153,6 @@ struct clksel {
         const struct clksel_rate *rates;
 };
 
-unsigned long omap_fixed_divisor_recalc(struct clk_hw *hw,
-                                        unsigned long parent_rate);
-
 /* CM_CLKSEL2_PLL.CORE_CLK_SRC bits (2XXX) */
 #define CORE_CLK_SRC_32K                0x0
 #define CORE_CLK_SRC_DPLL               0x1
@@ -248,6 +220,23 @@ void omap2_clk_writel(u32 val, struct clk_hw_omap *clk, void __iomem *reg);
 
 extern u16 cpu_mask;
 
+/*
+ * Clock features setup. Used instead of CPU type checks.
+ */
+struct ti_clk_features {
+        u32 flags;
+        long fint_min;
+        long fint_max;
+        long fint_band1_max;
+        long fint_band2_min;
+        u8 dpll_bypass_vals;
+        u8 cm_idlest_val;
+};
+
+#define TI_CLK_DPLL_HAS_FREQSEL         (1 << 0)
+
+extern struct ti_clk_features ti_clk_features;
+
 extern const struct clkops clkops_omap2_dflt_wait;
 extern const struct clkops clkops_dummy;
 extern const struct clkops clkops_omap2_dflt;
@@ -286,4 +275,6 @@ extern int omap2_clkops_enable_clkdm(struct clk_hw *hw);
 extern void omap2_clkops_disable_clkdm(struct clk_hw *hw);
 
 extern void omap_clocks_register(struct omap_clk *oclks, int cnt);
+
+void __init ti_clk_init_features(void);
 #endif
diff --git a/arch/arm/mach-omap2/clock2xxx.h b/arch/arm/mach-omap2/clock2xxx.h
index 45f41a411603..a090225ceeba 100644
--- a/arch/arm/mach-omap2/clock2xxx.h
+++ b/arch/arm/mach-omap2/clock2xxx.h
@@ -45,8 +45,6 @@ int omap2430_clk_init(void);
 #define omap2430_clk_init()     do { } while(0)
 #endif
 
-extern void __iomem *prcm_clksrc_ctrl;
-
 extern struct clk_hw *dclk_hw;
 int omap2_enable_osc_ck(struct clk_hw *hw);
 void omap2_disable_osc_ck(struct clk_hw *hw);
diff --git a/arch/arm/mach-omap2/cm-regbits-24xx.h b/arch/arm/mach-omap2/cm-regbits-24xx.h
index 8538669cc2ad..d7a5d11cbcbf 100644
--- a/arch/arm/mach-omap2/cm-regbits-24xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-24xx.h
@@ -107,6 +107,7 @@
 #define OMAP24XX_AUTO_DPLL_SHIFT                        0
 #define OMAP24XX_AUTO_DPLL_MASK                         (0x3 << 0)
 #define OMAP24XX_APLLS_CLKIN_SHIFT                      23
+#define OMAP24XX_APLLS_CLKIN_WIDTH                      3
 #define OMAP24XX_APLLS_CLKIN_MASK                       (0x7 << 23)
 #define OMAP24XX_DPLL_MULT_MASK                         (0x3ff << 12)
 #define OMAP24XX_DPLL_DIV_MASK                          (0xf << 8)
diff --git a/arch/arm/mach-omap2/cm2_7xx.h b/arch/arm/mach-omap2/cm2_7xx.h
index 9ad7594e7622..e966e3a3c931 100644
--- a/arch/arm/mach-omap2/cm2_7xx.h
+++ b/arch/arm/mach-omap2/cm2_7xx.h
@@ -357,6 +357,10 @@
 #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_L3INIT_PCIESS1_CLKCTRL_OFFSET                 0x00b0
+#define DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x00b0)
+#define DRA7XX_CM_L3INIT_PCIESS2_CLKCTRL_OFFSET                 0x00b8
+#define DRA7XX_CM_L3INIT_PCIESS2_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x00b8)
 #define DRA7XX_CM_GMAC_CLKSTCTRL_OFFSET                         0x00c0
 #define DRA7XX_CM_GMAC_STATICDEP_OFFSET                         0x00c4
 #define DRA7XX_CM_GMAC_DYNAMICDEP_OFFSET                        0x00c8
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 2dabb9ecb986..484cdadfb187 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -14,7 +14,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/platform_data/dsp-omap.h>
 
 #include "common.h"
 #include "omap-secure.h"
@@ -30,7 +29,6 @@ int __weak omap_secure_ram_reserve_memblock(void)
 
 void __init omap_reserve(void)
 {
-        omap_dsp_reserve_sdram_memblock();
         omap_secure_ram_reserve_memblock();
         omap_barrier_reserve_memblock();
 }
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 751f3549bf6f..da041b4ab29c 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -44,8 +44,7 @@ struct omap3_scratchpad {
 };
 
 struct omap3_scratchpad_prcm_block {
-        u32 prm_clksrc_ctrl;
-        u32 prm_clksel;
+        u32 prm_contents[2];
         u32 cm_contents[11];
         u32 prcm_block_size;
 };
@@ -281,14 +280,11 @@ void omap3_clear_scratchpad_contents(void)
         u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET;
         void __iomem *v_addr;
         u32 offset = 0;
+
         v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);
-        if (omap2_prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) &
-            OMAP3430_GLOBAL_COLD_RST_MASK) {
+        if (omap3xxx_prm_clear_global_cold_reset()) {
                 for ( ; offset <= max_offset; offset += 0x4)
                         writel_relaxed(0x0, (v_addr + offset));
-                omap2_prm_set_mod_reg_bits(OMAP3430_GLOBAL_COLD_RST_MASK,
-                                           OMAP3430_GR_MOD,
-                                           OMAP3_PRM_RSTST_OFFSET);
         }
 }
 
@@ -314,7 +310,8 @@ void omap3_save_scratchpad_contents(void)
                 scratchpad_contents.public_restore_ptr =
                         virt_to_phys(omap3_restore_3630);
         else if (omap_rev() != OMAP3430_REV_ES3_0 &&
-                                        omap_rev() != OMAP3430_REV_ES3_1)
+                                        omap_rev() != OMAP3430_REV_ES3_1 &&
+                                        omap_rev() != OMAP3430_REV_ES3_1_2)
                 scratchpad_contents.public_restore_ptr =
                         virt_to_phys(omap3_restore);
         else
@@ -331,13 +328,7 @@ void omap3_save_scratchpad_contents(void)
         scratchpad_contents.sdrc_block_offset = 0x64;
 
         /* Populate the PRCM block contents */
-        prcm_block_contents.prm_clksrc_ctrl =
-                omap2_prm_read_mod_reg(OMAP3430_GR_MOD,
-                                       OMAP3_PRM_CLKSRC_CTRL_OFFSET);
-        prcm_block_contents.prm_clksel =
-                omap2_prm_read_mod_reg(OMAP3430_CCR_MOD,
-                                       OMAP3_PRM_CLKSEL_OFFSET);
-
+        omap3_prm_save_scratchpad_contents(prcm_block_contents.prm_contents);
         omap3_cm_save_scratchpad_contents(prcm_block_contents.cm_contents);
 
         prcm_block_contents.prcm_block_size = 0x0;
@@ -474,7 +465,6 @@ void omap3_control_save_context(void)
         control_context.csi = omap_ctrl_readl(OMAP343X_CONTROL_CSI);
         control_context.padconf_sys_nirq =
                 omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ);
-        return;
 }
 
 void omap3_control_restore_context(void)
@@ -532,7 +522,6 @@ void omap3_control_restore_context(void)
         omap_ctrl_writel(control_context.csi, OMAP343X_CONTROL_CSI);
         omap_ctrl_writel(control_context.padconf_sys_nirq,
                          OMAP343X_CONTROL_PADCONF_SYSNIRQ);
-        return;
 }
 
 void omap3630_ctrl_disable_rta(void)
@@ -575,9 +564,50 @@ int omap3_ctrl_save_padconf(void)
  * Sets the bootmode for IVA2 to idle. This is needed by the PM code to
  * force disable IVA2 so that it does not prevent any low-power states.
  */
-void omap3_ctrl_set_iva_bootmode_idle(void)
+static void __init omap3_ctrl_set_iva_bootmode_idle(void)
 {
         omap_ctrl_writel(OMAP3_IVA2_BOOTMOD_IDLE,
                          OMAP343X_CONTROL_IVA2_BOOTMOD);
 }
+
+/**
+ * omap3_ctrl_setup_d2d_padconf - setup stacked modem pads for idle
+ *
+ * Sets up the pads controlling the stacked modem in such way that the
+ * device can enter idle.
+ */
+static void __init omap3_ctrl_setup_d2d_padconf(void)
+{
+        u16 mask, padconf;
+
+        /*
+         * In a stand alone OMAP3430 where there is not a stacked
+         * modem for the D2D Idle Ack and D2D MStandby must be pulled
+         * high. S CONTROL_PADCONF_SAD2D_IDLEACK and
+         * CONTROL_PADCONF_SAD2D_MSTDBY to have a pull up.
+         */
+        mask = (1 << 4) | (1 << 3); /* pull-up, enabled */
+        padconf = omap_ctrl_readw(OMAP3_PADCONF_SAD2D_MSTANDBY);
+        padconf |= mask;
+        omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_MSTANDBY);
+
+        padconf = omap_ctrl_readw(OMAP3_PADCONF_SAD2D_IDLEACK);
+        padconf |= mask;
+        omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_IDLEACK);
+}
+
+/**
+ * omap3_ctrl_init - does static initializations for control module
+ *
+ * Initializes system control module. This sets up the sysconfig autoidle,
+ * and sets up modem and iva2 so that they can be idled properly.
+ */
+void __init omap3_ctrl_init(void)
+{
+        omap_ctrl_writel(OMAP3430_AUTOIDLE_MASK, OMAP2_CONTROL_SYSCONFIG);
+
+        omap3_ctrl_set_iva_bootmode_idle();
+
+        omap3_ctrl_setup_d2d_padconf();
+}
 #endif /* CONFIG_ARCH_OMAP3 && CONFIG_PM */
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h
index da054801b114..a3c013345c45 100644
--- a/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@ -16,11 +16,6 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CONTROL_H
 #define __ARCH_ARM_MACH_OMAP2_CONTROL_H
 
-#include "ctrl_module_core_44xx.h"
-#include "ctrl_module_wkup_44xx.h"
-#include "ctrl_module_pad_core_44xx.h"
-#include "ctrl_module_pad_wkup_44xx.h"
-
 #include "am33xx.h"
 
 #ifndef __ASSEMBLY__
@@ -254,6 +249,39 @@
 /* TI81XX CONTROL_DEVCONF register offsets */
 #define TI81XX_CONTROL_DEVICE_ID        (TI81XX_CONTROL_DEVCONF + 0x000)
 
+/* OMAP4 CONTROL MODULE */
+#define OMAP4_CTRL_MODULE_PAD_WKUP                      0x4a31e000
+#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_I2C_2        0x0604
+#define OMAP4_CTRL_MODULE_CORE_STATUS                   0x02c4
+#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_PROD_ID_1       0x0218
+#define OMAP4_CTRL_MODULE_CORE_DSP_BOOTADDR             0x0304
+#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY       0x0618
+#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_CAMERA_RX    0x0608
+
+/* OMAP4 CONTROL_DSIPHY */
+#define OMAP4_DSI2_LANEENABLE_SHIFT                     29
+#define OMAP4_DSI2_LANEENABLE_MASK                      (0x7 << 29)
+#define OMAP4_DSI1_LANEENABLE_SHIFT                     24
+#define OMAP4_DSI1_LANEENABLE_MASK                      (0x1f << 24)
+#define OMAP4_DSI1_PIPD_SHIFT                           19
+#define OMAP4_DSI1_PIPD_MASK                            (0x1f << 19)
+#define OMAP4_DSI2_PIPD_SHIFT                           14
+#define OMAP4_DSI2_PIPD_MASK                            (0x1f << 14)
+
+/* OMAP4 CONTROL_CAMERA_RX */
+#define OMAP4_CAMERARX_CSI21_LANEENABLE_SHIFT           24
+#define OMAP4_CAMERARX_CSI21_LANEENABLE_MASK            (0x1f << 24)
+#define OMAP4_CAMERARX_CSI22_LANEENABLE_SHIFT           29
+#define OMAP4_CAMERARX_CSI22_LANEENABLE_MASK            (0x3 << 29)
+#define OMAP4_CAMERARX_CSI22_CTRLCLKEN_SHIFT            21
+#define OMAP4_CAMERARX_CSI22_CTRLCLKEN_MASK             (1 << 21)
+#define OMAP4_CAMERARX_CSI22_CAMMODE_SHIFT              19
+#define OMAP4_CAMERARX_CSI22_CAMMODE_MASK               (0x3 << 19)
+#define OMAP4_CAMERARX_CSI21_CTRLCLKEN_SHIFT            18
+#define OMAP4_CAMERARX_CSI21_CTRLCLKEN_MASK             (1 << 18)
+#define OMAP4_CAMERARX_CSI21_CAMMODE_SHIFT              16
+#define OMAP4_CAMERARX_CSI21_CAMMODE_MASK               (0x3 << 16)
+
 /* OMAP54XX CONTROL STATUS register */
 #define OMAP5XXX_CONTROL_STATUS                0x134
 #define OMAP5_DEVICETYPE_MASK          (0x7 << 6)
@@ -427,7 +455,7 @@ extern void omap_ctrl_write_dsp_boot_addr(u32 bootaddr);
 extern void omap_ctrl_write_dsp_boot_mode(u8 bootmode);
 extern void omap3630_ctrl_disable_rta(void);
 extern int omap3_ctrl_save_padconf(void);
-extern void omap3_ctrl_set_iva_bootmode_idle(void);
+void omap3_ctrl_init(void);
 extern void omap2_set_globals_control(void __iomem *ctrl,
                                       void __iomem *ctrl_pad);
 #else
diff --git a/arch/arm/mach-omap2/ctrl_module_core_44xx.h b/arch/arm/mach-omap2/ctrl_module_core_44xx.h
deleted file mode 100644
index 01970824e0e5..000000000000
--- a/arch/arm/mach-omap2/ctrl_module_core_44xx.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * OMAP44xx CTRL_MODULE_CORE registers and bitfields
- *
- * Copyright (C) 2009-2010 Texas Instruments, Inc.
- *
- * Benoit Cousson (b-cousson@ti.com)
- * Santosh Shilimkar (santosh.shilimkar@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_CTRL_MODULE_CORE_44XX_H
-#define __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_CORE_44XX_H
-
-
-/* Base address */
-#define OMAP4_CTRL_MODULE_CORE                                  0x4a002000
-
-/* Registers offset */
-#define OMAP4_CTRL_MODULE_CORE_IP_REVISION                      0x0000
-#define OMAP4_CTRL_MODULE_CORE_IP_HWINFO                        0x0004
-#define OMAP4_CTRL_MODULE_CORE_IP_SYSCONFIG                     0x0010
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_DIE_ID_0                0x0200
-#define OMAP4_CTRL_MODULE_CORE_ID_CODE                          0x0204
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_DIE_ID_1                0x0208
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_DIE_ID_2                0x020c
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_DIE_ID_3                0x0210
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_PROD_ID_0               0x0214
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_PROD_ID_1               0x0218
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_USB_CONF                0x021c
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_OPP_VDD_WKUP            0x0228
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_OPP_BGAP                0x0260
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_OPP_DPLL_0              0x0264
-#define OMAP4_CTRL_MODULE_CORE_STD_FUSE_OPP_DPLL_1              0x0268
-#define OMAP4_CTRL_MODULE_CORE_STATUS                           0x02c4
-#define OMAP4_CTRL_MODULE_CORE_DEV_CONF                         0x0300
-#define OMAP4_CTRL_MODULE_CORE_DSP_BOOTADDR                     0x0304
-#define OMAP4_CTRL_MODULE_CORE_LDOVBB_IVA_VOLTAGE_CTRL          0x0314
-#define OMAP4_CTRL_MODULE_CORE_LDOVBB_MPU_VOLTAGE_CTRL          0x0318
-#define OMAP4_CTRL_MODULE_CORE_LDOSRAM_IVA_VOLTAGE_CTRL         0x0320
-#define OMAP4_CTRL_MODULE_CORE_LDOSRAM_MPU_VOLTAGE_CTRL         0x0324
-#define OMAP4_CTRL_MODULE_CORE_LDOSRAM_CORE_VOLTAGE_CTRL        0x0328
-#define OMAP4_CTRL_MODULE_CORE_TEMP_SENSOR                      0x032c
-#define OMAP4_CTRL_MODULE_CORE_DPLL_NWELL_TRIM_0                0x0330
-#define OMAP4_CTRL_MODULE_CORE_DPLL_NWELL_TRIM_1                0x0334
-#define OMAP4_CTRL_MODULE_CORE_USBOTGHS_CONTROL                 0x033c
-#define OMAP4_CTRL_MODULE_CORE_DSS_CONTROL                      0x0340
-#define OMAP4_CTRL_MODULE_CORE_HWOBS_CONTROL                    0x0350
-#define OMAP4_CTRL_MODULE_CORE_DEBOBS_FINAL_MUX_SEL             0x0400
-#define OMAP4_CTRL_MODULE_CORE_DEBOBS_MMR_MPU                   0x0408
-#define OMAP4_CTRL_MODULE_CORE_CONF_SDMA_REQ_SEL0               0x042c
-#define OMAP4_CTRL_MODULE_CORE_CONF_SDMA_REQ_SEL1               0x0430
-#define OMAP4_CTRL_MODULE_CORE_CONF_SDMA_REQ_SEL2               0x0434
-#define OMAP4_CTRL_MODULE_CORE_CONF_SDMA_REQ_SEL3               0x0438
-#define OMAP4_CTRL_MODULE_CORE_CONF_CLK_SEL0                    0x0440
-#define OMAP4_CTRL_MODULE_CORE_CONF_CLK_SEL1                    0x0444
-#define OMAP4_CTRL_MODULE_CORE_CONF_CLK_SEL2                    0x0448
-#define OMAP4_CTRL_MODULE_CORE_CONF_DPLL_FREQLOCK_SEL           0x044c
-#define OMAP4_CTRL_MODULE_CORE_CONF_DPLL_TINITZ_SEL             0x0450
-#define OMAP4_CTRL_MODULE_CORE_CONF_DPLL_PHASELOCK_SEL          0x0454
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_0             0x0480
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_1             0x0484
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_2             0x0488
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_3             0x048c
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_4             0x0490
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_5             0x0494
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_6             0x0498
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_7             0x049c
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_8             0x04a0
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_9             0x04a4
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_10            0x04a8
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_11            0x04ac
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_12            0x04b0
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_13            0x04b4
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_14            0x04b8
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_15            0x04bc
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_16            0x04c0
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_17            0x04c4
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_18            0x04c8
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_19            0x04cc
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_20            0x04d0
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_21            0x04d4
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_22            0x04d8
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_23            0x04dc
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_24            0x04e0
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_25            0x04e4
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_26            0x04e8
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_27            0x04ec
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_28            0x04f0
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_29            0x04f4
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_30            0x04f8
-#define OMAP4_CTRL_MODULE_CORE_CONF_DEBUG_SEL_TST_31            0x04fc
-
-/* Registers shifts and masks */
-
-/* IP_REVISION */
-#define OMAP4_IP_REV_SCHEME_SHIFT                       30
-#define OMAP4_IP_REV_SCHEME_MASK                        (0x3 << 30)
-#define OMAP4_IP_REV_FUNC_SHIFT                         16
-#define OMAP4_IP_REV_FUNC_MASK                          (0xfff << 16)
-#define OMAP4_IP_REV_RTL_SHIFT                          11
-#define OMAP4_IP_REV_RTL_MASK                           (0x1f << 11)
-#define OMAP4_IP_REV_MAJOR_SHIFT                        8
-#define OMAP4_IP_REV_MAJOR_MASK                         (0x7 << 8)
-#define OMAP4_IP_REV_CUSTOM_SHIFT                       6
-#define OMAP4_IP_REV_CUSTOM_MASK                        (0x3 << 6)
-#define OMAP4_IP_REV_MINOR_SHIFT                        0
-#define OMAP4_IP_REV_MINOR_MASK                         (0x3f << 0)
-
-/* IP_HWINFO */
-#define OMAP4_IP_HWINFO_SHIFT                           0
-#define OMAP4_IP_HWINFO_MASK                            (0xffffffff << 0)
-
-/* IP_SYSCONFIG */
-#define OMAP4_IP_SYSCONFIG_IDLEMODE_SHIFT               2
-#define OMAP4_IP_SYSCONFIG_IDLEMODE_MASK                (0x3 << 2)
-
-/* STD_FUSE_DIE_ID_0 */
-#define OMAP4_STD_FUSE_DIE_ID_0_SHIFT                   0
-#define OMAP4_STD_FUSE_DIE_ID_0_MASK                    (0xffffffff << 0)
-
-/* ID_CODE */
-#define OMAP4_STD_FUSE_IDCODE_SHIFT                     0
-#define OMAP4_STD_FUSE_IDCODE_MASK                      (0xffffffff << 0)
-
-/* STD_FUSE_DIE_ID_1 */
-#define OMAP4_STD_FUSE_DIE_ID_1_SHIFT                   0
-#define OMAP4_STD_FUSE_DIE_ID_1_MASK                    (0xffffffff << 0)
-
-/* STD_FUSE_DIE_ID_2 */
-#define OMAP4_STD_FUSE_DIE_ID_2_SHIFT                   0
-#define OMAP4_STD_FUSE_DIE_ID_2_MASK                    (0xffffffff << 0)
-
-/* STD_FUSE_DIE_ID_3 */
-#define OMAP4_STD_FUSE_DIE_ID_3_SHIFT                   0
-#define OMAP4_STD_FUSE_DIE_ID_3_MASK                    (0xffffffff << 0)
-
-/* STD_FUSE_PROD_ID_0 */
-#define OMAP4_STD_FUSE_PROD_ID_0_SHIFT                  0
-#define OMAP4_STD_FUSE_PROD_ID_0_MASK                   (0xffffffff << 0)
-
-/* STD_FUSE_PROD_ID_1 */
-#define OMAP4_STD_FUSE_PROD_ID_1_SHIFT                  0
-#define OMAP4_STD_FUSE_PROD_ID_1_MASK                   (0xffffffff << 0)
-
-/* STD_FUSE_USB_CONF */
-#define OMAP4_USB_PROD_ID_SHIFT                         16
-#define OMAP4_USB_PROD_ID_MASK                          (0xffff << 16)
-#define OMAP4_USB_VENDOR_ID_SHIFT                       0
-#define OMAP4_USB_VENDOR_ID_MASK                        (0xffff << 0)
-
-/* STD_FUSE_OPP_VDD_WKUP */
-#define OMAP4_STD_FUSE_OPP_VDD_WKUP_SHIFT               0
-#define OMAP4_STD_FUSE_OPP_VDD_WKUP_MASK                (0xffffffff << 0)
-
-/* STD_FUSE_OPP_BGAP */
-#define OMAP4_STD_FUSE_OPP_BGAP_SHIFT                   0
-#define OMAP4_STD_FUSE_OPP_BGAP_MASK                    (0xffffffff << 0)
-
-/* STD_FUSE_OPP_DPLL_0 */
-#define OMAP4_STD_FUSE_OPP_DPLL_0_SHIFT                 0
-#define OMAP4_STD_FUSE_OPP_DPLL_0_MASK                  (0xffffffff << 0)
-
-/* STD_FUSE_OPP_DPLL_1 */
-#define OMAP4_STD_FUSE_OPP_DPLL_1_SHIFT                 0
-#define OMAP4_STD_FUSE_OPP_DPLL_1_MASK                  (0xffffffff << 0)
-
-/* STATUS */
-#define OMAP4_ATTILA_CONF_SHIFT                         11
-#define OMAP4_ATTILA_CONF_MASK                          (0x3 << 11)
-#define OMAP4_DEVICE_TYPE_SHIFT                         8
-#define OMAP4_DEVICE_TYPE_MASK                          (0x7 << 8)
-#define OMAP4_SYS_BOOT_SHIFT                            0
-#define OMAP4_SYS_BOOT_MASK                             (0xff << 0)
-
-/* DEV_CONF */
-#define OMAP4_DEV_CONF_SHIFT                            1
-#define OMAP4_DEV_CONF_MASK                             (0x7fffffff << 1)
-#define OMAP4_USBPHY_PD_SHIFT                           0
-#define OMAP4_USBPHY_PD_MASK                            (1 << 0)
-
-/* LDOVBB_IVA_VOLTAGE_CTRL */
-#define OMAP4_LDOVBBIVA_RBB_MUX_CTRL_SHIFT              26
-#define OMAP4_LDOVBBIVA_RBB_MUX_CTRL_MASK               (1 << 26)
-#define OMAP4_LDOVBBIVA_RBB_VSET_IN_SHIFT               21
-#define OMAP4_LDOVBBIVA_RBB_VSET_IN_MASK                (0x1f << 21)
-#define OMAP4_LDOVBBIVA_RBB_VSET_OUT_SHIFT              16
-#define OMAP4_LDOVBBIVA_RBB_VSET_OUT_MASK               (0x1f << 16)
-#define OMAP4_LDOVBBIVA_FBB_MUX_CTRL_SHIFT              10
-#define OMAP4_LDOVBBIVA_FBB_MUX_CTRL_MASK               (1 << 10)
-#define OMAP4_LDOVBBIVA_FBB_VSET_IN_SHIFT               5
-#define OMAP4_LDOVBBIVA_FBB_VSET_IN_MASK                (0x1f << 5)
-#define OMAP4_LDOVBBIVA_FBB_VSET_OUT_SHIFT              0
-#define OMAP4_LDOVBBIVA_FBB_VSET_OUT_MASK               (0x1f << 0)
-
-/* LDOVBB_MPU_VOLTAGE_CTRL */
-#define OMAP4_LDOVBBMPU_RBB_MUX_CTRL_SHIFT              26
-#define OMAP4_LDOVBBMPU_RBB_MUX_CTRL_MASK               (1 << 26)
-#define OMAP4_LDOVBBMPU_RBB_VSET_IN_SHIFT               21
-#define OMAP4_LDOVBBMPU_RBB_VSET_IN_MASK                (0x1f << 21)
-#define OMAP4_LDOVBBMPU_RBB_VSET_OUT_SHIFT              16
-#define OMAP4_LDOVBBMPU_RBB_VSET_OUT_MASK               (0x1f << 16)
-#define OMAP4_LDOVBBMPU_FBB_MUX_CTRL_SHIFT              10
-#define OMAP4_LDOVBBMPU_FBB_MUX_CTRL_MASK               (1 << 10)
-#define OMAP4_LDOVBBMPU_FBB_VSET_IN_SHIFT               5
-#define OMAP4_LDOVBBMPU_FBB_VSET_IN_MASK                (0x1f << 5)
-#define OMAP4_LDOVBBMPU_FBB_VSET_OUT_SHIFT              0
-#define OMAP4_LDOVBBMPU_FBB_VSET_OUT_MASK               (0x1f << 0)
-
-/* LDOSRAM_IVA_VOLTAGE_CTRL */
-#define OMAP4_LDOSRAMIVA_RETMODE_MUX_CTRL_SHIFT         26
-#define OMAP4_LDOSRAMIVA_RETMODE_MUX_CTRL_MASK          (1 << 26)
-#define OMAP4_LDOSRAMIVA_RETMODE_VSET_IN_SHIFT          21
-#define OMAP4_LDOSRAMIVA_RETMODE_VSET_IN_MASK           (0x1f << 21)
-#define OMAP4_LDOSRAMIVA_RETMODE_VSET_OUT_SHIFT         16
-#define OMAP4_LDOSRAMIVA_RETMODE_VSET_OUT_MASK          (0x1f << 16)
-#define OMAP4_LDOSRAMIVA_ACTMODE_MUX_CTRL_SHIFT         10
-#define OMAP4_LDOSRAMIVA_ACTMODE_MUX_CTRL_MASK          (1 << 10)
-#define OMAP4_LDOSRAMIVA_ACTMODE_VSET_IN_SHIFT          5
-#define OMAP4_LDOSRAMIVA_ACTMODE_VSET_IN_MASK           (0x1f << 5)
-#define OMAP4_LDOSRAMIVA_ACTMODE_VSET_OUT_SHIFT         0
-#define OMAP4_LDOSRAMIVA_ACTMODE_VSET_OUT_MASK          (0x1f << 0)
-
-/* LDOSRAM_MPU_VOLTAGE_CTRL */
-#define OMAP4_LDOSRAMMPU_RETMODE_MUX_CTRL_SHIFT         26
-#define OMAP4_LDOSRAMMPU_RETMODE_MUX_CTRL_MASK          (1 << 26)
-#define OMAP4_LDOSRAMMPU_RETMODE_VSET_IN_SHIFT          21
-#define OMAP4_LDOSRAMMPU_RETMODE_VSET_IN_MASK           (0x1f << 21)
-#define OMAP4_LDOSRAMMPU_RETMODE_VSET_OUT_SHIFT         16
-#define OMAP4_LDOSRAMMPU_RETMODE_VSET_OUT_MASK          (0x1f << 16)
-#define OMAP4_LDOSRAMMPU_ACTMODE_MUX_CTRL_SHIFT         10
-#define OMAP4_LDOSRAMMPU_ACTMODE_MUX_CTRL_MASK          (1 << 10)
-#define OMAP4_LDOSRAMMPU_ACTMODE_VSET_IN_SHIFT          5
-#define OMAP4_LDOSRAMMPU_ACTMODE_VSET_IN_MASK           (0x1f << 5)
-#define OMAP4_LDOSRAMMPU_ACTMODE_VSET_OUT_SHIFT         0
-#define OMAP4_LDOSRAMMPU_ACTMODE_VSET_OUT_MASK          (0x1f << 0)
-
-/* LDOSRAM_CORE_VOLTAGE_CTRL */
-#define OMAP4_LDOSRAMCORE_RETMODE_MUX_CTRL_SHIFT        26
-#define OMAP4_LDOSRAMCORE_RETMODE_MUX_CTRL_MASK         (1 << 26)
-#define OMAP4_LDOSRAMCORE_RETMODE_VSET_IN_SHIFT         21
-#define OMAP4_LDOSRAMCORE_RETMODE_VSET_IN_MASK          (0x1f << 21)
-#define OMAP4_LDOSRAMCORE_RETMODE_VSET_OUT_SHIFT        16
-#define OMAP4_LDOSRAMCORE_RETMODE_VSET_OUT_MASK         (0x1f << 16)
-#define OMAP4_LDOSRAMCORE_ACTMODE_MUX_CTRL_SHIFT        10
-#define OMAP4_LDOSRAMCORE_ACTMODE_MUX_CTRL_MASK         (1 << 10)
-#define OMAP4_LDOSRAMCORE_ACTMODE_VSET_IN_SHIFT         5
-#define OMAP4_LDOSRAMCORE_ACTMODE_VSET_IN_MASK          (0x1f << 5)
-#define OMAP4_LDOSRAMCORE_ACTMODE_VSET_OUT_SHIFT        0
-#define OMAP4_LDOSRAMCORE_ACTMODE_VSET_OUT_MASK         (0x1f << 0)
-
-/* TEMP_SENSOR */
-#define OMAP4_BGAP_TEMPSOFF_SHIFT                       12
-#define OMAP4_BGAP_TEMPSOFF_MASK                        (1 << 12)
-#define OMAP4_BGAP_TSHUT_SHIFT                          11
-#define OMAP4_BGAP_TSHUT_MASK                           (1 << 11)
-#define OMAP4_BGAP_TEMP_SENSOR_CONTCONV_SHIFT           10
-#define OMAP4_BGAP_TEMP_SENSOR_CONTCONV_MASK            (1 << 10)
-#define OMAP4_BGAP_TEMP_SENSOR_SOC_SHIFT                9
-#define OMAP4_BGAP_TEMP_SENSOR_SOC_MASK                 (1 << 9)
-#define OMAP4_BGAP_TEMP_SENSOR_EOCZ_SHIFT               8
-#define OMAP4_BGAP_TEMP_SENSOR_EOCZ_MASK                (1 << 8)
-#define OMAP4_BGAP_TEMP_SENSOR_DTEMP_SHIFT              0
-#define OMAP4_BGAP_TEMP_SENSOR_DTEMP_MASK               (0xff << 0)
-
-/* DPLL_NWELL_TRIM_0 */
-#define OMAP4_DPLL_ABE_NWELL_TRIM_MUX_CTRL_SHIFT        29
-#define OMAP4_DPLL_ABE_NWELL_TRIM_MUX_CTRL_MASK         (1 << 29)
-#define OMAP4_DPLL_ABE_NWELL_TRIM_SHIFT                 24
-#define OMAP4_DPLL_ABE_NWELL_TRIM_MASK                  (0x1f << 24)
-#define OMAP4_DPLL_PER_NWELL_TRIM_MUX_CTRL_SHIFT        23
-#define OMAP4_DPLL_PER_NWELL_TRIM_MUX_CTRL_MASK         (1 << 23)
-#define OMAP4_DPLL_PER_NWELL_TRIM_SHIFT                 18
-#define OMAP4_DPLL_PER_NWELL_TRIM_MASK                  (0x1f << 18)
-#define OMAP4_DPLL_CORE_NWELL_TRIM_MUX_CTRL_SHIFT       17
-#define OMAP4_DPLL_CORE_NWELL_TRIM_MUX_CTRL_MASK        (1 << 17)
-#define OMAP4_DPLL_CORE_NWELL_TRIM_SHIFT                12
-#define OMAP4_DPLL_CORE_NWELL_TRIM_MASK                 (0x1f << 12)
-#define OMAP4_DPLL_IVA_NWELL_TRIM_MUX_CTRL_SHIFT        11
-#define OMAP4_DPLL_IVA_NWELL_TRIM_MUX_CTRL_MASK         (1 << 11)
-#define OMAP4_DPLL_IVA_NWELL_TRIM_SHIFT                 6
-#define OMAP4_DPLL_IVA_NWELL_TRIM_MASK                  (0x1f << 6)
-#define OMAP4_DPLL_MPU_NWELL_TRIM_MUX_CTRL_SHIFT        5
-#define OMAP4_DPLL_MPU_NWELL_TRIM_MUX_CTRL_MASK         (1 << 5)
-#define OMAP4_DPLL_MPU_NWELL_TRIM_SHIFT                 0
-#define OMAP4_DPLL_MPU_NWELL_TRIM_MASK                  (0x1f << 0)
-
-/* DPLL_NWELL_TRIM_1 */
-#define OMAP4_DPLL_UNIPRO_NWELL_TRIM_MUX_CTRL_SHIFT     29
-#define OMAP4_DPLL_UNIPRO_NWELL_TRIM_MUX_CTRL_MASK      (1 << 29)
-#define OMAP4_DPLL_UNIPRO_NWELL_TRIM_SHIFT              24
-#define OMAP4_DPLL_UNIPRO_NWELL_TRIM_MASK               (0x1f << 24)
-#define OMAP4_DPLL_USB_NWELL_TRIM_MUX_CTRL_SHIFT        23
-#define OMAP4_DPLL_USB_NWELL_TRIM_MUX_CTRL_MASK         (1 << 23)
-#define OMAP4_DPLL_USB_NWELL_TRIM_SHIFT                 18
-#define OMAP4_DPLL_USB_NWELL_TRIM_MASK                  (0x1f << 18)
-#define OMAP4_DPLL_HDMI_NWELL_TRIM_MUX_CTRL_SHIFT       17
-#define OMAP4_DPLL_HDMI_NWELL_TRIM_MUX_CTRL_MASK        (1 << 17)
-#define OMAP4_DPLL_HDMI_NWELL_TRIM_SHIFT                12
-#define OMAP4_DPLL_HDMI_NWELL_TRIM_MASK                 (0x1f << 12)
-#define OMAP4_DPLL_DSI2_NWELL_TRIM_MUX_CTRL_SHIFT       11
-#define OMAP4_DPLL_DSI2_NWELL_TRIM_MUX_CTRL_MASK        (1 << 11)
-#define OMAP4_DPLL_DSI2_NWELL_TRIM_SHIFT                6
-#define OMAP4_DPLL_DSI2_NWELL_TRIM_MASK                 (0x1f << 6)
-#define OMAP4_DPLL_DSI1_NWELL_TRIM_MUX_CTRL_SHIFT       5
-#define OMAP4_DPLL_DSI1_NWELL_TRIM_MUX_CTRL_MASK        (1 << 5)
-#define OMAP4_DPLL_DSI1_NWELL_TRIM_SHIFT                0
-#define OMAP4_DPLL_DSI1_NWELL_TRIM_MASK                 (0x1f << 0)
-
-/* USBOTGHS_CONTROL */
-#define OMAP4_DISCHRGVBUS_SHIFT                         8
-#define OMAP4_DISCHRGVBUS_MASK                          (1 << 8)
-#define OMAP4_CHRGVBUS_SHIFT                            7
-#define OMAP4_CHRGVBUS_MASK                             (1 << 7)
-#define OMAP4_DRVVBUS_SHIFT                             6
-#define OMAP4_DRVVBUS_MASK                              (1 << 6)
-#define OMAP4_IDPULLUP_SHIFT                            5
-#define OMAP4_IDPULLUP_MASK                             (1 << 5)
-#define OMAP4_IDDIG_SHIFT                               4
-#define OMAP4_IDDIG_MASK                                (1 << 4)
-#define OMAP4_SESSEND_SHIFT                             3
-#define OMAP4_SESSEND_MASK                              (1 << 3)
-#define OMAP4_VBUSVALID_SHIFT                           2
-#define OMAP4_VBUSVALID_MASK                            (1 << 2)
-#define OMAP4_BVALID_SHIFT                              1
-#define OMAP4_BVALID_MASK                               (1 << 1)
-#define OMAP4_AVALID_SHIFT                              0
-#define OMAP4_AVALID_MASK                               (1 << 0)
-
-/* DSS_CONTROL */
-#define OMAP4_DSS_MUX6_SELECT_SHIFT                     0
-#define OMAP4_DSS_MUX6_SELECT_MASK                      (1 << 0)
-
-/* HWOBS_CONTROL */
-#define OMAP4_HWOBS_CLKDIV_SEL_SHIFT                    3
-#define OMAP4_HWOBS_CLKDIV_SEL_MASK                     (0x1f << 3)
-#define OMAP4_HWOBS_ALL_ZERO_MODE_SHIFT                 2
-#define OMAP4_HWOBS_ALL_ZERO_MODE_MASK                  (1 << 2)
-#define OMAP4_HWOBS_ALL_ONE_MODE_SHIFT                  1
-#define OMAP4_HWOBS_ALL_ONE_MODE_MASK                   (1 << 1)
-#define OMAP4_HWOBS_MACRO_ENABLE_SHIFT                  0
-#define OMAP4_HWOBS_MACRO_ENABLE_MASK                   (1 << 0)
-
-/* DEBOBS_FINAL_MUX_SEL */
-#define OMAP4_SELECT_SHIFT                              0
-#define OMAP4_SELECT_MASK                               (0xffffffff << 0)
-
-/* DEBOBS_MMR_MPU */
-#define OMAP4_SELECT_DEBOBS_MMR_MPU_SHIFT               0
-#define OMAP4_SELECT_DEBOBS_MMR_MPU_MASK                (0xf << 0)
-
-/* CONF_SDMA_REQ_SEL0 */
-#define OMAP4_MULT_SHIFT                                0
-#define OMAP4_MULT_MASK                                 (0x7f << 0)
-
-/* CONF_CLK_SEL0 */
-#define OMAP4_MULT_CONF_CLK_SEL0_SHIFT                  0
-#define OMAP4_MULT_CONF_CLK_SEL0_MASK                   (0x7 << 0)
-
-/* CONF_CLK_SEL1 */
-#define OMAP4_MULT_CONF_CLK_SEL1_SHIFT                  0
-#define OMAP4_MULT_CONF_CLK_SEL1_MASK                   (0x7 << 0)
-
-/* CONF_CLK_SEL2 */
-#define OMAP4_MULT_CONF_CLK_SEL2_SHIFT                  0
-#define OMAP4_MULT_CONF_CLK_SEL2_MASK                   (0x7 << 0)
-
-/* CONF_DPLL_FREQLOCK_SEL */
-#define OMAP4_MULT_CONF_DPLL_FREQLOCK_SEL_SHIFT         0
-#define OMAP4_MULT_CONF_DPLL_FREQLOCK_SEL_MASK          (0x7 << 0)
-
-/* CONF_DPLL_TINITZ_SEL */
-#define OMAP4_MULT_CONF_DPLL_TINITZ_SEL_SHIFT           0
-#define OMAP4_MULT_CONF_DPLL_TINITZ_SEL_MASK            (0x7 << 0)
-
-/* CONF_DPLL_PHASELOCK_SEL */
-#define OMAP4_MULT_CONF_DPLL_PHASELOCK_SEL_SHIFT        0
-#define OMAP4_MULT_CONF_DPLL_PHASELOCK_SEL_MASK         (0x7 << 0)
-
-/* CONF_DEBUG_SEL_TST_0 */
-#define OMAP4_MODE_SHIFT                                0
-#define OMAP4_MODE_MASK                                 (0xf << 0)
-
-#endif
diff --git a/arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h
deleted file mode 100644
index c88420de1151..000000000000
--- a/arch/arm/mach-omap2/ctrl_module_pad_core_44xx.h
+++ /dev/null
@@ -1,1409 +0,0 @@
-/*
- * OMAP44xx CTRL_MODULE_PAD_CORE registers and bitfields
- *
- * Copyright (C) 2009-2010 Texas Instruments, Inc.
- *
- * Benoit Cousson (b-cousson@ti.com)
- * Santosh Shilimkar (santosh.shilimkar@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_CTRL_MODULE_PAD_CORE_44XX_H
-#define __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_PAD_CORE_44XX_H
-
-
-/* Base address */
-#define OMAP4_CTRL_MODULE_PAD_CORE                              0x4a100000
-
-/* Registers offset */
-#define OMAP4_CTRL_MODULE_PAD_CORE_IP_REVISION                  0x0000
-#define OMAP4_CTRL_MODULE_PAD_CORE_IP_HWINFO                    0x0004
-#define OMAP4_CTRL_MODULE_PAD_CORE_IP_SYSCONFIG                 0x0010
-#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_0        0x01d8
-#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_1        0x01dc
-#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_2        0x01e0
-#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_3        0x01e4
-#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_4        0x01e8
-#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_5        0x01ec
-#define OMAP4_CTRL_MODULE_PAD_CORE_PADCONF_WAKEUPEVENT_6        0x01f0
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_PADCONF_GLOBAL       0x05a0
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_PADCONF_MODE         0x05a4
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART1IO_PADCONF_0   0x05a8
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART1IO_PADCONF_1   0x05ac
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART2IO_PADCONF_0   0x05b0
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART2IO_PADCONF_1   0x05b4
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART3IO_PADCONF_0   0x05b8
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART3IO_PADCONF_1   0x05bc
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SMART3IO_PADCONF_2   0x05c0
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_USBB_HSIC            0x05c4
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_SLIMBUS              0x05c8
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_PBIASLITE            0x0600
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_0                0x0604
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_CAMERA_RX            0x0608
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_AVDAC                0x060c
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_HDMI_TX_PHY          0x0610
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MMC2                 0x0614
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_DSIPHY               0x0618
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MCBSPLP              0x061c
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_USB2PHYCORE          0x0620
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_1                0x0624
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MMC1                 0x0628
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_HSI                  0x062c
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_USB                  0x0630
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_HDQ                  0x0634
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO1_0          0x0638
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO1_1          0x063c
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO1_2          0x0640
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO1_3          0x0644
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO2_0          0x0648
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO2_1          0x064c
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO2_2          0x0650
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_LPDDR2IO2_3          0x0654
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_BUS_HOLD             0x0658
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_C2C                  0x065c
-#define OMAP4_CTRL_MODULE_PAD_CORE_CORE_CONTROL_SPARE_RW        0x0660
-#define OMAP4_CTRL_MODULE_PAD_CORE_CORE_CONTROL_SPARE_R         0x0664
-#define OMAP4_CTRL_MODULE_PAD_CORE_CORE_CONTROL_SPARE_R_C0      0x0668
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_1              0x0700
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_2              0x0704
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_3              0x0708
-#define OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_EFUSE_4              0x070c
-
-/* Registers shifts and masks */
-
-/* IP_REVISION */
-#define OMAP4_IP_REV_SCHEME_SHIFT                               30
-#define OMAP4_IP_REV_SCHEME_MASK                                (0x3 << 30)
-#define OMAP4_IP_REV_FUNC_SHIFT                                 16
-#define OMAP4_IP_REV_FUNC_MASK                                  (0xfff << 16)
-#define OMAP4_IP_REV_RTL_SHIFT                                  11
-#define OMAP4_IP_REV_RTL_MASK                                   (0x1f << 11)
-#define OMAP4_IP_REV_MAJOR_SHIFT                                8
-#define OMAP4_IP_REV_MAJOR_MASK                                 (0x7 << 8)
-#define OMAP4_IP_REV_CUSTOM_SHIFT                               6
-#define OMAP4_IP_REV_CUSTOM_MASK                                (0x3 << 6)
-#define OMAP4_IP_REV_MINOR_SHIFT                                0
-#define OMAP4_IP_REV_MINOR_MASK                                 (0x3f << 0)
-
-/* IP_HWINFO */
-#define OMAP4_IP_HWINFO_SHIFT                                   0
-#define OMAP4_IP_HWINFO_MASK                                    (0xffffffff << 0)
-
-/* IP_SYSCONFIG */
-#define OMAP4_IP_SYSCONFIG_IDLEMODE_SHIFT                       2
-#define OMAP4_IP_SYSCONFIG_IDLEMODE_MASK                        (0x3 << 2)
-
-/* PADCONF_WAKEUPEVENT_0 */
-#define OMAP4_GPMC_CLK_DUPLICATEWAKEUPEVENT_SHIFT               31
-#define OMAP4_GPMC_CLK_DUPLICATEWAKEUPEVENT_MASK                (1 << 31)
-#define OMAP4_GPMC_NWP_DUPLICATEWAKEUPEVENT_SHIFT               30
-#define OMAP4_GPMC_NWP_DUPLICATEWAKEUPEVENT_MASK                (1 << 30)
-#define OMAP4_GPMC_NCS3_DUPLICATEWAKEUPEVENT_SHIFT              29
-#define OMAP4_GPMC_NCS3_DUPLICATEWAKEUPEVENT_MASK               (1 << 29)
-#define OMAP4_GPMC_NCS2_DUPLICATEWAKEUPEVENT_SHIFT              28
-#define OMAP4_GPMC_NCS2_DUPLICATEWAKEUPEVENT_MASK               (1 << 28)
-#define OMAP4_GPMC_NCS1_DUPLICATEWAKEUPEVENT_SHIFT              27
-#define OMAP4_GPMC_NCS1_DUPLICATEWAKEUPEVENT_MASK               (1 << 27)
-#define OMAP4_GPMC_NCS0_DUPLICATEWAKEUPEVENT_SHIFT              26
-#define OMAP4_GPMC_NCS0_DUPLICATEWAKEUPEVENT_MASK               (1 << 26)
-#define OMAP4_GPMC_A25_DUPLICATEWAKEUPEVENT_SHIFT               25
-#define OMAP4_GPMC_A25_DUPLICATEWAKEUPEVENT_MASK                (1 << 25)
-#define OMAP4_GPMC_A24_DUPLICATEWAKEUPEVENT_SHIFT               24
-#define OMAP4_GPMC_A24_DUPLICATEWAKEUPEVENT_MASK                (1 << 24)
-#define OMAP4_GPMC_A23_DUPLICATEWAKEUPEVENT_SHIFT               23
-#define OMAP4_GPMC_A23_DUPLICATEWAKEUPEVENT_MASK                (1 << 23)
-#define OMAP4_GPMC_A22_DUPLICATEWAKEUPEVENT_SHIFT               22
-#define OMAP4_GPMC_A22_DUPLICATEWAKEUPEVENT_MASK                (1 << 22)
-#define OMAP4_GPMC_A21_DUPLICATEWAKEUPEVENT_SHIFT               21
-#define OMAP4_GPMC_A21_DUPLICATEWAKEUPEVENT_MASK                (1 << 21)
-#define OMAP4_GPMC_A20_DUPLICATEWAKEUPEVENT_SHIFT               20
-#define OMAP4_GPMC_A20_DUPLICATEWAKEUPEVENT_MASK                (1 << 20)
-#define OMAP4_GPMC_A19_DUPLICATEWAKEUPEVENT_SHIFT               19
-#define OMAP4_GPMC_A19_DUPLICATEWAKEUPEVENT_MASK                (1 << 19)
-#define OMAP4_GPMC_A18_DUPLICATEWAKEUPEVENT_SHIFT               18
-#define OMAP4_GPMC_A18_DUPLICATEWAKEUPEVENT_MASK                (1 << 18)
-#define OMAP4_GPMC_A17_DUPLICATEWAKEUPEVENT_SHIFT               17
-#define OMAP4_GPMC_A17_DUPLICATEWAKEUPEVENT_MASK                (1 << 17)
-#define OMAP4_GPMC_A16_DUPLICATEWAKEUPEVENT_SHIFT               16
-#define OMAP4_GPMC_A16_DUPLICATEWAKEUPEVENT_MASK                (1 << 16)
-#define OMAP4_GPMC_AD15_DUPLICATEWAKEUPEVENT_SHIFT              15
-#define OMAP4_GPMC_AD15_DUPLICATEWAKEUPEVENT_MASK               (1 << 15)
-#define OMAP4_GPMC_AD14_DUPLICATEWAKEUPEVENT_SHIFT              14
-#define OMAP4_GPMC_AD14_DUPLICATEWAKEUPEVENT_MASK               (1 << 14)
-#define OMAP4_GPMC_AD13_DUPLICATEWAKEUPEVENT_SHIFT              13
-#define OMAP4_GPMC_AD13_DUPLICATEWAKEUPEVENT_MASK               (1 << 13)
-#define OMAP4_GPMC_AD12_DUPLICATEWAKEUPEVENT_SHIFT              12
-#define OMAP4_GPMC_AD12_DUPLICATEWAKEUPEVENT_MASK               (1 << 12)
-#define OMAP4_GPMC_AD11_DUPLICATEWAKEUPEVENT_SHIFT              11
-#define OMAP4_GPMC_AD11_DUPLICATEWAKEUPEVENT_MASK               (1 << 11)
-#define OMAP4_GPMC_AD10_DUPLICATEWAKEUPEVENT_SHIFT              10
-#define OMAP4_GPMC_AD10_DUPLICATEWAKEUPEVENT_MASK               (1 << 10)
-#define OMAP4_GPMC_AD9_DUPLICATEWAKEUPEVENT_SHIFT               9
-#define OMAP4_GPMC_AD9_DUPLICATEWAKEUPEVENT_MASK                (1 << 9)
-#define OMAP4_GPMC_AD8_DUPLICATEWAKEUPEVENT_SHIFT               8
-#define OMAP4_GPMC_AD8_DUPLICATEWAKEUPEVENT_MASK                (1 << 8)
-#define OMAP4_GPMC_AD7_DUPLICATEWAKEUPEVENT_SHIFT               7
-#define OMAP4_GPMC_AD7_DUPLICATEWAKEUPEVENT_MASK                (1 << 7)
-#define OMAP4_GPMC_AD6_DUPLICATEWAKEUPEVENT_SHIFT               6
-#define OMAP4_GPMC_AD6_DUPLICATEWAKEUPEVENT_MASK                (1 << 6)
-#define OMAP4_GPMC_AD5_DUPLICATEWAKEUPEVENT_SHIFT               5
-#define OMAP4_GPMC_AD5_DUPLICATEWAKEUPEVENT_MASK                (1 << 5)
-#define OMAP4_GPMC_AD4_DUPLICATEWAKEUPEVENT_SHIFT               4
-#define OMAP4_GPMC_AD4_DUPLICATEWAKEUPEVENT_MASK                (1 << 4)
-#define OMAP4_GPMC_AD3_DUPLICATEWAKEUPEVENT_SHIFT               3
-#define OMAP4_GPMC_AD3_DUPLICATEWAKEUPEVENT_MASK                (1 << 3)
-#define OMAP4_GPMC_AD2_DUPLICATEWAKEUPEVENT_SHIFT               2
-#define OMAP4_GPMC_AD2_DUPLICATEWAKEUPEVENT_MASK                (1 << 2)
-#define OMAP4_GPMC_AD1_DUPLICATEWAKEUPEVENT_SHIFT               1
-#define OMAP4_GPMC_AD1_DUPLICATEWAKEUPEVENT_MASK                (1 << 1)
-#define OMAP4_GPMC_AD0_DUPLICATEWAKEUPEVENT_SHIFT               0
-#define OMAP4_GPMC_AD0_DUPLICATEWAKEUPEVENT_MASK                (1 << 0)
-
-/* PADCONF_WAKEUPEVENT_1 */
-#define OMAP4_CAM_STROBE_DUPLICATEWAKEUPEVENT_SHIFT             31
-#define OMAP4_CAM_STROBE_DUPLICATEWAKEUPEVENT_MASK              (1 << 31)
-#define OMAP4_CAM_SHUTTER_DUPLICATEWAKEUPEVENT_SHIFT            30
-#define OMAP4_CAM_SHUTTER_DUPLICATEWAKEUPEVENT_MASK             (1 << 30)
-#define OMAP4_CSI22_DY1_DUPLICATEWAKEUPEVENT_SHIFT              29
-#define OMAP4_CSI22_DY1_DUPLICATEWAKEUPEVENT_MASK               (1 << 29)
-#define OMAP4_CSI22_DX1_DUPLICATEWAKEUPEVENT_SHIFT              28
-#define OMAP4_CSI22_DX1_DUPLICATEWAKEUPEVENT_MASK               (1 << 28)
-#define OMAP4_CSI22_DY0_DUPLICATEWAKEUPEVENT_SHIFT              27
-#define OMAP4_CSI22_DY0_DUPLICATEWAKEUPEVENT_MASK               (1 << 27)
-#define OMAP4_CSI22_DX0_DUPLICATEWAKEUPEVENT_SHIFT              26
-#define OMAP4_CSI22_DX0_DUPLICATEWAKEUPEVENT_MASK               (1 << 26)
-#define OMAP4_CSI21_DY4_DUPLICATEWAKEUPEVENT_SHIFT              25
-#define OMAP4_CSI21_DY4_DUPLICATEWAKEUPEVENT_MASK               (1 << 25)
-#define OMAP4_CSI21_DX4_DUPLICATEWAKEUPEVENT_SHIFT              24
-#define OMAP4_CSI21_DX4_DUPLICATEWAKEUPEVENT_MASK               (1 << 24)
-#define OMAP4_CSI21_DY3_DUPLICATEWAKEUPEVENT_SHIFT              23
-#define OMAP4_CSI21_DY3_DUPLICATEWAKEUPEVENT_MASK               (1 << 23)
-#define OMAP4_CSI21_DX3_DUPLICATEWAKEUPEVENT_SHIFT              22
-#define OMAP4_CSI21_DX3_DUPLICATEWAKEUPEVENT_MASK               (1 << 22)
-#define OMAP4_CSI21_DY2_DUPLICATEWAKEUPEVENT_SHIFT              21
-#define OMAP4_CSI21_DY2_DUPLICATEWAKEUPEVENT_MASK               (1 << 21)
-#define OMAP4_CSI21_DX2_DUPLICATEWAKEUPEVENT_SHIFT              20
-#define OMAP4_CSI21_DX2_DUPLICATEWAKEUPEVENT_MASK               (1 << 20)
-#define OMAP4_CSI21_DY1_DUPLICATEWAKEUPEVENT_SHIFT              19
-#define OMAP4_CSI21_DY1_DUPLICATEWAKEUPEVENT_MASK               (1 << 19)
-#define OMAP4_CSI21_DX1_DUPLICATEWAKEUPEVENT_SHIFT              18
-#define OMAP4_CSI21_DX1_DUPLICATEWAKEUPEVENT_MASK               (1 << 18)
-#define OMAP4_CSI21_DY0_DUPLICATEWAKEUPEVENT_SHIFT              17
-#define OMAP4_CSI21_DY0_DUPLICATEWAKEUPEVENT_MASK               (1 << 17)
-#define OMAP4_CSI21_DX0_DUPLICATEWAKEUPEVENT_SHIFT              16
-#define OMAP4_CSI21_DX0_DUPLICATEWAKEUPEVENT_MASK               (1 << 16)
-#define OMAP4_HDMI_DDC_SDA_DUPLICATEWAKEUPEVENT_SHIFT           15
-#define OMAP4_HDMI_DDC_SDA_DUPLICATEWAKEUPEVENT_MASK            (1 << 15)
-#define OMAP4_HDMI_DDC_SCL_DUPLICATEWAKEUPEVENT_SHIFT           14
-#define OMAP4_HDMI_DDC_SCL_DUPLICATEWAKEUPEVENT_MASK            (1 << 14)
-#define OMAP4_HDMI_CEC_DUPLICATEWAKEUPEVENT_SHIFT               13
-#define OMAP4_HDMI_CEC_DUPLICATEWAKEUPEVENT_MASK                (1 << 13)
-#define OMAP4_HDMI_HPD_DUPLICATEWAKEUPEVENT_SHIFT               12
-#define OMAP4_HDMI_HPD_DUPLICATEWAKEUPEVENT_MASK                (1 << 12)
-#define OMAP4_C2C_DATA15_DUPLICATEWAKEUPEVENT_SHIFT             11
-#define OMAP4_C2C_DATA15_DUPLICATEWAKEUPEVENT_MASK              (1 << 11)
-#define OMAP4_C2C_DATA14_DUPLICATEWAKEUPEVENT_SHIFT             10
-#define OMAP4_C2C_DATA14_DUPLICATEWAKEUPEVENT_MASK              (1 << 10)
-#define OMAP4_C2C_DATA13_DUPLICATEWAKEUPEVENT_SHIFT             9
-#define OMAP4_C2C_DATA13_DUPLICATEWAKEUPEVENT_MASK              (1 << 9)
-#define OMAP4_C2C_DATA12_DUPLICATEWAKEUPEVENT_SHIFT             8
-#define OMAP4_C2C_DATA12_DUPLICATEWAKEUPEVENT_MASK              (1 << 8)
-#define OMAP4_C2C_DATA11_DUPLICATEWAKEUPEVENT_SHIFT             7
-#define OMAP4_C2C_DATA11_DUPLICATEWAKEUPEVENT_MASK              (1 << 7)
-#define OMAP4_GPMC_WAIT1_DUPLICATEWAKEUPEVENT_SHIFT             6
-#define OMAP4_GPMC_WAIT1_DUPLICATEWAKEUPEVENT_MASK              (1 << 6)
-#define OMAP4_GPMC_WAIT0_DUPLICATEWAKEUPEVENT_SHIFT             5
-#define OMAP4_GPMC_WAIT0_DUPLICATEWAKEUPEVENT_MASK              (1 << 5)
-#define OMAP4_GPMC_NBE1_DUPLICATEWAKEUPEVENT_SHIFT              4
-#define OMAP4_GPMC_NBE1_DUPLICATEWAKEUPEVENT_MASK               (1 << 4)
-#define OMAP4_GPMC_NBE0_CLE_DUPLICATEWAKEUPEVENT_SHIFT          3
-#define OMAP4_GPMC_NBE0_CLE_DUPLICATEWAKEUPEVENT_MASK           (1 << 3)
-#define OMAP4_GPMC_NWE_DUPLICATEWAKEUPEVENT_SHIFT               2
-#define OMAP4_GPMC_NWE_DUPLICATEWAKEUPEVENT_MASK                (1 << 2)
-#define OMAP4_GPMC_NOE_DUPLICATEWAKEUPEVENT_SHIFT               1
-#define OMAP4_GPMC_NOE_DUPLICATEWAKEUPEVENT_MASK                (1 << 1)
-#define OMAP4_GPMC_NADV_ALE_DUPLICATEWAKEUPEVENT_SHIFT          0
-#define OMAP4_GPMC_NADV_ALE_DUPLICATEWAKEUPEVENT_MASK           (1 << 0)
-
-/* PADCONF_WAKEUPEVENT_2 */
-#define OMAP4_ABE_MCBSP1_CLKX_DUPLICATEWAKEUPEVENT_SHIFT        31
-#define OMAP4_ABE_MCBSP1_CLKX_DUPLICATEWAKEUPEVENT_MASK         (1 << 31)
-#define OMAP4_ABE_MCBSP2_FSX_DUPLICATEWAKEUPEVENT_SHIFT         30
-#define OMAP4_ABE_MCBSP2_FSX_DUPLICATEWAKEUPEVENT_MASK          (1 << 30)
-#define OMAP4_ABE_MCBSP2_DX_DUPLICATEWAKEUPEVENT_SHIFT          29
-#define OMAP4_ABE_MCBSP2_DX_DUPLICATEWAKEUPEVENT_MASK           (1 << 29)
-#define OMAP4_ABE_MCBSP2_DR_DUPLICATEWAKEUPEVENT_SHIFT          28
-#define OMAP4_ABE_MCBSP2_DR_DUPLICATEWAKEUPEVENT_MASK           (1 << 28)
-#define OMAP4_ABE_MCBSP2_CLKX_DUPLICATEWAKEUPEVENT_SHIFT        27
-#define OMAP4_ABE_MCBSP2_CLKX_DUPLICATEWAKEUPEVENT_MASK         (1 << 27)
-#define OMAP4_SDMMC1_DAT7_DUPLICATEWAKEUPEVENT_SHIFT            26
-#define OMAP4_SDMMC1_DAT7_DUPLICATEWAKEUPEVENT_MASK             (1 << 26)
-#define OMAP4_SDMMC1_DAT6_DUPLICATEWAKEUPEVENT_SHIFT            25
-#define OMAP4_SDMMC1_DAT6_DUPLICATEWAKEUPEVENT_MASK             (1 << 25)
-#define OMAP4_SDMMC1_DAT5_DUPLICATEWAKEUPEVENT_SHIFT            24
-#define OMAP4_SDMMC1_DAT5_DUPLICATEWAKEUPEVENT_MASK             (1 << 24)
-#define OMAP4_SDMMC1_DAT4_DUPLICATEWAKEUPEVENT_SHIFT            23
-#define OMAP4_SDMMC1_DAT4_DUPLICATEWAKEUPEVENT_MASK             (1 << 23)
-#define OMAP4_SDMMC1_DAT3_DUPLICATEWAKEUPEVENT_SHIFT            22
-#define OMAP4_SDMMC1_DAT3_DUPLICATEWAKEUPEVENT_MASK             (1 << 22)
-#define OMAP4_SDMMC1_DAT2_DUPLICATEWAKEUPEVENT_SHIFT            21
-#define OMAP4_SDMMC1_DAT2_DUPLICATEWAKEUPEVENT_MASK             (1 << 21)
-#define OMAP4_SDMMC1_DAT1_DUPLICATEWAKEUPEVENT_SHIFT            20
-#define OMAP4_SDMMC1_DAT1_DUPLICATEWAKEUPEVENT_MASK             (1 << 20)
-#define OMAP4_SDMMC1_DAT0_DUPLICATEWAKEUPEVENT_SHIFT            19
-#define OMAP4_SDMMC1_DAT0_DUPLICATEWAKEUPEVENT_MASK             (1 << 19)
-#define OMAP4_SDMMC1_CMD_DUPLICATEWAKEUPEVENT_SHIFT             18
-#define OMAP4_SDMMC1_CMD_DUPLICATEWAKEUPEVENT_MASK              (1 << 18)
-#define OMAP4_SDMMC1_CLK_DUPLICATEWAKEUPEVENT_SHIFT             17
-#define OMAP4_SDMMC1_CLK_DUPLICATEWAKEUPEVENT_MASK              (1 << 17)
-#define OMAP4_USBC1_ICUSB_DM_DUPLICATEWAKEUPEVENT_SHIFT         16
-#define OMAP4_USBC1_ICUSB_DM_DUPLICATEWAKEUPEVENT_MASK          (1 << 16)
-#define OMAP4_USBC1_ICUSB_DP_DUPLICATEWAKEUPEVENT_SHIFT         15
-#define OMAP4_USBC1_ICUSB_DP_DUPLICATEWAKEUPEVENT_MASK          (1 << 15)
-#define OMAP4_USBB1_HSIC_STROBE_DUPLICATEWAKEUPEVENT_SHIFT      14
-#define OMAP4_USBB1_HSIC_STROBE_DUPLICATEWAKEUPEVENT_MASK       (1 << 14)
-#define OMAP4_USBB1_HSIC_DATA_DUPLICATEWAKEUPEVENT_SHIFT        13
-#define OMAP4_USBB1_HSIC_DATA_DUPLICATEWAKEUPEVENT_MASK         (1 << 13)
-#define OMAP4_USBB1_ULPITLL_DAT7_DUPLICATEWAKEUPEVENT_SHIFT     12
-#define OMAP4_USBB1_ULPITLL_DAT7_DUPLICATEWAKEUPEVENT_MASK      (1 << 12)
-#define OMAP4_USBB1_ULPITLL_DAT6_DUPLICATEWAKEUPEVENT_SHIFT     11
-#define OMAP4_USBB1_ULPITLL_DAT6_DUPLICATEWAKEUPEVENT_MASK      (1 << 11)
-#define OMAP4_USBB1_ULPITLL_DAT5_DUPLICATEWAKEUPEVENT_SHIFT     10
-#define OMAP4_USBB1_ULPITLL_DAT5_DUPLICATEWAKEUPEVENT_MASK      (1 << 10)
-#define OMAP4_USBB1_ULPITLL_DAT4_DUPLICATEWAKEUPEVENT_SHIFT     9
-#define OMAP4_USBB1_ULPITLL_DAT4_DUPLICATEWAKEUPEVENT_MASK      (1 << 9)
-#define OMAP4_USBB1_ULPITLL_DAT3_DUPLICATEWAKEUPEVENT_SHIFT     8
-#define OMAP4_USBB1_ULPITLL_DAT3_DUPLICATEWAKEUPEVENT_MASK      (1 << 8)
-#define OMAP4_USBB1_ULPITLL_DAT2_DUPLICATEWAKEUPEVENT_SHIFT     7
-#define OMAP4_USBB1_ULPITLL_DAT2_DUPLICATEWAKEUPEVENT_MASK      (1 << 7)
-#define OMAP4_USBB1_ULPITLL_DAT1_DUPLICATEWAKEUPEVENT_SHIFT     6
-#define OMAP4_USBB1_ULPITLL_DAT1_DUPLICATEWAKEUPEVENT_MASK      (1 << 6)
-#define OMAP4_USBB1_ULPITLL_DAT0_DUPLICATEWAKEUPEVENT_SHIFT     5
-#define OMAP4_USBB1_ULPITLL_DAT0_DUPLICATEWAKEUPEVENT_MASK      (1 << 5)
-#define OMAP4_USBB1_ULPITLL_NXT_DUPLICATEWAKEUPEVENT_SHIFT      4
-#define OMAP4_USBB1_ULPITLL_NXT_DUPLICATEWAKEUPEVENT_MASK       (1 << 4)
-#define OMAP4_USBB1_ULPITLL_DIR_DUPLICATEWAKEUPEVENT_SHIFT      3
-#define OMAP4_USBB1_ULPITLL_DIR_DUPLICATEWAKEUPEVENT_MASK       (1 << 3)
-#define OMAP4_USBB1_ULPITLL_STP_DUPLICATEWAKEUPEVENT_SHIFT      2
-#define OMAP4_USBB1_ULPITLL_STP_DUPLICATEWAKEUPEVENT_MASK       (1 << 2)
-#define OMAP4_USBB1_ULPITLL_CLK_DUPLICATEWAKEUPEVENT_SHIFT      1
-#define OMAP4_USBB1_ULPITLL_CLK_DUPLICATEWAKEUPEVENT_MASK       (1 << 1)
-#define OMAP4_CAM_GLOBALRESET_DUPLICATEWAKEUPEVENT_SHIFT        0
-#define OMAP4_CAM_GLOBALRESET_DUPLICATEWAKEUPEVENT_MASK         (1 << 0)
-
-/* PADCONF_WAKEUPEVENT_3 */
-#define OMAP4_MCSPI1_CS3_DUPLICATEWAKEUPEVENT_SHIFT             31
-#define OMAP4_MCSPI1_CS3_DUPLICATEWAKEUPEVENT_MASK              (1 << 31)
-#define OMAP4_MCSPI1_CS2_DUPLICATEWAKEUPEVENT_SHIFT             30
-#define OMAP4_MCSPI1_CS2_DUPLICATEWAKEUPEVENT_MASK              (1 << 30)
-#define OMAP4_MCSPI1_CS1_DUPLICATEWAKEUPEVENT_SHIFT             29
-#define OMAP4_MCSPI1_CS1_DUPLICATEWAKEUPEVENT_MASK              (1 << 29)
-#define OMAP4_MCSPI1_CS0_DUPLICATEWAKEUPEVENT_SHIFT             28
-#define OMAP4_MCSPI1_CS0_DUPLICATEWAKEUPEVENT_MASK              (1 << 28)
-#define OMAP4_MCSPI1_SIMO_DUPLICATEWAKEUPEVENT_SHIFT            27
-#define OMAP4_MCSPI1_SIMO_DUPLICATEWAKEUPEVENT_MASK             (1 << 27)
-#define OMAP4_MCSPI1_SOMI_DUPLICATEWAKEUPEVENT_SHIFT            26
-#define OMAP4_MCSPI1_SOMI_DUPLICATEWAKEUPEVENT_MASK             (1 << 26)
-#define OMAP4_MCSPI1_CLK_DUPLICATEWAKEUPEVENT_SHIFT             25
-#define OMAP4_MCSPI1_CLK_DUPLICATEWAKEUPEVENT_MASK              (1 << 25)
-#define OMAP4_I2C4_SDA_DUPLICATEWAKEUPEVENT_SHIFT               24
-#define OMAP4_I2C4_SDA_DUPLICATEWAKEUPEVENT_MASK                (1 << 24)
-#define OMAP4_I2C4_SCL_DUPLICATEWAKEUPEVENT_SHIFT               23
-#define OMAP4_I2C4_SCL_DUPLICATEWAKEUPEVENT_MASK                (1 << 23)
-#define OMAP4_I2C3_SDA_DUPLICATEWAKEUPEVENT_SHIFT               22
-#define OMAP4_I2C3_SDA_DUPLICATEWAKEUPEVENT_MASK                (1 << 22)
-#define OMAP4_I2C3_SCL_DUPLICATEWAKEUPEVENT_SHIFT               21
-#define OMAP4_I2C3_SCL_DUPLICATEWAKEUPEVENT_MASK                (1 << 21)
-#define OMAP4_I2C2_SDA_DUPLICATEWAKEUPEVENT_SHIFT               20
-#define OMAP4_I2C2_SDA_DUPLICATEWAKEUPEVENT_MASK                (1 << 20)
-#define OMAP4_I2C2_SCL_DUPLICATEWAKEUPEVENT_SHIFT               19
-#define OMAP4_I2C2_SCL_DUPLICATEWAKEUPEVENT_MASK                (1 << 19)
-#define OMAP4_I2C1_SDA_DUPLICATEWAKEUPEVENT_SHIFT               18
-#define OMAP4_I2C1_SDA_DUPLICATEWAKEUPEVENT_MASK                (1 << 18)
-#define OMAP4_I2C1_SCL_DUPLICATEWAKEUPEVENT_SHIFT               17
-#define OMAP4_I2C1_SCL_DUPLICATEWAKEUPEVENT_MASK                (1 << 17)
-#define OMAP4_HDQ_SIO_DUPLICATEWAKEUPEVENT_SHIFT                16
-#define OMAP4_HDQ_SIO_DUPLICATEWAKEUPEVENT_MASK                 (1 << 16)
-#define OMAP4_UART2_TX_DUPLICATEWAKEUPEVENT_SHIFT               15
-#define OMAP4_UART2_TX_DUPLICATEWAKEUPEVENT_MASK                (1 << 15)
-#define OMAP4_UART2_RX_DUPLICATEWAKEUPEVENT_SHIFT               14
-#define OMAP4_UART2_RX_DUPLICATEWAKEUPEVENT_MASK                (1 << 14)
-#define OMAP4_UART2_RTS_DUPLICATEWAKEUPEVENT_SHIFT              13
-#define OMAP4_UART2_RTS_DUPLICATEWAKEUPEVENT_MASK               (1 << 13)
-#define OMAP4_UART2_CTS_DUPLICATEWAKEUPEVENT_SHIFT              12
-#define OMAP4_UART2_CTS_DUPLICATEWAKEUPEVENT_MASK               (1 << 12)
-#define OMAP4_ABE_DMIC_DIN3_DUPLICATEWAKEUPEVENT_SHIFT          11
-#define OMAP4_ABE_DMIC_DIN3_DUPLICATEWAKEUPEVENT_MASK           (1 << 11)
-#define OMAP4_ABE_DMIC_DIN2_DUPLICATEWAKEUPEVENT_SHIFT          10
-#define OMAP4_ABE_DMIC_DIN2_DUPLICATEWAKEUPEVENT_MASK           (1 << 10)
-#define OMAP4_ABE_DMIC_DIN1_DUPLICATEWAKEUPEVENT_SHIFT          9
-#define OMAP4_ABE_DMIC_DIN1_DUPLICATEWAKEUPEVENT_MASK           (1 << 9)
-#define OMAP4_ABE_DMIC_CLK1_DUPLICATEWAKEUPEVENT_SHIFT          8
-#define OMAP4_ABE_DMIC_CLK1_DUPLICATEWAKEUPEVENT_MASK           (1 << 8)
-#define OMAP4_ABE_CLKS_DUPLICATEWAKEUPEVENT_SHIFT               7
-#define OMAP4_ABE_CLKS_DUPLICATEWAKEUPEVENT_MASK                (1 << 7)
-#define OMAP4_ABE_PDM_LB_CLK_DUPLICATEWAKEUPEVENT_SHIFT         6
-#define OMAP4_ABE_PDM_LB_CLK_DUPLICATEWAKEUPEVENT_MASK          (1 << 6)
-#define OMAP4_ABE_PDM_FRAME_DUPLICATEWAKEUPEVENT_SHIFT          5
-#define OMAP4_ABE_PDM_FRAME_DUPLICATEWAKEUPEVENT_MASK           (1 << 5)
-#define OMAP4_ABE_PDM_DL_DATA_DUPLICATEWAKEUPEVENT_SHIFT        4
-#define OMAP4_ABE_PDM_DL_DATA_DUPLICATEWAKEUPEVENT_MASK         (1 << 4)
-#define OMAP4_ABE_PDM_UL_DATA_DUPLICATEWAKEUPEVENT_SHIFT        3
-#define OMAP4_ABE_PDM_UL_DATA_DUPLICATEWAKEUPEVENT_MASK         (1 << 3)
-#define OMAP4_ABE_MCBSP1_FSX_DUPLICATEWAKEUPEVENT_SHIFT         2
-#define OMAP4_ABE_MCBSP1_FSX_DUPLICATEWAKEUPEVENT_MASK          (1 << 2)
-#define OMAP4_ABE_MCBSP1_DX_DUPLICATEWAKEUPEVENT_SHIFT          1
-#define OMAP4_ABE_MCBSP1_DX_DUPLICATEWAKEUPEVENT_MASK           (1 << 1)
-#define OMAP4_ABE_MCBSP1_DR_DUPLICATEWAKEUPEVENT_SHIFT          0
-#define OMAP4_ABE_MCBSP1_DR_DUPLICATEWAKEUPEVENT_MASK           (1 << 0)
-
-/* PADCONF_WAKEUPEVENT_4 */
-#define OMAP4_UNIPRO_TY0_DUPLICATEWAKEUPEVENT_SHIFT             31
-#define OMAP4_UNIPRO_TY0_DUPLICATEWAKEUPEVENT_MASK              (1 << 31)
-#define OMAP4_UNIPRO_TX0_DUPLICATEWAKEUPEVENT_SHIFT             30
-#define OMAP4_UNIPRO_TX0_DUPLICATEWAKEUPEVENT_MASK              (1 << 30)
-#define OMAP4_USBB2_HSIC_STROBE_DUPLICATEWAKEUPEVENT_SHIFT      29
-#define OMAP4_USBB2_HSIC_STROBE_DUPLICATEWAKEUPEVENT_MASK       (1 << 29)
-#define OMAP4_USBB2_HSIC_DATA_DUPLICATEWAKEUPEVENT_SHIFT        28
-#define OMAP4_USBB2_HSIC_DATA_DUPLICATEWAKEUPEVENT_MASK         (1 << 28)
-#define OMAP4_USBB2_ULPITLL_DAT7_DUPLICATEWAKEUPEVENT_SHIFT     27
-#define OMAP4_USBB2_ULPITLL_DAT7_DUPLICATEWAKEUPEVENT_MASK      (1 << 27)
-#define OMAP4_USBB2_ULPITLL_DAT6_DUPLICATEWAKEUPEVENT_SHIFT     26
-#define OMAP4_USBB2_ULPITLL_DAT6_DUPLICATEWAKEUPEVENT_MASK      (1 << 26)
-#define OMAP4_USBB2_ULPITLL_DAT5_DUPLICATEWAKEUPEVENT_SHIFT     25
-#define OMAP4_USBB2_ULPITLL_DAT5_DUPLICATEWAKEUPEVENT_MASK      (1 << 25)
-#define OMAP4_USBB2_ULPITLL_DAT4_DUPLICATEWAKEUPEVENT_SHIFT     24
-#define OMAP4_USBB2_ULPITLL_DAT4_DUPLICATEWAKEUPEVENT_MASK      (1 << 24)
-#define OMAP4_USBB2_ULPITLL_DAT3_DUPLICATEWAKEUPEVENT_SHIFT     23
-#define OMAP4_USBB2_ULPITLL_DAT3_DUPLICATEWAKEUPEVENT_MASK      (1 << 23)
-#define OMAP4_USBB2_ULPITLL_DAT2_DUPLICATEWAKEUPEVENT_SHIFT     22
-#define OMAP4_USBB2_ULPITLL_DAT2_DUPLICATEWAKEUPEVENT_MASK      (1 << 22)
-#define OMAP4_USBB2_ULPITLL_DAT1_DUPLICATEWAKEUPEVENT_SHIFT     21
-#define OMAP4_USBB2_ULPITLL_DAT1_DUPLICATEWAKEUPEVENT_MASK      (1 << 21)
-#define OMAP4_USBB2_ULPITLL_DAT0_DUPLICATEWAKEUPEVENT_SHIFT     20
-#define OMAP4_USBB2_ULPITLL_DAT0_DUPLICATEWAKEUPEVENT_MASK      (1 << 20)
-#define OMAP4_USBB2_ULPITLL_NXT_DUPLICATEWAKEUPEVENT_SHIFT      19
-#define OMAP4_USBB2_ULPITLL_NXT_DUPLICATEWAKEUPEVENT_MASK       (1 << 19)
-#define OMAP4_USBB2_ULPITLL_DIR_DUPLICATEWAKEUPEVENT_SHIFT      18
-#define OMAP4_USBB2_ULPITLL_DIR_DUPLICATEWAKEUPEVENT_MASK       (1 << 18)
-#define OMAP4_USBB2_ULPITLL_STP_DUPLICATEWAKEUPEVENT_SHIFT      17
-#define OMAP4_USBB2_ULPITLL_STP_DUPLICATEWAKEUPEVENT_MASK       (1 << 17)
-#define OMAP4_USBB2_ULPITLL_CLK_DUPLICATEWAKEUPEVENT_SHIFT      16
-#define OMAP4_USBB2_ULPITLL_CLK_DUPLICATEWAKEUPEVENT_MASK       (1 << 16)
-#define OMAP4_UART4_TX_DUPLICATEWAKEUPEVENT_SHIFT               15
-#define OMAP4_UART4_TX_DUPLICATEWAKEUPEVENT_MASK                (1 << 15)
-#define OMAP4_UART4_RX_DUPLICATEWAKEUPEVENT_SHIFT               14
-#define OMAP4_UART4_RX_DUPLICATEWAKEUPEVENT_MASK                (1 << 14)
-#define OMAP4_MCSPI4_CS0_DUPLICATEWAKEUPEVENT_SHIFT             13
-#define OMAP4_MCSPI4_CS0_DUPLICATEWAKEUPEVENT_MASK              (1 << 13)
-#define OMAP4_MCSPI4_SOMI_DUPLICATEWAKEUPEVENT_SHIFT            12
-#define OMAP4_MCSPI4_SOMI_DUPLICATEWAKEUPEVENT_MASK             (1 << 12)
-#define OMAP4_MCSPI4_SIMO_DUPLICATEWAKEUPEVENT_SHIFT            11
-#define OMAP4_MCSPI4_SIMO_DUPLICATEWAKEUPEVENT_MASK             (1 << 11)
-#define OMAP4_MCSPI4_CLK_DUPLICATEWAKEUPEVENT_SHIFT             10
-#define OMAP4_MCSPI4_CLK_DUPLICATEWAKEUPEVENT_MASK              (1 << 10)
-#define OMAP4_SDMMC5_DAT3_DUPLICATEWAKEUPEVENT_SHIFT            9
-#define OMAP4_SDMMC5_DAT3_DUPLICATEWAKEUPEVENT_MASK             (1 << 9)
-#define OMAP4_SDMMC5_DAT2_DUPLICATEWAKEUPEVENT_SHIFT            8
-#define OMAP4_SDMMC5_DAT2_DUPLICATEWAKEUPEVENT_MASK             (1 << 8)
-#define OMAP4_SDMMC5_DAT1_DUPLICATEWAKEUPEVENT_SHIFT            7
-#define OMAP4_SDMMC5_DAT1_DUPLICATEWAKEUPEVENT_MASK             (1 << 7)
-#define OMAP4_SDMMC5_DAT0_DUPLICATEWAKEUPEVENT_SHIFT            6
-#define OMAP4_SDMMC5_DAT0_DUPLICATEWAKEUPEVENT_MASK             (1 << 6)
-#define OMAP4_SDMMC5_CMD_DUPLICATEWAKEUPEVENT_SHIFT             5
-#define OMAP4_SDMMC5_CMD_DUPLICATEWAKEUPEVENT_MASK              (1 << 5)
-#define OMAP4_SDMMC5_CLK_DUPLICATEWAKEUPEVENT_SHIFT             4
-#define OMAP4_SDMMC5_CLK_DUPLICATEWAKEUPEVENT_MASK              (1 << 4)
-#define OMAP4_UART3_TX_IRTX_DUPLICATEWAKEUPEVENT_SHIFT          3
-#define OMAP4_UART3_TX_IRTX_DUPLICATEWAKEUPEVENT_MASK           (1 << 3)
-#define OMAP4_UART3_RX_IRRX_DUPLICATEWAKEUPEVENT_SHIFT          2
-#define OMAP4_UART3_RX_IRRX_DUPLICATEWAKEUPEVENT_MASK           (1 << 2)
-#define OMAP4_UART3_RTS_SD_DUPLICATEWAKEUPEVENT_SHIFT           1
-#define OMAP4_UART3_RTS_SD_DUPLICATEWAKEUPEVENT_MASK            (1 << 1)
-#define OMAP4_UART3_CTS_RCTX_DUPLICATEWAKEUPEVENT_SHIFT         0
-#define OMAP4_UART3_CTS_RCTX_DUPLICATEWAKEUPEVENT_MASK          (1 << 0)
-
-/* PADCONF_WAKEUPEVENT_5 */
-#define OMAP4_DPM_EMU11_DUPLICATEWAKEUPEVENT_SHIFT              31
-#define OMAP4_DPM_EMU11_DUPLICATEWAKEUPEVENT_MASK               (1 << 31)
-#define OMAP4_DPM_EMU10_DUPLICATEWAKEUPEVENT_SHIFT              30
-#define OMAP4_DPM_EMU10_DUPLICATEWAKEUPEVENT_MASK               (1 << 30)
-#define OMAP4_DPM_EMU9_DUPLICATEWAKEUPEVENT_SHIFT               29
-#define OMAP4_DPM_EMU9_DUPLICATEWAKEUPEVENT_MASK                (1 << 29)
-#define OMAP4_DPM_EMU8_DUPLICATEWAKEUPEVENT_SHIFT               28
-#define OMAP4_DPM_EMU8_DUPLICATEWAKEUPEVENT_MASK                (1 << 28)
-#define OMAP4_DPM_EMU7_DUPLICATEWAKEUPEVENT_SHIFT               27
-#define OMAP4_DPM_EMU7_DUPLICATEWAKEUPEVENT_MASK                (1 << 27)
-#define OMAP4_DPM_EMU6_DUPLICATEWAKEUPEVENT_SHIFT               26
-#define OMAP4_DPM_EMU6_DUPLICATEWAKEUPEVENT_MASK                (1 << 26)
-#define OMAP4_DPM_EMU5_DUPLICATEWAKEUPEVENT_SHIFT               25
-#define OMAP4_DPM_EMU5_DUPLICATEWAKEUPEVENT_MASK                (1 << 25)
-#define OMAP4_DPM_EMU4_DUPLICATEWAKEUPEVENT_SHIFT               24
-#define OMAP4_DPM_EMU4_DUPLICATEWAKEUPEVENT_MASK                (1 << 24)
-#define OMAP4_DPM_EMU3_DUPLICATEWAKEUPEVENT_SHIFT               23
-#define OMAP4_DPM_EMU3_DUPLICATEWAKEUPEVENT_MASK                (1 << 23)
-#define OMAP4_DPM_EMU2_DUPLICATEWAKEUPEVENT_SHIFT               22
-#define OMAP4_DPM_EMU2_DUPLICATEWAKEUPEVENT_MASK                (1 << 22)
-#define OMAP4_DPM_EMU1_DUPLICATEWAKEUPEVENT_SHIFT               21
-#define OMAP4_DPM_EMU1_DUPLICATEWAKEUPEVENT_MASK                (1 << 21)
-#define OMAP4_DPM_EMU0_DUPLICATEWAKEUPEVENT_SHIFT               20
-#define OMAP4_DPM_EMU0_DUPLICATEWAKEUPEVENT_MASK                (1 << 20)
-#define OMAP4_SYS_BOOT5_DUPLICATEWAKEUPEVENT_SHIFT              19
-#define OMAP4_SYS_BOOT5_DUPLICATEWAKEUPEVENT_MASK               (1 << 19)
-#define OMAP4_SYS_BOOT4_DUPLICATEWAKEUPEVENT_SHIFT              18
-#define OMAP4_SYS_BOOT4_DUPLICATEWAKEUPEVENT_MASK               (1 << 18)
-#define OMAP4_SYS_BOOT3_DUPLICATEWAKEUPEVENT_SHIFT              17
-#define OMAP4_SYS_BOOT3_DUPLICATEWAKEUPEVENT_MASK               (1 << 17)
-#define OMAP4_SYS_BOOT2_DUPLICATEWAKEUPEVENT_SHIFT              16
-#define OMAP4_SYS_BOOT2_DUPLICATEWAKEUPEVENT_MASK               (1 << 16)
-#define OMAP4_SYS_BOOT1_DUPLICATEWAKEUPEVENT_SHIFT              15
-#define OMAP4_SYS_BOOT1_DUPLICATEWAKEUPEVENT_MASK               (1 << 15)
-#define OMAP4_SYS_BOOT0_DUPLICATEWAKEUPEVENT_SHIFT              14
-#define OMAP4_SYS_BOOT0_DUPLICATEWAKEUPEVENT_MASK               (1 << 14)
-#define OMAP4_SYS_NIRQ2_DUPLICATEWAKEUPEVENT_SHIFT              13
-#define OMAP4_SYS_NIRQ2_DUPLICATEWAKEUPEVENT_MASK               (1 << 13)
-#define OMAP4_SYS_NIRQ1_DUPLICATEWAKEUPEVENT_SHIFT              12
-#define OMAP4_SYS_NIRQ1_DUPLICATEWAKEUPEVENT_MASK               (1 << 12)
-#define OMAP4_FREF_CLK2_OUT_DUPLICATEWAKEUPEVENT_SHIFT          11
-#define OMAP4_FREF_CLK2_OUT_DUPLICATEWAKEUPEVENT_MASK           (1 << 11)
-#define OMAP4_FREF_CLK1_OUT_DUPLICATEWAKEUPEVENT_SHIFT          10
-#define OMAP4_FREF_CLK1_OUT_DUPLICATEWAKEUPEVENT_MASK           (1 << 10)
-#define OMAP4_UNIPRO_RY2_DUPLICATEWAKEUPEVENT_SHIFT             9
-#define OMAP4_UNIPRO_RY2_DUPLICATEWAKEUPEVENT_MASK              (1 << 9)
-#define OMAP4_UNIPRO_RX2_DUPLICATEWAKEUPEVENT_SHIFT             8
-#define OMAP4_UNIPRO_RX2_DUPLICATEWAKEUPEVENT_MASK              (1 << 8)
-#define OMAP4_UNIPRO_RY1_DUPLICATEWAKEUPEVENT_SHIFT             7
-#define OMAP4_UNIPRO_RY1_DUPLICATEWAKEUPEVENT_MASK              (1 << 7)
-#define OMAP4_UNIPRO_RX1_DUPLICATEWAKEUPEVENT_SHIFT             6
-#define OMAP4_UNIPRO_RX1_DUPLICATEWAKEUPEVENT_MASK              (1 << 6)
-#define OMAP4_UNIPRO_RY0_DUPLICATEWAKEUPEVENT_SHIFT             5
-#define OMAP4_UNIPRO_RY0_DUPLICATEWAKEUPEVENT_MASK              (1 << 5)
-#define OMAP4_UNIPRO_RX0_DUPLICATEWAKEUPEVENT_SHIFT             4
-#define OMAP4_UNIPRO_RX0_DUPLICATEWAKEUPEVENT_MASK              (1 << 4)
-#define OMAP4_UNIPRO_TY2_DUPLICATEWAKEUPEVENT_SHIFT             3
-#define OMAP4_UNIPRO_TY2_DUPLICATEWAKEUPEVENT_MASK              (1 << 3)
-#define OMAP4_UNIPRO_TX2_DUPLICATEWAKEUPEVENT_SHIFT             2
-#define OMAP4_UNIPRO_TX2_DUPLICATEWAKEUPEVENT_MASK              (1 << 2)
-#define OMAP4_UNIPRO_TY1_DUPLICATEWAKEUPEVENT_SHIFT             1
-#define OMAP4_UNIPRO_TY1_DUPLICATEWAKEUPEVENT_MASK              (1 << 1)
-#define OMAP4_UNIPRO_TX1_DUPLICATEWAKEUPEVENT_SHIFT             0
-#define OMAP4_UNIPRO_TX1_DUPLICATEWAKEUPEVENT_MASK              (1 << 0)
-
-/* PADCONF_WAKEUPEVENT_6 */
-#define OMAP4_DPM_EMU19_DUPLICATEWAKEUPEVENT_SHIFT              7
-#define OMAP4_DPM_EMU19_DUPLICATEWAKEUPEVENT_MASK               (1 << 7)
-#define OMAP4_DPM_EMU18_DUPLICATEWAKEUPEVENT_SHIFT              6
-#define OMAP4_DPM_EMU18_DUPLICATEWAKEUPEVENT_MASK               (1 << 6)
-#define OMAP4_DPM_EMU17_DUPLICATEWAKEUPEVENT_SHIFT              5
-#define OMAP4_DPM_EMU17_DUPLICATEWAKEUPEVENT_MASK               (1 << 5)
-#define OMAP4_DPM_EMU16_DUPLICATEWAKEUPEVENT_SHIFT              4
-#define OMAP4_DPM_EMU16_DUPLICATEWAKEUPEVENT_MASK               (1 << 4)
-#define OMAP4_DPM_EMU15_DUPLICATEWAKEUPEVENT_SHIFT              3
-#define OMAP4_DPM_EMU15_DUPLICATEWAKEUPEVENT_MASK               (1 << 3)
-#define OMAP4_DPM_EMU14_DUPLICATEWAKEUPEVENT_SHIFT              2
-#define OMAP4_DPM_EMU14_DUPLICATEWAKEUPEVENT_MASK               (1 << 2)
-#define OMAP4_DPM_EMU13_DUPLICATEWAKEUPEVENT_SHIFT              1
-#define OMAP4_DPM_EMU13_DUPLICATEWAKEUPEVENT_MASK               (1 << 1)
-#define OMAP4_DPM_EMU12_DUPLICATEWAKEUPEVENT_SHIFT              0
-#define OMAP4_DPM_EMU12_DUPLICATEWAKEUPEVENT_MASK               (1 << 0)
-
-/* CONTROL_PADCONF_GLOBAL */
-#define OMAP4_FORCE_OFFMODE_EN_SHIFT                            31
-#define OMAP4_FORCE_OFFMODE_EN_MASK                             (1 << 31)
-
-/* CONTROL_PADCONF_MODE */
-#define OMAP4_VDDS_DV_BANK0_SHIFT                               31
-#define OMAP4_VDDS_DV_BANK0_MASK                                (1 << 31)
-#define OMAP4_VDDS_DV_BANK1_SHIFT                               30
-#define OMAP4_VDDS_DV_BANK1_MASK                                (1 << 30)
-#define OMAP4_VDDS_DV_BANK3_SHIFT                               29
-#define OMAP4_VDDS_DV_BANK3_MASK                                (1 << 29)
-#define OMAP4_VDDS_DV_BANK4_SHIFT                               28
-#define OMAP4_VDDS_DV_BANK4_MASK                                (1 << 28)
-#define OMAP4_VDDS_DV_BANK5_SHIFT                               27
-#define OMAP4_VDDS_DV_BANK5_MASK                                (1 << 27)
-#define OMAP4_VDDS_DV_BANK6_SHIFT                               26
-#define OMAP4_VDDS_DV_BANK6_MASK                                (1 << 26)
-#define OMAP4_VDDS_DV_C2C_SHIFT                                 25
-#define OMAP4_VDDS_DV_C2C_MASK                                  (1 << 25)
-#define OMAP4_VDDS_DV_CAM_SHIFT                                 24
-#define OMAP4_VDDS_DV_CAM_MASK                                  (1 << 24)
-#define OMAP4_VDDS_DV_GPMC_SHIFT                                23
-#define OMAP4_VDDS_DV_GPMC_MASK                                 (1 << 23)
-#define OMAP4_VDDS_DV_SDMMC2_SHIFT                              22
-#define OMAP4_VDDS_DV_SDMMC2_MASK                               (1 << 22)
-
-/* CONTROL_SMART1IO_PADCONF_0 */
-#define OMAP4_ABE_DR0_SC_SHIFT                                  30
-#define OMAP4_ABE_DR0_SC_MASK                                   (0x3 << 30)
-#define OMAP4_CAM_DR0_SC_SHIFT                                  28
-#define OMAP4_CAM_DR0_SC_MASK                                   (0x3 << 28)
-#define OMAP4_FREF_DR2_SC_SHIFT                                 26
-#define OMAP4_FREF_DR2_SC_MASK                                  (0x3 << 26)
-#define OMAP4_FREF_DR3_SC_SHIFT                                 24
-#define OMAP4_FREF_DR3_SC_MASK                                  (0x3 << 24)
-#define OMAP4_GPIO_DR8_SC_SHIFT                                 22
-#define OMAP4_GPIO_DR8_SC_MASK                                  (0x3 << 22)
-#define OMAP4_GPIO_DR9_SC_SHIFT                                 20
-#define OMAP4_GPIO_DR9_SC_MASK                                  (0x3 << 20)
-#define OMAP4_GPMC_DR2_SC_SHIFT                                 18
-#define OMAP4_GPMC_DR2_SC_MASK                                  (0x3 << 18)
-#define OMAP4_GPMC_DR3_SC_SHIFT                                 16
-#define OMAP4_GPMC_DR3_SC_MASK                                  (0x3 << 16)
-#define OMAP4_GPMC_DR6_SC_SHIFT                                 14
-#define OMAP4_GPMC_DR6_SC_MASK                                  (0x3 << 14)
-#define OMAP4_HDMI_DR0_SC_SHIFT                                 12
-#define OMAP4_HDMI_DR0_SC_MASK                                  (0x3 << 12)
-#define OMAP4_MCSPI1_DR0_SC_SHIFT                               10
-#define OMAP4_MCSPI1_DR0_SC_MASK                                (0x3 << 10)
-#define OMAP4_UART1_DR0_SC_SHIFT                                8
-#define OMAP4_UART1_DR0_SC_MASK                                 (0x3 << 8)
-#define OMAP4_UART3_DR0_SC_SHIFT                                6
-#define OMAP4_UART3_DR0_SC_MASK                                 (0x3 << 6)
-#define OMAP4_UART3_DR1_SC_SHIFT                                4
-#define OMAP4_UART3_DR1_SC_MASK                                 (0x3 << 4)
-#define OMAP4_UNIPRO_DR0_SC_SHIFT                               2
-#define OMAP4_UNIPRO_DR0_SC_MASK                                (0x3 << 2)
-#define OMAP4_UNIPRO_DR1_SC_SHIFT                               0
-#define OMAP4_UNIPRO_DR1_SC_MASK                                (0x3 << 0)
-
-/* CONTROL_SMART1IO_PADCONF_1 */
-#define OMAP4_ABE_DR0_LB_SHIFT                                  30
-#define OMAP4_ABE_DR0_LB_MASK                                   (0x3 << 30)
-#define OMAP4_CAM_DR0_LB_SHIFT                                  28
-#define OMAP4_CAM_DR0_LB_MASK                                   (0x3 << 28)
-#define OMAP4_FREF_DR2_LB_SHIFT                                 26
-#define OMAP4_FREF_DR2_LB_MASK                                  (0x3 << 26)
-#define OMAP4_FREF_DR3_LB_SHIFT                                 24
-#define OMAP4_FREF_DR3_LB_MASK                                  (0x3 << 24)
-#define OMAP4_GPIO_DR8_LB_SHIFT                                 22
-#define OMAP4_GPIO_DR8_LB_MASK                                  (0x3 << 22)
-#define OMAP4_GPIO_DR9_LB_SHIFT                                 20
-#define OMAP4_GPIO_DR9_LB_MASK                                  (0x3 << 20)
-#define OMAP4_GPMC_DR2_LB_SHIFT                                 18
-#define OMAP4_GPMC_DR2_LB_MASK                                  (0x3 << 18)
-#define OMAP4_GPMC_DR3_LB_SHIFT                                 16
-#define OMAP4_GPMC_DR3_LB_MASK                                  (0x3 << 16)
-#define OMAP4_GPMC_DR6_LB_SHIFT                                 14
-#define OMAP4_GPMC_DR6_LB_MASK                                  (0x3 << 14)
-#define OMAP4_HDMI_DR0_LB_SHIFT                                 12
-#define OMAP4_HDMI_DR0_LB_MASK                                  (0x3 << 12)
-#define OMAP4_MCSPI1_DR0_LB_SHIFT                               10
-#define OMAP4_MCSPI1_DR0_LB_MASK                                (0x3 << 10)
-#define OMAP4_UART1_DR0_LB_SHIFT                                8
-#define OMAP4_UART1_DR0_LB_MASK                                 (0x3 << 8)
-#define OMAP4_UART3_DR0_LB_SHIFT                                6
-#define OMAP4_UART3_DR0_LB_MASK                                 (0x3 << 6)
-#define OMAP4_UART3_DR1_LB_SHIFT                                4
-#define OMAP4_UART3_DR1_LB_MASK                                 (0x3 << 4)
-#define OMAP4_UNIPRO_DR0_LB_SHIFT                               2
-#define OMAP4_UNIPRO_DR0_LB_MASK                                (0x3 << 2)
-#define OMAP4_UNIPRO_DR1_LB_SHIFT                               0
-#define OMAP4_UNIPRO_DR1_LB_MASK                                (0x3 << 0)
-
-/* CONTROL_SMART2IO_PADCONF_0 */
-#define OMAP4_C2C_DR0_LB_SHIFT                                  31
-#define OMAP4_C2C_DR0_LB_MASK                                   (1 << 31)
-#define OMAP4_DPM_DR1_LB_SHIFT                                  30
-#define OMAP4_DPM_DR1_LB_MASK                                   (1 << 30)
-#define OMAP4_DPM_DR2_LB_SHIFT                                  29
-#define OMAP4_DPM_DR2_LB_MASK                                   (1 << 29)
-#define OMAP4_DPM_DR3_LB_SHIFT                                  28
-#define OMAP4_DPM_DR3_LB_MASK                                   (1 << 28)
-#define OMAP4_GPIO_DR0_LB_SHIFT                                 27
-#define OMAP4_GPIO_DR0_LB_MASK                                  (1 << 27)
-#define OMAP4_GPIO_DR1_LB_SHIFT                                 26
-#define OMAP4_GPIO_DR1_LB_MASK                                  (1 << 26)
-#define OMAP4_GPIO_DR10_LB_SHIFT                                25
-#define OMAP4_GPIO_DR10_LB_MASK                                 (1 << 25)
-#define OMAP4_GPIO_DR2_LB_SHIFT                                 24
-#define OMAP4_GPIO_DR2_LB_MASK                                  (1 << 24)
-#define OMAP4_GPMC_DR0_LB_SHIFT                                 23
-#define OMAP4_GPMC_DR0_LB_MASK                                  (1 << 23)
-#define OMAP4_GPMC_DR1_LB_SHIFT                                 22
-#define OMAP4_GPMC_DR1_LB_MASK                                  (1 << 22)
-#define OMAP4_GPMC_DR4_LB_SHIFT                                 21
-#define OMAP4_GPMC_DR4_LB_MASK                                  (1 << 21)
-#define OMAP4_GPMC_DR5_LB_SHIFT                                 20
-#define OMAP4_GPMC_DR5_LB_MASK                                  (1 << 20)
-#define OMAP4_GPMC_DR7_LB_SHIFT                                 19
-#define OMAP4_GPMC_DR7_LB_MASK                                  (1 << 19)
-#define OMAP4_HSI2_DR0_LB_SHIFT                                 18
-#define OMAP4_HSI2_DR0_LB_MASK                                  (1 << 18)
-#define OMAP4_HSI2_DR1_LB_SHIFT                                 17
-#define OMAP4_HSI2_DR1_LB_MASK                                  (1 << 17)
-#define OMAP4_HSI2_DR2_LB_SHIFT                                 16
-#define OMAP4_HSI2_DR2_LB_MASK                                  (1 << 16)
-#define OMAP4_KPD_DR0_LB_SHIFT                                  15
-#define OMAP4_KPD_DR0_LB_MASK                                   (1 << 15)
-#define OMAP4_KPD_DR1_LB_SHIFT                                  14
-#define OMAP4_KPD_DR1_LB_MASK                                   (1 << 14)
-#define OMAP4_PDM_DR0_LB_SHIFT                                  13
-#define OMAP4_PDM_DR0_LB_MASK                                   (1 << 13)
-#define OMAP4_SDMMC2_DR0_LB_SHIFT                               12
-#define OMAP4_SDMMC2_DR0_LB_MASK                                (1 << 12)
-#define OMAP4_SDMMC3_DR0_LB_SHIFT                               11
-#define OMAP4_SDMMC3_DR0_LB_MASK                                (1 << 11)
-#define OMAP4_SDMMC4_DR0_LB_SHIFT                               10
-#define OMAP4_SDMMC4_DR0_LB_MASK                                (1 << 10)
-#define OMAP4_SDMMC4_DR1_LB_SHIFT                               9
-#define OMAP4_SDMMC4_DR1_LB_MASK                                (1 << 9)
-#define OMAP4_SPI3_DR0_LB_SHIFT                                 8
-#define OMAP4_SPI3_DR0_LB_MASK                                  (1 << 8)
-#define OMAP4_SPI3_DR1_LB_SHIFT                                 7
-#define OMAP4_SPI3_DR1_LB_MASK                                  (1 << 7)
-#define OMAP4_UART3_DR2_LB_SHIFT                                6
-#define OMAP4_UART3_DR2_LB_MASK                                 (1 << 6)
-#define OMAP4_UART3_DR3_LB_SHIFT                                5
-#define OMAP4_UART3_DR3_LB_MASK                                 (1 << 5)
-#define OMAP4_UART3_DR4_LB_SHIFT                                4
-#define OMAP4_UART3_DR4_LB_MASK                                 (1 << 4)
-#define OMAP4_UART3_DR5_LB_SHIFT                                3
-#define OMAP4_UART3_DR5_LB_MASK                                 (1 << 3)
-#define OMAP4_USBA0_DR1_LB_SHIFT                                2
-#define OMAP4_USBA0_DR1_LB_MASK                                 (1 << 2)
-#define OMAP4_USBA_DR2_LB_SHIFT                                 1
-#define OMAP4_USBA_DR2_LB_MASK                                  (1 << 1)
-
-/* CONTROL_SMART2IO_PADCONF_1 */
-#define OMAP4_USBB1_DR0_LB_SHIFT                                31
-#define OMAP4_USBB1_DR0_LB_MASK                                 (1 << 31)
-#define OMAP4_USBB2_DR0_LB_SHIFT                                30
-#define OMAP4_USBB2_DR0_LB_MASK                                 (1 << 30)
-#define OMAP4_USBA0_DR0_LB_SHIFT                                29
-#define OMAP4_USBA0_DR0_LB_MASK                                 (1 << 29)
-
-/* CONTROL_SMART3IO_PADCONF_0 */
-#define OMAP4_DMIC_DR0_MB_SHIFT                                 30
-#define OMAP4_DMIC_DR0_MB_MASK                                  (0x3 << 30)
-#define OMAP4_GPIO_DR3_MB_SHIFT                                 28
-#define OMAP4_GPIO_DR3_MB_MASK                                  (0x3 << 28)
-#define OMAP4_GPIO_DR4_MB_SHIFT                                 26
-#define OMAP4_GPIO_DR4_MB_MASK                                  (0x3 << 26)
-#define OMAP4_GPIO_DR5_MB_SHIFT                                 24
-#define OMAP4_GPIO_DR5_MB_MASK                                  (0x3 << 24)
-#define OMAP4_GPIO_DR6_MB_SHIFT                                 22
-#define OMAP4_GPIO_DR6_MB_MASK                                  (0x3 << 22)
-#define OMAP4_HSI_DR1_MB_SHIFT                                  20
-#define OMAP4_HSI_DR1_MB_MASK                                   (0x3 << 20)
-#define OMAP4_HSI_DR2_MB_SHIFT                                  18
-#define OMAP4_HSI_DR2_MB_MASK                                   (0x3 << 18)
-#define OMAP4_HSI_DR3_MB_SHIFT                                  16
-#define OMAP4_HSI_DR3_MB_MASK                                   (0x3 << 16)
-#define OMAP4_MCBSP2_DR0_MB_SHIFT                               14
-#define OMAP4_MCBSP2_DR0_MB_MASK                                (0x3 << 14)
-#define OMAP4_MCSPI4_DR0_MB_SHIFT                               12
-#define OMAP4_MCSPI4_DR0_MB_MASK                                (0x3 << 12)
-#define OMAP4_MCSPI4_DR1_MB_SHIFT                               10
-#define OMAP4_MCSPI4_DR1_MB_MASK                                (0x3 << 10)
-#define OMAP4_SDMMC3_DR0_MB_SHIFT                               8
-#define OMAP4_SDMMC3_DR0_MB_MASK                                (0x3 << 8)
-#define OMAP4_SPI2_DR0_MB_SHIFT                                 0
-#define OMAP4_SPI2_DR0_MB_MASK                                  (0x3 << 0)
-
-/* CONTROL_SMART3IO_PADCONF_1 */
-#define OMAP4_SPI2_DR1_MB_SHIFT                                 30
-#define OMAP4_SPI2_DR1_MB_MASK                                  (0x3 << 30)
-#define OMAP4_SPI2_DR2_MB_SHIFT                                 28
-#define OMAP4_SPI2_DR2_MB_MASK                                  (0x3 << 28)
-#define OMAP4_UART2_DR0_MB_SHIFT                                26
-#define OMAP4_UART2_DR0_MB_MASK                                 (0x3 << 26)
-#define OMAP4_UART2_DR1_MB_SHIFT                                24
-#define OMAP4_UART2_DR1_MB_MASK                                 (0x3 << 24)
-#define OMAP4_UART4_DR0_MB_SHIFT                                22
-#define OMAP4_UART4_DR0_MB_MASK                                 (0x3 << 22)
-#define OMAP4_HSI_DR0_MB_SHIFT                                  20
-#define OMAP4_HSI_DR0_MB_MASK                                   (0x3 << 20)
-
-/* CONTROL_SMART3IO_PADCONF_2 */
-#define OMAP4_DMIC_DR0_LB_SHIFT                                 31
-#define OMAP4_DMIC_DR0_LB_MASK                                  (1 << 31)
-#define OMAP4_GPIO_DR3_LB_SHIFT                                 30
-#define OMAP4_GPIO_DR3_LB_MASK                                  (1 << 30)
-#define OMAP4_GPIO_DR4_LB_SHIFT                                 29
-#define OMAP4_GPIO_DR4_LB_MASK                                  (1 << 29)
-#define OMAP4_GPIO_DR5_LB_SHIFT                                 28
-#define OMAP4_GPIO_DR5_LB_MASK                                  (1 << 28)
-#define OMAP4_GPIO_DR6_LB_SHIFT                                 27
-#define OMAP4_GPIO_DR6_LB_MASK                                  (1 << 27)
-#define OMAP4_HSI_DR1_LB_SHIFT                                  26
-#define OMAP4_HSI_DR1_LB_MASK                                   (1 << 26)
-#define OMAP4_HSI_DR2_LB_SHIFT                                  25
-#define OMAP4_HSI_DR2_LB_MASK                                   (1 << 25)
-#define OMAP4_HSI_DR3_LB_SHIFT                                  24
-#define OMAP4_HSI_DR3_LB_MASK                                   (1 << 24)
-#define OMAP4_MCBSP2_DR0_LB_SHIFT                               23
-#define OMAP4_MCBSP2_DR0_LB_MASK                                (1 << 23)
-#define OMAP4_MCSPI4_DR0_LB_SHIFT                               22
-#define OMAP4_MCSPI4_DR0_LB_MASK                                (1 << 22)
-#define OMAP4_MCSPI4_DR1_LB_SHIFT                               21
-#define OMAP4_MCSPI4_DR1_LB_MASK                                (1 << 21)
-#define OMAP4_SLIMBUS2_DR0_LB_SHIFT                             18
-#define OMAP4_SLIMBUS2_DR0_LB_MASK                              (1 << 18)
-#define OMAP4_SPI2_DR0_LB_SHIFT                                 16
-#define OMAP4_SPI2_DR0_LB_MASK                                  (1 << 16)
-#define OMAP4_SPI2_DR1_LB_SHIFT                                 15
-#define OMAP4_SPI2_DR1_LB_MASK                                  (1 << 15)
-#define OMAP4_SPI2_DR2_LB_SHIFT                                 14
-#define OMAP4_SPI2_DR2_LB_MASK                                  (1 << 14)
-#define OMAP4_UART2_DR0_LB_SHIFT                                13
-#define OMAP4_UART2_DR0_LB_MASK                                 (1 << 13)
-#define OMAP4_UART2_DR1_LB_SHIFT                                12
-#define OMAP4_UART2_DR1_LB_MASK                                 (1 << 12)
-#define OMAP4_UART4_DR0_LB_SHIFT                                11
-#define OMAP4_UART4_DR0_LB_MASK                                 (1 << 11)
-#define OMAP4_HSI_DR0_LB_SHIFT                                  10
-#define OMAP4_HSI_DR0_LB_MASK                                   (1 << 10)
-
-/* CONTROL_USBB_HSIC */
-#define OMAP4_USBB2_DR1_SR_SHIFT                                30
-#define OMAP4_USBB2_DR1_SR_MASK                                 (0x3 << 30)
-#define OMAP4_USBB2_DR1_I_SHIFT                                 27
-#define OMAP4_USBB2_DR1_I_MASK                                  (0x7 << 27)
-#define OMAP4_USBB1_DR1_SR_SHIFT                                25
-#define OMAP4_USBB1_DR1_SR_MASK                                 (0x3 << 25)
-#define OMAP4_USBB1_DR1_I_SHIFT                                 22
-#define OMAP4_USBB1_DR1_I_MASK                                  (0x7 << 22)
-#define OMAP4_USBB1_HSIC_DATA_WD_SHIFT                          20
-#define OMAP4_USBB1_HSIC_DATA_WD_MASK                           (0x3 << 20)
-#define OMAP4_USBB1_HSIC_STROBE_WD_SHIFT                        18
-#define OMAP4_USBB1_HSIC_STROBE_WD_MASK                         (0x3 << 18)
-#define OMAP4_USBB2_HSIC_DATA_WD_SHIFT                          16
-#define OMAP4_USBB2_HSIC_DATA_WD_MASK                           (0x3 << 16)
-#define OMAP4_USBB2_HSIC_STROBE_WD_SHIFT                        14
-#define OMAP4_USBB2_HSIC_STROBE_WD_MASK                         (0x3 << 14)
-#define OMAP4_USBB1_HSIC_DATA_OFFMODE_WD_ENABLE_SHIFT           13
-#define OMAP4_USBB1_HSIC_DATA_OFFMODE_WD_ENABLE_MASK            (1 << 13)
-#define OMAP4_USBB1_HSIC_DATA_OFFMODE_WD_SHIFT                  11
-#define OMAP4_USBB1_HSIC_DATA_OFFMODE_WD_MASK                   (0x3 << 11)
-#define OMAP4_USBB1_HSIC_STROBE_OFFMODE_WD_ENABLE_SHIFT         10
-#define OMAP4_USBB1_HSIC_STROBE_OFFMODE_WD_ENABLE_MASK          (1 << 10)
-#define OMAP4_USBB1_HSIC_STROBE_OFFMODE_WD_SHIFT                8
-#define OMAP4_USBB1_HSIC_STROBE_OFFMODE_WD_MASK                 (0x3 << 8)
-#define OMAP4_USBB2_HSIC_DATA_OFFMODE_WD_ENABLE_SHIFT           7
-#define OMAP4_USBB2_HSIC_DATA_OFFMODE_WD_ENABLE_MASK            (1 << 7)
-#define OMAP4_USBB2_HSIC_DATA_OFFMODE_WD_SHIFT                  5
-#define OMAP4_USBB2_HSIC_DATA_OFFMODE_WD_MASK                   (0x3 << 5)
-#define OMAP4_USBB2_HSIC_STROBE_OFFMODE_WD_ENABLE_SHIFT         4
-#define OMAP4_USBB2_HSIC_STROBE_OFFMODE_WD_ENABLE_MASK          (1 << 4)
-#define OMAP4_USBB2_HSIC_STROBE_OFFMODE_WD_SHIFT                2
-#define OMAP4_USBB2_HSIC_STROBE_OFFMODE_WD_MASK                 (0x3 << 2)
-
-/* CONTROL_SLIMBUS */
-#define OMAP4_SLIMBUS1_DR0_MB_SHIFT                             30
-#define OMAP4_SLIMBUS1_DR0_MB_MASK                              (0x3 << 30)
-#define OMAP4_SLIMBUS1_DR1_MB_SHIFT                             28
-#define OMAP4_SLIMBUS1_DR1_MB_MASK                              (0x3 << 28)
-#define OMAP4_SLIMBUS2_DR0_MB_SHIFT                             26
-#define OMAP4_SLIMBUS2_DR0_MB_MASK                              (0x3 << 26)
-#define OMAP4_SLIMBUS2_DR1_MB_SHIFT                             24
-#define OMAP4_SLIMBUS2_DR1_MB_MASK                              (0x3 << 24)
-#define OMAP4_SLIMBUS2_DR2_MB_SHIFT                             22
-#define OMAP4_SLIMBUS2_DR2_MB_MASK                              (0x3 << 22)
-#define OMAP4_SLIMBUS2_DR3_MB_SHIFT                             20
-#define OMAP4_SLIMBUS2_DR3_MB_MASK                              (0x3 << 20)
-#define OMAP4_SLIMBUS1_DR0_LB_SHIFT                             19
-#define OMAP4_SLIMBUS1_DR0_LB_MASK                              (1 << 19)
-#define OMAP4_SLIMBUS2_DR1_LB_SHIFT                             18
-#define OMAP4_SLIMBUS2_DR1_LB_MASK                              (1 << 18)
-
-/* CONTROL_PBIASLITE */
-#define OMAP4_USIM_PBIASLITE_HIZ_MODE_SHIFT                     31
-#define OMAP4_USIM_PBIASLITE_HIZ_MODE_MASK                      (1 << 31)
-#define OMAP4_USIM_PBIASLITE_SUPPLY_HI_OUT_SHIFT                30
-#define OMAP4_USIM_PBIASLITE_SUPPLY_HI_OUT_MASK                 (1 << 30)
-#define OMAP4_USIM_PBIASLITE_VMODE_ERROR_SHIFT                  29
-#define OMAP4_USIM_PBIASLITE_VMODE_ERROR_MASK                   (1 << 29)
-#define OMAP4_USIM_PBIASLITE_PWRDNZ_SHIFT                       28
-#define OMAP4_USIM_PBIASLITE_PWRDNZ_MASK                        (1 << 28)
-#define OMAP4_USIM_PBIASLITE_VMODE_SHIFT                        27
-#define OMAP4_USIM_PBIASLITE_VMODE_MASK                         (1 << 27)
-#define OMAP4_MMC1_PWRDNZ_SHIFT                                 26
-#define OMAP4_MMC1_PWRDNZ_MASK                                  (1 << 26)
-#define OMAP4_MMC1_PBIASLITE_HIZ_MODE_SHIFT                     25
-#define OMAP4_MMC1_PBIASLITE_HIZ_MODE_MASK                      (1 << 25)
-#define OMAP4_MMC1_PBIASLITE_SUPPLY_HI_OUT_SHIFT                24
-#define OMAP4_MMC1_PBIASLITE_SUPPLY_HI_OUT_MASK                 (1 << 24)
-#define OMAP4_MMC1_PBIASLITE_VMODE_ERROR_SHIFT                  23
-#define OMAP4_MMC1_PBIASLITE_VMODE_ERROR_MASK                   (1 << 23)
-#define OMAP4_MMC1_PBIASLITE_PWRDNZ_SHIFT                       22
-#define OMAP4_MMC1_PBIASLITE_PWRDNZ_MASK                        (1 << 22)
-#define OMAP4_MMC1_PBIASLITE_VMODE_SHIFT                        21
-#define OMAP4_MMC1_PBIASLITE_VMODE_MASK                         (1 << 21)
-#define OMAP4_USBC1_ICUSB_PWRDNZ_SHIFT                          20
-#define OMAP4_USBC1_ICUSB_PWRDNZ_MASK                           (1 << 20)
-
-/* CONTROL_I2C_0 */
-#define OMAP4_I2C4_SDA_GLFENB_SHIFT                             31
-#define OMAP4_I2C4_SDA_GLFENB_MASK                              (1 << 31)
-#define OMAP4_I2C4_SDA_LOAD_BITS_SHIFT                          29
-#define OMAP4_I2C4_SDA_LOAD_BITS_MASK                           (0x3 << 29)
-#define OMAP4_I2C4_SDA_PULLUPRESX_SHIFT                         28
-#define OMAP4_I2C4_SDA_PULLUPRESX_MASK                          (1 << 28)
-#define OMAP4_I2C3_SDA_GLFENB_SHIFT                             27
-#define OMAP4_I2C3_SDA_GLFENB_MASK                              (1 << 27)
-#define OMAP4_I2C3_SDA_LOAD_BITS_SHIFT                          25
-#define OMAP4_I2C3_SDA_LOAD_BITS_MASK                           (0x3 << 25)
-#define OMAP4_I2C3_SDA_PULLUPRESX_SHIFT                         24
-#define OMAP4_I2C3_SDA_PULLUPRESX_MASK                          (1 << 24)
-#define OMAP4_I2C2_SDA_GLFENB_SHIFT                             23
-#define OMAP4_I2C2_SDA_GLFENB_MASK                              (1 << 23)
-#define OMAP4_I2C2_SDA_LOAD_BITS_SHIFT                          21
-#define OMAP4_I2C2_SDA_LOAD_BITS_MASK                           (0x3 << 21)
-#define OMAP4_I2C2_SDA_PULLUPRESX_SHIFT                         20
-#define OMAP4_I2C2_SDA_PULLUPRESX_MASK                          (1 << 20)
-#define OMAP4_I2C1_SDA_GLFENB_SHIFT                             19
-#define OMAP4_I2C1_SDA_GLFENB_MASK                              (1 << 19)
-#define OMAP4_I2C1_SDA_LOAD_BITS_SHIFT                          17
-#define OMAP4_I2C1_SDA_LOAD_BITS_MASK                           (0x3 << 17)
-#define OMAP4_I2C1_SDA_PULLUPRESX_SHIFT                         16
-#define OMAP4_I2C1_SDA_PULLUPRESX_MASK                          (1 << 16)
-#define OMAP4_I2C4_SCL_GLFENB_SHIFT                             15
-#define OMAP4_I2C4_SCL_GLFENB_MASK                              (1 << 15)
-#define OMAP4_I2C4_SCL_LOAD_BITS_SHIFT                          13
-#define OMAP4_I2C4_SCL_LOAD_BITS_MASK                           (0x3 << 13)
-#define OMAP4_I2C4_SCL_PULLUPRESX_SHIFT                         12
-#define OMAP4_I2C4_SCL_PULLUPRESX_MASK                          (1 << 12)
-#define OMAP4_I2C3_SCL_GLFENB_SHIFT                             11
-#define OMAP4_I2C3_SCL_GLFENB_MASK                              (1 << 11)
-#define OMAP4_I2C3_SCL_LOAD_BITS_SHIFT                          9
-#define OMAP4_I2C3_SCL_LOAD_BITS_MASK                           (0x3 << 9)
-#define OMAP4_I2C3_SCL_PULLUPRESX_SHIFT                         8
-#define OMAP4_I2C3_SCL_PULLUPRESX_MASK                          (1 << 8)
-#define OMAP4_I2C2_SCL_GLFENB_SHIFT                             7
-#define OMAP4_I2C2_SCL_GLFENB_MASK                              (1 << 7)
-#define OMAP4_I2C2_SCL_LOAD_BITS_SHIFT                          5
-#define OMAP4_I2C2_SCL_LOAD_BITS_MASK                           (0x3 << 5)
-#define OMAP4_I2C2_SCL_PULLUPRESX_SHIFT                         4
-#define OMAP4_I2C2_SCL_PULLUPRESX_MASK                          (1 << 4)
-#define OMAP4_I2C1_SCL_GLFENB_SHIFT                             3
-#define OMAP4_I2C1_SCL_GLFENB_MASK                              (1 << 3)
-#define OMAP4_I2C1_SCL_LOAD_BITS_SHIFT                          1
-#define OMAP4_I2C1_SCL_LOAD_BITS_MASK                           (0x3 << 1)
-#define OMAP4_I2C1_SCL_PULLUPRESX_SHIFT                         0
-#define OMAP4_I2C1_SCL_PULLUPRESX_MASK                          (1 << 0)
-
-/* CONTROL_CAMERA_RX */
-#define OMAP4_CAMERARX_UNIPRO_CTRLCLKEN_SHIFT                   31
-#define OMAP4_CAMERARX_UNIPRO_CTRLCLKEN_MASK                    (1 << 31)
-#define OMAP4_CAMERARX_CSI22_LANEENABLE_SHIFT                   29
-#define OMAP4_CAMERARX_CSI22_LANEENABLE_MASK                    (0x3 << 29)
-#define OMAP4_CAMERARX_CSI21_LANEENABLE_SHIFT                   24
-#define OMAP4_CAMERARX_CSI21_LANEENABLE_MASK                    (0x1f << 24)
-#define OMAP4_CAMERARX_UNIPRO_CAMMODE_SHIFT                     22
-#define OMAP4_CAMERARX_UNIPRO_CAMMODE_MASK                      (0x3 << 22)
-#define OMAP4_CAMERARX_CSI22_CTRLCLKEN_SHIFT                    21
-#define OMAP4_CAMERARX_CSI22_CTRLCLKEN_MASK                     (1 << 21)
-#define OMAP4_CAMERARX_CSI22_CAMMODE_SHIFT                      19
-#define OMAP4_CAMERARX_CSI22_CAMMODE_MASK                       (0x3 << 19)
-#define OMAP4_CAMERARX_CSI21_CTRLCLKEN_SHIFT                    18
-#define OMAP4_CAMERARX_CSI21_CTRLCLKEN_MASK                     (1 << 18)
-#define OMAP4_CAMERARX_CSI21_CAMMODE_SHIFT                      16
-#define OMAP4_CAMERARX_CSI21_CAMMODE_MASK                       (0x3 << 16)
-
-/* CONTROL_AVDAC */
-#define OMAP4_AVDAC_ACEN_SHIFT                                  31
-#define OMAP4_AVDAC_ACEN_MASK                                   (1 << 31)
-#define OMAP4_AVDAC_TVOUTBYPASS_SHIFT                           30
-#define OMAP4_AVDAC_TVOUTBYPASS_MASK                            (1 << 30)
-#define OMAP4_AVDAC_INPUTINV_SHIFT                              29
-#define OMAP4_AVDAC_INPUTINV_MASK                               (1 << 29)
-#define OMAP4_AVDAC_CTL_SHIFT                                   13
-#define OMAP4_AVDAC_CTL_MASK                                    (0xffff << 13)
-#define OMAP4_AVDAC_CTL_WR_ACK_SHIFT                            12
-#define OMAP4_AVDAC_CTL_WR_ACK_MASK                             (1 << 12)
-
-/* CONTROL_HDMI_TX_PHY */
-#define OMAP4_HDMITXPHY_PADORDER_SHIFT                          31
-#define OMAP4_HDMITXPHY_PADORDER_MASK                           (1 << 31)
-#define OMAP4_HDMITXPHY_TXVALID_SHIFT                           30
-#define OMAP4_HDMITXPHY_TXVALID_MASK                            (1 << 30)
-#define OMAP4_HDMITXPHY_ENBYPASSCLK_SHIFT                       29
-#define OMAP4_HDMITXPHY_ENBYPASSCLK_MASK                        (1 << 29)
-#define OMAP4_HDMITXPHY_PD_PULLUPDET_SHIFT                      28
-#define OMAP4_HDMITXPHY_PD_PULLUPDET_MASK                       (1 << 28)
-
-/* CONTROL_MMC2 */
-#define OMAP4_MMC2_FEEDBACK_CLK_SEL_SHIFT                       31
-#define OMAP4_MMC2_FEEDBACK_CLK_SEL_MASK                        (1 << 31)
-
-/* CONTROL_DSIPHY */
-#define OMAP4_DSI2_LANEENABLE_SHIFT                             29
-#define OMAP4_DSI2_LANEENABLE_MASK                              (0x7 << 29)
-#define OMAP4_DSI1_LANEENABLE_SHIFT                             24
-#define OMAP4_DSI1_LANEENABLE_MASK                              (0x1f << 24)
-#define OMAP4_DSI1_PIPD_SHIFT                                   19
-#define OMAP4_DSI1_PIPD_MASK                                    (0x1f << 19)
-#define OMAP4_DSI2_PIPD_SHIFT                                   14
-#define OMAP4_DSI2_PIPD_MASK                                    (0x1f << 14)
-
-/* CONTROL_MCBSPLP */
-#define OMAP4_ALBCTRLRX_FSX_SHIFT                               31
-#define OMAP4_ALBCTRLRX_FSX_MASK                                (1 << 31)
-#define OMAP4_ALBCTRLRX_CLKX_SHIFT                              30
-#define OMAP4_ALBCTRLRX_CLKX_MASK                               (1 << 30)
-#define OMAP4_ABE_MCBSP1_DR_EN_SHIFT                            29
-#define OMAP4_ABE_MCBSP1_DR_EN_MASK                             (1 << 29)
-
-/* CONTROL_USB2PHYCORE */
-#define OMAP4_USB2PHY_AUTORESUME_EN_SHIFT                       31
-#define OMAP4_USB2PHY_AUTORESUME_EN_MASK                        (1 << 31)
-#define OMAP4_USB2PHY_DISCHGDET_SHIFT                           30
-#define OMAP4_USB2PHY_DISCHGDET_MASK                            (1 << 30)
-#define OMAP4_USB2PHY_GPIOMODE_SHIFT                            29
-#define OMAP4_USB2PHY_GPIOMODE_MASK                             (1 << 29)
-#define OMAP4_USB2PHY_CHG_DET_EXT_CTL_SHIFT                     28
-#define OMAP4_USB2PHY_CHG_DET_EXT_CTL_MASK                      (1 << 28)
-#define OMAP4_USB2PHY_RDM_PD_CHGDET_EN_SHIFT                    27
-#define OMAP4_USB2PHY_RDM_PD_CHGDET_EN_MASK                     (1 << 27)
-#define OMAP4_USB2PHY_RDP_PU_CHGDET_EN_SHIFT                    26
-#define OMAP4_USB2PHY_RDP_PU_CHGDET_EN_MASK                     (1 << 26)
-#define OMAP4_USB2PHY_CHG_VSRC_EN_SHIFT                         25
-#define OMAP4_USB2PHY_CHG_VSRC_EN_MASK                          (1 << 25)
-#define OMAP4_USB2PHY_CHG_ISINK_EN_SHIFT                        24
-#define OMAP4_USB2PHY_CHG_ISINK_EN_MASK                         (1 << 24)
-#define OMAP4_USB2PHY_CHG_DET_STATUS_SHIFT                      21
-#define OMAP4_USB2PHY_CHG_DET_STATUS_MASK                       (0x7 << 21)
-#define OMAP4_USB2PHY_CHG_DET_DM_COMP_SHIFT                     20
-#define OMAP4_USB2PHY_CHG_DET_DM_COMP_MASK                      (1 << 20)
-#define OMAP4_USB2PHY_CHG_DET_DP_COMP_SHIFT                     19
-#define OMAP4_USB2PHY_CHG_DET_DP_COMP_MASK                      (1 << 19)
-#define OMAP4_USB2PHY_DATADET_SHIFT                             18
-#define OMAP4_USB2PHY_DATADET_MASK                              (1 << 18)
-#define OMAP4_USB2PHY_SINKONDP_SHIFT                            17
-#define OMAP4_USB2PHY_SINKONDP_MASK                             (1 << 17)
-#define OMAP4_USB2PHY_SRCONDM_SHIFT                             16
-#define OMAP4_USB2PHY_SRCONDM_MASK                              (1 << 16)
-#define OMAP4_USB2PHY_RESTARTCHGDET_SHIFT                       15
-#define OMAP4_USB2PHY_RESTARTCHGDET_MASK                        (1 << 15)
-#define OMAP4_USB2PHY_CHGDETDONE_SHIFT                          14
-#define OMAP4_USB2PHY_CHGDETDONE_MASK                           (1 << 14)
-#define OMAP4_USB2PHY_CHGDETECTED_SHIFT                         13
-#define OMAP4_USB2PHY_CHGDETECTED_MASK                          (1 << 13)
-#define OMAP4_USB2PHY_MCPCPUEN_SHIFT                            12
-#define OMAP4_USB2PHY_MCPCPUEN_MASK                             (1 << 12)
-#define OMAP4_USB2PHY_MCPCMODEEN_SHIFT                          11
-#define OMAP4_USB2PHY_MCPCMODEEN_MASK                           (1 << 11)
-#define OMAP4_USB2PHY_RESETDONEMCLK_SHIFT                       10
-#define OMAP4_USB2PHY_RESETDONEMCLK_MASK                        (1 << 10)
-#define OMAP4_USB2PHY_UTMIRESETDONE_SHIFT                       9
-#define OMAP4_USB2PHY_UTMIRESETDONE_MASK                        (1 << 9)
-#define OMAP4_USB2PHY_TXBITSTUFFENABLE_SHIFT                    8
-#define OMAP4_USB2PHY_TXBITSTUFFENABLE_MASK                     (1 << 8)
-#define OMAP4_USB2PHY_DATAPOLARITYN_SHIFT                       7
-#define OMAP4_USB2PHY_DATAPOLARITYN_MASK                        (1 << 7)
-#define OMAP4_USBDPLL_FREQLOCK_SHIFT                            6
-#define OMAP4_USBDPLL_FREQLOCK_MASK                             (1 << 6)
-#define OMAP4_USB2PHY_RESETDONETCLK_SHIFT                       5
-#define OMAP4_USB2PHY_RESETDONETCLK_MASK                        (1 << 5)
-
-/* CONTROL_I2C_1 */
-#define OMAP4_HDMI_DDC_SDA_GLFENB_SHIFT                         31
-#define OMAP4_HDMI_DDC_SDA_GLFENB_MASK                          (1 << 31)
-#define OMAP4_HDMI_DDC_SDA_LOAD_BITS_SHIFT                      29
-#define OMAP4_HDMI_DDC_SDA_LOAD_BITS_MASK                       (0x3 << 29)
-#define OMAP4_HDMI_DDC_SDA_PULLUPRESX_SHIFT                     28
-#define OMAP4_HDMI_DDC_SDA_PULLUPRESX_MASK                      (1 << 28)
-#define OMAP4_HDMI_DDC_SCL_GLFENB_SHIFT                         27
-#define OMAP4_HDMI_DDC_SCL_GLFENB_MASK                          (1 << 27)
-#define OMAP4_HDMI_DDC_SCL_LOAD_BITS_SHIFT                      25
-#define OMAP4_HDMI_DDC_SCL_LOAD_BITS_MASK                       (0x3 << 25)
-#define OMAP4_HDMI_DDC_SCL_PULLUPRESX_SHIFT                     24
-#define OMAP4_HDMI_DDC_SCL_PULLUPRESX_MASK                      (1 << 24)
-#define OMAP4_HDMI_DDC_SDA_HSMODE_SHIFT                         23
-#define OMAP4_HDMI_DDC_SDA_HSMODE_MASK                          (1 << 23)
-#define OMAP4_HDMI_DDC_SDA_NMODE_SHIFT                          22
-#define OMAP4_HDMI_DDC_SDA_NMODE_MASK                           (1 << 22)
-#define OMAP4_HDMI_DDC_SCL_HSMODE_SHIFT                         21
-#define OMAP4_HDMI_DDC_SCL_HSMODE_MASK                          (1 << 21)
-#define OMAP4_HDMI_DDC_SCL_NMODE_SHIFT                          20
-#define OMAP4_HDMI_DDC_SCL_NMODE_MASK                           (1 << 20)
-
-/* CONTROL_MMC1 */
-#define OMAP4_SDMMC1_PUSTRENGTH_GRP0_SHIFT                      31
-#define OMAP4_SDMMC1_PUSTRENGTH_GRP0_MASK                       (1 << 31)
-#define OMAP4_SDMMC1_PUSTRENGTH_GRP1_SHIFT                      30
-#define OMAP4_SDMMC1_PUSTRENGTH_GRP1_MASK                       (1 << 30)
-#define OMAP4_SDMMC1_PUSTRENGTH_GRP2_SHIFT                      29
-#define OMAP4_SDMMC1_PUSTRENGTH_GRP2_MASK                       (1 << 29)
-#define OMAP4_SDMMC1_PUSTRENGTH_GRP3_SHIFT                      28
-#define OMAP4_SDMMC1_PUSTRENGTH_GRP3_MASK                       (1 << 28)
-#define OMAP4_SDMMC1_DR0_SPEEDCTRL_SHIFT                        27
-#define OMAP4_SDMMC1_DR0_SPEEDCTRL_MASK                         (1 << 27)
-#define OMAP4_SDMMC1_DR1_SPEEDCTRL_SHIFT                        26
-#define OMAP4_SDMMC1_DR1_SPEEDCTRL_MASK                         (1 << 26)
-#define OMAP4_SDMMC1_DR2_SPEEDCTRL_SHIFT                        25
-#define OMAP4_SDMMC1_DR2_SPEEDCTRL_MASK                         (1 << 25)
-#define OMAP4_USBC1_DR0_SPEEDCTRL_SHIFT                         24
-#define OMAP4_USBC1_DR0_SPEEDCTRL_MASK                          (1 << 24)
-#define OMAP4_USB_FD_CDEN_SHIFT                                 23
-#define OMAP4_USB_FD_CDEN_MASK                                  (1 << 23)
-#define OMAP4_USBC1_ICUSB_DP_PDDIS_SHIFT                        22
-#define OMAP4_USBC1_ICUSB_DP_PDDIS_MASK                         (1 << 22)
-#define OMAP4_USBC1_ICUSB_DM_PDDIS_SHIFT                        21
-#define OMAP4_USBC1_ICUSB_DM_PDDIS_MASK                         (1 << 21)
-
-/* CONTROL_HSI */
-#define OMAP4_HSI1_CALLOOP_SEL_SHIFT                            31
-#define OMAP4_HSI1_CALLOOP_SEL_MASK                             (1 << 31)
-#define OMAP4_HSI1_CALMUX_SEL_SHIFT                             30
-#define OMAP4_HSI1_CALMUX_SEL_MASK                              (1 << 30)
-#define OMAP4_HSI2_CALLOOP_SEL_SHIFT                            29
-#define OMAP4_HSI2_CALLOOP_SEL_MASK                             (1 << 29)
-#define OMAP4_HSI2_CALMUX_SEL_SHIFT                             28
-#define OMAP4_HSI2_CALMUX_SEL_MASK                              (1 << 28)
-
-/* CONTROL_USB */
-#define OMAP4_CARKIT_USBA0_ULPIPHY_DAT0_AUTO_EN_SHIFT           31
-#define OMAP4_CARKIT_USBA0_ULPIPHY_DAT0_AUTO_EN_MASK            (1 << 31)
-#define OMAP4_CARKIT_USBA0_ULPIPHY_DAT1_AUTO_EN_SHIFT           30
-#define OMAP4_CARKIT_USBA0_ULPIPHY_DAT1_AUTO_EN_MASK            (1 << 30)
-
-/* CONTROL_HDQ */
-#define OMAP4_HDQ_SIO_PWRDNZ_SHIFT                              31
-#define OMAP4_HDQ_SIO_PWRDNZ_MASK                               (1 << 31)
-
-/* CONTROL_LPDDR2IO1_0 */
-#define OMAP4_LPDDR2IO1_GR4_SR_SHIFT                            30
-#define OMAP4_LPDDR2IO1_GR4_SR_MASK                             (0x3 << 30)
-#define OMAP4_LPDDR2IO1_GR4_I_SHIFT                             27
-#define OMAP4_LPDDR2IO1_GR4_I_MASK                              (0x7 << 27)
-#define OMAP4_LPDDR2IO1_GR4_WD_SHIFT                            25
-#define OMAP4_LPDDR2IO1_GR4_WD_MASK                             (0x3 << 25)
-#define OMAP4_LPDDR2IO1_GR3_SR_SHIFT                            22
-#define OMAP4_LPDDR2IO1_GR3_SR_MASK                             (0x3 << 22)
-#define OMAP4_LPDDR2IO1_GR3_I_SHIFT                             19
-#define OMAP4_LPDDR2IO1_GR3_I_MASK                              (0x7 << 19)
-#define OMAP4_LPDDR2IO1_GR3_WD_SHIFT                            17
-#define OMAP4_LPDDR2IO1_GR3_WD_MASK                             (0x3 << 17)
-#define OMAP4_LPDDR2IO1_GR2_SR_SHIFT                            14
-#define OMAP4_LPDDR2IO1_GR2_SR_MASK                             (0x3 << 14)
-#define OMAP4_LPDDR2IO1_GR2_I_SHIFT                             11
-#define OMAP4_LPDDR2IO1_GR2_I_MASK                              (0x7 << 11)
-#define OMAP4_LPDDR2IO1_GR2_WD_SHIFT                            9
-#define OMAP4_LPDDR2IO1_GR2_WD_MASK                             (0x3 << 9)
-#define OMAP4_LPDDR2IO1_GR1_SR_SHIFT                            6
-#define OMAP4_LPDDR2IO1_GR1_SR_MASK                             (0x3 << 6)
-#define OMAP4_LPDDR2IO1_GR1_I_SHIFT                             3
-#define OMAP4_LPDDR2IO1_GR1_I_MASK                              (0x7 << 3)
-#define OMAP4_LPDDR2IO1_GR1_WD_SHIFT                            1
-#define OMAP4_LPDDR2IO1_GR1_WD_MASK                             (0x3 << 1)
-
-/* CONTROL_LPDDR2IO1_1 */
-#define OMAP4_LPDDR2IO1_GR8_SR_SHIFT                            30
-#define OMAP4_LPDDR2IO1_GR8_SR_MASK                             (0x3 << 30)
-#define OMAP4_LPDDR2IO1_GR8_I_SHIFT                             27
-#define OMAP4_LPDDR2IO1_GR8_I_MASK                              (0x7 << 27)
-#define OMAP4_LPDDR2IO1_GR8_WD_SHIFT                            25
-#define OMAP4_LPDDR2IO1_GR8_WD_MASK                             (0x3 << 25)
-#define OMAP4_LPDDR2IO1_GR7_SR_SHIFT                            22
-#define OMAP4_LPDDR2IO1_GR7_SR_MASK                             (0x3 << 22)
-#define OMAP4_LPDDR2IO1_GR7_I_SHIFT                             19
-#define OMAP4_LPDDR2IO1_GR7_I_MASK                              (0x7 << 19)
-#define OMAP4_LPDDR2IO1_GR7_WD_SHIFT                            17
-#define OMAP4_LPDDR2IO1_GR7_WD_MASK                             (0x3 << 17)
-#define OMAP4_LPDDR2IO1_GR6_SR_SHIFT                            14
-#define OMAP4_LPDDR2IO1_GR6_SR_MASK                             (0x3 << 14)
-#define OMAP4_LPDDR2IO1_GR6_I_SHIFT                             11
-#define OMAP4_LPDDR2IO1_GR6_I_MASK                              (0x7 << 11)
-#define OMAP4_LPDDR2IO1_GR6_WD_SHIFT                            9
-#define OMAP4_LPDDR2IO1_GR6_WD_MASK                             (0x3 << 9)
-#define OMAP4_LPDDR2IO1_GR5_SR_SHIFT                            6
-#define OMAP4_LPDDR2IO1_GR5_SR_MASK                             (0x3 << 6)
-#define OMAP4_LPDDR2IO1_GR5_I_SHIFT                             3
-#define OMAP4_LPDDR2IO1_GR5_I_MASK                              (0x7 << 3)
-#define OMAP4_LPDDR2IO1_GR5_WD_SHIFT                            1
-#define OMAP4_LPDDR2IO1_GR5_WD_MASK                             (0x3 << 1)
-
-/* CONTROL_LPDDR2IO1_2 */
-#define OMAP4_LPDDR2IO1_GR11_SR_SHIFT                           30
-#define OMAP4_LPDDR2IO1_GR11_SR_MASK                            (0x3 << 30)
-#define OMAP4_LPDDR2IO1_GR11_I_SHIFT                            27
-#define OMAP4_LPDDR2IO1_GR11_I_MASK                             (0x7 << 27)
-#define OMAP4_LPDDR2IO1_GR11_WD_SHIFT                           25
-#define OMAP4_LPDDR2IO1_GR11_WD_MASK                            (0x3 << 25)
-#define OMAP4_LPDDR2IO1_GR10_SR_SHIFT                           22
-#define OMAP4_LPDDR2IO1_GR10_SR_MASK                            (0x3 << 22)
-#define OMAP4_LPDDR2IO1_GR10_I_SHIFT                            19
-#define OMAP4_LPDDR2IO1_GR10_I_MASK                             (0x7 << 19)
-#define OMAP4_LPDDR2IO1_GR10_WD_SHIFT                           17
-#define OMAP4_LPDDR2IO1_GR10_WD_MASK                            (0x3 << 17)
-#define OMAP4_LPDDR2IO1_GR9_SR_SHIFT                            14
-#define OMAP4_LPDDR2IO1_GR9_SR_MASK                             (0x3 << 14)
-#define OMAP4_LPDDR2IO1_GR9_I_SHIFT                             11
-#define OMAP4_LPDDR2IO1_GR9_I_MASK                              (0x7 << 11)
-#define OMAP4_LPDDR2IO1_GR9_WD_SHIFT                            9
-#define OMAP4_LPDDR2IO1_GR9_WD_MASK                             (0x3 << 9)
-
-/* CONTROL_LPDDR2IO1_3 */
-#define OMAP4_LPDDR21_VREF_CA_CCAP0_SHIFT                       31
-#define OMAP4_LPDDR21_VREF_CA_CCAP0_MASK                        (1 << 31)
-#define OMAP4_LPDDR21_VREF_CA_CCAP1_SHIFT                       30
-#define OMAP4_LPDDR21_VREF_CA_CCAP1_MASK                        (1 << 30)
-#define OMAP4_LPDDR21_VREF_CA_INT_CCAP0_SHIFT                   29
-#define OMAP4_LPDDR21_VREF_CA_INT_CCAP0_MASK                    (1 << 29)
-#define OMAP4_LPDDR21_VREF_CA_INT_CCAP1_SHIFT                   28
-#define OMAP4_LPDDR21_VREF_CA_INT_CCAP1_MASK                    (1 << 28)
-#define OMAP4_LPDDR21_VREF_CA_INT_TAP0_SHIFT                    27
-#define OMAP4_LPDDR21_VREF_CA_INT_TAP0_MASK                     (1 << 27)
-#define OMAP4_LPDDR21_VREF_CA_INT_TAP1_SHIFT                    26
-#define OMAP4_LPDDR21_VREF_CA_INT_TAP1_MASK                     (1 << 26)
-#define OMAP4_LPDDR21_VREF_CA_TAP0_SHIFT                        25
-#define OMAP4_LPDDR21_VREF_CA_TAP0_MASK                         (1 << 25)
-#define OMAP4_LPDDR21_VREF_CA_TAP1_SHIFT                        24
-#define OMAP4_LPDDR21_VREF_CA_TAP1_MASK                         (1 << 24)
-#define OMAP4_LPDDR21_VREF_DQ0_INT_CCAP0_SHIFT                  23
-#define OMAP4_LPDDR21_VREF_DQ0_INT_CCAP0_MASK                   (1 << 23)
-#define OMAP4_LPDDR21_VREF_DQ0_INT_CCAP1_SHIFT                  22
-#define OMAP4_LPDDR21_VREF_DQ0_INT_CCAP1_MASK                   (1 << 22)
-#define OMAP4_LPDDR21_VREF_DQ0_INT_TAP0_SHIFT                   21
-#define OMAP4_LPDDR21_VREF_DQ0_INT_TAP0_MASK                    (1 << 21)
-#define OMAP4_LPDDR21_VREF_DQ0_INT_TAP1_SHIFT                   20
-#define OMAP4_LPDDR21_VREF_DQ0_INT_TAP1_MASK                    (1 << 20)
-#define OMAP4_LPDDR21_VREF_DQ1_INT_CCAP0_SHIFT                  19
-#define OMAP4_LPDDR21_VREF_DQ1_INT_CCAP0_MASK                   (1 << 19)
-#define OMAP4_LPDDR21_VREF_DQ1_INT_CCAP1_SHIFT                  18
-#define OMAP4_LPDDR21_VREF_DQ1_INT_CCAP1_MASK                   (1 << 18)
-#define OMAP4_LPDDR21_VREF_DQ1_INT_TAP0_SHIFT                   17
-#define OMAP4_LPDDR21_VREF_DQ1_INT_TAP0_MASK                    (1 << 17)
-#define OMAP4_LPDDR21_VREF_DQ1_INT_TAP1_SHIFT                   16
-#define OMAP4_LPDDR21_VREF_DQ1_INT_TAP1_MASK                    (1 << 16)
-#define OMAP4_LPDDR21_VREF_DQ_CCAP0_SHIFT                       15
-#define OMAP4_LPDDR21_VREF_DQ_CCAP0_MASK                        (1 << 15)
-#define OMAP4_LPDDR21_VREF_DQ_CCAP1_SHIFT                       14
-#define OMAP4_LPDDR21_VREF_DQ_CCAP1_MASK                        (1 << 14)
-#define OMAP4_LPDDR21_VREF_DQ_TAP0_SHIFT                        13
-#define OMAP4_LPDDR21_VREF_DQ_TAP0_MASK                         (1 << 13)
-#define OMAP4_LPDDR21_VREF_DQ_TAP1_SHIFT                        12
-#define OMAP4_LPDDR21_VREF_DQ_TAP1_MASK                         (1 << 12)
-
-/* CONTROL_LPDDR2IO2_0 */
-#define OMAP4_LPDDR2IO2_GR4_SR_SHIFT                            30
-#define OMAP4_LPDDR2IO2_GR4_SR_MASK                             (0x3 << 30)
-#define OMAP4_LPDDR2IO2_GR4_I_SHIFT                             27
-#define OMAP4_LPDDR2IO2_GR4_I_MASK                              (0x7 << 27)
-#define OMAP4_LPDDR2IO2_GR4_WD_SHIFT                            25
-#define OMAP4_LPDDR2IO2_GR4_WD_MASK                             (0x3 << 25)
-#define OMAP4_LPDDR2IO2_GR3_SR_SHIFT                            22
-#define OMAP4_LPDDR2IO2_GR3_SR_MASK                             (0x3 << 22)
-#define OMAP4_LPDDR2IO2_GR3_I_SHIFT                             19
-#define OMAP4_LPDDR2IO2_GR3_I_MASK                              (0x7 << 19)
-#define OMAP4_LPDDR2IO2_GR3_WD_SHIFT                            17
-#define OMAP4_LPDDR2IO2_GR3_WD_MASK                             (0x3 << 17)
-#define OMAP4_LPDDR2IO2_GR2_SR_SHIFT                            14
-#define OMAP4_LPDDR2IO2_GR2_SR_MASK                             (0x3 << 14)
-#define OMAP4_LPDDR2IO2_GR2_I_SHIFT                             11
-#define OMAP4_LPDDR2IO2_GR2_I_MASK                              (0x7 << 11)
-#define OMAP4_LPDDR2IO2_GR2_WD_SHIFT                            9
-#define OMAP4_LPDDR2IO2_GR2_WD_MASK                             (0x3 << 9)
-#define OMAP4_LPDDR2IO2_GR1_SR_SHIFT                            6
-#define OMAP4_LPDDR2IO2_GR1_SR_MASK                             (0x3 << 6)
-#define OMAP4_LPDDR2IO2_GR1_I_SHIFT                             3
-#define OMAP4_LPDDR2IO2_GR1_I_MASK                              (0x7 << 3)
-#define OMAP4_LPDDR2IO2_GR1_WD_SHIFT                            1
-#define OMAP4_LPDDR2IO2_GR1_WD_MASK                             (0x3 << 1)
-
-/* CONTROL_LPDDR2IO2_1 */
-#define OMAP4_LPDDR2IO2_GR8_SR_SHIFT                            30
-#define OMAP4_LPDDR2IO2_GR8_SR_MASK                             (0x3 << 30)
-#define OMAP4_LPDDR2IO2_GR8_I_SHIFT                             27
-#define OMAP4_LPDDR2IO2_GR8_I_MASK                              (0x7 << 27)
-#define OMAP4_LPDDR2IO2_GR8_WD_SHIFT                            25
-#define OMAP4_LPDDR2IO2_GR8_WD_MASK                             (0x3 << 25)
-#define OMAP4_LPDDR2IO2_GR7_SR_SHIFT                            22
-#define OMAP4_LPDDR2IO2_GR7_SR_MASK                             (0x3 << 22)
-#define OMAP4_LPDDR2IO2_GR7_I_SHIFT                             19
-#define OMAP4_LPDDR2IO2_GR7_I_MASK                              (0x7 << 19)
-#define OMAP4_LPDDR2IO2_GR7_WD_SHIFT                            17
-#define OMAP4_LPDDR2IO2_GR7_WD_MASK                             (0x3 << 17)
-#define OMAP4_LPDDR2IO2_GR6_SR_SHIFT                            14
-#define OMAP4_LPDDR2IO2_GR6_SR_MASK                             (0x3 << 14)
-#define OMAP4_LPDDR2IO2_GR6_I_SHIFT                             11
-#define OMAP4_LPDDR2IO2_GR6_I_MASK                              (0x7 << 11)
-#define OMAP4_LPDDR2IO2_GR6_WD_SHIFT                            9
-#define OMAP4_LPDDR2IO2_GR6_WD_MASK                             (0x3 << 9)
-#define OMAP4_LPDDR2IO2_GR5_SR_SHIFT                            6
-#define OMAP4_LPDDR2IO2_GR5_SR_MASK                             (0x3 << 6)
-#define OMAP4_LPDDR2IO2_GR5_I_SHIFT                             3
-#define OMAP4_LPDDR2IO2_GR5_I_MASK                              (0x7 << 3)
-#define OMAP4_LPDDR2IO2_GR5_WD_SHIFT                            1
-#define OMAP4_LPDDR2IO2_GR5_WD_MASK                             (0x3 << 1)
-
-/* CONTROL_LPDDR2IO2_2 */
-#define OMAP4_LPDDR2IO2_GR11_SR_SHIFT                           30
-#define OMAP4_LPDDR2IO2_GR11_SR_MASK                            (0x3 << 30)
-#define OMAP4_LPDDR2IO2_GR11_I_SHIFT                            27
-#define OMAP4_LPDDR2IO2_GR11_I_MASK                             (0x7 << 27)
-#define OMAP4_LPDDR2IO2_GR11_WD_SHIFT                           25
-#define OMAP4_LPDDR2IO2_GR11_WD_MASK                            (0x3 << 25)
-#define OMAP4_LPDDR2IO2_GR10_SR_SHIFT                           22
-#define OMAP4_LPDDR2IO2_GR10_SR_MASK                            (0x3 << 22)
-#define OMAP4_LPDDR2IO2_GR10_I_SHIFT                            19
-#define OMAP4_LPDDR2IO2_GR10_I_MASK                             (0x7 << 19)
-#define OMAP4_LPDDR2IO2_GR10_WD_SHIFT                           17
-#define OMAP4_LPDDR2IO2_GR10_WD_MASK                            (0x3 << 17)
-#define OMAP4_LPDDR2IO2_GR9_SR_SHIFT                            14
-#define OMAP4_LPDDR2IO2_GR9_SR_MASK                             (0x3 << 14)
-#define OMAP4_LPDDR2IO2_GR9_I_SHIFT                             11
-#define OMAP4_LPDDR2IO2_GR9_I_MASK                              (0x7 << 11)
-#define OMAP4_LPDDR2IO2_GR9_WD_SHIFT                            9
-#define OMAP4_LPDDR2IO2_GR9_WD_MASK                             (0x3 << 9)
-
-/* CONTROL_LPDDR2IO2_3 */
-#define OMAP4_LPDDR22_VREF_CA_CCAP0_SHIFT                       31
-#define OMAP4_LPDDR22_VREF_CA_CCAP0_MASK                        (1 << 31)
-#define OMAP4_LPDDR22_VREF_CA_CCAP1_SHIFT                       30
-#define OMAP4_LPDDR22_VREF_CA_CCAP1_MASK                        (1 << 30)
-#define OMAP4_LPDDR22_VREF_CA_INT_CCAP0_SHIFT                   29
-#define OMAP4_LPDDR22_VREF_CA_INT_CCAP0_MASK                    (1 << 29)
-#define OMAP4_LPDDR22_VREF_CA_INT_CCAP1_SHIFT                   28
-#define OMAP4_LPDDR22_VREF_CA_INT_CCAP1_MASK                    (1 << 28)
-#define OMAP4_LPDDR22_VREF_CA_INT_TAP0_SHIFT                    27
-#define OMAP4_LPDDR22_VREF_CA_INT_TAP0_MASK                     (1 << 27)
-#define OMAP4_LPDDR22_VREF_CA_INT_TAP1_SHIFT                    26
-#define OMAP4_LPDDR22_VREF_CA_INT_TAP1_MASK                     (1 << 26)
-#define OMAP4_LPDDR22_VREF_CA_TAP0_SHIFT                        25
-#define OMAP4_LPDDR22_VREF_CA_TAP0_MASK                         (1 << 25)
-#define OMAP4_LPDDR22_VREF_CA_TAP1_SHIFT                        24
-#define OMAP4_LPDDR22_VREF_CA_TAP1_MASK                         (1 << 24)
-#define OMAP4_LPDDR22_VREF_DQ0_INT_CCAP0_SHIFT                  23
-#define OMAP4_LPDDR22_VREF_DQ0_INT_CCAP0_MASK                   (1 << 23)
-#define OMAP4_LPDDR22_VREF_DQ0_INT_CCAP1_SHIFT                  22
-#define OMAP4_LPDDR22_VREF_DQ0_INT_CCAP1_MASK                   (1 << 22)
-#define OMAP4_LPDDR22_VREF_DQ0_INT_TAP0_SHIFT                   21
-#define OMAP4_LPDDR22_VREF_DQ0_INT_TAP0_MASK                    (1 << 21)
-#define OMAP4_LPDDR22_VREF_DQ0_INT_TAP1_SHIFT                   20
-#define OMAP4_LPDDR22_VREF_DQ0_INT_TAP1_MASK                    (1 << 20)
-#define OMAP4_LPDDR22_VREF_DQ1_INT_CCAP0_SHIFT                  19
-#define OMAP4_LPDDR22_VREF_DQ1_INT_CCAP0_MASK                   (1 << 19)
-#define OMAP4_LPDDR22_VREF_DQ1_INT_CCAP1_SHIFT                  18
-#define OMAP4_LPDDR22_VREF_DQ1_INT_CCAP1_MASK                   (1 << 18)
-#define OMAP4_LPDDR22_VREF_DQ1_INT_TAP0_SHIFT                   17
-#define OMAP4_LPDDR22_VREF_DQ1_INT_TAP0_MASK                    (1 << 17)
-#define OMAP4_LPDDR22_VREF_DQ1_INT_TAP1_SHIFT                   16
-#define OMAP4_LPDDR22_VREF_DQ1_INT_TAP1_MASK                    (1 << 16)
-#define OMAP4_LPDDR22_VREF_DQ_CCAP0_SHIFT                       15
-#define OMAP4_LPDDR22_VREF_DQ_CCAP0_MASK                        (1 << 15)
-#define OMAP4_LPDDR22_VREF_DQ_CCAP1_SHIFT                       14
-#define OMAP4_LPDDR22_VREF_DQ_CCAP1_MASK                        (1 << 14)
-#define OMAP4_LPDDR22_VREF_DQ_TAP0_SHIFT                        13
-#define OMAP4_LPDDR22_VREF_DQ_TAP0_MASK                         (1 << 13)
-#define OMAP4_LPDDR22_VREF_DQ_TAP1_SHIFT                        12
-#define OMAP4_LPDDR22_VREF_DQ_TAP1_MASK                         (1 << 12)
-
-/* CONTROL_BUS_HOLD */
-#define OMAP4_ABE_DMIC_DIN3_EN_SHIFT                            31
-#define OMAP4_ABE_DMIC_DIN3_EN_MASK                             (1 << 31)
-#define OMAP4_MCSPI1_CS3_EN_SHIFT                               30
-#define OMAP4_MCSPI1_CS3_EN_MASK                                (1 << 30)
-
-/* CONTROL_C2C */
-#define OMAP4_MIRROR_MODE_EN_SHIFT                              31
-#define OMAP4_MIRROR_MODE_EN_MASK                               (1 << 31)
-#define OMAP4_C2C_SPARE_SHIFT                                   24
-#define OMAP4_C2C_SPARE_MASK                                    (0x7f << 24)
-
-/* CORE_CONTROL_SPARE_RW */
-#define OMAP4_CORE_CONTROL_SPARE_RW_SHIFT                       0
-#define OMAP4_CORE_CONTROL_SPARE_RW_MASK                        (0xffffffff << 0)
-
-/* CORE_CONTROL_SPARE_R */
-#define OMAP4_CORE_CONTROL_SPARE_R_SHIFT                        0
-#define OMAP4_CORE_CONTROL_SPARE_R_MASK                         (0xffffffff << 0)
-
-/* CORE_CONTROL_SPARE_R_C0 */
-#define OMAP4_CORE_CONTROL_SPARE_R_C0_SHIFT                     31
-#define OMAP4_CORE_CONTROL_SPARE_R_C0_MASK                      (1 << 31)
-#define OMAP4_CORE_CONTROL_SPARE_R_C1_SHIFT                     30
-#define OMAP4_CORE_CONTROL_SPARE_R_C1_MASK                      (1 << 30)
-#define OMAP4_CORE_CONTROL_SPARE_R_C2_SHIFT                     29
-#define OMAP4_CORE_CONTROL_SPARE_R_C2_MASK                      (1 << 29)
-#define OMAP4_CORE_CONTROL_SPARE_R_C3_SHIFT                     28
-#define OMAP4_CORE_CONTROL_SPARE_R_C3_MASK                      (1 << 28)
-#define OMAP4_CORE_CONTROL_SPARE_R_C4_SHIFT                     27
-#define OMAP4_CORE_CONTROL_SPARE_R_C4_MASK                      (1 << 27)
-#define OMAP4_CORE_CONTROL_SPARE_R_C5_SHIFT                     26
-#define OMAP4_CORE_CONTROL_SPARE_R_C5_MASK                      (1 << 26)
-#define OMAP4_CORE_CONTROL_SPARE_R_C6_SHIFT                     25
-#define OMAP4_CORE_CONTROL_SPARE_R_C6_MASK                      (1 << 25)
-#define OMAP4_CORE_CONTROL_SPARE_R_C7_SHIFT                     24
-#define OMAP4_CORE_CONTROL_SPARE_R_C7_MASK                      (1 << 24)
-
-/* CONTROL_EFUSE_1 */
-#define OMAP4_AVDAC_TRIM_BYTE3_SHIFT                            24
-#define OMAP4_AVDAC_TRIM_BYTE3_MASK                             (0x7f << 24)
-#define OMAP4_AVDAC_TRIM_BYTE2_SHIFT                            16
-#define OMAP4_AVDAC_TRIM_BYTE2_MASK                             (0xff << 16)
-#define OMAP4_AVDAC_TRIM_BYTE1_SHIFT                            8
-#define OMAP4_AVDAC_TRIM_BYTE1_MASK                             (0xff << 8)
-#define OMAP4_AVDAC_TRIM_BYTE0_SHIFT                            0
-#define OMAP4_AVDAC_TRIM_BYTE0_MASK                             (0xff << 0)
-
-/* CONTROL_EFUSE_2 */
-#define OMAP4_EFUSE_SMART2TEST_P0_SHIFT                         31
-#define OMAP4_EFUSE_SMART2TEST_P0_MASK                          (1 << 31)
-#define OMAP4_EFUSE_SMART2TEST_P1_SHIFT                         30
-#define OMAP4_EFUSE_SMART2TEST_P1_MASK                          (1 << 30)
-#define OMAP4_EFUSE_SMART2TEST_P2_SHIFT                         29
-#define OMAP4_EFUSE_SMART2TEST_P2_MASK                          (1 << 29)
-#define OMAP4_EFUSE_SMART2TEST_P3_SHIFT                         28
-#define OMAP4_EFUSE_SMART2TEST_P3_MASK                          (1 << 28)
-#define OMAP4_EFUSE_SMART2TEST_N0_SHIFT                         27
-#define OMAP4_EFUSE_SMART2TEST_N0_MASK                          (1 << 27)
-#define OMAP4_EFUSE_SMART2TEST_N1_SHIFT                         26
-#define OMAP4_EFUSE_SMART2TEST_N1_MASK                          (1 << 26)
-#define OMAP4_EFUSE_SMART2TEST_N2_SHIFT                         25
-#define OMAP4_EFUSE_SMART2TEST_N2_MASK                          (1 << 25)
-#define OMAP4_EFUSE_SMART2TEST_N3_SHIFT                         24
-#define OMAP4_EFUSE_SMART2TEST_N3_MASK                          (1 << 24)
-#define OMAP4_LPDDR2_PTV_N1_SHIFT                               23
-#define OMAP4_LPDDR2_PTV_N1_MASK                                (1 << 23)
-#define OMAP4_LPDDR2_PTV_N2_SHIFT                               22
-#define OMAP4_LPDDR2_PTV_N2_MASK                                (1 << 22)
-#define OMAP4_LPDDR2_PTV_N3_SHIFT                               21
-#define OMAP4_LPDDR2_PTV_N3_MASK                                (1 << 21)
-#define OMAP4_LPDDR2_PTV_N4_SHIFT                               20
-#define OMAP4_LPDDR2_PTV_N4_MASK                                (1 << 20)
-#define OMAP4_LPDDR2_PTV_N5_SHIFT                               19
-#define OMAP4_LPDDR2_PTV_N5_MASK                                (1 << 19)
-#define OMAP4_LPDDR2_PTV_P1_SHIFT                               18
-#define OMAP4_LPDDR2_PTV_P1_MASK                                (1 << 18)
-#define OMAP4_LPDDR2_PTV_P2_SHIFT                               17
-#define OMAP4_LPDDR2_PTV_P2_MASK                                (1 << 17)
-#define OMAP4_LPDDR2_PTV_P3_SHIFT                               16
-#define OMAP4_LPDDR2_PTV_P3_MASK                                (1 << 16)
-#define OMAP4_LPDDR2_PTV_P4_SHIFT                               15
-#define OMAP4_LPDDR2_PTV_P4_MASK                                (1 << 15)
-#define OMAP4_LPDDR2_PTV_P5_SHIFT                               14
-#define OMAP4_LPDDR2_PTV_P5_MASK                                (1 << 14)
-
-/* CONTROL_EFUSE_3 */
-#define OMAP4_STD_FUSE_SPARE_1_SHIFT                            24
-#define OMAP4_STD_FUSE_SPARE_1_MASK                             (0xff << 24)
-#define OMAP4_STD_FUSE_SPARE_2_SHIFT                            16
-#define OMAP4_STD_FUSE_SPARE_2_MASK                             (0xff << 16)
-#define OMAP4_STD_FUSE_SPARE_3_SHIFT                            8
-#define OMAP4_STD_FUSE_SPARE_3_MASK                             (0xff << 8)
-#define OMAP4_STD_FUSE_SPARE_4_SHIFT                            0
-#define OMAP4_STD_FUSE_SPARE_4_MASK                             (0xff << 0)
-
-/* CONTROL_EFUSE_4 */
-#define OMAP4_STD_FUSE_SPARE_5_SHIFT                            24
-#define OMAP4_STD_FUSE_SPARE_5_MASK                             (0xff << 24)
-#define OMAP4_STD_FUSE_SPARE_6_SHIFT                            16
-#define OMAP4_STD_FUSE_SPARE_6_MASK                             (0xff << 16)
-#define OMAP4_STD_FUSE_SPARE_7_SHIFT                            8
-#define OMAP4_STD_FUSE_SPARE_7_MASK                             (0xff << 8)
-#define OMAP4_STD_FUSE_SPARE_8_SHIFT                            0
-#define OMAP4_STD_FUSE_SPARE_8_MASK                             (0xff << 0)
-
-#endif
diff --git a/arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h b/arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h
deleted file mode 100644
index 17c9b37042c0..000000000000
--- a/arch/arm/mach-omap2/ctrl_module_pad_wkup_44xx.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * OMAP44xx CTRL_MODULE_PAD_WKUP registers and bitfields
- *
- * Copyright (C) 2009-2010 Texas Instruments, Inc.
- *
- * Benoit Cousson (b-cousson@ti.com)
- * Santosh Shilimkar (santosh.shilimkar@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_CTRL_MODULE_PAD_WKUP_44XX_H
-#define __ARCH_ARM_MACH_OMAP2_CTRL_MODULE_PAD_WKUP_44XX_H
-
-
-/* Base address */
-#define OMAP4_CTRL_MODULE_PAD_WKUP                                      0x4a31e000
-
-/* Registers offset */
-#define OMAP4_CTRL_MODULE_PAD_WKUP_IP_REVISION                          0x0000
-#define OMAP4_CTRL_MODULE_PAD_WKUP_IP_HWINFO                            0x0004
-#define OMAP4_CTRL_MODULE_PAD_WKUP_IP_SYSCONFIG                         0x0010
-#define OMAP4_CTRL_MODULE_PAD_WKUP_PADCONF_WAKEUPEVENT_0                0x007c
-#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_SMART1NOPMIO_PADCONF_0       0x05a0
-#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_SMART1NOPMIO_PADCONF_1       0x05a4
-#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_PADCONF_MODE                 0x05a8
-#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_XTAL_OSCILLATOR              0x05ac
-#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_USIMIO                       0x0600
-#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_I2C_2                        0x0604
-#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_JTAG                         0x0608
-#define OMAP4_CTRL_MODULE_PAD_WKUP_CONTROL_SYS                          0x060c
-#define OMAP4_CTRL_MODULE_PAD_WKUP_WKUP_CONTROL_SPARE_RW                0x0614
-#define OMAP4_CTRL_MODULE_PAD_WKUP_WKUP_CONTROL_SPARE_R                 0x0618
-#define OMAP4_CTRL_MODULE_PAD_WKUP_WKUP_CONTROL_SPARE_R_C0              0x061c
-
-/* Registers shifts and masks */
-
-/* IP_REVISION */
-#define OMAP4_IP_REV_SCHEME_SHIFT                               30
-#define OMAP4_IP_REV_SCHEME_MASK                                (0x3 << 30)
-#define OMAP4_IP_REV_FUNC_SHIFT                                 16
-#define OMAP4_IP_REV_FUNC_MASK                                  (0xfff << 16)
-#define OMAP4_IP_REV_RTL_SHIFT                                  11
-#define OMAP4_IP_REV_RTL_MASK                                   (0x1f << 11)
-#define OMAP4_IP_REV_MAJOR_SHIFT                                8
-#define OMAP4_IP_REV_MAJOR_MASK                                 (0x7 << 8)
-#define OMAP4_IP_REV_CUSTOM_SHIFT                               6
-#define OMAP4_IP_REV_CUSTOM_MASK                                (0x3 << 6)
-#define OMAP4_IP_REV_MINOR_SHIFT                                0
-#define OMAP4_IP_REV_MINOR_MASK                                 (0x3f << 0)
-
-/* IP_HWINFO */
-#define OMAP4_IP_HWINFO_SHIFT                                   0
-#define OMAP4_IP_HWINFO_MASK                                    (0xffffffff << 0)
-
-/* IP_SYSCONFIG */
-#define OMAP4_IP_SYSCONFIG_IDLEMODE_SHIFT                       2
-#define OMAP4_IP_SYSCONFIG_IDLEMODE_MASK                        (0x3 << 2)
-
-/* PADCONF_WAKEUPEVENT_0 */
-#define OMAP4_JTAG_TDO_DUPLICATEWAKEUPEVENT_SHIFT               24
-#define OMAP4_JTAG_TDO_DUPLICATEWAKEUPEVENT_MASK                (1 << 24)
-#define OMAP4_JTAG_TDI_DUPLICATEWAKEUPEVENT_SHIFT               23
-#define OMAP4_JTAG_TDI_DUPLICATEWAKEUPEVENT_MASK                (1 << 23)
-#define OMAP4_JTAG_TMS_TMSC_DUPLICATEWAKEUPEVENT_SHIFT          22
-#define OMAP4_JTAG_TMS_TMSC_DUPLICATEWAKEUPEVENT_MASK           (1 << 22)
-#define OMAP4_JTAG_RTCK_DUPLICATEWAKEUPEVENT_SHIFT              21
-#define OMAP4_JTAG_RTCK_DUPLICATEWAKEUPEVENT_MASK               (1 << 21)
-#define OMAP4_JTAG_TCK_DUPLICATEWAKEUPEVENT_SHIFT               20
-#define OMAP4_JTAG_TCK_DUPLICATEWAKEUPEVENT_MASK                (1 << 20)
-#define OMAP4_JTAG_NTRST_DUPLICATEWAKEUPEVENT_SHIFT             19
-#define OMAP4_JTAG_NTRST_DUPLICATEWAKEUPEVENT_MASK              (1 << 19)
-#define OMAP4_SYS_BOOT7_DUPLICATEWAKEUPEVENT_SHIFT              18
-#define OMAP4_SYS_BOOT7_DUPLICATEWAKEUPEVENT_MASK               (1 << 18)
-#define OMAP4_SYS_BOOT6_DUPLICATEWAKEUPEVENT_SHIFT              17
-#define OMAP4_SYS_BOOT6_DUPLICATEWAKEUPEVENT_MASK               (1 << 17)
-#define OMAP4_SYS_PWRON_RESET_OUT_DUPLICATEWAKEUPEVENT_SHIFT    16
-#define OMAP4_SYS_PWRON_RESET_OUT_DUPLICATEWAKEUPEVENT_MASK     (1 << 16)
-#define OMAP4_SYS_PWR_REQ_DUPLICATEWAKEUPEVENT_SHIFT            15
-#define OMAP4_SYS_PWR_REQ_DUPLICATEWAKEUPEVENT_MASK             (1 << 15)
-#define OMAP4_SYS_NRESWARM_DUPLICATEWAKEUPEVENT_SHIFT           14
-#define OMAP4_SYS_NRESWARM_DUPLICATEWAKEUPEVENT_MASK            (1 << 14)
-#define OMAP4_SYS_32K_DUPLICATEWAKEUPEVENT_SHIFT                13
-#define OMAP4_SYS_32K_DUPLICATEWAKEUPEVENT_MASK                 (1 << 13)
-#define OMAP4_FREF_CLK4_OUT_DUPLICATEWAKEUPEVENT_SHIFT          12
-#define OMAP4_FREF_CLK4_OUT_DUPLICATEWAKEUPEVENT_MASK           (1 << 12)
-#define OMAP4_FREF_CLK4_REQ_DUPLICATEWAKEUPEVENT_SHIFT          11
-#define OMAP4_FREF_CLK4_REQ_DUPLICATEWAKEUPEVENT_MASK           (1 << 11)
-#define OMAP4_FREF_CLK3_OUT_DUPLICATEWAKEUPEVENT_SHIFT          10
-#define OMAP4_FREF_CLK3_OUT_DUPLICATEWAKEUPEVENT_MASK           (1 << 10)
-#define OMAP4_FREF_CLK3_REQ_DUPLICATEWAKEUPEVENT_SHIFT          9
-#define OMAP4_FREF_CLK3_REQ_DUPLICATEWAKEUPEVENT_MASK           (1 << 9)
-#define OMAP4_FREF_CLK0_OUT_DUPLICATEWAKEUPEVENT_SHIFT          8
-#define OMAP4_FREF_CLK0_OUT_DUPLICATEWAKEUPEVENT_MASK           (1 << 8)
-#define OMAP4_FREF_CLK_IOREQ_DUPLICATEWAKEUPEVENT_SHIFT         7
-#define OMAP4_FREF_CLK_IOREQ_DUPLICATEWAKEUPEVENT_MASK          (1 << 7)
-#define OMAP4_SR_SDA_DUPLICATEWAKEUPEVENT_SHIFT                 6
-#define OMAP4_SR_SDA_DUPLICATEWAKEUPEVENT_MASK                  (1 << 6)
-#define OMAP4_SR_SCL_DUPLICATEWAKEUPEVENT_SHIFT                 5
-#define OMAP4_SR_SCL_DUPLICATEWAKEUPEVENT_MASK                  (1 << 5)
-#define OMAP4_SIM_PWRCTRL_DUPLICATEWAKEUPEVENT_SHIFT            4
-#define OMAP4_SIM_PWRCTRL_DUPLICATEWAKEUPEVENT_MASK             (1 << 4)
-#define OMAP4_SIM_CD_DUPLICATEWAKEUPEVENT_SHIFT                 3
-#define OMAP4_SIM_CD_DUPLICATEWAKEUPEVENT_MASK                  (1 << 3)
-#define OMAP4_SIM_RESET_DUPLICATEWAKEUPEVENT_SHIFT              2
-#define OMAP4_SIM_RESET_DUPLICATEWAKEUPEVENT_MASK               (1 << 2)
-#define OMAP4_SIM_CLK_DUPLICATEWAKEUPEVENT_SHIFT                1
-#define OMAP4_SIM_CLK_DUPLICATEWAKEUPEVENT_MASK                 (1 << 1)
-#define OMAP4_SIM_IO_DUPLICATEWAKEUPEVENT_SHIFT                 0
-#define OMAP4_SIM_IO_DUPLICATEWAKEUPEVENT_MASK                  (1 << 0)
-
-/* CONTROL_SMART1NOPMIO_PADCONF_0 */
-#define OMAP4_FREF_DR0_SC_SHIFT                                 30
-#define OMAP4_FREF_DR0_SC_MASK                                  (0x3 << 30)
-#define OMAP4_FREF_DR1_SC_SHIFT                                 28
-#define OMAP4_FREF_DR1_SC_MASK                                  (0x3 << 28)
-#define OMAP4_FREF_DR4_SC_SHIFT                                 26
-#define OMAP4_FREF_DR4_SC_MASK                                  (0x3 << 26)
-#define OMAP4_FREF_DR5_SC_SHIFT                                 24
-#define OMAP4_FREF_DR5_SC_MASK                                  (0x3 << 24)
-#define OMAP4_FREF_DR6_SC_SHIFT                                 22
-#define OMAP4_FREF_DR6_SC_MASK                                  (0x3 << 22)
-#define OMAP4_FREF_DR7_SC_SHIFT                                 20
-#define OMAP4_FREF_DR7_SC_MASK                                  (0x3 << 20)
-#define OMAP4_GPIO_DR7_SC_SHIFT                                 18
-#define OMAP4_GPIO_DR7_SC_MASK                                  (0x3 << 18)
-#define OMAP4_DPM_DR0_SC_SHIFT                                  14
-#define OMAP4_DPM_DR0_SC_MASK                                   (0x3 << 14)
-#define OMAP4_SIM_DR0_SC_SHIFT                                  12
-#define OMAP4_SIM_DR0_SC_MASK                                   (0x3 << 12)
-
-/* CONTROL_SMART1NOPMIO_PADCONF_1 */
-#define OMAP4_FREF_DR0_LB_SHIFT                                 30
-#define OMAP4_FREF_DR0_LB_MASK                                  (0x3 << 30)
-#define OMAP4_FREF_DR1_LB_SHIFT                                 28
-#define OMAP4_FREF_DR1_LB_MASK                                  (0x3 << 28)
-#define OMAP4_FREF_DR4_LB_SHIFT                                 26
-#define OMAP4_FREF_DR4_LB_MASK                                  (0x3 << 26)
-#define OMAP4_FREF_DR5_LB_SHIFT                                 24
-#define OMAP4_FREF_DR5_LB_MASK                                  (0x3 << 24)
-#define OMAP4_FREF_DR6_LB_SHIFT                                 22
-#define OMAP4_FREF_DR6_LB_MASK                                  (0x3 << 22)
-#define OMAP4_FREF_DR7_LB_SHIFT                                 20
-#define OMAP4_FREF_DR7_LB_MASK                                  (0x3 << 20)
-#define OMAP4_GPIO_DR7_LB_SHIFT                                 18
-#define OMAP4_GPIO_DR7_LB_MASK                                  (0x3 << 18)
-#define OMAP4_DPM_DR0_LB_SHIFT                                  14
-#define OMAP4_DPM_DR0_LB_MASK                                   (0x3 << 14)
-#define OMAP4_SIM_DR0_LB_SHIFT                                  12
-#define OMAP4_SIM_DR0_LB_MASK                                   (0x3 << 12)
-
-/* CONTROL_PADCONF_MODE */
-#define OMAP4_VDDS_DV_FREF_SHIFT                                31
-#define OMAP4_VDDS_DV_FREF_MASK                                 (1 << 31)
-#define OMAP4_VDDS_DV_BANK2_SHIFT                               30
-#define OMAP4_VDDS_DV_BANK2_MASK                                (1 << 30)
-
-/* CONTROL_XTAL_OSCILLATOR */
-#define OMAP4_OSCILLATOR_BOOST_SHIFT                            31
-#define OMAP4_OSCILLATOR_BOOST_MASK                             (1 << 31)
-#define OMAP4_OSCILLATOR_OS_OUT_SHIFT                           30
-#define OMAP4_OSCILLATOR_OS_OUT_MASK                            (1 << 30)
-
-/* CONTROL_USIMIO */
-#define OMAP4_PAD_USIM_CLK_LOW_SHIFT                            31
-#define OMAP4_PAD_USIM_CLK_LOW_MASK                             (1 << 31)
-#define OMAP4_PAD_USIM_RST_LOW_SHIFT                            29
-#define OMAP4_PAD_USIM_RST_LOW_MASK                             (1 << 29)
-#define OMAP4_USIM_PWRDNZ_SHIFT                                 28
-#define OMAP4_USIM_PWRDNZ_MASK                                  (1 << 28)
-
-/* CONTROL_I2C_2 */
-#define OMAP4_SR_SDA_GLFENB_SHIFT                               31
-#define OMAP4_SR_SDA_GLFENB_MASK                                (1 << 31)
-#define OMAP4_SR_SDA_LOAD_BITS_SHIFT                            29
-#define OMAP4_SR_SDA_LOAD_BITS_MASK                             (0x3 << 29)
-#define OMAP4_SR_SDA_PULLUPRESX_SHIFT                           28
-#define OMAP4_SR_SDA_PULLUPRESX_MASK                            (1 << 28)
-#define OMAP4_SR_SCL_GLFENB_SHIFT                               27
-#define OMAP4_SR_SCL_GLFENB_MASK                                (1 << 27)
-#define OMAP4_SR_SCL_LOAD_BITS_SHIFT                            25
-#define OMAP4_SR_SCL_LOAD_BITS_MASK                             (0x3 << 25)
-#define OMAP4_SR_SCL_PULLUPRESX_SHIFT                           24
-#define OMAP4_SR_SCL_PULLUPRESX_MASK                            (1 << 24)
-
-/* CONTROL_JTAG */
-#define OMAP4_JTAG_NTRST_EN_SHIFT                               31
-#define OMAP4_JTAG_NTRST_EN_MASK                                (1 << 31)
-#define OMAP4_JTAG_TCK_EN_SHIFT                                 30
-#define OMAP4_JTAG_TCK_EN_MASK                                  (1 << 30)
-#define OMAP4_JTAG_RTCK_EN_SHIFT                                29
-#define OMAP4_JTAG_RTCK_EN_MASK                                 (1 << 29)
-#define OMAP4_JTAG_TDI_EN_SHIFT                                 28
-#define OMAP4_JTAG_TDI_EN_MASK                                  (1 << 28)
-#define OMAP4_JTAG_TDO_EN_SHIFT                                 27
-#define OMAP4_JTAG_TDO_EN_MASK                                  (1 << 27)
-
-/* CONTROL_SYS */
-#define OMAP4_SYS_NRESWARM_PIPU_SHIFT                           31
-#define OMAP4_SYS_NRESWARM_PIPU_MASK                            (1 << 31)
-
-/* WKUP_CONTROL_SPARE_RW */
-#define OMAP4_WKUP_CONTROL_SPARE_RW_SHIFT                       0
-#define OMAP4_WKUP_CONTROL_SPARE_RW_MASK                        (0xffffffff << 0)
-
-/* WKUP_CONTROL_SPARE_R */
-#define OMAP4_WKUP_CONTROL_SPARE_R_SHIFT                        0
-#define OMAP4_WKUP_CONTROL_SPARE_R_MASK                         (0xffffffff << 0)
-
-/* WKUP_CONTROL_SPARE_R_C0 */
-#define OMAP4_WKUP_CONTROL_SPARE_R_C0_SHIFT                     31
-#define OMAP4_WKUP_CONTROL_SPARE_R_C0_MASK                      (1 << 31)
-#define OMAP4_WKUP_CONTROL_SPARE_R_C1_SHIFT                     30
-#define OMAP4_WKUP_CONTROL_SPARE_R_C1_MASK                      (1 << 30)
-#define OMAP4_WKUP_CONTROL_SPARE_R_C2_SHIFT                     29
-#define OMAP4_WKUP_CONTROL_SPARE_R_C2_MASK                      (1 << 29)
-#define OMAP4_WKUP_CONTROL_SPARE_R_C3_SHIFT                     28
-#define OMAP4_WKUP_CONTROL_SPARE_R_C3_MASK                      (1 << 28)
-#define OMAP4_WKUP_CONTROL_SPARE_R_C4_SHIFT                     27
-#define OMAP4_WKUP_CONTROL_SPARE_R_C4_MASK                      (1 << 27)
-#define OMAP4_WKUP_CONTROL_SPARE_R_C5_SHIFT                     26
-#define OMAP4_WKUP_CONTROL_SPARE_R_C5_MASK                      (1 << 26)
-#define OMAP4_WKUP_CONTROL_SPARE_R_C6_SHIFT                     25
-#define OMAP4_WKUP_CONTROL_SPARE_R_C6_MASK                      (1 << 25)
-#define OMAP4_WKUP_CONTROL_SPARE_R_C7_SHIFT                     24
-#define OMAP4_WKUP_CONTROL_SPARE_R_C7_MASK                      (1 << 24)
-
-#endif
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index b6f8f348296e..324f02bf8a51 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -432,9 +432,9 @@ static int __init omap2_init_devices(void)
          */
         omap_init_audio();
         omap_init_camera();
-        omap_init_mbox();
         /* If dtb is there, the devices will be created dynamically */
         if (!of_have_populated_dt()) {
+                omap_init_mbox();
                 omap_init_mcspi();
                 omap_init_sham();
                 omap_init_aes();
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c
index a6d2cf1f8d02..e1a56d87599e 100644
--- a/arch/arm/mach-omap2/dma.c
+++ b/arch/arm/mach-omap2/dma.c
@@ -259,6 +259,9 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
         if (cpu_is_omap34xx() && (omap_type() != OMAP2_DEVICE_TYPE_GP))
                 d->dev_caps |= HS_CHANNELS_RESERVED;
 
+        if (platform_get_irq_byname(pdev, "0") < 0)
+                d->dev_caps |= DMA_ENGINE_HANDLE_IRQ;
+
         /* Check the capabilities register for descriptor loading feature */
         if (dma_read(CAPS_0, 0) & DMA_HAS_DESCRIPTOR_CAPS)
                 dma_common_ch_end = CCDN;
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c
index 6d7ba37e2257..ac3d789ac3cd 100644
--- a/arch/arm/mach-omap2/dpll3xxx.c
+++ b/arch/arm/mach-omap2/dpll3xxx.c
@@ -28,11 +28,8 @@
 #include <linux/bitops.h>
 #include <linux/clkdev.h>
 
-#include "soc.h"
 #include "clockdomain.h"
 #include "clock.h"
-#include "cm2xxx_3xxx.h"
-#include "cm-regbits-34xx.h"
 
 /* CM_AUTOIDLE_PLL*.AUTO_* bit values */
 #define DPLL_AUTOIDLE_DISABLE                   0x0
@@ -310,7 +307,7 @@ static int omap3_noncore_dpll_program(struct clk_hw_omap *clk, u16 freqsel)
          * Set jitter correction. Jitter correction applicable for OMAP343X
          * only since freqsel field is no longer present on other devices.
          */
-        if (cpu_is_omap343x()) {
+        if (ti_clk_features.flags & TI_CLK_DPLL_HAS_FREQSEL) {
                 v = omap2_clk_readl(clk, dd->control_reg);
                 v &= ~dd->freqsel_mask;
                 v |= freqsel << __ffs(dd->freqsel_mask);
@@ -478,6 +475,7 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate,
 {
         struct clk_hw_omap *clk = to_clk_hw_omap(hw);
         struct clk *new_parent = NULL;
+        unsigned long rrate;
         u16 freqsel = 0;
         struct dpll_data *dd;
         int ret;
@@ -505,14 +503,22 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate,
                 __clk_prepare(dd->clk_ref);
                 clk_enable(dd->clk_ref);
 
-                if (dd->last_rounded_rate != rate)
-                        rate = __clk_round_rate(hw->clk, rate);
+                /* XXX this check is probably pointless in the CCF context */
+                if (dd->last_rounded_rate != rate) {
+                        rrate = __clk_round_rate(hw->clk, rate);
+                        if (rrate != rate) {
+                                pr_warn("%s: %s: final rate %lu does not match desired rate %lu\n",
+                                        __func__, __clk_get_name(hw->clk),
+                                        rrate, rate);
+                                rate = rrate;
+                        }
+                }
 
                 if (dd->last_rounded_rate == 0)
                         return -EINVAL;
 
                 /* Freqsel is available only on OMAP343X devices */
-                if (cpu_is_omap343x()) {
+                if (ti_clk_features.flags & TI_CLK_DPLL_HAS_FREQSEL) {
                         freqsel = _omap3_dpll_compute_freqsel(clk,
                                                 dd->last_rounded_n);
                         WARN_ON(!freqsel);
diff --git a/arch/arm/mach-omap2/dpll44xx.c b/arch/arm/mach-omap2/dpll44xx.c
index 52f9438b92f2..4613f1e86988 100644
--- a/arch/arm/mach-omap2/dpll44xx.c
+++ b/arch/arm/mach-omap2/dpll44xx.c
@@ -15,10 +15,7 @@
 #include <linux/io.h>
 #include <linux/bitops.h>
 
-#include "soc.h"
 #include "clock.h"
-#include "clock44xx.h"
-#include "cm-regbits-44xx.h"
 
 /*
  * Maximum DPLL input frequency (FINT) and output frequency (FOUT) that
@@ -29,13 +26,23 @@
 #define OMAP4_DPLL_LP_FINT_MAX  1000000
 #define OMAP4_DPLL_LP_FOUT_MAX  100000000
 
+/*
+ * Bitfield declarations
+ */
+#define OMAP4430_DPLL_CLKOUT_GATE_CTRL_MASK             (1 << 8)
+#define OMAP4430_DPLL_CLKOUTX2_GATE_CTRL_MASK           (1 << 10)
+#define OMAP4430_DPLL_REGM4XEN_MASK                     (1 << 11)
+
+/* Static rate multiplier for OMAP4 REGM4XEN clocks */
+#define OMAP4430_REGM4XEN_MULT                          4
+
 /* Supported only on OMAP4 */
 int omap4_dpllmx_gatectrl_read(struct clk_hw_omap *clk)
 {
         u32 v;
         u32 mask;
 
-        if (!clk || !clk->clksel_reg || !cpu_is_omap44xx())
+        if (!clk || !clk->clksel_reg)
                 return -EINVAL;
 
         mask = clk->flags & CLOCK_CLKOUTX2 ?
@@ -54,7 +61,7 @@ void omap4_dpllmx_allow_gatectrl(struct clk_hw_omap *clk)
         u32 v;
         u32 mask;
 
-        if (!clk || !clk->clksel_reg || !cpu_is_omap44xx())
+        if (!clk || !clk->clksel_reg)
                 return;
 
         mask = clk->flags & CLOCK_CLKOUTX2 ?
@@ -72,7 +79,7 @@ void omap4_dpllmx_deny_gatectrl(struct clk_hw_omap *clk)
         u32 v;
         u32 mask;
 
-        if (!clk || !clk->clksel_reg || !cpu_is_omap44xx())
+        if (!clk || !clk->clksel_reg)
                 return;
 
         mask = clk->flags & CLOCK_CLKOUTX2 ?
diff --git a/arch/arm/mach-omap2/dsp.c b/arch/arm/mach-omap2/dsp.c
deleted file mode 100644
index f7492df1cbba..000000000000
--- a/arch/arm/mach-omap2/dsp.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * TI's OMAP DSP platform device registration
- *
- * Copyright (C) 2005-2006 Texas Instruments, Inc.
- * Copyright (C) 2009 Nokia Corporation
- *
- * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.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.
- */
-
-/*
- * XXX The function pointers to the PRM/CM functions are incorrect and
- * should be removed.  No device driver should be changing PRM/CM bits
- * directly; that's a layering violation -- those bits are the responsibility
- * of the OMAP PM core code.
- */
-
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#include <asm/memblock.h>
-
-#include "control.h"
-#include "cm2xxx_3xxx.h"
-#include "prm2xxx_3xxx.h"
-#ifdef CONFIG_TIDSPBRIDGE_DVFS
-#include "omap-pm.h"
-#endif
-#include "soc.h"
-
-#include <linux/platform_data/dsp-omap.h>
-
-static struct platform_device *omap_dsp_pdev;
-
-static struct omap_dsp_platform_data omap_dsp_pdata __initdata = {
-#ifdef CONFIG_TIDSPBRIDGE_DVFS
-        .dsp_set_min_opp = omap_pm_dsp_set_min_opp,
-        .dsp_get_opp = omap_pm_dsp_get_opp,
-        .cpu_set_freq = omap_pm_cpu_set_freq,
-        .cpu_get_freq = omap_pm_cpu_get_freq,
-#endif
-        .dsp_prm_read = omap2_prm_read_mod_reg,
-        .dsp_prm_write = omap2_prm_write_mod_reg,
-        .dsp_prm_rmw_bits = omap2_prm_rmw_mod_reg_bits,
-        .dsp_cm_read = omap2_cm_read_mod_reg,
-        .dsp_cm_write = omap2_cm_write_mod_reg,
-        .dsp_cm_rmw_bits = omap2_cm_rmw_mod_reg_bits,
-
-        .set_bootaddr = omap_ctrl_write_dsp_boot_addr,
-        .set_bootmode = omap_ctrl_write_dsp_boot_mode,
-};
-
-static phys_addr_t omap_dsp_phys_mempool_base;
-
-void __init omap_dsp_reserve_sdram_memblock(void)
-{
-        phys_addr_t size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE;
-        phys_addr_t paddr;
-
-        if (!cpu_is_omap34xx())
-                return;
-
-        if (!size)
-                return;
-
-        paddr = arm_memblock_steal(size, SZ_1M);
-        if (!paddr) {
-                pr_err("%s: failed to reserve %llx bytes\n",
-                                __func__, (unsigned long long)size);
-                return;
-        }
-
-        omap_dsp_phys_mempool_base = paddr;
-}
-
-static phys_addr_t omap_dsp_get_mempool_base(void)
-{
-        return omap_dsp_phys_mempool_base;
-}
-
-static int __init omap_dsp_init(void)
-{
-        struct platform_device *pdev;
-        int err = -ENOMEM;
-        struct omap_dsp_platform_data *pdata = &omap_dsp_pdata;
-
-        if (!cpu_is_omap34xx())
-                return 0;
-
-        pdata->phys_mempool_base = omap_dsp_get_mempool_base();
-
-        if (pdata->phys_mempool_base) {
-                pdata->phys_mempool_size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE;
-                pr_info("%s: %llx bytes @ %llx\n", __func__,
-                        (unsigned long long)pdata->phys_mempool_size,
-                        (unsigned long long)pdata->phys_mempool_base);
-        }
-
-        pdev = platform_device_alloc("omap-dsp", -1);
-        if (!pdev)
-                goto err_out;
-
-        err = platform_device_add_data(pdev, pdata, sizeof(*pdata));
-        if (err)
-                goto err_out;
-
-        err = platform_device_add(pdev);
-        if (err)
-                goto err_out;
-
-        omap_dsp_pdev = pdev;
-        return 0;
-
-err_out:
-        platform_device_put(pdev);
-        return err;
-}
-module_init(omap_dsp_init);
-
-static void __exit omap_dsp_exit(void)
-{
-        if (!cpu_is_omap34xx())
-                return;
-
-        platform_device_unregister(omap_dsp_pdev);
-}
-module_exit(omap_dsp_exit);
-
-MODULE_AUTHOR("Hiroshi DOYU");
-MODULE_DESCRIPTION("TI's OMAP DSP platform device registration");
-MODULE_LICENSE("GPL");
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index 93914d220069..8897ad7035fd 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -24,25 +24,6 @@
 /* minimum size for IO mapping */
 #define NAND_IO_SIZE    4
 
-static struct resource gpmc_nand_resource[] = {
-        {
-                .flags          = IORESOURCE_MEM,
-        },
-        {
-                .flags          = IORESOURCE_IRQ,
-        },
-        {
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device gpmc_nand_device = {
-        .name           = "omap2-nand",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(gpmc_nand_resource),
-        .resource       = gpmc_nand_resource,
-};
-
 static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
 {
         /* platforms which support all ECC schemes */
@@ -95,43 +76,41 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
 {
         int err = 0;
         struct gpmc_settings s;
-        struct device *dev = &gpmc_nand_device.dev;
-
-        memset(&s, 0, sizeof(struct gpmc_settings));
+        struct platform_device *pdev;
+        struct resource gpmc_nand_res[] = {
+                { .flags = IORESOURCE_MEM, },
+                { .flags = IORESOURCE_IRQ, },
+                { .flags = IORESOURCE_IRQ, },
+        };
 
-        gpmc_nand_device.dev.platform_data = gpmc_nand_data;
+        BUG_ON(gpmc_nand_data->cs >= GPMC_CS_NUM);
 
         err = gpmc_cs_request(gpmc_nand_data->cs, NAND_IO_SIZE,
-                                (unsigned long *)&gpmc_nand_resource[0].start);
+                              (unsigned long *)&gpmc_nand_res[0].start);
         if (err < 0) {
-                dev_err(dev, "Cannot request GPMC CS %d, error %d\n",
-                        gpmc_nand_data->cs, err);
+                pr_err("omap2-gpmc: Cannot request GPMC CS %d, error %d\n",
+                       gpmc_nand_data->cs, err);
                 return err;
         }
-
-        gpmc_nand_resource[0].end = gpmc_nand_resource[0].start +
-                                                        NAND_IO_SIZE - 1;
-
-        gpmc_nand_resource[1].start =
-                                gpmc_get_client_irq(GPMC_IRQ_FIFOEVENTENABLE);
-        gpmc_nand_resource[2].start =
-                                gpmc_get_client_irq(GPMC_IRQ_COUNT_EVENT);
+        gpmc_nand_res[0].end = gpmc_nand_res[0].start + NAND_IO_SIZE - 1;
+        gpmc_nand_res[1].start = gpmc_get_client_irq(GPMC_IRQ_FIFOEVENTENABLE);
+        gpmc_nand_res[2].start = gpmc_get_client_irq(GPMC_IRQ_COUNT_EVENT);
 
         if (gpmc_t) {
                 err = gpmc_cs_set_timings(gpmc_nand_data->cs, gpmc_t);
                 if (err < 0) {
-                        dev_err(dev, "Unable to set gpmc timings: %d\n", err);
+                        pr_err("omap2-gpmc: Unable to set gpmc timings: %d\n", err);
                         return err;
                 }
         }
 
+        memset(&s, 0, sizeof(struct gpmc_settings));
         if (gpmc_nand_data->of_node)
                 gpmc_read_settings_dt(gpmc_nand_data->of_node, &s);
         else
                 gpmc_set_legacy(gpmc_nand_data, &s);
 
         s.device_nand = true;
-
         err = gpmc_cs_program_settings(gpmc_nand_data->cs, &s);
         if (err < 0)
                 goto out_free_cs;
@@ -143,18 +122,34 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
         gpmc_update_nand_reg(&gpmc_nand_data->reg, gpmc_nand_data->cs);
 
         if (!gpmc_hwecc_bch_capable(gpmc_nand_data->ecc_opt)) {
-                dev_err(dev, "Unsupported NAND ECC scheme selected\n");
-                return -EINVAL;
+                pr_err("omap2-nand: Unsupported NAND ECC scheme selected\n");
+                err = -EINVAL;
+                goto out_free_cs;
         }
 
-        err = platform_device_register(&gpmc_nand_device);
-        if (err < 0) {
-                dev_err(dev, "Unable to register NAND device\n");
-                goto out_free_cs;
+
+        pdev = platform_device_alloc("omap2-nand", gpmc_nand_data->cs);
+        if (pdev) {
+                err = platform_device_add_resources(pdev, gpmc_nand_res,
+                                                    ARRAY_SIZE(gpmc_nand_res));
+                if (!err)
+                        pdev->dev.platform_data = gpmc_nand_data;
+        } else {
+                err = -ENOMEM;
+        }
+        if (err)
+                goto out_free_pdev;
+
+        err = platform_device_add(pdev);
+        if (err) {
+                dev_err(&pdev->dev, "Unable to register NAND device\n");
+                goto out_free_pdev;
         }
 
         return 0;
 
+out_free_pdev:
+        platform_device_put(pdev);
 out_free_cs:
         gpmc_cs_free(gpmc_nand_data->cs);
 
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 8f559450c876..5d0667c119f6 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -53,6 +53,7 @@
 #include "prm2xxx.h"
 #include "prm3xxx.h"
 #include "prm44xx.h"
+#include "opp2xxx.h"
 
 /*
  * omap_clk_soc_init: points to a function that does the SoC-specific
@@ -410,7 +411,8 @@ void __init omap2420_init_early(void)
         omap242x_clockdomains_init();
         omap2420_hwmod_init();
         omap_hwmod_init_postsetup();
-        omap_clk_soc_init = omap2420_clk_init;
+        omap_clk_soc_init = omap2420_dt_clk_init;
+        rate_table = omap2420_rate_table;
 }
 
 void __init omap2420_init_late(void)
@@ -439,7 +441,8 @@ void __init omap2430_init_early(void)
         omap243x_clockdomains_init();
         omap2430_hwmod_init();
         omap_hwmod_init_postsetup();
-        omap_clk_soc_init = omap2430_clk_init;
+        omap_clk_soc_init = omap2430_dt_clk_init;
+        rate_table = omap2430_rate_table;
 }
 
 void __init omap2430_init_late(void)
@@ -728,6 +731,8 @@ int __init omap_clk_init(void)
         if (!omap_clk_soc_init)
                 return 0;
 
+        ti_clk_init_features();
+
         ret = of_prcm_init();
         if (!ret)
                 ret = omap_clk_soc_init();
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index f62f7537d899..ac8a249779f2 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -681,29 +681,19 @@ static ssize_t omap_mux_dbg_signal_write(struct file *file,
                                          const char __user *user_buf,
                                          size_t count, loff_t *ppos)
 {
-        char buf[OMAP_MUX_MAX_ARG_CHAR];
         struct seq_file *seqf;
         struct omap_mux *m;
-        unsigned long val;
-        int buf_size, ret;
+        u16 val;
+        int ret;
         struct omap_mux_partition *partition;
 
         if (count > OMAP_MUX_MAX_ARG_CHAR)
                 return -EINVAL;
 
-        memset(buf, 0, sizeof(buf));
-        buf_size = min(count, sizeof(buf) - 1);
-
-        if (copy_from_user(buf, user_buf, buf_size))
-                return -EFAULT;
-
-        ret = strict_strtoul(buf, 0x10, &val);
+        ret = kstrtou16_from_user(user_buf, count, 0x10, &val);
         if (ret < 0)
                 return ret;
 
-        if (val > 0xffff)
-                return -EINVAL;
-
         seqf = file->private_data;
         m = seqf->private;
 
@@ -711,7 +701,7 @@ static ssize_t omap_mux_dbg_signal_write(struct file *file,
         if (!partition)
                 return -ENODEV;
 
-        omap_mux_write(partition, (u16)val, m->reg_offset);
+        omap_mux_write(partition, val, m->reg_offset);
         *ppos += count;
 
         return count;
@@ -917,14 +907,14 @@ static void __init omap_mux_set_cmdline_signals(void)
 
         while ((token = strsep(&next_opt, ",")) != NULL) {
                 char *keyval, *name;
-                unsigned long val;
+                u16 val;
 
                 keyval = token;
                 name = strsep(&keyval, "=");
                 if (name) {
                         int res;
 
-                        res = strict_strtoul(keyval, 0x10, &val);
+                        res = kstrtou16(keyval, 0x10, &val);
                         if (res < 0)
                                 continue;
 
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
index f1fab5684a24..4068350f9059 100644
--- a/arch/arm/mach-omap2/omap-iommu.c
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -34,8 +34,6 @@ static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused)
 
         pdata->name = oh->name;
         pdata->nr_tlb_entries = a->nr_tlb_entries;
-        pdata->da_start = a->da_start;
-        pdata->da_end = a->da_end;
 
         if (oh->rst_lines_cnt == 1) {
                 pdata->reset_name = oh->rst_lines->name;
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 2f15979c2e9c..65b1647092bd 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -16,7 +16,6 @@
 #include <linux/i2c-omap.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/omap-dma.h>
-#include <linux/platform_data/mailbox-omap.h>
 #include <plat/dmtimer.h>
 
 #include "omap_hwmod.h"
@@ -163,18 +162,6 @@ static struct omap_hwmod omap2420_dma_system_hwmod = {
 };
 
 /* mailbox */
-static struct omap_mbox_dev_info omap2420_mailbox_info[] = {
-        { .name = "dsp", .tx_id = 0, .rx_id = 1, .irq_id = 0, .usr_id = 0 },
-        { .name = "iva", .tx_id = 2, .rx_id = 3, .irq_id = 1, .usr_id = 3 },
-};
-
-static struct omap_mbox_pdata omap2420_mailbox_attrs = {
-        .num_users      = 4,
-        .num_fifos      = 6,
-        .info_cnt       = ARRAY_SIZE(omap2420_mailbox_info),
-        .info           = omap2420_mailbox_info,
-};
-
 static struct omap_hwmod omap2420_mailbox_hwmod = {
         .name           = "mailbox",
         .class          = &omap2xxx_mailbox_hwmod_class,
@@ -188,7 +175,6 @@ static struct omap_hwmod omap2420_mailbox_hwmod = {
                         .idlest_idle_bit = OMAP24XX_ST_MAILBOXES_SHIFT,
                 },
         },
-        .dev_attr       = &omap2420_mailbox_attrs,
 };
 
 /*
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index 6d1b60902179..c2555cb95e71 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -17,7 +17,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/omap-dma.h>
-#include <linux/platform_data/mailbox-omap.h>
 #include <plat/dmtimer.h>
 
 #include "omap_hwmod.h"
@@ -161,17 +160,6 @@ static struct omap_hwmod omap2430_dma_system_hwmod = {
 };
 
 /* mailbox */
-static struct omap_mbox_dev_info omap2430_mailbox_info[] = {
-        { .name = "dsp", .tx_id = 0, .rx_id = 1 },
-};
-
-static struct omap_mbox_pdata omap2430_mailbox_attrs = {
-        .num_users      = 4,
-        .num_fifos      = 6,
-        .info_cnt       = ARRAY_SIZE(omap2430_mailbox_info),
-        .info           = omap2430_mailbox_info,
-};
-
 static struct omap_hwmod omap2430_mailbox_hwmod = {
         .name           = "mailbox",
         .class          = &omap2xxx_mailbox_hwmod_class,
@@ -185,7 +173,6 @@ static struct omap_hwmod omap2430_mailbox_hwmod = {
                         .idlest_idle_bit = OMAP24XX_ST_MAILBOXES_SHIFT,
                 },
         },
-        .dev_attr       = &omap2430_mailbox_attrs,
 };
 
 /* mcspi3 */
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
index 0413daba2dba..c1e98d589100 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
@@ -152,15 +152,6 @@ struct omap_hwmod_addr_space omap2_dma_system_addrs[] = {
         { }
 };
 
-struct omap_hwmod_addr_space omap2_mailbox_addrs[] = {
-        {
-                .pa_start       = 0x48094000,
-                .pa_end         = 0x48094000 + SZ_512 - 1,
-                .flags          = ADDR_TYPE_RT,
-        },
-        { }
-};
-
 struct omap_hwmod_addr_space omap2_mcbsp1_addrs[] = {
         {
                 .name           = "mpu",
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
index 5da7a42a6d90..c6c6384de867 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
@@ -37,46 +37,6 @@ struct omap_hwmod_class omap2_uart_class = {
 };
 
 /*
- * 'dss' class
- * display sub-system
- */
-
-static struct omap_hwmod_class_sysconfig omap2_dss_sysc = {
-        .rev_offs       = 0x0000,
-        .sysc_offs      = 0x0010,
-        .syss_offs      = 0x0014,
-        .sysc_flags     = (SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE |
-                           SYSS_HAS_RESET_STATUS),
-        .sysc_fields    = &omap_hwmod_sysc_type1,
-};
-
-struct omap_hwmod_class omap2_dss_hwmod_class = {
-        .name   = "dss",
-        .sysc   = &omap2_dss_sysc,
-        .reset  = omap_dss_reset,
-};
-
-/*
- * 'rfbi' class
- * remote frame buffer interface
- */
-
-static struct omap_hwmod_class_sysconfig omap2_rfbi_sysc = {
-        .rev_offs       = 0x0000,
-        .sysc_offs      = 0x0010,
-        .syss_offs      = 0x0014,
-        .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
-                           SYSC_HAS_AUTOIDLE),
-        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
-        .sysc_fields    = &omap_hwmod_sysc_type1,
-};
-
-struct omap_hwmod_class omap2_rfbi_hwmod_class = {
-        .name   = "rfbi",
-        .sysc   = &omap2_rfbi_sysc,
-};
-
-/*
  * 'venc' class
  * video encoder
  */
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
index e2db378b849e..8f5989d48a80 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
@@ -317,21 +317,11 @@ struct omap_hwmod_ocp_if am33xx_l4_per__i2c3 = {
         .user           = OCP_USER_MPU,
 };
 
-static struct omap_hwmod_addr_space am33xx_mailbox_addrs[] = {
-        {
-                .pa_start       = 0x480C8000,
-                .pa_end         = 0x480C8000 + (SZ_4K - 1),
-                .flags          = ADDR_TYPE_RT
-        },
-        { }
-};
-
 /* l4 ls -> mailbox */
 struct omap_hwmod_ocp_if am33xx_l4_per__mailbox = {
         .master         = &am33xx_l4_ls_hwmod,
         .slave          = &am33xx_mailbox_hwmod,
         .clk            = "l4ls_gclk",
-        .addr           = am33xx_mailbox_addrs,
         .user           = OCP_USER_MPU,
 };
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 1cd0cfdc03e0..e9516b454e76 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -2986,8 +2986,6 @@ static struct omap_hwmod_class omap3xxx_mmu_hwmod_class = {
 /* mmu isp */
 
 static struct omap_mmu_dev_attr mmu_isp_dev_attr = {
-        .da_start       = 0x0,
-        .da_end         = 0xfffff000,
         .nr_tlb_entries = 8,
 };
 
@@ -3026,8 +3024,6 @@ static struct omap_hwmod omap3xxx_mmu_isp_hwmod = {
 /* mmu iva */
 
 static struct omap_mmu_dev_attr mmu_iva_dev_attr = {
-        .da_start       = 0x11000000,
-        .da_end         = 0xfffff000,
         .nr_tlb_entries = 32,
 };
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
index 5c2cc8083fdd..fea01aa3ef42 100644
--- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
@@ -19,6 +19,8 @@
 #include "omap_hwmod.h"
 #include "omap_hwmod_33xx_43xx_common_data.h"
 #include "prcm43xx.h"
+#include "omap_hwmod_common_data.h"
+
 
 /* IP blocks */
 static struct omap_hwmod am43xx_l4_hs_hwmod = {
@@ -415,6 +417,72 @@ static struct omap_hwmod am43xx_qspi_hwmod = {
         },
 };
 
+/* dss */
+
+static struct omap_hwmod am43xx_dss_core_hwmod = {
+        .name           = "dss_core",
+        .class          = &omap2_dss_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "disp_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* dispc */
+
+struct omap_dss_dispc_dev_attr am43xx_dss_dispc_dev_attr = {
+        .manager_count          = 1,
+        .has_framedonetv_irq    = 0
+};
+
+static struct omap_hwmod_class_sysconfig am43xx_dispc_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SOFTRESET |
+                           SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_MIDLEMODE),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class am43xx_dispc_hwmod_class = {
+        .name   = "dispc",
+        .sysc   = &am43xx_dispc_sysc,
+};
+
+static struct omap_hwmod am43xx_dss_dispc_hwmod = {
+        .name           = "dss_dispc",
+        .class          = &am43xx_dispc_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "disp_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+                },
+        },
+        .dev_attr       = &am43xx_dss_dispc_dev_attr,
+};
+
+/* rfbi */
+
+static struct omap_hwmod am43xx_dss_rfbi_hwmod = {
+        .name           = "dss_rfbi",
+        .class          = &omap2_rfbi_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "disp_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,
+                },
+        },
+};
+
 /* Interfaces */
 static struct omap_hwmod_ocp_if am43xx_l3_main__l4_hs = {
         .master         = &am33xx_l3_main_hwmod,
@@ -654,6 +722,34 @@ static struct omap_hwmod_ocp_if am43xx_l3_s__qspi = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+static struct omap_hwmod_ocp_if am43xx_dss__l3_main = {
+        .master         = &am43xx_dss_core_hwmod,
+        .slave          = &am33xx_l3_main_hwmod,
+        .clk            = "l3_gclk",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if am43xx_l4_ls__dss = {
+        .master         = &am33xx_l4_ls_hwmod,
+        .slave          = &am43xx_dss_core_hwmod,
+        .clk            = "l4ls_gclk",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_dispc = {
+        .master         = &am33xx_l4_ls_hwmod,
+        .slave          = &am43xx_dss_dispc_hwmod,
+        .clk            = "l4ls_gclk",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_rfbi = {
+        .master         = &am33xx_l4_ls_hwmod,
+        .slave          = &am43xx_dss_rfbi_hwmod,
+        .clk            = "l4ls_gclk",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
         &am33xx_l4_wkup__synctimer,
         &am43xx_l4_ls__timer8,
@@ -748,6 +844,10 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
         &am43xx_l4_ls__ocp2scp1,
         &am43xx_l3_s__usbotgss0,
         &am43xx_l3_s__usbotgss1,
+        &am43xx_dss__l3_main,
+        &am43xx_l4_ls__dss,
+        &am43xx_l4_ls__dss_dispc,
+        &am43xx_l4_ls__dss_rfbi,
         NULL,
 };
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 41e54f759934..44e5634bba34 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2084,8 +2084,6 @@ static struct omap_hwmod_class omap44xx_mmu_hwmod_class = {
 /* mmu ipu */
 
 static struct omap_mmu_dev_attr mmu_ipu_dev_attr = {
-        .da_start       = 0x0,
-        .da_end         = 0xfffff000,
         .nr_tlb_entries = 32,
 };
 
@@ -2133,8 +2131,6 @@ static struct omap_hwmod omap44xx_mmu_ipu_hwmod = {
 /* mmu dsp */
 
 static struct omap_mmu_dev_attr mmu_dsp_dev_attr = {
-        .da_start       = 0x0,
-        .da_end         = 0xfffff000,
         .nr_tlb_entries = 32,
 };
 
@@ -4142,21 +4138,11 @@ static struct omap_hwmod_ocp_if omap44xx_l4_wkup__kbd = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-static struct omap_hwmod_addr_space omap44xx_mailbox_addrs[] = {
-        {
-                .pa_start       = 0x4a0f4000,
-                .pa_end         = 0x4a0f41ff,
-                .flags          = ADDR_TYPE_RT
-        },
-        { }
-};
-
 /* l4_cfg -> mailbox */
 static struct omap_hwmod_ocp_if omap44xx_l4_cfg__mailbox = {
         .master         = &omap44xx_l4_cfg_hwmod,
         .slave          = &omap44xx_mailbox_hwmod,
         .clk            = "l4_div_ck",
-        .addr           = omap44xx_mailbox_addrs,
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 284324f2b98a..2757abf87fbc 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -273,6 +273,56 @@ static struct omap_hwmod dra7xx_ctrl_module_wkup_hwmod = {
 };
 
 /*
+ * 'gmac' class
+ * cpsw/gmac sub system
+ */
+static struct omap_hwmod_class_sysconfig dra7xx_gmac_sysc = {
+        .rev_offs       = 0x0,
+        .sysc_offs      = 0x8,
+        .syss_offs      = 0x4,
+        .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE |
+                           SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | MSTANDBY_FORCE |
+                           MSTANDBY_NO),
+        .sysc_fields    = &omap_hwmod_sysc_type3,
+};
+
+static struct omap_hwmod_class dra7xx_gmac_hwmod_class = {
+        .name           = "gmac",
+        .sysc           = &dra7xx_gmac_sysc,
+};
+
+static struct omap_hwmod dra7xx_gmac_hwmod = {
+        .name           = "gmac",
+        .class          = &dra7xx_gmac_hwmod_class,
+        .clkdm_name     = "gmac_clkdm",
+        .flags          = (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY),
+        .main_clk       = "dpll_gmac_ck",
+        .mpu_rt_idx     = 1,
+        .prcm           = {
+                .omap4  = {
+                        .clkctrl_offs   = DRA7XX_CM_GMAC_GMAC_CLKCTRL_OFFSET,
+                        .context_offs   = DRA7XX_RM_GMAC_GMAC_CONTEXT_OFFSET,
+                        .modulemode     = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
+ * 'mdio' class
+ */
+static struct omap_hwmod_class dra7xx_mdio_hwmod_class = {
+        .name           = "davinci_mdio",
+};
+
+static struct omap_hwmod dra7xx_mdio_hwmod = {
+        .name           = "davinci_mdio",
+        .class          = &dra7xx_mdio_hwmod_class,
+        .clkdm_name     = "gmac_clkdm",
+        .main_clk       = "dpll_gmac_ck",
+};
+
+/*
  * 'dcan' class
  *
  */
@@ -343,19 +393,10 @@ static struct omap_dma_dev_attr dma_dev_attr = {
 };
 
 /* 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 = {
@@ -939,6 +980,194 @@ static struct omap_hwmod dra7xx_i2c5_hwmod = {
 };
 
 /*
+ * 'mailbox' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_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 dra7xx_mailbox_hwmod_class = {
+        .name   = "mailbox",
+        .sysc   = &dra7xx_mailbox_sysc,
+};
+
+/* mailbox1 */
+static struct omap_hwmod dra7xx_mailbox1_hwmod = {
+        .name           = "mailbox1",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX1_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox2 */
+static struct omap_hwmod dra7xx_mailbox2_hwmod = {
+        .name           = "mailbox2",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX2_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox3 */
+static struct omap_hwmod dra7xx_mailbox3_hwmod = {
+        .name           = "mailbox3",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX3_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX3_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox4 */
+static struct omap_hwmod dra7xx_mailbox4_hwmod = {
+        .name           = "mailbox4",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX4_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX4_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox5 */
+static struct omap_hwmod dra7xx_mailbox5_hwmod = {
+        .name           = "mailbox5",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX5_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX5_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox6 */
+static struct omap_hwmod dra7xx_mailbox6_hwmod = {
+        .name           = "mailbox6",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX6_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX6_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox7 */
+static struct omap_hwmod dra7xx_mailbox7_hwmod = {
+        .name           = "mailbox7",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX7_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX7_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox8 */
+static struct omap_hwmod dra7xx_mailbox8_hwmod = {
+        .name           = "mailbox8",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX8_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX8_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox9 */
+static struct omap_hwmod dra7xx_mailbox9_hwmod = {
+        .name           = "mailbox9",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX9_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX9_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox10 */
+static struct omap_hwmod dra7xx_mailbox10_hwmod = {
+        .name           = "mailbox10",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX10_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX10_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox11 */
+static struct omap_hwmod dra7xx_mailbox11_hwmod = {
+        .name           = "mailbox11",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX11_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX11_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox12 */
+static struct omap_hwmod dra7xx_mailbox12_hwmod = {
+        .name           = "mailbox12",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX12_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX12_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* mailbox13 */
+static struct omap_hwmod dra7xx_mailbox13_hwmod = {
+        .name           = "mailbox13",
+        .class          = &dra7xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_MAILBOX13_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_MAILBOX13_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/*
  * 'mcspi' class
  *
  */
@@ -1215,6 +1444,97 @@ static struct omap_hwmod dra7xx_ocp2scp1_hwmod = {
         },
 };
 
+/* ocp2scp3 */
+static struct omap_hwmod dra7xx_ocp2scp3_hwmod = {
+        .name           = "ocp2scp3",
+        .class          = &dra7xx_ocp2scp_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "l4_root_clk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_OCP2SCP3_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_OCP2SCP3_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+
+/*
+ * 'PCIE' class
+ *
+ */
+
+static struct omap_hwmod_class dra7xx_pcie_hwmod_class = {
+        .name   = "pcie",
+};
+
+/* pcie1 */
+static struct omap_hwmod dra7xx_pcie1_hwmod = {
+        .name           = "pcie1",
+        .class          = &dra7xx_pcie_hwmod_class,
+        .clkdm_name     = "pcie_clkdm",
+        .main_clk       = "l4_root_clk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs   = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
+                        .modulemode     = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* pcie2 */
+static struct omap_hwmod dra7xx_pcie2_hwmod = {
+        .name           = "pcie2",
+        .class          = &dra7xx_pcie_hwmod_class,
+        .clkdm_name     = "pcie_clkdm",
+        .main_clk       = "l4_root_clk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
+ * 'PCIE PHY' class
+ *
+ */
+
+static struct omap_hwmod_class dra7xx_pcie_phy_hwmod_class = {
+        .name   = "pcie-phy",
+};
+
+/* pcie1 phy */
+static struct omap_hwmod dra7xx_pcie1_phy_hwmod = {
+        .name           = "pcie1-phy",
+        .class          = &dra7xx_pcie_phy_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "l4_root_clk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_PCIESS1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* pcie2 phy */
+static struct omap_hwmod dra7xx_pcie2_phy_hwmod = {
+        .name           = "pcie2-phy",
+        .class          = &dra7xx_pcie_phy_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "l4_root_clk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_PCIESS2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_PCIESS2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
 /*
  * 'qspi' class
  *
@@ -1249,6 +1569,38 @@ static struct omap_hwmod dra7xx_qspi_hwmod = {
 };
 
 /*
+ * 'rtcss' class
+ *
+ */
+static struct omap_hwmod_class_sysconfig dra7xx_rtcss_sysc = {
+        .sysc_offs      = 0x0078,
+        .sysc_flags     = SYSC_HAS_SIDLEMODE,
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type3,
+};
+
+static struct omap_hwmod_class dra7xx_rtcss_hwmod_class = {
+        .name   = "rtcss",
+        .sysc   = &dra7xx_rtcss_sysc,
+};
+
+/* rtcss */
+static struct omap_hwmod dra7xx_rtcss_hwmod = {
+        .name           = "rtcss",
+        .class          = &dra7xx_rtcss_hwmod_class,
+        .clkdm_name     = "rtc_clkdm",
+        .main_clk       = "sys_32k_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_RTC_RTCSS_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_RTC_RTCSS_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
  * 'sata' class
  *
  */
@@ -2007,6 +2359,19 @@ static struct omap_hwmod_ocp_if dra7xx_l4_wkup__ctrl_module_wkup = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+static struct omap_hwmod_ocp_if dra7xx_l4_per2__cpgmac0 = {
+        .master         = &dra7xx_l4_per2_hwmod,
+        .slave          = &dra7xx_gmac_hwmod,
+        .clk            = "dpll_gmac_ck",
+        .user           = OCP_USER_MPU,
+};
+
+static struct omap_hwmod_ocp_if dra7xx_gmac__mdio = {
+        .master         = &dra7xx_gmac_hwmod,
+        .slave          = &dra7xx_mdio_hwmod,
+        .user           = OCP_USER_MPU,
+};
+
 /* l4_wkup -> dcan1 */
 static struct omap_hwmod_ocp_if dra7xx_l4_wkup__dcan1 = {
         .master         = &dra7xx_l4_wkup_hwmod,
@@ -2254,6 +2619,110 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__i2c5 = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* l4_cfg -> mailbox1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mailbox1 = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_mailbox1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox2 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox3 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox3_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox4 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox4 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox4_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox5 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox5 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox5_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox6 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox6 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox6_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox7 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox7 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox7_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox8 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox8 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox8_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox9 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox9 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox9_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox10 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox10 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox10_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox11 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox11 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox11_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox12 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox12 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox12_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> mailbox13 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__mailbox13 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_mailbox13_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,
@@ -2334,6 +2803,62 @@ static struct omap_hwmod_ocp_if dra7xx_l4_cfg__ocp2scp1 = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* l4_cfg -> ocp2scp3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__ocp2scp3 = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_ocp2scp3_hwmod,
+        .clk            = "l4_root_clk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> pcie1 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie1 = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_pcie1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_cfg -> pcie1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1 = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_pcie1_hwmod,
+        .clk            = "l4_root_clk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> pcie2 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie2 = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_pcie2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_cfg -> pcie2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie2 = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_pcie2_hwmod,
+        .clk            = "l4_root_clk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_cfg -> pcie1 phy */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1_phy = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_pcie1_phy_hwmod,
+        .clk            = "l4_root_clk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_cfg -> pcie2 phy */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie2_phy = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_pcie2_phy_hwmod,
+        .clk            = "l4_root_clk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 static struct omap_hwmod_addr_space dra7xx_qspi_addrs[] = {
         {
                 .pa_start       = 0x4b300000,
@@ -2352,6 +2877,14 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__qspi = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* l4_per3 -> rtcss */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__rtcss = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_rtcss_hwmod,
+        .clk            = "l4_root_clk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 static struct omap_hwmod_addr_space dra7xx_sata_addrs[] = {
         {
                 .name           = "sysc",
@@ -2650,6 +3183,8 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
         &dra7xx_l4_wkup__ctrl_module_wkup,
         &dra7xx_l4_wkup__dcan1,
         &dra7xx_l4_per2__dcan2,
+        &dra7xx_l4_per2__cpgmac0,
+        &dra7xx_gmac__mdio,
         &dra7xx_l4_cfg__dma_system,
         &dra7xx_l3_main_1__dss,
         &dra7xx_l3_main_1__dispc,
@@ -2670,6 +3205,19 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
         &dra7xx_l4_per1__i2c3,
         &dra7xx_l4_per1__i2c4,
         &dra7xx_l4_per1__i2c5,
+        &dra7xx_l4_cfg__mailbox1,
+        &dra7xx_l4_per3__mailbox2,
+        &dra7xx_l4_per3__mailbox3,
+        &dra7xx_l4_per3__mailbox4,
+        &dra7xx_l4_per3__mailbox5,
+        &dra7xx_l4_per3__mailbox6,
+        &dra7xx_l4_per3__mailbox7,
+        &dra7xx_l4_per3__mailbox8,
+        &dra7xx_l4_per3__mailbox9,
+        &dra7xx_l4_per3__mailbox10,
+        &dra7xx_l4_per3__mailbox11,
+        &dra7xx_l4_per3__mailbox12,
+        &dra7xx_l4_per3__mailbox13,
         &dra7xx_l4_per1__mcspi1,
         &dra7xx_l4_per1__mcspi2,
         &dra7xx_l4_per1__mcspi3,
@@ -2680,7 +3228,15 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
         &dra7xx_l4_per1__mmc4,
         &dra7xx_l4_cfg__mpu,
         &dra7xx_l4_cfg__ocp2scp1,
+        &dra7xx_l4_cfg__ocp2scp3,
+        &dra7xx_l3_main_1__pcie1,
+        &dra7xx_l4_cfg__pcie1,
+        &dra7xx_l3_main_1__pcie2,
+        &dra7xx_l4_cfg__pcie2,
+        &dra7xx_l4_cfg__pcie1_phy,
+        &dra7xx_l4_cfg__pcie2_phy,
         &dra7xx_l3_main_1__qspi,
+        &dra7xx_l4_per3__rtcss,
         &dra7xx_l4_cfg__sata,
         &dra7xx_l4_cfg__smartreflex_core,
         &dra7xx_l4_cfg__smartreflex_mpu,
diff --git a/arch/arm/mach-omap2/omap_hwmod_common_data.h b/arch/arm/mach-omap2/omap_hwmod_common_data.h
index 2c38c6b0ee03..11ed5a17dd77 100644
--- a/arch/arm/mach-omap2/omap_hwmod_common_data.h
+++ b/arch/arm/mach-omap2/omap_hwmod_common_data.h
@@ -33,7 +33,6 @@ extern struct omap_hwmod_addr_space omap2_mcspi1_addr_space[];
 extern struct omap_hwmod_addr_space omap2_mcspi2_addr_space[];
 extern struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[];
 extern struct omap_hwmod_addr_space omap2_dma_system_addrs[];
-extern struct omap_hwmod_addr_space omap2_mailbox_addrs[];
 extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[];
 extern struct omap_hwmod_addr_space omap2_hdq1w_addr_space[];
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_common_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_common_ipblock_data.c
new file mode 100644
index 000000000000..f21664da25a2
--- /dev/null
+++ b/arch/arm/mach-omap2/omap_hwmod_common_ipblock_data.c
@@ -0,0 +1,55 @@
+/*
+ * omap_hwmod_common_ipblock_data.c - common IP block data for OMAP2+
+ *
+ * Copyright (C) 2011 Nokia Corporation
+ * Copyright (C) 2012 Texas Instruments, Inc.
+ * Paul Walmsley
+ *
+ * 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 "omap_hwmod.h"
+#include "omap_hwmod_common_data.h"
+
+/*
+ * 'dss' class
+ * display sub-system
+ */
+
+static struct omap_hwmod_class_sysconfig omap2_dss_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE |
+                           SYSS_HAS_RESET_STATUS),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+struct omap_hwmod_class omap2_dss_hwmod_class = {
+        .name   = "dss",
+        .sysc   = &omap2_dss_sysc,
+        .reset  = omap_dss_reset,
+};
+
+/*
+ * 'rfbi' class
+ * remote frame buffer interface
+ */
+
+static struct omap_hwmod_class_sysconfig omap2_rfbi_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                           SYSC_HAS_AUTOIDLE),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+struct omap_hwmod_class omap2_rfbi_hwmod_class = {
+        .name   = "rfbi",
+        .sysc   = &omap2_rfbi_sysc,
+};
+
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index a5ea988ff340..fe01c5a03aa2 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -75,9 +75,9 @@ static int omap2_enter_full_retention(void)
 
         /* Clear old wake-up events */
         /* REVISIT: These write to reserved bits? */
-        omap2_prm_write_mod_reg(0xffffffff, CORE_MOD, PM_WKST1);
-        omap2_prm_write_mod_reg(0xffffffff, CORE_MOD, OMAP24XX_PM_WKST2);
-        omap2_prm_write_mod_reg(0xffffffff, WKUP_MOD, PM_WKST);
+        omap2xxx_prm_clear_mod_irqs(CORE_MOD, PM_WKST1, ~0);
+        omap2xxx_prm_clear_mod_irqs(CORE_MOD, OMAP24XX_PM_WKST2, ~0);
+        omap2xxx_prm_clear_mod_irqs(WKUP_MOD, PM_WKST, ~0);
 
         pwrdm_set_next_pwrst(core_pwrdm, PWRDM_POWER_RET);
         pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_RET);
@@ -104,23 +104,18 @@ no_sleep:
         clk_enable(osc_ck);
 
         /* clear CORE wake-up events */
-        omap2_prm_write_mod_reg(0xffffffff, CORE_MOD, PM_WKST1);
-        omap2_prm_write_mod_reg(0xffffffff, CORE_MOD, OMAP24XX_PM_WKST2);
+        omap2xxx_prm_clear_mod_irqs(CORE_MOD, PM_WKST1, ~0);
+        omap2xxx_prm_clear_mod_irqs(CORE_MOD, OMAP24XX_PM_WKST2, ~0);
 
         /* wakeup domain events - bit 1: GPT1, bit5 GPIO */
-        omap2_prm_clear_mod_reg_bits(0x4 | 0x1, WKUP_MOD, PM_WKST);
+        omap2xxx_prm_clear_mod_irqs(WKUP_MOD, PM_WKST, 0x4 | 0x1);
 
         /* MPU domain wake events */
-        l = omap2_prm_read_mod_reg(OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);
-        if (l & 0x01)
-                omap2_prm_write_mod_reg(0x01, OCP_MOD,
-                                  OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);
-        if (l & 0x20)
-                omap2_prm_write_mod_reg(0x20, OCP_MOD,
-                                  OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);
+        omap2xxx_prm_clear_mod_irqs(OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET,
+                                    0x1);
 
-        /* Mask future PRCM-to-MPU interrupts */
-        omap2_prm_write_mod_reg(0x0, OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);
+        omap2xxx_prm_clear_mod_irqs(OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET,
+                                    0x20);
 
         pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
         pwrdm_set_next_pwrst(core_pwrdm, PWRDM_POWER_ON);
@@ -148,9 +143,9 @@ static void omap2_enter_mpu_retention(void)
          * it is in retention mode. */
         if (omap2_allow_mpu_retention()) {
                 /* REVISIT: These write to reserved bits? */
-                omap2_prm_write_mod_reg(0xffffffff, CORE_MOD, PM_WKST1);
-                omap2_prm_write_mod_reg(0xffffffff, CORE_MOD, OMAP24XX_PM_WKST2);
-                omap2_prm_write_mod_reg(0xffffffff, WKUP_MOD, PM_WKST);
+                omap2xxx_prm_clear_mod_irqs(CORE_MOD, PM_WKST1, ~0);
+                omap2xxx_prm_clear_mod_irqs(CORE_MOD, OMAP24XX_PM_WKST2, ~0);
+                omap2xxx_prm_clear_mod_irqs(WKUP_MOD, PM_WKST, ~0);
 
                 /* Try to enter MPU retention */
                 pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_RET);
@@ -249,6 +244,10 @@ static void __init prcm_setup_regs(void)
         /* Enable wake-up events */
         omap2_prm_write_mod_reg(OMAP24XX_EN_GPIOS_MASK | OMAP24XX_EN_GPT1_MASK,
                                 WKUP_MOD, PM_WKEN);
+
+        /* Enable SYS_CLKEN control when all domains idle */
+        omap2_prm_set_mod_reg_bits(OMAP_AUTOEXTCLKMODE_MASK, OMAP24XX_GR_MOD,
+                                   OMAP2_PRCM_CLKSRC_CTRL_OFFSET);
 }
 
 int __init omap2_pm_init(void)
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 507d8eeaab95..3f80929a5f7e 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -133,60 +133,13 @@ static void omap3_save_secure_ram_context(void)
         }
 }
 
-/*
- * PRCM Interrupt Handler Helper Function
- *
- * The purpose of this function is to clear any wake-up events latched
- * in the PRCM PM_WKST_x registers. It is possible that a wake-up event
- * may occur whilst attempting to clear a PM_WKST_x register and thus
- * set another bit in this register. A while loop is used to ensure
- * that any peripheral wake-up events occurring while attempting to
- * clear the PM_WKST_x are detected and cleared.
- */
-static int prcm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits)
-{
-        u32 wkst, fclk, iclk, clken;
-        u16 wkst_off = (regs == 3) ? OMAP3430ES2_PM_WKST3 : PM_WKST1;
-        u16 fclk_off = (regs == 3) ? OMAP3430ES2_CM_FCLKEN3 : CM_FCLKEN1;
-        u16 iclk_off = (regs == 3) ? CM_ICLKEN3 : CM_ICLKEN1;
-        u16 grpsel_off = (regs == 3) ?
-                OMAP3430ES2_PM_MPUGRPSEL3 : OMAP3430_PM_MPUGRPSEL;
-        int c = 0;
-
-        wkst = omap2_prm_read_mod_reg(module, wkst_off);
-        wkst &= omap2_prm_read_mod_reg(module, grpsel_off);
-        wkst &= ~ignore_bits;
-        if (wkst) {
-                iclk = omap2_cm_read_mod_reg(module, iclk_off);
-                fclk = omap2_cm_read_mod_reg(module, fclk_off);
-                while (wkst) {
-                        clken = wkst;
-                        omap2_cm_set_mod_reg_bits(clken, module, iclk_off);
-                        /*
-                         * For USBHOST, we don't know whether HOST1 or
-                         * HOST2 woke us up, so enable both f-clocks
-                         */
-                        if (module == OMAP3430ES2_USBHOST_MOD)
-                                clken |= 1 << OMAP3430ES2_EN_USBHOST2_SHIFT;
-                        omap2_cm_set_mod_reg_bits(clken, module, fclk_off);
-                        omap2_prm_write_mod_reg(wkst, module, wkst_off);
-                        wkst = omap2_prm_read_mod_reg(module, wkst_off);
-                        wkst &= ~ignore_bits;
-                        c++;
-                }
-                omap2_cm_write_mod_reg(iclk, module, iclk_off);
-                omap2_cm_write_mod_reg(fclk, module, fclk_off);
-        }
-
-        return c;
-}
-
 static irqreturn_t _prcm_int_handle_io(int irq, void *unused)
 {
         int c;
 
-        c = prcm_clear_mod_irqs(WKUP_MOD, 1,
-                ~(OMAP3430_ST_IO_MASK | OMAP3430_ST_IO_CHAIN_MASK));
+        c = omap3xxx_prm_clear_mod_irqs(WKUP_MOD, 1,
+                                        ~(OMAP3430_ST_IO_MASK |
+                                          OMAP3430_ST_IO_CHAIN_MASK));
 
         return c ? IRQ_HANDLED : IRQ_NONE;
 }
@@ -200,13 +153,14 @@ static irqreturn_t _prcm_int_handle_wakeup(int irq, void *unused)
          * these are handled in a separate handler to avoid acking
          * IO events before parsing in mux code
          */
-        c = prcm_clear_mod_irqs(WKUP_MOD, 1,
-                OMAP3430_ST_IO_MASK | OMAP3430_ST_IO_CHAIN_MASK);
-        c += prcm_clear_mod_irqs(CORE_MOD, 1, 0);
-        c += prcm_clear_mod_irqs(OMAP3430_PER_MOD, 1, 0);
+        c = omap3xxx_prm_clear_mod_irqs(WKUP_MOD, 1,
+                                        OMAP3430_ST_IO_MASK |
+                                        OMAP3430_ST_IO_CHAIN_MASK);
+        c += omap3xxx_prm_clear_mod_irqs(CORE_MOD, 1, 0);
+        c += omap3xxx_prm_clear_mod_irqs(OMAP3430_PER_MOD, 1, 0);
         if (omap_rev() > OMAP3430_REV_ES1_0) {
-                c += prcm_clear_mod_irqs(CORE_MOD, 3, 0);
-                c += prcm_clear_mod_irqs(OMAP3430ES2_USBHOST_MOD, 1, 0);
+                c += omap3xxx_prm_clear_mod_irqs(CORE_MOD, 3, 0);
+                c += omap3xxx_prm_clear_mod_irqs(OMAP3430ES2_USBHOST_MOD, 1, 0);
         }
 
         return c ? IRQ_HANDLED : IRQ_NONE;
@@ -399,159 +353,11 @@ restore:
 #define omap3_pm_suspend NULL
 #endif /* CONFIG_SUSPEND */
 
-
-/**
- * omap3_iva_idle(): ensure IVA is in idle so it can be put into
- *                   retention
- *
- * In cases where IVA2 is activated by bootcode, it may prevent
- * full-chip retention or off-mode because it is not idle.  This
- * function forces the IVA2 into idle state so it can go
- * into retention/off and thus allow full-chip retention/off.
- *
- **/
-static void __init omap3_iva_idle(void)
-{
-        /* ensure IVA2 clock is disabled */
-        omap2_cm_write_mod_reg(0, OMAP3430_IVA2_MOD, CM_FCLKEN);
-
-        /* if no clock activity, nothing else to do */
-        if (!(omap2_cm_read_mod_reg(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSTST) &
-              OMAP3430_CLKACTIVITY_IVA2_MASK))
-                return;
-
-        /* Reset IVA2 */
-        omap2_prm_write_mod_reg(OMAP3430_RST1_IVA2_MASK |
-                          OMAP3430_RST2_IVA2_MASK |
-                          OMAP3430_RST3_IVA2_MASK,
-                          OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);
-
-        /* Enable IVA2 clock */
-        omap2_cm_write_mod_reg(OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_MASK,
-                         OMAP3430_IVA2_MOD, CM_FCLKEN);
-
-        /* Set IVA2 boot mode to 'idle' */
-        omap3_ctrl_set_iva_bootmode_idle();
-
-        /* Un-reset IVA2 */
-        omap2_prm_write_mod_reg(0, OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);
-
-        /* Disable IVA2 clock */
-        omap2_cm_write_mod_reg(0, OMAP3430_IVA2_MOD, CM_FCLKEN);
-
-        /* Reset IVA2 */
-        omap2_prm_write_mod_reg(OMAP3430_RST1_IVA2_MASK |
-                          OMAP3430_RST2_IVA2_MASK |
-                          OMAP3430_RST3_IVA2_MASK,
-                          OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);
-}
-
-static void __init omap3_d2d_idle(void)
-{
-        u16 mask, padconf;
-
-        /* In a stand alone OMAP3430 where there is not a stacked
-         * modem for the D2D Idle Ack and D2D MStandby must be pulled
-         * high. S CONTROL_PADCONF_SAD2D_IDLEACK and
-         * CONTROL_PADCONF_SAD2D_MSTDBY to have a pull up. */
-        mask = (1 << 4) | (1 << 3); /* pull-up, enabled */
-        padconf = omap_ctrl_readw(OMAP3_PADCONF_SAD2D_MSTANDBY);
-        padconf |= mask;
-        omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_MSTANDBY);
-
-        padconf = omap_ctrl_readw(OMAP3_PADCONF_SAD2D_IDLEACK);
-        padconf |= mask;
-        omap_ctrl_writew(padconf, OMAP3_PADCONF_SAD2D_IDLEACK);
-
-        /* reset modem */
-        omap2_prm_write_mod_reg(OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON_MASK |
-                          OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST_MASK,
-                          CORE_MOD, OMAP2_RM_RSTCTRL);
-        omap2_prm_write_mod_reg(0, CORE_MOD, OMAP2_RM_RSTCTRL);
-}
-
 static void __init prcm_setup_regs(void)
 {
-        u32 omap3630_en_uart4_mask = cpu_is_omap3630() ?
-                                        OMAP3630_EN_UART4_MASK : 0;
-        u32 omap3630_grpsel_uart4_mask = cpu_is_omap3630() ?
-                                        OMAP3630_GRPSEL_UART4_MASK : 0;
-
-        /* XXX This should be handled by hwmod code or SCM init code */
-        omap_ctrl_writel(OMAP3430_AUTOIDLE_MASK, OMAP2_CONTROL_SYSCONFIG);
-
-        /*
-         * Enable control of expternal oscillator through
-         * sys_clkreq. In the long run clock framework should
-         * take care of this.
-         */
-        omap2_prm_rmw_mod_reg_bits(OMAP_AUTOEXTCLKMODE_MASK,
-                             1 << OMAP_AUTOEXTCLKMODE_SHIFT,
-                             OMAP3430_GR_MOD,
-                             OMAP3_PRM_CLKSRC_CTRL_OFFSET);
-
-        /* setup wakup source */
-        omap2_prm_write_mod_reg(OMAP3430_EN_IO_MASK | OMAP3430_EN_GPIO1_MASK |
-                          OMAP3430_EN_GPT1_MASK | OMAP3430_EN_GPT12_MASK,
-                          WKUP_MOD, PM_WKEN);
-        /* No need to write EN_IO, that is always enabled */
-        omap2_prm_write_mod_reg(OMAP3430_GRPSEL_GPIO1_MASK |
-                          OMAP3430_GRPSEL_GPT1_MASK |
-                          OMAP3430_GRPSEL_GPT12_MASK,
-                          WKUP_MOD, OMAP3430_PM_MPUGRPSEL);
-
-        /* Enable PM_WKEN to support DSS LPR */
-        omap2_prm_write_mod_reg(OMAP3430_PM_WKEN_DSS_EN_DSS_MASK,
-                                OMAP3430_DSS_MOD, PM_WKEN);
-
-        /* Enable wakeups in PER */
-        omap2_prm_write_mod_reg(omap3630_en_uart4_mask |
-                          OMAP3430_EN_GPIO2_MASK | OMAP3430_EN_GPIO3_MASK |
-                          OMAP3430_EN_GPIO4_MASK | OMAP3430_EN_GPIO5_MASK |
-                          OMAP3430_EN_GPIO6_MASK | OMAP3430_EN_UART3_MASK |
-                          OMAP3430_EN_MCBSP2_MASK | OMAP3430_EN_MCBSP3_MASK |
-                          OMAP3430_EN_MCBSP4_MASK,
-                          OMAP3430_PER_MOD, PM_WKEN);
-        /* and allow them to wake up MPU */
-        omap2_prm_write_mod_reg(omap3630_grpsel_uart4_mask |
-                          OMAP3430_GRPSEL_GPIO2_MASK |
-                          OMAP3430_GRPSEL_GPIO3_MASK |
-                          OMAP3430_GRPSEL_GPIO4_MASK |
-                          OMAP3430_GRPSEL_GPIO5_MASK |
-                          OMAP3430_GRPSEL_GPIO6_MASK |
-                          OMAP3430_GRPSEL_UART3_MASK |
-                          OMAP3430_GRPSEL_MCBSP2_MASK |
-                          OMAP3430_GRPSEL_MCBSP3_MASK |
-                          OMAP3430_GRPSEL_MCBSP4_MASK,
-                          OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL);
-
-        /* Don't attach IVA interrupts */
-        if (omap3_has_iva()) {
-                omap2_prm_write_mod_reg(0, WKUP_MOD, OMAP3430_PM_IVAGRPSEL);
-                omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430_PM_IVAGRPSEL1);
-                omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3);
-                omap2_prm_write_mod_reg(0, OMAP3430_PER_MOD,
-                                        OMAP3430_PM_IVAGRPSEL);
-        }
-
-        /* Clear any pending 'reset' flags */
-        omap2_prm_write_mod_reg(0xffffffff, MPU_MOD, OMAP2_RM_RSTST);
-        omap2_prm_write_mod_reg(0xffffffff, CORE_MOD, OMAP2_RM_RSTST);
-        omap2_prm_write_mod_reg(0xffffffff, OMAP3430_PER_MOD, OMAP2_RM_RSTST);
-        omap2_prm_write_mod_reg(0xffffffff, OMAP3430_EMU_MOD, OMAP2_RM_RSTST);
-        omap2_prm_write_mod_reg(0xffffffff, OMAP3430_NEON_MOD, OMAP2_RM_RSTST);
-        omap2_prm_write_mod_reg(0xffffffff, OMAP3430_DSS_MOD, OMAP2_RM_RSTST);
-        omap2_prm_write_mod_reg(0xffffffff, OMAP3430ES2_USBHOST_MOD, OMAP2_RM_RSTST);
-
-        /* Clear any pending PRCM interrupts */
-        omap2_prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
-
-        /*
-         * We need to idle iva2_pwrdm even on am3703 with no iva2.
-         */
-        omap3_iva_idle();
+        omap3_ctrl_init();
 
-        omap3_d2d_idle();
+        omap3_prm_init_pm(cpu_is_omap3630(), omap3_has_iva());
 }
 
 void omap3_pm_off_mode_enable(int enable)
diff --git a/arch/arm/mach-omap2/prcm43xx.h b/arch/arm/mach-omap2/prcm43xx.h
index 7785be984edd..ad7b3e9977f8 100644
--- a/arch/arm/mach-omap2/prcm43xx.h
+++ b/arch/arm/mach-omap2/prcm43xx.h
@@ -142,5 +142,6 @@
 #define AM43XX_CM_PER_USBPHYOCP2SCP0_CLKCTRL_OFFSET     0x05B8
 #define AM43XX_CM_PER_USB_OTG_SS1_CLKCTRL_OFFSET        0x0268
 #define AM43XX_CM_PER_USBPHYOCP2SCP1_CLKCTRL_OFFSET     0x05C0
+#define AM43XX_CM_PER_DSS_CLKCTRL_OFFSET                0x0a20
 
 #endif
diff --git a/arch/arm/mach-omap2/prm2xxx.c b/arch/arm/mach-omap2/prm2xxx.c
index a3a3cca2bcc4..86958050547a 100644
--- a/arch/arm/mach-omap2/prm2xxx.c
+++ b/arch/arm/mach-omap2/prm2xxx.c
@@ -114,6 +114,24 @@ void omap2xxx_prm_dpll_reset(void)
         omap2_prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTCTRL);
 }
 
+/**
+ * omap2xxx_prm_clear_mod_irqs - clear wakeup status bits for a module
+ * @module: PRM module to clear wakeups from
+ * @regs: register offset to clear
+ * @wkst_mask: wakeup status mask to clear
+ *
+ * Clears wakeup status bits for a given module, so that the device can
+ * re-enter idle.
+ */
+void omap2xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 wkst_mask)
+{
+        u32 wkst;
+
+        wkst = omap2_prm_read_mod_reg(module, regs);
+        wkst &= wkst_mask;
+        omap2_prm_write_mod_reg(wkst, module, regs);
+}
+
 int omap2xxx_clkdm_sleep(struct clockdomain *clkdm)
 {
         omap2_prm_set_mod_reg_bits(OMAP24XX_FORCESTATE_MASK,
diff --git a/arch/arm/mach-omap2/prm2xxx.h b/arch/arm/mach-omap2/prm2xxx.h
index d2cb6365716f..d73414139292 100644
--- a/arch/arm/mach-omap2/prm2xxx.h
+++ b/arch/arm/mach-omap2/prm2xxx.h
@@ -125,6 +125,7 @@ extern int omap2xxx_clkdm_sleep(struct clockdomain *clkdm);
 extern int omap2xxx_clkdm_wakeup(struct clockdomain *clkdm);
 
 extern void omap2xxx_prm_dpll_reset(void);
+void omap2xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 wkst_mask);
 
 extern int __init omap2xxx_prm_init(void);
 
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 4bd7a2dca8af..2458be6fc67b 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -26,6 +26,8 @@
 #include "prm2xxx_3xxx.h"
 #include "cm2xxx_3xxx.h"
 #include "prm-regbits-34xx.h"
+#include "cm3xxx.h"
+#include "cm-regbits-34xx.h"
 
 static const struct omap_prcm_irq omap3_prcm_irqs[] = {
         OMAP_PRCM_IRQ("wkup",   0,      0),
@@ -206,6 +208,167 @@ void omap3xxx_prm_restore_irqen(u32 *saved_mask)
 }
 
 /**
+ * omap3xxx_prm_clear_mod_irqs - clear wake-up events from PRCM interrupt
+ * @module: PRM module to clear wakeups from
+ * @regs: register set to clear, 1 or 3
+ * @ignore_bits: wakeup status bits to ignore
+ *
+ * The purpose of this function is to clear any wake-up events latched
+ * in the PRCM PM_WKST_x registers. It is possible that a wake-up event
+ * may occur whilst attempting to clear a PM_WKST_x register and thus
+ * set another bit in this register. A while loop is used to ensure
+ * that any peripheral wake-up events occurring while attempting to
+ * clear the PM_WKST_x are detected and cleared.
+ */
+int omap3xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits)
+{
+        u32 wkst, fclk, iclk, clken;
+        u16 wkst_off = (regs == 3) ? OMAP3430ES2_PM_WKST3 : PM_WKST1;
+        u16 fclk_off = (regs == 3) ? OMAP3430ES2_CM_FCLKEN3 : CM_FCLKEN1;
+        u16 iclk_off = (regs == 3) ? CM_ICLKEN3 : CM_ICLKEN1;
+        u16 grpsel_off = (regs == 3) ?
+                OMAP3430ES2_PM_MPUGRPSEL3 : OMAP3430_PM_MPUGRPSEL;
+        int c = 0;
+
+        wkst = omap2_prm_read_mod_reg(module, wkst_off);
+        wkst &= omap2_prm_read_mod_reg(module, grpsel_off);
+        wkst &= ~ignore_bits;
+        if (wkst) {
+                iclk = omap2_cm_read_mod_reg(module, iclk_off);
+                fclk = omap2_cm_read_mod_reg(module, fclk_off);
+                while (wkst) {
+                        clken = wkst;
+                        omap2_cm_set_mod_reg_bits(clken, module, iclk_off);
+                        /*
+                         * For USBHOST, we don't know whether HOST1 or
+                         * HOST2 woke us up, so enable both f-clocks
+                         */
+                        if (module == OMAP3430ES2_USBHOST_MOD)
+                                clken |= 1 << OMAP3430ES2_EN_USBHOST2_SHIFT;
+                        omap2_cm_set_mod_reg_bits(clken, module, fclk_off);
+                        omap2_prm_write_mod_reg(wkst, module, wkst_off);
+                        wkst = omap2_prm_read_mod_reg(module, wkst_off);
+                        wkst &= ~ignore_bits;
+                        c++;
+                }
+                omap2_cm_write_mod_reg(iclk, module, iclk_off);
+                omap2_cm_write_mod_reg(fclk, module, fclk_off);
+        }
+
+        return c;
+}
+
+/**
+ * omap3_prm_reset_modem - toggle reset signal for modem
+ *
+ * Toggles the reset signal to modem IP block. Required to allow
+ * OMAP3430 without stacked modem to idle properly.
+ */
+void __init omap3_prm_reset_modem(void)
+{
+        omap2_prm_write_mod_reg(
+                OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON_MASK |
+                OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST_MASK,
+                                CORE_MOD, OMAP2_RM_RSTCTRL);
+        omap2_prm_write_mod_reg(0, CORE_MOD, OMAP2_RM_RSTCTRL);
+}
+
+/**
+ * omap3_prm_init_pm - initialize PM related registers for PRM
+ * @has_uart4: SoC has UART4
+ * @has_iva: SoC has IVA
+ *
+ * Initializes PRM registers for PM use. Called from PM init.
+ */
+void __init omap3_prm_init_pm(bool has_uart4, bool has_iva)
+{
+        u32 en_uart4_mask;
+        u32 grpsel_uart4_mask;
+
+        /*
+         * Enable control of expternal oscillator through
+         * sys_clkreq. In the long run clock framework should
+         * take care of this.
+         */
+        omap2_prm_rmw_mod_reg_bits(OMAP_AUTOEXTCLKMODE_MASK,
+                                   1 << OMAP_AUTOEXTCLKMODE_SHIFT,
+                                   OMAP3430_GR_MOD,
+                                   OMAP3_PRM_CLKSRC_CTRL_OFFSET);
+
+        /* setup wakup source */
+        omap2_prm_write_mod_reg(OMAP3430_EN_IO_MASK | OMAP3430_EN_GPIO1_MASK |
+                                OMAP3430_EN_GPT1_MASK | OMAP3430_EN_GPT12_MASK,
+                                WKUP_MOD, PM_WKEN);
+        /* No need to write EN_IO, that is always enabled */
+        omap2_prm_write_mod_reg(OMAP3430_GRPSEL_GPIO1_MASK |
+                                OMAP3430_GRPSEL_GPT1_MASK |
+                                OMAP3430_GRPSEL_GPT12_MASK,
+                                WKUP_MOD, OMAP3430_PM_MPUGRPSEL);
+
+        /* Enable PM_WKEN to support DSS LPR */
+        omap2_prm_write_mod_reg(OMAP3430_PM_WKEN_DSS_EN_DSS_MASK,
+                                OMAP3430_DSS_MOD, PM_WKEN);
+
+        if (has_uart4) {
+                en_uart4_mask = OMAP3630_EN_UART4_MASK;
+                grpsel_uart4_mask = OMAP3630_GRPSEL_UART4_MASK;
+        }
+
+        /* Enable wakeups in PER */
+        omap2_prm_write_mod_reg(en_uart4_mask |
+                                OMAP3430_EN_GPIO2_MASK |
+                                OMAP3430_EN_GPIO3_MASK |
+                                OMAP3430_EN_GPIO4_MASK |
+                                OMAP3430_EN_GPIO5_MASK |
+                                OMAP3430_EN_GPIO6_MASK |
+                                OMAP3430_EN_UART3_MASK |
+                                OMAP3430_EN_MCBSP2_MASK |
+                                OMAP3430_EN_MCBSP3_MASK |
+                                OMAP3430_EN_MCBSP4_MASK,
+                                OMAP3430_PER_MOD, PM_WKEN);
+
+        /* and allow them to wake up MPU */
+        omap2_prm_write_mod_reg(grpsel_uart4_mask |
+                                OMAP3430_GRPSEL_GPIO2_MASK |
+                                OMAP3430_GRPSEL_GPIO3_MASK |
+                                OMAP3430_GRPSEL_GPIO4_MASK |
+                                OMAP3430_GRPSEL_GPIO5_MASK |
+                                OMAP3430_GRPSEL_GPIO6_MASK |
+                                OMAP3430_GRPSEL_UART3_MASK |
+                                OMAP3430_GRPSEL_MCBSP2_MASK |
+                                OMAP3430_GRPSEL_MCBSP3_MASK |
+                                OMAP3430_GRPSEL_MCBSP4_MASK,
+                                OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL);
+
+        /* Don't attach IVA interrupts */
+        if (has_iva) {
+                omap2_prm_write_mod_reg(0, WKUP_MOD, OMAP3430_PM_IVAGRPSEL);
+                omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430_PM_IVAGRPSEL1);
+                omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3);
+                omap2_prm_write_mod_reg(0, OMAP3430_PER_MOD,
+                                        OMAP3430_PM_IVAGRPSEL);
+        }
+
+        /* Clear any pending 'reset' flags */
+        omap2_prm_write_mod_reg(0xffffffff, MPU_MOD, OMAP2_RM_RSTST);
+        omap2_prm_write_mod_reg(0xffffffff, CORE_MOD, OMAP2_RM_RSTST);
+        omap2_prm_write_mod_reg(0xffffffff, OMAP3430_PER_MOD, OMAP2_RM_RSTST);
+        omap2_prm_write_mod_reg(0xffffffff, OMAP3430_EMU_MOD, OMAP2_RM_RSTST);
+        omap2_prm_write_mod_reg(0xffffffff, OMAP3430_NEON_MOD, OMAP2_RM_RSTST);
+        omap2_prm_write_mod_reg(0xffffffff, OMAP3430_DSS_MOD, OMAP2_RM_RSTST);
+        omap2_prm_write_mod_reg(0xffffffff, OMAP3430ES2_USBHOST_MOD,
+                                OMAP2_RM_RSTST);
+
+        /* Clear any pending PRCM interrupts */
+        omap2_prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
+
+        /* We need to idle iva2_pwrdm even on am3703 with no iva2. */
+        omap3xxx_prm_iva_idle();
+
+        omap3_prm_reset_modem();
+}
+
+/**
  * omap3xxx_prm_reconfigure_io_chain - clear latches and reconfigure I/O chain
  *
  * Clear any previously-latched I/O wakeup events and ensure that the
@@ -276,6 +439,76 @@ static u32 omap3xxx_prm_read_reset_sources(void)
         return r;
 }
 
+/**
+ * omap3xxx_prm_iva_idle - ensure IVA is in idle so it can be put into retention
+ *
+ * In cases where IVA2 is activated by bootcode, it may prevent
+ * full-chip retention or off-mode because it is not idle.  This
+ * function forces the IVA2 into idle state so it can go
+ * into retention/off and thus allow full-chip retention/off.
+ */
+void omap3xxx_prm_iva_idle(void)
+{
+        /* ensure IVA2 clock is disabled */
+        omap2_cm_write_mod_reg(0, OMAP3430_IVA2_MOD, CM_FCLKEN);
+
+        /* if no clock activity, nothing else to do */
+        if (!(omap2_cm_read_mod_reg(OMAP3430_IVA2_MOD, OMAP3430_CM_CLKSTST) &
+              OMAP3430_CLKACTIVITY_IVA2_MASK))
+                return;
+
+        /* Reset IVA2 */
+        omap2_prm_write_mod_reg(OMAP3430_RST1_IVA2_MASK |
+                                OMAP3430_RST2_IVA2_MASK |
+                                OMAP3430_RST3_IVA2_MASK,
+                                OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);
+
+        /* Enable IVA2 clock */
+        omap2_cm_write_mod_reg(OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_MASK,
+                               OMAP3430_IVA2_MOD, CM_FCLKEN);
+
+        /* Un-reset IVA2 */
+        omap2_prm_write_mod_reg(0, OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);
+
+        /* Disable IVA2 clock */
+        omap2_cm_write_mod_reg(0, OMAP3430_IVA2_MOD, CM_FCLKEN);
+
+        /* Reset IVA2 */
+        omap2_prm_write_mod_reg(OMAP3430_RST1_IVA2_MASK |
+                                OMAP3430_RST2_IVA2_MASK |
+                                OMAP3430_RST3_IVA2_MASK,
+                                OMAP3430_IVA2_MOD, OMAP2_RM_RSTCTRL);
+}
+
+/**
+ * omap3xxx_prm_clear_global_cold_reset - checks the global cold reset status
+ *                                        and clears it if asserted
+ *
+ * Checks if cold-reset has occurred and clears the status bit if yes. Returns
+ * 1 if cold-reset has occurred, 0 otherwise.
+ */
+int omap3xxx_prm_clear_global_cold_reset(void)
+{
+        if (omap2_prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) &
+            OMAP3430_GLOBAL_COLD_RST_MASK) {
+                omap2_prm_set_mod_reg_bits(OMAP3430_GLOBAL_COLD_RST_MASK,
+                                           OMAP3430_GR_MOD,
+                                           OMAP3_PRM_RSTST_OFFSET);
+                return 1;
+        }
+
+        return 0;
+}
+
+void omap3_prm_save_scratchpad_contents(u32 *ptr)
+{
+        *ptr++ = omap2_prm_read_mod_reg(OMAP3430_GR_MOD,
+                                        OMAP3_PRM_CLKSRC_CTRL_OFFSET);
+
+        *ptr++ = omap2_prm_read_mod_reg(OMAP3430_GR_MOD,
+                                        OMAP3_PRM_CLKSEL_OFFSET);
+}
+
 /* Powerdomain low-level functions */
 
 static int omap3_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
diff --git a/arch/arm/mach-omap2/prm3xxx.h b/arch/arm/mach-omap2/prm3xxx.h
index 1dacfc5b1959..bc37d42a8704 100644
--- a/arch/arm/mach-omap2/prm3xxx.h
+++ b/arch/arm/mach-omap2/prm3xxx.h
@@ -162,6 +162,12 @@ extern void omap3xxx_prm_dpll3_reset(void);
 
 extern int __init omap3xxx_prm_init(void);
 extern u32 omap3xxx_prm_get_reset_sources(void);
+int omap3xxx_prm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits);
+void omap3xxx_prm_iva_idle(void);
+void omap3_prm_reset_modem(void);
+int omap3xxx_prm_clear_global_cold_reset(void);
+void omap3_prm_save_scratchpad_contents(u32 *ptr);
+void omap3_prm_init_pm(bool has_uart4, bool has_iva);
 
 #endif /* __ASSEMBLER */
 
diff --git a/arch/arm/mach-omap2/prm7xx.h b/arch/arm/mach-omap2/prm7xx.h
index d92a8404edc7..4bb50fbf29be 100644
--- a/arch/arm/mach-omap2/prm7xx.h
+++ b/arch/arm/mach-omap2/prm7xx.h
@@ -374,6 +374,10 @@
 #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_PM_L3INIT_PCIESS1_WKDEP_OFFSET                   0x00b0
+#define DRA7XX_RM_L3INIT_PCIESS1_CONTEXT_OFFSET         0x00b4
+#define DRA7XX_PM_L3INIT_PCIESS2_WKDEP_OFFSET                   0x00b8
+#define DRA7XX_RM_L3INIT_PCIESS2_CONTEXT_OFFSET         0x00bc
 #define DRA7XX_RM_GMAC_GMAC_CONTEXT_OFFSET                      0x00d4
 #define DRA7XX_RM_L3INIT_OCP2SCP1_CONTEXT_OFFSET                0x00e4
 #define DRA7XX_RM_L3INIT_OCP2SCP3_CONTEXT_OFFSET                0x00ec
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 25e8b8232115..76ca320f007c 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -472,6 +472,8 @@ static struct of_device_id omap_prcm_dt_match_table[] = {
         { .compatible = "ti,am3-scrm" },
         { .compatible = "ti,am4-prcm" },
         { .compatible = "ti,am4-scrm" },
+        { .compatible = "ti,omap2-prcm" },
+        { .compatible = "ti,omap2-scrm" },
         { .compatible = "ti,omap3-prm" },
         { .compatible = "ti,omap3-cm" },
         { .compatible = "ti,omap3-scrm" },
diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
index 9086ce03ae12..b84a0122d823 100644
--- a/arch/arm/mach-omap2/sleep44xx.S
+++ b/arch/arm/mach-omap2/sleep44xx.S
@@ -10,6 +10,7 @@
  */
 
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 #include <asm/smp_scu.h>
 #include <asm/memory.h>
 #include <asm/hardware/cache-l2x0.h>
@@ -334,7 +335,7 @@ ENDPROC(omap4_cpu_resume)
 
 #ifndef CONFIG_OMAP4_ERRATA_I688
 ENTRY(omap_bus_sync)
-        mov     pc, lr
+        ret     lr
 ENDPROC(omap_bus_sync)
 #endif
 
diff --git a/arch/arm/mach-omap2/sram242x.S b/arch/arm/mach-omap2/sram242x.S
index 680a7c56cc3e..2c88ff2d0236 100644
--- a/arch/arm/mach-omap2/sram242x.S
+++ b/arch/arm/mach-omap2/sram242x.S
@@ -101,7 +101,7 @@ i_dll_wait:
 i_dll_delay:
         subs    r4, r4, #0x1
         bne     i_dll_delay
-        mov     pc, lr
+        ret     lr
 
         /*
          * shift up or down voltage, use R9 as input to tell level.
@@ -125,7 +125,7 @@ volt_delay:
         ldr     r7, [r3]                @ get timer value
         cmp     r5, r7                  @ time up?
         bhi     volt_delay              @ not yet->branch
-        mov     pc, lr                  @ back to caller.
+        ret     lr                      @ back to caller.
 
 omap242x_sdi_cm_clksel2_pll:
         .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKSEL2)
@@ -220,7 +220,7 @@ volt_delay_c:
         ldr     r7, [r10]               @ get timer value
         cmp     r8, r7                  @ time up?
         bhi     volt_delay_c            @ not yet->branch
-        mov     pc, lr                  @ back to caller
+        ret     lr                      @ back to caller
 
 omap242x_srs_cm_clksel2_pll:
         .word OMAP2420_CM_REGADDR(PLL_MOD, CM_CLKSEL2)
diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S
index a1e9edd673f4..d5deb9761fc7 100644
--- a/arch/arm/mach-omap2/sram243x.S
+++ b/arch/arm/mach-omap2/sram243x.S
@@ -101,7 +101,7 @@ i_dll_wait:
 i_dll_delay:
         subs    r4, r4, #0x1
         bne     i_dll_delay
-        mov     pc, lr
+        ret     lr
 
         /*
          * shift up or down voltage, use R9 as input to tell level.
@@ -125,7 +125,7 @@ volt_delay:
         ldr     r7, [r3]                @ get timer value
         cmp     r5, r7                  @ time up?
         bhi     volt_delay              @ not yet->branch
-        mov     pc, lr                  @ back to caller.
+        ret     lr                      @ back to caller.
 
 omap243x_sdi_cm_clksel2_pll:
         .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKSEL2)
@@ -220,7 +220,7 @@ volt_delay_c:
         ldr     r7, [r10]               @ get timer value
         cmp     r8, r7                  @ time up?
         bhi     volt_delay_c            @ not yet->branch
-        mov     pc, lr                  @ back to caller
+        ret     lr                      @ back to caller
 
 omap243x_srs_cm_clksel2_pll:
         .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKSEL2)
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
index e832bc7b8e2d..8333400898fb 100644
--- a/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -95,7 +95,6 @@ static int tusb_set_sync_mode(unsigned sysclk_ps)
         dev_t.t_avdp_w = t_scsnh_advnh;
         dev_t.cyc_aavdh_we = 3;
         dev_t.cyc_wpl = 6;
-        dev_t.t_ce_rdyz = 7000;
 
         gpmc_calc_timings(&t, &tusb_sync, &dev_t);
 
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 648867a8caa8..2fe1824c6dcb 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -4,7 +4,7 @@
 
 # Common support (must be linked before board specific support)
 obj-y                           += clock.o devices.o generic.o irq.o \
-                                   time.o reset.o
+                                   reset.o
 obj-$(CONFIG_PM)                += pm.o sleep.o standby.o
 
 # Generic drivers that other drivers may depend upon
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 43596e0ed051..d897292712eb 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -90,7 +90,7 @@ int __init parse_balloon3_features(char *arg)
         if (!arg)
                 return 0;
 
-        return strict_strtoul(arg, 0, &balloon3_features_present);
+        return kstrtoul(arg, 0, &balloon3_features_present);
 }
 early_param("balloon3_features", parse_balloon3_features);
 
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 91dd1c7cdbcd..06022b235730 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -514,7 +514,7 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = {
         .gpio_pullup            = CORGI_GPIO_USB_PULLUP,
 };
 
-#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MASTER)
+#if IS_ENABLED(CONFIG_SPI_PXA2XX)
 static struct pxa2xx_spi_master corgi_spi_info = {
         .num_chipselect = 3,
 };
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 42254175fcf4..630fa916bbc6 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -25,11 +25,13 @@
 #include <asm/mach/map.h>
 #include <asm/mach-types.h>
 
+#include <mach/irqs.h>
 #include <mach/reset.h>
 #include <mach/smemc.h>
 #include <mach/pxa3xx-regs.h>
 
 #include "generic.h"
+#include <clocksource/pxa.h>
 
 void clear_reset_status(unsigned int mask)
 {
@@ -57,6 +59,15 @@ unsigned long get_clock_tick_rate(void)
 EXPORT_SYMBOL(get_clock_tick_rate);
 
 /*
+ * For non device-tree builds, keep legacy timer init
+ */
+void pxa_timer_init(void)
+{
+        pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000),
+                            get_clock_tick_rate());
+}
+
+/*
  * Get the clock frequency as reflected by CCCR and the turbo flag.
  * We assume these values have been applied via a fcs.
  * If info is not 0 we also display the current settings.
@@ -79,19 +90,15 @@ EXPORT_SYMBOL(get_clk_frequency_khz);
  */
 static struct map_desc common_io_desc[] __initdata = {
         {       /* Devs */
-                .virtual        =  0xf2000000,
-                .pfn            = __phys_to_pfn(0x40000000),
-                .length         = 0x02000000,
-                .type           = MT_DEVICE
-        }, {    /* UNCACHED_PHYS_0 */
-                .virtual        = 0xff000000,
-                .pfn            = __phys_to_pfn(0x00000000),
-                .length         = 0x00100000,
+                .virtual        = (unsigned long)PERIPH_VIRT,
+                .pfn            = __phys_to_pfn(PERIPH_PHYS),
+                .length         = PERIPH_SIZE,
                 .type           = MT_DEVICE
         }
 };
 
 void __init pxa_map_io(void)
 {
+        debug_ll_io_init();
         iotable_init(ARRAY_AND_SIZE(common_io_desc));
 }
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
index ccb06e485520..8d63c211b22f 100644
--- a/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@ -19,8 +19,8 @@
  * Workarounds for at least 2 errata so far require this.
  * The mapping is set in mach-pxa/generic.c.
  */
-#define UNCACHED_PHYS_0         0xff000000
-#define UNCACHED_ADDR           UNCACHED_PHYS_0
+#define UNCACHED_PHYS_0         0xfe000000
+#define UNCACHED_PHYS_0_SIZE    0x00100000
 
 /*
  * Intel PXA2xx internal register mapping:
diff --git a/arch/arm/mach-pxa/mioa701_bootresume.S b/arch/arm/mach-pxa/mioa701_bootresume.S
index 324d25a48c85..81591491ab94 100644
--- a/arch/arm/mach-pxa/mioa701_bootresume.S
+++ b/arch/arm/mach-pxa/mioa701_bootresume.S
@@ -29,7 +29,7 @@ ENTRY(mioa701_jumpaddr)
         str     r1, [r0]                @ Early disable resume for next boot
         ldr     r0, mioa701_jumpaddr    @ (Murphy's Law)
         ldr     r0, [r0]
-        mov     pc, r0
+        ret     r0
 2:
 
 ENTRY(mioa701_bootstrap_lg)
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index f2c28972084d..66e4a2b6316e 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -331,7 +331,12 @@ static struct map_desc pxa25x_io_desc[] __initdata = {
         {       /* Mem Ctl */
                 .virtual        = (unsigned long)SMEMC_VIRT,
                 .pfn            = __phys_to_pfn(PXA2XX_SMEMC_BASE),
-                .length         = 0x00200000,
+                .length         = SMEMC_SIZE,
+                .type           = MT_DEVICE
+        }, {    /* UNCACHED_PHYS_0 */
+                .virtual        = UNCACHED_PHYS_0,
+                .pfn            = __phys_to_pfn(0x00000000),
+                .length         = UNCACHED_PHYS_0_SIZE,
                 .type           = MT_DEVICE
         },
 };
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 301471a07a10..b040d7d14888 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -402,12 +402,12 @@ static struct map_desc pxa27x_io_desc[] __initdata = {
         {       /* Mem Ctl */
                 .virtual        = (unsigned long)SMEMC_VIRT,
                 .pfn            = __phys_to_pfn(PXA2XX_SMEMC_BASE),
-                .length         = 0x00200000,
+                .length         = SMEMC_SIZE,
                 .type           = MT_DEVICE
-        }, {    /* IMem ctl */
-                .virtual        =  0xfe000000,
-                .pfn            = __phys_to_pfn(0x58000000),
-                .length         = 0x00100000,
+        }, {    /* UNCACHED_PHYS_0 */
+                .virtual        = UNCACHED_PHYS_0,
+                .pfn            = __phys_to_pfn(0x00000000),
+                .length         = UNCACHED_PHYS_0_SIZE,
                 .type           = MT_DEVICE
         },
 };
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 87011f3de69d..593ccd35ca97 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -416,7 +416,7 @@ static struct map_desc pxa3xx_io_desc[] __initdata = {
         {       /* Mem Ctl */
                 .virtual        = (unsigned long)SMEMC_VIRT,
                 .pfn            = __phys_to_pfn(PXA3XX_SMEMC_BASE),
-                .length         = 0x00200000,
+                .length         = SMEMC_SIZE,
                 .type           = MT_DEVICE
         }
 };
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index 1e544be9905d..6c5b3ffd2cd3 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -157,7 +157,7 @@ pxa_cpu_do_suspend:
         @ Do not reorder...
         @ Intel PXA270 Specification Update notes problems performing
         @ external accesses after SDRAM is put in self-refresh mode
-        @ (see Errata 39 ...hangs when entering self-refresh mode)
+        @ (see Errata 38 ...hangs when entering self-refresh mode)
 
         @ force address lines low by reading at physical address 0
         ldr     r3, [r2]
diff --git a/arch/arm/mach-pxa/standby.S b/arch/arm/mach-pxa/standby.S
index 29f5f5c180b7..eab1645bb4ad 100644
--- a/arch/arm/mach-pxa/standby.S
+++ b/arch/arm/mach-pxa/standby.S
@@ -29,7 +29,7 @@ ENTRY(pxa_cpu_standby)
         .align  5
 1:      mcr     p14, 0, r2, c7, c0, 0   @ put the system into Standby
         str     r1, [r0]                @ make sure PSSR_PH/STS are clear
-        mov     pc, lr
+        ret     lr
 
 #endif
 
@@ -108,7 +108,7 @@ ENTRY(pm_enter_standby_start)
         bic     r0, r0, #0x20000000
         str     r0, [r1, #PXA3_DMCIER]
 
-        mov     pc, lr
+        ret     lr
 ENTRY(pm_enter_standby_end)
 
 #endif
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
deleted file mode 100644
index fca174e3865d..000000000000
--- a/arch/arm/mach-pxa/time.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * arch/arm/mach-pxa/time.c
- *
- * PXA clocksource, clockevents, and OST interrupt handlers.
- * Copyright (c) 2007 by Bill Gatliff <bgat@billgatliff.com>.
- *
- * Derived from Nicolas Pitre's PXA timer handler Copyright (c) 2001
- * by MontaVista Software, Inc.  (Nico, your code rocks!)
- *
- * 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 <linux/interrupt.h>
-#include <linux/clockchips.h>
-#include <linux/sched_clock.h>
-
-#include <asm/div64.h>
-#include <asm/mach/irq.h>
-#include <asm/mach/time.h>
-#include <mach/regs-ost.h>
-#include <mach/irqs.h>
-
-/*
- * This is PXA's sched_clock implementation. This has a resolution
- * of at least 308 ns and a maximum value of 208 days.
- *
- * The return value is guaranteed to be monotonic in that range as
- * long as there is always less than 582 seconds between successive
- * calls to sched_clock() which should always be the case in practice.
- */
-
-static u64 notrace pxa_read_sched_clock(void)
-{
-        return readl_relaxed(OSCR);
-}
-
-
-#define MIN_OSCR_DELTA 16
-
-static irqreturn_t
-pxa_ost0_interrupt(int irq, void *dev_id)
-{
-        struct clock_event_device *c = dev_id;
-
-        /* Disarm the compare/match, signal the event. */
-        writel_relaxed(readl_relaxed(OIER) & ~OIER_E0, OIER);
-        writel_relaxed(OSSR_M0, OSSR);
-        c->event_handler(c);
-
-        return IRQ_HANDLED;
-}
-
-static int
-pxa_osmr0_set_next_event(unsigned long delta, struct clock_event_device *dev)
-{
-        unsigned long next, oscr;
-
-        writel_relaxed(readl_relaxed(OIER) | OIER_E0, OIER);
-        next = readl_relaxed(OSCR) + delta;
-        writel_relaxed(next, OSMR0);
-        oscr = readl_relaxed(OSCR);
-
-        return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;
-}
-
-static void
-pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev)
-{
-        switch (mode) {
-        case CLOCK_EVT_MODE_ONESHOT:
-                writel_relaxed(readl_relaxed(OIER) & ~OIER_E0, OIER);
-                writel_relaxed(OSSR_M0, OSSR);
-                break;
-
-        case CLOCK_EVT_MODE_UNUSED:
-        case CLOCK_EVT_MODE_SHUTDOWN:
-                /* initializing, released, or preparing for suspend */
-                writel_relaxed(readl_relaxed(OIER) & ~OIER_E0, OIER);
-                writel_relaxed(OSSR_M0, OSSR);
-                break;
-
-        case CLOCK_EVT_MODE_RESUME:
-        case CLOCK_EVT_MODE_PERIODIC:
-                break;
-        }
-}
-
-#ifdef CONFIG_PM
-static unsigned long osmr[4], oier, oscr;
-
-static void pxa_timer_suspend(struct clock_event_device *cedev)
-{
-        osmr[0] = readl_relaxed(OSMR0);
-        osmr[1] = readl_relaxed(OSMR1);
-        osmr[2] = readl_relaxed(OSMR2);
-        osmr[3] = readl_relaxed(OSMR3);
-        oier = readl_relaxed(OIER);
-        oscr = readl_relaxed(OSCR);
-}
-
-static void pxa_timer_resume(struct clock_event_device *cedev)
-{
-        /*
-         * Ensure that we have at least MIN_OSCR_DELTA between match
-         * register 0 and the OSCR, to guarantee that we will receive
-         * the one-shot timer interrupt.  We adjust OSMR0 in preference
-         * to OSCR to guarantee that OSCR is monotonically incrementing.
-         */
-        if (osmr[0] - oscr < MIN_OSCR_DELTA)
-                osmr[0] += MIN_OSCR_DELTA;
-
-        writel_relaxed(osmr[0], OSMR0);
-        writel_relaxed(osmr[1], OSMR1);
-        writel_relaxed(osmr[2], OSMR2);
-        writel_relaxed(osmr[3], OSMR3);
-        writel_relaxed(oier, OIER);
-        writel_relaxed(oscr, OSCR);
-}
-#else
-#define pxa_timer_suspend NULL
-#define pxa_timer_resume NULL
-#endif
-
-static struct clock_event_device ckevt_pxa_osmr0 = {
-        .name           = "osmr0",
-        .features       = CLOCK_EVT_FEAT_ONESHOT,
-        .rating         = 200,
-        .set_next_event = pxa_osmr0_set_next_event,
-        .set_mode       = pxa_osmr0_set_mode,
-        .suspend        = pxa_timer_suspend,
-        .resume         = pxa_timer_resume,
-};
-
-static struct irqaction pxa_ost0_irq = {
-        .name           = "ost0",
-        .flags          = IRQF_TIMER | IRQF_IRQPOLL,
-        .handler        = pxa_ost0_interrupt,
-        .dev_id         = &ckevt_pxa_osmr0,
-};
-
-void __init pxa_timer_init(void)
-{
-        unsigned long clock_tick_rate = get_clock_tick_rate();
-
-        writel_relaxed(0, OIER);
-        writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR);
-
-        sched_clock_register(pxa_read_sched_clock, 32, clock_tick_rate);
-
-        ckevt_pxa_osmr0.cpumask = cpumask_of(0);
-
-        setup_irq(IRQ_OST0, &pxa_ost0_irq);
-
-        clocksource_mmio_init(OSCR, "oscr0", clock_tick_rate, 200, 32,
-                clocksource_mmio_readl_up);
-        clockevents_config_and_register(&ckevt_pxa_osmr0, clock_tick_rate,
-                MIN_OSCR_DELTA * 2, 0x7fffffff);
-}
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 41f27f667ca8..de3b08073fe7 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -769,7 +769,7 @@ static unsigned long viper_tpm;
 
 static int __init viper_tpm_setup(char *str)
 {
-        return strict_strtoul(str, 10, &viper_tpm) >= 0;
+        return kstrtoul(str, 10, &viper_tpm) >= 0;
 }
 
 __setup("tpm=", viper_tpm_setup);
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 8c1b39a0caa0..850e506926df 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -25,6 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
+#include <linux/platform_data/video-clcd-versatile.h>
 #include <linux/io.h>
 #include <linux/smsc911x.h>
 #include <linux/ata_platform.h>
@@ -48,7 +49,6 @@
 #include <mach/irqs.h>
 #include <asm/hardware/timer-sp.h>
 
-#include <plat/clcd.h>
 #include <plat/sched_clock.h>
 
 #include "core.h"
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h
index db09170e3832..23e7a313f75d 100644
--- a/arch/arm/mach-realview/include/mach/memory.h
+++ b/arch/arm/mach-realview/include/mach/memory.h
@@ -20,15 +20,6 @@
 #ifndef __ASM_ARCH_MEMORY_H
 #define __ASM_ARCH_MEMORY_H
 
-/*
- * Physical DRAM offset.
- */
-#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
-#define PLAT_PHYS_OFFSET                UL(0x70000000)
-#else
-#define PLAT_PHYS_OFFSET                UL(0x00000000)
-#endif
-
 #ifdef CONFIG_SPARSEMEM
 
 /*
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index e4564c259ed1..d1686696ca41 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -6,6 +6,7 @@ config ARCH_ROCKCHIP
         select ARCH_REQUIRE_GPIOLIB
         select ARM_GIC
         select CACHE_L2X0
+        select HAVE_ARM_ARCH_TIMER
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
         select DW_APB_TIMER_OF
diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
index 4377a1436a98..b29d8ead4cf2 100644
--- a/arch/arm/mach-rockchip/Makefile
+++ b/arch/arm/mach-rockchip/Makefile
@@ -1,2 +1,4 @@
+CFLAGS_platsmp.o := -march=armv7-a
+
 obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip.o
 obj-$(CONFIG_SMP) += headsmp.o platsmp.o
diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c
index 910835d4ccf4..189684f55927 100644
--- a/arch/arm/mach-rockchip/platsmp.c
+++ b/arch/arm/mach-rockchip/platsmp.c
@@ -21,6 +21,7 @@
 #include <linux/of_address.h>
 
 #include <asm/cacheflush.h>
+#include <asm/cp15.h>
 #include <asm/smp_scu.h>
 #include <asm/smp_plat.h>
 #include <asm/mach/map.h>
@@ -178,8 +179,27 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus)
                 pmu_set_power_domain(0 + i, false);
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
+static int rockchip_cpu_kill(unsigned int cpu)
+{
+        pmu_set_power_domain(0 + cpu, false);
+        return 1;
+}
+
+static void rockchip_cpu_die(unsigned int cpu)
+{
+        v7_exit_coherency_flush(louis);
+        while(1)
+                cpu_do_idle();
+}
+#endif
+
 static struct smp_operations rockchip_smp_ops __initdata = {
         .smp_prepare_cpus       = rockchip_smp_prepare_cpus,
         .smp_boot_secondary     = rockchip_boot_secondary,
+#ifdef CONFIG_HOTPLUG_CPU
+        .cpu_kill               = rockchip_cpu_kill,
+        .cpu_die                = rockchip_cpu_die,
+#endif
 };
 CPU_METHOD_OF_DECLARE(rk3066_smp, "rockchip,rk3066-smp", &rockchip_smp_ops);
diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c
index 968cc348e624..8ab9e0e7ff04 100644
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@ -29,6 +29,7 @@ static const char * const rockchip_board_dt_compat[] = {
         "rockchip,rk3066a",
         "rockchip,rk3066b",
         "rockchip,rk3188",
+        "rockchip,rk3288",
         NULL,
 };
 
diff --git a/arch/arm/mach-rpc/include/mach/memory.h b/arch/arm/mach-rpc/include/mach/memory.h
index 18a221093bf5..b7e49571417d 100644
--- a/arch/arm/mach-rpc/include/mach/memory.h
+++ b/arch/arm/mach-rpc/include/mach/memory.h
@@ -19,11 +19,6 @@
 #define __ASM_ARCH_MEMORY_H
 
 /*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET        UL(0x10000000)
-
-/*
  * Cache flushing area - ROM
  */
 #define FLUSH_BASE_PHYS         0x00000000
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index c0763b837745..44fa95df9262 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -49,9 +49,7 @@
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/clock.h>
 #include <plat/cpu-freq.h>
-#include <plat/pll.h>
 #include <plat/pwm-core.h>
 #include <plat/watchdog-reset.h>
 
diff --git a/arch/arm/mach-s3c24xx/iotiming-s3c2412.c b/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
index bd064c05c473..28b13951de87 100644
--- a/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
@@ -29,7 +29,6 @@
 
 #include <plat/cpu.h>
 #include <plat/cpu-freq-core.h>
-#include <plat/clock.h>
 
 #include <mach/s3c2412.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
index fbf5487ae5d1..c9a99bbad545 100644
--- a/arch/arm/mach-s3c24xx/mach-h1940.c
+++ b/arch/arm/mach-s3c24xx/mach-h1940.c
@@ -60,7 +60,6 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/gpio-cfg.h>
-#include <plat/pll.h>
 #include <plat/pm.h>
 #include <plat/samsung-time.h>
 
@@ -73,6 +72,10 @@
 
 #define H1940_LATCH_BIT(x)      (1 << ((x) + 16 - S3C_GPIO_END))
 
+#define S3C24XX_PLL_MDIV_SHIFT         (12)
+#define S3C24XX_PLL_PDIV_SHIFT         (4)
+#define S3C24XX_PLL_SDIV_SHIFT         (0)
+
 static struct map_desc h1940_iodesc[] __initdata = {
         [0] = {
                 .virtual        = (unsigned long)H1940_LATCH,
diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index e81ea82c55f9..7804d3c6991b 100644
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -48,7 +48,6 @@
 #include <linux/mtd/partitions.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
@@ -243,7 +242,7 @@ static int __init jive_mtdset(char *options)
         if (options == NULL || options[0] == '\0')
                 return 0;
 
-        if (strict_strtoul(options, 10, &set)) {
+        if (kstrtoul(options, 10, &set)) {
                 printk(KERN_ERR "failed to parse mtdset=%s\n", options);
                 return 0;
         }
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2413.c b/arch/arm/mach-s3c24xx/mach-smdk2413.c
index fb3b80e44595..10726bf84920 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2413.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2413.c
@@ -43,7 +43,6 @@
 #include <mach/gpio-samsung.h>
 #include <mach/fb.h>
 
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/samsung-time.h>
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2416.c b/arch/arm/mach-s3c24xx/mach-smdk2416.c
index fa6f30d23601..24189e8e8560 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2416.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c
@@ -44,7 +44,6 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
diff --git a/arch/arm/mach-s3c24xx/mach-smdk2443.c b/arch/arm/mach-s3c24xx/mach-smdk2443.c
index ef5d5ea33182..0ed77614dcfe 100644
--- a/arch/arm/mach-s3c24xx/mach-smdk2443.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2443.c
@@ -38,7 +38,6 @@
 #include <mach/fb.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/samsung-time.h>
diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
index 9104c2be36c9..9d4f64750698 100644
--- a/arch/arm/mach-s3c24xx/mach-vstms.c
+++ b/arch/arm/mach-s3c24xx/mach-vstms.c
@@ -42,7 +42,6 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/samsung-time.h>
diff --git a/arch/arm/mach-s3c24xx/s3c2410.c b/arch/arm/mach-s3c24xx/s3c2410.c
index 7eab88829883..5ffe828cd659 100644
--- a/arch/arm/mach-s3c24xx/s3c2410.c
+++ b/arch/arm/mach-s3c24xx/s3c2410.c
@@ -41,8 +41,6 @@
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/clock.h>
-#include <plat/pll.h>
 #include <plat/pm.h>
 #include <plat/watchdog-reset.h>
 
@@ -83,10 +81,6 @@ void __init s3c2410_map_io(void)
         iotable_init(s3c2410_iodesc, ARRAY_SIZE(s3c2410_iodesc));
 }
 
-void __init_or_cpufreq s3c2410_setup_clocks(void)
-{
-}
-
 struct bus_type s3c2410_subsys = {
         .name = "s3c2410-core",
         .dev_name = "s3c2410-core",
diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c
index d49f52fbc842..569f3f5a6c71 100644
--- a/arch/arm/mach-s3c24xx/s3c2412.c
+++ b/arch/arm/mach-s3c24xx/s3c2412.c
@@ -37,12 +37,10 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/cpu-freq.h>
 #include <plat/devs.h>
 #include <plat/nand-core.h>
-#include <plat/pll.h>
 #include <plat/pm.h>
 #include <plat/regs-spi.h>
 
@@ -171,10 +169,6 @@ void __init s3c2412_map_io(void)
         iotable_init(s3c2412_iodesc, ARRAY_SIZE(s3c2412_iodesc));
 }
 
-void __init_or_cpufreq s3c2412_setup_clocks(void)
-{
-}
-
 /* need to register the subsystem before we actually register the device, and
  * we also need to ensure that it has been initialised before any of the
  * drivers even try to use it (even if not on an s3c2412 based system)
diff --git a/arch/arm/mach-s3c24xx/s3c2442.c b/arch/arm/mach-s3c24xx/s3c2442.c
index fb9da2b603a2..7b043349f1c8 100644
--- a/arch/arm/mach-s3c24xx/s3c2442.c
+++ b/arch/arm/mach-s3c24xx/s3c2442.c
@@ -43,7 +43,6 @@
 
 #include <mach/regs-clock.h>
 
-#include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
 
diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c
index 4a64bcc9eb51..d1c3e65785a1 100644
--- a/arch/arm/mach-s3c24xx/s3c244x.c
+++ b/arch/arm/mach-s3c24xx/s3c244x.c
@@ -38,11 +38,9 @@
 #include <mach/regs-clock.h>
 #include <mach/regs-gpio.h>
 
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/pll.h>
 #include <plat/nand-core.h>
 #include <plat/watchdog-reset.h>
 
@@ -78,10 +76,6 @@ void __init s3c244x_map_io(void)
         s3c2410_device_dclk.name = "s3c2440-dclk";
 }
 
-void __init_or_cpufreq s3c244x_setup_clocks(void)
-{
-}
-
 /* Since the S3C2442 and S3C2440 share items, put both subsystems here */
 
 struct bus_type s3c2440_subsys = {
diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2410.S b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
index c9b91223697c..875ba8911127 100644
--- a/arch/arm/mach-s3c24xx/sleep-s3c2410.S
+++ b/arch/arm/mach-s3c24xx/sleep-s3c2410.S
@@ -66,4 +66,4 @@ s3c2410_do_sleep:
         streq   r8, [r5]                        @ SDRAM power-down config
         streq   r9, [r6]                        @ CPU sleep
 1:      beq     1b
-        mov     pc, r14
+        ret     lr
diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2412.S b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
index 5adaceb7da13..6bf5b4d8743c 100644
--- a/arch/arm/mach-s3c24xx/sleep-s3c2412.S
+++ b/arch/arm/mach-s3c24xx/sleep-s3c2412.S
@@ -65,4 +65,4 @@ s3c2412_sleep_enter1:
         strne   r9, [r3]
         bne     s3c2412_sleep_enter1
 
-        mov     pc, r14
+        ret     lr
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index 55eb6a69655b..60576dfbea8d 100644
--- a/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -45,7 +45,6 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <mach/regs-gpio.h>
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 4b0199fff9f5..fe116334afda 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -58,7 +58,6 @@
 #include <linux/platform_data/spi-s3c64xx.h>
 
 #include <plat/keypad.h>
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index 72cee08c8bf5..19e8feb908fd 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -39,7 +39,6 @@
 #include <plat/fb.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
 
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/samsung-time.h>
diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c
index 67f06a9ae656..4bae7dc49eea 100644
--- a/arch/arm/mach-s3c64xx/mach-ncp.c
+++ b/arch/arm/mach-s3c64xx/mach-ncp.c
@@ -40,7 +40,6 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/fb.h>
 
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/samsung-time.h>
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c
index 78dd6f73c072..b3d13537a7f0 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq.c
@@ -28,7 +28,6 @@
 #include <mach/regs-gpio.h>
 #include <mach/gpio-samsung.h>
 
-#include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <linux/platform_data/i2c-s3c2410.h>
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c
index c85d1cbe769f..910749768340 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6400.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c
@@ -30,7 +30,6 @@
 #include <mach/hardware.h>
 #include <mach/map.h>
 
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <linux/platform_data/i2c-s3c2410.h>
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index c6a8b2ab0240..1dc86d76b530 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -63,7 +63,6 @@
 #include <plat/fb.h>
 #include <plat/gpio-cfg.h>
 
-#include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/adc.h>
diff --git a/arch/arm/mach-s3c64xx/s3c6400.c b/arch/arm/mach-s3c64xx/s3c6400.c
index 8c42807bf579..1ce48c54cd9c 100644
--- a/arch/arm/mach-s3c64xx/s3c6400.c
+++ b/arch/arm/mach-s3c64xx/s3c6400.c
@@ -39,7 +39,6 @@
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/clock.h>
 #include <plat/sdhci.h>
 #include <plat/iic-core.h>
 #include <plat/onenand-core.h>
diff --git a/arch/arm/mach-s3c64xx/s3c6410.c b/arch/arm/mach-s3c64xx/s3c6410.c
index 5be3f09bac92..b2a7930548d9 100644
--- a/arch/arm/mach-s3c64xx/s3c6410.c
+++ b/arch/arm/mach-s3c64xx/s3c6410.c
@@ -40,7 +40,6 @@
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/clock.h>
 #include <plat/sdhci.h>
 #include <plat/ata-core.h>
 #include <plat/adc-core.h>
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
deleted file mode 100644
index 26003e23796d..000000000000
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ /dev/null
@@ -1,102 +0,0 @@
-# arch/arm/mach-s5p64x0/Kconfig
-#
-# Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
-#               http://www.samsung.com/
-#
-# Licensed under GPLv2
-
-if ARCH_S5P64X0
-
-config CPU_S5P6440
-        bool
-        select ARM_AMBA
-        select PL330_DMA if DMADEVICES
-        select S5P_SLEEP if PM
-        select SAMSUNG_WAKEMASK if PM
-        help
-          Enable S5P6440 CPU support
-
-config CPU_S5P6450
-        bool
-        select ARM_AMBA
-        select PL330_DMA if DMADEVICES
-        select S5P_SLEEP if PM
-        select SAMSUNG_WAKEMASK if PM
-        help
-          Enable S5P6450 CPU support
-
-config S5P64X0_SETUP_FB_24BPP
-        bool
-        help
-          Common setup code for S5P64X0 based boards with a LCD display
-          through RGB interface.
-
-config S5P64X0_SETUP_I2C1
-        bool
-        help
-          Common setup code for i2c bus 1.
-
-config S5P64X0_SETUP_SPI
-        bool
-        help
-          Common setup code for SPI GPIO configurations
-
-config S5P64X0_SETUP_SDHCI_GPIO
-        bool
-        help
-          Common setup code for SDHCI gpio.
-
-# machine support
-
-config MACH_SMDK6440
-        bool "SMDK6440"
-        select CPU_S5P6440
-        select S3C_DEV_FB
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
-        select S3C_DEV_HSMMC2
-        select S3C_DEV_I2C1
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
-        select S5P64X0_SETUP_FB_24BPP
-        select S5P64X0_SETUP_I2C1
-        select S5P64X0_SETUP_SDHCI_GPIO
-        select SAMSUNG_DEV_ADC
-        select SAMSUNG_DEV_BACKLIGHT
-        select SAMSUNG_DEV_PWM
-        select SAMSUNG_DEV_TS
-        help
-          Machine support for the Samsung SMDK6440
-
-config MACH_SMDK6450
-        bool "SMDK6450"
-        select CPU_S5P6450
-        select S3C_DEV_FB
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
-        select S3C_DEV_HSMMC2
-        select S3C_DEV_I2C1
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
-        select S5P64X0_SETUP_FB_24BPP
-        select S5P64X0_SETUP_I2C1
-        select S5P64X0_SETUP_SDHCI_GPIO
-        select SAMSUNG_DEV_ADC
-        select SAMSUNG_DEV_BACKLIGHT
-        select SAMSUNG_DEV_PWM
-        select SAMSUNG_DEV_TS
-        help
-          Machine support for the Samsung SMDK6450
-
-menu "Use 8-bit SDHCI bus width"
-
-config S5P64X0_SD_CH1_8BIT
-        bool "SDHCI Channel 1 (Slot 1)"
-        depends on MACH_SMDK6450 || MACH_SMDK6440
-        help
-          Support SDHCI Channel 1 8-bit bus.
-          If selected, Channel 2 is disabled.
-
-endmenu
-
-endif
diff --git a/arch/arm/mach-s5p64x0/Makefile b/arch/arm/mach-s5p64x0/Makefile
deleted file mode 100644
index 12bb951187a4..000000000000
--- a/arch/arm/mach-s5p64x0/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# arch/arm/mach-s5p64x0/Makefile
-#
-# Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
-#               http://www.samsung.com
-#
-# Licensed under GPLv2
-
-obj-y                           :=
-obj-m                           :=
-obj-n                           :=
-obj-                            :=
-
-# Core
-
-obj-y                           += common.o clock.o
-obj-$(CONFIG_CPU_S5P6440)       += clock-s5p6440.o
-obj-$(CONFIG_CPU_S5P6450)       += clock-s5p6450.o
-
-obj-$(CONFIG_PM)                += pm.o irq-pm.o
-
-obj-y                           += dma.o
-
-# machine support
-
-obj-$(CONFIG_MACH_SMDK6440)     += mach-smdk6440.o
-obj-$(CONFIG_MACH_SMDK6450)     += mach-smdk6450.o
-
-# device support
-
-obj-y                           += dev-audio.o
-
-obj-y                                   += setup-i2c0.o
-obj-$(CONFIG_S5P64X0_SETUP_I2C1)        += setup-i2c1.o
-obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP)    += setup-fb-24bpp.o
-obj-$(CONFIG_S5P64X0_SETUP_SPI)         += setup-spi.o
-obj-$(CONFIG_S5P64X0_SETUP_SDHCI_GPIO)  += setup-sdhci-gpio.o
diff --git a/arch/arm/mach-s5p64x0/Makefile.boot b/arch/arm/mach-s5p64x0/Makefile.boot
deleted file mode 100644
index 79ece4055b02..000000000000
--- a/arch/arm/mach-s5p64x0/Makefile.boot
+++ /dev/null
@@ -1,2 +0,0 @@
-   zreladdr-y   += 0x20008000
-params_phys-y   := 0x20000100
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c
deleted file mode 100644
index ae34a1d5e10a..000000000000
--- a/arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ /dev/null
@@ -1,632 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/clock-s5p6440.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P6440 - Clock 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.
-*/
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/io.h>
-
-#include <mach/hardware.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/cpu-freq.h>
-#include <plat/clock.h>
-#include <plat/cpu.h>
-#include <plat/pll.h>
-#include <plat/s5p-clock.h>
-#include <plat/clock-clksrc.h>
-
-#include "clock.h"
-#include "common.h"
-
-static u32 epll_div[][5] = {
-        { 36000000,     0,      48, 1, 4 },
-        { 48000000,     0,      32, 1, 3 },
-        { 60000000,     0,      40, 1, 3 },
-        { 72000000,     0,      48, 1, 3 },
-        { 84000000,     0,      28, 1, 2 },
-        { 96000000,     0,      32, 1, 2 },
-        { 32768000,     45264,  43, 1, 4 },
-        { 45158000,     6903,   30, 1, 3 },
-        { 49152000,     50332,  32, 1, 3 },
-        { 67738000,     10398,  45, 1, 3 },
-        { 73728000,     9961,   49, 1, 3 }
-};
-
-static int s5p6440_epll_set_rate(struct clk *clk, unsigned long rate)
-{
-        unsigned int epll_con, epll_con_k;
-        unsigned int i;
-
-        if (clk->rate == rate)  /* Return if nothing changed */
-                return 0;
-
-        epll_con = __raw_readl(S5P64X0_EPLL_CON);
-        epll_con_k = __raw_readl(S5P64X0_EPLL_CON_K);
-
-        epll_con_k &= ~(PLL90XX_KDIV_MASK);
-        epll_con &= ~(PLL90XX_MDIV_MASK | PLL90XX_PDIV_MASK | PLL90XX_SDIV_MASK);
-
-        for (i = 0; i < ARRAY_SIZE(epll_div); i++) {
-                 if (epll_div[i][0] == rate) {
-                        epll_con_k |= (epll_div[i][1] << PLL90XX_KDIV_SHIFT);
-                        epll_con |= (epll_div[i][2] << PLL90XX_MDIV_SHIFT) |
-                                    (epll_div[i][3] << PLL90XX_PDIV_SHIFT) |
-                                    (epll_div[i][4] << PLL90XX_SDIV_SHIFT);
-                        break;
-                }
-        }
-
-        if (i == ARRAY_SIZE(epll_div)) {
-                printk(KERN_ERR "%s: Invalid Clock EPLL Frequency\n", __func__);
-                return -EINVAL;
-        }
-
-        __raw_writel(epll_con, S5P64X0_EPLL_CON);
-        __raw_writel(epll_con_k, S5P64X0_EPLL_CON_K);
-
-        printk(KERN_WARNING "EPLL Rate changes from %lu to %lu\n",
-                        clk->rate, rate);
-
-        clk->rate = rate;
-
-        return 0;
-}
-
-static struct clk_ops s5p6440_epll_ops = {
-        .get_rate = s5p_epll_get_rate,
-        .set_rate = s5p6440_epll_set_rate,
-};
-
-static struct clksrc_clk clk_hclk = {
-        .clk    = {
-                .name           = "clk_hclk",
-                .parent         = &clk_armclk.clk,
-        },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV0, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clk_pclk = {
-        .clk    = {
-                .name           = "clk_pclk",
-                .parent         = &clk_hclk.clk,
-        },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV0, .shift = 12, .size = 4 },
-};
-static struct clksrc_clk clk_hclk_low = {
-        .clk    = {
-                .name           = "clk_hclk_low",
-        },
-        .sources        = &clkset_hclk_low,
-        .reg_src        = { .reg = S5P64X0_SYS_OTHERS, .shift = 6, .size = 1 },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV3, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clk_pclk_low = {
-        .clk    = {
-                .name           = "clk_pclk_low",
-                .parent         = &clk_hclk_low.clk,
-        },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV3, .shift = 12, .size = 4 },
-};
-
-/*
- * The following clocks will be disabled during clock initialization. It is
- * recommended to keep the following clocks disabled until the driver requests
- * for enabling the clock.
- */
-static struct clk init_clocks_off[] = {
-        {
-                .name           = "nand",
-                .parent         = &clk_hclk.clk,
-                .enable         = s5p64x0_mem_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "post",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 5)
-        }, {
-                .name           = "2d",
-                .parent         = &clk_hclk.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 8),
-        }, {
-                .name           = "dma",
-                .devname        = "dma-pl330",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 12),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.0",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 17),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.1",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 18),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.2",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 19),
-        }, {
-                .name           = "otg",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 20)
-        }, {
-                .name           = "irom",
-                .parent         = &clk_hclk.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 25),
-        }, {
-                .name           = "lcd",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk1_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "hclk_fimgvg",
-                .parent         = &clk_hclk.clk,
-                .enable         = s5p64x0_hclk1_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "tsi",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk1_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "watchdog",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 5),
-        }, {
-                .name           = "rtc",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 6),
-        }, {
-                .name           = "timers",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 7),
-        }, {
-                .name           = "pcm",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 8),
-        }, {
-                .name           = "adc",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 12),
-        }, {
-                .name           = "i2c",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 17),
-        }, {
-                .name           = "spi",
-                .devname        = "s5p64x0-spi.0",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 21),
-        }, {
-                .name           = "spi",
-                .devname        = "s5p64x0-spi.1",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 22),
-        }, {
-                .name           = "gps",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 25),
-        }, {
-                .name           = "dsim",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 28),
-        }, {
-                .name           = "etm",
-                .parent         = &clk_pclk.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 29),
-        }, {
-                .name           = "dmc0",
-                .parent         = &clk_pclk.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 30),
-        }, {
-                .name           = "pclk_fimgvg",
-                .parent         = &clk_pclk.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 31),
-        }, {
-                .name           = "mmc_48m",
-                .devname        = "s3c-sdhci.0",
-                .parent         = &clk_48m,
-                .enable         = s5p64x0_sclk_ctrl,
-                .ctrlbit        = (1 << 27),
-        }, {
-                .name           = "mmc_48m",
-                .devname        = "s3c-sdhci.1",
-                .parent         = &clk_48m,
-                .enable         = s5p64x0_sclk_ctrl,
-                .ctrlbit        = (1 << 28),
-        }, {
-                .name           = "mmc_48m",
-                .devname        = "s3c-sdhci.2",
-                .parent         = &clk_48m,
-                .enable         = s5p64x0_sclk_ctrl,
-                .ctrlbit        = (1 << 29),
-        },
-};
-
-/*
- * The following clocks will be enabled during clock initialization.
- */
-static struct clk init_clocks[] = {
-        {
-                .name           = "intc",
-                .parent         = &clk_hclk.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "mem",
-                .parent         = &clk_hclk.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 21),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.0",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.1",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.2",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.3",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
-                .name           = "gpio",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 18),
-        },
-};
-
-static struct clk clk_iis_cd_v40 = {
-        .name           = "iis_cdclk_v40",
-};
-
-static struct clk clk_pcm_cd = {
-        .name           = "pcm_cdclk",
-};
-
-static struct clk *clkset_group1_list[] = {
-        &clk_mout_epll.clk,
-        &clk_dout_mpll.clk,
-        &clk_fin_epll,
-};
-
-static struct clksrc_sources clkset_group1 = {
-        .sources        = clkset_group1_list,
-        .nr_sources     = ARRAY_SIZE(clkset_group1_list),
-};
-
-static struct clk *clkset_uart_list[] = {
-        &clk_mout_epll.clk,
-        &clk_dout_mpll.clk,
-};
-
-static struct clksrc_sources clkset_uart = {
-        .sources        = clkset_uart_list,
-        .nr_sources     = ARRAY_SIZE(clkset_uart_list),
-};
-
-static struct clk *clkset_audio_list[] = {
-        &clk_mout_epll.clk,
-        &clk_dout_mpll.clk,
-        &clk_fin_epll,
-        &clk_iis_cd_v40,
-        &clk_pcm_cd,
-};
-
-static struct clksrc_sources clkset_audio = {
-        .sources        = clkset_audio_list,
-        .nr_sources     = ARRAY_SIZE(clkset_audio_list),
-};
-
-static struct clksrc_clk clksrcs[] = {
-        {
-                .clk    = {
-                        .name           = "sclk_post",
-                        .ctrlbit        = (1 << 10),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 26, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 12, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_dispcon",
-                        .ctrlbit        = (1 << 1),
-                        .enable         = s5p64x0_sclk1_ctrl,
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P64X0_CLK_SRC1, .shift = 4, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 0, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_fimgvg",
-                        .ctrlbit        = (1 << 2),
-                        .enable         = s5p64x0_sclk1_ctrl,
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P64X0_CLK_SRC1, .shift = 8, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 4, .size = 4 },
-        },
-};
-
-static struct clksrc_clk clk_sclk_mmc0 = {
-        .clk    = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.0",
-                .ctrlbit        = (1 << 24),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group1,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc1 = {
-        .clk    = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.1",
-                .ctrlbit        = (1 << 25),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group1,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc2 = {
-        .clk    = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.2",
-                .ctrlbit        = (1 << 26),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group1,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_uclk = {
-        .clk    = {
-                .name           = "uclk1",
-                .ctrlbit        = (1 << 5),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_uart,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },
-};
-
-static struct clk clk_i2s0 = {
-        .name           = "iis",
-        .devname        = "samsung-i2s.0",
-        .parent         = &clk_pclk_low.clk,
-        .enable         = s5p64x0_pclk_ctrl,
-        .ctrlbit        = (1 << 26),
-};
-
-static struct clksrc_clk clk_audio_bus2 = {
-        .clk    = {
-                .name           = "sclk_audio2",
-                .devname        = "samsung-i2s.0",
-                .ctrlbit        = (1 << 11),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_audio,
-        .reg_src = { .reg = S5P64X0_CLK_SRC1, .shift = 0, .size = 3 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 24, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_spi0 = {
-        .clk    = {
-                .name           = "sclk_spi",
-                .devname        = "s5p64x0-spi.0",
-                .ctrlbit        = (1 << 20),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group1,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_spi1 = {
-        .clk    = {
-                .name           = "sclk_spi",
-                .devname        = "s5p64x0-spi.1",
-                .ctrlbit        = (1 << 21),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group1,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },
-};
-
-/* Clock initialization code */
-static struct clksrc_clk *sysclks[] = {
-        &clk_mout_apll,
-        &clk_mout_epll,
-        &clk_mout_mpll,
-        &clk_dout_mpll,
-        &clk_armclk,
-        &clk_hclk,
-        &clk_pclk,
-        &clk_hclk_low,
-        &clk_pclk_low,
-};
-
-static struct clk dummy_apb_pclk = {
-        .name           = "apb_pclk",
-        .id             = -1,
-};
-
-static struct clk *clk_cdev[] = {
-        &clk_i2s0,
-};
-
-static struct clksrc_clk *clksrc_cdev[] = {
-        &clk_sclk_uclk,
-        &clk_sclk_spi0,
-        &clk_sclk_spi1,
-        &clk_sclk_mmc0,
-        &clk_sclk_mmc1,
-        &clk_sclk_mmc2,
-        &clk_audio_bus2,
-};
-
-static struct clk_lookup s5p6440_clk_lookup[] = {
-        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_pclk_low.clk),
-        CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_sclk_uclk.clk),
-        CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
-        CLKDEV_INIT("s5p64x0-spi.0", "spi_busclk1", &clk_sclk_spi0.clk),
-        CLKDEV_INIT("s5p64x0-spi.1", "spi_busclk1", &clk_sclk_spi1.clk),
-        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
-        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
-        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
-        CLKDEV_INIT("samsung-i2s.0", "i2s_opclk0", &clk_i2s0),
-        CLKDEV_INIT("samsung-i2s.0", "i2s_opclk1", &clk_audio_bus2.clk),
-};
-
-void __init_or_cpufreq s5p6440_setup_clocks(void)
-{
-        struct clk *xtal_clk;
-
-        unsigned long xtal;
-        unsigned long fclk;
-        unsigned long hclk;
-        unsigned long hclk_low;
-        unsigned long pclk;
-        unsigned long pclk_low;
-
-        unsigned long apll;
-        unsigned long mpll;
-        unsigned long epll;
-        unsigned int ptr;
-
-        /* Set S5P6440 functions for clk_fout_epll */
-
-        clk_fout_epll.enable = s5p_epll_enable;
-        clk_fout_epll.ops = &s5p6440_epll_ops;
-
-        clk_48m.enable = s5p64x0_clk48m_ctrl;
-
-        xtal_clk = clk_get(NULL, "ext_xtal");
-        BUG_ON(IS_ERR(xtal_clk));
-
-        xtal = clk_get_rate(xtal_clk);
-        clk_put(xtal_clk);
-
-        apll = s5p_get_pll45xx(xtal, __raw_readl(S5P64X0_APLL_CON), pll_4502);
-        mpll = s5p_get_pll45xx(xtal, __raw_readl(S5P64X0_MPLL_CON), pll_4502);
-        epll = s5p_get_pll90xx(xtal, __raw_readl(S5P64X0_EPLL_CON),
-                                __raw_readl(S5P64X0_EPLL_CON_K));
-
-        clk_fout_apll.rate = apll;
-        clk_fout_mpll.rate = mpll;
-        clk_fout_epll.rate = epll;
-
-        printk(KERN_INFO "S5P6440: PLL settings, A=%ld.%ldMHz, M=%ld.%ldMHz," \
-                        " E=%ld.%ldMHz\n",
-                        print_mhz(apll), print_mhz(mpll), print_mhz(epll));
-
-        fclk = clk_get_rate(&clk_armclk.clk);
-        hclk = clk_get_rate(&clk_hclk.clk);
-        pclk = clk_get_rate(&clk_pclk.clk);
-        hclk_low = clk_get_rate(&clk_hclk_low.clk);
-        pclk_low = clk_get_rate(&clk_pclk_low.clk);
-
-        printk(KERN_INFO "S5P6440: HCLK=%ld.%ldMHz, HCLK_LOW=%ld.%ldMHz," \
-                        " PCLK=%ld.%ldMHz, PCLK_LOW=%ld.%ldMHz\n",
-                        print_mhz(hclk), print_mhz(hclk_low),
-                        print_mhz(pclk), print_mhz(pclk_low));
-
-        clk_f.rate = fclk;
-        clk_h.rate = hclk;
-        clk_p.rate = pclk;
-
-        for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
-                s3c_set_clksrc(&clksrcs[ptr], true);
-}
-
-static struct clk *clks[] __initdata = {
-        &clk_ext,
-        &clk_iis_cd_v40,
-        &clk_pcm_cd,
-};
-
-void __init s5p6440_register_clocks(void)
-{
-        int ptr;
-        unsigned int cnt;
-
-        s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
-
-        for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++)
-                s3c_register_clksrc(sysclks[ptr], 1);
-
-        s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));
-        for (cnt = 0; cnt < ARRAY_SIZE(clk_cdev); cnt++)
-                s3c_disable_clocks(clk_cdev[cnt], 1);
-
-        s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
-        s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
-        for (ptr = 0; ptr < ARRAY_SIZE(clksrc_cdev); ptr++)
-                s3c_register_clksrc(clksrc_cdev[ptr], 1);
-
-        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(s5p6440_clk_lookup, ARRAY_SIZE(s5p6440_clk_lookup));
-
-        s3c24xx_register_clock(&dummy_apb_pclk);
-}
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c
deleted file mode 100644
index 0b3ca2ed53e9..000000000000
--- a/arch/arm/mach-s5p64x0/clock-s5p6450.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/clock-s5p6450.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P6450 - Clock 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.
-*/
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/io.h>
-
-#include <mach/hardware.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/cpu-freq.h>
-#include <plat/clock.h>
-#include <plat/cpu.h>
-#include <plat/pll.h>
-#include <plat/s5p-clock.h>
-#include <plat/clock-clksrc.h>
-
-#include "clock.h"
-#include "common.h"
-
-static struct clksrc_clk clk_mout_dpll = {
-        .clk    = {
-                .name           = "mout_dpll",
-        },
-        .sources        = &clk_src_dpll,
-        .reg_src        = { .reg = S5P64X0_CLK_SRC0, .shift = 5, .size = 1 },
-};
-
-static u32 epll_div[][5] = {
-        { 133000000,    27307,  55, 2, 2 },
-        { 100000000,    43691,  41, 2, 2 },
-        { 480000000,    0,      80, 2, 0 },
-};
-
-static int s5p6450_epll_set_rate(struct clk *clk, unsigned long rate)
-{
-        unsigned int epll_con, epll_con_k;
-        unsigned int i;
-
-        if (clk->rate == rate)  /* Return if nothing changed */
-                return 0;
-
-        epll_con = __raw_readl(S5P64X0_EPLL_CON);
-        epll_con_k = __raw_readl(S5P64X0_EPLL_CON_K);
-
-        epll_con_k &= ~(PLL90XX_KDIV_MASK);
-        epll_con &= ~(PLL90XX_MDIV_MASK | PLL90XX_PDIV_MASK | PLL90XX_SDIV_MASK);
-
-        for (i = 0; i < ARRAY_SIZE(epll_div); i++) {
-                 if (epll_div[i][0] == rate) {
-                        epll_con_k |= (epll_div[i][1] << PLL90XX_KDIV_SHIFT);
-                        epll_con |= (epll_div[i][2] << PLL90XX_MDIV_SHIFT) |
-                                    (epll_div[i][3] << PLL90XX_PDIV_SHIFT) |
-                                    (epll_div[i][4] << PLL90XX_SDIV_SHIFT);
-                        break;
-                }
-        }
-
-        if (i == ARRAY_SIZE(epll_div)) {
-                printk(KERN_ERR "%s: Invalid Clock EPLL Frequency\n", __func__);
-                return -EINVAL;
-        }
-
-        __raw_writel(epll_con, S5P64X0_EPLL_CON);
-        __raw_writel(epll_con_k, S5P64X0_EPLL_CON_K);
-
-        printk(KERN_WARNING "EPLL Rate changes from %lu to %lu\n",
-                        clk->rate, rate);
-
-        clk->rate = rate;
-
-        return 0;
-}
-
-static struct clk_ops s5p6450_epll_ops = {
-        .get_rate = s5p_epll_get_rate,
-        .set_rate = s5p6450_epll_set_rate,
-};
-
-static struct clksrc_clk clk_dout_epll = {
-        .clk    = {
-                .name           = "dout_epll",
-                .parent         = &clk_mout_epll.clk,
-        },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV1, .shift = 24, .size = 4 },
-};
-
-static struct clksrc_clk clk_mout_hclk_sel = {
-        .clk    = {
-                .name           = "mout_hclk_sel",
-        },
-        .sources        = &clkset_hclk_low,
-        .reg_src        = { .reg = S5P64X0_OTHERS, .shift = 15, .size = 1 },
-};
-
-static struct clk *clkset_hclk_list[] = {
-        &clk_mout_hclk_sel.clk,
-        &clk_armclk.clk,
-};
-
-static struct clksrc_sources clkset_hclk = {
-        .sources        = clkset_hclk_list,
-        .nr_sources     = ARRAY_SIZE(clkset_hclk_list),
-};
-
-static struct clksrc_clk clk_hclk = {
-        .clk    = {
-                .name           = "clk_hclk",
-        },
-        .sources        = &clkset_hclk,
-        .reg_src        = { .reg = S5P64X0_OTHERS, .shift = 14, .size = 1 },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV0, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clk_pclk = {
-        .clk    = {
-                .name           = "clk_pclk",
-                .parent         = &clk_hclk.clk,
-        },
-        .reg_div = { .reg = S5P64X0_CLK_DIV0, .shift = 12, .size = 4 },
-};
-static struct clksrc_clk clk_dout_pwm_ratio0 = {
-        .clk    = {
-                .name           = "clk_dout_pwm_ratio0",
-                .parent         = &clk_mout_hclk_sel.clk,
-        },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV3, .shift = 16, .size = 4 },
-};
-
-static struct clksrc_clk clk_pclk_to_wdt_pwm = {
-        .clk    = {
-                .name           = "clk_pclk_to_wdt_pwm",
-                .parent         = &clk_dout_pwm_ratio0.clk,
-        },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV3, .shift = 20, .size = 4 },
-};
-
-static struct clksrc_clk clk_hclk_low = {
-        .clk    = {
-                .name           = "clk_hclk_low",
-        },
-        .sources        = &clkset_hclk_low,
-        .reg_src        = { .reg = S5P64X0_OTHERS, .shift = 6, .size = 1 },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV3, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clk_pclk_low = {
-        .clk    = {
-                .name           = "clk_pclk_low",
-                .parent         = &clk_hclk_low.clk,
-        },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV3, .shift = 12, .size = 4 },
-};
-
-/*
- * The following clocks will be disabled during clock initialization. It is
- * recommended to keep the following clocks disabled until the driver requests
- * for enabling the clock.
- */
-static struct clk init_clocks_off[] = {
-        {
-                .name           = "usbhost",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "dma",
-                .devname        = "dma-pl330",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 12),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.0",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 17),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.1",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 18),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.2",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 19),
-        }, {
-                .name           = "usbotg",
-                .parent         = &clk_hclk_low.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 20),
-        }, {
-                .name           = "lcd",
-                .parent         = &clk_h,
-                .enable         = s5p64x0_hclk1_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "watchdog",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 5),
-        }, {
-                .name           = "rtc",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 6),
-        }, {
-                .name           = "adc",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 12),
-        }, {
-                .name           = "i2c",
-                .devname        = "s3c2440-i2c.0",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 17),
-        }, {
-                .name           = "spi",
-                .devname        = "s5p64x0-spi.0",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 21),
-        }, {
-                .name           = "spi",
-                .devname        = "s5p64x0-spi.1",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 22),
-        }, {
-                .name           = "i2c",
-                .devname        = "s3c2440-i2c.1",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 27),
-        }, {
-                .name           = "dmc0",
-                .parent         = &clk_pclk.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 30),
-        }
-};
-
-/*
- * The following clocks will be enabled during clock initialization.
- */
-static struct clk init_clocks[] = {
-        {
-                .name           = "intc",
-                .parent         = &clk_hclk.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "mem",
-                .parent         = &clk_hclk.clk,
-                .enable         = s5p64x0_hclk0_ctrl,
-                .ctrlbit        = (1 << 21),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.0",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.1",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.2",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.3",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
-                .name           = "timers",
-                .parent         = &clk_pclk_to_wdt_pwm.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 7),
-        }, {
-                .name           = "gpio",
-                .parent         = &clk_pclk_low.clk,
-                .enable         = s5p64x0_pclk_ctrl,
-                .ctrlbit        = (1 << 18),
-        },
-};
-
-static struct clk *clkset_uart_list[] = {
-        &clk_dout_epll.clk,
-        &clk_dout_mpll.clk,
-};
-
-static struct clksrc_sources clkset_uart = {
-        .sources        = clkset_uart_list,
-        .nr_sources     = ARRAY_SIZE(clkset_uart_list),
-};
-
-static struct clk *clkset_mali_list[] = {
-        &clk_mout_epll.clk,
-        &clk_mout_apll.clk,
-        &clk_mout_mpll.clk,
-};
-
-static struct clksrc_sources clkset_mali = {
-        .sources        = clkset_mali_list,
-        .nr_sources     = ARRAY_SIZE(clkset_mali_list),
-};
-
-static struct clk *clkset_group2_list[] = {
-        &clk_dout_epll.clk,
-        &clk_dout_mpll.clk,
-        &clk_ext_xtal_mux,
-};
-
-static struct clksrc_sources clkset_group2 = {
-        .sources        = clkset_group2_list,
-        .nr_sources     = ARRAY_SIZE(clkset_group2_list),
-};
-
-static struct clk *clkset_dispcon_list[] = {
-        &clk_dout_epll.clk,
-        &clk_dout_mpll.clk,
-        &clk_ext_xtal_mux,
-        &clk_mout_dpll.clk,
-};
-
-static struct clksrc_sources clkset_dispcon = {
-        .sources        = clkset_dispcon_list,
-        .nr_sources     = ARRAY_SIZE(clkset_dispcon_list),
-};
-
-static struct clk *clkset_hsmmc44_list[] = {
-        &clk_dout_epll.clk,
-        &clk_dout_mpll.clk,
-        &clk_ext_xtal_mux,
-        &s5p_clk_27m,
-        &clk_48m,
-};
-
-static struct clksrc_sources clkset_hsmmc44 = {
-        .sources        = clkset_hsmmc44_list,
-        .nr_sources     = ARRAY_SIZE(clkset_hsmmc44_list),
-};
-
-static struct clk *clkset_sclk_audio0_list[] = {
-        [0] = &clk_dout_epll.clk,
-        [1] = &clk_dout_mpll.clk,
-        [2] = &clk_ext_xtal_mux,
-        [3] = NULL,
-        [4] = NULL,
-};
-
-static struct clksrc_sources clkset_sclk_audio0 = {
-        .sources        = clkset_sclk_audio0_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_audio0_list),
-};
-
-static struct clksrc_clk clk_sclk_audio0 = {
-        .clk            = {
-                .name           = "audio-bus",
-                .devname        = "samsung-i2s.0",
-                .enable         = s5p64x0_sclk_ctrl,
-                .ctrlbit        = (1 << 8),
-                .parent         = &clk_dout_epll.clk,
-        },
-        .sources        = &clkset_sclk_audio0,
-        .reg_src        = { .reg = S5P64X0_CLK_SRC1, .shift = 10, .size = 3 },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV2, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clksrcs[] = {
-        {
-                .clk    = {
-                        .name           = "sclk_fimc",
-                        .ctrlbit        = (1 << 10),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 26, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 12, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "aclk_mali",
-                        .ctrlbit        = (1 << 2),
-                        .enable         = s5p64x0_sclk1_ctrl,
-                },
-                .sources = &clkset_mali,
-                .reg_src = { .reg = S5P64X0_CLK_SRC1, .shift = 8, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 4, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_2d",
-                        .ctrlbit        = (1 << 12),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_mali,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 30, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 20, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_usi",
-                        .ctrlbit        = (1 << 7),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 10, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 16, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_camif",
-                        .ctrlbit        = (1 << 6),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 28, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 20, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_dispcon",
-                        .ctrlbit        = (1 << 1),
-                        .enable         = s5p64x0_sclk1_ctrl,
-                },
-                .sources = &clkset_dispcon,
-                .reg_src = { .reg = S5P64X0_CLK_SRC1, .shift = 4, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV3, .shift = 0, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_hsmmc44",
-                        .ctrlbit        = (1 << 30),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_hsmmc44,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 6, .size = 3 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 28, .size = 4 },
-        },
-};
-
-static struct clksrc_clk clk_sclk_mmc0 = {
-        .clk    = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.0",
-                .ctrlbit        = (1 << 24),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc1 = {
-        .clk    = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.1",
-                .ctrlbit        = (1 << 25),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc2 = {
-        .clk    = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.2",
-                .ctrlbit        = (1 << 26),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_uclk = {
-        .clk    = {
-                .name           = "uclk1",
-                .ctrlbit        = (1 << 5),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_uart,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_spi0 = {
-        .clk    = {
-                .name           = "sclk_spi",
-                .devname        = "s5p64x0-spi.0",
-                .ctrlbit        = (1 << 20),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_spi1 = {
-        .clk    = {
-                .name           = "sclk_spi",
-                .devname        = "s5p64x0-spi.1",
-                .ctrlbit        = (1 << 21),
-                .enable         = s5p64x0_sclk_ctrl,
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },
-        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },
-};
-
-static struct clk clk_i2s0 = {
-        .name           = "iis",
-        .devname        = "samsung-i2s.0",
-        .parent         = &clk_pclk_low.clk,
-        .enable         = s5p64x0_pclk_ctrl,
-        .ctrlbit        = (1 << 26),
-};
-
-static struct clk clk_i2s1 = {
-        .name           = "iis",
-        .devname        = "samsung-i2s.1",
-        .parent         = &clk_pclk_low.clk,
-        .enable         = s5p64x0_pclk_ctrl,
-        .ctrlbit        = (1 << 15),
-};
-
-static struct clk clk_i2s2 = {
-        .name           = "iis",
-        .devname        = "samsung-i2s.2",
-        .parent         = &clk_pclk_low.clk,
-        .enable         = s5p64x0_pclk_ctrl,
-        .ctrlbit        = (1 << 16),
-};
-
-static struct clk *clk_cdev[] = {
-        &clk_i2s0,
-        &clk_i2s1,
-        &clk_i2s2,
-};
-
-static struct clksrc_clk *clksrc_cdev[] = {
-        &clk_sclk_uclk,
-        &clk_sclk_spi0,
-        &clk_sclk_spi1,
-        &clk_sclk_mmc0,
-        &clk_sclk_mmc1,
-        &clk_sclk_mmc2,
-        &clk_sclk_audio0,
-};
-
-static struct clk_lookup s5p6450_clk_lookup[] = {
-        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_pclk_low.clk),
-        CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_sclk_uclk.clk),
-        CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
-        CLKDEV_INIT("s5p64x0-spi.0", "spi_busclk1", &clk_sclk_spi0.clk),
-        CLKDEV_INIT("s5p64x0-spi.1", "spi_busclk1", &clk_sclk_spi1.clk),
-        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
-        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
-        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
-        CLKDEV_INIT("samsung-i2s.0", "i2s_opclk0", &clk_i2s0),
-        CLKDEV_INIT("samsung-i2s.0", "i2s_opclk1", &clk_sclk_audio0.clk),
-        CLKDEV_INIT("samsung-i2s.1", "i2s_opclk0", &clk_i2s1),
-        CLKDEV_INIT("samsung-i2s.2", "i2s_opclk0", &clk_i2s2),
-};
-
-/* Clock initialization code */
-static struct clksrc_clk *sysclks[] = {
-        &clk_mout_apll,
-        &clk_mout_epll,
-        &clk_dout_epll,
-        &clk_mout_mpll,
-        &clk_dout_mpll,
-        &clk_armclk,
-        &clk_mout_hclk_sel,
-        &clk_dout_pwm_ratio0,
-        &clk_pclk_to_wdt_pwm,
-        &clk_hclk,
-        &clk_pclk,
-        &clk_hclk_low,
-        &clk_pclk_low,
-};
-
-static struct clk dummy_apb_pclk = {
-        .name           = "apb_pclk",
-        .id             = -1,
-};
-
-void __init_or_cpufreq s5p6450_setup_clocks(void)
-{
-        struct clk *xtal_clk;
-
-        unsigned long xtal;
-        unsigned long fclk;
-        unsigned long hclk;
-        unsigned long hclk_low;
-        unsigned long pclk;
-        unsigned long pclk_low;
-
-        unsigned long apll;
-        unsigned long mpll;
-        unsigned long epll;
-        unsigned long dpll;
-        unsigned int ptr;
-
-        /* Set S5P6450 functions for clk_fout_epll */
-
-        clk_fout_epll.enable = s5p_epll_enable;
-        clk_fout_epll.ops = &s5p6450_epll_ops;
-
-        clk_48m.enable = s5p64x0_clk48m_ctrl;
-
-        xtal_clk = clk_get(NULL, "ext_xtal");
-        BUG_ON(IS_ERR(xtal_clk));
-
-        xtal = clk_get_rate(xtal_clk);
-        clk_put(xtal_clk);
-
-        apll = s5p_get_pll45xx(xtal, __raw_readl(S5P64X0_APLL_CON), pll_4502);
-        mpll = s5p_get_pll45xx(xtal, __raw_readl(S5P64X0_MPLL_CON), pll_4502);
-        epll = s5p_get_pll90xx(xtal, __raw_readl(S5P64X0_EPLL_CON),
-                                __raw_readl(S5P64X0_EPLL_CON_K));
-        dpll = s5p_get_pll46xx(xtal, __raw_readl(S5P6450_DPLL_CON),
-                                __raw_readl(S5P6450_DPLL_CON_K), pll_4650c);
-
-        clk_fout_apll.rate = apll;
-        clk_fout_mpll.rate = mpll;
-        clk_fout_epll.rate = epll;
-        clk_fout_dpll.rate = dpll;
-
-        printk(KERN_INFO "S5P6450: PLL settings, A=%ld.%ldMHz, M=%ld.%ldMHz," \
-                        " E=%ld.%ldMHz, D=%ld.%ldMHz\n",
-                        print_mhz(apll), print_mhz(mpll), print_mhz(epll),
-                        print_mhz(dpll));
-
-        fclk = clk_get_rate(&clk_armclk.clk);
-        hclk = clk_get_rate(&clk_hclk.clk);
-        pclk = clk_get_rate(&clk_pclk.clk);
-        hclk_low = clk_get_rate(&clk_hclk_low.clk);
-        pclk_low = clk_get_rate(&clk_pclk_low.clk);
-
-        printk(KERN_INFO "S5P6450: HCLK=%ld.%ldMHz, HCLK_LOW=%ld.%ldMHz," \
-                        " PCLK=%ld.%ldMHz, PCLK_LOW=%ld.%ldMHz\n",
-                        print_mhz(hclk), print_mhz(hclk_low),
-                        print_mhz(pclk), print_mhz(pclk_low));
-
-        clk_f.rate = fclk;
-        clk_h.rate = hclk;
-        clk_p.rate = pclk;
-
-        for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
-                s3c_set_clksrc(&clksrcs[ptr], true);
-}
-
-void __init s5p6450_register_clocks(void)
-{
-        int ptr;
-        unsigned int cnt;
-
-        for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++)
-                s3c_register_clksrc(sysclks[ptr], 1);
-
-
-        s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));
-        for (cnt = 0; cnt < ARRAY_SIZE(clk_cdev); cnt++)
-                s3c_disable_clocks(clk_cdev[cnt], 1);
-
-        s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
-        s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
-        for (ptr = 0; ptr < ARRAY_SIZE(clksrc_cdev); ptr++)
-                s3c_register_clksrc(clksrc_cdev[ptr], 1);
-
-        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(s5p6450_clk_lookup, ARRAY_SIZE(s5p6450_clk_lookup));
-
-        s3c24xx_register_clock(&dummy_apb_pclk);
-}
diff --git a/arch/arm/mach-s5p64x0/clock.c b/arch/arm/mach-s5p64x0/clock.c
deleted file mode 100644
index 57e718957ef3..000000000000
--- a/arch/arm/mach-s5p64x0/clock.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/clock.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - Clock 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.
-*/
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/io.h>
-
-#include <mach/hardware.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/cpu-freq.h>
-#include <plat/clock.h>
-#include <plat/cpu.h>
-#include <plat/pll.h>
-#include <plat/s5p-clock.h>
-#include <plat/clock-clksrc.h>
-
-#include "common.h"
-
-struct clksrc_clk clk_mout_apll = {
-        .clk    = {
-                .name           = "mout_apll",
-                .id             = -1,
-        },
-        .sources        = &clk_src_apll,
-        .reg_src        = { .reg = S5P64X0_CLK_SRC0, .shift = 0, .size = 1 },
-};
-
-struct clksrc_clk clk_mout_mpll = {
-        .clk    = {
-                .name           = "mout_mpll",
-                .id             = -1,
-        },
-        .sources        = &clk_src_mpll,
-        .reg_src        = { .reg = S5P64X0_CLK_SRC0, .shift = 1, .size = 1 },
-};
-
-struct clksrc_clk clk_mout_epll = {
-        .clk    = {
-                .name           = "mout_epll",
-                .id             = -1,
-        },
-        .sources        = &clk_src_epll,
-        .reg_src        = { .reg = S5P64X0_CLK_SRC0, .shift = 2, .size = 1 },
-};
-
-enum perf_level {
-        L0 = 532*1000,
-        L1 = 266*1000,
-        L2 = 133*1000,
-};
-
-static const u32 clock_table[][3] = {
-        /*{ARM_CLK, DIVarm, DIVhclk}*/
-        {L0 * 1000, (0 << ARM_DIV_RATIO_SHIFT), (3 << S5P64X0_CLKDIV0_HCLK_SHIFT)},
-        {L1 * 1000, (1 << ARM_DIV_RATIO_SHIFT), (1 << S5P64X0_CLKDIV0_HCLK_SHIFT)},
-        {L2 * 1000, (3 << ARM_DIV_RATIO_SHIFT), (0 << S5P64X0_CLKDIV0_HCLK_SHIFT)},
-};
-
-static unsigned long s5p64x0_armclk_get_rate(struct clk *clk)
-{
-        unsigned long rate = clk_get_rate(clk->parent);
-        u32 clkdiv;
-
-        /* divisor mask starts at bit0, so no need to shift */
-        clkdiv = __raw_readl(ARM_CLK_DIV) & ARM_DIV_MASK;
-
-        return rate / (clkdiv + 1);
-}
-
-static unsigned long s5p64x0_armclk_round_rate(struct clk *clk,
-                                               unsigned long rate)
-{
-        u32 iter;
-
-        for (iter = 1 ; iter < ARRAY_SIZE(clock_table) ; iter++) {
-                if (rate > clock_table[iter][0])
-                        return clock_table[iter-1][0];
-        }
-
-        return clock_table[ARRAY_SIZE(clock_table) - 1][0];
-}
-
-static int s5p64x0_armclk_set_rate(struct clk *clk, unsigned long rate)
-{
-        u32 round_tmp;
-        u32 iter;
-        u32 clk_div0_tmp;
-        u32 cur_rate = clk->ops->get_rate(clk);
-        unsigned long flags;
-
-        round_tmp = clk->ops->round_rate(clk, rate);
-        if (round_tmp == cur_rate)
-                return 0;
-
-
-        for (iter = 0 ; iter < ARRAY_SIZE(clock_table) ; iter++) {
-                if (round_tmp == clock_table[iter][0])
-                        break;
-        }
-
-        if (iter >= ARRAY_SIZE(clock_table))
-                iter = ARRAY_SIZE(clock_table) - 1;
-
-        local_irq_save(flags);
-        if (cur_rate > round_tmp) {
-                /* Frequency Down */
-                clk_div0_tmp = __raw_readl(ARM_CLK_DIV) & ~(ARM_DIV_MASK);
-                clk_div0_tmp |= clock_table[iter][1];
-                __raw_writel(clk_div0_tmp, ARM_CLK_DIV);
-
-                clk_div0_tmp = __raw_readl(ARM_CLK_DIV) &
-                                ~(S5P64X0_CLKDIV0_HCLK_MASK);
-                clk_div0_tmp |= clock_table[iter][2];
-                __raw_writel(clk_div0_tmp, ARM_CLK_DIV);
-
-
-        } else {
-                /* Frequency Up */
-                clk_div0_tmp = __raw_readl(ARM_CLK_DIV) &
-                                ~(S5P64X0_CLKDIV0_HCLK_MASK);
-                clk_div0_tmp |= clock_table[iter][2];
-                __raw_writel(clk_div0_tmp, ARM_CLK_DIV);
-
-                clk_div0_tmp = __raw_readl(ARM_CLK_DIV) & ~(ARM_DIV_MASK);
-                clk_div0_tmp |= clock_table[iter][1];
-                __raw_writel(clk_div0_tmp, ARM_CLK_DIV);
-        }
-        local_irq_restore(flags);
-
-        clk->rate = clock_table[iter][0];
-
-        return 0;
-}
-
-static struct clk_ops s5p64x0_clkarm_ops = {
-        .get_rate       = s5p64x0_armclk_get_rate,
-        .set_rate       = s5p64x0_armclk_set_rate,
-        .round_rate     = s5p64x0_armclk_round_rate,
-};
-
-struct clksrc_clk clk_armclk = {
-        .clk    = {
-                .name           = "armclk",
-                .id             = 1,
-                .parent         = &clk_mout_apll.clk,
-                .ops            = &s5p64x0_clkarm_ops,
-        },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV0, .shift = 0, .size = 4 },
-};
-
-struct clksrc_clk clk_dout_mpll = {
-        .clk    = {
-                .name           = "dout_mpll",
-                .id             = -1,
-                .parent         = &clk_mout_mpll.clk,
-        },
-        .reg_div        = { .reg = S5P64X0_CLK_DIV0, .shift = 4, .size = 1 },
-};
-
-static struct clk *clkset_hclk_low_list[] = {
-        &clk_mout_apll.clk,
-        &clk_mout_mpll.clk,
-};
-
-struct clksrc_sources clkset_hclk_low = {
-        .sources        = clkset_hclk_low_list,
-        .nr_sources     = ARRAY_SIZE(clkset_hclk_low_list),
-};
-
-int s5p64x0_pclk_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P64X0_CLK_GATE_PCLK, clk, enable);
-}
-
-int s5p64x0_hclk0_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P64X0_CLK_GATE_HCLK0, clk, enable);
-}
-
-int s5p64x0_hclk1_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P64X0_CLK_GATE_HCLK1, clk, enable);
-}
-
-int s5p64x0_sclk_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P64X0_CLK_GATE_SCLK0, clk, enable);
-}
-
-int s5p64x0_sclk1_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P64X0_CLK_GATE_SCLK1, clk, enable);
-}
-
-int s5p64x0_mem_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P64X0_CLK_GATE_MEM0, clk, enable);
-}
-
-int s5p64x0_clk48m_ctrl(struct clk *clk, int enable)
-{
-        unsigned long flags;
-        u32 val;
-
-        /* can't rely on clock lock, this register has other usages */
-        local_irq_save(flags);
-
-        val = __raw_readl(S5P64X0_OTHERS);
-        if (enable)
-                val |= S5P64X0_OTHERS_USB_SIG_MASK;
-        else
-                val &= ~S5P64X0_OTHERS_USB_SIG_MASK;
-
-        __raw_writel(val, S5P64X0_OTHERS);
-
-        local_irq_restore(flags);
-
-        return 0;
-}
diff --git a/arch/arm/mach-s5p64x0/clock.h b/arch/arm/mach-s5p64x0/clock.h
deleted file mode 100644
index 28b8e3c6bd24..000000000000
--- a/arch/arm/mach-s5p64x0/clock.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Header file for s5p64x0 clock 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 __MACH_S5P64X0_CLOCK_H
-#define __MACH_S5P64X0_CLOCK_H __FILE__
-
-#include <linux/clk.h>
-
-extern struct clksrc_clk clk_mout_apll;
-extern struct clksrc_clk clk_mout_mpll;
-extern struct clksrc_clk clk_mout_epll;
-
-extern int s5p64x0_epll_enable(struct clk *clk, int enable);
-extern unsigned long s5p64x0_epll_get_rate(struct clk *clk);
-
-extern struct clksrc_clk clk_armclk;
-extern struct clksrc_clk clk_dout_mpll;
-
-extern struct clksrc_sources clkset_hclk_low;
-
-extern int s5p64x0_pclk_ctrl(struct clk *clk, int enable);
-extern int s5p64x0_hclk0_ctrl(struct clk *clk, int enable);
-extern int s5p64x0_hclk1_ctrl(struct clk *clk, int enable);
-extern int s5p64x0_sclk_ctrl(struct clk *clk, int enable);
-extern int s5p64x0_sclk1_ctrl(struct clk *clk, int enable);
-extern int s5p64x0_mem_ctrl(struct clk *clk, int enable);
-
-extern int s5p64x0_clk48m_ctrl(struct clk *clk, int enable);
-
-#endif /* __MACH_S5P64X0_CLOCK_H */
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
deleted file mode 100644
index 9a43be002d78..000000000000
--- a/arch/arm/mach-s5p64x0/common.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Common Codes for S5P64X0 machines
- *
- * 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/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/device.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <clocksource/samsung_pwm.h>
-#include <linux/platform_device.h>
-#include <linux/sched.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-#include <linux/irq.h>
-#include <linux/reboot.h>
-
-#include <asm/irq.h>
-#include <asm/proc-fns.h>
-#include <asm/system_misc.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/map.h>
-#include <mach/hardware.h>
-#include <mach/regs-clock.h>
-#include <mach/regs-gpio.h>
-
-#include <plat/cpu.h>
-#include <plat/clock.h>
-#include <plat/devs.h>
-#include <plat/pm.h>
-#include <plat/sdhci.h>
-#include <plat/adc-core.h>
-#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/watchdog-reset.h>
-
-#include "common.h"
-
-static const char name_s5p6440[] = "S5P6440";
-static const char name_s5p6450[] = "S5P6450";
-
-static struct cpu_table cpu_ids[] __initdata = {
-        {
-                .idcode         = S5P6440_CPU_ID,
-                .idmask         = S5P64XX_CPU_MASK,
-                .map_io         = s5p6440_map_io,
-                .init_clocks    = s5p6440_init_clocks,
-                .init_uarts     = s5p6440_init_uarts,
-                .init           = s5p64x0_init,
-                .name           = name_s5p6440,
-        }, {
-                .idcode         = S5P6450_CPU_ID,
-                .idmask         = S5P64XX_CPU_MASK,
-                .map_io         = s5p6450_map_io,
-                .init_clocks    = s5p6450_init_clocks,
-                .init_uarts     = s5p6450_init_uarts,
-                .init           = s5p64x0_init,
-                .name           = name_s5p6450,
-        },
-};
-
-/* Initial IO mappings */
-
-static struct map_desc s5p64x0_iodesc[] __initdata = {
-        {
-                .virtual        = (unsigned long)S5P_VA_CHIPID,
-                .pfn            = __phys_to_pfn(S5P64X0_PA_CHIPID),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_SYS,
-                .pfn            = __phys_to_pfn(S5P64X0_PA_SYSCON),
-                .length         = SZ_64K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_TIMER,
-                .pfn            = __phys_to_pfn(S5P64X0_PA_TIMER),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_WATCHDOG,
-                .pfn            = __phys_to_pfn(S5P64X0_PA_WDT),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_SROMC,
-                .pfn            = __phys_to_pfn(S5P64X0_PA_SROMC),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_GPIO,
-                .pfn            = __phys_to_pfn(S5P64X0_PA_GPIO),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC0,
-                .pfn            = __phys_to_pfn(S5P64X0_PA_VIC0),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC1,
-                .pfn            = __phys_to_pfn(S5P64X0_PA_VIC1),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        },
-};
-
-static struct map_desc s5p6440_iodesc[] __initdata = {
-        {
-                .virtual        = (unsigned long)S3C_VA_UART,
-                .pfn            = __phys_to_pfn(S5P6440_PA_UART(0)),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        },
-};
-
-static struct map_desc s5p6450_iodesc[] __initdata = {
-        {
-                .virtual        = (unsigned long)S3C_VA_UART,
-                .pfn            = __phys_to_pfn(S5P6450_PA_UART(0)),
-                .length         = SZ_512K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_UART + SZ_512K,
-                .pfn            = __phys_to_pfn(S5P6450_PA_UART(5)),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        },
-};
-
-static void s5p64x0_idle(void)
-{
-        unsigned long val;
-
-        val = __raw_readl(S5P64X0_PWR_CFG);
-        val &= ~(0x3 << 5);
-        val |= (0x1 << 5);
-        __raw_writel(val, S5P64X0_PWR_CFG);
-
-        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
- *
- * register the standard CPU IO areas
- */
-
-void __init s5p64x0_init_io(struct map_desc *mach_desc, int size)
-{
-        /* initialize the io descriptors we need for initialization */
-        iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
-        if (mach_desc)
-                iotable_init(mach_desc, size);
-
-        /* detect cpu id and rev. */
-        s5p_init_cpu(S5P64X0_SYS_ID);
-
-        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);
-}
-
-#ifdef CONFIG_CPU_S5P6440
-void __init s5p6440_map_io(void)
-{
-        /* initialize any device information early */
-        s3c_adc_setname("s3c64xx-adc");
-        s3c_fb_setname("s5p64x0-fb");
-        s3c64xx_spi_setname("s5p64x0-spi");
-
-        s5p64x0_default_sdhci0();
-        s5p64x0_default_sdhci1();
-        s5p6440_default_sdhci2();
-
-        iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));
-}
-#endif
-
-#ifdef CONFIG_CPU_S5P6450
-void __init s5p6450_map_io(void)
-{
-        /* initialize any device information early */
-        s3c_adc_setname("s3c64xx-adc");
-        s3c_fb_setname("s5p64x0-fb");
-        s3c64xx_spi_setname("s5p64x0-spi");
-
-        s5p64x0_default_sdhci0();
-        s5p64x0_default_sdhci1();
-        s5p6450_default_sdhci2();
-
-        iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));
-}
-#endif
-
-/*
- * s5p64x0_init_clocks
- *
- * register and setup the CPU clocks
- */
-#ifdef CONFIG_CPU_S5P6440
-void __init s5p6440_init_clocks(int xtal)
-{
-        printk(KERN_DEBUG "%s: initializing clocks\n", __func__);
-
-        s3c24xx_register_baseclocks(xtal);
-        s5p_register_clocks(xtal);
-        s5p6440_register_clocks();
-        s5p6440_setup_clocks();
-}
-#endif
-
-#ifdef CONFIG_CPU_S5P6450
-void __init s5p6450_init_clocks(int xtal)
-{
-        printk(KERN_DEBUG "%s: initializing clocks\n", __func__);
-
-        s3c24xx_register_baseclocks(xtal);
-        s5p_register_clocks(xtal);
-        s5p6450_register_clocks();
-        s5p6450_setup_clocks();
-}
-#endif
-
-/*
- * s5p64x0_init_irq
- *
- * register the CPU interrupts
- */
-#ifdef CONFIG_CPU_S5P6440
-void __init s5p6440_init_irq(void)
-{
-        /* S5P6440 supports 2 VIC */
-        u32 vic[2];
-
-        /*
-         * VIC0 is missing IRQ_VIC0[3, 4, 8, 10, (12-22)]
-         * VIC1 is missing IRQ VIC1[1, 3, 4, 10, 11, 12, 14, 15, 22]
-         */
-        vic[0] = 0xff800ae7;
-        vic[1] = 0xffbf23e5;
-
-        s5p_init_irq(vic, ARRAY_SIZE(vic));
-}
-#endif
-
-#ifdef CONFIG_CPU_S5P6450
-void __init s5p6450_init_irq(void)
-{
-        /* S5P6450 supports only 2 VIC */
-        u32 vic[2];
-
-        /*
-         * VIC0 is missing IRQ_VIC0[(13-15), (21-22)]
-         * VIC1 is missing IRQ VIC1[12, 14, 23]
-         */
-        vic[0] = 0xff9f1fff;
-        vic[1] = 0xff7fafff;
-
-        s5p_init_irq(vic, ARRAY_SIZE(vic));
-}
-#endif
-
-struct bus_type s5p64x0_subsys = {
-        .name           = "s5p64x0-core",
-        .dev_name       = "s5p64x0-core",
-};
-
-static struct device s5p64x0_dev = {
-        .bus    = &s5p64x0_subsys,
-};
-
-static int __init s5p64x0_core_init(void)
-{
-        return subsys_system_register(&s5p64x0_subsys, NULL);
-}
-core_initcall(s5p64x0_core_init);
-
-int __init s5p64x0_init(void)
-{
-        printk(KERN_INFO "S5P64X0(S5P6440/S5P6450): Initializing architecture\n");
-
-        /* set idle function */
-        arm_pm_idle = s5p64x0_idle;
-
-        return device_register(&s5p64x0_dev);
-}
-
-/* uart registration process */
-#ifdef CONFIG_CPU_S5P6440
-void __init s5p6440_init_uarts(struct s3c2410_uartcfg *cfg, int no)
-{
-        int uart;
-
-        for (uart = 0; uart < no; uart++) {
-                s5p_uart_resources[uart].resources->start = S5P6440_PA_UART(uart);
-                s5p_uart_resources[uart].resources->end = S5P6440_PA_UART(uart) + S5P_SZ_UART;
-        }
-
-        s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
-}
-#endif
-
-#ifdef CONFIG_CPU_S5P6450
-void __init s5p6450_init_uarts(struct s3c2410_uartcfg *cfg, int no)
-{
-        s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
-}
-#endif
-
-#define eint_offset(irq)        ((irq) - IRQ_EINT(0))
-
-static int s5p64x0_irq_eint_set_type(struct irq_data *data, unsigned int type)
-{
-        int offs = eint_offset(data->irq);
-        int shift;
-        u32 ctrl, mask;
-        u32 newvalue = 0;
-
-        if (offs > 15)
-                return -EINVAL;
-
-        switch (type) {
-        case IRQ_TYPE_NONE:
-                printk(KERN_WARNING "No edge setting!\n");
-                break;
-        case IRQ_TYPE_EDGE_RISING:
-                newvalue = S3C2410_EXTINT_RISEEDGE;
-                break;
-        case IRQ_TYPE_EDGE_FALLING:
-                newvalue = S3C2410_EXTINT_FALLEDGE;
-                break;
-        case IRQ_TYPE_EDGE_BOTH:
-                newvalue = S3C2410_EXTINT_BOTHEDGE;
-                break;
-        case IRQ_TYPE_LEVEL_LOW:
-                newvalue = S3C2410_EXTINT_LOWLEV;
-                break;
-        case IRQ_TYPE_LEVEL_HIGH:
-                newvalue = S3C2410_EXTINT_HILEV;
-                break;
-        default:
-                printk(KERN_ERR "No such irq type %d", type);
-                return -EINVAL;
-        }
-
-        shift = (offs / 2) * 4;
-        mask = 0x7 << shift;
-
-        ctrl = __raw_readl(S5P64X0_EINT0CON0) & ~mask;
-        ctrl |= newvalue << shift;
-        __raw_writel(ctrl, S5P64X0_EINT0CON0);
-
-        /* Configure the GPIO pin for 6450 or 6440 based on CPU ID */
-        if (soc_is_s5p6450())
-                s3c_gpio_cfgpin(S5P6450_GPN(offs), S3C_GPIO_SFN(2));
-        else
-                s3c_gpio_cfgpin(S5P6440_GPN(offs), S3C_GPIO_SFN(2));
-
-        return 0;
-}
-
-/*
- * s5p64x0_irq_demux_eint
- *
- * This function demuxes the IRQ from the group0 external interrupts,
- * from IRQ_EINT(0) to IRQ_EINT(15). It is designed to be inlined into
- * the specific handlers s5p64x0_irq_demux_eintX_Y.
- */
-static inline void s5p64x0_irq_demux_eint(unsigned int start, unsigned int end)
-{
-        u32 status = __raw_readl(S5P64X0_EINT0PEND);
-        u32 mask = __raw_readl(S5P64X0_EINT0MASK);
-        unsigned int irq;
-
-        status &= ~mask;
-        status >>= start;
-        status &= (1 << (end - start + 1)) - 1;
-
-        for (irq = IRQ_EINT(start); irq <= IRQ_EINT(end); irq++) {
-                if (status & 1)
-                        generic_handle_irq(irq);
-                status >>= 1;
-        }
-}
-
-static void s5p64x0_irq_demux_eint0_3(unsigned int irq, struct irq_desc *desc)
-{
-        s5p64x0_irq_demux_eint(0, 3);
-}
-
-static void s5p64x0_irq_demux_eint4_11(unsigned int irq, struct irq_desc *desc)
-{
-        s5p64x0_irq_demux_eint(4, 11);
-}
-
-static void s5p64x0_irq_demux_eint12_15(unsigned int irq,
-                                        struct irq_desc *desc)
-{
-        s5p64x0_irq_demux_eint(12, 15);
-}
-
-static int s5p64x0_alloc_gc(void)
-{
-        struct irq_chip_generic *gc;
-        struct irq_chip_type *ct;
-
-        gc = irq_alloc_generic_chip("s5p64x0-eint", 1, S5P_IRQ_EINT_BASE,
-                                    S5P_VA_GPIO, handle_level_irq);
-        if (!gc) {
-                printk(KERN_ERR "%s: irq_alloc_generic_chip for group 0"
-                        "external interrupts failed\n", __func__);
-                return -EINVAL;
-        }
-
-        ct = gc->chip_types;
-        ct->chip.irq_ack = irq_gc_ack_set_bit;
-        ct->chip.irq_mask = irq_gc_mask_set_bit;
-        ct->chip.irq_unmask = irq_gc_mask_clr_bit;
-        ct->chip.irq_set_type = s5p64x0_irq_eint_set_type;
-        ct->chip.irq_set_wake = s3c_irqext_wake;
-        ct->regs.ack = EINT0PEND_OFFSET;
-        ct->regs.mask = EINT0MASK_OFFSET;
-        irq_setup_generic_chip(gc, IRQ_MSK(16), IRQ_GC_INIT_MASK_CACHE,
-                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
-        return 0;
-}
-
-static int __init s5p64x0_init_irq_eint(void)
-{
-        int ret = s5p64x0_alloc_gc();
-        irq_set_chained_handler(IRQ_EINT0_3, s5p64x0_irq_demux_eint0_3);
-        irq_set_chained_handler(IRQ_EINT4_11, s5p64x0_irq_demux_eint4_11);
-        irq_set_chained_handler(IRQ_EINT12_15, s5p64x0_irq_demux_eint12_15);
-
-        return ret;
-}
-arch_initcall(s5p64x0_init_irq_eint);
-
-void s5p64x0_restart(enum reboot_mode mode, const char *cmd)
-{
-        if (mode != REBOOT_SOFT)
-                samsung_wdt_reset();
-
-        soft_restart(0);
-}
diff --git a/arch/arm/mach-s5p64x0/common.h b/arch/arm/mach-s5p64x0/common.h
deleted file mode 100644
index cbe7f3d731d0..000000000000
--- a/arch/arm/mach-s5p64x0/common.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Common Header for S5P64X0 machines
- *
- * 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_S5P64X0_COMMON_H
-#define __ARCH_ARM_MACH_S5P64X0_COMMON_H
-
-#include <linux/reboot.h>
-
-void s5p6440_init_irq(void);
-void s5p6450_init_irq(void);
-void s5p64x0_init_io(struct map_desc *mach_desc, int size);
-
-void s5p6440_register_clocks(void);
-void s5p6440_setup_clocks(void);
-
-void s5p6450_register_clocks(void);
-void s5p6450_setup_clocks(void);
-
-void s5p64x0_restart(enum reboot_mode mode, const char *cmd);
-extern  int s5p64x0_init(void);
-
-#ifdef CONFIG_CPU_S5P6440
-
-extern void s5p6440_map_io(void);
-extern void s5p6440_init_clocks(int xtal);
-
-extern void s5p6440_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
-#else
-#define s5p6440_init_clocks NULL
-#define s5p6440_init_uarts NULL
-#define s5p6440_map_io NULL
-#endif
-
-#ifdef CONFIG_CPU_S5P6450
-
-extern void s5p6450_map_io(void);
-extern void s5p6450_init_clocks(int xtal);
-
-extern void s5p6450_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
-#else
-#define s5p6450_init_clocks NULL
-#define s5p6450_init_uarts NULL
-#define s5p6450_map_io NULL
-#endif
-
-#endif /* __ARCH_ARM_MACH_S5P64X0_COMMON_H */
diff --git a/arch/arm/mach-s5p64x0/dev-audio.c b/arch/arm/mach-s5p64x0/dev-audio.c
deleted file mode 100644
index 723d4773c323..000000000000
--- a/arch/arm/mach-s5p64x0/dev-audio.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/dev-audio.c
- *
- * Copyright (c) 2010 Samsung Electronics Co. Ltd
- *      Jaswinder Singh <jassi.brar@samsung.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/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <plat/gpio-cfg.h>
-#include <linux/platform_data/asoc-s3c.h>
-
-#include <mach/map.h>
-#include <mach/dma.h>
-#include <mach/irqs.h>
-
-static int s5p6440_cfg_i2s(struct platform_device *pdev)
-{
-        switch (pdev->id) {
-        case 0:
-                s3c_gpio_cfgpin_range(S5P6440_GPC(4), 2, S3C_GPIO_SFN(5));
-                s3c_gpio_cfgpin(S5P6440_GPC(7), S3C_GPIO_SFN(5));
-                s3c_gpio_cfgpin_range(S5P6440_GPH(6), 4, S3C_GPIO_SFN(5));
-                break;
-        default:
-                printk(KERN_ERR "Invalid Device %d\n", pdev->id);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct s3c_audio_pdata s5p6440_i2s_pdata = {
-        .cfg_gpio = s5p6440_cfg_i2s,
-        .type = {
-                .i2s = {
-                        .quirks = QUIRK_PRI_6CHAN,
-                },
-        },
-};
-
-static struct resource s5p64x0_i2s0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P64X0_PA_I2S, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_I2S0_TX),
-        [2] = DEFINE_RES_DMA(DMACH_I2S0_RX),
-};
-
-struct platform_device s5p6440_device_iis = {
-        .name           = "samsung-i2s",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(s5p64x0_i2s0_resource),
-        .resource       = s5p64x0_i2s0_resource,
-        .dev = {
-                .platform_data = &s5p6440_i2s_pdata,
-        },
-};
-
-static int s5p6450_cfg_i2s(struct platform_device *pdev)
-{
-        switch (pdev->id) {
-        case 0:
-                s3c_gpio_cfgpin_range(S5P6450_GPR(4), 5, S3C_GPIO_SFN(5));
-                s3c_gpio_cfgpin_range(S5P6450_GPR(13), 2, S3C_GPIO_SFN(5));
-                break;
-        case 1:
-                s3c_gpio_cfgpin(S5P6440_GPB(4), S3C_GPIO_SFN(5));
-                s3c_gpio_cfgpin_range(S5P6450_GPC(0), 4, S3C_GPIO_SFN(5));
-                break;
-        case 2:
-                s3c_gpio_cfgpin_range(S5P6450_GPK(0), 5, S3C_GPIO_SFN(5));
-                break;
-        default:
-                printk(KERN_ERR "Invalid Device %d\n", pdev->id);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct s3c_audio_pdata s5p6450_i2s0_pdata = {
-        .cfg_gpio = s5p6450_cfg_i2s,
-        .type = {
-                .i2s = {
-                        .quirks = QUIRK_PRI_6CHAN,
-                },
-        },
-};
-
-struct platform_device s5p6450_device_iis0 = {
-        .name           = "samsung-i2s",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(s5p64x0_i2s0_resource),
-        .resource       = s5p64x0_i2s0_resource,
-        .dev = {
-                .platform_data = &s5p6450_i2s0_pdata,
-        },
-};
-
-static struct s3c_audio_pdata s5p6450_i2s_pdata = {
-        .cfg_gpio = s5p6450_cfg_i2s,
-};
-
-static struct resource s5p6450_i2s1_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P6450_PA_I2S1, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_I2S1_TX),
-        [2] = DEFINE_RES_DMA(DMACH_I2S1_RX),
-};
-
-struct platform_device s5p6450_device_iis1 = {
-        .name           = "samsung-i2s",
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(s5p6450_i2s1_resource),
-        .resource       = s5p6450_i2s1_resource,
-        .dev = {
-                .platform_data = &s5p6450_i2s_pdata,
-        },
-};
-
-static struct resource s5p6450_i2s2_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P6450_PA_I2S2, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_I2S2_TX),
-        [2] = DEFINE_RES_DMA(DMACH_I2S2_RX),
-};
-
-struct platform_device s5p6450_device_iis2 = {
-        .name           = "samsung-i2s",
-        .id             = 2,
-        .num_resources  = ARRAY_SIZE(s5p6450_i2s2_resource),
-        .resource       = s5p6450_i2s2_resource,
-        .dev = {
-                .platform_data = &s5p6450_i2s_pdata,
-        },
-};
-
-/* PCM Controller platform_devices */
-
-static int s5p6440_pcm_cfg_gpio(struct platform_device *pdev)
-{
-        switch (pdev->id) {
-        case 0:
-                s3c_gpio_cfgpin_range(S5P6440_GPR(6), 3, S3C_GPIO_SFN(2));
-                s3c_gpio_cfgpin_range(S5P6440_GPR(13), 2, S3C_GPIO_SFN(2));
-                break;
-
-        default:
-                printk(KERN_DEBUG "Invalid PCM Controller number!");
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct s3c_audio_pdata s5p6440_pcm_pdata = {
-        .cfg_gpio = s5p6440_pcm_cfg_gpio,
-};
-
-static struct resource s5p6440_pcm0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P64X0_PA_PCM, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_PCM0_TX),
-        [2] = DEFINE_RES_DMA(DMACH_PCM0_RX),
-};
-
-struct platform_device s5p6440_device_pcm = {
-        .name           = "samsung-pcm",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(s5p6440_pcm0_resource),
-        .resource       = s5p6440_pcm0_resource,
-        .dev = {
-                .platform_data = &s5p6440_pcm_pdata,
-        },
-};
diff --git a/arch/arm/mach-s5p64x0/dma.c b/arch/arm/mach-s5p64x0/dma.c
deleted file mode 100644
index 9c4ce085f585..000000000000
--- a/arch/arm/mach-s5p64x0/dma.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/dma.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/dma-mapping.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/pl330.h>
-
-#include <asm/irq.h>
-
-#include <mach/map.h>
-#include <mach/irqs.h>
-#include <mach/regs-clock.h>
-#include <mach/dma.h>
-
-#include <plat/cpu.h>
-#include <plat/devs.h>
-#include <plat/irqs.h>
-
-static u8 s5p6440_pdma_peri[] = {
-        DMACH_UART0_RX,
-        DMACH_UART0_TX,
-        DMACH_UART1_RX,
-        DMACH_UART1_TX,
-        DMACH_UART2_RX,
-        DMACH_UART2_TX,
-        DMACH_UART3_RX,
-        DMACH_UART3_TX,
-        DMACH_MAX,
-        DMACH_MAX,
-        DMACH_PCM0_TX,
-        DMACH_PCM0_RX,
-        DMACH_I2S0_TX,
-        DMACH_I2S0_RX,
-        DMACH_SPI0_TX,
-        DMACH_SPI0_RX,
-        DMACH_MAX,
-        DMACH_MAX,
-        DMACH_MAX,
-        DMACH_MAX,
-        DMACH_SPI1_TX,
-        DMACH_SPI1_RX,
-};
-
-static struct dma_pl330_platdata s5p6440_pdma_pdata = {
-        .nr_valid_peri = ARRAY_SIZE(s5p6440_pdma_peri),
-        .peri_id = s5p6440_pdma_peri,
-};
-
-static u8 s5p6450_pdma_peri[] = {
-        DMACH_UART0_RX,
-        DMACH_UART0_TX,
-        DMACH_UART1_RX,
-        DMACH_UART1_TX,
-        DMACH_UART2_RX,
-        DMACH_UART2_TX,
-        DMACH_UART3_RX,
-        DMACH_UART3_TX,
-        DMACH_UART4_RX,
-        DMACH_UART4_TX,
-        DMACH_PCM0_TX,
-        DMACH_PCM0_RX,
-        DMACH_I2S0_TX,
-        DMACH_I2S0_RX,
-        DMACH_SPI0_TX,
-        DMACH_SPI0_RX,
-        DMACH_PCM1_TX,
-        DMACH_PCM1_RX,
-        DMACH_PCM2_TX,
-        DMACH_PCM2_RX,
-        DMACH_SPI1_TX,
-        DMACH_SPI1_RX,
-        DMACH_USI_TX,
-        DMACH_USI_RX,
-        DMACH_MAX,
-        DMACH_I2S1_TX,
-        DMACH_I2S1_RX,
-        DMACH_I2S2_TX,
-        DMACH_I2S2_RX,
-        DMACH_PWM,
-        DMACH_UART5_RX,
-        DMACH_UART5_TX,
-};
-
-static struct dma_pl330_platdata s5p6450_pdma_pdata = {
-        .nr_valid_peri = ARRAY_SIZE(s5p6450_pdma_peri),
-        .peri_id = s5p6450_pdma_peri,
-};
-
-static AMBA_AHB_DEVICE(s5p64x0_pdma, "dma-pl330", 0x00041330,
-        S5P64X0_PA_PDMA, {IRQ_DMA0}, NULL);
-
-static int __init s5p64x0_dma_init(void)
-{
-        if (soc_is_s5p6450()) {
-                dma_cap_set(DMA_SLAVE, s5p6450_pdma_pdata.cap_mask);
-                dma_cap_set(DMA_CYCLIC, s5p6450_pdma_pdata.cap_mask);
-                s5p64x0_pdma_device.dev.platform_data = &s5p6450_pdma_pdata;
-        } else {
-                dma_cap_set(DMA_SLAVE, s5p6440_pdma_pdata.cap_mask);
-                dma_cap_set(DMA_CYCLIC, s5p6440_pdma_pdata.cap_mask);
-                s5p64x0_pdma_device.dev.platform_data = &s5p6440_pdma_pdata;
-        }
-
-        amba_device_register(&s5p64x0_pdma_device, &iomem_resource);
-
-        return 0;
-}
-arch_initcall(s5p64x0_dma_init);
diff --git a/arch/arm/mach-s5p64x0/i2c.h b/arch/arm/mach-s5p64x0/i2c.h
deleted file mode 100644
index 1e5bb4ea200d..000000000000
--- a/arch/arm/mach-s5p64x0/i2c.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 I2C configuration
- *
- * 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 s5p6440_i2c0_cfg_gpio(struct platform_device *dev);
-extern void s5p6440_i2c1_cfg_gpio(struct platform_device *dev);
-
-extern void s5p6450_i2c0_cfg_gpio(struct platform_device *dev);
-extern void s5p6450_i2c1_cfg_gpio(struct platform_device *dev);
diff --git a/arch/arm/mach-s5p64x0/include/mach/debug-macro.S b/arch/arm/mach-s5p64x0/include/mach/debug-macro.S
deleted file mode 100644
index 8759e7882bcb..000000000000
--- a/arch/arm/mach-s5p64x0/include/mach/debug-macro.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/debug-macro.S
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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.
-*/
-
-/* pull in the relevant register and map files. */
-
-#include <linux/serial_s3c.h>
-#include <plat/map-base.h>
-#include <plat/map-s5p.h>
-
-        .macro addruart, rp, rv, tmp
-                mov     \rp, #0xE0000000
-                orr     \rp, \rp, #0x00100000
-                ldr     \rp, [\rp, #0x118 ]
-                and     \rp, \rp, #0xff000
-                teq     \rp, #0x50000           @@ S5P6450
-                ldreq   \rp, =0xEC800000
-                movne   \rp, #0xEC000000        @@ S5P6440
-                ldrne   \rv, = S3C_VA_UART
-#if CONFIG_DEBUG_S3C_UART != 0
-                add     \rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
-                add     \rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
-#endif
-        .endm
-
-#include <debug/samsung.S>
diff --git a/arch/arm/mach-s5p64x0/include/mach/gpio.h b/arch/arm/mach-s5p64x0/include/mach/gpio.h
deleted file mode 100644
index 06cd3c9b16ac..000000000000
--- a/arch/arm/mach-s5p64x0/include/mach/gpio.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/gpio.h
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - GPIO lib 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_ARCH_GPIO_H
-#define __ASM_ARCH_GPIO_H __FILE__
-
-/* GPIO bank sizes */
-
-#define S5P6440_GPIO_A_NR       (6)
-#define S5P6440_GPIO_B_NR       (7)
-#define S5P6440_GPIO_C_NR       (8)
-#define S5P6440_GPIO_F_NR       (16)
-#define S5P6440_GPIO_G_NR       (7)
-#define S5P6440_GPIO_H_NR       (10)
-#define S5P6440_GPIO_I_NR       (16)
-#define S5P6440_GPIO_J_NR       (12)
-#define S5P6440_GPIO_N_NR       (16)
-#define S5P6440_GPIO_P_NR       (8)
-#define S5P6440_GPIO_R_NR       (15)
-
-#define S5P6450_GPIO_A_NR       (6)
-#define S5P6450_GPIO_B_NR       (7)
-#define S5P6450_GPIO_C_NR       (8)
-#define S5P6450_GPIO_D_NR       (8)
-#define S5P6450_GPIO_F_NR       (16)
-#define S5P6450_GPIO_G_NR       (14)
-#define S5P6450_GPIO_H_NR       (10)
-#define S5P6450_GPIO_I_NR       (16)
-#define S5P6450_GPIO_J_NR       (12)
-#define S5P6450_GPIO_K_NR       (5)
-#define S5P6450_GPIO_N_NR       (16)
-#define S5P6450_GPIO_P_NR       (11)
-#define S5P6450_GPIO_Q_NR       (14)
-#define S5P6450_GPIO_R_NR       (15)
-#define S5P6450_GPIO_S_NR       (8)
-
-/* GPIO bank numbers */
-
-/* CONFIG_S3C_GPIO_SPACE allows the user to select extra
- * space for debugging purposes so that any accidental
- * change from one gpio bank to another can be caught.
-*/
-
-#define S5P64X0_GPIO_NEXT(__gpio) \
-        ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1)
-
-enum s5p6440_gpio_number {
-        S5P6440_GPIO_A_START    = 0,
-        S5P6440_GPIO_B_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_A),
-        S5P6440_GPIO_C_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_B),
-        S5P6440_GPIO_F_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_C),
-        S5P6440_GPIO_G_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_F),
-        S5P6440_GPIO_H_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_G),
-        S5P6440_GPIO_I_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_H),
-        S5P6440_GPIO_J_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_I),
-        S5P6440_GPIO_N_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_J),
-        S5P6440_GPIO_P_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_N),
-        S5P6440_GPIO_R_START    = S5P64X0_GPIO_NEXT(S5P6440_GPIO_P),
-};
-
-enum s5p6450_gpio_number {
-        S5P6450_GPIO_A_START    = 0,
-        S5P6450_GPIO_B_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_A),
-        S5P6450_GPIO_C_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_B),
-        S5P6450_GPIO_D_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_C),
-        S5P6450_GPIO_F_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_D),
-        S5P6450_GPIO_G_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_F),
-        S5P6450_GPIO_H_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_G),
-        S5P6450_GPIO_I_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_H),
-        S5P6450_GPIO_J_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_I),
-        S5P6450_GPIO_K_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_J),
-        S5P6450_GPIO_N_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_K),
-        S5P6450_GPIO_P_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_N),
-        S5P6450_GPIO_Q_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_P),
-        S5P6450_GPIO_R_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_Q),
-        S5P6450_GPIO_S_START    = S5P64X0_GPIO_NEXT(S5P6450_GPIO_R),
-};
-
-/* GPIO number definitions */
-
-#define S5P6440_GPA(_nr)        (S5P6440_GPIO_A_START + (_nr))
-#define S5P6440_GPB(_nr)        (S5P6440_GPIO_B_START + (_nr))
-#define S5P6440_GPC(_nr)        (S5P6440_GPIO_C_START + (_nr))
-#define S5P6440_GPF(_nr)        (S5P6440_GPIO_F_START + (_nr))
-#define S5P6440_GPG(_nr)        (S5P6440_GPIO_G_START + (_nr))
-#define S5P6440_GPH(_nr)        (S5P6440_GPIO_H_START + (_nr))
-#define S5P6440_GPI(_nr)        (S5P6440_GPIO_I_START + (_nr))
-#define S5P6440_GPJ(_nr)        (S5P6440_GPIO_J_START + (_nr))
-#define S5P6440_GPN(_nr)        (S5P6440_GPIO_N_START + (_nr))
-#define S5P6440_GPP(_nr)        (S5P6440_GPIO_P_START + (_nr))
-#define S5P6440_GPR(_nr)        (S5P6440_GPIO_R_START + (_nr))
-
-#define S5P6450_GPA(_nr)        (S5P6450_GPIO_A_START + (_nr))
-#define S5P6450_GPB(_nr)        (S5P6450_GPIO_B_START + (_nr))
-#define S5P6450_GPC(_nr)        (S5P6450_GPIO_C_START + (_nr))
-#define S5P6450_GPD(_nr)        (S5P6450_GPIO_D_START + (_nr))
-#define S5P6450_GPF(_nr)        (S5P6450_GPIO_F_START + (_nr))
-#define S5P6450_GPG(_nr)        (S5P6450_GPIO_G_START + (_nr))
-#define S5P6450_GPH(_nr)        (S5P6450_GPIO_H_START + (_nr))
-#define S5P6450_GPI(_nr)        (S5P6450_GPIO_I_START + (_nr))
-#define S5P6450_GPJ(_nr)        (S5P6450_GPIO_J_START + (_nr))
-#define S5P6450_GPK(_nr)        (S5P6450_GPIO_K_START + (_nr))
-#define S5P6450_GPN(_nr)        (S5P6450_GPIO_N_START + (_nr))
-#define S5P6450_GPP(_nr)        (S5P6450_GPIO_P_START + (_nr))
-#define S5P6450_GPQ(_nr)        (S5P6450_GPIO_Q_START + (_nr))
-#define S5P6450_GPR(_nr)        (S5P6450_GPIO_R_START + (_nr))
-#define S5P6450_GPS(_nr)        (S5P6450_GPIO_S_START + (_nr))
-
-/* the end of the S5P64X0 specific gpios */
-
-#define S5P6440_GPIO_END        (S5P6440_GPR(S5P6440_GPIO_R_NR) + 1)
-#define S5P6450_GPIO_END        (S5P6450_GPS(S5P6450_GPIO_S_NR) + 1)
-
-#define S5P64X0_GPIO_END        (S5P6440_GPIO_END > S5P6450_GPIO_END ?  \
-                                 S5P6440_GPIO_END : S5P6450_GPIO_END)
-
-#define S3C_GPIO_END            S5P64X0_GPIO_END
-
-/* define the number of gpios we need to the one after the last GPIO range */
-
-#define ARCH_NR_GPIOS           (S5P64X0_GPIO_END + CONFIG_SAMSUNG_GPIO_EXTRA)
-
-#endif /* __ASM_ARCH_GPIO_H */
diff --git a/arch/arm/mach-s5p64x0/include/mach/hardware.h b/arch/arm/mach-s5p64x0/include/mach/hardware.h
deleted file mode 100644
index d3e87996dd9a..000000000000
--- a/arch/arm/mach-s5p64x0/include/mach/hardware.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/hardware.h
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - Hardware 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_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H __FILE__
-
-/* currently nothing here, placeholder */
-
-#endif /* __ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-s5p64x0/include/mach/irqs.h b/arch/arm/mach-s5p64x0/include/mach/irqs.h
deleted file mode 100644
index 53982db9d259..000000000000
--- a/arch/arm/mach-s5p64x0/include/mach/irqs.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/irqs.h
- *
- * Copyright 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - IRQ definitions
- *
- * 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_IRQS_H
-#define __ASM_ARCH_IRQS_H __FILE__
-
-#include <plat/irqs.h>
-
-/* VIC0 */
-
-#define IRQ_EINT0_3             S5P_IRQ_VIC0(0)
-#define IRQ_EINT4_11            S5P_IRQ_VIC0(1)
-#define IRQ_RTC_TIC             S5P_IRQ_VIC0(2)
-#define IRQ_IIS1                S5P_IRQ_VIC0(3) /* for only S5P6450 */
-#define IRQ_IIS2                S5P_IRQ_VIC0(4) /* for only S5P6450 */
-#define IRQ_IIC1                S5P_IRQ_VIC0(5)
-#define IRQ_I2SV40              S5P_IRQ_VIC0(6)
-#define IRQ_GPS                 S5P_IRQ_VIC0(7) /* for only S5P6450 */
-
-#define IRQ_2D                  S5P_IRQ_VIC0(11)
-#define IRQ_TIMER0_VIC          S5P_IRQ_VIC0(23)
-#define IRQ_TIMER1_VIC          S5P_IRQ_VIC0(24)
-#define IRQ_TIMER2_VIC          S5P_IRQ_VIC0(25)
-#define IRQ_WDT                 S5P_IRQ_VIC0(26)
-#define IRQ_TIMER3_VIC          S5P_IRQ_VIC0(27)
-#define IRQ_TIMER4_VIC          S5P_IRQ_VIC0(28)
-#define IRQ_DISPCON0            S5P_IRQ_VIC0(29)
-#define IRQ_DISPCON1            S5P_IRQ_VIC0(30)
-#define IRQ_DISPCON2            S5P_IRQ_VIC0(31)
-
-/* VIC1 */
-
-#define IRQ_EINT12_15           S5P_IRQ_VIC1(0)
-#define IRQ_PCM0                S5P_IRQ_VIC1(2)
-#define IRQ_PCM1                S5P_IRQ_VIC1(3) /* for only S5P6450 */
-#define IRQ_PCM2                S5P_IRQ_VIC1(4) /* for only S5P6450 */
-#define IRQ_UART0               S5P_IRQ_VIC1(5)
-#define IRQ_UART1               S5P_IRQ_VIC1(6)
-#define IRQ_UART2               S5P_IRQ_VIC1(7)
-#define IRQ_UART3               S5P_IRQ_VIC1(8)
-#define IRQ_DMA0                S5P_IRQ_VIC1(9)
-#define IRQ_UART4               S5P_IRQ_VIC1(10)        /* S5P6450 */
-#define IRQ_UART5               S5P_IRQ_VIC1(11)        /* S5P6450 */
-#define IRQ_NFC                 S5P_IRQ_VIC1(13)
-#define IRQ_USI                 S5P_IRQ_VIC1(15)        /* S5P6450 */
-#define IRQ_SPI0                S5P_IRQ_VIC1(16)
-#define IRQ_SPI1                S5P_IRQ_VIC1(17)
-#define IRQ_HSMMC2              S5P_IRQ_VIC1(17)        /* Shared */
-#define IRQ_IIC                 S5P_IRQ_VIC1(18)
-#define IRQ_DISPCON3            S5P_IRQ_VIC1(19)
-#define IRQ_EINT_GROUPS         S5P_IRQ_VIC1(21)
-#define IRQ_PMU                 S5P_IRQ_VIC1(23)        /* S5P6440 */
-#define IRQ_HSMMC0              S5P_IRQ_VIC1(24)
-#define IRQ_HSMMC1              S5P_IRQ_VIC1(25)
-#define IRQ_OTG                 S5P_IRQ_VIC1(26)
-#define IRQ_DSI                 S5P_IRQ_VIC1(27)
-#define IRQ_RTC_ALARM           S5P_IRQ_VIC1(28)
-#define IRQ_TSI                 S5P_IRQ_VIC1(29)
-#define IRQ_PENDN               S5P_IRQ_VIC1(30)
-#define IRQ_TC                  IRQ_PENDN
-#define IRQ_ADC                 S5P_IRQ_VIC1(31)
-
-/* UART interrupts, S5P6450 has 5 UARTs */
-#define IRQ_S5P_UART_BASE4      (96)
-#define IRQ_S5P_UART_BASE5      (100)
-
-#define IRQ_S5P_UART_RX4        (IRQ_S5P_UART_BASE4 + UART_IRQ_RXD)
-#define IRQ_S5P_UART_TX4        (IRQ_S5P_UART_BASE4 + UART_IRQ_TXD)
-#define IRQ_S5P_UART_ERR4       (IRQ_S5P_UART_BASE4 + UART_IRQ_ERR)
-
-#define IRQ_S5P_UART_RX5        (IRQ_S5P_UART_BASE5 + UART_IRQ_RXD)
-#define IRQ_S5P_UART_TX5        (IRQ_S5P_UART_BASE5 + UART_IRQ_TXD)
-#define IRQ_S5P_UART_ERR5       (IRQ_S5P_UART_BASE5 + UART_IRQ_ERR)
-
-/* S3C compatibilty defines */
-#define IRQ_S3CUART_RX4         IRQ_S5P_UART_RX4
-#define IRQ_S3CUART_RX5         IRQ_S5P_UART_RX5
-
-#define IRQ_I2S0                IRQ_I2SV40
-
-#define IRQ_LCD_FIFO            IRQ_DISPCON0
-#define IRQ_LCD_VSYNC           IRQ_DISPCON1
-#define IRQ_LCD_SYSTEM          IRQ_DISPCON2
-
-/* S5P6450 EINT feature will be added */
-
-/*
- * Since the IRQ_EINT(x) are a linear mapping on s5p6440 we just defined
- * them as an IRQ_EINT(x) macro from S5P_IRQ_EINT_BASE which we place
- * after the pair of VICs.
- */
-
-#define S5P_IRQ_EINT_BASE       (S5P_IRQ_VIC1(31) + 6)
-
-#define S5P_EINT(x)             ((x) + S5P_IRQ_EINT_BASE)
-
-#define S5P_EINT_BASE1          (S5P_IRQ_EINT_BASE)
-/*
- * S5P6440 has 0-15 external interrupts in group 0. Only these can be used
- * to wake up from sleep. If request is beyond this range, by mistake, a large
- * return value for an irq number should be indication of something amiss.
- */
-#define S5P_EINT_BASE2          (0xf0000000)
-
-/*
- * Next the external interrupt groups. These are similar to the IRQ_EINT(x)
- * that they are sourced from the GPIO pins but with a different scheme for
- * priority and source indication.
- *
- * The IRQ_EINT(x) can be thought of as 'group 0' of the available GPIO
- * interrupts, but for historical reasons they are kept apart from these
- * next interrupts.
- *
- * Use IRQ_EINT_GROUP(group, offset) to get the number for use in the
- * machine specific support files.
- */
-
-/* Actually, #6 and #7 are missing in the EINT_GROUP1 */
-#define IRQ_EINT_GROUP1_NR      (15)
-#define IRQ_EINT_GROUP2_NR      (8)
-#define IRQ_EINT_GROUP5_NR      (7)
-#define IRQ_EINT_GROUP6_NR      (10)
-/* Actually, #0, #1 and #2 are missing in the EINT_GROUP8 */
-#define IRQ_EINT_GROUP8_NR      (11)
-
-#define IRQ_EINT_GROUP_BASE     S5P_EINT(16)
-#define IRQ_EINT_GROUP1_BASE    (IRQ_EINT_GROUP_BASE + 0)
-#define IRQ_EINT_GROUP2_BASE    (IRQ_EINT_GROUP1_BASE + IRQ_EINT_GROUP1_NR)
-#define IRQ_EINT_GROUP5_BASE    (IRQ_EINT_GROUP2_BASE + IRQ_EINT_GROUP2_NR)
-#define IRQ_EINT_GROUP6_BASE    (IRQ_EINT_GROUP5_BASE + IRQ_EINT_GROUP5_NR)
-#define IRQ_EINT_GROUP8_BASE    (IRQ_EINT_GROUP6_BASE + IRQ_EINT_GROUP6_NR)
-
-#define IRQ_EINT_GROUP(grp, x)  (IRQ_EINT_GROUP##grp##_BASE + (x))
-
-/* Set the default NR_IRQS */
-
-#define NR_IRQS                 (IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR + 1)
-
-#endif /* __ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-s5p64x0/include/mach/map.h
deleted file mode 100644
index 50a6e96d6389..000000000000
--- a/arch/arm/mach-s5p64x0/include/mach/map.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/map.h
- *
- * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - Memory map definitions
- *
- * 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_MAP_H
-#define __ASM_ARCH_MAP_H __FILE__
-
-#include <plat/map-base.h>
-#include <plat/map-s5p.h>
-
-#define S5P64X0_PA_SDRAM        0x20000000
-
-#define S5P64X0_PA_CHIPID       0xE0000000
-
-#define S5P64X0_PA_SYSCON       0xE0100000
-
-#define S5P64X0_PA_GPIO         0xE0308000
-
-#define S5P64X0_PA_VIC0         0xE4000000
-#define S5P64X0_PA_VIC1         0xE4100000
-
-#define S5P64X0_PA_SROMC        0xE7000000
-
-#define S5P64X0_PA_PDMA         0xE9000000
-
-#define S5P64X0_PA_TIMER        0xEA000000
-#define S5P64X0_PA_RTC          0xEA100000
-#define S5P64X0_PA_WDT          0xEA200000
-
-#define S5P6440_PA_IIC0         0xEC104000
-#define S5P6440_PA_IIC1         0xEC20F000
-#define S5P6450_PA_IIC0         0xEC100000
-#define S5P6450_PA_IIC1         0xEC200000
-
-#define S5P64X0_PA_SPI0         0xEC400000
-#define S5P64X0_PA_SPI1         0xEC500000
-
-#define S5P64X0_PA_HSOTG        0xED100000
-
-#define S5P64X0_PA_HSMMC(x)     (0xED800000 + ((x) * 0x100000))
-
-#define S5P64X0_PA_FB           0xEE000000
-
-#define S5P64X0_PA_I2S          0xF2000000
-#define S5P6450_PA_I2S1         0xF2800000
-#define S5P6450_PA_I2S2         0xF2900000
-
-#define S5P64X0_PA_PCM          0xF2100000
-
-#define S5P64X0_PA_ADC          0xF3000000
-
-/* Compatibiltiy Defines */
-
-#define S3C_PA_HSMMC0           S5P64X0_PA_HSMMC(0)
-#define S3C_PA_HSMMC1           S5P64X0_PA_HSMMC(1)
-#define S3C_PA_HSMMC2           S5P64X0_PA_HSMMC(2)
-#define S3C_PA_IIC              S5P6440_PA_IIC0
-#define S3C_PA_IIC1             S5P6440_PA_IIC1
-#define S3C_PA_RTC              S5P64X0_PA_RTC
-#define S3C_PA_WDT              S5P64X0_PA_WDT
-#define S3C_PA_FB               S5P64X0_PA_FB
-#define S3C_PA_SPI0             S5P64X0_PA_SPI0
-#define S3C_PA_SPI1             S5P64X0_PA_SPI1
-
-#define S5P_PA_CHIPID           S5P64X0_PA_CHIPID
-#define S5P_PA_SROMC            S5P64X0_PA_SROMC
-#define S5P_PA_SYSCON           S5P64X0_PA_SYSCON
-#define S5P_PA_TIMER            S5P64X0_PA_TIMER
-
-#define SAMSUNG_PA_ADC          S5P64X0_PA_ADC
-#define SAMSUNG_PA_TIMER        S5P64X0_PA_TIMER
-
-/* UART */
-
-#define S5P6440_PA_UART(x)      (0xEC000000 + ((x) * S3C_UART_OFFSET))
-#define S5P6450_PA_UART(x)      ((x < 5) ? (0xEC800000 + ((x) * S3C_UART_OFFSET)) : (0xEC000000))
-
-#define S5P_PA_UART0            S5P6450_PA_UART(0)
-#define S5P_PA_UART1            S5P6450_PA_UART(1)
-#define S5P_PA_UART2            S5P6450_PA_UART(2)
-#define S5P_PA_UART3            S5P6450_PA_UART(3)
-#define S5P_PA_UART4            S5P6450_PA_UART(4)
-#define S5P_PA_UART5            S5P6450_PA_UART(5)
-
-#define S5P_SZ_UART             SZ_256
-#define S3C_VA_UARTx(x)         (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
-
-#endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-s5p64x0/include/mach/pm-core.h b/arch/arm/mach-s5p64x0/include/mach/pm-core.h
deleted file mode 100644
index 1e0eb65b2b82..000000000000
--- a/arch/arm/mach-s5p64x0/include/mach/pm-core.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/pm-core.h
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - PM core support for arch/arm/plat-samsung/pm.c
- *
- * Based on PM core support for S3C64XX 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.
- */
-
-#include <linux/serial_s3c.h>
-
-#include <mach/regs-gpio.h>
-
-static inline void s3c_pm_debug_init_uart(void)
-{
-        u32 tmp = __raw_readl(S5P64X0_CLK_GATE_PCLK);
-
-        /*
-         * As a note, since the S5P64X0 UARTs generally have multiple
-         * clock sources, we simply enable PCLK at the moment and hope
-         * that the resume settings for the UART are suitable for the
-         * use with PCLK.
-         */
-        tmp |= S5P64X0_CLK_GATE_PCLK_UART0;
-        tmp |= S5P64X0_CLK_GATE_PCLK_UART1;
-        tmp |= S5P64X0_CLK_GATE_PCLK_UART2;
-        tmp |= S5P64X0_CLK_GATE_PCLK_UART3;
-
-        __raw_writel(tmp, S5P64X0_CLK_GATE_PCLK);
-        udelay(10);
-}
-
-static inline void s3c_pm_arch_prepare_irqs(void)
-{
-        /* VIC should have already been taken care of */
-
-        /* clear any pending EINT0 interrupts */
-        __raw_writel(__raw_readl(S5P64X0_EINT0PEND), S5P64X0_EINT0PEND);
-}
-
-static inline void s3c_pm_arch_stop_clocks(void) { }
-static inline void s3c_pm_arch_show_resume_irqs(void) { }
-
-/*
- * make these defines, we currently do not have any need to change
- * the IRQ wake controls depending on the CPU we are running on
- */
-#define s3c_irqwake_eintallow   ((1 << 16) - 1)
-#define s3c_irqwake_intallow    (~0)
-
-static inline void s3c_pm_arch_update_uart(void __iomem *regs,
-                                        struct pm_uart_save *save)
-{
-        u32 ucon = __raw_readl(regs + S3C2410_UCON);
-        u32 ucon_clk = ucon & S3C6400_UCON_CLKMASK;
-        u32 save_clk = save->ucon & S3C6400_UCON_CLKMASK;
-        u32 new_ucon;
-        u32 delta;
-
-        /*
-         * S5P64X0 UART blocks only support level interrupts, so ensure that
-         * when we restore unused UART blocks we force the level interrupt
-         * settings.
-         */
-        save->ucon |= S3C2410_UCON_TXILEVEL | S3C2410_UCON_RXILEVEL;
-
-        /*
-         * We have a constraint on changing the clock type of the UART
-         * between UCLKx and PCLK, so ensure that when we restore UCON
-         * that the CLK field is correctly modified if the bootloader
-         * has changed anything.
-         */
-        if (ucon_clk != save_clk) {
-                new_ucon = save->ucon;
-                delta = ucon_clk ^ save_clk;
-
-                /*
-                 * change from UCLKx => wrong PCLK,
-                 * either UCLK can be tested for by a bit-test
-                 * with UCLK0
-                 */
-                if (ucon_clk & S3C6400_UCON_UCLK0 &&
-                !(save_clk & S3C6400_UCON_UCLK0) &&
-                delta & S3C6400_UCON_PCLK2) {
-                        new_ucon &= ~S3C6400_UCON_UCLK0;
-                } else if (delta == S3C6400_UCON_PCLK2) {
-                        /*
-                         * as a precaution, don't change from
-                         * PCLK2 => PCLK or vice-versa
-                         */
-                        new_ucon ^= S3C6400_UCON_PCLK2;
-                }
-
-                S3C_PMDBG("ucon change %04x => %04x (save=%04x)\n",
-                        ucon, new_ucon, save->ucon);
-                save->ucon = new_ucon;
-        }
-}
-
-static inline void s3c_pm_restored_gpios(void)
-{
-        /* ensure sleep mode has been cleared from the system */
-        __raw_writel(0, S5P64X0_SLPEN);
-}
-
-static inline void samsung_pm_saved_gpios(void)
-{
-        /*
-         * turn on the sleep mode and keep it there, as it seems that during
-         * suspend the xCON registers get re-set and thus you can end up with
-         * problems between going to sleep and resuming.
-         */
-        __raw_writel(S5P64X0_SLPEN_USE_xSLP, S5P64X0_SLPEN);
-}
diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-clock.h b/arch/arm/mach-s5p64x0/include/mach/regs-clock.h
deleted file mode 100644
index bd91112c813c..000000000000
--- a/arch/arm/mach-s5p64x0/include/mach/regs-clock.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/regs-clock.h
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - Clock register definitions
- *
- * 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_REGS_CLOCK_H
-#define __ASM_ARCH_REGS_CLOCK_H __FILE__
-
-#include <mach/map.h>
-
-#define S5P_CLKREG(x)                   (S3C_VA_SYS + (x))
-
-#define S5P64X0_APLL_CON                S5P_CLKREG(0x0C)
-#define S5P64X0_MPLL_CON                S5P_CLKREG(0x10)
-#define S5P64X0_EPLL_CON                S5P_CLKREG(0x14)
-#define S5P64X0_EPLL_CON_K              S5P_CLKREG(0x18)
-
-#define S5P64X0_CLK_SRC0                S5P_CLKREG(0x1C)
-
-#define S5P64X0_CLK_DIV0                S5P_CLKREG(0x20)
-#define S5P64X0_CLK_DIV1                S5P_CLKREG(0x24)
-#define S5P64X0_CLK_DIV2                S5P_CLKREG(0x28)
-
-#define S5P64X0_CLK_GATE_HCLK0          S5P_CLKREG(0x30)
-#define S5P64X0_CLK_GATE_PCLK           S5P_CLKREG(0x34)
-#define S5P64X0_CLK_GATE_SCLK0          S5P_CLKREG(0x38)
-#define S5P64X0_CLK_GATE_MEM0           S5P_CLKREG(0x3C)
-
-#define S5P64X0_CLK_DIV3                S5P_CLKREG(0x40)
-
-#define S5P64X0_CLK_GATE_HCLK1          S5P_CLKREG(0x44)
-#define S5P64X0_CLK_GATE_SCLK1          S5P_CLKREG(0x48)
-
-#define S5P6450_DPLL_CON                S5P_CLKREG(0x50)
-#define S5P6450_DPLL_CON_K              S5P_CLKREG(0x54)
-
-#define S5P64X0_AHB_CON0                S5P_CLKREG(0x100)
-#define S5P64X0_CLK_SRC1                S5P_CLKREG(0x10C)
-
-#define S5P64X0_SYS_ID                  S5P_CLKREG(0x118)
-#define S5P64X0_SYS_OTHERS              S5P_CLKREG(0x11C)
-
-#define S5P64X0_PWR_CFG                 S5P_CLKREG(0x804)
-#define S5P64X0_EINT_WAKEUP_MASK        S5P_CLKREG(0x808)
-#define S5P64X0_SLEEP_CFG               S5P_CLKREG(0x818)
-#define S5P64X0_PWR_STABLE              S5P_CLKREG(0x828)
-
-#define S5P64X0_OTHERS                  S5P_CLKREG(0x900)
-#define S5P64X0_WAKEUP_STAT             S5P_CLKREG(0x908)
-
-#define S5P64X0_INFORM0                 S5P_CLKREG(0xA00)
-
-#define S5P64X0_CLKDIV0_HCLK_SHIFT      (8)
-#define S5P64X0_CLKDIV0_HCLK_MASK       (0xF << S5P64X0_CLKDIV0_HCLK_SHIFT)
-
-/* HCLK GATE Registers */
-#define S5P64X0_CLK_GATE_HCLK1_FIMGVG   (1 << 2)
-#define S5P64X0_CLK_GATE_SCLK1_FIMGVG   (1 << 2)
-
-/* PCLK GATE Registers */
-#define S5P64X0_CLK_GATE_PCLK_UART3     (1 << 4)
-#define S5P64X0_CLK_GATE_PCLK_UART2     (1 << 3)
-#define S5P64X0_CLK_GATE_PCLK_UART1     (1 << 2)
-#define S5P64X0_CLK_GATE_PCLK_UART0     (1 << 1)
-
-#define S5P64X0_PWR_CFG_MMC1_DISABLE            (1 << 15)
-#define S5P64X0_PWR_CFG_MMC0_DISABLE            (1 << 14)
-#define S5P64X0_PWR_CFG_RTC_TICK_DISABLE        (1 << 11)
-#define S5P64X0_PWR_CFG_RTC_ALRM_DISABLE        (1 << 10)
-#define S5P64X0_PWR_CFG_WFI_MASK                (3 << 5)
-#define S5P64X0_PWR_CFG_WFI_SLEEP               (3 << 5)
-
-#define S5P64X0_SLEEP_CFG_OSC_EN        (1 << 0)
-
-#define S5P64X0_PWR_STABLE_PWR_CNT_VAL4 (4 << 0)
-
-#define S5P6450_OTHERS_DISABLE_INT      (1 << 31)
-#define S5P64X0_OTHERS_RET_UART         (1 << 26)
-#define S5P64X0_OTHERS_RET_MMC1         (1 << 25)
-#define S5P64X0_OTHERS_RET_MMC0         (1 << 24)
-#define S5P64X0_OTHERS_USB_SIG_MASK     (1 << 16)
-
-/* Compatibility defines */
-
-#define ARM_CLK_DIV                     S5P64X0_CLK_DIV0
-#define ARM_DIV_RATIO_SHIFT             0
-#define ARM_DIV_MASK                    (0xF << ARM_DIV_RATIO_SHIFT)
-
-#define S5P_EPLL_CON                    S5P64X0_EPLL_CON
-
-#endif /* __ASM_ARCH_REGS_CLOCK_H */
diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h b/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
deleted file mode 100644
index cfdfa4fdadf2..000000000000
--- a/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - GPIO register definitions
- *
- * 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_REGS_GPIO_H
-#define __ASM_ARCH_REGS_GPIO_H __FILE__
-
-#include <mach/map.h>
-
-/* Base addresses for each of the banks */
-
-#define S5P64X0_GPA_BASE                (S5P_VA_GPIO + 0x0000)
-#define S5P64X0_GPB_BASE                (S5P_VA_GPIO + 0x0020)
-#define S5P64X0_GPC_BASE                (S5P_VA_GPIO + 0x0040)
-#define S5P64X0_GPF_BASE                (S5P_VA_GPIO + 0x00A0)
-#define S5P64X0_GPG_BASE                (S5P_VA_GPIO + 0x00C0)
-#define S5P64X0_GPH_BASE                (S5P_VA_GPIO + 0x00E0)
-#define S5P64X0_GPI_BASE                (S5P_VA_GPIO + 0x0100)
-#define S5P64X0_GPJ_BASE                (S5P_VA_GPIO + 0x0120)
-#define S5P64X0_GPN_BASE                (S5P_VA_GPIO + 0x0830)
-#define S5P64X0_GPP_BASE                (S5P_VA_GPIO + 0x0160)
-#define S5P64X0_GPR_BASE                (S5P_VA_GPIO + 0x0290)
-
-#define S5P6450_GPD_BASE                (S5P_VA_GPIO + 0x0060)
-#define S5P6450_GPK_BASE                (S5P_VA_GPIO + 0x0140)
-#define S5P6450_GPQ_BASE                (S5P_VA_GPIO + 0x0180)
-#define S5P6450_GPS_BASE                (S5P_VA_GPIO + 0x0300)
-
-#define S5P64X0_SPCON0                  (S5P_VA_GPIO + 0x1A0)
-#define S5P64X0_SPCON0_LCD_SEL_MASK     (0x3 << 0)
-#define S5P64X0_SPCON0_LCD_SEL_RGB      (0x1 << 0)
-#define S5P64X0_SPCON1                  (S5P_VA_GPIO + 0x2B0)
-
-#define S5P64X0_MEM0CONSLP0             (S5P_VA_GPIO + 0x1C0)
-#define S5P64X0_MEM0CONSLP1             (S5P_VA_GPIO + 0x1C4)
-#define S5P64X0_MEM0DRVCON              (S5P_VA_GPIO + 0x1D0)
-#define S5P64X0_MEM1DRVCON              (S5P_VA_GPIO + 0x1D4)
-
-#define S5P64X0_EINT12CON               (S5P_VA_GPIO + 0x200)
-#define S5P64X0_EINT12FLTCON            (S5P_VA_GPIO + 0x220)
-#define S5P64X0_EINT12MASK              (S5P_VA_GPIO + 0x240)
-
-/* External interrupt control registers for group0 */
-
-#define EINT0CON0_OFFSET                (0x900)
-#define EINT0FLTCON0_OFFSET             (0x910)
-#define EINT0FLTCON1_OFFSET             (0x914)
-#define EINT0MASK_OFFSET                (0x920)
-#define EINT0PEND_OFFSET                (0x924)
-
-#define S5P64X0_EINT0CON0               (S5P_VA_GPIO + EINT0CON0_OFFSET)
-#define S5P64X0_EINT0FLTCON0            (S5P_VA_GPIO + EINT0FLTCON0_OFFSET)
-#define S5P64X0_EINT0FLTCON1            (S5P_VA_GPIO + EINT0FLTCON1_OFFSET)
-#define S5P64X0_EINT0MASK               (S5P_VA_GPIO + EINT0MASK_OFFSET)
-#define S5P64X0_EINT0PEND               (S5P_VA_GPIO + EINT0PEND_OFFSET)
-
-#define S5P64X0_SLPEN                   (S5P_VA_GPIO + 0x930)
-#define S5P64X0_SLPEN_USE_xSLP          (1 << 0)
-
-#endif /* __ASM_ARCH_REGS_GPIO_H */
diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-irq.h b/arch/arm/mach-s5p64x0/include/mach/regs-irq.h
deleted file mode 100644
index d60397d1ff40..000000000000
--- a/arch/arm/mach-s5p64x0/include/mach/regs-irq.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/include/mach/regs-irq.h
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - IRQ register definitions
- *
- * 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_REGS_IRQ_H
-#define __ASM_ARCH_REGS_IRQ_H __FILE__
-
-#include <mach/map.h>
-
-#endif /* __ASM_ARCH_REGS_IRQ_H */
diff --git a/arch/arm/mach-s5p64x0/irq-pm.c b/arch/arm/mach-s5p64x0/irq-pm.c
deleted file mode 100644
index 2ed921e095dc..000000000000
--- a/arch/arm/mach-s5p64x0/irq-pm.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/irq-pm.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 - Interrupt handling Power Management
- *
- * Based on arch/arm/mach-s3c64xx/irq-pm.c 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.
- */
-
-#include <linux/syscore_ops.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/io.h>
-
-#include <plat/pm.h>
-
-#include <mach/regs-gpio.h>
-
-static struct sleep_save irq_save[] = {
-        SAVE_ITEM(S5P64X0_EINT0CON0),
-        SAVE_ITEM(S5P64X0_EINT0FLTCON0),
-        SAVE_ITEM(S5P64X0_EINT0FLTCON1),
-        SAVE_ITEM(S5P64X0_EINT0MASK),
-};
-
-static struct irq_grp_save {
-        u32     con;
-        u32     fltcon;
-        u32     mask;
-} eint_grp_save[4];
-
-#ifdef CONFIG_SERIAL_SAMSUNG
-static u32 irq_uart_mask[CONFIG_SERIAL_SAMSUNG_UARTS];
-#endif
-
-static int s5p64x0_irq_pm_suspend(void)
-{
-        struct irq_grp_save *grp = eint_grp_save;
-        int i;
-
-        S3C_PMDBG("%s: suspending IRQs\n", __func__);
-
-        s3c_pm_do_save(irq_save, ARRAY_SIZE(irq_save));
-
-#ifdef CONFIG_SERIAL_SAMSUNG
-        for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++)
-                irq_uart_mask[i] = __raw_readl(S3C_VA_UARTx(i) + S3C64XX_UINTM);
-#endif
-
-        for (i = 0; i < ARRAY_SIZE(eint_grp_save); i++, grp++) {
-                grp->con = __raw_readl(S5P64X0_EINT12CON + (i * 4));
-                grp->mask = __raw_readl(S5P64X0_EINT12MASK + (i * 4));
-                grp->fltcon = __raw_readl(S5P64X0_EINT12FLTCON + (i * 4));
-        }
-
-        return 0;
-}
-
-static void s5p64x0_irq_pm_resume(void)
-{
-        struct irq_grp_save *grp = eint_grp_save;
-        int i;
-
-        S3C_PMDBG("%s: resuming IRQs\n", __func__);
-
-        s3c_pm_do_restore(irq_save, ARRAY_SIZE(irq_save));
-
-#ifdef CONFIG_SERIAL_SAMSUNG
-        for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++)
-                __raw_writel(irq_uart_mask[i], S3C_VA_UARTx(i) + S3C64XX_UINTM);
-#endif
-
-        for (i = 0; i < ARRAY_SIZE(eint_grp_save); i++, grp++) {
-                __raw_writel(grp->con, S5P64X0_EINT12CON + (i * 4));
-                __raw_writel(grp->mask, S5P64X0_EINT12MASK + (i * 4));
-                __raw_writel(grp->fltcon, S5P64X0_EINT12FLTCON + (i * 4));
-        }
-
-        S3C_PMDBG("%s: IRQ configuration restored\n", __func__);
-}
-
-static struct syscore_ops s5p64x0_irq_syscore_ops = {
-        .suspend = s5p64x0_irq_pm_suspend,
-        .resume  = s5p64x0_irq_pm_resume,
-};
-
-static int __init s5p64x0_syscore_init(void)
-{
-        register_syscore_ops(&s5p64x0_irq_syscore_ops);
-
-        return 0;
-}
-core_initcall(s5p64x0_syscore_init);
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
deleted file mode 100644
index 6840e197cb2d..000000000000
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/mach-smdk6440.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/i2c.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/clk.h>
-#include <linux/gpio.h>
-#include <linux/pwm_backlight.h>
-#include <linux/fb.h>
-#include <linux/mmc/host.h>
-
-#include <video/platform_lcd.h>
-#include <video/samsung_fimd.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/irq.h>
-#include <asm/mach-types.h>
-
-#include <mach/hardware.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <mach/regs-gpio.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/clock.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/pll.h>
-#include <plat/adc.h>
-#include <linux/platform_data/touchscreen-s3c2410.h>
-#include <plat/samsung-time.h>
-#include <plat/backlight.h>
-#include <plat/fb.h>
-#include <plat/sdhci.h>
-
-#include "common.h"
-#include "i2c.h"
-
-#define SMDK6440_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
-                                S3C2410_UCON_RXILEVEL |         \
-                                S3C2410_UCON_TXIRQMODE |        \
-                                S3C2410_UCON_RXIRQMODE |        \
-                                S3C2410_UCON_RXFIFO_TOI |       \
-                                S3C2443_UCON_RXERR_IRQEN)
-
-#define SMDK6440_ULCON_DEFAULT  S3C2410_LCON_CS8
-
-#define SMDK6440_UFCON_DEFAULT  (S3C2410_UFCON_FIFOMODE |       \
-                                S3C2440_UFCON_TXTRIG16 |        \
-                                S3C2410_UFCON_RXTRIG8)
-
-static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = {
-        [0] = {
-                .hwport         = 0,
-                .flags          = 0,
-                .ucon           = SMDK6440_UCON_DEFAULT,
-                .ulcon          = SMDK6440_ULCON_DEFAULT,
-                .ufcon          = SMDK6440_UFCON_DEFAULT,
-        },
-        [1] = {
-                .hwport         = 1,
-                .flags          = 0,
-                .ucon           = SMDK6440_UCON_DEFAULT,
-                .ulcon          = SMDK6440_ULCON_DEFAULT,
-                .ufcon          = SMDK6440_UFCON_DEFAULT,
-        },
-        [2] = {
-                .hwport         = 2,
-                .flags          = 0,
-                .ucon           = SMDK6440_UCON_DEFAULT,
-                .ulcon          = SMDK6440_ULCON_DEFAULT,
-                .ufcon          = SMDK6440_UFCON_DEFAULT,
-        },
-        [3] = {
-                .hwport         = 3,
-                .flags          = 0,
-                .ucon           = SMDK6440_UCON_DEFAULT,
-                .ulcon          = SMDK6440_ULCON_DEFAULT,
-                .ufcon          = SMDK6440_UFCON_DEFAULT,
-        },
-};
-
-/* Frame Buffer */
-static struct s3c_fb_pd_win smdk6440_fb_win0 = {
-        .max_bpp        = 32,
-        .default_bpp    = 24,
-        .xres           = 800,
-        .yres           = 480,
-};
-
-static struct fb_videomode smdk6440_lcd_timing = {
-        .left_margin    = 8,
-        .right_margin   = 13,
-        .upper_margin   = 7,
-        .lower_margin   = 5,
-        .hsync_len      = 3,
-        .vsync_len      = 1,
-        .xres           = 800,
-        .yres           = 480,
-};
-
-static struct s3c_fb_platdata smdk6440_lcd_pdata __initdata = {
-        .win[0]         = &smdk6440_fb_win0,
-        .vtiming        = &smdk6440_lcd_timing,
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
-        .setup_gpio     = s5p64x0_fb_gpio_setup_24bpp,
-};
-
-/* LCD power controller */
-static void smdk6440_lte480_reset_power(struct plat_lcd_data *pd,
-                                         unsigned int power)
-{
-        int err;
-
-        if (power) {
-                err = gpio_request(S5P6440_GPN(5), "GPN");
-                if (err) {
-                        printk(KERN_ERR "failed to request GPN for lcd reset\n");
-                        return;
-                }
-
-                gpio_direction_output(S5P6440_GPN(5), 1);
-                gpio_set_value(S5P6440_GPN(5), 0);
-                gpio_set_value(S5P6440_GPN(5), 1);
-                gpio_free(S5P6440_GPN(5));
-        }
-}
-
-static struct plat_lcd_data smdk6440_lcd_power_data = {
-        .set_power      = smdk6440_lte480_reset_power,
-};
-
-static struct platform_device smdk6440_lcd_lte480wv = {
-        .name                   = "platform-lcd",
-        .dev.parent             = &s3c_device_fb.dev,
-        .dev.platform_data      = &smdk6440_lcd_power_data,
-};
-
-static struct platform_device *smdk6440_devices[] __initdata = {
-        &s3c_device_adc,
-        &s3c_device_rtc,
-        &s3c_device_i2c0,
-        &s3c_device_i2c1,
-        &samsung_device_pwm,
-        &s3c_device_ts,
-        &s3c_device_wdt,
-        &s5p6440_device_iis,
-        &s3c_device_fb,
-        &smdk6440_lcd_lte480wv,
-        &s3c_device_hsmmc0,
-        &s3c_device_hsmmc1,
-        &s3c_device_hsmmc2,
-};
-
-static struct s3c_sdhci_platdata smdk6440_hsmmc0_pdata __initdata = {
-        .cd_type        = S3C_SDHCI_CD_NONE,
-};
-
-static struct s3c_sdhci_platdata smdk6440_hsmmc1_pdata __initdata = {
-        .cd_type        = S3C_SDHCI_CD_INTERNAL,
-#if defined(CONFIG_S5P64X0_SD_CH1_8BIT)
-        .max_width      = 8,
-        .host_caps      = MMC_CAP_8_BIT_DATA,
-#endif
-};
-
-static struct s3c_sdhci_platdata smdk6440_hsmmc2_pdata __initdata = {
-        .cd_type        = S3C_SDHCI_CD_NONE,
-};
-
-static struct s3c2410_platform_i2c s5p6440_i2c0_data __initdata = {
-        .flags          = 0,
-        .slave_addr     = 0x10,
-        .frequency      = 100*1000,
-        .sda_delay      = 100,
-        .cfg_gpio       = s5p6440_i2c0_cfg_gpio,
-};
-
-static struct s3c2410_platform_i2c s5p6440_i2c1_data __initdata = {
-        .flags          = 0,
-        .bus_num        = 1,
-        .slave_addr     = 0x10,
-        .frequency      = 100*1000,
-        .sda_delay      = 100,
-        .cfg_gpio       = s5p6440_i2c1_cfg_gpio,
-};
-
-static struct i2c_board_info smdk6440_i2c_devs0[] __initdata = {
-        { I2C_BOARD_INFO("24c08", 0x50), },
-        { I2C_BOARD_INFO("wm8580", 0x1b), },
-};
-
-static struct i2c_board_info smdk6440_i2c_devs1[] __initdata = {
-        /* To be populated */
-};
-
-/* LCD Backlight data */
-static struct samsung_bl_gpio_info smdk6440_bl_gpio_info = {
-        .no = S5P6440_GPF(15),
-        .func = S3C_GPIO_SFN(2),
-};
-
-static struct platform_pwm_backlight_data smdk6440_bl_data = {
-        .pwm_id = 1,
-        .enable_gpio = -1,
-};
-
-static void __init smdk6440_map_io(void)
-{
-        s5p64x0_init_io(NULL, 0);
-        s3c24xx_init_clocks(12000000);
-        s3c24xx_init_uarts(smdk6440_uartcfgs, ARRAY_SIZE(smdk6440_uartcfgs));
-        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void s5p6440_set_lcd_interface(void)
-{
-        unsigned int cfg;
-
-        /* select TFT LCD type (RGB I/F) */
-        cfg = __raw_readl(S5P64X0_SPCON0);
-        cfg &= ~S5P64X0_SPCON0_LCD_SEL_MASK;
-        cfg |= S5P64X0_SPCON0_LCD_SEL_RGB;
-        __raw_writel(cfg, S5P64X0_SPCON0);
-}
-
-static void __init smdk6440_machine_init(void)
-{
-        s3c24xx_ts_set_platdata(NULL);
-
-        s3c_i2c0_set_platdata(&s5p6440_i2c0_data);
-        s3c_i2c1_set_platdata(&s5p6440_i2c1_data);
-        i2c_register_board_info(0, smdk6440_i2c_devs0,
-                        ARRAY_SIZE(smdk6440_i2c_devs0));
-        i2c_register_board_info(1, smdk6440_i2c_devs1,
-                        ARRAY_SIZE(smdk6440_i2c_devs1));
-
-        s5p6440_set_lcd_interface();
-        s3c_fb_set_platdata(&smdk6440_lcd_pdata);
-
-        s3c_sdhci0_set_platdata(&smdk6440_hsmmc0_pdata);
-        s3c_sdhci1_set_platdata(&smdk6440_hsmmc1_pdata);
-        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")
-        /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
-        .atag_offset    = 0x100,
-
-        .init_irq       = s5p6440_init_irq,
-        .map_io         = smdk6440_map_io,
-        .init_machine   = smdk6440_machine_init,
-        .init_time      = samsung_timer_init,
-        .restart        = s5p64x0_restart,
-MACHINE_END
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
deleted file mode 100644
index fa1341c074ca..000000000000
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/mach-smdk6450.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/i2c.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/clk.h>
-#include <linux/gpio.h>
-#include <linux/pwm_backlight.h>
-#include <linux/fb.h>
-#include <linux/mmc/host.h>
-
-#include <video/platform_lcd.h>
-#include <video/samsung_fimd.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/irq.h>
-#include <asm/mach-types.h>
-
-#include <mach/hardware.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-#include <mach/regs-gpio.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/clock.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/pll.h>
-#include <plat/adc.h>
-#include <linux/platform_data/touchscreen-s3c2410.h>
-#include <plat/samsung-time.h>
-#include <plat/backlight.h>
-#include <plat/fb.h>
-#include <plat/sdhci.h>
-
-#include "common.h"
-#include "i2c.h"
-
-#define SMDK6450_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
-                                S3C2410_UCON_RXILEVEL |         \
-                                S3C2410_UCON_TXIRQMODE |        \
-                                S3C2410_UCON_RXIRQMODE |        \
-                                S3C2410_UCON_RXFIFO_TOI |       \
-                                S3C2443_UCON_RXERR_IRQEN)
-
-#define SMDK6450_ULCON_DEFAULT  S3C2410_LCON_CS8
-
-#define SMDK6450_UFCON_DEFAULT  (S3C2410_UFCON_FIFOMODE |       \
-                                S3C2440_UFCON_TXTRIG16 |        \
-                                S3C2410_UFCON_RXTRIG8)
-
-static struct s3c2410_uartcfg smdk6450_uartcfgs[] __initdata = {
-        [0] = {
-                .hwport         = 0,
-                .flags          = 0,
-                .ucon           = SMDK6450_UCON_DEFAULT,
-                .ulcon          = SMDK6450_ULCON_DEFAULT,
-                .ufcon          = SMDK6450_UFCON_DEFAULT,
-        },
-        [1] = {
-                .hwport         = 1,
-                .flags          = 0,
-                .ucon           = SMDK6450_UCON_DEFAULT,
-                .ulcon          = SMDK6450_ULCON_DEFAULT,
-                .ufcon          = SMDK6450_UFCON_DEFAULT,
-        },
-        [2] = {
-                .hwport         = 2,
-                .flags          = 0,
-                .ucon           = SMDK6450_UCON_DEFAULT,
-                .ulcon          = SMDK6450_ULCON_DEFAULT,
-                .ufcon          = SMDK6450_UFCON_DEFAULT,
-        },
-        [3] = {
-                .hwport         = 3,
-                .flags          = 0,
-                .ucon           = SMDK6450_UCON_DEFAULT,
-                .ulcon          = SMDK6450_ULCON_DEFAULT,
-                .ufcon          = SMDK6450_UFCON_DEFAULT,
-        },
-#if CONFIG_SERIAL_SAMSUNG_UARTS > 4
-        [4] = {
-                .hwport         = 4,
-                .flags          = 0,
-                .ucon           = SMDK6450_UCON_DEFAULT,
-                .ulcon          = SMDK6450_ULCON_DEFAULT,
-                .ufcon          = SMDK6450_UFCON_DEFAULT,
-        },
-#endif
-#if CONFIG_SERIAL_SAMSUNG_UARTS > 5
-        [5] = {
-                .hwport         = 5,
-                .flags          = 0,
-                .ucon           = SMDK6450_UCON_DEFAULT,
-                .ulcon          = SMDK6450_ULCON_DEFAULT,
-                .ufcon          = SMDK6450_UFCON_DEFAULT,
-        },
-#endif
-};
-
-/* Frame Buffer */
-static struct s3c_fb_pd_win smdk6450_fb_win0 = {
-        .max_bpp        = 32,
-        .default_bpp    = 24,
-        .xres           = 800,
-        .yres           = 480,
-};
-
-static struct fb_videomode smdk6450_lcd_timing = {
-        .left_margin    = 8,
-        .right_margin   = 13,
-        .upper_margin   = 7,
-        .lower_margin   = 5,
-        .hsync_len      = 3,
-        .vsync_len      = 1,
-        .xres           = 800,
-        .yres           = 480,
-};
-
-static struct s3c_fb_platdata smdk6450_lcd_pdata __initdata = {
-        .win[0]         = &smdk6450_fb_win0,
-        .vtiming        = &smdk6450_lcd_timing,
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
-        .setup_gpio     = s5p64x0_fb_gpio_setup_24bpp,
-};
-
-/* LCD power controller */
-static void smdk6450_lte480_reset_power(struct plat_lcd_data *pd,
-                                         unsigned int power)
-{
-        int err;
-
-        if (power) {
-                err = gpio_request(S5P6450_GPN(5), "GPN");
-                if (err) {
-                        printk(KERN_ERR "failed to request GPN for lcd reset\n");
-                        return;
-                }
-
-                gpio_direction_output(S5P6450_GPN(5), 1);
-                gpio_set_value(S5P6450_GPN(5), 0);
-                gpio_set_value(S5P6450_GPN(5), 1);
-                gpio_free(S5P6450_GPN(5));
-        }
-}
-
-static struct plat_lcd_data smdk6450_lcd_power_data = {
-        .set_power      = smdk6450_lte480_reset_power,
-};
-
-static struct platform_device smdk6450_lcd_lte480wv = {
-        .name                   = "platform-lcd",
-        .dev.parent             = &s3c_device_fb.dev,
-        .dev.platform_data      = &smdk6450_lcd_power_data,
-};
-
-static struct platform_device *smdk6450_devices[] __initdata = {
-        &s3c_device_adc,
-        &s3c_device_rtc,
-        &s3c_device_i2c0,
-        &s3c_device_i2c1,
-        &samsung_device_pwm,
-        &s3c_device_ts,
-        &s3c_device_wdt,
-        &s5p6450_device_iis0,
-        &s3c_device_fb,
-        &smdk6450_lcd_lte480wv,
-        &s3c_device_hsmmc0,
-        &s3c_device_hsmmc1,
-        &s3c_device_hsmmc2,
-        /* s5p6450_device_spi0 will be added */
-};
-
-static struct s3c_sdhci_platdata smdk6450_hsmmc0_pdata __initdata = {
-        .cd_type        = S3C_SDHCI_CD_NONE,
-};
-
-static struct s3c_sdhci_platdata smdk6450_hsmmc1_pdata __initdata = {
-        .cd_type        = S3C_SDHCI_CD_NONE,
-#if defined(CONFIG_S5P64X0_SD_CH1_8BIT)
-        .max_width      = 8,
-        .host_caps      = MMC_CAP_8_BIT_DATA,
-#endif
-};
-
-static struct s3c_sdhci_platdata smdk6450_hsmmc2_pdata __initdata = {
-        .cd_type        = S3C_SDHCI_CD_NONE,
-};
-
-static struct s3c2410_platform_i2c s5p6450_i2c0_data __initdata = {
-        .flags          = 0,
-        .slave_addr     = 0x10,
-        .frequency      = 100*1000,
-        .sda_delay      = 100,
-        .cfg_gpio       = s5p6450_i2c0_cfg_gpio,
-};
-
-static struct s3c2410_platform_i2c s5p6450_i2c1_data __initdata = {
-        .flags          = 0,
-        .bus_num        = 1,
-        .slave_addr     = 0x10,
-        .frequency      = 100*1000,
-        .sda_delay      = 100,
-        .cfg_gpio       = s5p6450_i2c1_cfg_gpio,
-};
-
-static struct i2c_board_info smdk6450_i2c_devs0[] __initdata = {
-        { I2C_BOARD_INFO("wm8580", 0x1b), },
-        { I2C_BOARD_INFO("24c08", 0x50), },     /* Samsung KS24C080C EEPROM */
-};
-
-static struct i2c_board_info smdk6450_i2c_devs1[] __initdata = {
-        { I2C_BOARD_INFO("24c128", 0x57), },/* Samsung S524AD0XD1 EEPROM */
-};
-
-/* LCD Backlight data */
-static struct samsung_bl_gpio_info smdk6450_bl_gpio_info = {
-        .no = S5P6450_GPF(15),
-        .func = S3C_GPIO_SFN(2),
-};
-
-static struct platform_pwm_backlight_data smdk6450_bl_data = {
-        .pwm_id = 1,
-        .enable_gpio = -1,
-};
-
-static void __init smdk6450_map_io(void)
-{
-        s5p64x0_init_io(NULL, 0);
-        s3c24xx_init_clocks(19200000);
-        s3c24xx_init_uarts(smdk6450_uartcfgs, ARRAY_SIZE(smdk6450_uartcfgs));
-        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void s5p6450_set_lcd_interface(void)
-{
-        unsigned int cfg;
-
-        /* select TFT LCD type (RGB I/F) */
-        cfg = __raw_readl(S5P64X0_SPCON0);
-        cfg &= ~S5P64X0_SPCON0_LCD_SEL_MASK;
-        cfg |= S5P64X0_SPCON0_LCD_SEL_RGB;
-        __raw_writel(cfg, S5P64X0_SPCON0);
-}
-
-static void __init smdk6450_machine_init(void)
-{
-        s3c24xx_ts_set_platdata(NULL);
-
-        s3c_i2c0_set_platdata(&s5p6450_i2c0_data);
-        s3c_i2c1_set_platdata(&s5p6450_i2c1_data);
-        i2c_register_board_info(0, smdk6450_i2c_devs0,
-                        ARRAY_SIZE(smdk6450_i2c_devs0));
-        i2c_register_board_info(1, smdk6450_i2c_devs1,
-                        ARRAY_SIZE(smdk6450_i2c_devs1));
-
-        s5p6450_set_lcd_interface();
-        s3c_fb_set_platdata(&smdk6450_lcd_pdata);
-
-        s3c_sdhci0_set_platdata(&smdk6450_hsmmc0_pdata);
-        s3c_sdhci1_set_platdata(&smdk6450_hsmmc1_pdata);
-        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")
-        /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
-        .atag_offset    = 0x100,
-
-        .init_irq       = s5p6450_init_irq,
-        .map_io         = smdk6450_map_io,
-        .init_machine   = smdk6450_machine_init,
-        .init_time      = samsung_timer_init,
-        .restart        = s5p64x0_restart,
-MACHINE_END
diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c
deleted file mode 100644
index ec8229cee716..000000000000
--- a/arch/arm/mach-s5p64x0/pm.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/pm.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P64X0 Power Management Support
- *
- * Based on arch/arm/mach-s3c64xx/pm.c 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.
-*/
-
-#include <linux/suspend.h>
-#include <linux/syscore_ops.h>
-#include <linux/io.h>
-
-#include <plat/cpu.h>
-#include <plat/pm.h>
-#include <plat/wakeup-mask.h>
-
-#include <mach/regs-clock.h>
-#include <mach/regs-gpio.h>
-
-static struct sleep_save s5p64x0_core_save[] = {
-        SAVE_ITEM(S5P64X0_APLL_CON),
-        SAVE_ITEM(S5P64X0_MPLL_CON),
-        SAVE_ITEM(S5P64X0_EPLL_CON),
-        SAVE_ITEM(S5P64X0_EPLL_CON_K),
-        SAVE_ITEM(S5P64X0_CLK_SRC0),
-        SAVE_ITEM(S5P64X0_CLK_SRC1),
-        SAVE_ITEM(S5P64X0_CLK_DIV0),
-        SAVE_ITEM(S5P64X0_CLK_DIV1),
-        SAVE_ITEM(S5P64X0_CLK_DIV2),
-        SAVE_ITEM(S5P64X0_CLK_DIV3),
-        SAVE_ITEM(S5P64X0_CLK_GATE_MEM0),
-        SAVE_ITEM(S5P64X0_CLK_GATE_HCLK1),
-        SAVE_ITEM(S5P64X0_CLK_GATE_SCLK1),
-};
-
-static struct sleep_save s5p64x0_misc_save[] = {
-        SAVE_ITEM(S5P64X0_AHB_CON0),
-        SAVE_ITEM(S5P64X0_SPCON0),
-        SAVE_ITEM(S5P64X0_SPCON1),
-        SAVE_ITEM(S5P64X0_MEM0CONSLP0),
-        SAVE_ITEM(S5P64X0_MEM0CONSLP1),
-        SAVE_ITEM(S5P64X0_MEM0DRVCON),
-        SAVE_ITEM(S5P64X0_MEM1DRVCON),
-};
-
-/* DPLL is present only in S5P6450 */
-static struct sleep_save s5p6450_core_save[] = {
-        SAVE_ITEM(S5P6450_DPLL_CON),
-        SAVE_ITEM(S5P6450_DPLL_CON_K),
-};
-
-void s3c_pm_configure_extint(void)
-{
-        __raw_writel(s3c_irqwake_eintmask, S5P64X0_EINT_WAKEUP_MASK);
-}
-
-void s3c_pm_restore_core(void)
-{
-        __raw_writel(0, S5P64X0_EINT_WAKEUP_MASK);
-
-        s3c_pm_do_restore_core(s5p64x0_core_save,
-                                ARRAY_SIZE(s5p64x0_core_save));
-
-        if (soc_is_s5p6450())
-                s3c_pm_do_restore_core(s5p6450_core_save,
-                                ARRAY_SIZE(s5p6450_core_save));
-
-        s3c_pm_do_restore(s5p64x0_misc_save, ARRAY_SIZE(s5p64x0_misc_save));
-}
-
-void s3c_pm_save_core(void)
-{
-        s3c_pm_do_save(s5p64x0_misc_save, ARRAY_SIZE(s5p64x0_misc_save));
-
-        if (soc_is_s5p6450())
-                s3c_pm_do_save(s5p6450_core_save,
-                                ARRAY_SIZE(s5p6450_core_save));
-
-        s3c_pm_do_save(s5p64x0_core_save, ARRAY_SIZE(s5p64x0_core_save));
-}
-
-static int s5p64x0_cpu_suspend(unsigned long arg)
-{
-        unsigned long tmp = 0;
-
-        /*
-         * Issue the standby signal into the pm unit. Note, we
-         * issue a write-buffer drain just in case.
-         */
-        asm("b 1f\n\t"
-            ".align 5\n\t"
-            "1:\n\t"
-            "mcr p15, 0, %0, c7, c10, 5\n\t"
-            "mcr p15, 0, %0, c7, c10, 4\n\t"
-            "mcr p15, 0, %0, c7, c0, 4" : : "r" (tmp));
-
-        pr_info("Failed to suspend the system\n");
-        return 1; /* Aborting suspend */
-}
-
-/* mapping of interrupts to parts of the wakeup mask */
-static struct samsung_wakeup_mask s5p64x0_wake_irqs[] = {
-        { .irq = IRQ_RTC_ALARM, .bit = S5P64X0_PWR_CFG_RTC_ALRM_DISABLE, },
-        { .irq = IRQ_RTC_TIC,   .bit = S5P64X0_PWR_CFG_RTC_TICK_DISABLE, },
-        { .irq = IRQ_HSMMC0,    .bit = S5P64X0_PWR_CFG_MMC0_DISABLE, },
-        { .irq = IRQ_HSMMC1,    .bit = S5P64X0_PWR_CFG_MMC1_DISABLE, },
-};
-
-static void s5p64x0_pm_prepare(void)
-{
-        u32 tmp;
-
-        samsung_sync_wakemask(S5P64X0_PWR_CFG,
-                        s5p64x0_wake_irqs, ARRAY_SIZE(s5p64x0_wake_irqs));
-
-        /* store the resume address in INFORM0 register */
-        __raw_writel(virt_to_phys(s3c_cpu_resume), S5P64X0_INFORM0);
-
-        /* setup clock gating for FIMGVG block */
-        __raw_writel((__raw_readl(S5P64X0_CLK_GATE_HCLK1) | \
-                (S5P64X0_CLK_GATE_HCLK1_FIMGVG)), S5P64X0_CLK_GATE_HCLK1);
-        __raw_writel((__raw_readl(S5P64X0_CLK_GATE_SCLK1) | \
-                (S5P64X0_CLK_GATE_SCLK1_FIMGVG)), S5P64X0_CLK_GATE_SCLK1);
-
-        /* Configure the stabilization counter with wait time required */
-        __raw_writel(S5P64X0_PWR_STABLE_PWR_CNT_VAL4, S5P64X0_PWR_STABLE);
-
-        /* set WFI to SLEEP mode configuration */
-        tmp = __raw_readl(S5P64X0_SLEEP_CFG);
-        tmp &= ~(S5P64X0_SLEEP_CFG_OSC_EN);
-        __raw_writel(tmp, S5P64X0_SLEEP_CFG);
-
-        tmp = __raw_readl(S5P64X0_PWR_CFG);
-        tmp &= ~(S5P64X0_PWR_CFG_WFI_MASK);
-        tmp |= S5P64X0_PWR_CFG_WFI_SLEEP;
-        __raw_writel(tmp, S5P64X0_PWR_CFG);
-
-        /*
-         * set OTHERS register to disable interrupt before going to
-         * sleep. This bit is present only in S5P6450, it is reserved
-         * in S5P6440.
-         */
-        if (soc_is_s5p6450()) {
-                tmp = __raw_readl(S5P64X0_OTHERS);
-                tmp |= S5P6450_OTHERS_DISABLE_INT;
-                __raw_writel(tmp, S5P64X0_OTHERS);
-        }
-
-        /* ensure previous wakeup state is cleared before sleeping */
-        __raw_writel(__raw_readl(S5P64X0_WAKEUP_STAT), S5P64X0_WAKEUP_STAT);
-
-}
-
-static int s5p64x0_pm_add(struct device *dev, struct subsys_interface *sif)
-{
-        pm_cpu_prep = s5p64x0_pm_prepare;
-        pm_cpu_sleep = s5p64x0_cpu_suspend;
-
-        return 0;
-}
-
-static struct subsys_interface s5p64x0_pm_interface = {
-        .name           = "s5p64x0_pm",
-        .subsys         = &s5p64x0_subsys,
-        .add_dev        = s5p64x0_pm_add,
-};
-
-static __init int s5p64x0_pm_drvinit(void)
-{
-        s3c_pm_init();
-
-        return subsys_interface_register(&s5p64x0_pm_interface);
-}
-arch_initcall(s5p64x0_pm_drvinit);
-
-static void s5p64x0_pm_resume(void)
-{
-        u32 tmp;
-
-        tmp = __raw_readl(S5P64X0_OTHERS);
-        tmp |= (S5P64X0_OTHERS_RET_MMC0 | S5P64X0_OTHERS_RET_MMC1 | \
-                        S5P64X0_OTHERS_RET_UART);
-        __raw_writel(tmp , S5P64X0_OTHERS);
-}
-
-static struct syscore_ops s5p64x0_pm_syscore_ops = {
-        .resume         = s5p64x0_pm_resume,
-};
-
-static __init int s5p64x0_pm_syscore_init(void)
-{
-        register_syscore_ops(&s5p64x0_pm_syscore_ops);
-
-        return 0;
-}
-arch_initcall(s5p64x0_pm_syscore_init);
diff --git a/arch/arm/mach-s5p64x0/setup-fb-24bpp.c b/arch/arm/mach-s5p64x0/setup-fb-24bpp.c
deleted file mode 100644
index f346ee4af54d..000000000000
--- a/arch/arm/mach-s5p64x0/setup-fb-24bpp.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/setup-fb-24bpp.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.com/
- *
- * Base S5P64X0 GPIO setup information for LCD framebuffer
- *
- * 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/fb.h>
-#include <linux/gpio.h>
-
-#include <plat/cpu.h>
-#include <plat/fb.h>
-#include <plat/gpio-cfg.h>
-
-void s5p64x0_fb_gpio_setup_24bpp(void)
-{
-        if (soc_is_s5p6440()) {
-                s3c_gpio_cfgrange_nopull(S5P6440_GPI(0), 16, S3C_GPIO_SFN(2));
-                s3c_gpio_cfgrange_nopull(S5P6440_GPJ(0), 12, S3C_GPIO_SFN(2));
-        } else if (soc_is_s5p6450()) {
-                s3c_gpio_cfgrange_nopull(S5P6450_GPI(0), 16, S3C_GPIO_SFN(2));
-                s3c_gpio_cfgrange_nopull(S5P6450_GPJ(0), 12, S3C_GPIO_SFN(2));
-        }
-}
diff --git a/arch/arm/mach-s5p64x0/setup-i2c0.c b/arch/arm/mach-s5p64x0/setup-i2c0.c
deleted file mode 100644
index 569b76ac98cb..000000000000
--- a/arch/arm/mach-s5p64x0/setup-i2c0.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/setup-i2c0.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * I2C0 GPIO configuration.
- *
- * Based on plat-s3c64x0/setup-i2c0.c
- *
- * 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/types.h>
-#include <linux/gpio.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <plat/gpio-cfg.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-
-#include "i2c.h"
-
-void s5p6440_i2c0_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5P6440_GPB(5), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
-
-void s5p6450_i2c0_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5P6450_GPB(5), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
-
-void s3c_i2c0_cfg_gpio(struct platform_device *dev) { }
diff --git a/arch/arm/mach-s5p64x0/setup-i2c1.c b/arch/arm/mach-s5p64x0/setup-i2c1.c
deleted file mode 100644
index 867374e6d0bc..000000000000
--- a/arch/arm/mach-s5p64x0/setup-i2c1.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* linux/arch/arm/mach-s5p64xx/setup-i2c1.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * I2C1 GPIO configuration.
- *
- * Based on plat-s3c64xx/setup-i2c0.c
- *
- * 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/types.h>
-#include <linux/gpio.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <plat/gpio-cfg.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-
-#include "i2c.h"
-
-void s5p6440_i2c1_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5P6440_GPR(9), 2,
-                              S3C_GPIO_SFN(6), S3C_GPIO_PULL_UP);
-}
-
-void s5p6450_i2c1_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5P6450_GPR(9), 2,
-                              S3C_GPIO_SFN(6), S3C_GPIO_PULL_UP);
-}
-
-void s3c_i2c1_cfg_gpio(struct platform_device *dev) { }
diff --git a/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c b/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
deleted file mode 100644
index 8410af0d12bf..000000000000
--- a/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P64X0 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
- *
- * 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/platform_device.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-
-#include <mach/regs-gpio.h>
-#include <mach/regs-clock.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/sdhci.h>
-#include <plat/cpu.h>
-
-void s5p64x0_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
-{
-        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-        /* Set all the necessary GPG pins to special-function 2 */
-        if (soc_is_s5p6450())
-                s3c_gpio_cfgrange_nopull(S5P6450_GPG(0), 2 + width,
-                                         S3C_GPIO_SFN(2));
-        else
-                s3c_gpio_cfgrange_nopull(S5P6440_GPG(0), 2 + width,
-                                         S3C_GPIO_SFN(2));
-
-        /* Set GPG[6] pin to special-function 2 - MMC0 CDn */
-        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-                if (soc_is_s5p6450()) {
-                        s3c_gpio_setpull(S5P6450_GPG(6), S3C_GPIO_PULL_UP);
-                        s3c_gpio_cfgpin(S5P6450_GPG(6), S3C_GPIO_SFN(2));
-                } else {
-                        s3c_gpio_setpull(S5P6440_GPG(6), S3C_GPIO_PULL_UP);
-                        s3c_gpio_cfgpin(S5P6440_GPG(6), S3C_GPIO_SFN(2));
-                }
-        }
-}
-
-void s5p64x0_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
-{
-        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-        /* Set GPH[0:1] pins to special-function 2 - CLK and CMD */
-        if (soc_is_s5p6450())
-                s3c_gpio_cfgrange_nopull(S5P6450_GPH(0), 2, S3C_GPIO_SFN(2));
-        else
-                s3c_gpio_cfgrange_nopull(S5P6440_GPH(0), 2 , S3C_GPIO_SFN(2));
-
-        switch (width) {
-        case 8:
-                /* Set data pins GPH[6:9] special-function 2 */
-                if (soc_is_s5p6450())
-                        s3c_gpio_cfgrange_nopull(S5P6450_GPH(6), 4,
-                                                 S3C_GPIO_SFN(2));
-                else
-                        s3c_gpio_cfgrange_nopull(S5P6440_GPH(6), 4,
-                                                 S3C_GPIO_SFN(2));
-        case 4:
-                /* set data pins GPH[2:5] special-function 2 */
-                if (soc_is_s5p6450())
-                        s3c_gpio_cfgrange_nopull(S5P6450_GPH(2), 4,
-                                                 S3C_GPIO_SFN(2));
-                else
-                        s3c_gpio_cfgrange_nopull(S5P6440_GPH(2), 4,
-                                                 S3C_GPIO_SFN(2));
-        default:
-                break;
-        }
-
-        /* Set GPG[6] pin to special-funtion 3 : MMC1 CDn */
-        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-                if (soc_is_s5p6450()) {
-                        s3c_gpio_setpull(S5P6450_GPG(6), S3C_GPIO_PULL_UP);
-                        s3c_gpio_cfgpin(S5P6450_GPG(6), S3C_GPIO_SFN(3));
-                } else {
-                        s3c_gpio_setpull(S5P6440_GPG(6), S3C_GPIO_PULL_UP);
-                        s3c_gpio_cfgpin(S5P6440_GPG(6), S3C_GPIO_SFN(3));
-                }
-        }
-}
-
-void s5p6440_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
-{
-        /* Set GPC[4:5] pins to special-function 3 - CLK and CMD */
-        s3c_gpio_cfgrange_nopull(S5P6440_GPC(4), 2, S3C_GPIO_SFN(3));
-
-        /* Set data pins GPH[6:9] pins to special-function 3 */
-        s3c_gpio_cfgrange_nopull(S5P6440_GPH(6), 4, S3C_GPIO_SFN(3));
-}
-
-void s5p6450_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
-{
-        /* Set all the necessary GPG pins to special-function 3 */
-        s3c_gpio_cfgrange_nopull(S5P6450_GPG(7), 2 + width, S3C_GPIO_SFN(3));
-}
diff --git a/arch/arm/mach-s5p64x0/setup-spi.c b/arch/arm/mach-s5p64x0/setup-spi.c
deleted file mode 100644
index 7664356720ca..000000000000
--- a/arch/arm/mach-s5p64x0/setup-spi.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/setup-spi.c
- *
- * Copyright (C) 2011 Samsung Electronics Ltd.
- *              http://www.samsung.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/gpio.h>
-#include <plat/gpio-cfg.h>
-
-#ifdef CONFIG_S3C64XX_DEV_SPI0
-int s3c64xx_spi0_cfg_gpio(void)
-{
-        if (soc_is_s5p6450())
-                s3c_gpio_cfgall_range(S5P6450_GPC(0), 3,
-                                        S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-        else
-                s3c_gpio_cfgall_range(S5P6440_GPC(0), 3,
-                                        S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-        return 0;
-}
-#endif
-
-#ifdef CONFIG_S3C64XX_DEV_SPI1
-int s3c64xx_spi1_cfg_gpio(void)
-{
-        if (soc_is_s5p6450())
-                s3c_gpio_cfgall_range(S5P6450_GPC(4), 3,
-                                        S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-        else
-                s3c_gpio_cfgall_range(S5P6440_GPC(4), 3,
-                                        S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-        return 0;
-}
-#endif
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
deleted file mode 100644
index c5e3a969b063..000000000000
--- a/arch/arm/mach-s5pc100/Kconfig
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2009 Samsung Electronics Co.
-#       Byungho Min <bhmin@samsung.com>
-#
-# Licensed under GPLv2
-
-# Configuration options for the S5PC100 CPU
-
-if ARCH_S5PC100
-
-config CPU_S5PC100
-        bool
-        select ARM_AMBA
-        select PL330_DMA if DMADEVICES
-        select S5P_EXT_INT
-        help
-          Enable S5PC100 CPU support
-
-config S5PC100_SETUP_FB_24BPP
-        bool
-        help
-          Common setup code for S5PC1XX with an 24bpp RGB display helper.
-
-config S5PC100_SETUP_I2C1
-        bool
-        help
-          Common setup code for i2c bus 1.
-
-config S5PC100_SETUP_IDE
-        bool
-        help
-          Common setup code for S5PC100 IDE GPIO configurations
-
-config S5PC100_SETUP_KEYPAD
-        bool
-        help
-          Common setup code for KEYPAD GPIO configurations.
-
-config S5PC100_SETUP_SDHCI
-        bool
-        select S5PC100_SETUP_SDHCI_GPIO
-        help
-          Internal helper functions for S5PC100 based SDHCI systems
-
-config S5PC100_SETUP_SDHCI_GPIO
-        bool
-        help
-          Common setup code for SDHCI gpio.
-
-config S5PC100_SETUP_SPI
-        bool
-        help
-          Common setup code for SPI GPIO configurations.
-
-config MACH_SMDKC100
-        bool "SMDKC100"
-        select CPU_S5PC100
-        select S3C_DEV_FB
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
-        select S3C_DEV_HSMMC2
-        select S3C_DEV_I2C1
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
-        select S5PC100_SETUP_FB_24BPP
-        select S5PC100_SETUP_I2C1
-        select S5PC100_SETUP_IDE
-        select S5PC100_SETUP_KEYPAD
-        select S5PC100_SETUP_SDHCI
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
-        select SAMSUNG_DEV_ADC
-        select SAMSUNG_DEV_BACKLIGHT
-        select SAMSUNG_DEV_IDE
-        select SAMSUNG_DEV_KEYPAD
-        select SAMSUNG_DEV_PWM
-        select SAMSUNG_DEV_TS
-        help
-          Machine support for the Samsung SMDKC100
-
-endif
diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile
deleted file mode 100644
index 118c711f74e8..000000000000
--- a/arch/arm/mach-s5pc100/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# arch/arm/mach-s5pc100/Makefile
-#
-# Copyright 2009 Samsung Electronics Co.
-#
-# Licensed under GPLv2
-
-obj-y                           :=
-obj-m                           :=
-obj-n                           :=
-obj-                            :=
-
-# Core
-
-obj-y                           += common.o clock.o
-
-obj-y                           += dma.o
-
-# machine support
-
-obj-$(CONFIG_MACH_SMDKC100)     += mach-smdkc100.o
-
-# device support
-
-obj-y                           += dev-audio.o
-
-obj-y                                   += setup-i2c0.o
-obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)    += setup-fb-24bpp.o
-obj-$(CONFIG_S5PC100_SETUP_I2C1)        += setup-i2c1.o
-obj-$(CONFIG_S5PC100_SETUP_IDE)         += setup-ide.o
-obj-$(CONFIG_S5PC100_SETUP_KEYPAD)      += setup-keypad.o
-obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)  += setup-sdhci-gpio.o
-obj-$(CONFIG_S5PC100_SETUP_SPI)         += setup-spi.o
diff --git a/arch/arm/mach-s5pc100/Makefile.boot b/arch/arm/mach-s5pc100/Makefile.boot
deleted file mode 100644
index 79ece4055b02..000000000000
--- a/arch/arm/mach-s5pc100/Makefile.boot
+++ /dev/null
@@ -1,2 +0,0 @@
-   zreladdr-y   += 0x20008000
-params_phys-y   := 0x20000100
diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c
deleted file mode 100644
index d0dc10ee7729..000000000000
--- a/arch/arm/mach-s5pc100/clock.c
+++ /dev/null
@@ -1,1361 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/clock.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PC100 - Clock 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.
-*/
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-
-#include <mach/map.h>
-
-#include <plat/cpu-freq.h>
-#include <mach/regs-clock.h>
-#include <plat/clock.h>
-#include <plat/cpu.h>
-#include <plat/pll.h>
-#include <plat/s5p-clock.h>
-#include <plat/clock-clksrc.h>
-
-#include "common.h"
-
-static struct clk s5p_clk_otgphy = {
-        .name           = "otg_phy",
-};
-
-static struct clk dummy_apb_pclk = {
-        .name           = "apb_pclk",
-        .id             = -1,
-};
-
-static struct clk *clk_src_mout_href_list[] = {
-        [0] = &s5p_clk_27m,
-        [1] = &clk_fin_hpll,
-};
-
-static struct clksrc_sources clk_src_mout_href = {
-        .sources        = clk_src_mout_href_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_mout_href_list),
-};
-
-static struct clksrc_clk clk_mout_href = {
-        .clk = {
-                .name           = "mout_href",
-        },
-        .sources        = &clk_src_mout_href,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 20, .size = 1 },
-};
-
-static struct clk *clk_src_mout_48m_list[] = {
-        [0] = &clk_xusbxti,
-        [1] = &s5p_clk_otgphy,
-};
-
-static struct clksrc_sources clk_src_mout_48m = {
-        .sources        = clk_src_mout_48m_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_mout_48m_list),
-};
-
-static struct clksrc_clk clk_mout_48m = {
-        .clk = {
-                .name           = "mout_48m",
-        },
-        .sources        = &clk_src_mout_48m,
-        .reg_src        = { .reg = S5P_CLK_SRC1, .shift = 24, .size = 1 },
-};
-
-static struct clksrc_clk clk_mout_mpll = {
-        .clk = {
-                .name           = "mout_mpll",
-        },
-        .sources        = &clk_src_mpll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 4, .size = 1 },
-};
-
-
-static struct clksrc_clk clk_mout_apll = {
-        .clk    = {
-                .name           = "mout_apll",
-        },
-        .sources        = &clk_src_apll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 0, .size = 1 },
-};
-
-static struct clksrc_clk clk_mout_epll = {
-        .clk    = {
-                .name           = "mout_epll",
-        },
-        .sources        = &clk_src_epll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 8, .size = 1 },
-};
-
-static struct clk *clk_src_mout_hpll_list[] = {
-        [0] = &s5p_clk_27m,
-};
-
-static struct clksrc_sources clk_src_mout_hpll = {
-        .sources        = clk_src_mout_hpll_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_mout_hpll_list),
-};
-
-static struct clksrc_clk clk_mout_hpll = {
-        .clk    = {
-                .name           = "mout_hpll",
-        },
-        .sources        = &clk_src_mout_hpll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 12, .size = 1 },
-};
-
-static struct clksrc_clk clk_div_apll = {
-        .clk    = {
-                .name   = "div_apll",
-                .parent = &clk_mout_apll.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV0, .shift = 0, .size = 1 },
-};
-
-static struct clksrc_clk clk_div_arm = {
-        .clk    = {
-                .name   = "div_arm",
-                .parent = &clk_div_apll.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV0, .shift = 4, .size = 3 },
-};
-
-static struct clksrc_clk clk_div_d0_bus = {
-        .clk    = {
-                .name   = "div_d0_bus",
-                .parent = &clk_div_arm.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV0, .shift = 8, .size = 3 },
-};
-
-static struct clksrc_clk clk_div_pclkd0 = {
-        .clk    = {
-                .name   = "div_pclkd0",
-                .parent = &clk_div_d0_bus.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV0, .shift = 12, .size = 3 },
-};
-
-static struct clksrc_clk clk_div_secss = {
-        .clk    = {
-                .name   = "div_secss",
-                .parent = &clk_div_d0_bus.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV0, .shift = 16, .size = 3 },
-};
-
-static struct clksrc_clk clk_div_apll2 = {
-        .clk    = {
-                .name   = "div_apll2",
-                .parent = &clk_mout_apll.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV1, .shift = 0, .size = 3 },
-};
-
-static struct clk *clk_src_mout_am_list[] = {
-        [0] = &clk_mout_mpll.clk,
-        [1] = &clk_div_apll2.clk,
-};
-
-static struct clksrc_sources clk_src_mout_am = {
-        .sources        = clk_src_mout_am_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_mout_am_list),
-};
-
-static struct clksrc_clk clk_mout_am = {
-        .clk    = {
-                .name   = "mout_am",
-        },
-        .sources = &clk_src_mout_am,
-        .reg_src = { .reg = S5P_CLK_SRC0, .shift = 16, .size = 1 },
-};
-
-static struct clksrc_clk clk_div_d1_bus = {
-        .clk    = {
-                .name   = "div_d1_bus",
-                .parent = &clk_mout_am.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 3 },
-};
-
-static struct clksrc_clk clk_div_mpll2 = {
-        .clk    = {
-                .name   = "div_mpll2",
-                .parent = &clk_mout_am.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV1, .shift = 8, .size = 1 },
-};
-
-static struct clksrc_clk clk_div_mpll = {
-        .clk    = {
-                .name   = "div_mpll",
-                .parent = &clk_mout_am.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV1, .shift = 4, .size = 2 },
-};
-
-static struct clk *clk_src_mout_onenand_list[] = {
-        [0] = &clk_div_d0_bus.clk,
-        [1] = &clk_div_d1_bus.clk,
-};
-
-static struct clksrc_sources clk_src_mout_onenand = {
-        .sources        = clk_src_mout_onenand_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_mout_onenand_list),
-};
-
-static struct clksrc_clk clk_mout_onenand = {
-        .clk    = {
-                .name   = "mout_onenand",
-        },
-        .sources = &clk_src_mout_onenand,
-        .reg_src = { .reg = S5P_CLK_SRC0, .shift = 24, .size = 1 },
-};
-
-static struct clksrc_clk clk_div_onenand = {
-        .clk    = {
-                .name   = "div_onenand",
-                .parent = &clk_mout_onenand.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV1, .shift = 20, .size = 2 },
-};
-
-static struct clksrc_clk clk_div_pclkd1 = {
-        .clk    = {
-                .name   = "div_pclkd1",
-                .parent = &clk_div_d1_bus.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV1, .shift = 16, .size = 3 },
-};
-
-static struct clksrc_clk clk_div_cam = {
-        .clk    = {
-                .name   = "div_cam",
-                .parent = &clk_div_mpll2.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV1, .shift = 24, .size = 5 },
-};
-
-static struct clksrc_clk clk_div_hdmi = {
-        .clk    = {
-                .name   = "div_hdmi",
-                .parent = &clk_mout_hpll.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV3, .shift = 28, .size = 4 },
-};
-
-static u32 epll_div[][4] = {
-        { 32750000,     131, 3, 4 },
-        { 32768000,     131, 3, 4 },
-        { 36000000,     72,  3, 3 },
-        { 45000000,     90,  3, 3 },
-        { 45158000,     90,  3, 3 },
-        { 45158400,     90,  3, 3 },
-        { 48000000,     96,  3, 3 },
-        { 49125000,     131, 4, 3 },
-        { 49152000,     131, 4, 3 },
-        { 60000000,     120, 3, 3 },
-        { 67737600,     226, 5, 3 },
-        { 67738000,     226, 5, 3 },
-        { 73800000,     246, 5, 3 },
-        { 73728000,     246, 5, 3 },
-        { 72000000,     144, 3, 3 },
-        { 84000000,     168, 3, 3 },
-        { 96000000,     96,  3, 2 },
-        { 144000000,    144, 3, 2 },
-        { 192000000,    96,  3, 1 }
-};
-
-static int s5pc100_epll_set_rate(struct clk *clk, unsigned long rate)
-{
-        unsigned int epll_con;
-        unsigned int i;
-
-        if (clk->rate == rate)  /* Return if nothing changed */
-                return 0;
-
-        epll_con = __raw_readl(S5P_EPLL_CON);
-
-        epll_con &= ~(PLL65XX_MDIV_MASK | PLL65XX_PDIV_MASK | PLL65XX_SDIV_MASK);
-
-        for (i = 0; i < ARRAY_SIZE(epll_div); i++) {
-                if (epll_div[i][0] == rate) {
-                        epll_con |= (epll_div[i][1] << PLL65XX_MDIV_SHIFT) |
-                                    (epll_div[i][2] << PLL65XX_PDIV_SHIFT) |
-                                    (epll_div[i][3] << PLL65XX_SDIV_SHIFT);
-                        break;
-                }
-        }
-
-        if (i == ARRAY_SIZE(epll_div)) {
-                printk(KERN_ERR "%s: Invalid Clock EPLL Frequency\n", __func__);
-                return -EINVAL;
-        }
-
-        __raw_writel(epll_con, S5P_EPLL_CON);
-
-        printk(KERN_WARNING "EPLL Rate changes from %lu to %lu\n",
-                        clk->rate, rate);
-
-        clk->rate = rate;
-
-        return 0;
-}
-
-static struct clk_ops s5pc100_epll_ops = {
-        .get_rate = s5p_epll_get_rate,
-        .set_rate = s5pc100_epll_set_rate,
-};
-
-static int s5pc100_d0_0_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_D00, clk, enable);
-}
-
-static int s5pc100_d0_1_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_D01, clk, enable);
-}
-
-static int s5pc100_d0_2_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_D02, clk, enable);
-}
-
-static int s5pc100_d1_0_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_D10, clk, enable);
-}
-
-static int s5pc100_d1_1_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_D11, clk, enable);
-}
-
-static int s5pc100_d1_2_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_D12, clk, enable);
-}
-
-static int s5pc100_d1_3_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_D13, clk, enable);
-}
-
-static int s5pc100_d1_4_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_D14, clk, enable);
-}
-
-static int s5pc100_d1_5_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_D15, clk, enable);
-}
-
-static int s5pc100_sclk0_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_SCLK0, clk, enable);
-}
-
-static int s5pc100_sclk1_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_SCLK1, clk, enable);
-}
-
-/*
- * The following clocks will be disabled during clock initialization. It is
- * recommended to keep the following clocks disabled until the driver requests
- * for enabling the clock.
- */
-static struct clk init_clocks_off[] = {
-        {
-                .name           = "cssys",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_0_ctrl,
-                .ctrlbit        = (1 << 6),
-        }, {
-                .name           = "secss",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_0_ctrl,
-                .ctrlbit        = (1 << 5),
-        }, {
-                .name           = "g2d",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_0_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
-                .name           = "mdma",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_0_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "cfcon",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_0_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "nfcon",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_1_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "onenandc",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_1_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "sdm",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_2_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "seckey",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_2_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "modemif",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_0_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
-                .name           = "otg",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_0_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "usbhost",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_0_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "dma",
-                .devname        = "dma-pl330.1",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_0_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "dma",
-                .devname        = "dma-pl330.0",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_0_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "lcd",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_1_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "rotator",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_1_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "fimc",
-                .devname        = "s5p-fimc.0",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_1_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "fimc",
-                .devname        = "s5p-fimc.1",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_1_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "fimc",
-                .devname        = "s5p-fimc.2",
-                .enable         = s5pc100_d1_1_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
-                .name           = "jpeg",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_1_ctrl,
-                .ctrlbit        = (1 << 5),
-        }, {
-                .name           = "mipi-dsim",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_1_ctrl,
-                .ctrlbit        = (1 << 6),
-        }, {
-                .name           = "mipi-csis",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_1_ctrl,
-                .ctrlbit        = (1 << 7),
-        }, {
-                .name           = "g3d",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_0_ctrl,
-                .ctrlbit        = (1 << 8),
-        }, {
-                .name           = "tv",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_2_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "vp",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_2_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "mixer",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_2_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "hdmi",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_2_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "mfc",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_2_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
-                .name           = "apc",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_3_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "iec",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_3_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "systimer",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_3_ctrl,
-                .ctrlbit        = (1 << 7),
-        }, {
-                .name           = "watchdog",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_3_ctrl,
-                .ctrlbit        = (1 << 8),
-        }, {
-                .name           = "rtc",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_3_ctrl,
-                .ctrlbit        = (1 << 9),
-        }, {
-                .name           = "i2c",
-                .devname        = "s3c2440-i2c.0",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
-                .name           = "i2c",
-                .devname        = "s3c2440-i2c.1",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 5),
-        }, {
-                .name           = "spi",
-                .devname        = "s5pc100-spi.0",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 6),
-        }, {
-                .name           = "spi",
-                .devname        = "s5pc100-spi.1",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 7),
-        }, {
-                .name           = "spi",
-                .devname        = "s5pc100-spi.2",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 8),
-        }, {
-                .name           = "irda",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 9),
-        }, {
-                .name           = "ccan",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 10),
-        }, {
-                .name           = "ccan",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 11),
-        }, {
-                .name           = "hsitx",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 12),
-        }, {
-                .name           = "hsirx",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 13),
-        }, {
-                .name           = "ac97",
-                .parent         = &clk_div_pclkd1.clk,
-                .enable         = s5pc100_d1_5_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "pcm",
-                .devname        = "samsung-pcm.0",
-                .parent         = &clk_div_pclkd1.clk,
-                .enable         = s5pc100_d1_5_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
-                .name           = "pcm",
-                .devname        = "samsung-pcm.1",
-                .parent         = &clk_div_pclkd1.clk,
-                .enable         = s5pc100_d1_5_ctrl,
-                .ctrlbit        = (1 << 5),
-        }, {
-                .name           = "spdif",
-                .parent         = &clk_div_pclkd1.clk,
-                .enable         = s5pc100_d1_5_ctrl,
-                .ctrlbit        = (1 << 6),
-        }, {
-                .name           = "adc",
-                .parent         = &clk_div_pclkd1.clk,
-                .enable         = s5pc100_d1_5_ctrl,
-                .ctrlbit        = (1 << 7),
-        }, {
-                .name           = "keypad",
-                .parent         = &clk_div_pclkd1.clk,
-                .enable         = s5pc100_d1_5_ctrl,
-                .ctrlbit        = (1 << 8),
-        }, {
-                .name           = "mmc_48m",
-                .devname        = "s3c-sdhci.0",
-                .parent         = &clk_mout_48m.clk,
-                .enable         = s5pc100_sclk0_ctrl,
-                .ctrlbit        = (1 << 15),
-        }, {
-                .name           = "mmc_48m",
-                .devname        = "s3c-sdhci.1",
-                .parent         = &clk_mout_48m.clk,
-                .enable         = s5pc100_sclk0_ctrl,
-                .ctrlbit        = (1 << 16),
-        }, {
-                .name           = "mmc_48m",
-                .devname        = "s3c-sdhci.2",
-                .parent         = &clk_mout_48m.clk,
-                .enable         = s5pc100_sclk0_ctrl,
-                .ctrlbit        = (1 << 17),
-        },
-};
-
-static struct clk clk_hsmmc2 = {
-        .name           = "hsmmc",
-        .devname        = "s3c-sdhci.2",
-        .parent         = &clk_div_d1_bus.clk,
-        .enable         = s5pc100_d1_0_ctrl,
-        .ctrlbit        = (1 << 7),
-};
-
-static struct clk clk_hsmmc1 = {
-        .name           = "hsmmc",
-        .devname        = "s3c-sdhci.1",
-        .parent         = &clk_div_d1_bus.clk,
-        .enable         = s5pc100_d1_0_ctrl,
-        .ctrlbit        = (1 << 6),
-};
-
-static struct clk clk_hsmmc0 = {
-        .name           = "hsmmc",
-        .devname        = "s3c-sdhci.0",
-        .parent         = &clk_div_d1_bus.clk,
-        .enable         = s5pc100_d1_0_ctrl,
-        .ctrlbit        = (1 << 5),
-};
-
-static struct clk clk_48m_spi0 = {
-        .name           = "spi_48m",
-        .devname        = "s5pc100-spi.0",
-        .parent         = &clk_mout_48m.clk,
-        .enable         = s5pc100_sclk0_ctrl,
-        .ctrlbit        = (1 << 7),
-};
-
-static struct clk clk_48m_spi1 = {
-        .name           = "spi_48m",
-        .devname        = "s5pc100-spi.1",
-        .parent         = &clk_mout_48m.clk,
-        .enable         = s5pc100_sclk0_ctrl,
-        .ctrlbit        = (1 << 8),
-};
-
-static struct clk clk_48m_spi2 = {
-        .name           = "spi_48m",
-        .devname        = "s5pc100-spi.2",
-        .parent         = &clk_mout_48m.clk,
-        .enable         = s5pc100_sclk0_ctrl,
-        .ctrlbit        = (1 << 9),
-};
-
-static struct clk clk_i2s0 = {
-        .name           = "iis",
-        .devname        = "samsung-i2s.0",
-        .parent         = &clk_div_pclkd1.clk,
-        .enable         = s5pc100_d1_5_ctrl,
-        .ctrlbit        = (1 << 0),
-};
-
-static struct clk clk_i2s1 = {
-        .name           = "iis",
-        .devname        = "samsung-i2s.1",
-        .parent         = &clk_div_pclkd1.clk,
-        .enable         = s5pc100_d1_5_ctrl,
-        .ctrlbit        = (1 << 1),
-};
-
-static struct clk clk_i2s2 = {
-        .name           = "iis",
-        .devname        = "samsung-i2s.2",
-        .parent         = &clk_div_pclkd1.clk,
-        .enable         = s5pc100_d1_5_ctrl,
-        .ctrlbit        = (1 << 2),
-};
-
-static struct clk clk_vclk54m = {
-        .name           = "vclk_54m",
-        .rate           = 54000000,
-};
-
-static struct clk clk_i2scdclk0 = {
-        .name           = "i2s_cdclk0",
-};
-
-static struct clk clk_i2scdclk1 = {
-        .name           = "i2s_cdclk1",
-};
-
-static struct clk clk_i2scdclk2 = {
-        .name           = "i2s_cdclk2",
-};
-
-static struct clk clk_pcmcdclk0 = {
-        .name           = "pcm_cdclk0",
-};
-
-static struct clk clk_pcmcdclk1 = {
-        .name           = "pcm_cdclk1",
-};
-
-static struct clk *clk_src_group1_list[] = {
-        [0] = &clk_mout_epll.clk,
-        [1] = &clk_div_mpll2.clk,
-        [2] = &clk_fin_epll,
-        [3] = &clk_mout_hpll.clk,
-};
-
-static struct clksrc_sources clk_src_group1 = {
-        .sources        = clk_src_group1_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_group1_list),
-};
-
-static struct clk *clk_src_group2_list[] = {
-        [0] = &clk_mout_epll.clk,
-        [1] = &clk_div_mpll.clk,
-};
-
-static struct clksrc_sources clk_src_group2 = {
-        .sources        = clk_src_group2_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_group2_list),
-};
-
-static struct clk *clk_src_group3_list[] = {
-        [0] = &clk_mout_epll.clk,
-        [1] = &clk_div_mpll.clk,
-        [2] = &clk_fin_epll,
-        [3] = &clk_i2scdclk0,
-        [4] = &clk_pcmcdclk0,
-        [5] = &clk_mout_hpll.clk,
-};
-
-static struct clksrc_sources clk_src_group3 = {
-        .sources        = clk_src_group3_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_group3_list),
-};
-
-static struct clksrc_clk clk_sclk_audio0 = {
-        .clk    = {
-                .name           = "sclk_audio",
-                .devname        = "samsung-pcm.0",
-                .ctrlbit        = (1 << 8),
-                .enable         = s5pc100_sclk1_ctrl,
-        },
-        .sources = &clk_src_group3,
-        .reg_src = { .reg = S5P_CLK_SRC3, .shift = 12, .size = 3 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 12, .size = 4 },
-};
-
-static struct clk *clk_src_group4_list[] = {
-        [0] = &clk_mout_epll.clk,
-        [1] = &clk_div_mpll.clk,
-        [2] = &clk_fin_epll,
-        [3] = &clk_i2scdclk1,
-        [4] = &clk_pcmcdclk1,
-        [5] = &clk_mout_hpll.clk,
-};
-
-static struct clksrc_sources clk_src_group4 = {
-        .sources        = clk_src_group4_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_group4_list),
-};
-
-static struct clksrc_clk clk_sclk_audio1 = {
-        .clk    = {
-                .name           = "sclk_audio",
-                .devname        = "samsung-pcm.1",
-                .ctrlbit        = (1 << 9),
-                .enable         = s5pc100_sclk1_ctrl,
-        },
-        .sources = &clk_src_group4,
-        .reg_src = { .reg = S5P_CLK_SRC3, .shift = 16, .size = 3 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 16, .size = 4 },
-};
-
-static struct clk *clk_src_group5_list[] = {
-        [0] = &clk_mout_epll.clk,
-        [1] = &clk_div_mpll.clk,
-        [2] = &clk_fin_epll,
-        [3] = &clk_i2scdclk2,
-        [4] = &clk_mout_hpll.clk,
-};
-
-static struct clksrc_sources clk_src_group5 = {
-        .sources        = clk_src_group5_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_group5_list),
-};
-
-static struct clksrc_clk clk_sclk_audio2 = {
-        .clk    = {
-                .name           = "sclk_audio",
-                .devname        = "samsung-pcm.2",
-                .ctrlbit        = (1 << 10),
-                .enable         = s5pc100_sclk1_ctrl,
-        },
-        .sources = &clk_src_group5,
-        .reg_src = { .reg = S5P_CLK_SRC3, .shift = 20, .size = 3 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 20, .size = 4 },
-};
-
-static struct clk *clk_src_group6_list[] = {
-        [0] = &s5p_clk_27m,
-        [1] = &clk_vclk54m,
-        [2] = &clk_div_hdmi.clk,
-};
-
-static struct clksrc_sources clk_src_group6 = {
-        .sources        = clk_src_group6_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_group6_list),
-};
-
-static struct clk *clk_src_group7_list[] = {
-        [0] = &clk_mout_epll.clk,
-        [1] = &clk_div_mpll.clk,
-        [2] = &clk_mout_hpll.clk,
-        [3] = &clk_vclk54m,
-};
-
-static struct clksrc_sources clk_src_group7 = {
-        .sources        = clk_src_group7_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_group7_list),
-};
-
-static struct clk *clk_src_mmc0_list[] = {
-        [0] = &clk_mout_epll.clk,
-        [1] = &clk_div_mpll.clk,
-        [2] = &clk_fin_epll,
-};
-
-static struct clksrc_sources clk_src_mmc0 = {
-        .sources        = clk_src_mmc0_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_mmc0_list),
-};
-
-static struct clk *clk_src_mmc12_list[] = {
-        [0] = &clk_mout_epll.clk,
-        [1] = &clk_div_mpll.clk,
-        [2] = &clk_fin_epll,
-        [3] = &clk_mout_hpll.clk,
-};
-
-static struct clksrc_sources clk_src_mmc12 = {
-        .sources        = clk_src_mmc12_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_mmc12_list),
-};
-
-static struct clk *clk_src_irda_usb_list[] = {
-        [0] = &clk_mout_epll.clk,
-        [1] = &clk_div_mpll.clk,
-        [2] = &clk_fin_epll,
-        [3] = &clk_mout_hpll.clk,
-};
-
-static struct clksrc_sources clk_src_irda_usb = {
-        .sources        = clk_src_irda_usb_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_irda_usb_list),
-};
-
-static struct clk *clk_src_pwi_list[] = {
-        [0] = &clk_fin_epll,
-        [1] = &clk_mout_epll.clk,
-        [2] = &clk_div_mpll.clk,
-};
-
-static struct clksrc_sources clk_src_pwi = {
-        .sources        = clk_src_pwi_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_pwi_list),
-};
-
-static struct clk *clk_sclk_spdif_list[] = {
-        [0] = &clk_sclk_audio0.clk,
-        [1] = &clk_sclk_audio1.clk,
-        [2] = &clk_sclk_audio2.clk,
-};
-
-static struct clksrc_sources clk_src_sclk_spdif = {
-        .sources        = clk_sclk_spdif_list,
-        .nr_sources     = ARRAY_SIZE(clk_sclk_spdif_list),
-};
-
-static struct clksrc_clk clk_sclk_spdif = {
-        .clk    = {
-                .name           = "sclk_spdif",
-                .ctrlbit        = (1 << 11),
-                .enable         = s5pc100_sclk1_ctrl,
-                .ops            = &s5p_sclk_spdif_ops,
-        },
-        .sources = &clk_src_sclk_spdif,
-        .reg_src = { .reg = S5P_CLK_SRC3, .shift = 24, .size = 2 },
-};
-
-static struct clksrc_clk clksrcs[] = {
-        {
-                .clk    = {
-                        .name           = "sclk_mixer",
-                        .ctrlbit        = (1 << 6),
-                        .enable         = s5pc100_sclk0_ctrl,
-
-                },
-                .sources = &clk_src_group6,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 28, .size = 2 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_lcd",
-                        .ctrlbit        = (1 << 0),
-                        .enable         = s5pc100_sclk1_ctrl,
-
-                },
-                .sources = &clk_src_group7,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 12, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 12, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_fimc",
-                        .devname        = "s5p-fimc.0",
-                        .ctrlbit        = (1 << 1),
-                        .enable         = s5pc100_sclk1_ctrl,
-
-                },
-                .sources = &clk_src_group7,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 16, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 16, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_fimc",
-                        .devname        = "s5p-fimc.1",
-                        .ctrlbit        = (1 << 2),
-                        .enable         = s5pc100_sclk1_ctrl,
-
-                },
-                .sources = &clk_src_group7,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 20, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_fimc",
-                        .devname        = "s5p-fimc.2",
-                        .ctrlbit        = (1 << 3),
-                        .enable         = s5pc100_sclk1_ctrl,
-
-                },
-                .sources = &clk_src_group7,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 24, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 24, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_irda",
-                        .ctrlbit        = (1 << 10),
-                        .enable         = s5pc100_sclk0_ctrl,
-
-                },
-                .sources = &clk_src_irda_usb,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 8, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 8, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_irda",
-                        .ctrlbit        = (1 << 10),
-                        .enable         = s5pc100_sclk0_ctrl,
-
-                },
-                .sources = &clk_src_mmc12,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 16, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV2, .shift = 16, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_pwi",
-                        .ctrlbit        = (1 << 1),
-                        .enable         = s5pc100_sclk0_ctrl,
-
-                },
-                .sources = &clk_src_pwi,
-                .reg_src = { .reg = S5P_CLK_SRC3, .shift = 0, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV4, .shift = 0, .size = 3 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_uhost",
-                        .ctrlbit        = (1 << 11),
-                        .enable         = s5pc100_sclk0_ctrl,
-
-                },
-                .sources = &clk_src_irda_usb,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 20, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV2, .shift = 20, .size = 4 },
-        },
-};
-
-static struct clksrc_clk clk_sclk_uart = {
-        .clk    = {
-                .name           = "uclk1",
-                .ctrlbit        = (1 << 3),
-                .enable         = s5pc100_sclk0_ctrl,
-        },
-        .sources = &clk_src_group2,
-        .reg_src = { .reg = S5P_CLK_SRC1, .shift = 0, .size = 1 },
-        .reg_div = { .reg = S5P_CLK_DIV2, .shift = 0, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc0 = {
-        .clk    = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.0",
-                .ctrlbit        = (1 << 12),
-                .enable         = s5pc100_sclk1_ctrl,
-        },
-        .sources = &clk_src_mmc0,
-        .reg_src = { .reg = S5P_CLK_SRC2, .shift = 0, .size = 2 },
-        .reg_div = { .reg = S5P_CLK_DIV3, .shift = 0, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc1 = {
-        .clk    = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.1",
-                .ctrlbit        = (1 << 13),
-                .enable         = s5pc100_sclk1_ctrl,
-        },
-        .sources = &clk_src_mmc12,
-        .reg_src = { .reg = S5P_CLK_SRC2, .shift = 4, .size = 2 },
-        .reg_div = { .reg = S5P_CLK_DIV3, .shift = 4, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc2 = {
-        .clk    = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.2",
-                .ctrlbit        = (1 << 14),
-                .enable         = s5pc100_sclk1_ctrl,
-        },
-        .sources = &clk_src_mmc12,
-        .reg_src = { .reg = S5P_CLK_SRC2, .shift = 8, .size = 2 },
-        .reg_div = { .reg = S5P_CLK_DIV3, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_spi0 = {
-        .clk    = {
-                .name           = "sclk_spi",
-                .devname        = "s5pc100-spi.0",
-                .ctrlbit        = (1 << 4),
-                .enable         = s5pc100_sclk0_ctrl,
-        },
-        .sources = &clk_src_group1,
-        .reg_src = { .reg = S5P_CLK_SRC1, .shift = 4, .size = 2 },
-        .reg_div = { .reg = S5P_CLK_DIV2, .shift = 4, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_spi1 = {
-        .clk    = {
-                .name           = "sclk_spi",
-                .devname        = "s5pc100-spi.1",
-                .ctrlbit        = (1 << 5),
-                .enable         = s5pc100_sclk0_ctrl,
-        },
-        .sources = &clk_src_group1,
-        .reg_src = { .reg = S5P_CLK_SRC1, .shift = 8, .size = 2 },
-        .reg_div = { .reg = S5P_CLK_DIV2, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_spi2 = {
-        .clk    = {
-                .name           = "sclk_spi",
-                .devname        = "s5pc100-spi.2",
-                .ctrlbit        = (1 << 6),
-                .enable         = s5pc100_sclk0_ctrl,
-        },
-        .sources = &clk_src_group1,
-        .reg_src = { .reg = S5P_CLK_SRC1, .shift = 12, .size = 2 },
-        .reg_div = { .reg = S5P_CLK_DIV2, .shift = 12, .size = 4 },
-};
-
-/* Clock initialisation code */
-static struct clksrc_clk *sysclks[] = {
-        &clk_mout_apll,
-        &clk_mout_epll,
-        &clk_mout_mpll,
-        &clk_mout_hpll,
-        &clk_mout_href,
-        &clk_mout_48m,
-        &clk_div_apll,
-        &clk_div_arm,
-        &clk_div_d0_bus,
-        &clk_div_pclkd0,
-        &clk_div_secss,
-        &clk_div_apll2,
-        &clk_mout_am,
-        &clk_div_d1_bus,
-        &clk_div_mpll2,
-        &clk_div_mpll,
-        &clk_mout_onenand,
-        &clk_div_onenand,
-        &clk_div_pclkd1,
-        &clk_div_cam,
-        &clk_div_hdmi,
-        &clk_sclk_audio0,
-        &clk_sclk_audio1,
-        &clk_sclk_audio2,
-        &clk_sclk_spdif,
-};
-
-static struct clk *clk_cdev[] = {
-        &clk_hsmmc0,
-        &clk_hsmmc1,
-        &clk_hsmmc2,
-        &clk_48m_spi0,
-        &clk_48m_spi1,
-        &clk_48m_spi2,
-        &clk_i2s0,
-        &clk_i2s1,
-        &clk_i2s2,
-};
-
-static struct clksrc_clk *clksrc_cdev[] = {
-        &clk_sclk_uart,
-        &clk_sclk_mmc0,
-        &clk_sclk_mmc1,
-        &clk_sclk_mmc2,
-        &clk_sclk_spi0,
-        &clk_sclk_spi1,
-        &clk_sclk_spi2,
-};
-
-void __init_or_cpufreq s5pc100_setup_clocks(void)
-{
-        unsigned long xtal;
-        unsigned long arm;
-        unsigned long hclkd0;
-        unsigned long hclkd1;
-        unsigned long pclkd0;
-        unsigned long pclkd1;
-        unsigned long apll;
-        unsigned long mpll;
-        unsigned long epll;
-        unsigned long hpll;
-        unsigned int ptr;
-
-        /* Set S5PC100 functions for clk_fout_epll */
-        clk_fout_epll.enable = s5p_epll_enable;
-        clk_fout_epll.ops = &s5pc100_epll_ops;
-
-        printk(KERN_DEBUG "%s: registering clocks\n", __func__);
-
-        xtal = clk_get_rate(&clk_xtal);
-
-        printk(KERN_DEBUG "%s: xtal is %ld\n", __func__, xtal);
-
-        apll = s5p_get_pll65xx(xtal, __raw_readl(S5P_APLL_CON));
-        mpll = s5p_get_pll65xx(xtal, __raw_readl(S5P_MPLL_CON));
-        epll = s5p_get_pll65xx(xtal, __raw_readl(S5P_EPLL_CON));
-        hpll = s5p_get_pll65xx(xtal, __raw_readl(S5P_HPLL_CON));
-
-        printk(KERN_INFO "S5PC100: PLL settings, A=%ld.%ldMHz, M=%ld.%ldMHz, E=%ld.%ldMHz, H=%ld.%ldMHz\n",
-                        print_mhz(apll), print_mhz(mpll), print_mhz(epll), print_mhz(hpll));
-
-        clk_fout_apll.rate = apll;
-        clk_fout_mpll.rate = mpll;
-        clk_fout_epll.rate = epll;
-        clk_mout_hpll.clk.rate = hpll;
-
-        for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
-                s3c_set_clksrc(&clksrcs[ptr], true);
-
-        arm = clk_get_rate(&clk_div_arm.clk);
-        hclkd0 = clk_get_rate(&clk_div_d0_bus.clk);
-        pclkd0 = clk_get_rate(&clk_div_pclkd0.clk);
-        hclkd1 = clk_get_rate(&clk_div_d1_bus.clk);
-        pclkd1 = clk_get_rate(&clk_div_pclkd1.clk);
-
-        printk(KERN_INFO "S5PC100: HCLKD0=%ld.%ldMHz, HCLKD1=%ld.%ldMHz, PCLKD0=%ld.%ldMHz, PCLKD1=%ld.%ldMHz\n",
-                        print_mhz(hclkd0), print_mhz(hclkd1), print_mhz(pclkd0), print_mhz(pclkd1));
-
-        clk_f.rate = arm;
-        clk_h.rate = hclkd1;
-        clk_p.rate = pclkd1;
-}
-
-/*
- * The following clocks will be enabled during clock initialization.
- */
-static struct clk init_clocks[] = {
-        {
-                .name           = "tzic",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_0_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "intc",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_0_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "ebi",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_1_ctrl,
-                .ctrlbit        = (1 << 5),
-        }, {
-                .name           = "intmem",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_1_ctrl,
-                .ctrlbit        = (1 << 4),
-        }, {
-                .name           = "sromc",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_1_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "dmc",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_1_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "chipid",
-                .parent         = &clk_div_d0_bus.clk,
-                .enable         = s5pc100_d0_1_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "gpio",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_3_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.0",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.1",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.2",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 2),
-        }, {
-                .name           = "uart",
-                .devname        = "s3c6400-uart.3",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_4_ctrl,
-                .ctrlbit        = (1 << 3),
-        }, {
-                .name           = "timers",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_3_ctrl,
-                .ctrlbit        = (1 << 6),
-        },
-};
-
-static struct clk *clks[] __initdata = {
-        &clk_ext,
-        &clk_i2scdclk0,
-        &clk_i2scdclk1,
-        &clk_i2scdclk2,
-        &clk_pcmcdclk0,
-        &clk_pcmcdclk1,
-};
-
-static struct clk_lookup s5pc100_clk_lookup[] = {
-        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p),
-        CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_sclk_uart.clk),
-        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &clk_hsmmc0),
-        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &clk_hsmmc1),
-        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.0", &clk_hsmmc2),
-        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
-        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
-        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
-        CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
-        CLKDEV_INIT("s5pc100-spi.0", "spi_busclk1", &clk_48m_spi0),
-        CLKDEV_INIT("s5pc100-spi.0", "spi_busclk2", &clk_sclk_spi0.clk),
-        CLKDEV_INIT("s5pc100-spi.1", "spi_busclk1", &clk_48m_spi1),
-        CLKDEV_INIT("s5pc100-spi.1", "spi_busclk2", &clk_sclk_spi1.clk),
-        CLKDEV_INIT("s5pc100-spi.2", "spi_busclk1", &clk_48m_spi2),
-        CLKDEV_INIT("s5pc100-spi.2", "spi_busclk2", &clk_sclk_spi2.clk),
-        CLKDEV_INIT("samsung-i2s.0", "i2s_opclk0", &clk_i2s0),
-        CLKDEV_INIT("samsung-i2s.1", "i2s_opclk0", &clk_i2s1),
-        CLKDEV_INIT("samsung-i2s.2", "i2s_opclk0", &clk_i2s2),
-};
-
-void __init s5pc100_register_clocks(void)
-{
-        int ptr;
-
-        s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
-
-        for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++)
-                s3c_register_clksrc(sysclks[ptr], 1);
-
-        s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
-        s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
-        for (ptr = 0; ptr < ARRAY_SIZE(clksrc_cdev); ptr++)
-                s3c_register_clksrc(clksrc_cdev[ptr], 1);
-
-        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(s5pc100_clk_lookup, ARRAY_SIZE(s5pc100_clk_lookup));
-
-        s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));
-        for (ptr = 0; ptr < ARRAY_SIZE(clk_cdev); ptr++)
-                s3c_disable_clocks(clk_cdev[ptr], 1);
-
-        s3c24xx_register_clock(&dummy_apb_pclk);
-}
diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c
deleted file mode 100644
index 6a41bf7dacf6..000000000000
--- a/arch/arm/mach-s5pc100/common.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * Common Codes for S5PC100
- *
- * 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/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/device.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <clocksource/samsung_pwm.h>
-#include <linux/platform_device.h>
-#include <linux/sched.h>
-#include <linux/reboot.h>
-
-#include <asm/irq.h>
-#include <asm/proc-fns.h>
-#include <asm/system_misc.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/map.h>
-#include <mach/hardware.h>
-#include <mach/regs-clock.h>
-
-#include <plat/cpu.h>
-#include <plat/devs.h>
-#include <plat/clock.h>
-#include <plat/sdhci.h>
-#include <plat/adc-core.h>
-#include <plat/ata-core.h>
-#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/watchdog-reset.h>
-
-#include "common.h"
-
-static const char name_s5pc100[] = "S5PC100";
-
-static struct cpu_table cpu_ids[] __initdata = {
-        {
-                .idcode         = S5PC100_CPU_ID,
-                .idmask         = S5PC100_CPU_MASK,
-                .map_io         = s5pc100_map_io,
-                .init_clocks    = s5pc100_init_clocks,
-                .init_uarts     = s5pc100_init_uarts,
-                .init           = s5pc100_init,
-                .name           = name_s5pc100,
-        },
-};
-
-/* Initial IO mappings */
-
-static struct map_desc s5pc100_iodesc[] __initdata = {
-        {
-                .virtual        = (unsigned long)S5P_VA_CHIPID,
-                .pfn            = __phys_to_pfn(S5PC100_PA_CHIPID),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_SYS,
-                .pfn            = __phys_to_pfn(S5PC100_PA_SYSCON),
-                .length         = SZ_64K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_TIMER,
-                .pfn            = __phys_to_pfn(S5PC100_PA_TIMER),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_WATCHDOG,
-                .pfn            = __phys_to_pfn(S5PC100_PA_WATCHDOG),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_SROMC,
-                .pfn            = __phys_to_pfn(S5PC100_PA_SROMC),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_SYSTIMER,
-                .pfn            = __phys_to_pfn(S5PC100_PA_SYSTIMER),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_GPIO,
-                .pfn            = __phys_to_pfn(S5PC100_PA_GPIO),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC0,
-                .pfn            = __phys_to_pfn(S5PC100_PA_VIC0),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC1,
-                .pfn            = __phys_to_pfn(S5PC100_PA_VIC1),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC2,
-                .pfn            = __phys_to_pfn(S5PC100_PA_VIC2),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_UART,
-                .pfn            = __phys_to_pfn(S3C_PA_UART),
-                .length         = SZ_512K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5PC100_VA_OTHERS,
-                .pfn            = __phys_to_pfn(S5PC100_PA_OTHERS),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }
-};
-
-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
- *
- * register the standard CPU IO areas
- */
-
-void __init s5pc100_init_io(struct map_desc *mach_desc, int size)
-{
-        /* initialize the io descriptors we need for initialization */
-        iotable_init(s5pc100_iodesc, ARRAY_SIZE(s5pc100_iodesc));
-        if (mach_desc)
-                iotable_init(mach_desc, size);
-
-        /* detect cpu id and rev. */
-        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)
-{
-        /* initialise device information early */
-        s5pc100_default_sdhci0();
-        s5pc100_default_sdhci1();
-        s5pc100_default_sdhci2();
-
-        s3c_adc_setname("s3c64xx-adc");
-
-        /* the i2c devices are directly compatible with s3c2440 */
-        s3c_i2c0_setname("s3c2440-i2c");
-        s3c_i2c1_setname("s3c2440-i2c");
-
-        s3c_onenand_setname("s5pc100-onenand");
-        s3c_fb_setname("s5pc100-fb");
-        s3c_cfcon_setname("s5pc100-pata");
-
-        s3c64xx_spi_setname("s5pc100-spi");
-}
-
-void __init s5pc100_init_clocks(int xtal)
-{
-        printk(KERN_DEBUG "%s: initializing clocks\n", __func__);
-
-        s3c24xx_register_baseclocks(xtal);
-        s5p_register_clocks(xtal);
-        s5pc100_register_clocks();
-        s5pc100_setup_clocks();
-        samsung_wdt_reset_init(S3C_VA_WATCHDOG);
-}
-
-void __init s5pc100_init_irq(void)
-{
-        u32 vic[] = {~0, ~0, ~0};
-
-        /* VIC0, VIC1, and VIC2 are fully populated. */
-        s5p_init_irq(vic, ARRAY_SIZE(vic));
-}
-
-static struct bus_type s5pc100_subsys = {
-        .name           = "s5pc100-core",
-        .dev_name       = "s5pc100-core",
-};
-
-static struct device s5pc100_dev = {
-        .bus    = &s5pc100_subsys,
-};
-
-static int __init s5pc100_core_init(void)
-{
-        return subsys_system_register(&s5pc100_subsys, NULL);
-}
-core_initcall(s5pc100_core_init);
-
-int __init s5pc100_init(void)
-{
-        printk(KERN_INFO "S5PC100: Initializing architecture\n");
-        return device_register(&s5pc100_dev);
-}
-
-/* uart registration process */
-
-void __init s5pc100_init_uarts(struct s3c2410_uartcfg *cfg, int no)
-{
-        s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
-}
-
-void s5pc100_restart(enum reboot_mode mode, const char *cmd)
-{
-        if (mode != REBOOT_SOFT)
-                samsung_wdt_reset();
-
-        soft_restart(0);
-}
diff --git a/arch/arm/mach-s5pc100/common.h b/arch/arm/mach-s5pc100/common.h
deleted file mode 100644
index 08d782d65d7b..000000000000
--- a/arch/arm/mach-s5pc100/common.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Common Header for S5PC100 machines
- *
- * 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_S5PC100_COMMON_H
-#define __ARCH_ARM_MACH_S5PC100_COMMON_H
-
-#include <linux/reboot.h>
-
-void s5pc100_init_io(struct map_desc *mach_desc, int size);
-void s5pc100_init_irq(void);
-
-void s5pc100_register_clocks(void);
-void s5pc100_setup_clocks(void);
-
-void s5pc100_restart(enum reboot_mode mode, const char *cmd);
-
-extern  int s5pc100_init(void);
-extern void s5pc100_map_io(void);
-extern void s5pc100_init_clocks(int xtal);
-extern void s5pc100_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
-#endif /* __ARCH_ARM_MACH_S5PC100_COMMON_H */
diff --git a/arch/arm/mach-s5pc100/dev-audio.c b/arch/arm/mach-s5pc100/dev-audio.c
deleted file mode 100644
index 46f488b09391..000000000000
--- a/arch/arm/mach-s5pc100/dev-audio.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/dev-audio.c
- *
- * Copyright (c) 2010 Samsung Electronics Co. Ltd
- *      Jaswinder Singh <jassi.brar@samsung.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/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <plat/gpio-cfg.h>
-#include <linux/platform_data/asoc-s3c.h>
-
-#include <mach/map.h>
-#include <mach/dma.h>
-#include <mach/irqs.h>
-
-static int s5pc100_cfg_i2s(struct platform_device *pdev)
-{
-        /* configure GPIO for i2s port */
-        switch (pdev->id) {
-        case 0: /* Dedicated pins */
-                break;
-        case 1:
-                s3c_gpio_cfgpin_range(S5PC100_GPC(0), 5, S3C_GPIO_SFN(2));
-                break;
-        case 2:
-                s3c_gpio_cfgpin_range(S5PC100_GPG3(0), 5, S3C_GPIO_SFN(4));
-                break;
-        default:
-                printk(KERN_ERR "Invalid Device %d\n", pdev->id);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct s3c_audio_pdata i2sv5_pdata = {
-        .cfg_gpio = s5pc100_cfg_i2s,
-        .type = {
-                .i2s = {
-                        .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
-                                         | QUIRK_NEED_RSTCLR,
-                },
-        },
-};
-
-static struct resource s5pc100_iis0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PC100_PA_I2S0, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_I2S0_TX),
-        [2] = DEFINE_RES_DMA(DMACH_I2S0_RX),
-        [3] = DEFINE_RES_DMA(DMACH_I2S0S_TX),
-};
-
-struct platform_device s5pc100_device_iis0 = {
-        .name = "samsung-i2s",
-        .id = 0,
-        .num_resources    = ARRAY_SIZE(s5pc100_iis0_resource),
-        .resource         = s5pc100_iis0_resource,
-        .dev = {
-                .platform_data = &i2sv5_pdata,
-        },
-};
-
-static struct s3c_audio_pdata i2sv3_pdata = {
-        .cfg_gpio = s5pc100_cfg_i2s,
-};
-
-static struct resource s5pc100_iis1_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PC100_PA_I2S1, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_I2S1_TX),
-        [2] = DEFINE_RES_DMA(DMACH_I2S1_RX),
-};
-
-struct platform_device s5pc100_device_iis1 = {
-        .name             = "samsung-i2s",
-        .id               = 1,
-        .num_resources    = ARRAY_SIZE(s5pc100_iis1_resource),
-        .resource         = s5pc100_iis1_resource,
-        .dev = {
-                .platform_data = &i2sv3_pdata,
-        },
-};
-
-static struct resource s5pc100_iis2_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PC100_PA_I2S2, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_I2S2_TX),
-        [2] = DEFINE_RES_DMA(DMACH_I2S2_RX),
-};
-
-struct platform_device s5pc100_device_iis2 = {
-        .name             = "samsung-i2s",
-        .id               = 2,
-        .num_resources    = ARRAY_SIZE(s5pc100_iis2_resource),
-        .resource         = s5pc100_iis2_resource,
-        .dev = {
-                .platform_data = &i2sv3_pdata,
-        },
-};
-
-/* PCM Controller platform_devices */
-
-static int s5pc100_pcm_cfg_gpio(struct platform_device *pdev)
-{
-        switch (pdev->id) {
-        case 0:
-                s3c_gpio_cfgpin_range(S5PC100_GPG3(0), 5, S3C_GPIO_SFN(5));
-                break;
-
-        case 1:
-                s3c_gpio_cfgpin_range(S5PC100_GPC(0), 5, S3C_GPIO_SFN(3));
-                break;
-
-        default:
-                printk(KERN_DEBUG "Invalid PCM Controller number!");
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct s3c_audio_pdata s3c_pcm_pdata = {
-        .cfg_gpio = s5pc100_pcm_cfg_gpio,
-};
-
-static struct resource s5pc100_pcm0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PC100_PA_PCM0, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_PCM0_TX),
-        [2] = DEFINE_RES_DMA(DMACH_PCM0_RX),
-};
-
-struct platform_device s5pc100_device_pcm0 = {
-        .name             = "samsung-pcm",
-        .id               = 0,
-        .num_resources    = ARRAY_SIZE(s5pc100_pcm0_resource),
-        .resource         = s5pc100_pcm0_resource,
-        .dev = {
-                .platform_data = &s3c_pcm_pdata,
-        },
-};
-
-static struct resource s5pc100_pcm1_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PC100_PA_PCM1, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_PCM1_TX),
-        [2] = DEFINE_RES_DMA(DMACH_PCM1_RX),
-};
-
-struct platform_device s5pc100_device_pcm1 = {
-        .name             = "samsung-pcm",
-        .id               = 1,
-        .num_resources    = ARRAY_SIZE(s5pc100_pcm1_resource),
-        .resource         = s5pc100_pcm1_resource,
-        .dev = {
-                .platform_data = &s3c_pcm_pdata,
-        },
-};
-
-/* AC97 Controller platform devices */
-
-static int s5pc100_ac97_cfg_gpio(struct platform_device *pdev)
-{
-        return s3c_gpio_cfgpin_range(S5PC100_GPC(0), 5, S3C_GPIO_SFN(4));
-}
-
-static struct resource s5pc100_ac97_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PC100_PA_AC97, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_AC97_PCMOUT),
-        [2] = DEFINE_RES_DMA(DMACH_AC97_PCMIN),
-        [3] = DEFINE_RES_DMA(DMACH_AC97_MICIN),
-        [4] = DEFINE_RES_IRQ(IRQ_AC97),
-};
-
-static struct s3c_audio_pdata s3c_ac97_pdata = {
-        .cfg_gpio = s5pc100_ac97_cfg_gpio,
-};
-
-static u64 s5pc100_ac97_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5pc100_device_ac97 = {
-        .name             = "samsung-ac97",
-        .id               = -1,
-        .num_resources    = ARRAY_SIZE(s5pc100_ac97_resource),
-        .resource         = s5pc100_ac97_resource,
-        .dev = {
-                .platform_data = &s3c_ac97_pdata,
-                .dma_mask = &s5pc100_ac97_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-};
-
-/* S/PDIF Controller platform_device */
-static int s5pc100_spdif_cfg_gpd(struct platform_device *pdev)
-{
-        s3c_gpio_cfgpin_range(S5PC100_GPD(5), 2, S3C_GPIO_SFN(3));
-
-        return 0;
-}
-
-static int s5pc100_spdif_cfg_gpg3(struct platform_device *pdev)
-{
-        s3c_gpio_cfgpin_range(S5PC100_GPG3(5), 2, S3C_GPIO_SFN(3));
-
-        return 0;
-}
-
-static struct resource s5pc100_spdif_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PC100_PA_SPDIF, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_SPDIF),
-};
-
-static struct s3c_audio_pdata s5p_spdif_pdata = {
-        .cfg_gpio = s5pc100_spdif_cfg_gpd,
-};
-
-static u64 s5pc100_spdif_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5pc100_device_spdif = {
-        .name           = "samsung-spdif",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5pc100_spdif_resource),
-        .resource       = s5pc100_spdif_resource,
-        .dev = {
-                .platform_data = &s5p_spdif_pdata,
-                .dma_mask = &s5pc100_spdif_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-};
-
-void __init s5pc100_spdif_setup_gpio(int gpio)
-{
-        if (gpio == S5PC100_SPDIF_GPD)
-                s5p_spdif_pdata.cfg_gpio = s5pc100_spdif_cfg_gpd;
-        else
-                s5p_spdif_pdata.cfg_gpio = s5pc100_spdif_cfg_gpg3;
-}
diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c
deleted file mode 100644
index b1418409709e..000000000000
--- a/arch/arm/mach-s5pc100/dma.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/dma.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/pl330.h>
-
-#include <asm/irq.h>
-#include <plat/devs.h>
-#include <plat/irqs.h>
-
-#include <mach/map.h>
-#include <mach/irqs.h>
-#include <mach/dma.h>
-
-static u8 pdma0_peri[] = {
-        DMACH_UART0_RX,
-        DMACH_UART0_TX,
-        DMACH_UART1_RX,
-        DMACH_UART1_TX,
-        DMACH_UART2_RX,
-        DMACH_UART2_TX,
-        DMACH_UART3_RX,
-        DMACH_UART3_TX,
-        DMACH_IRDA,
-        DMACH_I2S0_RX,
-        DMACH_I2S0_TX,
-        DMACH_I2S0S_TX,
-        DMACH_I2S1_RX,
-        DMACH_I2S1_TX,
-        DMACH_I2S2_RX,
-        DMACH_I2S2_TX,
-        DMACH_SPI0_RX,
-        DMACH_SPI0_TX,
-        DMACH_SPI1_RX,
-        DMACH_SPI1_TX,
-        DMACH_SPI2_RX,
-        DMACH_SPI2_TX,
-        DMACH_AC97_MICIN,
-        DMACH_AC97_PCMIN,
-        DMACH_AC97_PCMOUT,
-        DMACH_EXTERNAL,
-        DMACH_PWM,
-        DMACH_SPDIF,
-        DMACH_HSI_RX,
-        DMACH_HSI_TX,
-};
-
-static struct dma_pl330_platdata s5pc100_pdma0_pdata = {
-        .nr_valid_peri = ARRAY_SIZE(pdma0_peri),
-        .peri_id = pdma0_peri,
-};
-
-static AMBA_AHB_DEVICE(s5pc100_pdma0,  "dma-pl330.0", 0x00041330,
-        S5PC100_PA_PDMA0, {IRQ_PDMA0}, &s5pc100_pdma0_pdata);
-
-static u8 pdma1_peri[] = {
-        DMACH_UART0_RX,
-        DMACH_UART0_TX,
-        DMACH_UART1_RX,
-        DMACH_UART1_TX,
-        DMACH_UART2_RX,
-        DMACH_UART2_TX,
-        DMACH_UART3_RX,
-        DMACH_UART3_TX,
-        DMACH_IRDA,
-        DMACH_I2S0_RX,
-        DMACH_I2S0_TX,
-        DMACH_I2S0S_TX,
-        DMACH_I2S1_RX,
-        DMACH_I2S1_TX,
-        DMACH_I2S2_RX,
-        DMACH_I2S2_TX,
-        DMACH_SPI0_RX,
-        DMACH_SPI0_TX,
-        DMACH_SPI1_RX,
-        DMACH_SPI1_TX,
-        DMACH_SPI2_RX,
-        DMACH_SPI2_TX,
-        DMACH_PCM0_RX,
-        DMACH_PCM0_TX,
-        DMACH_PCM1_RX,
-        DMACH_PCM1_TX,
-        DMACH_MSM_REQ0,
-        DMACH_MSM_REQ1,
-        DMACH_MSM_REQ2,
-        DMACH_MSM_REQ3,
-};
-
-static struct dma_pl330_platdata s5pc100_pdma1_pdata = {
-        .nr_valid_peri = ARRAY_SIZE(pdma1_peri),
-        .peri_id = pdma1_peri,
-};
-
-static AMBA_AHB_DEVICE(s5pc100_pdma1, "dma-pl330.1", 0x00041330,
-        S5PC100_PA_PDMA1, {IRQ_PDMA1}, &s5pc100_pdma1_pdata);
-
-static int __init s5pc100_dma_init(void)
-{
-        dma_cap_set(DMA_SLAVE, s5pc100_pdma0_pdata.cap_mask);
-        dma_cap_set(DMA_CYCLIC, s5pc100_pdma0_pdata.cap_mask);
-        amba_device_register(&s5pc100_pdma0_device, &iomem_resource);
-
-        dma_cap_set(DMA_SLAVE, s5pc100_pdma1_pdata.cap_mask);
-        dma_cap_set(DMA_CYCLIC, s5pc100_pdma1_pdata.cap_mask);
-        amba_device_register(&s5pc100_pdma1_device, &iomem_resource);
-
-        return 0;
-}
-arch_initcall(s5pc100_dma_init);
diff --git a/arch/arm/mach-s5pc100/include/mach/debug-macro.S b/arch/arm/mach-s5pc100/include/mach/debug-macro.S
deleted file mode 100644
index 22c23859e45e..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/debug-macro.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/* arch/arm/mach-s5pc100/include/mach/debug-macro.S
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- *
- * Based on mach-s3c6400/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.
-*/
-
-/* pull in the relevant register and map files. */
-
-#include <linux/serial_s3c.h>
-#include <mach/map.h>
-
-        /* note, for the boot process to work we have to keep the UART
-         * virtual address aligned to an 1MiB boundary for the L1
-         * mapping the head code makes. We keep the UART virtual address
-         * aligned and add in the offset when we load the value here.
-         */
-
-        .macro addruart, rp, rv, tmp
-                ldr     \rp, = S3C_PA_UART
-                ldr     \rv, = S3C_VA_UART
-#if CONFIG_DEBUG_S3C_UART != 0
-                add     \rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
-                add     \rv, \rv, #(0x400 * CONFIG_DEBUG_S3C_UART)
-#endif
-        .endm
-
-/* include the reset of the code which will do the work, we're only
- * compiling for a single cpu processor type so the default of s3c2440
- * will be fine with us.
- */
-
-#include <debug/samsung.S>
diff --git a/arch/arm/mach-s5pc100/include/mach/entry-macro.S b/arch/arm/mach-s5pc100/include/mach/entry-macro.S
deleted file mode 100644
index bad0700457db..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/entry-macro.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* arch/arm/mach-s5pc100/include/mach/entry-macro.S
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * Based on mach-s3c6400/include/mach/entry-macro.S
- *
- * Low-level IRQ helper macros for the Samsung S5PC1XX series
- *
- * 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.
-*/
-
-        .macro  get_irqnr_preamble, base, tmp
-        .endm
-
-        .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-        .endm
diff --git a/arch/arm/mach-s5pc100/include/mach/gpio.h b/arch/arm/mach-s5pc100/include/mach/gpio.h
deleted file mode 100644
index 5e1a924b595f..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/gpio.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* arch/arm/mach-s5pc100/include/mach/gpio.h
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * S5PC100 - GPIO lib support
- *
- * Base on mach-s3c6400/include/mach/gpio.h
- *
- * 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_GPIO_H
-#define __ASM_ARCH_GPIO_H __FILE__
-
-/* GPIO bank sizes */
-#define S5PC100_GPIO_A0_NR      (8)
-#define S5PC100_GPIO_A1_NR      (5)
-#define S5PC100_GPIO_B_NR       (8)
-#define S5PC100_GPIO_C_NR       (5)
-#define S5PC100_GPIO_D_NR       (7)
-#define S5PC100_GPIO_E0_NR      (8)
-#define S5PC100_GPIO_E1_NR      (6)
-#define S5PC100_GPIO_F0_NR      (8)
-#define S5PC100_GPIO_F1_NR      (8)
-#define S5PC100_GPIO_F2_NR      (8)
-#define S5PC100_GPIO_F3_NR      (4)
-#define S5PC100_GPIO_G0_NR      (8)
-#define S5PC100_GPIO_G1_NR      (3)
-#define S5PC100_GPIO_G2_NR      (7)
-#define S5PC100_GPIO_G3_NR      (7)
-#define S5PC100_GPIO_H0_NR      (8)
-#define S5PC100_GPIO_H1_NR      (8)
-#define S5PC100_GPIO_H2_NR      (8)
-#define S5PC100_GPIO_H3_NR      (8)
-#define S5PC100_GPIO_I_NR       (8)
-#define S5PC100_GPIO_J0_NR      (8)
-#define S5PC100_GPIO_J1_NR      (5)
-#define S5PC100_GPIO_J2_NR      (8)
-#define S5PC100_GPIO_J3_NR      (8)
-#define S5PC100_GPIO_J4_NR      (4)
-#define S5PC100_GPIO_K0_NR      (8)
-#define S5PC100_GPIO_K1_NR      (6)
-#define S5PC100_GPIO_K2_NR      (8)
-#define S5PC100_GPIO_K3_NR      (8)
-#define S5PC100_GPIO_L0_NR      (8)
-#define S5PC100_GPIO_L1_NR      (8)
-#define S5PC100_GPIO_L2_NR      (8)
-#define S5PC100_GPIO_L3_NR      (8)
-#define S5PC100_GPIO_L4_NR      (8)
-
-/* GPIO bank numbes */
-
-/* CONFIG_S3C_GPIO_SPACE allows the user to select extra
- * space for debugging purposes so that any accidental
- * change from one gpio bank to another can be caught.
-*/
-
-#define S5PC100_GPIO_NEXT(__gpio) \
-        ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1)
-
-enum s5p_gpio_number {
-        S5PC100_GPIO_A0_START   = 0,
-        S5PC100_GPIO_A1_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_A0),
-        S5PC100_GPIO_B_START    = S5PC100_GPIO_NEXT(S5PC100_GPIO_A1),
-        S5PC100_GPIO_C_START    = S5PC100_GPIO_NEXT(S5PC100_GPIO_B),
-        S5PC100_GPIO_D_START    = S5PC100_GPIO_NEXT(S5PC100_GPIO_C),
-        S5PC100_GPIO_E0_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_D),
-        S5PC100_GPIO_E1_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_E0),
-        S5PC100_GPIO_F0_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_E1),
-        S5PC100_GPIO_F1_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_F0),
-        S5PC100_GPIO_F2_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_F1),
-        S5PC100_GPIO_F3_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_F2),
-        S5PC100_GPIO_G0_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_F3),
-        S5PC100_GPIO_G1_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_G0),
-        S5PC100_GPIO_G2_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_G1),
-        S5PC100_GPIO_G3_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_G2),
-        S5PC100_GPIO_H0_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_G3),
-        S5PC100_GPIO_H1_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_H0),
-        S5PC100_GPIO_H2_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_H1),
-        S5PC100_GPIO_H3_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_H2),
-        S5PC100_GPIO_I_START    = S5PC100_GPIO_NEXT(S5PC100_GPIO_H3),
-        S5PC100_GPIO_J0_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_I),
-        S5PC100_GPIO_J1_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_J0),
-        S5PC100_GPIO_J2_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_J1),
-        S5PC100_GPIO_J3_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_J2),
-        S5PC100_GPIO_J4_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_J3),
-        S5PC100_GPIO_K0_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_J4),
-        S5PC100_GPIO_K1_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_K0),
-        S5PC100_GPIO_K2_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_K1),
-        S5PC100_GPIO_K3_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_K2),
-        S5PC100_GPIO_L0_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_K3),
-        S5PC100_GPIO_L1_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_L0),
-        S5PC100_GPIO_L2_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_L1),
-        S5PC100_GPIO_L3_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_L2),
-        S5PC100_GPIO_L4_START   = S5PC100_GPIO_NEXT(S5PC100_GPIO_L3),
-        S5PC100_GPIO_END        = S5PC100_GPIO_NEXT(S5PC100_GPIO_L4),
-};
-
-/* S5PC100 GPIO number definitions. */
-#define S5PC100_GPA0(_nr)       (S5PC100_GPIO_A0_START + (_nr))
-#define S5PC100_GPA1(_nr)       (S5PC100_GPIO_A1_START + (_nr))
-#define S5PC100_GPB(_nr)        (S5PC100_GPIO_B_START + (_nr))
-#define S5PC100_GPC(_nr)        (S5PC100_GPIO_C_START + (_nr))
-#define S5PC100_GPD(_nr)        (S5PC100_GPIO_D_START + (_nr))
-#define S5PC100_GPE0(_nr)       (S5PC100_GPIO_E0_START + (_nr))
-#define S5PC100_GPE1(_nr)       (S5PC100_GPIO_E1_START + (_nr))
-#define S5PC100_GPF0(_nr)       (S5PC100_GPIO_F0_START + (_nr))
-#define S5PC100_GPF1(_nr)       (S5PC100_GPIO_F1_START + (_nr))
-#define S5PC100_GPF2(_nr)       (S5PC100_GPIO_F2_START + (_nr))
-#define S5PC100_GPF3(_nr)       (S5PC100_GPIO_F3_START + (_nr))
-#define S5PC100_GPG0(_nr)       (S5PC100_GPIO_G0_START + (_nr))
-#define S5PC100_GPG1(_nr)       (S5PC100_GPIO_G1_START + (_nr))
-#define S5PC100_GPG2(_nr)       (S5PC100_GPIO_G2_START + (_nr))
-#define S5PC100_GPG3(_nr)       (S5PC100_GPIO_G3_START + (_nr))
-#define S5PC100_GPH0(_nr)       (S5PC100_GPIO_H0_START + (_nr))
-#define S5PC100_GPH1(_nr)       (S5PC100_GPIO_H1_START + (_nr))
-#define S5PC100_GPH2(_nr)       (S5PC100_GPIO_H2_START + (_nr))
-#define S5PC100_GPH3(_nr)       (S5PC100_GPIO_H3_START + (_nr))
-#define S5PC100_GPI(_nr)        (S5PC100_GPIO_I_START + (_nr))
-#define S5PC100_GPJ0(_nr)       (S5PC100_GPIO_J0_START + (_nr))
-#define S5PC100_GPJ1(_nr)       (S5PC100_GPIO_J1_START + (_nr))
-#define S5PC100_GPJ2(_nr)       (S5PC100_GPIO_J2_START + (_nr))
-#define S5PC100_GPJ3(_nr)       (S5PC100_GPIO_J3_START + (_nr))
-#define S5PC100_GPJ4(_nr)       (S5PC100_GPIO_J4_START + (_nr))
-#define S5PC100_GPK0(_nr)       (S5PC100_GPIO_K0_START + (_nr))
-#define S5PC100_GPK1(_nr)       (S5PC100_GPIO_K1_START + (_nr))
-#define S5PC100_GPK2(_nr)       (S5PC100_GPIO_K2_START + (_nr))
-#define S5PC100_GPK3(_nr)       (S5PC100_GPIO_K3_START + (_nr))
-#define S5PC100_GPL0(_nr)       (S5PC100_GPIO_L0_START + (_nr))
-#define S5PC100_GPL1(_nr)       (S5PC100_GPIO_L1_START + (_nr))
-#define S5PC100_GPL2(_nr)       (S5PC100_GPIO_L2_START + (_nr))
-#define S5PC100_GPL3(_nr)       (S5PC100_GPIO_L3_START + (_nr))
-#define S5PC100_GPL4(_nr)       (S5PC100_GPIO_L4_START + (_nr))
-
-/* It used the end of the S5PC100 gpios */
-#define S3C_GPIO_END            S5PC100_GPIO_END
-
-/* define the number of gpios we need to the one after the MP04() range */
-#define ARCH_NR_GPIOS           (S5PC100_GPIO_END + 1)
-
-#endif /* __ASM_ARCH_GPIO_H */
diff --git a/arch/arm/mach-s5pc100/include/mach/hardware.h b/arch/arm/mach-s5pc100/include/mach/hardware.h
deleted file mode 100644
index 6b38618c2fd9..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/hardware.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/include/mach/hardware.h
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * S5PC100 - Hardware support
- */
-
-#ifndef __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H __FILE__
-
-/* currently nothing here, placeholder */
-
-#endif /* __ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-s5pc100/include/mach/irqs.h b/arch/arm/mach-s5pc100/include/mach/irqs.h
deleted file mode 100644
index d2eb4757381f..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/irqs.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/include/mach/irqs.h
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * S5PC100 - IRQ definitions
- */
-
-#ifndef __ASM_ARCH_IRQS_H
-#define __ASM_ARCH_IRQS_H __FILE__
-
-#include <plat/irqs.h>
-
-/* VIC0: system, DMA, timer */
-#define IRQ_EINT16_31           S5P_IRQ_VIC0(16)
-#define IRQ_BATF                S5P_IRQ_VIC0(17)
-#define IRQ_MDMA                S5P_IRQ_VIC0(18)
-#define IRQ_PDMA0               S5P_IRQ_VIC0(19)
-#define IRQ_PDMA1               S5P_IRQ_VIC0(20)
-#define IRQ_TIMER0_VIC          S5P_IRQ_VIC0(21)
-#define IRQ_TIMER1_VIC          S5P_IRQ_VIC0(22)
-#define IRQ_TIMER2_VIC          S5P_IRQ_VIC0(23)
-#define IRQ_TIMER3_VIC          S5P_IRQ_VIC0(24)
-#define IRQ_TIMER4_VIC          S5P_IRQ_VIC0(25)
-#define IRQ_SYSTIMER            S5P_IRQ_VIC0(26)
-#define IRQ_WDT                 S5P_IRQ_VIC0(27)
-#define IRQ_RTC_ALARM           S5P_IRQ_VIC0(28)
-#define IRQ_RTC_TIC             S5P_IRQ_VIC0(29)
-#define IRQ_GPIOINT             S5P_IRQ_VIC0(30)
-
-/* VIC1: ARM, power, memory, connectivity */
-#define IRQ_PMU                 S5P_IRQ_VIC1(0)
-#define IRQ_CORTEX1             S5P_IRQ_VIC1(1)
-#define IRQ_CORTEX2             S5P_IRQ_VIC1(2)
-#define IRQ_CORTEX3             S5P_IRQ_VIC1(3)
-#define IRQ_CORTEX4             S5P_IRQ_VIC1(4)
-#define IRQ_IEMAPC              S5P_IRQ_VIC1(5)
-#define IRQ_IEMIEC              S5P_IRQ_VIC1(6)
-#define IRQ_ONENAND             S5P_IRQ_VIC1(7)
-#define IRQ_NFC                 S5P_IRQ_VIC1(8)
-#define IRQ_CFCON               S5P_IRQ_VIC1(9)
-#define IRQ_UART0               S5P_IRQ_VIC1(10)
-#define IRQ_UART1               S5P_IRQ_VIC1(11)
-#define IRQ_UART2               S5P_IRQ_VIC1(12)
-#define IRQ_UART3               S5P_IRQ_VIC1(13)
-#define IRQ_IIC                 S5P_IRQ_VIC1(14)
-#define IRQ_SPI0                S5P_IRQ_VIC1(15)
-#define IRQ_SPI1                S5P_IRQ_VIC1(16)
-#define IRQ_SPI2                S5P_IRQ_VIC1(17)
-#define IRQ_IRDA                S5P_IRQ_VIC1(18)
-#define IRQ_IIC2                S5P_IRQ_VIC1(19)
-#define IRQ_IIC3                S5P_IRQ_VIC1(20)
-#define IRQ_HSIRX               S5P_IRQ_VIC1(21)
-#define IRQ_HSITX               S5P_IRQ_VIC1(22)
-#define IRQ_UHOST               S5P_IRQ_VIC1(23)
-#define IRQ_OTG                 S5P_IRQ_VIC1(24)
-#define IRQ_MSM                 S5P_IRQ_VIC1(25)
-#define IRQ_HSMMC0              S5P_IRQ_VIC1(26)
-#define IRQ_HSMMC1              S5P_IRQ_VIC1(27)
-#define IRQ_HSMMC2              S5P_IRQ_VIC1(28)
-#define IRQ_MIPICSI             S5P_IRQ_VIC1(29)
-#define IRQ_MIPIDSI             S5P_IRQ_VIC1(30)
-
-/* VIC2: multimedia, audio, security */
-#define IRQ_LCD0                S5P_IRQ_VIC2(0)
-#define IRQ_LCD1                S5P_IRQ_VIC2(1)
-#define IRQ_LCD2                S5P_IRQ_VIC2(2)
-#define IRQ_LCD3                S5P_IRQ_VIC2(3)
-#define IRQ_ROTATOR             S5P_IRQ_VIC2(4)
-#define IRQ_FIMC0               S5P_IRQ_VIC2(5)
-#define IRQ_FIMC1               S5P_IRQ_VIC2(6)
-#define IRQ_FIMC2               S5P_IRQ_VIC2(7)
-#define IRQ_JPEG                S5P_IRQ_VIC2(8)
-#define IRQ_2D                  S5P_IRQ_VIC2(9)
-#define IRQ_3D                  S5P_IRQ_VIC2(10)
-#define IRQ_MIXER               S5P_IRQ_VIC2(11)
-#define IRQ_HDMI                S5P_IRQ_VIC2(12)
-#define IRQ_IIC1                S5P_IRQ_VIC2(13)
-#define IRQ_MFC                 S5P_IRQ_VIC2(14)
-#define IRQ_TVENC               S5P_IRQ_VIC2(15)
-#define IRQ_I2S0                S5P_IRQ_VIC2(16)
-#define IRQ_I2S1                S5P_IRQ_VIC2(17)
-#define IRQ_I2S2                S5P_IRQ_VIC2(18)
-#define IRQ_AC97                S5P_IRQ_VIC2(19)
-#define IRQ_PCM0                S5P_IRQ_VIC2(20)
-#define IRQ_PCM1                S5P_IRQ_VIC2(21)
-#define IRQ_SPDIF               S5P_IRQ_VIC2(22)
-#define IRQ_ADC                 S5P_IRQ_VIC2(23)
-#define IRQ_PENDN               S5P_IRQ_VIC2(24)
-#define IRQ_TC                  IRQ_PENDN
-#define IRQ_KEYPAD              S5P_IRQ_VIC2(25)
-#define IRQ_CG                  S5P_IRQ_VIC2(26)
-#define IRQ_SEC                 S5P_IRQ_VIC2(27)
-#define IRQ_SECRX               S5P_IRQ_VIC2(28)
-#define IRQ_SECTX               S5P_IRQ_VIC2(29)
-#define IRQ_SDMIRQ              S5P_IRQ_VIC2(30)
-#define IRQ_SDMFIQ              S5P_IRQ_VIC2(31)
-#define IRQ_VIC_END             S5P_IRQ_VIC2(31)
-
-#define S5P_EINT_BASE1          (S5P_IRQ_VIC0(0))
-#define S5P_EINT_BASE2          (IRQ_VIC_END + 1)
-
-/* GPIO interrupt */
-#define S5P_GPIOINT_BASE        (IRQ_EINT(31) + 1)
-#define S5P_GPIOINT_GROUP_MAXNR 21
-
-/* Set the default NR_IRQS */
-#define NR_IRQS                 (IRQ_EINT(31) + S5P_GPIOINT_COUNT + 1)
-
-/* Compatibility */
-#define IRQ_LCD_FIFO            IRQ_LCD0
-#define IRQ_LCD_VSYNC           IRQ_LCD1
-#define IRQ_LCD_SYSTEM          IRQ_LCD2
-
-#endif /* __ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
deleted file mode 100644
index 2550b6112b82..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/include/mach/map.h
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * S5PC100 - Memory map definitions
- *
- * 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_MAP_H
-#define __ASM_ARCH_MAP_H __FILE__
-
-#include <plat/map-base.h>
-#include <plat/map-s5p.h>
-
-#define S5PC100_PA_SDRAM                0x20000000
-
-#define S5PC100_PA_ONENAND              0xE7100000
-#define S5PC100_PA_ONENAND_BUF          0xB0000000
-
-#define S5PC100_PA_CHIPID               0xE0000000
-
-#define S5PC100_PA_SYSCON               0xE0100000
-
-#define S5PC100_PA_OTHERS               0xE0200000
-
-#define S5PC100_PA_GPIO                 0xE0300000
-
-#define S5PC100_PA_VIC0                 0xE4000000
-#define S5PC100_PA_VIC1                 0xE4100000
-#define S5PC100_PA_VIC2                 0xE4200000
-
-#define S5PC100_PA_SROMC                0xE7000000
-
-#define S5PC100_PA_CFCON                0xE7800000
-
-#define S5PC100_PA_MDMA                 0xE8100000
-#define S5PC100_PA_PDMA0                0xE9000000
-#define S5PC100_PA_PDMA1                0xE9200000
-
-#define S5PC100_PA_TIMER                0xEA000000
-#define S5PC100_PA_SYSTIMER             0xEA100000
-#define S5PC100_PA_WATCHDOG             0xEA200000
-#define S5PC100_PA_RTC                  0xEA300000
-
-#define S5PC100_PA_UART                 0xEC000000
-
-#define S5PC100_PA_IIC0                 0xEC100000
-#define S5PC100_PA_IIC1                 0xEC200000
-
-#define S5PC100_PA_SPI0                 0xEC300000
-#define S5PC100_PA_SPI1                 0xEC400000
-#define S5PC100_PA_SPI2                 0xEC500000
-
-#define S5PC100_PA_USB_HSOTG            0xED200000
-#define S5PC100_PA_USB_HSPHY            0xED300000
-
-#define S5PC100_PA_HSMMC(x)             (0xED800000 + ((x) * 0x100000))
-
-#define S5PC100_PA_FB                   0xEE000000
-
-#define S5PC100_PA_FIMC0                0xEE200000
-#define S5PC100_PA_FIMC1                0xEE300000
-#define S5PC100_PA_FIMC2                0xEE400000
-
-#define S5PC100_PA_I2S0                 0xF2000000
-#define S5PC100_PA_I2S1                 0xF2100000
-#define S5PC100_PA_I2S2                 0xF2200000
-
-#define S5PC100_PA_AC97                 0xF2300000
-
-#define S5PC100_PA_PCM0                 0xF2400000
-#define S5PC100_PA_PCM1                 0xF2500000
-
-#define S5PC100_PA_SPDIF                0xF2600000
-
-#define S5PC100_PA_TSADC                0xF3000000
-
-#define S5PC100_PA_KEYPAD               0xF3100000
-
-/* Compatibiltiy Defines */
-
-#define S3C_PA_FB                       S5PC100_PA_FB
-#define S3C_PA_HSMMC0                   S5PC100_PA_HSMMC(0)
-#define S3C_PA_HSMMC1                   S5PC100_PA_HSMMC(1)
-#define S3C_PA_HSMMC2                   S5PC100_PA_HSMMC(2)
-#define S3C_PA_IIC                      S5PC100_PA_IIC0
-#define S3C_PA_IIC1                     S5PC100_PA_IIC1
-#define S3C_PA_KEYPAD                   S5PC100_PA_KEYPAD
-#define S3C_PA_ONENAND                  S5PC100_PA_ONENAND
-#define S3C_PA_ONENAND_BUF              S5PC100_PA_ONENAND_BUF
-#define S3C_PA_RTC                      S5PC100_PA_RTC
-#define S3C_PA_TSADC                    S5PC100_PA_TSADC
-#define S3C_PA_USB_HSOTG                S5PC100_PA_USB_HSOTG
-#define S3C_PA_USB_HSPHY                S5PC100_PA_USB_HSPHY
-#define S3C_PA_WDT                      S5PC100_PA_WATCHDOG
-#define S3C_PA_SPI0                     S5PC100_PA_SPI0
-#define S3C_PA_SPI1                     S5PC100_PA_SPI1
-#define S3C_PA_SPI2                     S5PC100_PA_SPI2
-
-#define S5P_PA_CHIPID                   S5PC100_PA_CHIPID
-#define S5P_PA_FIMC0                    S5PC100_PA_FIMC0
-#define S5P_PA_FIMC1                    S5PC100_PA_FIMC1
-#define S5P_PA_FIMC2                    S5PC100_PA_FIMC2
-#define S5P_PA_SDRAM                    S5PC100_PA_SDRAM
-#define S5P_PA_SROMC                    S5PC100_PA_SROMC
-#define S5P_PA_SYSCON                   S5PC100_PA_SYSCON
-#define S5P_PA_TIMER                    S5PC100_PA_TIMER
-
-#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)
-
-#define S3C_SZ_ONENAND_BUF              (SZ_256M - SZ_32M)
-
-/* UART */
-
-#define S3C_PA_UART                     S5PC100_PA_UART
-
-#define S5P_PA_UART(x)                  (S3C_PA_UART + ((x) * S3C_UART_OFFSET))
-#define S5P_PA_UART0                    S5P_PA_UART(0)
-#define S5P_PA_UART1                    S5P_PA_UART(1)
-#define S5P_PA_UART2                    S5P_PA_UART(2)
-#define S5P_PA_UART3                    S5P_PA_UART(3)
-
-#define S5P_SZ_UART                     SZ_256
-
-#endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-s5pc100/include/mach/regs-clock.h b/arch/arm/mach-s5pc100/include/mach/regs-clock.h
deleted file mode 100644
index bc92da2e0ba2..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/regs-clock.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/include/mach/regs-clock.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PC100 - Clock register definitions
- *
- * 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_REGS_CLOCK_H
-#define __ASM_ARCH_REGS_CLOCK_H __FILE__
-
-#include <mach/map.h>
-
-#define S5P_CLKREG(x)           (S3C_VA_SYS + (x))
-
-#define S5PC100_REG_OTHERS(x)   (S5PC100_VA_OTHERS + (x))
-
-#define S5P_APLL_LOCK           S5P_CLKREG(0x00)
-#define S5P_MPLL_LOCK           S5P_CLKREG(0x04)
-#define S5P_EPLL_LOCK           S5P_CLKREG(0x08)
-#define S5P_HPLL_LOCK           S5P_CLKREG(0x0C)
-
-#define S5P_APLL_CON            S5P_CLKREG(0x100)
-#define S5P_MPLL_CON            S5P_CLKREG(0x104)
-#define S5P_EPLL_CON            S5P_CLKREG(0x108)
-#define S5P_HPLL_CON            S5P_CLKREG(0x10C)
-
-#define S5P_CLK_SRC0            S5P_CLKREG(0x200)
-#define S5P_CLK_SRC1            S5P_CLKREG(0x204)
-#define S5P_CLK_SRC2            S5P_CLKREG(0x208)
-#define S5P_CLK_SRC3            S5P_CLKREG(0x20C)
-
-#define S5P_CLK_DIV0            S5P_CLKREG(0x300)
-#define S5P_CLK_DIV1            S5P_CLKREG(0x304)
-#define S5P_CLK_DIV2            S5P_CLKREG(0x308)
-#define S5P_CLK_DIV3            S5P_CLKREG(0x30C)
-#define S5P_CLK_DIV4            S5P_CLKREG(0x310)
-
-#define S5P_CLK_OUT             S5P_CLKREG(0x400)
-
-#define S5P_CLKGATE_D00         S5P_CLKREG(0x500)
-#define S5P_CLKGATE_D01         S5P_CLKREG(0x504)
-#define S5P_CLKGATE_D02         S5P_CLKREG(0x508)
-
-#define S5P_CLKGATE_D10         S5P_CLKREG(0x520)
-#define S5P_CLKGATE_D11         S5P_CLKREG(0x524)
-#define S5P_CLKGATE_D12         S5P_CLKREG(0x528)
-#define S5P_CLKGATE_D13         S5P_CLKREG(0x52C)
-#define S5P_CLKGATE_D14         S5P_CLKREG(0x530)
-#define S5P_CLKGATE_D15         S5P_CLKREG(0x534)
-
-#define S5P_CLKGATE_D20         S5P_CLKREG(0x540)
-
-#define S5P_CLKGATE_SCLK0       S5P_CLKREG(0x560)
-#define S5P_CLKGATE_SCLK1       S5P_CLKREG(0x564)
-
-/* CLKDIV0 */
-#define S5P_CLKDIV0_D0_MASK             (0x7<<8)
-#define S5P_CLKDIV0_D0_SHIFT            (8)
-#define S5P_CLKDIV0_PCLKD0_MASK         (0x7<<12)
-#define S5P_CLKDIV0_PCLKD0_SHIFT        (12)
-
-/* CLKDIV1 */
-#define S5P_CLKDIV1_D1_MASK             (0x7<<12)
-#define S5P_CLKDIV1_D1_SHIFT            (12)
-#define S5P_CLKDIV1_PCLKD1_MASK         (0x7<<16)
-#define S5P_CLKDIV1_PCLKD1_SHIFT        (16)
-
-#define S5PC100_SWRESET         S5PC100_REG_OTHERS(0x000)
-#define S5PC100_MEM_SYS_CFG     S5PC100_REG_OTHERS(0x200)
-
-#define S5PC100_SWRESET_RESETVAL        0xc100
-
-#define MEM_SYS_CFG_EBI_FIX_PRI_CFCON   0x30
-
-#endif /* __ASM_ARCH_REGS_CLOCK_H */
diff --git a/arch/arm/mach-s5pc100/include/mach/regs-gpio.h b/arch/arm/mach-s5pc100/include/mach/regs-gpio.h
deleted file mode 100644
index 0bf73209ec7b..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/regs-gpio.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* linux/arch/arm/plat-s5pc100/include/plat/regs-gpio.h
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * S5PC100 - GPIO register definitions
- */
-
-#ifndef __ASM_MACH_S5PC100_REGS_GPIO_H
-#define __ASM_MACH_S5PC100_REGS_GPIO_H __FILE__
-
-#include <mach/map.h>
-
-#define S5PC100EINT30CON                (S5P_VA_GPIO + 0xE00)
-#define S5P_EINT_CON(x)                 (S5PC100EINT30CON + ((x) * 0x4))
-
-#define S5PC100EINT30FLTCON0            (S5P_VA_GPIO + 0xE80)
-#define S5P_EINT_FLTCON(x)              (S5PC100EINT30FLTCON0 + ((x) * 0x4))
-
-#define S5PC100EINT30MASK               (S5P_VA_GPIO + 0xF00)
-#define S5P_EINT_MASK(x)                (S5PC100EINT30MASK + ((x) * 0x4))
-
-#define S5PC100EINT30PEND               (S5P_VA_GPIO + 0xF40)
-#define S5P_EINT_PEND(x)                (S5PC100EINT30PEND + ((x) * 0x4))
-
-#define EINT_REG_NR(x)                  (EINT_OFFSET(x) >> 3)
-
-#define eint_irq_to_bit(irq)            (1 << (EINT_OFFSET(irq) & 0x7))
-
-#define EINT_MODE               S3C_GPIO_SFN(0x2)
-
-#define EINT_GPIO_0(x)          S5PC100_GPH0(x)
-#define EINT_GPIO_1(x)          S5PC100_GPH1(x)
-#define EINT_GPIO_2(x)          S5PC100_GPH2(x)
-#define EINT_GPIO_3(x)          S5PC100_GPH3(x)
-
-#endif /* __ASM_MACH_S5PC100_REGS_GPIO_H */
-
diff --git a/arch/arm/mach-s5pc100/include/mach/regs-irq.h b/arch/arm/mach-s5pc100/include/mach/regs-irq.h
deleted file mode 100644
index 761627897f30..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/regs-irq.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/include/mach/regs-irq.h
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * S5PC100 - IRQ register definitions
- *
- * 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_REGS_IRQ_H
-#define __ASM_ARCH_REGS_IRQ_H __FILE__
-
-#include <mach/map.h>
-
-#endif /* __ASM_ARCH_REGS_IRQ_H */
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
deleted file mode 100644
index 668af3ac31f3..000000000000
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/mach-smdkc100.c
- *
- * Copyright 2009 Samsung Electronics Co.
- * Author: Byungho Min <bhmin@samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <linux/i2c.h>
-#include <linux/fb.h>
-#include <linux/delay.h>
-#include <linux/input.h>
-#include <linux/pwm_backlight.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-
-#include <mach/map.h>
-#include <mach/regs-gpio.h>
-
-#include <video/platform_lcd.h>
-#include <video/samsung_fimd.h>
-
-#include <asm/irq.h>
-#include <asm/mach-types.h>
-
-#include <plat/gpio-cfg.h>
-
-#include <plat/clock.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <plat/fb.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <linux/platform_data/ata-samsung_cf.h>
-#include <plat/adc.h>
-#include <plat/keypad.h>
-#include <linux/platform_data/touchscreen-s3c2410.h>
-#include <linux/platform_data/asoc-s3c.h>
-#include <plat/backlight.h>
-#include <plat/samsung-time.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define SMDKC100_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
-                                 S3C2410_UCON_RXILEVEL |        \
-                                 S3C2410_UCON_TXIRQMODE |       \
-                                 S3C2410_UCON_RXIRQMODE |       \
-                                 S3C2410_UCON_RXFIFO_TOI |      \
-                                 S3C2443_UCON_RXERR_IRQEN)
-
-#define SMDKC100_ULCON_DEFAULT  S3C2410_LCON_CS8
-
-#define SMDKC100_UFCON_DEFAULT  (S3C2410_UFCON_FIFOMODE |       \
-                                 S3C2440_UFCON_RXTRIG8 |        \
-                                 S3C2440_UFCON_TXTRIG16)
-
-static struct s3c2410_uartcfg smdkc100_uartcfgs[] __initdata = {
-        [0] = {
-                .hwport      = 0,
-                .flags       = 0,
-                .ucon        = SMDKC100_UCON_DEFAULT,
-                .ulcon       = SMDKC100_ULCON_DEFAULT,
-                .ufcon       = SMDKC100_UFCON_DEFAULT,
-        },
-        [1] = {
-                .hwport      = 1,
-                .flags       = 0,
-                .ucon        = SMDKC100_UCON_DEFAULT,
-                .ulcon       = SMDKC100_ULCON_DEFAULT,
-                .ufcon       = SMDKC100_UFCON_DEFAULT,
-        },
-        [2] = {
-                .hwport      = 2,
-                .flags       = 0,
-                .ucon        = SMDKC100_UCON_DEFAULT,
-                .ulcon       = SMDKC100_ULCON_DEFAULT,
-                .ufcon       = SMDKC100_UFCON_DEFAULT,
-        },
-        [3] = {
-                .hwport      = 3,
-                .flags       = 0,
-                .ucon        = SMDKC100_UCON_DEFAULT,
-                .ulcon       = SMDKC100_ULCON_DEFAULT,
-                .ufcon       = SMDKC100_UFCON_DEFAULT,
-        },
-};
-
-/* I2C0 */
-static struct i2c_board_info i2c_devs0[] __initdata = {
-        {I2C_BOARD_INFO("wm8580", 0x1b),},
-};
-
-/* I2C1 */
-static struct i2c_board_info i2c_devs1[] __initdata = {
-};
-
-/* LCD power controller */
-static void smdkc100_lcd_power_set(struct plat_lcd_data *pd,
-                                   unsigned int power)
-{
-        if (power) {
-                /* module reset */
-                gpio_direction_output(S5PC100_GPH0(6), 1);
-                mdelay(100);
-                gpio_direction_output(S5PC100_GPH0(6), 0);
-                mdelay(10);
-                gpio_direction_output(S5PC100_GPH0(6), 1);
-                mdelay(10);
-        }
-}
-
-static struct plat_lcd_data smdkc100_lcd_power_data = {
-        .set_power      = smdkc100_lcd_power_set,
-};
-
-static struct platform_device smdkc100_lcd_powerdev = {
-        .name                   = "platform-lcd",
-        .dev.parent             = &s3c_device_fb.dev,
-        .dev.platform_data      = &smdkc100_lcd_power_data,
-};
-
-/* Frame Buffer */
-static struct s3c_fb_pd_win smdkc100_fb_win0 = {
-        .max_bpp        = 32,
-        .default_bpp    = 16,
-        .xres           = 800,
-        .yres           = 480,
-};
-
-static struct fb_videomode smdkc100_lcd_timing = {
-        .left_margin    = 8,
-        .right_margin   = 13,
-        .upper_margin   = 7,
-        .lower_margin   = 5,
-        .hsync_len      = 3,
-        .vsync_len      = 1,
-        .xres           = 800,
-        .yres           = 480,
-        .refresh        = 80,
-};
-
-static struct s3c_fb_platdata smdkc100_lcd_pdata __initdata = {
-        .win[0]         = &smdkc100_fb_win0,
-        .vtiming        = &smdkc100_lcd_timing,
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
-        .setup_gpio     = s5pc100_fb_gpio_setup_24bpp,
-};
-
-static struct s3c_ide_platdata smdkc100_ide_pdata __initdata = {
-        .setup_gpio     = s5pc100_ide_setup_gpio,
-};
-
-static uint32_t smdkc100_keymap[] __initdata = {
-        /* KEY(row, col, keycode) */
-        KEY(0, 3, KEY_1), KEY(0, 4, KEY_2), KEY(0, 5, KEY_3),
-        KEY(0, 6, KEY_4), KEY(0, 7, KEY_5),
-        KEY(1, 3, KEY_A), KEY(1, 4, KEY_B), KEY(1, 5, KEY_C),
-        KEY(1, 6, KEY_D), KEY(1, 7, KEY_E)
-};
-
-static struct matrix_keymap_data smdkc100_keymap_data __initdata = {
-        .keymap         = smdkc100_keymap,
-        .keymap_size    = ARRAY_SIZE(smdkc100_keymap),
-};
-
-static struct samsung_keypad_platdata smdkc100_keypad_data __initdata = {
-        .keymap_data    = &smdkc100_keymap_data,
-        .rows           = 2,
-        .cols           = 8,
-};
-
-static struct platform_device *smdkc100_devices[] __initdata = {
-        &s3c_device_adc,
-        &s3c_device_cfcon,
-        &s3c_device_i2c0,
-        &s3c_device_i2c1,
-        &s3c_device_fb,
-        &s3c_device_hsmmc0,
-        &s3c_device_hsmmc1,
-        &s3c_device_hsmmc2,
-        &samsung_device_pwm,
-        &s3c_device_ts,
-        &s3c_device_wdt,
-        &smdkc100_lcd_powerdev,
-        &s5pc100_device_iis0,
-        &samsung_device_keypad,
-        &s5pc100_device_ac97,
-        &s3c_device_rtc,
-        &s5p_device_fimc0,
-        &s5p_device_fimc1,
-        &s5p_device_fimc2,
-        &s5pc100_device_spdif,
-};
-
-/* LCD Backlight data */
-static struct samsung_bl_gpio_info smdkc100_bl_gpio_info = {
-        .no = S5PC100_GPD(0),
-        .func = S3C_GPIO_SFN(2),
-};
-
-static struct platform_pwm_backlight_data smdkc100_bl_data = {
-        .pwm_id = 0,
-        .enable_gpio = -1,
-};
-
-static void __init smdkc100_map_io(void)
-{
-        s5pc100_init_io(NULL, 0);
-        s3c24xx_init_clocks(12000000);
-        s3c24xx_init_uarts(smdkc100_uartcfgs, ARRAY_SIZE(smdkc100_uartcfgs));
-        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void __init smdkc100_machine_init(void)
-{
-        s3c24xx_ts_set_platdata(NULL);
-
-        /* I2C */
-        s3c_i2c0_set_platdata(NULL);
-        s3c_i2c1_set_platdata(NULL);
-        i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));
-        i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
-
-        s3c_fb_set_platdata(&smdkc100_lcd_pdata);
-        s3c_ide_set_platdata(&smdkc100_ide_pdata);
-
-        samsung_keypad_set_platdata(&smdkc100_keypad_data);
-
-        s5pc100_spdif_setup_gpio(S5PC100_SPDIF_GPD);
-
-        /* LCD init */
-        gpio_request(S5PC100_GPH0(6), "GPH0");
-        smdkc100_lcd_power_set(&smdkc100_lcd_power_data, 0);
-
-        platform_add_devices(smdkc100_devices, ARRAY_SIZE(smdkc100_devices));
-
-        samsung_bl_set(&smdkc100_bl_gpio_info, &smdkc100_bl_data);
-}
-
-MACHINE_START(SMDKC100, "SMDKC100")
-        /* Maintainer: Byungho Min <bhmin@samsung.com> */
-        .atag_offset    = 0x100,
-        .init_irq       = s5pc100_init_irq,
-        .map_io         = smdkc100_map_io,
-        .init_machine   = smdkc100_machine_init,
-        .init_time      = samsung_timer_init,
-        .restart        = s5pc100_restart,
-MACHINE_END
diff --git a/arch/arm/mach-s5pc100/setup-fb-24bpp.c b/arch/arm/mach-s5pc100/setup-fb-24bpp.c
deleted file mode 100644
index 8978e4cf9ed5..000000000000
--- a/arch/arm/mach-s5pc100/setup-fb-24bpp.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * linux/arch/arm/mach-s5pc100/setup-fb-24bpp.c
- *
- * Copyright 2009 Samsung Electronics
- *
- * Base S5PC100 setup information for 24bpp LCD framebuffer
- *
- * 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/types.h>
-#include <linux/fb.h>
-#include <linux/gpio.h>
-
-#include <mach/map.h>
-#include <plat/fb.h>
-#include <plat/gpio-cfg.h>
-
-#define DISR_OFFSET     0x7008
-
-static void s5pc100_fb_setgpios(unsigned int base, unsigned int nr)
-{
-        s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(2));
-}
-
-void s5pc100_fb_gpio_setup_24bpp(void)
-{
-        s5pc100_fb_setgpios(S5PC100_GPF0(0), 8);
-        s5pc100_fb_setgpios(S5PC100_GPF1(0), 8);
-        s5pc100_fb_setgpios(S5PC100_GPF2(0), 8);
-        s5pc100_fb_setgpios(S5PC100_GPF3(0), 4);
-}
diff --git a/arch/arm/mach-s5pc100/setup-i2c0.c b/arch/arm/mach-s5pc100/setup-i2c0.c
deleted file mode 100644
index 89a6a769d622..000000000000
--- a/arch/arm/mach-s5pc100/setup-i2c0.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/setup-i2c0.c
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * Base S5PC100 I2C bus 0 gpio configuration
- *
- * Based on plat-s3c64xx/setup-i2c0.c
- *
- * 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/types.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <linux/gpio.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/gpio-cfg.h>
-
-void s3c_i2c0_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5PC100_GPD(3), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
diff --git a/arch/arm/mach-s5pc100/setup-i2c1.c b/arch/arm/mach-s5pc100/setup-i2c1.c
deleted file mode 100644
index faa667ef02cb..000000000000
--- a/arch/arm/mach-s5pc100/setup-i2c1.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/setup-i2c1.c
- *
- * Copyright 2009 Samsung Electronics Co.
- *      Byungho Min <bhmin@samsung.com>
- *
- * Base S5PC100 I2C bus 1 gpio configuration
- *
- * Based on plat-s3c64xx/setup-i2c1.c
- *
- * 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/types.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <linux/gpio.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/gpio-cfg.h>
-
-void s3c_i2c1_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5PC100_GPD(5), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
diff --git a/arch/arm/mach-s5pc100/setup-ide.c b/arch/arm/mach-s5pc100/setup-ide.c
deleted file mode 100644
index 223aae044466..000000000000
--- a/arch/arm/mach-s5pc100/setup-ide.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/setup-ide.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5PC100 setup information for IDE
- *
- * 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/gpio.h>
-#include <linux/io.h>
-
-#include <mach/regs-clock.h>
-#include <plat/gpio-cfg.h>
-
-static void s5pc100_ide_cfg_gpios(unsigned int base, unsigned int nr)
-{
-        s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(4));
-
-        for (; nr > 0; nr--, base++)
-                s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
-}
-
-void s5pc100_ide_setup_gpio(void)
-{
-        u32 reg;
-
-        /* Independent CF interface, CF chip select configuration */
-        reg = readl(S5PC100_MEM_SYS_CFG) & (~0x3f);
-        writel(reg | MEM_SYS_CFG_EBI_FIX_PRI_CFCON, S5PC100_MEM_SYS_CFG);
-
-        /* CF_Add[0 - 2], CF_IORDY, CF_INTRQ, CF_DMARQ, CF_DMARST, CF_DMACK */
-        s5pc100_ide_cfg_gpios(S5PC100_GPJ0(0), 8);
-
-        /*CF_Data[0 - 7] */
-        s5pc100_ide_cfg_gpios(S5PC100_GPJ2(0), 8);
-
-        /* CF_Data[8 - 15] */
-        s5pc100_ide_cfg_gpios(S5PC100_GPJ3(0), 8);
-
-        /* CF_CS0, CF_CS1, CF_IORD, CF_IOWR */
-        s5pc100_ide_cfg_gpios(S5PC100_GPJ4(0), 4);
-
-        /* EBI_OE, EBI_WE */
-        s3c_gpio_cfgpin_range(S5PC100_GPK0(6), 2, S3C_GPIO_SFN(0));
-
-        /* CF_OE, CF_WE */
-        s3c_gpio_cfgrange_nopull(S5PC100_GPK1(6), 8, S3C_GPIO_SFN(2));
-
-        /* CF_CD */
-        s3c_gpio_cfgpin(S5PC100_GPK3(5), S3C_GPIO_SFN(2));
-        s3c_gpio_setpull(S5PC100_GPK3(5), S3C_GPIO_PULL_NONE);
-}
diff --git a/arch/arm/mach-s5pc100/setup-keypad.c b/arch/arm/mach-s5pc100/setup-keypad.c
deleted file mode 100644
index ada377f0c206..000000000000
--- a/arch/arm/mach-s5pc100/setup-keypad.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/setup-keypad.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * GPIO configuration for S5PC100 KeyPad device
- *
- * 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/gpio.h>
-#include <plat/gpio-cfg.h>
-
-void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
-{
-        /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */
-        s3c_gpio_cfgrange_nopull(S5PC100_GPH3(0), rows, S3C_GPIO_SFN(3));
-
-        /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */
-        s3c_gpio_cfgrange_nopull(S5PC100_GPH2(0), cols, S3C_GPIO_SFN(3));
-}
diff --git a/arch/arm/mach-s5pc100/setup-sdhci-gpio.c b/arch/arm/mach-s5pc100/setup-sdhci-gpio.c
deleted file mode 100644
index 6010c0310cb5..000000000000
--- a/arch/arm/mach-s5pc100/setup-sdhci-gpio.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* linux/arch/arm/plat-s5pc100/setup-sdhci-gpio.c
- *
- * Copyright 2009 Samsung Eletronics
- *
- * S5PC100 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
- *
- * 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/types.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/card.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/sdhci.h>
-
-void s5pc100_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
-{
-        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-        unsigned int num;
-
-        num = width;
-        /* In case of 8 width, we should decrease the 2 */
-        if (width == 8)
-                num = width - 2;
-
-        /* Set all the necessary GPG0/GPG1 pins to special-function 0 */
-        s3c_gpio_cfgrange_nopull(S5PC100_GPG0(0), 2 + num, S3C_GPIO_SFN(2));
-
-        if (width == 8)
-                s3c_gpio_cfgrange_nopull(S5PC100_GPG1(0), 2, S3C_GPIO_SFN(2));
-
-        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-                s3c_gpio_setpull(S5PC100_GPG1(2), S3C_GPIO_PULL_UP);
-                s3c_gpio_cfgpin(S5PC100_GPG1(2), S3C_GPIO_SFN(2));
-        }
-}
-
-void s5pc100_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
-{
-        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-        /* Set all the necessary GPG2 pins to special-function 2 */
-        s3c_gpio_cfgrange_nopull(S5PC100_GPG2(0), 2 + width, S3C_GPIO_SFN(2));
-
-        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-                s3c_gpio_setpull(S5PC100_GPG2(6), S3C_GPIO_PULL_UP);
-                s3c_gpio_cfgpin(S5PC100_GPG2(6), S3C_GPIO_SFN(2));
-        }
-}
-
-void s5pc100_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
-{
-        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-        /* Set all the necessary GPG3 pins to special-function 2 */
-        s3c_gpio_cfgrange_nopull(S5PC100_GPG3(0), 2 + width, S3C_GPIO_SFN(2));
-
-        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-                s3c_gpio_setpull(S5PC100_GPG3(6), S3C_GPIO_PULL_UP);
-                s3c_gpio_cfgpin(S5PC100_GPG3(6), S3C_GPIO_SFN(2));
-        }
-}
diff --git a/arch/arm/mach-s5pc100/setup-spi.c b/arch/arm/mach-s5pc100/setup-spi.c
deleted file mode 100644
index 183567961de1..000000000000
--- a/arch/arm/mach-s5pc100/setup-spi.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/setup-spi.c
- *
- * Copyright (C) 2011 Samsung Electronics Ltd.
- *              http://www.samsung.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/gpio.h>
-#include <plat/gpio-cfg.h>
-
-#ifdef CONFIG_S3C64XX_DEV_SPI0
-int s3c64xx_spi0_cfg_gpio(void)
-{
-        s3c_gpio_cfgall_range(S5PC100_GPB(0), 3,
-                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-        return 0;
-}
-#endif
-
-#ifdef CONFIG_S3C64XX_DEV_SPI1
-int s3c64xx_spi1_cfg_gpio(void)
-{
-        s3c_gpio_cfgall_range(S5PC100_GPB(4), 3,
-                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-        return 0;
-}
-#endif
-
-#ifdef CONFIG_S3C64XX_DEV_SPI2
-int s3c64xx_spi2_cfg_gpio(void)
-{
-        s3c_gpio_cfgpin(S5PC100_GPG3(0), S3C_GPIO_SFN(3));
-        s3c_gpio_setpull(S5PC100_GPG3(0), S3C_GPIO_PULL_UP);
-        s3c_gpio_cfgall_range(S5PC100_GPB(2), 2,
-                                S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP);
-        return 0;
-}
-#endif
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index f60f2862856d..330bfc8fcd52 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -7,193 +7,28 @@
 
 # Configuration options for the S5PV210/S5PC110
 
+config ARCH_S5PV210
+        bool "Samsung S5PV210/S5PC110" if ARCH_MULTI_V7
+        select ARCH_HAS_HOLES_MEMORYMODEL
+        select ARCH_REQUIRE_GPIOLIB
+        select ARM_VIC
+        select CLKSRC_SAMSUNG_PWM
+        select COMMON_CLK_SAMSUNG
+        select HAVE_S3C2410_I2C if I2C
+        select HAVE_S3C2410_WATCHDOG if WATCHDOG
+        select HAVE_S3C_RTC if RTC_CLASS
+        select PINCTRL
+        select PINCTRL_EXYNOS
+        help
+          Samsung S5PV210/S5PC110 series based systems
+
 if ARCH_S5PV210
 
 config CPU_S5PV210
-        bool
+        def_bool y
         select ARM_AMBA
         select PL330_DMA if DMADEVICES
-        select S5P_EXT_INT
-        select S5P_PM if PM
-        select S5P_SLEEP if PM
         help
           Enable S5PV210 CPU support
 
-config S5PV210_SETUP_I2C1
-        bool
-        help
-          Common setup code for i2c bus 1.
-
-config S5PV210_SETUP_I2C2
-        bool
-        help
-          Common setup code for i2c bus 2.
-
-config S5PV210_SETUP_IDE
-        bool
-        help
-          Common setup code for S5PV210 IDE GPIO configurations
-
-config S5PV210_SETUP_FB_24BPP
-        bool
-        help
-          Common setup code for S5PV210 with an 24bpp RGB display helper.
-
-config S5PV210_SETUP_KEYPAD
-        bool
-        help
-          Common setup code for keypad.
-
-config S5PV210_SETUP_SDHCI
-        bool
-        select S5PV210_SETUP_SDHCI_GPIO
-        help
-          Internal helper functions for S5PV210 based SDHCI systems
-
-config S5PV210_SETUP_SDHCI_GPIO
-        bool
-        help
-          Common setup code for SDHCI gpio.
-
-config S5PV210_SETUP_FIMC
-        bool
-        help
-          Common setup code for the camera interfaces.
-
-config S5PV210_SETUP_SPI
-        bool
-        help
-          Common setup code for SPI GPIO configurations.
-
-config S5PV210_SETUP_USB_PHY
-        bool
-        help
-          Common setup code for USB PHY controller
-
-menu "S5PC110 Machines"
-
-config MACH_AQUILA
-        bool "Aquila"
-        select CPU_S5PV210
-        select S3C_DEV_FB
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
-        select S3C_DEV_HSMMC2
-        select S5PV210_SETUP_FB_24BPP
-        select S5PV210_SETUP_SDHCI
-        select S5PV210_SETUP_USB_PHY
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
-        select S5P_DEV_ONENAND
-        help
-          Machine support for the Samsung Aquila target based on S5PC110 SoC
-
-config MACH_GONI
-        bool "GONI"
-        select CPU_S5PV210
-        select S3C_DEV_FB
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
-        select S3C_DEV_HSMMC2
-        select S3C_DEV_I2C1
-        select S3C_DEV_I2C2
-        select S3C_DEV_USB_HSOTG
-        select S5PV210_SETUP_FB_24BPP
-        select S5PV210_SETUP_FIMC
-        select S5PV210_SETUP_I2C1
-        select S5PV210_SETUP_I2C2
-        select S5PV210_SETUP_KEYPAD
-        select S5PV210_SETUP_SDHCI
-        select S5PV210_SETUP_USB_PHY
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
-        select S5P_DEV_MFC
-        select S5P_DEV_ONENAND
-        select S5P_DEV_TV
-        select S5P_GPIO_INT
-        select SAMSUNG_DEV_KEYPAD
-        help
-          Machine support for Samsung GONI board
-          S5PC110(MCP) is one of package option of S5PV210
-
-config MACH_SMDKC110
-        bool "SMDKC110"
-        select CPU_S5PV210
-        select S3C_DEV_I2C1
-        select S3C_DEV_I2C2
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
-        select S5PV210_SETUP_I2C1
-        select S5PV210_SETUP_I2C2
-        select S5PV210_SETUP_IDE
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
-        select S5P_DEV_MFC
-        select SAMSUNG_DEV_IDE
-        help
-          Machine support for Samsung SMDKC110
-          S5PC110(MCP) is one of package option of S5PV210
-
-endmenu
-
-menu "S5PV210 Machines"
-
-config MACH_SMDKV210
-        bool "SMDKV210"
-        select CPU_S5PV210
-        select S3C_DEV_FB
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
-        select S3C_DEV_HSMMC2
-        select S3C_DEV_HSMMC3
-        select S3C_DEV_I2C1
-        select S3C_DEV_I2C2
-        select S3C_DEV_RTC
-        select S3C_DEV_USB_HSOTG
-        select S3C_DEV_WDT
-        select S5PV210_SETUP_FB_24BPP
-        select S5PV210_SETUP_I2C1
-        select S5PV210_SETUP_I2C2
-        select S5PV210_SETUP_IDE
-        select S5PV210_SETUP_KEYPAD
-        select S5PV210_SETUP_SDHCI
-        select S5PV210_SETUP_USB_PHY
-        select S5P_DEV_FIMC0
-        select S5P_DEV_FIMC1
-        select S5P_DEV_FIMC2
-        select S5P_DEV_JPEG
-        select S5P_DEV_MFC
-        select SAMSUNG_DEV_ADC
-        select SAMSUNG_DEV_BACKLIGHT
-        select SAMSUNG_DEV_IDE
-        select SAMSUNG_DEV_KEYPAD
-        select SAMSUNG_DEV_PWM
-        select SAMSUNG_DEV_TS
-        help
-          Machine support for Samsung SMDKV210
-
-config MACH_TORBRECK
-        bool "Torbreck"
-        select ARCH_SPARSEMEM_ENABLE
-        select CPU_S5PV210
-        select S3C_DEV_HSMMC
-        select S3C_DEV_HSMMC1
-        select S3C_DEV_HSMMC2
-        select S3C_DEV_HSMMC3
-        select S3C_DEV_I2C1
-        select S3C_DEV_I2C2
-        select S3C_DEV_RTC
-        select S3C_DEV_WDT
-        select S5PV210_SETUP_I2C1
-        select S5PV210_SETUP_I2C2
-        select S5PV210_SETUP_SDHCI
-        select SAMSUNG_DEV_IDE
-        help
-          Machine support for aESOP Torbreck
-
-endmenu
-
 endif
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 1c4e41998a10..7dc2d0e25a83 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -5,6 +5,8 @@
 #
 # Licensed under GPLv2
 
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
+
 obj-y                           :=
 obj-m                           :=
 obj-n                           :=
@@ -12,31 +14,8 @@ obj-				:=
 
 # Core
 
-obj-y                           += common.o clock.o
-
-obj-$(CONFIG_PM)                += pm.o
-
-obj-y                           += dma.o
+obj-$(CONFIG_PM_SLEEP)          += pm.o sleep.o
 
 # machine support
 
-obj-$(CONFIG_MACH_AQUILA)       += mach-aquila.o
-obj-$(CONFIG_MACH_GONI)         += mach-goni.o
-obj-$(CONFIG_MACH_SMDKC110)     += mach-smdkc110.o
-obj-$(CONFIG_MACH_SMDKV210)     += mach-smdkv210.o
-obj-$(CONFIG_MACH_TORBRECK)     += mach-torbreck.o
-
-# device support
-
-obj-y                           += dev-audio.o
-
-obj-y                                   += setup-i2c0.o
-obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)    += setup-fb-24bpp.o
-obj-$(CONFIG_S5PV210_SETUP_FIMC)        += setup-fimc.o
-obj-$(CONFIG_S5PV210_SETUP_I2C1)        += setup-i2c1.o
-obj-$(CONFIG_S5PV210_SETUP_I2C2)        += setup-i2c2.o
-obj-$(CONFIG_S5PV210_SETUP_IDE)         += setup-ide.o
-obj-$(CONFIG_S5PV210_SETUP_KEYPAD)      += setup-keypad.o
-obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO)  += setup-sdhci-gpio.o
-obj-$(CONFIG_S5PV210_SETUP_SPI)         += setup-spi.o
-obj-$(CONFIG_S5PV210_SETUP_USB_PHY) += setup-usb-phy.o
+obj-y                           += s5pv210.o
diff --git a/arch/arm/mach-s5pv210/Makefile.boot b/arch/arm/mach-s5pv210/Makefile.boot
deleted file mode 100644
index 79ece4055b02..000000000000
--- a/arch/arm/mach-s5pv210/Makefile.boot
+++ /dev/null
@@ -1,2 +0,0 @@
-   zreladdr-y   += 0x20008000
-params_phys-y   := 0x20000100
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
deleted file mode 100644
index ca463724a3df..000000000000
--- a/arch/arm/mach-s5pv210/clock.c
+++ /dev/null
@@ -1,1365 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/clock.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - Clock 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.
-*/
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/io.h>
-
-#include <mach/map.h>
-
-#include <plat/cpu-freq.h>
-#include <mach/regs-clock.h>
-#include <plat/clock.h>
-#include <plat/cpu.h>
-#include <plat/pll.h>
-#include <plat/s5p-clock.h>
-#include <plat/clock-clksrc.h>
-
-#include "common.h"
-
-static unsigned long xtal;
-
-static struct clksrc_clk clk_mout_apll = {
-        .clk    = {
-                .name           = "mout_apll",
-        },
-        .sources        = &clk_src_apll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 0, .size = 1 },
-};
-
-static struct clksrc_clk clk_mout_epll = {
-        .clk    = {
-                .name           = "mout_epll",
-        },
-        .sources        = &clk_src_epll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 8, .size = 1 },
-};
-
-static struct clksrc_clk clk_mout_mpll = {
-        .clk = {
-                .name           = "mout_mpll",
-        },
-        .sources        = &clk_src_mpll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 4, .size = 1 },
-};
-
-static struct clk *clkset_armclk_list[] = {
-        [0] = &clk_mout_apll.clk,
-        [1] = &clk_mout_mpll.clk,
-};
-
-static struct clksrc_sources clkset_armclk = {
-        .sources        = clkset_armclk_list,
-        .nr_sources     = ARRAY_SIZE(clkset_armclk_list),
-};
-
-static struct clksrc_clk clk_armclk = {
-        .clk    = {
-                .name           = "armclk",
-        },
-        .sources        = &clkset_armclk,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 16, .size = 1 },
-        .reg_div        = { .reg = S5P_CLK_DIV0, .shift = 0, .size = 3 },
-};
-
-static struct clksrc_clk clk_hclk_msys = {
-        .clk    = {
-                .name           = "hclk_msys",
-                .parent         = &clk_armclk.clk,
-        },
-        .reg_div        = { .reg = S5P_CLK_DIV0, .shift = 8, .size = 3 },
-};
-
-static struct clksrc_clk clk_pclk_msys = {
-        .clk    = {
-                .name           = "pclk_msys",
-                .parent         = &clk_hclk_msys.clk,
-        },
-        .reg_div        = { .reg = S5P_CLK_DIV0, .shift = 12, .size = 3 },
-};
-
-static struct clksrc_clk clk_sclk_a2m = {
-        .clk    = {
-                .name           = "sclk_a2m",
-                .parent         = &clk_mout_apll.clk,
-        },
-        .reg_div        = { .reg = S5P_CLK_DIV0, .shift = 4, .size = 3 },
-};
-
-static struct clk *clkset_hclk_sys_list[] = {
-        [0] = &clk_mout_mpll.clk,
-        [1] = &clk_sclk_a2m.clk,
-};
-
-static struct clksrc_sources clkset_hclk_sys = {
-        .sources        = clkset_hclk_sys_list,
-        .nr_sources     = ARRAY_SIZE(clkset_hclk_sys_list),
-};
-
-static struct clksrc_clk clk_hclk_dsys = {
-        .clk    = {
-                .name   = "hclk_dsys",
-        },
-        .sources        = &clkset_hclk_sys,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 20, .size = 1 },
-        .reg_div        = { .reg = S5P_CLK_DIV0, .shift = 16, .size = 4 },
-};
-
-static struct clksrc_clk clk_pclk_dsys = {
-        .clk    = {
-                .name   = "pclk_dsys",
-                .parent = &clk_hclk_dsys.clk,
-        },
-        .reg_div = { .reg = S5P_CLK_DIV0, .shift = 20, .size = 3 },
-};
-
-static struct clksrc_clk clk_hclk_psys = {
-        .clk    = {
-                .name   = "hclk_psys",
-        },
-        .sources        = &clkset_hclk_sys,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 24, .size = 1 },
-        .reg_div        = { .reg = S5P_CLK_DIV0, .shift = 24, .size = 4 },
-};
-
-static struct clksrc_clk clk_pclk_psys = {
-        .clk    = {
-                .name   = "pclk_psys",
-                .parent = &clk_hclk_psys.clk,
-        },
-        .reg_div        = { .reg = S5P_CLK_DIV0, .shift = 28, .size = 3 },
-};
-
-static int s5pv210_clk_ip0_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_IP0, clk, enable);
-}
-
-static int s5pv210_clk_ip1_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_IP1, clk, enable);
-}
-
-static int s5pv210_clk_ip2_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_IP2, clk, enable);
-}
-
-static int s5pv210_clk_ip3_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLKGATE_IP3, clk, enable);
-}
-
-static int s5pv210_clk_mask0_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLK_SRC_MASK0, clk, enable);
-}
-
-static int s5pv210_clk_mask1_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_CLK_SRC_MASK1, clk, enable);
-}
-
-static int s5pv210_clk_hdmiphy_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_HDMI_PHY_CONTROL, clk, enable);
-}
-
-static int exynos4_clk_dac_ctrl(struct clk *clk, int enable)
-{
-        return s5p_gatectrl(S5P_DAC_PHY_CONTROL, clk, enable);
-}
-
-static struct clk clk_sclk_hdmi27m = {
-        .name           = "sclk_hdmi27m",
-        .rate           = 27000000,
-};
-
-static struct clk clk_sclk_hdmiphy = {
-        .name           = "sclk_hdmiphy",
-};
-
-static struct clk clk_sclk_usbphy0 = {
-        .name           = "sclk_usbphy0",
-};
-
-static struct clk clk_sclk_usbphy1 = {
-        .name           = "sclk_usbphy1",
-};
-
-static struct clk clk_pcmcdclk0 = {
-        .name           = "pcmcdclk",
-};
-
-static struct clk clk_pcmcdclk1 = {
-        .name           = "pcmcdclk",
-};
-
-static struct clk clk_pcmcdclk2 = {
-        .name           = "pcmcdclk",
-};
-
-static struct clk *clkset_vpllsrc_list[] = {
-        [0] = &clk_fin_vpll,
-        [1] = &clk_sclk_hdmi27m,
-};
-
-static struct clksrc_sources clkset_vpllsrc = {
-        .sources        = clkset_vpllsrc_list,
-        .nr_sources     = ARRAY_SIZE(clkset_vpllsrc_list),
-};
-
-static struct clksrc_clk clk_vpllsrc = {
-        .clk    = {
-                .name           = "vpll_src",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 7),
-        },
-        .sources        = &clkset_vpllsrc,
-        .reg_src        = { .reg = S5P_CLK_SRC1, .shift = 28, .size = 1 },
-};
-
-static struct clk *clkset_sclk_vpll_list[] = {
-        [0] = &clk_vpllsrc.clk,
-        [1] = &clk_fout_vpll,
-};
-
-static struct clksrc_sources clkset_sclk_vpll = {
-        .sources        = clkset_sclk_vpll_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_vpll_list),
-};
-
-static struct clksrc_clk clk_sclk_vpll = {
-        .clk    = {
-                .name           = "sclk_vpll",
-        },
-        .sources        = &clkset_sclk_vpll,
-        .reg_src        = { .reg = S5P_CLK_SRC0, .shift = 12, .size = 1 },
-};
-
-static struct clk *clkset_moutdmc0src_list[] = {
-        [0] = &clk_sclk_a2m.clk,
-        [1] = &clk_mout_mpll.clk,
-        [2] = NULL,
-        [3] = NULL,
-};
-
-static struct clksrc_sources clkset_moutdmc0src = {
-        .sources        = clkset_moutdmc0src_list,
-        .nr_sources     = ARRAY_SIZE(clkset_moutdmc0src_list),
-};
-
-static struct clksrc_clk clk_mout_dmc0 = {
-        .clk    = {
-                .name           = "mout_dmc0",
-        },
-        .sources        = &clkset_moutdmc0src,
-        .reg_src        = { .reg = S5P_CLK_SRC6, .shift = 24, .size = 2 },
-};
-
-static struct clksrc_clk clk_sclk_dmc0 = {
-        .clk    = {
-                .name           = "sclk_dmc0",
-                .parent         = &clk_mout_dmc0.clk,
-        },
-        .reg_div        = { .reg = S5P_CLK_DIV6, .shift = 28, .size = 4 },
-};
-
-static unsigned long s5pv210_clk_imem_get_rate(struct clk *clk)
-{
-        return clk_get_rate(clk->parent) / 2;
-}
-
-static struct clk_ops clk_hclk_imem_ops = {
-        .get_rate       = s5pv210_clk_imem_get_rate,
-};
-
-static unsigned long s5pv210_clk_fout_apll_get_rate(struct clk *clk)
-{
-        return s5p_get_pll45xx(xtal, __raw_readl(S5P_APLL_CON), pll_4508);
-}
-
-static struct clk_ops clk_fout_apll_ops = {
-        .get_rate       = s5pv210_clk_fout_apll_get_rate,
-};
-
-static struct clk init_clocks_off[] = {
-        {
-                .name           = "rot",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip0_ctrl,
-                .ctrlbit        = (1<<29),
-        }, {
-                .name           = "fimc",
-                .devname        = "s5pv210-fimc.0",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip0_ctrl,
-                .ctrlbit        = (1 << 24),
-        }, {
-                .name           = "fimc",
-                .devname        = "s5pv210-fimc.1",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip0_ctrl,
-                .ctrlbit        = (1 << 25),
-        }, {
-                .name           = "fimc",
-                .devname        = "s5pv210-fimc.2",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip0_ctrl,
-                .ctrlbit        = (1 << 26),
-        }, {
-                .name           = "jpeg",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip0_ctrl,
-                .ctrlbit        = (1 << 28),
-        }, {
-                .name           = "mfc",
-                .devname        = "s5p-mfc",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip0_ctrl,
-                .ctrlbit        = (1 << 16),
-        }, {
-                .name           = "dac",
-                .devname        = "s5p-sdo",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip1_ctrl,
-                .ctrlbit        = (1 << 10),
-        }, {
-                .name           = "mixer",
-                .devname        = "s5p-mixer",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip1_ctrl,
-                .ctrlbit        = (1 << 9),
-        }, {
-                .name           = "vp",
-                .devname        = "s5p-mixer",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip1_ctrl,
-                .ctrlbit        = (1 << 8),
-        }, {
-                .name           = "hdmi",
-                .devname        = "s5pv210-hdmi",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip1_ctrl,
-                .ctrlbit        = (1 << 11),
-        }, {
-                .name           = "hdmiphy",
-                .devname        = "s5pv210-hdmi",
-                .enable         = s5pv210_clk_hdmiphy_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "dacphy",
-                .devname        = "s5p-sdo",
-                .enable         = exynos4_clk_dac_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "otg",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip1_ctrl,
-                .ctrlbit        = (1<<16),
-        }, {
-                .name           = "usb-host",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip1_ctrl,
-                .ctrlbit        = (1<<17),
-        }, {
-                .name           = "lcd",
-                .parent         = &clk_hclk_dsys.clk,
-                .enable         = s5pv210_clk_ip1_ctrl,
-                .ctrlbit        = (1<<0),
-        }, {
-                .name           = "cfcon",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip1_ctrl,
-                .ctrlbit        = (1<<25),
-        }, {
-                .name           = "systimer",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<16),
-        }, {
-                .name           = "watchdog",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<22),
-        }, {
-                .name           = "rtc",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<15),
-        }, {
-                .name           = "i2c",
-                .devname        = "s3c2440-i2c.0",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<7),
-        }, {
-                .name           = "i2c",
-                .devname        = "s3c2440-i2c.1",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 10),
-        }, {
-                .name           = "i2c",
-                .devname        = "s3c2440-i2c.2",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<9),
-        }, {
-                .name           = "i2c",
-                .devname        = "s3c2440-hdmiphy-i2c",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 11),
-        }, {
-                .name           = "spi",
-                .devname        = "s5pv210-spi.0",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<12),
-        }, {
-                .name           = "spi",
-                .devname        = "s5pv210-spi.1",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<13),
-        }, {
-                .name           = "spi",
-                .devname        = "s5pv210-spi.2",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<14),
-        }, {
-                .name           = "timers",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<23),
-        }, {
-                .name           = "adc",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<24),
-        }, {
-                .name           = "keypad",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<21),
-        }, {
-                .name           = "iis",
-                .devname        = "samsung-i2s.0",
-                .parent         = &clk_p,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1<<4),
-        }, {
-                .name           = "iis",
-                .devname        = "samsung-i2s.1",
-                .parent         = &clk_p,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 5),
-        }, {
-                .name           = "iis",
-                .devname        = "samsung-i2s.2",
-                .parent         = &clk_p,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 6),
-        }, {
-                .name           = "spdif",
-                .parent         = &clk_p,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 0),
-        },
-};
-
-static struct clk init_clocks[] = {
-        {
-                .name           = "hclk_imem",
-                .parent         = &clk_hclk_msys.clk,
-                .ctrlbit        = (1 << 5),
-                .enable         = s5pv210_clk_ip0_ctrl,
-                .ops            = &clk_hclk_imem_ops,
-        }, {
-                .name           = "uart",
-                .devname        = "s5pv210-uart.0",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 17),
-        }, {
-                .name           = "uart",
-                .devname        = "s5pv210-uart.1",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 18),
-        }, {
-                .name           = "uart",
-                .devname        = "s5pv210-uart.2",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 19),
-        }, {
-                .name           = "uart",
-                .devname        = "s5pv210-uart.3",
-                .parent         = &clk_pclk_psys.clk,
-                .enable         = s5pv210_clk_ip3_ctrl,
-                .ctrlbit        = (1 << 20),
-        }, {
-                .name           = "sromc",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip1_ctrl,
-                .ctrlbit        = (1 << 26),
-        },
-};
-
-static struct clk clk_hsmmc0 = {
-        .name           = "hsmmc",
-        .devname        = "s3c-sdhci.0",
-        .parent         = &clk_hclk_psys.clk,
-        .enable         = s5pv210_clk_ip2_ctrl,
-        .ctrlbit        = (1<<16),
-};
-
-static struct clk clk_hsmmc1 = {
-        .name           = "hsmmc",
-        .devname        = "s3c-sdhci.1",
-        .parent         = &clk_hclk_psys.clk,
-        .enable         = s5pv210_clk_ip2_ctrl,
-        .ctrlbit        = (1<<17),
-};
-
-static struct clk clk_hsmmc2 = {
-        .name           = "hsmmc",
-        .devname        = "s3c-sdhci.2",
-        .parent         = &clk_hclk_psys.clk,
-        .enable         = s5pv210_clk_ip2_ctrl,
-        .ctrlbit        = (1<<18),
-};
-
-static struct clk clk_hsmmc3 = {
-        .name           = "hsmmc",
-        .devname        = "s3c-sdhci.3",
-        .parent         = &clk_hclk_psys.clk,
-        .enable         = s5pv210_clk_ip2_ctrl,
-        .ctrlbit        = (1<<19),
-};
-
-static struct clk clk_pdma0 = {
-        .name           = "pdma0",
-        .parent         = &clk_hclk_psys.clk,
-        .enable         = s5pv210_clk_ip0_ctrl,
-        .ctrlbit        = (1 << 3),
-};
-
-static struct clk clk_pdma1 = {
-        .name           = "pdma1",
-        .parent         = &clk_hclk_psys.clk,
-        .enable         = s5pv210_clk_ip0_ctrl,
-        .ctrlbit        = (1 << 4),
-};
-
-static struct clk *clkset_uart_list[] = {
-        [6] = &clk_mout_mpll.clk,
-        [7] = &clk_mout_epll.clk,
-};
-
-static struct clksrc_sources clkset_uart = {
-        .sources        = clkset_uart_list,
-        .nr_sources     = ARRAY_SIZE(clkset_uart_list),
-};
-
-static struct clk *clkset_group1_list[] = {
-        [0] = &clk_sclk_a2m.clk,
-        [1] = &clk_mout_mpll.clk,
-        [2] = &clk_mout_epll.clk,
-        [3] = &clk_sclk_vpll.clk,
-};
-
-static struct clksrc_sources clkset_group1 = {
-        .sources        = clkset_group1_list,
-        .nr_sources     = ARRAY_SIZE(clkset_group1_list),
-};
-
-static struct clk *clkset_sclk_onenand_list[] = {
-        [0] = &clk_hclk_psys.clk,
-        [1] = &clk_hclk_dsys.clk,
-};
-
-static struct clksrc_sources clkset_sclk_onenand = {
-        .sources        = clkset_sclk_onenand_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_onenand_list),
-};
-
-static struct clk *clkset_sclk_dac_list[] = {
-        [0] = &clk_sclk_vpll.clk,
-        [1] = &clk_sclk_hdmiphy,
-};
-
-static struct clksrc_sources clkset_sclk_dac = {
-        .sources        = clkset_sclk_dac_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_dac_list),
-};
-
-static struct clksrc_clk clk_sclk_dac = {
-        .clk            = {
-                .name           = "sclk_dac",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 2),
-        },
-        .sources        = &clkset_sclk_dac,
-        .reg_src        = { .reg = S5P_CLK_SRC1, .shift = 8, .size = 1 },
-};
-
-static struct clksrc_clk clk_sclk_pixel = {
-        .clk            = {
-                .name           = "sclk_pixel",
-                .parent         = &clk_sclk_vpll.clk,
-        },
-        .reg_div        = { .reg = S5P_CLK_DIV1, .shift = 0, .size = 4},
-};
-
-static struct clk *clkset_sclk_hdmi_list[] = {
-        [0] = &clk_sclk_pixel.clk,
-        [1] = &clk_sclk_hdmiphy,
-};
-
-static struct clksrc_sources clkset_sclk_hdmi = {
-        .sources        = clkset_sclk_hdmi_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_hdmi_list),
-};
-
-static struct clksrc_clk clk_sclk_hdmi = {
-        .clk            = {
-                .name           = "sclk_hdmi",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 0),
-        },
-        .sources        = &clkset_sclk_hdmi,
-        .reg_src        = { .reg = S5P_CLK_SRC1, .shift = 0, .size = 1 },
-};
-
-static struct clk *clkset_sclk_mixer_list[] = {
-        [0] = &clk_sclk_dac.clk,
-        [1] = &clk_sclk_hdmi.clk,
-};
-
-static struct clksrc_sources clkset_sclk_mixer = {
-        .sources        = clkset_sclk_mixer_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_mixer_list),
-};
-
-static struct clksrc_clk clk_sclk_mixer = {
-        .clk            = {
-                .name           = "sclk_mixer",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 1),
-        },
-        .sources = &clkset_sclk_mixer,
-        .reg_src = { .reg = S5P_CLK_SRC1, .shift = 4, .size = 1 },
-};
-
-static struct clksrc_clk *sclk_tv[] = {
-        &clk_sclk_dac,
-        &clk_sclk_pixel,
-        &clk_sclk_hdmi,
-        &clk_sclk_mixer,
-};
-
-static struct clk *clkset_sclk_audio0_list[] = {
-        [0] = &clk_ext_xtal_mux,
-        [1] = &clk_pcmcdclk0,
-        [2] = &clk_sclk_hdmi27m,
-        [3] = &clk_sclk_usbphy0,
-        [4] = &clk_sclk_usbphy1,
-        [5] = &clk_sclk_hdmiphy,
-        [6] = &clk_mout_mpll.clk,
-        [7] = &clk_mout_epll.clk,
-        [8] = &clk_sclk_vpll.clk,
-};
-
-static struct clksrc_sources clkset_sclk_audio0 = {
-        .sources        = clkset_sclk_audio0_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_audio0_list),
-};
-
-static struct clksrc_clk clk_sclk_audio0 = {
-        .clk            = {
-                .name           = "sclk_audio",
-                .devname        = "soc-audio.0",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 24),
-        },
-        .sources = &clkset_sclk_audio0,
-        .reg_src = { .reg = S5P_CLK_SRC6, .shift = 0, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV6, .shift = 0, .size = 4 },
-};
-
-static struct clk *clkset_sclk_audio1_list[] = {
-        [0] = &clk_ext_xtal_mux,
-        [1] = &clk_pcmcdclk1,
-        [2] = &clk_sclk_hdmi27m,
-        [3] = &clk_sclk_usbphy0,
-        [4] = &clk_sclk_usbphy1,
-        [5] = &clk_sclk_hdmiphy,
-        [6] = &clk_mout_mpll.clk,
-        [7] = &clk_mout_epll.clk,
-        [8] = &clk_sclk_vpll.clk,
-};
-
-static struct clksrc_sources clkset_sclk_audio1 = {
-        .sources        = clkset_sclk_audio1_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_audio1_list),
-};
-
-static struct clksrc_clk clk_sclk_audio1 = {
-        .clk            = {
-                .name           = "sclk_audio",
-                .devname        = "soc-audio.1",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 25),
-        },
-        .sources = &clkset_sclk_audio1,
-        .reg_src = { .reg = S5P_CLK_SRC6, .shift = 4, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV6, .shift = 4, .size = 4 },
-};
-
-static struct clk *clkset_sclk_audio2_list[] = {
-        [0] = &clk_ext_xtal_mux,
-        [1] = &clk_pcmcdclk0,
-        [2] = &clk_sclk_hdmi27m,
-        [3] = &clk_sclk_usbphy0,
-        [4] = &clk_sclk_usbphy1,
-        [5] = &clk_sclk_hdmiphy,
-        [6] = &clk_mout_mpll.clk,
-        [7] = &clk_mout_epll.clk,
-        [8] = &clk_sclk_vpll.clk,
-};
-
-static struct clksrc_sources clkset_sclk_audio2 = {
-        .sources        = clkset_sclk_audio2_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_audio2_list),
-};
-
-static struct clksrc_clk clk_sclk_audio2 = {
-        .clk            = {
-                .name           = "sclk_audio",
-                .devname        = "soc-audio.2",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 26),
-        },
-        .sources = &clkset_sclk_audio2,
-        .reg_src = { .reg = S5P_CLK_SRC6, .shift = 8, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV6, .shift = 8, .size = 4 },
-};
-
-static struct clk *clkset_sclk_spdif_list[] = {
-        [0] = &clk_sclk_audio0.clk,
-        [1] = &clk_sclk_audio1.clk,
-        [2] = &clk_sclk_audio2.clk,
-};
-
-static struct clksrc_sources clkset_sclk_spdif = {
-        .sources        = clkset_sclk_spdif_list,
-        .nr_sources     = ARRAY_SIZE(clkset_sclk_spdif_list),
-};
-
-static struct clksrc_clk clk_sclk_spdif = {
-        .clk            = {
-                .name           = "sclk_spdif",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 27),
-                .ops            = &s5p_sclk_spdif_ops,
-        },
-        .sources = &clkset_sclk_spdif,
-        .reg_src = { .reg = S5P_CLK_SRC6, .shift = 12, .size = 2 },
-};
-
-static struct clk *clkset_group2_list[] = {
-        [0] = &clk_ext_xtal_mux,
-        [1] = &clk_xusbxti,
-        [2] = &clk_sclk_hdmi27m,
-        [3] = &clk_sclk_usbphy0,
-        [4] = &clk_sclk_usbphy1,
-        [5] = &clk_sclk_hdmiphy,
-        [6] = &clk_mout_mpll.clk,
-        [7] = &clk_mout_epll.clk,
-        [8] = &clk_sclk_vpll.clk,
-};
-
-static struct clksrc_sources clkset_group2 = {
-        .sources        = clkset_group2_list,
-        .nr_sources     = ARRAY_SIZE(clkset_group2_list),
-};
-
-static struct clksrc_clk clksrcs[] = {
-        {
-                .clk    = {
-                        .name           = "sclk_dmc",
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P_CLK_SRC6, .shift = 24, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV6, .shift = 28, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_onenand",
-                },
-                .sources = &clkset_sclk_onenand,
-                .reg_src = { .reg = S5P_CLK_SRC0, .shift = 28, .size = 1 },
-                .reg_div = { .reg = S5P_CLK_DIV6, .shift = 12, .size = 3 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_fimc",
-                        .devname        = "s5pv210-fimc.0",
-                        .enable         = s5pv210_clk_mask1_ctrl,
-                        .ctrlbit        = (1 << 2),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC3, .shift = 12, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 12, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_fimc",
-                        .devname        = "s5pv210-fimc.1",
-                        .enable         = s5pv210_clk_mask1_ctrl,
-                        .ctrlbit        = (1 << 3),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC3, .shift = 16, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 16, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_fimc",
-                        .devname        = "s5pv210-fimc.2",
-                        .enable         = s5pv210_clk_mask1_ctrl,
-                        .ctrlbit        = (1 << 4),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC3, .shift = 20, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 20, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_cam0",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 3),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 12, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_cam1",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 4),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 16, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV1, .shift = 16, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_fimd",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 5),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 20, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV1, .shift = 20, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_mfc",
-                        .devname        = "s5p-mfc",
-                        .enable         = s5pv210_clk_ip0_ctrl,
-                        .ctrlbit        = (1 << 16),
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 4, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV2, .shift = 4, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_g2d",
-                        .enable         = s5pv210_clk_ip0_ctrl,
-                        .ctrlbit        = (1 << 12),
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 8, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV2, .shift = 8, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_g3d",
-                        .enable         = s5pv210_clk_ip0_ctrl,
-                        .ctrlbit        = (1 << 8),
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 0, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV2, .shift = 0, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_csis",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 6),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 24, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV1, .shift = 28, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_pwi",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 29),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC6, .shift = 20, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV6, .shift = 24, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_pwm",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 19),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC5, .shift = 12, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV5, .shift = 12, .size = 4 },
-        },
-};
-
-static struct clksrc_clk clk_sclk_uart0 = {
-        .clk    = {
-                .name           = "uclk1",
-                .devname        = "s5pv210-uart.0",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 12),
-        },
-        .sources = &clkset_uart,
-        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 16, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 16, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_uart1 = {
-        .clk            = {
-                .name           = "uclk1",
-                .devname        = "s5pv210-uart.1",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 13),
-        },
-        .sources = &clkset_uart,
-        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 20, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 20, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_uart2 = {
-        .clk            = {
-                .name           = "uclk1",
-                .devname        = "s5pv210-uart.2",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 14),
-        },
-        .sources = &clkset_uart,
-        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 24, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 24, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_uart3 = {
-        .clk            = {
-                .name           = "uclk1",
-                .devname        = "s5pv210-uart.3",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 15),
-        },
-        .sources = &clkset_uart,
-        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 28, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 28, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc0 = {
-        .clk            = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.0",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 8),
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 0, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 0, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc1 = {
-        .clk            = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.1",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 9),
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 4, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 4, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc2 = {
-        .clk            = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.2",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 10),
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 8, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 8, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_mmc3 = {
-        .clk            = {
-                .name           = "sclk_mmc",
-                .devname        = "s3c-sdhci.3",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 11),
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 12, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 12, .size = 4 },
-};
-
-static struct clksrc_clk clk_sclk_spi0 = {
-        .clk            = {
-                .name           = "sclk_spi",
-                .devname        = "s5pv210-spi.0",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 16),
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P_CLK_SRC5, .shift = 0, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV5, .shift = 0, .size = 4 },
-        };
-
-static struct clksrc_clk clk_sclk_spi1 = {
-        .clk            = {
-                .name           = "sclk_spi",
-                .devname        = "s5pv210-spi.1",
-                .enable         = s5pv210_clk_mask0_ctrl,
-                .ctrlbit        = (1 << 17),
-        },
-        .sources = &clkset_group2,
-        .reg_src = { .reg = S5P_CLK_SRC5, .shift = 4, .size = 4 },
-        .reg_div = { .reg = S5P_CLK_DIV5, .shift = 4, .size = 4 },
-        };
-
-
-static struct clksrc_clk *clksrc_cdev[] = {
-        &clk_sclk_uart0,
-        &clk_sclk_uart1,
-        &clk_sclk_uart2,
-        &clk_sclk_uart3,
-        &clk_sclk_mmc0,
-        &clk_sclk_mmc1,
-        &clk_sclk_mmc2,
-        &clk_sclk_mmc3,
-        &clk_sclk_spi0,
-        &clk_sclk_spi1,
-};
-
-static struct clk *clk_cdev[] = {
-        &clk_hsmmc0,
-        &clk_hsmmc1,
-        &clk_hsmmc2,
-        &clk_hsmmc3,
-        &clk_pdma0,
-        &clk_pdma1,
-};
-
-/* Clock initialisation code */
-static struct clksrc_clk *sysclks[] = {
-        &clk_mout_apll,
-        &clk_mout_epll,
-        &clk_mout_mpll,
-        &clk_armclk,
-        &clk_hclk_msys,
-        &clk_sclk_a2m,
-        &clk_hclk_dsys,
-        &clk_hclk_psys,
-        &clk_pclk_msys,
-        &clk_pclk_dsys,
-        &clk_pclk_psys,
-        &clk_vpllsrc,
-        &clk_sclk_vpll,
-        &clk_mout_dmc0,
-        &clk_sclk_dmc0,
-        &clk_sclk_audio0,
-        &clk_sclk_audio1,
-        &clk_sclk_audio2,
-        &clk_sclk_spdif,
-};
-
-static u32 epll_div[][6] = {
-        {  48000000, 0, 48, 3, 3, 0 },
-        {  96000000, 0, 48, 3, 2, 0 },
-        { 144000000, 1, 72, 3, 2, 0 },
-        { 192000000, 0, 48, 3, 1, 0 },
-        { 288000000, 1, 72, 3, 1, 0 },
-        {  32750000, 1, 65, 3, 4, 35127 },
-        {  32768000, 1, 65, 3, 4, 35127 },
-        {  45158400, 0, 45, 3, 3, 10355 },
-        {  45000000, 0, 45, 3, 3, 10355 },
-        {  45158000, 0, 45, 3, 3, 10355 },
-        {  49125000, 0, 49, 3, 3, 9961 },
-        {  49152000, 0, 49, 3, 3, 9961 },
-        {  67737600, 1, 67, 3, 3, 48366 },
-        {  67738000, 1, 67, 3, 3, 48366 },
-        {  73800000, 1, 73, 3, 3, 47710 },
-        {  73728000, 1, 73, 3, 3, 47710 },
-        {  36000000, 1, 32, 3, 4, 0 },
-        {  60000000, 1, 60, 3, 3, 0 },
-        {  72000000, 1, 72, 3, 3, 0 },
-        {  80000000, 1, 80, 3, 3, 0 },
-        {  84000000, 0, 42, 3, 2, 0 },
-        {  50000000, 0, 50, 3, 3, 0 },
-};
-
-static int s5pv210_epll_set_rate(struct clk *clk, unsigned long rate)
-{
-        unsigned int epll_con, epll_con_k;
-        unsigned int i;
-
-        /* Return if nothing changed */
-        if (clk->rate == rate)
-                return 0;
-
-        epll_con = __raw_readl(S5P_EPLL_CON);
-        epll_con_k = __raw_readl(S5P_EPLL_CON1);
-
-        epll_con_k &= ~PLL46XX_KDIV_MASK;
-        epll_con &= ~(1 << 27 |
-                        PLL46XX_MDIV_MASK << PLL46XX_MDIV_SHIFT |
-                        PLL46XX_PDIV_MASK << PLL46XX_PDIV_SHIFT |
-                        PLL46XX_SDIV_MASK << PLL46XX_SDIV_SHIFT);
-
-        for (i = 0; i < ARRAY_SIZE(epll_div); i++) {
-                if (epll_div[i][0] == rate) {
-                        epll_con_k |= epll_div[i][5] << 0;
-                        epll_con |= (epll_div[i][1] << 27 |
-                                        epll_div[i][2] << PLL46XX_MDIV_SHIFT |
-                                        epll_div[i][3] << PLL46XX_PDIV_SHIFT |
-                                        epll_div[i][4] << PLL46XX_SDIV_SHIFT);
-                        break;
-                }
-        }
-
-        if (i == ARRAY_SIZE(epll_div)) {
-                printk(KERN_ERR "%s: Invalid Clock EPLL Frequency\n",
-                                __func__);
-                return -EINVAL;
-        }
-
-        __raw_writel(epll_con, S5P_EPLL_CON);
-        __raw_writel(epll_con_k, S5P_EPLL_CON1);
-
-        printk(KERN_WARNING "EPLL Rate changes from %lu to %lu\n",
-                        clk->rate, rate);
-
-        clk->rate = rate;
-
-        return 0;
-}
-
-static struct clk_ops s5pv210_epll_ops = {
-        .set_rate = s5pv210_epll_set_rate,
-        .get_rate = s5p_epll_get_rate,
-};
-
-static u32 vpll_div[][5] = {
-        {  54000000, 3, 53, 3, 0 },
-        { 108000000, 3, 53, 2, 0 },
-};
-
-static unsigned long s5pv210_vpll_get_rate(struct clk *clk)
-{
-        return clk->rate;
-}
-
-static int s5pv210_vpll_set_rate(struct clk *clk, unsigned long rate)
-{
-        unsigned int vpll_con;
-        unsigned int i;
-
-        /* Return if nothing changed */
-        if (clk->rate == rate)
-                return 0;
-
-        vpll_con = __raw_readl(S5P_VPLL_CON);
-        vpll_con &= ~(0x1 << 27 |                                       \
-                        PLL90XX_MDIV_MASK << PLL90XX_MDIV_SHIFT |       \
-                        PLL90XX_PDIV_MASK << PLL90XX_PDIV_SHIFT |       \
-                        PLL90XX_SDIV_MASK << PLL90XX_SDIV_SHIFT);
-
-        for (i = 0; i < ARRAY_SIZE(vpll_div); i++) {
-                if (vpll_div[i][0] == rate) {
-                        vpll_con |= vpll_div[i][1] << PLL90XX_PDIV_SHIFT;
-                        vpll_con |= vpll_div[i][2] << PLL90XX_MDIV_SHIFT;
-                        vpll_con |= vpll_div[i][3] << PLL90XX_SDIV_SHIFT;
-                        vpll_con |= vpll_div[i][4] << 27;
-                        break;
-                }
-        }
-
-        if (i == ARRAY_SIZE(vpll_div)) {
-                printk(KERN_ERR "%s: Invalid Clock VPLL Frequency\n",
-                                __func__);
-                return -EINVAL;
-        }
-
-        __raw_writel(vpll_con, S5P_VPLL_CON);
-
-        /* Wait for VPLL lock */
-        while (!(__raw_readl(S5P_VPLL_CON) & (1 << PLL90XX_LOCKED_SHIFT)))
-                continue;
-
-        clk->rate = rate;
-        return 0;
-}
-static struct clk_ops s5pv210_vpll_ops = {
-        .get_rate = s5pv210_vpll_get_rate,
-        .set_rate = s5pv210_vpll_set_rate,
-};
-
-void __init_or_cpufreq s5pv210_setup_clocks(void)
-{
-        struct clk *xtal_clk;
-        unsigned long vpllsrc;
-        unsigned long armclk;
-        unsigned long hclk_msys;
-        unsigned long hclk_dsys;
-        unsigned long hclk_psys;
-        unsigned long pclk_msys;
-        unsigned long pclk_dsys;
-        unsigned long pclk_psys;
-        unsigned long apll;
-        unsigned long mpll;
-        unsigned long epll;
-        unsigned long vpll;
-        unsigned int ptr;
-        u32 clkdiv0, clkdiv1;
-
-        /* Set functions for clk_fout_epll */
-        clk_fout_epll.enable = s5p_epll_enable;
-        clk_fout_epll.ops = &s5pv210_epll_ops;
-
-        printk(KERN_DEBUG "%s: registering clocks\n", __func__);
-
-        clkdiv0 = __raw_readl(S5P_CLK_DIV0);
-        clkdiv1 = __raw_readl(S5P_CLK_DIV1);
-
-        printk(KERN_DEBUG "%s: clkdiv0 = %08x, clkdiv1 = %08x\n",
-                                __func__, clkdiv0, clkdiv1);
-
-        xtal_clk = clk_get(NULL, "xtal");
-        BUG_ON(IS_ERR(xtal_clk));
-
-        xtal = clk_get_rate(xtal_clk);
-        clk_put(xtal_clk);
-
-        printk(KERN_DEBUG "%s: xtal is %ld\n", __func__, xtal);
-
-        apll = s5p_get_pll45xx(xtal, __raw_readl(S5P_APLL_CON), pll_4508);
-        mpll = s5p_get_pll45xx(xtal, __raw_readl(S5P_MPLL_CON), pll_4502);
-        epll = s5p_get_pll46xx(xtal, __raw_readl(S5P_EPLL_CON),
-                                __raw_readl(S5P_EPLL_CON1), pll_4600);
-        vpllsrc = clk_get_rate(&clk_vpllsrc.clk);
-        vpll = s5p_get_pll45xx(vpllsrc, __raw_readl(S5P_VPLL_CON), pll_4502);
-
-        clk_fout_apll.ops = &clk_fout_apll_ops;
-        clk_fout_mpll.rate = mpll;
-        clk_fout_epll.rate = epll;
-        clk_fout_vpll.ops = &s5pv210_vpll_ops;
-        clk_fout_vpll.rate = vpll;
-
-        printk(KERN_INFO "S5PV210: PLL settings, A=%ld, M=%ld, E=%ld V=%ld",
-                        apll, mpll, epll, vpll);
-
-        armclk = clk_get_rate(&clk_armclk.clk);
-        hclk_msys = clk_get_rate(&clk_hclk_msys.clk);
-        hclk_dsys = clk_get_rate(&clk_hclk_dsys.clk);
-        hclk_psys = clk_get_rate(&clk_hclk_psys.clk);
-        pclk_msys = clk_get_rate(&clk_pclk_msys.clk);
-        pclk_dsys = clk_get_rate(&clk_pclk_dsys.clk);
-        pclk_psys = clk_get_rate(&clk_pclk_psys.clk);
-
-        printk(KERN_INFO "S5PV210: ARMCLK=%ld, HCLKM=%ld, HCLKD=%ld\n"
-                         "HCLKP=%ld, PCLKM=%ld, PCLKD=%ld, PCLKP=%ld\n",
-                        armclk, hclk_msys, hclk_dsys, hclk_psys,
-                        pclk_msys, pclk_dsys, pclk_psys);
-
-        clk_f.rate = armclk;
-        clk_h.rate = hclk_psys;
-        clk_p.rate = pclk_psys;
-
-        for (ptr = 0; ptr < ARRAY_SIZE(clksrcs); ptr++)
-                s3c_set_clksrc(&clksrcs[ptr], true);
-}
-
-static struct clk *clks[] __initdata = {
-        &clk_sclk_hdmi27m,
-        &clk_sclk_hdmiphy,
-        &clk_sclk_usbphy0,
-        &clk_sclk_usbphy1,
-        &clk_pcmcdclk0,
-        &clk_pcmcdclk1,
-        &clk_pcmcdclk2,
-};
-
-static struct clk_lookup s5pv210_clk_lookup[] = {
-        CLKDEV_INIT(NULL, "clk_uart_baud0", &clk_p),
-        CLKDEV_INIT("s5pv210-uart.0", "clk_uart_baud1", &clk_sclk_uart0.clk),
-        CLKDEV_INIT("s5pv210-uart.1", "clk_uart_baud1", &clk_sclk_uart1.clk),
-        CLKDEV_INIT("s5pv210-uart.2", "clk_uart_baud1", &clk_sclk_uart2.clk),
-        CLKDEV_INIT("s5pv210-uart.3", "clk_uart_baud1", &clk_sclk_uart3.clk),
-        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &clk_hsmmc0),
-        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &clk_hsmmc1),
-        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.0", &clk_hsmmc2),
-        CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.0", &clk_hsmmc3),
-        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
-        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
-        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
-        CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),
-        CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
-        CLKDEV_INIT("s5pv210-spi.0", "spi_busclk1", &clk_sclk_spi0.clk),
-        CLKDEV_INIT("s5pv210-spi.1", "spi_busclk1", &clk_sclk_spi1.clk),
-        CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),
-        CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),
-};
-
-void __init s5pv210_register_clocks(void)
-{
-        int ptr;
-
-        s3c24xx_register_clocks(clks, ARRAY_SIZE(clks));
-
-        for (ptr = 0; ptr < ARRAY_SIZE(sysclks); ptr++)
-                s3c_register_clksrc(sysclks[ptr], 1);
-
-        for (ptr = 0; ptr < ARRAY_SIZE(sclk_tv); ptr++)
-                s3c_register_clksrc(sclk_tv[ptr], 1);
-
-        for (ptr = 0; ptr < ARRAY_SIZE(clksrc_cdev); ptr++)
-                s3c_register_clksrc(clksrc_cdev[ptr], 1);
-
-        s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
-        s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
-
-        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(s5pv210_clk_lookup, ARRAY_SIZE(s5pv210_clk_lookup));
-
-        s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));
-        for (ptr = 0; ptr < ARRAY_SIZE(clk_cdev); ptr++)
-                s3c_disable_clocks(clk_cdev[ptr], 1);
-
-}
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
deleted file mode 100644
index 7024dcd0e40a..000000000000
--- a/arch/arm/mach-s5pv210/common.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Common Codes for S5PV210
- *
- * 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/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#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>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-
-#include <asm/proc-fns.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
-
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/cpu.h>
-#include <plat/clock.h>
-#include <plat/devs.h>
-#include <plat/sdhci.h>
-#include <plat/adc-core.h>
-#include <plat/ata-core.h>
-#include <plat/fb-core.h>
-#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 "common.h"
-
-static const char name_s5pv210[] = "S5PV210/S5PC110";
-
-static struct cpu_table cpu_ids[] __initdata = {
-        {
-                .idcode         = S5PV210_CPU_ID,
-                .idmask         = S5PV210_CPU_MASK,
-                .map_io         = s5pv210_map_io,
-                .init_clocks    = s5pv210_init_clocks,
-                .init_uarts     = s5pv210_init_uarts,
-                .init           = s5pv210_init,
-                .name           = name_s5pv210,
-        },
-};
-
-/* Initial IO mappings */
-
-static struct map_desc s5pv210_iodesc[] __initdata = {
-        {
-                .virtual        = (unsigned long)S5P_VA_CHIPID,
-                .pfn            = __phys_to_pfn(S5PV210_PA_CHIPID),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_SYS,
-                .pfn            = __phys_to_pfn(S5PV210_PA_SYSCON),
-                .length         = SZ_64K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_TIMER,
-                .pfn            = __phys_to_pfn(S5PV210_PA_TIMER),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_WATCHDOG,
-                .pfn            = __phys_to_pfn(S5PV210_PA_WATCHDOG),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_SROMC,
-                .pfn            = __phys_to_pfn(S5PV210_PA_SROMC),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_SYSTIMER,
-                .pfn            = __phys_to_pfn(S5PV210_PA_SYSTIMER),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_GPIO,
-                .pfn            = __phys_to_pfn(S5PV210_PA_GPIO),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC0,
-                .pfn            = __phys_to_pfn(S5PV210_PA_VIC0),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC1,
-                .pfn            = __phys_to_pfn(S5PV210_PA_VIC1),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC2,
-                .pfn            = __phys_to_pfn(S5PV210_PA_VIC2),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)VA_VIC3,
-                .pfn            = __phys_to_pfn(S5PV210_PA_VIC3),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_UART,
-                .pfn            = __phys_to_pfn(S3C_PA_UART),
-                .length         = SZ_512K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_DMC0,
-                .pfn            = __phys_to_pfn(S5PV210_PA_DMC0),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_DMC1,
-                .pfn            = __phys_to_pfn(S5PV210_PA_DMC1),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_USB_HSPHY,
-                .pfn            =__phys_to_pfn(S5PV210_PA_HSPHY),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }
-};
-
-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
- *
- * register the standard cpu IO areas
- */
-
-void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
-{
-        /* initialize the io descriptors we need for initialization */
-        iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));
-        if (mach_desc)
-                iotable_init(mach_desc, size);
-
-        /* detect cpu id and rev. */
-        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)
-{
-        /* initialise device information early */
-        s5pv210_default_sdhci0();
-        s5pv210_default_sdhci1();
-        s5pv210_default_sdhci2();
-        s5pv210_default_sdhci3();
-
-        s3c_adc_setname("samsung-adc-v3");
-
-        s3c_cfcon_setname("s5pv210-pata");
-
-        s3c_fimc_setname(0, "s5pv210-fimc");
-        s3c_fimc_setname(1, "s5pv210-fimc");
-        s3c_fimc_setname(2, "s5pv210-fimc");
-
-        /* the i2c devices are directly compatible with s3c2440 */
-        s3c_i2c0_setname("s3c2440-i2c");
-        s3c_i2c1_setname("s3c2440-i2c");
-        s3c_i2c2_setname("s3c2440-i2c");
-
-        s3c_fb_setname("s5pv210-fb");
-
-        /* Use s5pv210-keypad instead of samsung-keypad */
-        samsung_keypad_setname("s5pv210-keypad");
-
-        /* setup TV devices */
-        s5p_hdmi_setname("s5pv210-hdmi");
-
-        s3c64xx_spi_setname("s5pv210-spi");
-}
-
-void __init s5pv210_init_clocks(int xtal)
-{
-        printk(KERN_DEBUG "%s: initializing clocks\n", __func__);
-
-        s3c24xx_register_baseclocks(xtal);
-        s5p_register_clocks(xtal);
-        s5pv210_register_clocks();
-        s5pv210_setup_clocks();
-}
-
-void __init s5pv210_init_irq(void)
-{
-        u32 vic[4];     /* S5PV210 supports 4 VIC */
-
-        /* All the VICs are fully populated. */
-        vic[0] = ~0;
-        vic[1] = ~0;
-        vic[2] = ~0;
-        vic[3] = ~0;
-
-        s5p_init_irq(vic, ARRAY_SIZE(vic));
-}
-
-struct bus_type s5pv210_subsys = {
-        .name           = "s5pv210-core",
-        .dev_name       = "s5pv210-core",
-};
-
-static struct device s5pv210_dev = {
-        .bus    = &s5pv210_subsys,
-};
-
-static int __init s5pv210_core_init(void)
-{
-        return subsys_system_register(&s5pv210_subsys, NULL);
-}
-core_initcall(s5pv210_core_init);
-
-int __init s5pv210_init(void)
-{
-        printk(KERN_INFO "S5PV210: Initializing architecture\n");
-        return device_register(&s5pv210_dev);
-}
-
-/* uart registration process */
-
-void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
-{
-        s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
-}
diff --git a/arch/arm/mach-s5pv210/common.h b/arch/arm/mach-s5pv210/common.h
index fe1beb54e548..2ad387c1ecf0 100644
--- a/arch/arm/mach-s5pv210/common.h
+++ b/arch/arm/mach-s5pv210/common.h
@@ -12,19 +12,12 @@
 #ifndef __ARCH_ARM_MACH_S5PV210_COMMON_H
 #define __ARCH_ARM_MACH_S5PV210_COMMON_H
 
-#include <linux/reboot.h>
-
-void s5pv210_init_io(struct map_desc *mach_desc, int size);
-void s5pv210_init_irq(void);
-
-void s5pv210_register_clocks(void);
-void s5pv210_setup_clocks(void);
-
-void s5pv210_restart(enum reboot_mode mode, const char *cmd);
-
-extern  int s5pv210_init(void);
-extern void s5pv210_map_io(void);
-extern void s5pv210_init_clocks(int xtal);
-extern void s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no);
+#ifdef CONFIG_PM_SLEEP
+u32 exynos_get_eint_wake_mask(void);
+void s5pv210_cpu_resume(void);
+void s5pv210_pm_init(void);
+#else
+static inline void s5pv210_pm_init(void) {}
+#endif
 
 #endif /* __ARCH_ARM_MACH_S5PV210_COMMON_H */
diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c
deleted file mode 100644
index 2d67361ef431..000000000000
--- a/arch/arm/mach-s5pv210/dev-audio.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/dev-audio.c
- *
- * Copyright (c) 2010 Samsung Electronics Co. Ltd
- *      Jaswinder Singh <jassi.brar@samsung.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/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <plat/gpio-cfg.h>
-#include <linux/platform_data/asoc-s3c.h>
-
-#include <mach/map.h>
-#include <mach/dma.h>
-#include <mach/irqs.h>
-
-#define S5PV210_AUDSS_INT_MEM   (0xC0000000)
-
-static int s5pv210_cfg_i2s(struct platform_device *pdev)
-{
-        /* configure GPIO for i2s port */
-        switch (pdev->id) {
-        case 0:
-                s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
-                break;
-        case 1:
-                s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(2));
-                break;
-        case 2:
-                s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 5, S3C_GPIO_SFN(4));
-                break;
-        default:
-                printk(KERN_ERR "Invalid Device %d\n", pdev->id);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct s3c_audio_pdata i2sv5_pdata = {
-        .cfg_gpio = s5pv210_cfg_i2s,
-        .type = {
-                .i2s = {
-                        .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
-                                         | QUIRK_NEED_RSTCLR,
-                        .idma_addr = S5PV210_AUDSS_INT_MEM,
-                },
-        },
-};
-
-static struct resource s5pv210_iis0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PV210_PA_IIS0, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_I2S0_TX),
-        [2] = DEFINE_RES_DMA(DMACH_I2S0_RX),
-        [3] = DEFINE_RES_DMA(DMACH_I2S0S_TX),
-};
-
-struct platform_device s5pv210_device_iis0 = {
-        .name = "samsung-i2s",
-        .id = 0,
-        .num_resources    = ARRAY_SIZE(s5pv210_iis0_resource),
-        .resource         = s5pv210_iis0_resource,
-        .dev = {
-                .platform_data = &i2sv5_pdata,
-        },
-};
-
-static struct s3c_audio_pdata i2sv3_pdata = {
-        .cfg_gpio = s5pv210_cfg_i2s,
-};
-
-static struct resource s5pv210_iis1_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PV210_PA_IIS1, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_I2S1_TX),
-        [2] = DEFINE_RES_DMA(DMACH_I2S1_RX),
-};
-
-struct platform_device s5pv210_device_iis1 = {
-        .name             = "samsung-i2s",
-        .id               = 1,
-        .num_resources    = ARRAY_SIZE(s5pv210_iis1_resource),
-        .resource         = s5pv210_iis1_resource,
-        .dev = {
-                .platform_data = &i2sv3_pdata,
-        },
-};
-
-static struct resource s5pv210_iis2_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PV210_PA_IIS2, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_I2S2_TX),
-        [2] = DEFINE_RES_DMA(DMACH_I2S2_RX),
-};
-
-struct platform_device s5pv210_device_iis2 = {
-        .name             = "samsung-i2s",
-        .id               = 2,
-        .num_resources    = ARRAY_SIZE(s5pv210_iis2_resource),
-        .resource         = s5pv210_iis2_resource,
-        .dev = {
-                .platform_data = &i2sv3_pdata,
-        },
-};
-
-/* PCM Controller platform_devices */
-
-static int s5pv210_pcm_cfg_gpio(struct platform_device *pdev)
-{
-        switch (pdev->id) {
-        case 0:
-                s3c_gpio_cfgpin_range(S5PV210_GPI(0), 5, S3C_GPIO_SFN(3));
-                break;
-        case 1:
-                s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(3));
-                break;
-        case 2:
-                s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 5, S3C_GPIO_SFN(2));
-                break;
-        default:
-                printk(KERN_DEBUG "Invalid PCM Controller number!");
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct s3c_audio_pdata s3c_pcm_pdata = {
-        .cfg_gpio = s5pv210_pcm_cfg_gpio,
-};
-
-static struct resource s5pv210_pcm0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PV210_PA_PCM0, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_PCM0_TX),
-        [2] = DEFINE_RES_DMA(DMACH_PCM0_RX),
-};
-
-struct platform_device s5pv210_device_pcm0 = {
-        .name             = "samsung-pcm",
-        .id               = 0,
-        .num_resources    = ARRAY_SIZE(s5pv210_pcm0_resource),
-        .resource         = s5pv210_pcm0_resource,
-        .dev = {
-                .platform_data = &s3c_pcm_pdata,
-        },
-};
-
-static struct resource s5pv210_pcm1_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PV210_PA_PCM1, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_PCM1_TX),
-        [2] = DEFINE_RES_DMA(DMACH_PCM1_RX),
-};
-
-struct platform_device s5pv210_device_pcm1 = {
-        .name             = "samsung-pcm",
-        .id               = 1,
-        .num_resources    = ARRAY_SIZE(s5pv210_pcm1_resource),
-        .resource         = s5pv210_pcm1_resource,
-        .dev = {
-                .platform_data = &s3c_pcm_pdata,
-        },
-};
-
-static struct resource s5pv210_pcm2_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PV210_PA_PCM2, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_PCM2_TX),
-        [2] = DEFINE_RES_DMA(DMACH_PCM2_RX),
-};
-
-struct platform_device s5pv210_device_pcm2 = {
-        .name             = "samsung-pcm",
-        .id               = 2,
-        .num_resources    = ARRAY_SIZE(s5pv210_pcm2_resource),
-        .resource         = s5pv210_pcm2_resource,
-        .dev = {
-                .platform_data = &s3c_pcm_pdata,
-        },
-};
-
-/* AC97 Controller platform devices */
-
-static int s5pv210_ac97_cfg_gpio(struct platform_device *pdev)
-{
-        return s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(4));
-}
-
-static struct resource s5pv210_ac97_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PV210_PA_AC97, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_AC97_PCMOUT),
-        [2] = DEFINE_RES_DMA(DMACH_AC97_PCMIN),
-        [3] = DEFINE_RES_DMA(DMACH_AC97_MICIN),
-        [4] = DEFINE_RES_IRQ(IRQ_AC97),
-};
-
-static struct s3c_audio_pdata s3c_ac97_pdata = {
-        .cfg_gpio = s5pv210_ac97_cfg_gpio,
-};
-
-static u64 s5pv210_ac97_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5pv210_device_ac97 = {
-        .name             = "samsung-ac97",
-        .id               = -1,
-        .num_resources    = ARRAY_SIZE(s5pv210_ac97_resource),
-        .resource         = s5pv210_ac97_resource,
-        .dev = {
-                .platform_data = &s3c_ac97_pdata,
-                .dma_mask = &s5pv210_ac97_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-};
-
-/* S/PDIF Controller platform_device */
-
-static int s5pv210_spdif_cfg_gpio(struct platform_device *pdev)
-{
-        s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 2, S3C_GPIO_SFN(3));
-
-        return 0;
-}
-
-static struct resource s5pv210_spdif_resource[] = {
-        [0] = DEFINE_RES_MEM(S5PV210_PA_SPDIF, SZ_256),
-        [1] = DEFINE_RES_DMA(DMACH_SPDIF),
-};
-
-static struct s3c_audio_pdata samsung_spdif_pdata = {
-        .cfg_gpio = s5pv210_spdif_cfg_gpio,
-};
-
-static u64 s5pv210_spdif_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5pv210_device_spdif = {
-        .name           = "samsung-spdif",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5pv210_spdif_resource),
-        .resource       = s5pv210_spdif_resource,
-        .dev = {
-                .platform_data = &samsung_spdif_pdata,
-                .dma_mask = &s5pv210_spdif_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-};
diff --git a/arch/arm/mach-s5pv210/dma.c b/arch/arm/mach-s5pv210/dma.c
deleted file mode 100644
index b8337e248b09..000000000000
--- a/arch/arm/mach-s5pv210/dma.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/dma.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/pl330.h>
-
-#include <asm/irq.h>
-#include <plat/devs.h>
-#include <plat/irqs.h>
-
-#include <mach/map.h>
-#include <mach/irqs.h>
-#include <mach/dma.h>
-
-static u8 pdma0_peri[] = {
-        DMACH_UART0_RX,
-        DMACH_UART0_TX,
-        DMACH_UART1_RX,
-        DMACH_UART1_TX,
-        DMACH_UART2_RX,
-        DMACH_UART2_TX,
-        DMACH_UART3_RX,
-        DMACH_UART3_TX,
-        DMACH_MAX,
-        DMACH_I2S0_RX,
-        DMACH_I2S0_TX,
-        DMACH_I2S0S_TX,
-        DMACH_I2S1_RX,
-        DMACH_I2S1_TX,
-        DMACH_MAX,
-        DMACH_MAX,
-        DMACH_SPI0_RX,
-        DMACH_SPI0_TX,
-        DMACH_SPI1_RX,
-        DMACH_SPI1_TX,
-        DMACH_MAX,
-        DMACH_MAX,
-        DMACH_AC97_MICIN,
-        DMACH_AC97_PCMIN,
-        DMACH_AC97_PCMOUT,
-        DMACH_MAX,
-        DMACH_PWM,
-        DMACH_SPDIF,
-};
-
-static struct dma_pl330_platdata s5pv210_pdma0_pdata = {
-        .nr_valid_peri = ARRAY_SIZE(pdma0_peri),
-        .peri_id = pdma0_peri,
-};
-
-static AMBA_AHB_DEVICE(s5pv210_pdma0, "dma-pl330.0", 0x00041330,
-        S5PV210_PA_PDMA0, {IRQ_PDMA0}, &s5pv210_pdma0_pdata);
-
-static u8 pdma1_peri[] = {
-        DMACH_UART0_RX,
-        DMACH_UART0_TX,
-        DMACH_UART1_RX,
-        DMACH_UART1_TX,
-        DMACH_UART2_RX,
-        DMACH_UART2_TX,
-        DMACH_UART3_RX,
-        DMACH_UART3_TX,
-        DMACH_MAX,
-        DMACH_I2S0_RX,
-        DMACH_I2S0_TX,
-        DMACH_I2S0S_TX,
-        DMACH_I2S1_RX,
-        DMACH_I2S1_TX,
-        DMACH_I2S2_RX,
-        DMACH_I2S2_TX,
-        DMACH_SPI0_RX,
-        DMACH_SPI0_TX,
-        DMACH_SPI1_RX,
-        DMACH_SPI1_TX,
-        DMACH_MAX,
-        DMACH_MAX,
-        DMACH_PCM0_RX,
-        DMACH_PCM0_TX,
-        DMACH_PCM1_RX,
-        DMACH_PCM1_TX,
-        DMACH_MSM_REQ0,
-        DMACH_MSM_REQ1,
-        DMACH_MSM_REQ2,
-        DMACH_MSM_REQ3,
-        DMACH_PCM2_RX,
-        DMACH_PCM2_TX,
-};
-
-static struct dma_pl330_platdata s5pv210_pdma1_pdata = {
-        .nr_valid_peri = ARRAY_SIZE(pdma1_peri),
-        .peri_id = pdma1_peri,
-};
-
-static AMBA_AHB_DEVICE(s5pv210_pdma1, "dma-pl330.1", 0x00041330,
-        S5PV210_PA_PDMA1, {IRQ_PDMA1}, &s5pv210_pdma1_pdata);
-
-static int __init s5pv210_dma_init(void)
-{
-        dma_cap_set(DMA_SLAVE, s5pv210_pdma0_pdata.cap_mask);
-        dma_cap_set(DMA_CYCLIC, s5pv210_pdma0_pdata.cap_mask);
-        amba_device_register(&s5pv210_pdma0_device, &iomem_resource);
-
-        dma_cap_set(DMA_SLAVE, s5pv210_pdma1_pdata.cap_mask);
-        dma_cap_set(DMA_CYCLIC, s5pv210_pdma1_pdata.cap_mask);
-        amba_device_register(&s5pv210_pdma1_device, &iomem_resource);
-
-        return 0;
-}
-arch_initcall(s5pv210_dma_init);
diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h
deleted file mode 100644
index 6c8b903c02e4..000000000000
--- a/arch/arm/mach-s5pv210/include/mach/gpio.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/gpio.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - GPIO lib 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_ARCH_GPIO_H
-#define __ASM_ARCH_GPIO_H __FILE__
-
-/* Practically, GPIO banks up to MP03 are the configurable gpio banks */
-
-/* GPIO bank sizes */
-#define S5PV210_GPIO_A0_NR      (8)
-#define S5PV210_GPIO_A1_NR      (4)
-#define S5PV210_GPIO_B_NR       (8)
-#define S5PV210_GPIO_C0_NR      (5)
-#define S5PV210_GPIO_C1_NR      (5)
-#define S5PV210_GPIO_D0_NR      (4)
-#define S5PV210_GPIO_D1_NR      (6)
-#define S5PV210_GPIO_E0_NR      (8)
-#define S5PV210_GPIO_E1_NR      (5)
-#define S5PV210_GPIO_F0_NR      (8)
-#define S5PV210_GPIO_F1_NR      (8)
-#define S5PV210_GPIO_F2_NR      (8)
-#define S5PV210_GPIO_F3_NR      (6)
-#define S5PV210_GPIO_G0_NR      (7)
-#define S5PV210_GPIO_G1_NR      (7)
-#define S5PV210_GPIO_G2_NR      (7)
-#define S5PV210_GPIO_G3_NR      (7)
-#define S5PV210_GPIO_H0_NR      (8)
-#define S5PV210_GPIO_H1_NR      (8)
-#define S5PV210_GPIO_H2_NR      (8)
-#define S5PV210_GPIO_H3_NR      (8)
-#define S5PV210_GPIO_I_NR       (7)
-#define S5PV210_GPIO_J0_NR      (8)
-#define S5PV210_GPIO_J1_NR      (6)
-#define S5PV210_GPIO_J2_NR      (8)
-#define S5PV210_GPIO_J3_NR      (8)
-#define S5PV210_GPIO_J4_NR      (5)
-
-#define S5PV210_GPIO_MP01_NR    (8)
-#define S5PV210_GPIO_MP02_NR    (4)
-#define S5PV210_GPIO_MP03_NR    (8)
-#define S5PV210_GPIO_MP04_NR    (8)
-#define S5PV210_GPIO_MP05_NR    (8)
-
-/* GPIO bank numbers */
-
-/* CONFIG_S3C_GPIO_SPACE allows the user to select extra
- * space for debugging purposes so that any accidental
- * change from one gpio bank to another can be caught.
-*/
-
-#define S5PV210_GPIO_NEXT(__gpio) \
-        ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1)
-
-enum s5p_gpio_number {
-        S5PV210_GPIO_A0_START   = 0,
-        S5PV210_GPIO_A1_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_A0),
-        S5PV210_GPIO_B_START    = S5PV210_GPIO_NEXT(S5PV210_GPIO_A1),
-        S5PV210_GPIO_C0_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_B),
-        S5PV210_GPIO_C1_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_C0),
-        S5PV210_GPIO_D0_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_C1),
-        S5PV210_GPIO_D1_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_D0),
-        S5PV210_GPIO_E0_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_D1),
-        S5PV210_GPIO_E1_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_E0),
-        S5PV210_GPIO_F0_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_E1),
-        S5PV210_GPIO_F1_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_F0),
-        S5PV210_GPIO_F2_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_F1),
-        S5PV210_GPIO_F3_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_F2),
-        S5PV210_GPIO_G0_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_F3),
-        S5PV210_GPIO_G1_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_G0),
-        S5PV210_GPIO_G2_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_G1),
-        S5PV210_GPIO_G3_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_G2),
-        S5PV210_GPIO_H0_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_G3),
-        S5PV210_GPIO_H1_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_H0),
-        S5PV210_GPIO_H2_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_H1),
-        S5PV210_GPIO_H3_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_H2),
-        S5PV210_GPIO_I_START    = S5PV210_GPIO_NEXT(S5PV210_GPIO_H3),
-        S5PV210_GPIO_J0_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_I),
-        S5PV210_GPIO_J1_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_J0),
-        S5PV210_GPIO_J2_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_J1),
-        S5PV210_GPIO_J3_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_J2),
-        S5PV210_GPIO_J4_START   = S5PV210_GPIO_NEXT(S5PV210_GPIO_J3),
-        S5PV210_GPIO_MP01_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_J4),
-        S5PV210_GPIO_MP02_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP01),
-        S5PV210_GPIO_MP03_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP02),
-        S5PV210_GPIO_MP04_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP03),
-        S5PV210_GPIO_MP05_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP04),
-};
-
-/* S5PV210 GPIO number definitions */
-#define S5PV210_GPA0(_nr)       (S5PV210_GPIO_A0_START + (_nr))
-#define S5PV210_GPA1(_nr)       (S5PV210_GPIO_A1_START + (_nr))
-#define S5PV210_GPB(_nr)        (S5PV210_GPIO_B_START + (_nr))
-#define S5PV210_GPC0(_nr)       (S5PV210_GPIO_C0_START + (_nr))
-#define S5PV210_GPC1(_nr)       (S5PV210_GPIO_C1_START + (_nr))
-#define S5PV210_GPD0(_nr)       (S5PV210_GPIO_D0_START + (_nr))
-#define S5PV210_GPD1(_nr)       (S5PV210_GPIO_D1_START + (_nr))
-#define S5PV210_GPE0(_nr)       (S5PV210_GPIO_E0_START + (_nr))
-#define S5PV210_GPE1(_nr)       (S5PV210_GPIO_E1_START + (_nr))
-#define S5PV210_GPF0(_nr)       (S5PV210_GPIO_F0_START + (_nr))
-#define S5PV210_GPF1(_nr)       (S5PV210_GPIO_F1_START + (_nr))
-#define S5PV210_GPF2(_nr)       (S5PV210_GPIO_F2_START + (_nr))
-#define S5PV210_GPF3(_nr)       (S5PV210_GPIO_F3_START + (_nr))
-#define S5PV210_GPG0(_nr)       (S5PV210_GPIO_G0_START + (_nr))
-#define S5PV210_GPG1(_nr)       (S5PV210_GPIO_G1_START + (_nr))
-#define S5PV210_GPG2(_nr)       (S5PV210_GPIO_G2_START + (_nr))
-#define S5PV210_GPG3(_nr)       (S5PV210_GPIO_G3_START + (_nr))
-#define S5PV210_GPH0(_nr)       (S5PV210_GPIO_H0_START + (_nr))
-#define S5PV210_GPH1(_nr)       (S5PV210_GPIO_H1_START + (_nr))
-#define S5PV210_GPH2(_nr)       (S5PV210_GPIO_H2_START + (_nr))
-#define S5PV210_GPH3(_nr)       (S5PV210_GPIO_H3_START + (_nr))
-#define S5PV210_GPI(_nr)        (S5PV210_GPIO_I_START + (_nr))
-#define S5PV210_GPJ0(_nr)       (S5PV210_GPIO_J0_START + (_nr))
-#define S5PV210_GPJ1(_nr)       (S5PV210_GPIO_J1_START + (_nr))
-#define S5PV210_GPJ2(_nr)       (S5PV210_GPIO_J2_START + (_nr))
-#define S5PV210_GPJ3(_nr)       (S5PV210_GPIO_J3_START + (_nr))
-#define S5PV210_GPJ4(_nr)       (S5PV210_GPIO_J4_START + (_nr))
-#define S5PV210_MP01(_nr)       (S5PV210_GPIO_MP01_START + (_nr))
-#define S5PV210_MP02(_nr)       (S5PV210_GPIO_MP02_START + (_nr))
-#define S5PV210_MP03(_nr)       (S5PV210_GPIO_MP03_START + (_nr))
-#define S5PV210_MP04(_nr)       (S5PV210_GPIO_MP04_START + (_nr))
-#define S5PV210_MP05(_nr)       (S5PV210_GPIO_MP05_START + (_nr))
-
-/* the end of the S5PV210 specific gpios */
-#define S5PV210_GPIO_END        (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + 1)
-#define S3C_GPIO_END            S5PV210_GPIO_END
-
-/* define the number of gpios we need to the one after the MP05() range */
-#define ARCH_NR_GPIOS           (S5PV210_MP05(S5PV210_GPIO_MP05_NR) +   \
-                                 CONFIG_SAMSUNG_GPIO_EXTRA + 1)
-
-#endif /* __ASM_ARCH_GPIO_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/hardware.h b/arch/arm/mach-s5pv210/include/mach/hardware.h
deleted file mode 100644
index fada7a392d09..000000000000
--- a/arch/arm/mach-s5pv210/include/mach/hardware.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/hardware.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - Hardware 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_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H __FILE__
-
-/* currently nothing here, placeholder */
-
-#endif /* __ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h
deleted file mode 100644
index 5e0de3a31f3d..000000000000
--- a/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/irqs.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - IRQ definitions
- *
- * 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_IRQS_H
-#define __ASM_ARCH_IRQS_H __FILE__
-
-#include <plat/irqs.h>
-
-/* VIC0: System, DMA, Timer */
-
-#define IRQ_EINT16_31           S5P_IRQ_VIC0(16)
-#define IRQ_BATF                S5P_IRQ_VIC0(17)
-#define IRQ_MDMA                S5P_IRQ_VIC0(18)
-#define IRQ_PDMA0               S5P_IRQ_VIC0(19)
-#define IRQ_PDMA1               S5P_IRQ_VIC0(20)
-#define IRQ_TIMER0_VIC          S5P_IRQ_VIC0(21)
-#define IRQ_TIMER1_VIC          S5P_IRQ_VIC0(22)
-#define IRQ_TIMER2_VIC          S5P_IRQ_VIC0(23)
-#define IRQ_TIMER3_VIC          S5P_IRQ_VIC0(24)
-#define IRQ_TIMER4_VIC          S5P_IRQ_VIC0(25)
-#define IRQ_SYSTIMER            S5P_IRQ_VIC0(26)
-#define IRQ_WDT                 S5P_IRQ_VIC0(27)
-#define IRQ_RTC_ALARM           S5P_IRQ_VIC0(28)
-#define IRQ_RTC_TIC             S5P_IRQ_VIC0(29)
-#define IRQ_GPIOINT             S5P_IRQ_VIC0(30)
-#define IRQ_FIMC3               S5P_IRQ_VIC0(31)
-
-/* VIC1: ARM, Power, Memory, Connectivity, Storage */
-
-#define IRQ_PMU                 S5P_IRQ_VIC1(0)
-#define IRQ_CORTEX1             S5P_IRQ_VIC1(1)
-#define IRQ_CORTEX2             S5P_IRQ_VIC1(2)
-#define IRQ_CORTEX3             S5P_IRQ_VIC1(3)
-#define IRQ_CORTEX4             S5P_IRQ_VIC1(4)
-#define IRQ_IEMAPC              S5P_IRQ_VIC1(5)
-#define IRQ_IEMIEC              S5P_IRQ_VIC1(6)
-#define IRQ_ONENAND             S5P_IRQ_VIC1(7)
-#define IRQ_NFC                 S5P_IRQ_VIC1(8)
-#define IRQ_CFCON               S5P_IRQ_VIC1(9)
-#define IRQ_UART0               S5P_IRQ_VIC1(10)
-#define IRQ_UART1               S5P_IRQ_VIC1(11)
-#define IRQ_UART2               S5P_IRQ_VIC1(12)
-#define IRQ_UART3               S5P_IRQ_VIC1(13)
-#define IRQ_IIC                 S5P_IRQ_VIC1(14)
-#define IRQ_SPI0                S5P_IRQ_VIC1(15)
-#define IRQ_SPI1                S5P_IRQ_VIC1(16)
-#define IRQ_SPI2                S5P_IRQ_VIC1(17)
-#define IRQ_IRDA                S5P_IRQ_VIC1(18)
-#define IRQ_IIC2                S5P_IRQ_VIC1(19)
-#define IRQ_IIC_HDMIPHY         S5P_IRQ_VIC1(20)
-#define IRQ_HSIRX               S5P_IRQ_VIC1(21)
-#define IRQ_HSITX               S5P_IRQ_VIC1(22)
-#define IRQ_UHOST               S5P_IRQ_VIC1(23)
-#define IRQ_OTG                 S5P_IRQ_VIC1(24)
-#define IRQ_MSM                 S5P_IRQ_VIC1(25)
-#define IRQ_HSMMC0              S5P_IRQ_VIC1(26)
-#define IRQ_HSMMC1              S5P_IRQ_VIC1(27)
-#define IRQ_HSMMC2              S5P_IRQ_VIC1(28)
-#define IRQ_MIPI_CSIS           S5P_IRQ_VIC1(29)
-#define IRQ_MIPIDSI             S5P_IRQ_VIC1(30)
-#define IRQ_ONENAND_AUDI        S5P_IRQ_VIC1(31)
-
-/* VIC2: Multimedia, Audio, Security */
-
-#define IRQ_LCD0                S5P_IRQ_VIC2(0)
-#define IRQ_LCD1                S5P_IRQ_VIC2(1)
-#define IRQ_LCD2                S5P_IRQ_VIC2(2)
-#define IRQ_LCD3                S5P_IRQ_VIC2(3)
-#define IRQ_ROTATOR             S5P_IRQ_VIC2(4)
-#define IRQ_FIMC0               S5P_IRQ_VIC2(5)
-#define IRQ_FIMC1               S5P_IRQ_VIC2(6)
-#define IRQ_FIMC2               S5P_IRQ_VIC2(7)
-#define IRQ_JPEG                S5P_IRQ_VIC2(8)
-#define IRQ_2D                  S5P_IRQ_VIC2(9)
-#define IRQ_3D                  S5P_IRQ_VIC2(10)
-#define IRQ_MIXER               S5P_IRQ_VIC2(11)
-#define IRQ_HDMI                S5P_IRQ_VIC2(12)
-#define IRQ_IIC1                S5P_IRQ_VIC2(13)
-#define IRQ_MFC                 S5P_IRQ_VIC2(14)
-#define IRQ_SDO                 S5P_IRQ_VIC2(15)
-#define IRQ_I2S0                S5P_IRQ_VIC2(16)
-#define IRQ_I2S1                S5P_IRQ_VIC2(17)
-#define IRQ_I2S2                S5P_IRQ_VIC2(18)
-#define IRQ_AC97                S5P_IRQ_VIC2(19)
-#define IRQ_PCM0                S5P_IRQ_VIC2(20)
-#define IRQ_PCM1                S5P_IRQ_VIC2(21)
-#define IRQ_SPDIF               S5P_IRQ_VIC2(22)
-#define IRQ_ADC                 S5P_IRQ_VIC2(23)
-#define IRQ_PENDN               S5P_IRQ_VIC2(24)
-#define IRQ_TC                  IRQ_PENDN
-#define IRQ_KEYPAD              S5P_IRQ_VIC2(25)
-#define IRQ_CG                  S5P_IRQ_VIC2(26)
-#define IRQ_SSS_INT             S5P_IRQ_VIC2(27)
-#define IRQ_SSS_HASH            S5P_IRQ_VIC2(28)
-#define IRQ_PCM2                S5P_IRQ_VIC2(29)
-#define IRQ_SDMIRQ              S5P_IRQ_VIC2(30)
-#define IRQ_SDMFIQ              S5P_IRQ_VIC2(31)
-
-/* VIC3: Etc */
-
-#define IRQ_IPC                 S5P_IRQ_VIC3(0)
-#define IRQ_HOSTIF              S5P_IRQ_VIC3(1)
-#define IRQ_HSMMC3              S5P_IRQ_VIC3(2)
-#define IRQ_CEC                 S5P_IRQ_VIC3(3)
-#define IRQ_TSI                 S5P_IRQ_VIC3(4)
-#define IRQ_MDNIE0              S5P_IRQ_VIC3(5)
-#define IRQ_MDNIE1              S5P_IRQ_VIC3(6)
-#define IRQ_MDNIE2              S5P_IRQ_VIC3(7)
-#define IRQ_MDNIE3              S5P_IRQ_VIC3(8)
-#define IRQ_VIC_END             S5P_IRQ_VIC3(31)
-
-#define S5P_EINT_BASE1          (S5P_IRQ_VIC0(0))
-#define S5P_EINT_BASE2          (IRQ_VIC_END + 1)
-
-/* GPIO interrupt */
-#define S5P_GPIOINT_BASE        (IRQ_EINT(31) + 1)
-#define S5P_GPIOINT_GROUP_MAXNR 22
-
-/* Set the default NR_IRQS */
-#define NR_IRQS                 (IRQ_EINT(31) + S5P_GPIOINT_COUNT + 1)
-
-/* Compatibility */
-#define IRQ_LCD_FIFO            IRQ_LCD0
-#define IRQ_LCD_VSYNC           IRQ_LCD1
-#define IRQ_LCD_SYSTEM          IRQ_LCD2
-#define IRQ_MIPI_CSIS0          IRQ_MIPI_CSIS
-
-#endif /* ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
deleted file mode 100644
index 763929aca52d..000000000000
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/map.h
- *
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - Memory map definitions
- *
- * 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_MAP_H
-#define __ASM_ARCH_MAP_H __FILE__
-
-#include <plat/map-base.h>
-#include <plat/map-s5p.h>
-
-#define S5PV210_PA_SDRAM                0x20000000
-
-#define S5PV210_PA_SROM_BANK5           0xA8000000
-
-#define S5PC110_PA_ONENAND              0xB0000000
-#define S5PC110_PA_ONENAND_DMA          0xB0600000
-
-#define S5PV210_PA_CHIPID               0xE0000000
-
-#define S5PV210_PA_SYSCON               0xE0100000
-
-#define S5PV210_PA_GPIO                 0xE0200000
-
-#define S5PV210_PA_SPDIF                0xE1100000
-
-#define S5PV210_PA_SPI0                 0xE1300000
-#define S5PV210_PA_SPI1                 0xE1400000
-
-#define S5PV210_PA_KEYPAD               0xE1600000
-
-#define S5PV210_PA_ADC                  0xE1700000
-
-#define S5PV210_PA_IIC0                 0xE1800000
-#define S5PV210_PA_IIC1                 0xFAB00000
-#define S5PV210_PA_IIC2                 0xE1A00000
-
-#define S5PV210_PA_AC97                 0xE2200000
-
-#define S5PV210_PA_PCM0                 0xE2300000
-#define S5PV210_PA_PCM1                 0xE1200000
-#define S5PV210_PA_PCM2                 0xE2B00000
-
-#define S5PV210_PA_TIMER                0xE2500000
-#define S5PV210_PA_SYSTIMER             0xE2600000
-#define S5PV210_PA_WATCHDOG             0xE2700000
-#define S5PV210_PA_RTC                  0xE2800000
-
-#define S5PV210_PA_UART                 0xE2900000
-
-#define S5PV210_PA_SROMC                0xE8000000
-
-#define S5PV210_PA_CFCON                0xE8200000
-
-#define S5PV210_PA_MFC                  0xF1700000
-
-#define S5PV210_PA_HSMMC(x)             (0xEB000000 + ((x) * 0x100000))
-
-#define S5PV210_PA_HSOTG                0xEC000000
-#define S5PV210_PA_HSPHY                0xEC100000
-
-#define S5PV210_PA_IIS0                 0xEEE30000
-#define S5PV210_PA_IIS1                 0xE2100000
-#define S5PV210_PA_IIS2                 0xE2A00000
-
-#define S5PV210_PA_DMC0                 0xF0000000
-#define S5PV210_PA_DMC1                 0xF1400000
-
-#define S5PV210_PA_VIC0                 0xF2000000
-#define S5PV210_PA_VIC1                 0xF2100000
-#define S5PV210_PA_VIC2                 0xF2200000
-#define S5PV210_PA_VIC3                 0xF2300000
-
-#define S5PV210_PA_FB                   0xF8000000
-
-#define S5PV210_PA_MDMA                 0xFA200000
-#define S5PV210_PA_PDMA0                0xE0900000
-#define S5PV210_PA_PDMA1                0xE0A00000
-
-#define S5PV210_PA_MIPI_CSIS            0xFA600000
-
-#define S5PV210_PA_FIMC0                0xFB200000
-#define S5PV210_PA_FIMC1                0xFB300000
-#define S5PV210_PA_FIMC2                0xFB400000
-
-#define S5PV210_PA_JPEG                 0xFB600000
-
-#define S5PV210_PA_SDO                  0xF9000000
-#define S5PV210_PA_VP                   0xF9100000
-#define S5PV210_PA_MIXER                0xF9200000
-#define S5PV210_PA_HDMI                 0xFA100000
-#define S5PV210_PA_IIC_HDMIPHY          0xFA900000
-
-/* Compatibiltiy Defines */
-
-#define S3C_PA_FB                       S5PV210_PA_FB
-#define S3C_PA_HSMMC0                   S5PV210_PA_HSMMC(0)
-#define S3C_PA_HSMMC1                   S5PV210_PA_HSMMC(1)
-#define S3C_PA_HSMMC2                   S5PV210_PA_HSMMC(2)
-#define S3C_PA_HSMMC3                   S5PV210_PA_HSMMC(3)
-#define S3C_PA_IIC                      S5PV210_PA_IIC0
-#define S3C_PA_IIC1                     S5PV210_PA_IIC1
-#define S3C_PA_IIC2                     S5PV210_PA_IIC2
-#define S3C_PA_RTC                      S5PV210_PA_RTC
-#define S3C_PA_USB_HSOTG                S5PV210_PA_HSOTG
-#define S3C_PA_WDT                      S5PV210_PA_WATCHDOG
-#define S3C_PA_SPI0                     S5PV210_PA_SPI0
-#define S3C_PA_SPI1                     S5PV210_PA_SPI1
-
-#define S5P_PA_CHIPID                   S5PV210_PA_CHIPID
-#define S5P_PA_FIMC0                    S5PV210_PA_FIMC0
-#define S5P_PA_FIMC1                    S5PV210_PA_FIMC1
-#define S5P_PA_FIMC2                    S5PV210_PA_FIMC2
-#define S5P_PA_MIPI_CSIS0               S5PV210_PA_MIPI_CSIS
-#define S5P_PA_MFC                      S5PV210_PA_MFC
-#define S5P_PA_IIC_HDMIPHY              S5PV210_PA_IIC_HDMIPHY
-
-#define S5P_PA_SDO                      S5PV210_PA_SDO
-#define S5P_PA_VP                       S5PV210_PA_VP
-#define S5P_PA_MIXER                    S5PV210_PA_MIXER
-#define S5P_PA_HDMI                     S5PV210_PA_HDMI
-
-#define S5P_PA_ONENAND                  S5PC110_PA_ONENAND
-#define S5P_PA_ONENAND_DMA              S5PC110_PA_ONENAND_DMA
-#define S5P_PA_SDRAM                    S5PV210_PA_SDRAM
-#define S5P_PA_SROMC                    S5PV210_PA_SROMC
-#define S5P_PA_SYSCON                   S5PV210_PA_SYSCON
-#define S5P_PA_TIMER                    S5PV210_PA_TIMER
-
-#define S5P_PA_JPEG                     S5PV210_PA_JPEG
-
-#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 */
-
-#define S3C_VA_UARTx(x)                 (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
-
-#define S3C_PA_UART                     S5PV210_PA_UART
-
-#define S5P_PA_UART(x)                  (S3C_PA_UART + ((x) * S3C_UART_OFFSET))
-#define S5P_PA_UART0                    S5P_PA_UART(0)
-#define S5P_PA_UART1                    S5P_PA_UART(1)
-#define S5P_PA_UART2                    S5P_PA_UART(2)
-#define S5P_PA_UART3                    S5P_PA_UART(3)
-
-#define S5P_SZ_UART                     SZ_256
-
-#endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/memory.h b/arch/arm/mach-s5pv210/include/mach/memory.h
deleted file mode 100644
index 2d3cfa221d5f..000000000000
--- a/arch/arm/mach-s5pv210/include/mach/memory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/memory.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - Memory definitions
- *
- * 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_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#define PLAT_PHYS_OFFSET                UL(0x20000000)
-
-/*
- * Sparsemem support
- * Physical memory can be located from 0x20000000 to 0x7fffffff,
- * so MAX_PHYSMEM_BITS is 31.
- */
-
-#define MAX_PHYSMEM_BITS        31
-#define SECTION_SIZE_BITS       28
-
-#endif /* __ASM_ARCH_MEMORY_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/pm-core.h b/arch/arm/mach-s5pv210/include/mach/pm-core.h
deleted file mode 100644
index eba8aea63ed8..000000000000
--- a/arch/arm/mach-s5pv210/include/mach/pm-core.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/pm-core.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Based on arch/arm/mach-s3c2410/include/mach/pm-core.h,
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * S5PV210 - PM core support for arch/arm/plat-s5p/pm.c
- *
- * 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.
-*/
-
-static inline void s3c_pm_debug_init_uart(void)
-{
-        /* nothing here yet */
-}
-
-static inline void s3c_pm_arch_prepare_irqs(void)
-{
-        __raw_writel(s3c_irqwake_intmask, S5P_WAKEUP_MASK);
-        __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK);
-}
-
-static inline void s3c_pm_arch_stop_clocks(void)
-{
-        /* nothing here yet */
-}
-
-static inline void s3c_pm_arch_show_resume_irqs(void)
-{
-        /* nothing here yet */
-}
-
-static inline void s3c_pm_arch_update_uart(void __iomem *regs,
-                                           struct pm_uart_save *save)
-{
-        /* nothing here yet */
-}
-
-static inline void s3c_pm_restored_gpios(void) { }
-static inline void samsung_pm_saved_gpios(void) { }
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-clock.h b/arch/arm/mach-s5pv210/include/mach/regs-clock.h
index e345584d4c34..b14ffcd7f6cc 100644
--- a/arch/arm/mach-s5pv210/include/mach/regs-clock.h
+++ b/arch/arm/mach-s5pv210/include/mach/regs-clock.h
@@ -13,7 +13,7 @@
 #ifndef __ASM_ARCH_REGS_CLOCK_H
 #define __ASM_ARCH_REGS_CLOCK_H __FILE__
 
-#include <mach/map.h>
+#include <plat/map-base.h>
 
 #define S5P_CLKREG(x)           (S3C_VA_SYS + (x))
 
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-gpio.h b/arch/arm/mach-s5pv210/include/mach/regs-gpio.h
deleted file mode 100644
index de0c89976078..000000000000
--- a/arch/arm/mach-s5pv210/include/mach/regs-gpio.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/regs-gpio.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5PV210 - GPIO (including EINT) register definitions
- *
- * 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_REGS_GPIO_H
-#define __ASM_ARCH_REGS_GPIO_H __FILE__
-
-#include <mach/map.h>
-
-#define S5PV210_EINT30CON               (S5P_VA_GPIO + 0xE00)
-#define S5P_EINT_CON(x)                 (S5PV210_EINT30CON + ((x) * 0x4))
-
-#define S5PV210_EINT30FLTCON0           (S5P_VA_GPIO + 0xE80)
-#define S5P_EINT_FLTCON(x)              (S5PV210_EINT30FLTCON0 + ((x) * 0x4))
-
-#define S5PV210_EINT30MASK              (S5P_VA_GPIO + 0xF00)
-#define S5P_EINT_MASK(x)                (S5PV210_EINT30MASK + ((x) * 0x4))
-
-#define S5PV210_EINT30PEND              (S5P_VA_GPIO + 0xF40)
-#define S5P_EINT_PEND(x)                (S5PV210_EINT30PEND + ((x) * 0x4))
-
-#define EINT_REG_NR(x)                  (EINT_OFFSET(x) >> 3)
-
-#define eint_irq_to_bit(irq)            (1 << (EINT_OFFSET(irq) & 0x7))
-
-#define EINT_MODE               S3C_GPIO_SFN(0xf)
-
-#define EINT_GPIO_0(x)          S5PV210_GPH0(x)
-#define EINT_GPIO_1(x)          S5PV210_GPH1(x)
-#define EINT_GPIO_2(x)          S5PV210_GPH2(x)
-#define EINT_GPIO_3(x)          S5PV210_GPH3(x)
-
-#endif /* __ASM_ARCH_REGS_GPIO_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-irq.h b/arch/arm/mach-s5pv210/include/mach/regs-irq.h
deleted file mode 100644
index d8bc1e6c7aaa..000000000000
--- a/arch/arm/mach-s5pv210/include/mach/regs-irq.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/include/mach/regs-irq.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - IRQ register definitions
- *
- * 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_REGS_IRQ_H
-#define __ASM_ARCH_REGS_IRQ_H __FILE__
-
-#include <mach/map.h>
-
-#endif /* __ASM_ARCH_REGS_IRQ_H */
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
deleted file mode 100644
index cc37edacda26..000000000000
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ /dev/null
@@ -1,687 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-aquila.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/fb.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/mfd/max8998.h>
-#include <linux/mfd/wm8994/pdata.h>
-#include <linux/regulator/fixed.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/gpio.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <video/samsung_fimd.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <plat/fb.h>
-#include <plat/fimc-core.h>
-#include <plat/sdhci.h>
-#include <plat/samsung-time.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define AQUILA_UCON_DEFAULT     (S3C2410_UCON_TXILEVEL |        \
-                                 S3C2410_UCON_RXILEVEL |        \
-                                 S3C2410_UCON_TXIRQMODE |       \
-                                 S3C2410_UCON_RXIRQMODE |       \
-                                 S3C2410_UCON_RXFIFO_TOI |      \
-                                 S3C2443_UCON_RXERR_IRQEN)
-
-#define AQUILA_ULCON_DEFAULT    S3C2410_LCON_CS8
-
-#define AQUILA_UFCON_DEFAULT    S3C2410_UFCON_FIFOMODE
-
-static struct s3c2410_uartcfg aquila_uartcfgs[] __initdata = {
-        [0] = {
-                .hwport         = 0,
-                .flags          = 0,
-                .ucon           = AQUILA_UCON_DEFAULT,
-                .ulcon          = AQUILA_ULCON_DEFAULT,
-                /*
-                 * Actually UART0 can support 256 bytes fifo, but aquila board
-                 * supports 128 bytes fifo because of initial chip bug
-                 */
-                .ufcon          = AQUILA_UFCON_DEFAULT |
-                        S5PV210_UFCON_TXTRIG128 | S5PV210_UFCON_RXTRIG128,
-        },
-        [1] = {
-                .hwport         = 1,
-                .flags          = 0,
-                .ucon           = AQUILA_UCON_DEFAULT,
-                .ulcon          = AQUILA_ULCON_DEFAULT,
-                .ufcon          = AQUILA_UFCON_DEFAULT |
-                        S5PV210_UFCON_TXTRIG64 | S5PV210_UFCON_RXTRIG64,
-        },
-        [2] = {
-                .hwport         = 2,
-                .flags          = 0,
-                .ucon           = AQUILA_UCON_DEFAULT,
-                .ulcon          = AQUILA_ULCON_DEFAULT,
-                .ufcon          = AQUILA_UFCON_DEFAULT |
-                        S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
-        },
-        [3] = {
-                .hwport         = 3,
-                .flags          = 0,
-                .ucon           = AQUILA_UCON_DEFAULT,
-                .ulcon          = AQUILA_ULCON_DEFAULT,
-                .ufcon          = AQUILA_UFCON_DEFAULT |
-                        S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
-        },
-};
-
-/* Frame Buffer */
-static struct s3c_fb_pd_win aquila_fb_win0 = {
-        .max_bpp = 32,
-        .default_bpp = 16,
-        .xres = 480,
-        .yres = 800,
-};
-
-static struct s3c_fb_pd_win aquila_fb_win1 = {
-        .max_bpp = 32,
-        .default_bpp = 16,
-        .xres = 480,
-        .yres = 800,
-};
-
-static struct fb_videomode aquila_lcd_timing = {
-        .left_margin = 16,
-        .right_margin = 16,
-        .upper_margin = 3,
-        .lower_margin = 28,
-        .hsync_len = 2,
-        .vsync_len = 2,
-        .xres = 480,
-        .yres = 800,
-};
-
-static struct s3c_fb_platdata aquila_lcd_pdata __initdata = {
-        .win[0]         = &aquila_fb_win0,
-        .win[1]         = &aquila_fb_win1,
-        .vtiming        = &aquila_lcd_timing,
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC |
-                          VIDCON1_INV_VCLK | VIDCON1_INV_VDEN,
-        .setup_gpio     = s5pv210_fb_gpio_setup_24bpp,
-};
-
-/* MAX8998 regulators */
-#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
-
-static struct regulator_init_data aquila_ldo2_data = {
-        .constraints    = {
-                .name           = "VALIVE_1.1V",
-                .min_uV         = 1100000,
-                .max_uV         = 1100000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-                .state_mem      = {
-                        .enabled = 1,
-                },
-        },
-};
-
-static struct regulator_init_data aquila_ldo3_data = {
-        .constraints    = {
-                .name           = "VUSB+MIPI_1.1V",
-                .min_uV         = 1100000,
-                .max_uV         = 1100000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo4_data = {
-        .constraints    = {
-                .name           = "VDAC_3.3V",
-                .min_uV         = 3300000,
-                .max_uV         = 3300000,
-                .apply_uV       = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo5_data = {
-        .constraints    = {
-                .name           = "VTF_2.8V",
-                .min_uV         = 2800000,
-                .max_uV         = 2800000,
-                .apply_uV       = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo6_data = {
-        .constraints    = {
-                .name           = "VCC_3.3V",
-                .min_uV         = 3300000,
-                .max_uV         = 3300000,
-                .apply_uV       = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo7_data = {
-        .constraints    = {
-                .name           = "VCC_3.0V",
-                .min_uV         = 3000000,
-                .max_uV         = 3000000,
-                .apply_uV       = 1,
-                .boot_on        = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo8_data = {
-        .constraints    = {
-                .name           = "VUSB+VADC_3.3V",
-                .min_uV         = 3300000,
-                .max_uV         = 3300000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo9_data = {
-        .constraints    = {
-                .name           = "VCC+VCAM_2.8V",
-                .min_uV         = 2800000,
-                .max_uV         = 2800000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo10_data = {
-        .constraints    = {
-                .name           = "VPLL_1.1V",
-                .min_uV         = 1100000,
-                .max_uV         = 1100000,
-                .apply_uV       = 1,
-                .boot_on        = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo11_data = {
-        .constraints    = {
-                .name           = "CAM_IO_2.8V",
-                .min_uV         = 2800000,
-                .max_uV         = 2800000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo12_data = {
-        .constraints    = {
-                .name           = "CAM_ISP_1.2V",
-                .min_uV         = 1200000,
-                .max_uV         = 1200000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo13_data = {
-        .constraints    = {
-                .name           = "CAM_A_2.8V",
-                .min_uV         = 2800000,
-                .max_uV         = 2800000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo14_data = {
-        .constraints    = {
-                .name           = "CAM_CIF_1.8V",
-                .min_uV         = 1800000,
-                .max_uV         = 1800000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo15_data = {
-        .constraints    = {
-                .name           = "CAM_AF_3.3V",
-                .min_uV         = 3300000,
-                .max_uV         = 3300000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo16_data = {
-        .constraints    = {
-                .name           = "VMIPI_1.8V",
-                .min_uV         = 1800000,
-                .max_uV         = 1800000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data aquila_ldo17_data = {
-        .constraints    = {
-                .name           = "CAM_8M_1.8V",
-                .min_uV         = 1800000,
-                .max_uV         = 1800000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-/* BUCK */
-static struct regulator_consumer_supply buck1_consumer =
-        REGULATOR_SUPPLY("vddarm", NULL);
-
-static struct regulator_consumer_supply buck2_consumer =
-        REGULATOR_SUPPLY("vddint", NULL);
-
-static struct regulator_init_data aquila_buck1_data = {
-        .constraints    = {
-                .name           = "VARM_1.2V",
-                .min_uV         = 1200000,
-                .max_uV         = 1200000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                  REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &buck1_consumer,
-};
-
-static struct regulator_init_data aquila_buck2_data = {
-        .constraints    = {
-                .name           = "VINT_1.2V",
-                .min_uV         = 1200000,
-                .max_uV         = 1200000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                  REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &buck2_consumer,
-};
-
-static struct regulator_init_data aquila_buck3_data = {
-        .constraints    = {
-                .name           = "VCC_1.8V",
-                .min_uV         = 1800000,
-                .max_uV         = 1800000,
-                .apply_uV       = 1,
-                .state_mem      = {
-                        .enabled = 1,
-                },
-        },
-};
-
-static struct regulator_init_data aquila_buck4_data = {
-        .constraints    = {
-                .name           = "CAM_CORE_1.2V",
-                .min_uV         = 1200000,
-                .max_uV         = 1200000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct max8998_regulator_data aquila_regulators[] = {
-        { MAX8998_LDO2,  &aquila_ldo2_data },
-        { MAX8998_LDO3,  &aquila_ldo3_data },
-        { MAX8998_LDO4,  &aquila_ldo4_data },
-        { MAX8998_LDO5,  &aquila_ldo5_data },
-        { MAX8998_LDO6,  &aquila_ldo6_data },
-        { MAX8998_LDO7,  &aquila_ldo7_data },
-        { MAX8998_LDO8,  &aquila_ldo8_data },
-        { MAX8998_LDO9,  &aquila_ldo9_data },
-        { MAX8998_LDO10, &aquila_ldo10_data },
-        { MAX8998_LDO11, &aquila_ldo11_data },
-        { MAX8998_LDO12, &aquila_ldo12_data },
-        { MAX8998_LDO13, &aquila_ldo13_data },
-        { MAX8998_LDO14, &aquila_ldo14_data },
-        { MAX8998_LDO15, &aquila_ldo15_data },
-        { MAX8998_LDO16, &aquila_ldo16_data },
-        { MAX8998_LDO17, &aquila_ldo17_data },
-        { MAX8998_BUCK1, &aquila_buck1_data },
-        { MAX8998_BUCK2, &aquila_buck2_data },
-        { MAX8998_BUCK3, &aquila_buck3_data },
-        { MAX8998_BUCK4, &aquila_buck4_data },
-};
-
-static struct max8998_platform_data aquila_max8998_pdata = {
-        .num_regulators = ARRAY_SIZE(aquila_regulators),
-        .regulators     = aquila_regulators,
-        .buck1_set1     = S5PV210_GPH0(3),
-        .buck1_set2     = S5PV210_GPH0(4),
-        .buck2_set3     = S5PV210_GPH0(5),
-        .buck1_voltage  = { 1200000, 1200000, 1200000, 1200000 },
-        .buck2_voltage  = { 1200000, 1200000 },
-};
-#endif
-
-static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {
-        REGULATOR_SUPPLY("DBVDD", "5-001a"),
-        REGULATOR_SUPPLY("AVDD2", "5-001a"),
-        REGULATOR_SUPPLY("CPVDD", "5-001a"),
-};
-
-static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {
-        REGULATOR_SUPPLY("SPKVDD1", "5-001a"),
-        REGULATOR_SUPPLY("SPKVDD2", "5-001a"),
-};
-
-static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
-        .constraints = {
-                .always_on = 1,
-        },
-        .num_consumer_supplies  = ARRAY_SIZE(wm8994_fixed_voltage0_supplies),
-        .consumer_supplies      = wm8994_fixed_voltage0_supplies,
-};
-
-static struct regulator_init_data wm8994_fixed_voltage1_init_data = {
-        .constraints = {
-                .always_on = 1,
-        },
-        .num_consumer_supplies  = ARRAY_SIZE(wm8994_fixed_voltage1_supplies),
-        .consumer_supplies      = wm8994_fixed_voltage1_supplies,
-};
-
-static struct fixed_voltage_config wm8994_fixed_voltage0_config = {
-        .supply_name    = "VCC_1.8V_PDA",
-        .microvolts     = 1800000,
-        .gpio           = -EINVAL,
-        .init_data      = &wm8994_fixed_voltage0_init_data,
-};
-
-static struct fixed_voltage_config wm8994_fixed_voltage1_config = {
-        .supply_name    = "V_BAT",
-        .microvolts     = 3700000,
-        .gpio           = -EINVAL,
-        .init_data      = &wm8994_fixed_voltage1_init_data,
-};
-
-static struct platform_device wm8994_fixed_voltage0 = {
-        .name           = "reg-fixed-voltage",
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &wm8994_fixed_voltage0_config,
-        },
-};
-
-static struct platform_device wm8994_fixed_voltage1 = {
-        .name           = "reg-fixed-voltage",
-        .id             = 1,
-        .dev            = {
-                .platform_data  = &wm8994_fixed_voltage1_config,
-        },
-};
-
-static struct regulator_consumer_supply wm8994_avdd1_supply =
-        REGULATOR_SUPPLY("AVDD1", "5-001a");
-
-static struct regulator_consumer_supply wm8994_dcvdd_supply =
-        REGULATOR_SUPPLY("DCVDD", "5-001a");
-
-static struct regulator_init_data wm8994_ldo1_data = {
-        .constraints    = {
-                .name           = "AVDD1_3.0V",
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &wm8994_avdd1_supply,
-};
-
-static struct regulator_init_data wm8994_ldo2_data = {
-        .constraints    = {
-                .name           = "DCVDD_1.0V",
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &wm8994_dcvdd_supply,
-};
-
-static struct wm8994_pdata wm8994_platform_data = {
-        /* configure gpio1 function: 0x0001(Logic level input/output) */
-        .gpio_defaults[0] = 0x0001,
-        /* configure gpio3/4/5/7 function for AIF2 voice */
-        .gpio_defaults[2] = 0x8100,
-        .gpio_defaults[3] = 0x8100,
-        .gpio_defaults[4] = 0x8100,
-        .gpio_defaults[6] = 0x0100,
-        /* configure gpio8/9/10/11 function for AIF3 BT */
-        .gpio_defaults[7] = 0x8100,
-        .gpio_defaults[8] = 0x0100,
-        .gpio_defaults[9] = 0x0100,
-        .gpio_defaults[10] = 0x0100,
-        .ldo[0] = { S5PV210_MP03(6), &wm8994_ldo1_data },       /* XM0FRNB_2 */
-        .ldo[1] = { 0, &wm8994_ldo2_data },
-};
-
-/* GPIO I2C PMIC */
-#define AP_I2C_GPIO_PMIC_BUS_4  4
-static struct i2c_gpio_platform_data aquila_i2c_gpio_pmic_data = {
-        .sda_pin        = S5PV210_GPJ4(0),      /* XMSMCSN */
-        .scl_pin        = S5PV210_GPJ4(3),      /* XMSMIRQN */
-};
-
-static struct platform_device aquila_i2c_gpio_pmic = {
-        .name           = "i2c-gpio",
-        .id             = AP_I2C_GPIO_PMIC_BUS_4,
-        .dev            = {
-                .platform_data = &aquila_i2c_gpio_pmic_data,
-        },
-};
-
-static struct i2c_board_info i2c_gpio_pmic_devs[] __initdata = {
-#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
-        {
-                /* 0xCC when SRAD = 0 */
-                I2C_BOARD_INFO("max8998", 0xCC >> 1),
-                .platform_data = &aquila_max8998_pdata,
-        },
-#endif
-};
-
-/* GPIO I2C AP 1.8V */
-#define AP_I2C_GPIO_BUS_5       5
-static struct i2c_gpio_platform_data aquila_i2c_gpio5_data = {
-        .sda_pin        = S5PV210_MP05(3),      /* XM0ADDR_11 */
-        .scl_pin        = S5PV210_MP05(2),      /* XM0ADDR_10 */
-};
-
-static struct platform_device aquila_i2c_gpio5 = {
-        .name           = "i2c-gpio",
-        .id             = AP_I2C_GPIO_BUS_5,
-        .dev            = {
-                .platform_data  = &aquila_i2c_gpio5_data,
-        },
-};
-
-static struct i2c_board_info i2c_gpio5_devs[] __initdata = {
-        {
-                /* CS/ADDR = low 0x34 (FYI: high = 0x36) */
-                I2C_BOARD_INFO("wm8994", 0x1a),
-                .platform_data  = &wm8994_platform_data,
-        },
-};
-
-/* PMIC Power button */
-static struct gpio_keys_button aquila_gpio_keys_table[] = {
-        {
-                .code           = KEY_POWER,
-                .gpio           = S5PV210_GPH2(6),
-                .desc           = "gpio-keys: KEY_POWER",
-                .type           = EV_KEY,
-                .active_low     = 1,
-                .wakeup         = 1,
-                .debounce_interval = 1,
-        },
-};
-
-static struct gpio_keys_platform_data aquila_gpio_keys_data = {
-        .buttons        = aquila_gpio_keys_table,
-        .nbuttons       = ARRAY_SIZE(aquila_gpio_keys_table),
-};
-
-static struct platform_device aquila_device_gpiokeys = {
-        .name = "gpio-keys",
-        .dev = {
-                .platform_data = &aquila_gpio_keys_data,
-        },
-};
-
-static void __init aquila_pmic_init(void)
-{
-        /* AP_PMIC_IRQ: EINT7 */
-        s3c_gpio_cfgpin(S5PV210_GPH0(7), S3C_GPIO_SFN(0xf));
-        s3c_gpio_setpull(S5PV210_GPH0(7), S3C_GPIO_PULL_UP);
-
-        /* nPower: EINT22 */
-        s3c_gpio_cfgpin(S5PV210_GPH2(6), S3C_GPIO_SFN(0xf));
-        s3c_gpio_setpull(S5PV210_GPH2(6), S3C_GPIO_PULL_UP);
-}
-
-/* MoviNAND */
-static struct s3c_sdhci_platdata aquila_hsmmc0_data __initdata = {
-        .max_width              = 4,
-        .cd_type                = S3C_SDHCI_CD_PERMANENT,
-};
-
-/* Wireless LAN */
-static struct s3c_sdhci_platdata aquila_hsmmc1_data __initdata = {
-        .max_width              = 4,
-        .cd_type                = S3C_SDHCI_CD_EXTERNAL,
-        /* ext_cd_{init,cleanup} callbacks will be added later */
-};
-
-/* External Flash */
-#define AQUILA_EXT_FLASH_EN     S5PV210_MP05(4)
-#define AQUILA_EXT_FLASH_CD     S5PV210_GPH3(4)
-static struct s3c_sdhci_platdata aquila_hsmmc2_data __initdata = {
-        .max_width              = 4,
-        .cd_type                = S3C_SDHCI_CD_GPIO,
-        .ext_cd_gpio            = AQUILA_EXT_FLASH_CD,
-        .ext_cd_gpio_invert     = 1,
-};
-
-static void aquila_setup_sdhci(void)
-{
-        gpio_request_one(AQUILA_EXT_FLASH_EN, GPIOF_OUT_INIT_HIGH, "FLASH_EN");
-
-        s3c_sdhci0_set_platdata(&aquila_hsmmc0_data);
-        s3c_sdhci1_set_platdata(&aquila_hsmmc1_data);
-        s3c_sdhci2_set_platdata(&aquila_hsmmc2_data);
-};
-
-/* Audio device */
-static struct platform_device aquila_device_audio = {
-        .name = "smdk-audio",
-        .id = -1,
-};
-
-static struct platform_device *aquila_devices[] __initdata = {
-        &aquila_i2c_gpio_pmic,
-        &aquila_i2c_gpio5,
-        &aquila_device_gpiokeys,
-        &aquila_device_audio,
-        &s3c_device_fb,
-        &s5p_device_onenand,
-        &s3c_device_hsmmc0,
-        &s3c_device_hsmmc1,
-        &s3c_device_hsmmc2,
-        &s5p_device_fimc0,
-        &s5p_device_fimc1,
-        &s5p_device_fimc2,
-        &s5p_device_fimc_md,
-        &s5pv210_device_iis0,
-        &wm8994_fixed_voltage0,
-        &wm8994_fixed_voltage1,
-};
-
-static void __init aquila_sound_init(void)
-{
-        unsigned int gpio;
-
-        /* CODEC_XTAL_EN
-         *
-         * The Aquila board have a oscillator which provide main clock
-         * to WM8994 codec. The oscillator provide 24MHz clock to WM8994
-         * clock. Set gpio setting of "CODEC_XTAL_EN" to enable a oscillator.
-         * */
-        gpio = S5PV210_GPH3(2);         /* XEINT_26 */
-        gpio_request(gpio, "CODEC_XTAL_EN");
-        s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT);
-        s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
-
-        /* Ths main clock of WM8994 codec uses the output of CLKOUT pin.
-         * The CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS)
-         * because it needs 24MHz clock to operate WM8994 codec.
-         */
-        __raw_writel(__raw_readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS);
-}
-
-static void __init aquila_map_io(void)
-{
-        s5pv210_init_io(NULL, 0);
-        s3c24xx_init_clocks(24000000);
-        s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs));
-        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void __init aquila_machine_init(void)
-{
-        /* PMIC */
-        aquila_pmic_init();
-        i2c_register_board_info(AP_I2C_GPIO_PMIC_BUS_4, i2c_gpio_pmic_devs,
-                        ARRAY_SIZE(i2c_gpio_pmic_devs));
-        /* SDHCI */
-        aquila_setup_sdhci();
-
-        s3c_fimc_setname(0, "s5p-fimc");
-        s3c_fimc_setname(1, "s5p-fimc");
-        s3c_fimc_setname(2, "s5p-fimc");
-
-        /* SOUND */
-        aquila_sound_init();
-        i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs,
-                        ARRAY_SIZE(i2c_gpio5_devs));
-
-        /* FB */
-        s3c_fb_set_platdata(&aquila_lcd_pdata);
-
-        platform_add_devices(aquila_devices, ARRAY_SIZE(aquila_devices));
-}
-
-MACHINE_START(AQUILA, "Aquila")
-        /* Maintainers:
-           Marek Szyprowski <m.szyprowski@samsung.com>
-           Kyungmin Park <kyungmin.park@samsung.com> */
-        .atag_offset    = 0x100,
-        .init_irq       = s5pv210_init_irq,
-        .map_io         = aquila_map_io,
-        .init_machine   = aquila_machine_init,
-        .init_time      = samsung_timer_init,
-        .restart        = s5pv210_restart,
-MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
deleted file mode 100644
index c1ce921c4088..000000000000
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ /dev/null
@@ -1,916 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-goni.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/fb.h>
-#include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
-#include <linux/i2c/atmel_mxt_ts.h>
-#include <linux/mfd/max8998.h>
-#include <linux/mfd/wm8994/pdata.h>
-#include <linux/regulator/fixed.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/spi_gpio.h>
-#include <linux/lcd.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/gpio.h>
-#include <linux/mmc/host.h>
-#include <linux/interrupt.h>
-#include <linux/platform_data/s3c-hsotg.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <video/samsung_fimd.h>
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <plat/fb.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/keypad.h>
-#include <plat/sdhci.h>
-#include <plat/clock.h>
-#include <plat/samsung-time.h>
-#include <plat/mfc.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define GONI_UCON_DEFAULT       (S3C2410_UCON_TXILEVEL |        \
-                                 S3C2410_UCON_RXILEVEL |        \
-                                 S3C2410_UCON_TXIRQMODE |       \
-                                 S3C2410_UCON_RXIRQMODE |       \
-                                 S3C2410_UCON_RXFIFO_TOI |      \
-                                 S3C2443_UCON_RXERR_IRQEN)
-
-#define GONI_ULCON_DEFAULT      S3C2410_LCON_CS8
-
-#define GONI_UFCON_DEFAULT      S3C2410_UFCON_FIFOMODE
-
-static struct s3c2410_uartcfg goni_uartcfgs[] __initdata = {
-        [0] = {
-                .hwport         = 0,
-                .flags          = 0,
-                .ucon           = GONI_UCON_DEFAULT,
-                .ulcon          = GONI_ULCON_DEFAULT,
-                .ufcon          = GONI_UFCON_DEFAULT |
-                        S5PV210_UFCON_TXTRIG256 | S5PV210_UFCON_RXTRIG256,
-        },
-        [1] = {
-                .hwport         = 1,
-                .flags          = 0,
-                .ucon           = GONI_UCON_DEFAULT,
-                .ulcon          = GONI_ULCON_DEFAULT,
-                .ufcon          = GONI_UFCON_DEFAULT |
-                        S5PV210_UFCON_TXTRIG64 | S5PV210_UFCON_RXTRIG64,
-        },
-        [2] = {
-                .hwport         = 2,
-                .flags          = 0,
-                .ucon           = GONI_UCON_DEFAULT,
-                .ulcon          = GONI_ULCON_DEFAULT,
-                .ufcon          = GONI_UFCON_DEFAULT |
-                        S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
-        },
-        [3] = {
-                .hwport         = 3,
-                .flags          = 0,
-                .ucon           = GONI_UCON_DEFAULT,
-                .ulcon          = GONI_ULCON_DEFAULT,
-                .ufcon          = GONI_UFCON_DEFAULT |
-                        S5PV210_UFCON_TXTRIG16 | S5PV210_UFCON_RXTRIG16,
-        },
-};
-
-/* Frame Buffer */
-static struct s3c_fb_pd_win goni_fb_win0 = {
-        .max_bpp        = 32,
-        .default_bpp    = 16,
-        .xres           = 480,
-        .yres           = 800,
-        .virtual_x      = 480,
-        .virtual_y      = 2 * 800,
-};
-
-static struct fb_videomode goni_lcd_timing = {
-        .left_margin    = 16,
-        .right_margin   = 16,
-        .upper_margin   = 2,
-        .lower_margin   = 28,
-        .hsync_len      = 2,
-        .vsync_len      = 1,
-        .xres           = 480,
-        .yres           = 800,
-        .refresh        = 55,
-};
-
-static struct s3c_fb_platdata goni_lcd_pdata __initdata = {
-        .win[0]         = &goni_fb_win0,
-        .vtiming        = &goni_lcd_timing,
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB |
-                          VIDCON0_CLKSEL_LCD,
-        .vidcon1        = VIDCON1_INV_VCLK | VIDCON1_INV_VDEN
-                          | VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
-        .setup_gpio     = s5pv210_fb_gpio_setup_24bpp,
-};
-
-static int lcd_power_on(struct lcd_device *ld, int enable)
-{
-        return 1;
-}
-
-static int reset_lcd(struct lcd_device *ld)
-{
-        static unsigned int first = 1;
-        int reset_gpio = -1;
-
-        reset_gpio = S5PV210_MP05(5);
-
-        if (first) {
-                gpio_request(reset_gpio, "MLCD_RST");
-                first = 0;
-        }
-
-        gpio_direction_output(reset_gpio, 1);
-        return 1;
-}
-
-static struct lcd_platform_data goni_lcd_platform_data = {
-        .reset                  = reset_lcd,
-        .power_on               = lcd_power_on,
-        .lcd_enabled            = 0,
-        .reset_delay            = 120,  /* 120ms */
-        .power_on_delay         = 25,   /* 25ms */
-        .power_off_delay        = 200,  /* 200ms */
-};
-
-#define LCD_BUS_NUM     3
-static struct spi_board_info spi_board_info[] __initdata = {
-        {
-                .modalias       = "s6e63m0",
-                .platform_data  = &goni_lcd_platform_data,
-                .max_speed_hz   = 1200000,
-                .bus_num        = LCD_BUS_NUM,
-                .chip_select    = 0,
-                .mode           = SPI_MODE_3,
-                .controller_data = (void *)S5PV210_MP01(1), /* DISPLAY_CS */
-        },
-};
-
-static struct spi_gpio_platform_data lcd_spi_gpio_data = {
-        .sck    = S5PV210_MP04(1), /* DISPLAY_CLK */
-        .mosi   = S5PV210_MP04(3), /* DISPLAY_SI */
-        .miso   = SPI_GPIO_NO_MISO,
-        .num_chipselect = 1,
-};
-
-static struct platform_device goni_spi_gpio = {
-        .name   = "spi_gpio",
-        .id     = LCD_BUS_NUM,
-        .dev    = {
-                .parent         = &s3c_device_fb.dev,
-                .platform_data  = &lcd_spi_gpio_data,
-        },
-};
-
-/* KEYPAD */
-static uint32_t keymap[] __initdata = {
-        /* KEY(row, col, keycode) */
-        KEY(0, 1, KEY_MENU),            /* Send */
-        KEY(0, 2, KEY_BACK),            /* End */
-        KEY(1, 1, KEY_CONFIG),          /* Half shot */
-        KEY(1, 2, KEY_VOLUMEUP),
-        KEY(2, 1, KEY_CAMERA),          /* Full shot */
-        KEY(2, 2, KEY_VOLUMEDOWN),
-};
-
-static struct matrix_keymap_data keymap_data __initdata = {
-        .keymap         = keymap,
-        .keymap_size    = ARRAY_SIZE(keymap),
-};
-
-static struct samsung_keypad_platdata keypad_data __initdata = {
-        .keymap_data    = &keymap_data,
-        .rows           = 3,
-        .cols           = 3,
-};
-
-/* Radio */
-static struct i2c_board_info i2c1_devs[] __initdata = {
-        {
-                I2C_BOARD_INFO("si470x", 0x10),
-        },
-};
-
-static void __init goni_radio_init(void)
-{
-        int gpio;
-
-        gpio = S5PV210_GPJ2(4);                 /* XMSMDATA_4 */
-        gpio_request(gpio, "FM_INT");
-        s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf));
-        i2c1_devs[0].irq = gpio_to_irq(gpio);
-
-        gpio = S5PV210_GPJ2(5);                 /* XMSMDATA_5 */
-        gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "FM_RST");
-}
-
-/* TSP */
-static struct mxt_platform_data qt602240_platform_data = {
-        .irqflags       = IRQF_TRIGGER_FALLING,
-};
-
-static struct s3c2410_platform_i2c i2c2_data __initdata = {
-        .flags          = 0,
-        .bus_num        = 2,
-        .slave_addr     = 0x10,
-        .frequency      = 400 * 1000,
-        .sda_delay      = 100,
-};
-
-static struct i2c_board_info i2c2_devs[] __initdata = {
-        {
-                I2C_BOARD_INFO("qt602240_ts", 0x4a),
-                .platform_data = &qt602240_platform_data,
-        },
-};
-
-static void __init goni_tsp_init(void)
-{
-        int gpio;
-
-        gpio = S5PV210_GPJ1(3);         /* XMSMADDR_11 */
-        gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "TSP_LDO_ON");
-        gpio_export(gpio, 0);
-
-        gpio = S5PV210_GPJ0(5);         /* XMSMADDR_5 */
-        gpio_request(gpio, "TSP_INT");
-
-        s5p_register_gpio_interrupt(gpio);
-        s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0xf));
-        s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP);
-        i2c2_devs[0].irq = gpio_to_irq(gpio);
-}
-
-/* USB OTG */
-static struct s3c_hsotg_plat goni_hsotg_pdata;
-
-/* MAX8998 regulators */
-#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
-
-static struct regulator_consumer_supply goni_ldo3_consumers[] = {
-        REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),
-};
-
-static struct regulator_consumer_supply goni_ldo5_consumers[] = {
-        REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),
-};
-
-static struct regulator_consumer_supply goni_ldo8_consumers[] = {
-        REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"),
-        REGULATOR_SUPPLY("vdd33a_dac", "s5p-sdo"),
-};
-
-static struct regulator_consumer_supply goni_ldo11_consumers[] = {
-        REGULATOR_SUPPLY("vddio", "0-0030"), /* "CAM_IO_2.8V" */
-};
-
-static struct regulator_consumer_supply goni_ldo13_consumers[] = {
-        REGULATOR_SUPPLY("vdda", "0-0030"), /* "CAM_A_2.8V" */
-};
-
-static struct regulator_consumer_supply goni_ldo14_consumers[] = {
-        REGULATOR_SUPPLY("vdd_core", "0-0030"), /* "CAM_CIF_1.8V" */
-};
-
-static struct regulator_init_data goni_ldo2_data = {
-        .constraints    = {
-                .name           = "VALIVE_1.1V",
-                .min_uV         = 1100000,
-                .max_uV         = 1100000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-                .state_mem      = {
-                        .enabled = 1,
-                },
-        },
-};
-
-static struct regulator_init_data goni_ldo3_data = {
-        .constraints    = {
-                .name           = "VUSB+MIPI_1.1V",
-                .min_uV         = 1100000,
-                .max_uV         = 1100000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies = ARRAY_SIZE(goni_ldo3_consumers),
-        .consumer_supplies = goni_ldo3_consumers,
-};
-
-static struct regulator_init_data goni_ldo4_data = {
-        .constraints    = {
-                .name           = "VDAC_3.3V",
-                .min_uV         = 3300000,
-                .max_uV         = 3300000,
-                .apply_uV       = 1,
-        },
-};
-
-static struct regulator_init_data goni_ldo5_data = {
-        .constraints    = {
-                .name           = "VTF_2.8V",
-                .min_uV         = 2800000,
-                .max_uV         = 2800000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies = ARRAY_SIZE(goni_ldo5_consumers),
-        .consumer_supplies = goni_ldo5_consumers,
-};
-
-static struct regulator_init_data goni_ldo6_data = {
-        .constraints    = {
-                .name           = "VCC_3.3V",
-                .min_uV         = 3300000,
-                .max_uV         = 3300000,
-                .apply_uV       = 1,
-        },
-};
-
-static struct regulator_init_data goni_ldo7_data = {
-        .constraints    = {
-                .name           = "VLCD_1.8V",
-                .min_uV         = 1800000,
-                .max_uV         = 1800000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct regulator_init_data goni_ldo8_data = {
-        .constraints    = {
-                .name           = "VUSB+VADC_3.3V",
-                .min_uV         = 3300000,
-                .max_uV         = 3300000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies = ARRAY_SIZE(goni_ldo8_consumers),
-        .consumer_supplies = goni_ldo8_consumers,
-};
-
-static struct regulator_init_data goni_ldo9_data = {
-        .constraints    = {
-                .name           = "VCC+VCAM_2.8V",
-                .min_uV         = 2800000,
-                .max_uV         = 2800000,
-                .apply_uV       = 1,
-        },
-};
-
-static struct regulator_init_data goni_ldo10_data = {
-        .constraints    = {
-                .name           = "VPLL_1.1V",
-                .min_uV         = 1100000,
-                .max_uV         = 1100000,
-                .apply_uV       = 1,
-                .boot_on        = 1,
-        },
-};
-
-static struct regulator_init_data goni_ldo11_data = {
-        .constraints    = {
-                .name           = "CAM_IO_2.8V",
-                .min_uV         = 2800000,
-                .max_uV         = 2800000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = ARRAY_SIZE(goni_ldo11_consumers),
-        .consumer_supplies      = goni_ldo11_consumers,
-};
-
-static struct regulator_init_data goni_ldo12_data = {
-        .constraints    = {
-                .name           = "CAM_ISP_1.2V",
-                .min_uV         = 1200000,
-                .max_uV         = 1200000,
-                .apply_uV       = 1,
-        },
-};
-
-static struct regulator_init_data goni_ldo13_data = {
-        .constraints    = {
-                .name           = "CAM_A_2.8V",
-                .min_uV         = 2800000,
-                .max_uV         = 2800000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = ARRAY_SIZE(goni_ldo13_consumers),
-        .consumer_supplies      = goni_ldo13_consumers,
-};
-
-static struct regulator_init_data goni_ldo14_data = {
-        .constraints    = {
-                .name           = "CAM_CIF_1.8V",
-                .min_uV         = 1800000,
-                .max_uV         = 1800000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = ARRAY_SIZE(goni_ldo14_consumers),
-        .consumer_supplies      = goni_ldo14_consumers,
-};
-
-static struct regulator_init_data goni_ldo15_data = {
-        .constraints    = {
-                .name           = "CAM_AF_3.3V",
-                .min_uV         = 3300000,
-                .max_uV         = 3300000,
-                .apply_uV       = 1,
-        },
-};
-
-static struct regulator_init_data goni_ldo16_data = {
-        .constraints    = {
-                .name           = "VMIPI_1.8V",
-                .min_uV         = 1800000,
-                .max_uV         = 1800000,
-                .apply_uV       = 1,
-        },
-};
-
-static struct regulator_init_data goni_ldo17_data = {
-        .constraints    = {
-                .name           = "VCC_3.0V_LCD",
-                .min_uV         = 3000000,
-                .max_uV         = 3000000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-/* BUCK */
-static struct regulator_consumer_supply buck1_consumer =
-        REGULATOR_SUPPLY("vddarm", NULL);
-
-static struct regulator_consumer_supply buck2_consumer =
-        REGULATOR_SUPPLY("vddint", NULL);
-
-static struct regulator_consumer_supply buck3_consumer =
-        REGULATOR_SUPPLY("vdet", "s5p-sdo");
-
-
-static struct regulator_init_data goni_buck1_data = {
-        .constraints    = {
-                .name           = "VARM_1.2V",
-                .min_uV         = 1200000,
-                .max_uV         = 1200000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                  REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &buck1_consumer,
-};
-
-static struct regulator_init_data goni_buck2_data = {
-        .constraints    = {
-                .name           = "VINT_1.2V",
-                .min_uV         = 1200000,
-                .max_uV         = 1200000,
-                .apply_uV       = 1,
-                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                  REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &buck2_consumer,
-};
-
-static struct regulator_init_data goni_buck3_data = {
-        .constraints    = {
-                .name           = "VCC_1.8V",
-                .min_uV         = 1800000,
-                .max_uV         = 1800000,
-                .apply_uV       = 1,
-                .state_mem      = {
-                        .enabled = 1,
-                },
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &buck3_consumer,
-};
-
-static struct regulator_init_data goni_buck4_data = {
-        .constraints    = {
-                .name           = "CAM_CORE_1.2V",
-                .min_uV         = 1200000,
-                .max_uV         = 1200000,
-                .apply_uV       = 1,
-                .always_on      = 1,
-        },
-};
-
-static struct max8998_regulator_data goni_regulators[] = {
-        { MAX8998_LDO2,  &goni_ldo2_data },
-        { MAX8998_LDO3,  &goni_ldo3_data },
-        { MAX8998_LDO4,  &goni_ldo4_data },
-        { MAX8998_LDO5,  &goni_ldo5_data },
-        { MAX8998_LDO6,  &goni_ldo6_data },
-        { MAX8998_LDO7,  &goni_ldo7_data },
-        { MAX8998_LDO8,  &goni_ldo8_data },
-        { MAX8998_LDO9,  &goni_ldo9_data },
-        { MAX8998_LDO10, &goni_ldo10_data },
-        { MAX8998_LDO11, &goni_ldo11_data },
-        { MAX8998_LDO12, &goni_ldo12_data },
-        { MAX8998_LDO13, &goni_ldo13_data },
-        { MAX8998_LDO14, &goni_ldo14_data },
-        { MAX8998_LDO15, &goni_ldo15_data },
-        { MAX8998_LDO16, &goni_ldo16_data },
-        { MAX8998_LDO17, &goni_ldo17_data },
-        { MAX8998_BUCK1, &goni_buck1_data },
-        { MAX8998_BUCK2, &goni_buck2_data },
-        { MAX8998_BUCK3, &goni_buck3_data },
-        { MAX8998_BUCK4, &goni_buck4_data },
-};
-
-static struct max8998_platform_data goni_max8998_pdata = {
-        .num_regulators = ARRAY_SIZE(goni_regulators),
-        .regulators     = goni_regulators,
-        .buck1_set1     = S5PV210_GPH0(3),
-        .buck1_set2     = S5PV210_GPH0(4),
-        .buck2_set3     = S5PV210_GPH0(5),
-        .buck1_voltage  = { 1200000, 1200000, 1200000, 1200000 },
-        .buck2_voltage  = { 1200000, 1200000 },
-};
-#endif
-
-static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {
-        REGULATOR_SUPPLY("DBVDD", "5-001a"),
-        REGULATOR_SUPPLY("AVDD2", "5-001a"),
-        REGULATOR_SUPPLY("CPVDD", "5-001a"),
-};
-
-static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {
-        REGULATOR_SUPPLY("SPKVDD1", "5-001a"),
-        REGULATOR_SUPPLY("SPKVDD2", "5-001a"),
-};
-
-static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
-        .constraints = {
-                .always_on = 1,
-        },
-        .num_consumer_supplies  = ARRAY_SIZE(wm8994_fixed_voltage0_supplies),
-        .consumer_supplies      = wm8994_fixed_voltage0_supplies,
-};
-
-static struct regulator_init_data wm8994_fixed_voltage1_init_data = {
-        .constraints = {
-                .always_on = 1,
-        },
-        .num_consumer_supplies  = ARRAY_SIZE(wm8994_fixed_voltage1_supplies),
-        .consumer_supplies      = wm8994_fixed_voltage1_supplies,
-};
-
-static struct fixed_voltage_config wm8994_fixed_voltage0_config = {
-        .supply_name    = "VCC_1.8V_PDA",
-        .microvolts     = 1800000,
-        .gpio           = -EINVAL,
-        .init_data      = &wm8994_fixed_voltage0_init_data,
-};
-
-static struct fixed_voltage_config wm8994_fixed_voltage1_config = {
-        .supply_name    = "V_BAT",
-        .microvolts     = 3700000,
-        .gpio           = -EINVAL,
-        .init_data      = &wm8994_fixed_voltage1_init_data,
-};
-
-static struct platform_device wm8994_fixed_voltage0 = {
-        .name           = "reg-fixed-voltage",
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &wm8994_fixed_voltage0_config,
-        },
-};
-
-static struct platform_device wm8994_fixed_voltage1 = {
-        .name           = "reg-fixed-voltage",
-        .id             = 1,
-        .dev            = {
-                .platform_data  = &wm8994_fixed_voltage1_config,
-        },
-};
-
-static struct regulator_consumer_supply wm8994_avdd1_supply =
-        REGULATOR_SUPPLY("AVDD1", "5-001a");
-
-static struct regulator_consumer_supply wm8994_dcvdd_supply =
-        REGULATOR_SUPPLY("DCVDD", "5-001a");
-
-static struct regulator_init_data wm8994_ldo1_data = {
-        .constraints    = {
-                .name           = "AVDD1_3.0V",
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &wm8994_avdd1_supply,
-};
-
-static struct regulator_init_data wm8994_ldo2_data = {
-        .constraints    = {
-                .name           = "DCVDD_1.0V",
-        },
-        .num_consumer_supplies  = 1,
-        .consumer_supplies      = &wm8994_dcvdd_supply,
-};
-
-static struct wm8994_pdata wm8994_platform_data = {
-        /* configure gpio1 function: 0x0001(Logic level input/output) */
-        .gpio_defaults[0] = 0x0001,
-        /* configure gpio3/4/5/7 function for AIF2 voice */
-        .gpio_defaults[2] = 0x8100,
-        .gpio_defaults[3] = 0x8100,
-        .gpio_defaults[4] = 0x8100,
-        .gpio_defaults[6] = 0x0100,
-        /* configure gpio8/9/10/11 function for AIF3 BT */
-        .gpio_defaults[7] = 0x8100,
-        .gpio_defaults[8] = 0x0100,
-        .gpio_defaults[9] = 0x0100,
-        .gpio_defaults[10] = 0x0100,
-        .ldo[0] = { S5PV210_MP03(6), &wm8994_ldo1_data },       /* XM0FRNB_2 */
-        .ldo[1] = { 0, &wm8994_ldo2_data },
-};
-
-/* GPIO I2C PMIC */
-#define AP_I2C_GPIO_PMIC_BUS_4  4
-static struct i2c_gpio_platform_data goni_i2c_gpio_pmic_data = {
-        .sda_pin        = S5PV210_GPJ4(0),      /* XMSMCSN */
-        .scl_pin        = S5PV210_GPJ4(3),      /* XMSMIRQN */
-};
-
-static struct platform_device goni_i2c_gpio_pmic = {
-        .name           = "i2c-gpio",
-        .id             = AP_I2C_GPIO_PMIC_BUS_4,
-        .dev            = {
-                .platform_data  = &goni_i2c_gpio_pmic_data,
-        },
-};
-
-static struct i2c_board_info i2c_gpio_pmic_devs[] __initdata = {
-#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
-        {
-                /* 0xCC when SRAD = 0 */
-                I2C_BOARD_INFO("max8998", 0xCC >> 1),
-                .platform_data = &goni_max8998_pdata,
-        },
-#endif
-};
-
-/* GPIO I2C AP 1.8V */
-#define AP_I2C_GPIO_BUS_5       5
-static struct i2c_gpio_platform_data goni_i2c_gpio5_data = {
-        .sda_pin        = S5PV210_MP05(3),      /* XM0ADDR_11 */
-        .scl_pin        = S5PV210_MP05(2),      /* XM0ADDR_10 */
-};
-
-static struct platform_device goni_i2c_gpio5 = {
-        .name           = "i2c-gpio",
-        .id             = AP_I2C_GPIO_BUS_5,
-        .dev            = {
-                .platform_data  = &goni_i2c_gpio5_data,
-        },
-};
-
-static struct i2c_board_info i2c_gpio5_devs[] __initdata = {
-        {
-                /* CS/ADDR = low 0x34 (FYI: high = 0x36) */
-                I2C_BOARD_INFO("wm8994", 0x1a),
-                .platform_data  = &wm8994_platform_data,
-        },
-};
-
-/* PMIC Power button */
-static struct gpio_keys_button goni_gpio_keys_table[] = {
-        {
-                .code           = KEY_POWER,
-                .gpio           = S5PV210_GPH2(6),
-                .desc           = "gpio-keys: KEY_POWER",
-                .type           = EV_KEY,
-                .active_low     = 1,
-                .wakeup         = 1,
-                .debounce_interval = 1,
-        },
-};
-
-static struct gpio_keys_platform_data goni_gpio_keys_data = {
-        .buttons        = goni_gpio_keys_table,
-        .nbuttons       = ARRAY_SIZE(goni_gpio_keys_table),
-};
-
-static struct platform_device goni_device_gpiokeys = {
-        .name = "gpio-keys",
-        .dev = {
-                .platform_data = &goni_gpio_keys_data,
-        },
-};
-
-static void __init goni_pmic_init(void)
-{
-        /* AP_PMIC_IRQ: EINT7 */
-        s3c_gpio_cfgpin(S5PV210_GPH0(7), S3C_GPIO_SFN(0xf));
-        s3c_gpio_setpull(S5PV210_GPH0(7), S3C_GPIO_PULL_UP);
-
-        /* nPower: EINT22 */
-        s3c_gpio_cfgpin(S5PV210_GPH2(6), S3C_GPIO_SFN(0xf));
-        s3c_gpio_setpull(S5PV210_GPH2(6), S3C_GPIO_PULL_UP);
-}
-
-/* MoviNAND */
-static struct s3c_sdhci_platdata goni_hsmmc0_data __initdata = {
-        .max_width              = 4,
-        .cd_type                = S3C_SDHCI_CD_PERMANENT,
-};
-
-/* Wireless LAN */
-static struct s3c_sdhci_platdata goni_hsmmc1_data __initdata = {
-        .max_width              = 4,
-        .cd_type                = S3C_SDHCI_CD_EXTERNAL,
-        /* ext_cd_{init,cleanup} callbacks will be added later */
-};
-
-/* External Flash */
-#define GONI_EXT_FLASH_EN       S5PV210_MP05(4)
-#define GONI_EXT_FLASH_CD       S5PV210_GPH3(4)
-static struct s3c_sdhci_platdata goni_hsmmc2_data __initdata = {
-        .max_width              = 4,
-        .cd_type                = S3C_SDHCI_CD_GPIO,
-        .ext_cd_gpio            = GONI_EXT_FLASH_CD,
-        .ext_cd_gpio_invert     = 1,
-};
-
-static struct regulator_consumer_supply mmc2_supplies[] = {
-        REGULATOR_SUPPLY("vmmc", "s3c-sdhci.2"),
-};
-
-static struct regulator_init_data mmc2_fixed_voltage_init_data = {
-        .constraints            = {
-                .name           = "V_TF_2.8V",
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = ARRAY_SIZE(mmc2_supplies),
-        .consumer_supplies      = mmc2_supplies,
-};
-
-static struct fixed_voltage_config mmc2_fixed_voltage_config = {
-        .supply_name            = "EXT_FLASH_EN",
-        .microvolts             = 2800000,
-        .gpio                   = GONI_EXT_FLASH_EN,
-        .enable_high            = true,
-        .init_data              = &mmc2_fixed_voltage_init_data,
-};
-
-static struct platform_device mmc2_fixed_voltage = {
-        .name           = "reg-fixed-voltage",
-        .id             = 2,
-        .dev            = {
-                .platform_data  = &mmc2_fixed_voltage_config,
-        },
-};
-
-static void goni_setup_sdhci(void)
-{
-        s3c_sdhci0_set_platdata(&goni_hsmmc0_data);
-        s3c_sdhci1_set_platdata(&goni_hsmmc1_data);
-        s3c_sdhci2_set_platdata(&goni_hsmmc2_data);
-};
-
-/* Audio device */
-static struct platform_device goni_device_audio = {
-        .name = "smdk-audio",
-        .id = -1,
-};
-
-static struct platform_device *goni_devices[] __initdata = {
-        &s3c_device_fb,
-        &s5p_device_onenand,
-        &goni_spi_gpio,
-        &goni_i2c_gpio_pmic,
-        &goni_i2c_gpio5,
-        &goni_device_audio,
-        &mmc2_fixed_voltage,
-        &goni_device_gpiokeys,
-        &s5p_device_mfc,
-        &s5p_device_mfc_l,
-        &s5p_device_mfc_r,
-        &s5p_device_mixer,
-        &s5p_device_sdo,
-        &s3c_device_i2c0,
-        &s3c_device_hsmmc0,
-        &s3c_device_hsmmc1,
-        &s3c_device_hsmmc2,
-        &s5pv210_device_iis0,
-        &s3c_device_usb_hsotg,
-        &samsung_device_keypad,
-        &s3c_device_i2c1,
-        &s3c_device_i2c2,
-        &wm8994_fixed_voltage0,
-        &wm8994_fixed_voltage1,
-};
-
-static void __init goni_sound_init(void)
-{
-        /* Ths main clock of WM8994 codec uses the output of CLKOUT pin.
-         * The CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS)
-         * because it needs 24MHz clock to operate WM8994 codec.
-         */
-        __raw_writel(__raw_readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS);
-}
-
-static void __init goni_map_io(void)
-{
-        s5pv210_init_io(NULL, 0);
-        s3c24xx_init_clocks(clk_xusbxti.rate);
-        s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs));
-        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void __init goni_reserve(void)
-{
-        s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
-}
-
-static void __init goni_machine_init(void)
-{
-        /* Radio: call before I2C 1 registeration */
-        goni_radio_init();
-
-        /* I2C0 */
-        s3c_i2c0_set_platdata(NULL);
-
-        /* I2C1 */
-        s3c_i2c1_set_platdata(NULL);
-        i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
-
-        /* TSP: call before I2C 2 registeration */
-        goni_tsp_init();
-
-        /* I2C2 */
-        s3c_i2c2_set_platdata(&i2c2_data);
-        i2c_register_board_info(2, i2c2_devs, ARRAY_SIZE(i2c2_devs));
-
-        /* PMIC */
-        goni_pmic_init();
-        i2c_register_board_info(AP_I2C_GPIO_PMIC_BUS_4, i2c_gpio_pmic_devs,
-                        ARRAY_SIZE(i2c_gpio_pmic_devs));
-        /* SDHCI */
-        goni_setup_sdhci();
-
-        /* SOUND */
-        goni_sound_init();
-        i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs,
-                        ARRAY_SIZE(i2c_gpio5_devs));
-
-        /* FB */
-        s3c_fb_set_platdata(&goni_lcd_pdata);
-
-        s3c_hsotg_set_platdata(&goni_hsotg_pdata);
-
-        /* SPI */
-        spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
-
-        /* KEYPAD */
-        samsung_keypad_set_platdata(&keypad_data);
-
-        platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices));
-}
-
-MACHINE_START(GONI, "GONI")
-        /* Maintainers: Kyungmin Park <kyungmin.park@samsung.com> */
-        .atag_offset    = 0x100,
-        .init_irq       = s5pv210_init_irq,
-        .map_io         = goni_map_io,
-        .init_machine   = goni_machine_init,
-        .init_time      = samsung_timer_init,
-        .reserve        = &goni_reserve,
-        .restart        = s5pv210_restart,
-MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
deleted file mode 100644
index 448e1d2eeed6..000000000000
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-smdkc110.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/i2c.h>
-#include <linux/device.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <linux/platform_data/ata-samsung_cf.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/pm.h>
-#include <plat/samsung-time.h>
-#include <plat/mfc.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define SMDKC110_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
-                                 S3C2410_UCON_RXILEVEL |        \
-                                 S3C2410_UCON_TXIRQMODE |       \
-                                 S3C2410_UCON_RXIRQMODE |       \
-                                 S3C2410_UCON_RXFIFO_TOI |      \
-                                 S3C2443_UCON_RXERR_IRQEN)
-
-#define SMDKC110_ULCON_DEFAULT  S3C2410_LCON_CS8
-
-#define SMDKC110_UFCON_DEFAULT  (S3C2410_UFCON_FIFOMODE |       \
-                                 S5PV210_UFCON_TXTRIG4 |        \
-                                 S5PV210_UFCON_RXTRIG4)
-
-static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
-        [0] = {
-                .hwport         = 0,
-                .flags          = 0,
-                .ucon           = SMDKC110_UCON_DEFAULT,
-                .ulcon          = SMDKC110_ULCON_DEFAULT,
-                .ufcon          = SMDKC110_UFCON_DEFAULT,
-        },
-        [1] = {
-                .hwport         = 1,
-                .flags          = 0,
-                .ucon           = SMDKC110_UCON_DEFAULT,
-                .ulcon          = SMDKC110_ULCON_DEFAULT,
-                .ufcon          = SMDKC110_UFCON_DEFAULT,
-        },
-        [2] = {
-                .hwport         = 2,
-                .flags          = 0,
-                .ucon           = SMDKC110_UCON_DEFAULT,
-                .ulcon          = SMDKC110_ULCON_DEFAULT,
-                .ufcon          = SMDKC110_UFCON_DEFAULT,
-        },
-        [3] = {
-                .hwport         = 3,
-                .flags          = 0,
-                .ucon           = SMDKC110_UCON_DEFAULT,
-                .ulcon          = SMDKC110_ULCON_DEFAULT,
-                .ufcon          = SMDKC110_UFCON_DEFAULT,
-        },
-};
-
-static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = {
-        .setup_gpio     = s5pv210_ide_setup_gpio,
-};
-
-static struct platform_device *smdkc110_devices[] __initdata = {
-        &s5pv210_device_iis0,
-        &s5pv210_device_ac97,
-        &s5pv210_device_spdif,
-        &s3c_device_cfcon,
-        &s3c_device_i2c0,
-        &s3c_device_i2c1,
-        &s3c_device_i2c2,
-        &s3c_device_rtc,
-        &s3c_device_wdt,
-        &s5p_device_fimc0,
-        &s5p_device_fimc1,
-        &s5p_device_fimc2,
-        &s5p_device_fimc_md,
-        &s5p_device_mfc,
-        &s5p_device_mfc_l,
-        &s5p_device_mfc_r,
-};
-
-static struct i2c_board_info smdkc110_i2c_devs0[] __initdata = {
-        { I2C_BOARD_INFO("24c08", 0x50), },     /* Samsung S524AD0XD1 */
-        { I2C_BOARD_INFO("wm8580", 0x1b), },
-};
-
-static struct i2c_board_info smdkc110_i2c_devs1[] __initdata = {
-        /* To Be Updated */
-};
-
-static struct i2c_board_info smdkc110_i2c_devs2[] __initdata = {
-        /* To Be Updated */
-};
-
-static void __init smdkc110_map_io(void)
-{
-        s5pv210_init_io(NULL, 0);
-        s3c24xx_init_clocks(24000000);
-        s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs));
-        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void __init smdkc110_reserve(void)
-{
-        s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
-}
-
-static void __init smdkc110_machine_init(void)
-{
-        s3c_pm_init();
-
-        s3c_i2c0_set_platdata(NULL);
-        s3c_i2c1_set_platdata(NULL);
-        s3c_i2c2_set_platdata(NULL);
-        i2c_register_board_info(0, smdkc110_i2c_devs0,
-                        ARRAY_SIZE(smdkc110_i2c_devs0));
-        i2c_register_board_info(1, smdkc110_i2c_devs1,
-                        ARRAY_SIZE(smdkc110_i2c_devs1));
-        i2c_register_board_info(2, smdkc110_i2c_devs2,
-                        ARRAY_SIZE(smdkc110_i2c_devs2));
-
-        s3c_ide_set_platdata(&smdkc110_ide_pdata);
-
-        platform_add_devices(smdkc110_devices, ARRAY_SIZE(smdkc110_devices));
-}
-
-MACHINE_START(SMDKC110, "SMDKC110")
-        /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
-        .atag_offset    = 0x100,
-        .init_irq       = s5pv210_init_irq,
-        .map_io         = smdkc110_map_io,
-        .init_machine   = smdkc110_machine_init,
-        .init_time      = samsung_timer_init,
-        .restart        = s5pv210_restart,
-        .reserve        = &smdkc110_reserve,
-MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
deleted file mode 100644
index 2a6655fb63e7..000000000000
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-smdkv210.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.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/kernel.h>
-#include <linux/types.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-#include <linux/device.h>
-#include <linux/dm9000.h>
-#include <linux/fb.h>
-#include <linux/gpio.h>
-#include <linux/delay.h>
-#include <linux/pwm_backlight.h>
-#include <linux/platform_data/s3c-hsotg.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <video/platform_lcd.h>
-#include <video/samsung_fimd.h>
-
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/regs-srom.h>
-#include <plat/gpio-cfg.h>
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <plat/adc.h>
-#include <linux/platform_data/touchscreen-s3c2410.h>
-#include <linux/platform_data/ata-samsung_cf.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/keypad.h>
-#include <plat/pm.h>
-#include <plat/fb.h>
-#include <plat/samsung-time.h>
-#include <plat/backlight.h>
-#include <plat/mfc.h>
-#include <plat/clock.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define SMDKV210_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
-                                 S3C2410_UCON_RXILEVEL |        \
-                                 S3C2410_UCON_TXIRQMODE |       \
-                                 S3C2410_UCON_RXIRQMODE |       \
-                                 S3C2410_UCON_RXFIFO_TOI |      \
-                                 S3C2443_UCON_RXERR_IRQEN)
-
-#define SMDKV210_ULCON_DEFAULT  S3C2410_LCON_CS8
-
-#define SMDKV210_UFCON_DEFAULT  (S3C2410_UFCON_FIFOMODE |       \
-                                 S5PV210_UFCON_TXTRIG4 |        \
-                                 S5PV210_UFCON_RXTRIG4)
-
-static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
-        [0] = {
-                .hwport         = 0,
-                .flags          = 0,
-                .ucon           = SMDKV210_UCON_DEFAULT,
-                .ulcon          = SMDKV210_ULCON_DEFAULT,
-                .ufcon          = SMDKV210_UFCON_DEFAULT,
-        },
-        [1] = {
-                .hwport         = 1,
-                .flags          = 0,
-                .ucon           = SMDKV210_UCON_DEFAULT,
-                .ulcon          = SMDKV210_ULCON_DEFAULT,
-                .ufcon          = SMDKV210_UFCON_DEFAULT,
-        },
-        [2] = {
-                .hwport         = 2,
-                .flags          = 0,
-                .ucon           = SMDKV210_UCON_DEFAULT,
-                .ulcon          = SMDKV210_ULCON_DEFAULT,
-                .ufcon          = SMDKV210_UFCON_DEFAULT,
-        },
-        [3] = {
-                .hwport         = 3,
-                .flags          = 0,
-                .ucon           = SMDKV210_UCON_DEFAULT,
-                .ulcon          = SMDKV210_ULCON_DEFAULT,
-                .ufcon          = SMDKV210_UFCON_DEFAULT,
-        },
-};
-
-static struct s3c_ide_platdata smdkv210_ide_pdata __initdata = {
-        .setup_gpio     = s5pv210_ide_setup_gpio,
-};
-
-static uint32_t smdkv210_keymap[] __initdata = {
-        /* KEY(row, col, keycode) */
-        KEY(0, 3, KEY_1), KEY(0, 4, KEY_2), KEY(0, 5, KEY_3),
-        KEY(0, 6, KEY_4), KEY(0, 7, KEY_5),
-        KEY(1, 3, KEY_A), KEY(1, 4, KEY_B), KEY(1, 5, KEY_C),
-        KEY(1, 6, KEY_D), KEY(1, 7, KEY_E)
-};
-
-static struct matrix_keymap_data smdkv210_keymap_data __initdata = {
-        .keymap         = smdkv210_keymap,
-        .keymap_size    = ARRAY_SIZE(smdkv210_keymap),
-};
-
-static struct samsung_keypad_platdata smdkv210_keypad_data __initdata = {
-        .keymap_data    = &smdkv210_keymap_data,
-        .rows           = 8,
-        .cols           = 8,
-};
-
-static struct resource smdkv210_dm9000_resources[] = {
-        [0] = DEFINE_RES_MEM(S5PV210_PA_SROM_BANK5, 1),
-        [1] = DEFINE_RES_MEM(S5PV210_PA_SROM_BANK5 + 2, 1),
-        [2] = DEFINE_RES_NAMED(IRQ_EINT(9), 1, NULL, IORESOURCE_IRQ \
-                                | IORESOURCE_IRQ_HIGHLEVEL),
-};
-
-static struct dm9000_plat_data smdkv210_dm9000_platdata = {
-        .flags          = DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM,
-        .dev_addr       = { 0x00, 0x09, 0xc0, 0xff, 0xec, 0x48 },
-};
-
-static struct platform_device smdkv210_dm9000 = {
-        .name           = "dm9000",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(smdkv210_dm9000_resources),
-        .resource       = smdkv210_dm9000_resources,
-        .dev            = {
-                .platform_data  = &smdkv210_dm9000_platdata,
-        },
-};
-
-static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd,
-                                        unsigned int power)
-{
-        if (power) {
-#if !defined(CONFIG_BACKLIGHT_PWM)
-                gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_HIGH, "GPD0");
-                gpio_free(S5PV210_GPD0(3));
-#endif
-
-                /* fire nRESET on power up */
-                gpio_request_one(S5PV210_GPH0(6), GPIOF_OUT_INIT_HIGH, "GPH0");
-
-                gpio_set_value(S5PV210_GPH0(6), 0);
-                mdelay(10);
-
-                gpio_set_value(S5PV210_GPH0(6), 1);
-                mdelay(10);
-
-                gpio_free(S5PV210_GPH0(6));
-        } else {
-#if !defined(CONFIG_BACKLIGHT_PWM)
-                gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_LOW, "GPD0");
-                gpio_free(S5PV210_GPD0(3));
-#endif
-        }
-}
-
-static struct plat_lcd_data smdkv210_lcd_lte480wv_data = {
-        .set_power      = smdkv210_lte480wv_set_power,
-};
-
-static struct platform_device smdkv210_lcd_lte480wv = {
-        .name                   = "platform-lcd",
-        .dev.parent             = &s3c_device_fb.dev,
-        .dev.platform_data      = &smdkv210_lcd_lte480wv_data,
-};
-
-static struct s3c_fb_pd_win smdkv210_fb_win0 = {
-        .max_bpp        = 32,
-        .default_bpp    = 24,
-        .xres           = 800,
-        .yres           = 480,
-};
-
-static struct fb_videomode smdkv210_lcd_timing = {
-        .left_margin    = 13,
-        .right_margin   = 8,
-        .upper_margin   = 7,
-        .lower_margin   = 5,
-        .hsync_len      = 3,
-        .vsync_len      = 1,
-        .xres           = 800,
-        .yres           = 480,
-};
-
-static struct s3c_fb_platdata smdkv210_lcd0_pdata __initdata = {
-        .win[0]         = &smdkv210_fb_win0,
-        .vtiming        = &smdkv210_lcd_timing,
-        .vidcon0        = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,
-        .vidcon1        = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,
-        .setup_gpio     = s5pv210_fb_gpio_setup_24bpp,
-};
-
-/* USB OTG */
-static struct s3c_hsotg_plat smdkv210_hsotg_pdata;
-
-static struct platform_device *smdkv210_devices[] __initdata = {
-        &s3c_device_adc,
-        &s3c_device_cfcon,
-        &s3c_device_fb,
-        &s3c_device_hsmmc0,
-        &s3c_device_hsmmc1,
-        &s3c_device_hsmmc2,
-        &s3c_device_hsmmc3,
-        &s3c_device_i2c0,
-        &s3c_device_i2c1,
-        &s3c_device_i2c2,
-        &samsung_device_pwm,
-        &s3c_device_rtc,
-        &s3c_device_ts,
-        &s3c_device_usb_hsotg,
-        &s3c_device_wdt,
-        &s5p_device_fimc0,
-        &s5p_device_fimc1,
-        &s5p_device_fimc2,
-        &s5p_device_fimc_md,
-        &s5p_device_jpeg,
-        &s5p_device_mfc,
-        &s5p_device_mfc_l,
-        &s5p_device_mfc_r,
-        &s5pv210_device_ac97,
-        &s5pv210_device_iis0,
-        &s5pv210_device_spdif,
-        &samsung_asoc_idma,
-        &samsung_device_keypad,
-        &smdkv210_dm9000,
-        &smdkv210_lcd_lte480wv,
-};
-
-static void __init smdkv210_dm9000_init(void)
-{
-        unsigned int tmp;
-
-        gpio_request(S5PV210_MP01(5), "nCS5");
-        s3c_gpio_cfgpin(S5PV210_MP01(5), S3C_GPIO_SFN(2));
-        gpio_free(S5PV210_MP01(5));
-
-        tmp = (5 << S5P_SROM_BCX__TACC__SHIFT);
-        __raw_writel(tmp, S5P_SROM_BC5);
-
-        tmp = __raw_readl(S5P_SROM_BW);
-        tmp &= (S5P_SROM_BW__CS_MASK << S5P_SROM_BW__NCS5__SHIFT);
-        tmp |= (1 << S5P_SROM_BW__NCS5__SHIFT);
-        __raw_writel(tmp, S5P_SROM_BW);
-}
-
-static struct i2c_board_info smdkv210_i2c_devs0[] __initdata = {
-        { I2C_BOARD_INFO("24c08", 0x50), },     /* Samsung S524AD0XD1 */
-        { I2C_BOARD_INFO("wm8580", 0x1b), },
-};
-
-static struct i2c_board_info smdkv210_i2c_devs1[] __initdata = {
-        /* To Be Updated */
-};
-
-static struct i2c_board_info smdkv210_i2c_devs2[] __initdata = {
-        /* To Be Updated */
-};
-
-/* LCD Backlight data */
-static struct samsung_bl_gpio_info smdkv210_bl_gpio_info = {
-        .no = S5PV210_GPD0(3),
-        .func = S3C_GPIO_SFN(2),
-};
-
-static struct platform_pwm_backlight_data smdkv210_bl_data = {
-        .pwm_id = 3,
-        .pwm_period_ns = 1000,
-        .enable_gpio = -1,
-};
-
-static void __init smdkv210_map_io(void)
-{
-        s5pv210_init_io(NULL, 0);
-        s3c24xx_init_clocks(clk_xusbxti.rate);
-        s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs));
-        samsung_set_timer_source(SAMSUNG_PWM2, SAMSUNG_PWM4);
-}
-
-static void __init smdkv210_reserve(void)
-{
-        s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
-}
-
-static void __init smdkv210_machine_init(void)
-{
-        s3c_pm_init();
-
-        smdkv210_dm9000_init();
-
-        samsung_keypad_set_platdata(&smdkv210_keypad_data);
-        s3c24xx_ts_set_platdata(NULL);
-
-        s3c_i2c0_set_platdata(NULL);
-        s3c_i2c1_set_platdata(NULL);
-        s3c_i2c2_set_platdata(NULL);
-        i2c_register_board_info(0, smdkv210_i2c_devs0,
-                        ARRAY_SIZE(smdkv210_i2c_devs0));
-        i2c_register_board_info(1, smdkv210_i2c_devs1,
-                        ARRAY_SIZE(smdkv210_i2c_devs1));
-        i2c_register_board_info(2, smdkv210_i2c_devs2,
-                        ARRAY_SIZE(smdkv210_i2c_devs2));
-
-        s3c_ide_set_platdata(&smdkv210_ide_pdata);
-
-        s3c_fb_set_platdata(&smdkv210_lcd0_pdata);
-
-        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")
-        /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
-        .atag_offset    = 0x100,
-        .init_irq       = s5pv210_init_irq,
-        .map_io         = smdkv210_map_io,
-        .init_machine   = smdkv210_machine_init,
-        .init_time      = samsung_timer_init,
-        .restart        = s5pv210_restart,
-        .reserve        = &smdkv210_reserve,
-MACHINE_END
diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c
deleted file mode 100644
index 157805529f26..000000000000
--- a/arch/arm/mach-s5pv210/mach-torbreck.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/mach-torbreck.c
- *
- * Copyright (c) 2010 aESOP Community
- *              http://www.aesop.or.kr/
- *
- * 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/types.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <mach/map.h>
-#include <mach/regs-clock.h>
-
-#include <plat/devs.h>
-#include <plat/cpu.h>
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/samsung-time.h>
-
-#include "common.h"
-
-/* Following are default values for UCON, ULCON and UFCON UART registers */
-#define TORBRECK_UCON_DEFAULT   (S3C2410_UCON_TXILEVEL |        \
-                                 S3C2410_UCON_RXILEVEL |        \
-                                 S3C2410_UCON_TXIRQMODE |       \
-                                 S3C2410_UCON_RXIRQMODE |       \
-                                 S3C2410_UCON_RXFIFO_TOI |      \
-                                 S3C2443_UCON_RXERR_IRQEN)
-
-#define TORBRECK_ULCON_DEFAULT  S3C2410_LCON_CS8
-
-#define TORBRECK_UFCON_DEFAULT  (S3C2410_UFCON_FIFOMODE |       \
-                                 S5PV210_UFCON_TXTRIG4 |        \
-                                 S5PV210_UFCON_RXTRIG4)
-
-static struct s3c2410_uartcfg torbreck_uartcfgs[] __initdata = {
-        [0] = {
-                .hwport         = 0,
-                .flags          = 0,
-                .ucon           = TORBRECK_UCON_DEFAULT,
-                .ulcon          = TORBRECK_ULCON_DEFAULT,
-                .ufcon          = TORBRECK_UFCON_DEFAULT,
-        },
-        [1] = {
-                .hwport         = 1,
-                .flags          = 0,
-                .ucon           = TORBRECK_UCON_DEFAULT,
-                .ulcon          = TORBRECK_ULCON_DEFAULT,
-                .ufcon          = TORBRECK_UFCON_DEFAULT,
-        },
-        [2] = {
-                .hwport         = 2,
-                .flags          = 0,
-                .ucon           = TORBRECK_UCON_DEFAULT,
-                .ulcon          = TORBRECK_ULCON_DEFAULT,
-                .ufcon          = TORBRECK_UFCON_DEFAULT,
-        },
-        [3] = {
-                .hwport         = 3,
-                .flags          = 0,
-                .ucon           = TORBRECK_UCON_DEFAULT,
-                .ulcon          = TORBRECK_ULCON_DEFAULT,
-                .ufcon          = TORBRECK_UFCON_DEFAULT,
-        },
-};
-
-static struct platform_device *torbreck_devices[] __initdata = {
-        &s5pv210_device_iis0,
-        &s3c_device_cfcon,
-        &s3c_device_hsmmc0,
-        &s3c_device_hsmmc1,
-        &s3c_device_hsmmc2,
-        &s3c_device_hsmmc3,
-        &s3c_device_i2c0,
-        &s3c_device_i2c1,
-        &s3c_device_i2c2,
-        &s3c_device_rtc,
-        &s3c_device_wdt,
-};
-
-static struct i2c_board_info torbreck_i2c_devs0[] __initdata = {
-        /* To Be Updated */
-};
-
-static struct i2c_board_info torbreck_i2c_devs1[] __initdata = {
-        /* To Be Updated */
-};
-
-static struct i2c_board_info torbreck_i2c_devs2[] __initdata = {
-        /* To Be Updated */
-};
-
-static void __init torbreck_map_io(void)
-{
-        s5pv210_init_io(NULL, 0);
-        s3c24xx_init_clocks(24000000);
-        s3c24xx_init_uarts(torbreck_uartcfgs, ARRAY_SIZE(torbreck_uartcfgs));
-        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
-}
-
-static void __init torbreck_machine_init(void)
-{
-        s3c_i2c0_set_platdata(NULL);
-        s3c_i2c1_set_platdata(NULL);
-        s3c_i2c2_set_platdata(NULL);
-        i2c_register_board_info(0, torbreck_i2c_devs0,
-                        ARRAY_SIZE(torbreck_i2c_devs0));
-        i2c_register_board_info(1, torbreck_i2c_devs1,
-                        ARRAY_SIZE(torbreck_i2c_devs1));
-        i2c_register_board_info(2, torbreck_i2c_devs2,
-                        ARRAY_SIZE(torbreck_i2c_devs2));
-
-        platform_add_devices(torbreck_devices, ARRAY_SIZE(torbreck_devices));
-}
-
-MACHINE_START(TORBRECK, "TORBRECK")
-        /* Maintainer: Hyunchul Ko <ghcstop@gmail.com> */
-        .atag_offset    = 0x100,
-        .init_irq       = s5pv210_init_irq,
-        .map_io         = torbreck_map_io,
-        .init_machine   = torbreck_machine_init,
-        .init_time      = samsung_timer_init,
-        .restart        = s5pv210_restart,
-MACHINE_END
diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
index 3cf3f9c8ddd1..123163dd2ab0 100644
--- a/arch/arm/mach-s5pv210/pm.c
+++ b/arch/arm/mach-s5pv210/pm.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s5pv210/pm.c
  *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2010-2014 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com
  *
  * S5PV210 - Power Management support
@@ -19,65 +19,28 @@
 #include <linux/syscore_ops.h>
 #include <linux/io.h>
 
-#include <plat/cpu.h>
-#include <plat/pm.h>
+#include <asm/cacheflush.h>
+#include <asm/suspend.h>
+
+#include <plat/pm-common.h>
 
-#include <mach/regs-irq.h>
 #include <mach/regs-clock.h>
 
-static struct sleep_save s5pv210_core_save[] = {
-        /* Clock source */
-        SAVE_ITEM(S5P_CLK_SRC0),
-        SAVE_ITEM(S5P_CLK_SRC1),
-        SAVE_ITEM(S5P_CLK_SRC2),
-        SAVE_ITEM(S5P_CLK_SRC3),
-        SAVE_ITEM(S5P_CLK_SRC4),
-        SAVE_ITEM(S5P_CLK_SRC5),
-        SAVE_ITEM(S5P_CLK_SRC6),
-
-        /* Clock source Mask */
-        SAVE_ITEM(S5P_CLK_SRC_MASK0),
-        SAVE_ITEM(S5P_CLK_SRC_MASK1),
-
-        /* Clock Divider */
-        SAVE_ITEM(S5P_CLK_DIV0),
-        SAVE_ITEM(S5P_CLK_DIV1),
-        SAVE_ITEM(S5P_CLK_DIV2),
-        SAVE_ITEM(S5P_CLK_DIV3),
-        SAVE_ITEM(S5P_CLK_DIV4),
-        SAVE_ITEM(S5P_CLK_DIV5),
-        SAVE_ITEM(S5P_CLK_DIV6),
-        SAVE_ITEM(S5P_CLK_DIV7),
-
-        /* Clock Main Gate */
-        SAVE_ITEM(S5P_CLKGATE_MAIN0),
-        SAVE_ITEM(S5P_CLKGATE_MAIN1),
-        SAVE_ITEM(S5P_CLKGATE_MAIN2),
-
-        /* Clock source Peri Gate */
-        SAVE_ITEM(S5P_CLKGATE_PERI0),
-        SAVE_ITEM(S5P_CLKGATE_PERI1),
-
-        /* Clock source SCLK Gate */
-        SAVE_ITEM(S5P_CLKGATE_SCLK0),
-        SAVE_ITEM(S5P_CLKGATE_SCLK1),
-
-        /* Clock IP Clock gate */
-        SAVE_ITEM(S5P_CLKGATE_IP0),
-        SAVE_ITEM(S5P_CLKGATE_IP1),
-        SAVE_ITEM(S5P_CLKGATE_IP2),
-        SAVE_ITEM(S5P_CLKGATE_IP3),
-        SAVE_ITEM(S5P_CLKGATE_IP4),
-
-        /* Clock Blcok and Bus gate */
-        SAVE_ITEM(S5P_CLKGATE_BLOCK),
-        SAVE_ITEM(S5P_CLKGATE_BUS0),
+#include "common.h"
 
+static struct sleep_save s5pv210_core_save[] = {
         /* Clock ETC */
-        SAVE_ITEM(S5P_CLK_OUT),
         SAVE_ITEM(S5P_MDNIE_SEL),
 };
 
+/*
+ * VIC wake-up support (TODO)
+ */
+static u32 s5pv210_irqwake_intmask = 0xffffffff;
+
+/*
+ * Suspend helpers.
+ */
 static int s5pv210_cpu_suspend(unsigned long arg)
 {
         unsigned long tmp;
@@ -102,8 +65,12 @@ static void s5pv210_pm_prepare(void)
 {
         unsigned int tmp;
 
+        /* Set wake-up mask registers */
+        __raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
+        __raw_writel(s5pv210_irqwake_intmask, S5P_WAKEUP_MASK);
+
         /* ensure at least INFORM0 has the resume address */
-        __raw_writel(virt_to_phys(s3c_cpu_resume), S5P_INFORM0);
+        __raw_writel(virt_to_phys(s5pv210_cpu_resume), S5P_INFORM0);
 
         tmp = __raw_readl(S5P_SLEEP_CFG);
         tmp &= ~(S5P_SLEEP_CFG_OSC_EN | S5P_SLEEP_CFG_USBOSC_EN);
@@ -123,26 +90,70 @@ static void s5pv210_pm_prepare(void)
         s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
 }
 
-static int s5pv210_pm_add(struct device *dev, struct subsys_interface *sif)
+/*
+ * Suspend operations.
+ */
+static int s5pv210_suspend_enter(suspend_state_t state)
 {
-        pm_cpu_prep = s5pv210_pm_prepare;
-        pm_cpu_sleep = s5pv210_cpu_suspend;
+        int ret;
+
+        s3c_pm_debug_init();
+
+        S3C_PMDBG("%s: suspending the system...\n", __func__);
+
+        S3C_PMDBG("%s: wakeup masks: %08x,%08x\n", __func__,
+                        s5pv210_irqwake_intmask, exynos_get_eint_wake_mask());
+
+        if (s5pv210_irqwake_intmask == -1U
+            && exynos_get_eint_wake_mask() == -1U) {
+                pr_err("%s: No wake-up sources!\n", __func__);
+                pr_err("%s: Aborting sleep\n", __func__);
+                return -EINVAL;
+        }
+
+        s3c_pm_save_uarts();
+        s5pv210_pm_prepare();
+        flush_cache_all();
+        s3c_pm_check_store();
+
+        ret = cpu_suspend(0, s5pv210_cpu_suspend);
+        if (ret)
+                return ret;
+
+        s3c_pm_restore_uarts();
+
+        S3C_PMDBG("%s: wakeup stat: %08x\n", __func__,
+                        __raw_readl(S5P_WAKEUP_STAT));
+
+        s3c_pm_check_restore();
+
+        S3C_PMDBG("%s: resuming the system...\n", __func__);
 
         return 0;
 }
 
-static struct subsys_interface s5pv210_pm_interface = {
-        .name           = "s5pv210_pm",
-        .subsys         = &s5pv210_subsys,
-        .add_dev        = s5pv210_pm_add,
-};
+static int s5pv210_suspend_prepare(void)
+{
+        s3c_pm_check_prepare();
 
-static __init int s5pv210_pm_drvinit(void)
+        return 0;
+}
+
+static void s5pv210_suspend_finish(void)
 {
-        return subsys_interface_register(&s5pv210_pm_interface);
+        s3c_pm_check_cleanup();
 }
-arch_initcall(s5pv210_pm_drvinit);
 
+static const struct platform_suspend_ops s5pv210_suspend_ops = {
+        .enter          = s5pv210_suspend_enter,
+        .prepare        = s5pv210_suspend_prepare,
+        .finish         = s5pv210_suspend_finish,
+        .valid          = suspend_valid_only_mem,
+};
+
+/*
+ * Syscore operations used to delay restore of certain registers.
+ */
 static void s5pv210_pm_resume(void)
 {
         u32 tmp;
@@ -159,9 +170,11 @@ static struct syscore_ops s5pv210_pm_syscore_ops = {
         .resume         = s5pv210_pm_resume,
 };
 
-static __init int s5pv210_pm_syscore_init(void)
+/*
+ * Initialization entry point.
+ */
+void __init s5pv210_pm_init(void)
 {
         register_syscore_ops(&s5pv210_pm_syscore_ops);
-        return 0;
+        suspend_set_ops(&s5pv210_suspend_ops);
 }
-arch_initcall(s5pv210_pm_syscore_init);
diff --git a/arch/arm/mach-s5pv210/s5pv210.c b/arch/arm/mach-s5pv210/s5pv210.c
new file mode 100644
index 000000000000..53feff33d129
--- /dev/null
+++ b/arch/arm/mach-s5pv210/s5pv210.c
@@ -0,0 +1,77 @@
+/*
+ * Samsung's S5PC110/S5PV210 flattened device tree enabled machine.
+ *
+ * Copyright (c) 2013-2014 Samsung Electronics Co., Ltd.
+ * Mateusz Krawczuk <m.krawczuk@partner.samsung.com>
+ * Tomasz Figa <t.figa@samsung.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/of_fdt.h>
+#include <linux/of_platform.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/system_misc.h>
+
+#include <plat/map-base.h>
+#include <mach/regs-clock.h>
+
+#include "common.h"
+
+static int __init s5pv210_fdt_map_sys(unsigned long node, const char *uname,
+                                        int depth, void *data)
+{
+        struct map_desc iodesc;
+        const __be32 *reg;
+        int len;
+
+        if (!of_flat_dt_is_compatible(node, "samsung,s5pv210-clock"))
+                return 0;
+
+        reg = of_get_flat_dt_prop(node, "reg", &len);
+        if (reg == NULL || len != (sizeof(unsigned long) * 2))
+                return 0;
+
+        iodesc.pfn = __phys_to_pfn(be32_to_cpu(reg[0]));
+        iodesc.length = be32_to_cpu(reg[1]) - 1;
+        iodesc.virtual = (unsigned long)S3C_VA_SYS;
+        iodesc.type = MT_DEVICE;
+        iotable_init(&iodesc, 1);
+
+        return 1;
+}
+
+static void __init s5pv210_dt_map_io(void)
+{
+        debug_ll_io_init();
+
+        of_scan_flat_dt(s5pv210_fdt_map_sys, NULL);
+}
+
+static void s5pv210_dt_restart(enum reboot_mode mode, const char *cmd)
+{
+        __raw_writel(0x1, S5P_SWRESET);
+}
+
+static void __init s5pv210_dt_init_late(void)
+{
+        platform_device_register_simple("s5pv210-cpufreq", -1, NULL, 0);
+        s5pv210_pm_init();
+}
+
+static char const *s5pv210_dt_compat[] __initconst = {
+        "samsung,s5pc110",
+        "samsung,s5pv210",
+        NULL
+};
+
+DT_MACHINE_START(S5PV210_DT, "Samsung S5PC110/S5PV210-based board")
+        .dt_compat = s5pv210_dt_compat,
+        .map_io = s5pv210_dt_map_io,
+        .restart = s5pv210_dt_restart,
+        .init_late = s5pv210_dt_init_late,
+MACHINE_END
diff --git a/arch/arm/mach-s5pv210/setup-fb-24bpp.c b/arch/arm/mach-s5pv210/setup-fb-24bpp.c
deleted file mode 100644
index 55103c8220b3..000000000000
--- a/arch/arm/mach-s5pv210/setup-fb-24bpp.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* linux/arch/arm/plat-s5pv210/setup-fb-24bpp.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Base s5pv210 setup information for 24bpp LCD framebuffer
- *
- * 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/types.h>
-#include <linux/fb.h>
-#include <linux/gpio.h>
-
-#include <mach/map.h>
-#include <plat/fb.h>
-#include <mach/regs-clock.h>
-#include <plat/gpio-cfg.h>
-
-static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
-{
-        s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(2));
-
-        for (; nr > 0; nr--, base++)
-                s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
-}
-
-
-void s5pv210_fb_gpio_setup_24bpp(void)
-{
-        s5pv210_fb_cfg_gpios(S5PV210_GPF0(0), 8);
-        s5pv210_fb_cfg_gpios(S5PV210_GPF1(0), 8);
-        s5pv210_fb_cfg_gpios(S5PV210_GPF2(0), 8);
-        s5pv210_fb_cfg_gpios(S5PV210_GPF3(0), 4);
-
-        /* Set DISPLAY_CONTROL register for Display path selection.
-         *
-         * ouput   |   RGB   |   I80   |   ITU
-         * -----------------------------------
-         *  00     |   MIE   |  FIMD   |  FIMD
-         *  01     | MDNIE   | MDNIE   |  FIMD
-         *  10     |  FIMD   |  FIMD   |  FIMD
-         *  11     |  FIMD   |  FIMD   |  FIMD
-         */
-        writel(0x2, S5P_MDNIE_SEL);
-}
diff --git a/arch/arm/mach-s5pv210/setup-fimc.c b/arch/arm/mach-s5pv210/setup-fimc.c
deleted file mode 100644
index 54cc5b11be0b..000000000000
--- a/arch/arm/mach-s5pv210/setup-fimc.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co., Ltd.
- *
- * S5PV210 camera interface GPIO configuration.
- *
- * 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/gpio.h>
-#include <plat/gpio-cfg.h>
-#include <plat/camport.h>
-
-int s5pv210_fimc_setup_gpio(enum s5p_camport_id id)
-{
-        u32 gpio8, gpio5;
-        int ret;
-
-        switch (id) {
-        case S5P_CAMPORT_A:
-                gpio8 = S5PV210_GPE0(0);
-                gpio5 = S5PV210_GPE1(0);
-                break;
-
-        case S5P_CAMPORT_B:
-                gpio8 = S5PV210_GPJ0(0);
-                gpio5 = S5PV210_GPJ1(0);
-                break;
-
-        default:
-                WARN(1, "Wrong camport id: %d\n", id);
-                return -EINVAL;
-        }
-
-        ret = s3c_gpio_cfgall_range(gpio8, 8, S3C_GPIO_SFN(2),
-                                    S3C_GPIO_PULL_UP);
-        if (ret)
-                return ret;
-
-        return s3c_gpio_cfgall_range(gpio5, 5, S3C_GPIO_SFN(2),
-                                     S3C_GPIO_PULL_UP);
-}
diff --git a/arch/arm/mach-s5pv210/setup-i2c0.c b/arch/arm/mach-s5pv210/setup-i2c0.c
deleted file mode 100644
index 4a15849766c0..000000000000
--- a/arch/arm/mach-s5pv210/setup-i2c0.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-i2c0.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * I2C0 GPIO configuration.
- *
- * Based on plat-s3c64xx/setup-i2c0.c
- *
- * 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/types.h>
-#include <linux/gpio.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/gpio-cfg.h>
-
-void s3c_i2c0_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5PV210_GPD1(0), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
diff --git a/arch/arm/mach-s5pv210/setup-i2c1.c b/arch/arm/mach-s5pv210/setup-i2c1.c
deleted file mode 100644
index 4777f6b97a92..000000000000
--- a/arch/arm/mach-s5pv210/setup-i2c1.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-i2c1.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * I2C1 GPIO configuration.
- *
- * Based on plat-s3c64xx/setup-i2c1.c
- *
- * 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/types.h>
-#include <linux/gpio.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/gpio-cfg.h>
-
-void s3c_i2c1_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5PV210_GPD1(2), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
diff --git a/arch/arm/mach-s5pv210/setup-i2c2.c b/arch/arm/mach-s5pv210/setup-i2c2.c
deleted file mode 100644
index bbce6c74b915..000000000000
--- a/arch/arm/mach-s5pv210/setup-i2c2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-i2c2.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * I2C2 GPIO configuration.
- *
- * Based on plat-s3c64xx/setup-i2c0.c
- *
- * 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/types.h>
-#include <linux/gpio.h>
-
-struct platform_device; /* don't need the contents */
-
-#include <linux/platform_data/i2c-s3c2410.h>
-#include <plat/gpio-cfg.h>
-
-void s3c_i2c2_cfg_gpio(struct platform_device *dev)
-{
-        s3c_gpio_cfgall_range(S5PV210_GPD1(4), 2,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-}
diff --git a/arch/arm/mach-s5pv210/setup-ide.c b/arch/arm/mach-s5pv210/setup-ide.c
deleted file mode 100644
index ea123d546bd2..000000000000
--- a/arch/arm/mach-s5pv210/setup-ide.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-ide.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5PV210 setup information for IDE
- *
- * 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/gpio.h>
-
-#include <plat/gpio-cfg.h>
-
-static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
-{
-        s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(4));
-
-        for (; nr > 0; nr--, base++)
-                s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
-}
-
-void s5pv210_ide_setup_gpio(void)
-{
-        /* CF_Add[0 - 2], CF_IORDY, CF_INTRQ, CF_DMARQ, CF_DMARST, CF_DMACK */
-        s5pv210_ide_cfg_gpios(S5PV210_GPJ0(0), 8);
-
-        /* CF_Data[0 - 7] */
-        s5pv210_ide_cfg_gpios(S5PV210_GPJ2(0), 8);
-
-        /* CF_Data[8 - 15] */
-        s5pv210_ide_cfg_gpios(S5PV210_GPJ3(0), 8);
-
-        /* CF_CS0, CF_CS1, CF_IORD, CF_IOWR */
-        s5pv210_ide_cfg_gpios(S5PV210_GPJ4(0), 4);
-}
diff --git a/arch/arm/mach-s5pv210/setup-keypad.c b/arch/arm/mach-s5pv210/setup-keypad.c
deleted file mode 100644
index c56420a52f48..000000000000
--- a/arch/arm/mach-s5pv210/setup-keypad.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * linux/arch/arm/mach-s5pv210/setup-keypad.c
- *
- * Copyright (C) 2010 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.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/gpio.h>
-#include <plat/gpio-cfg.h>
-
-void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
-{
-        /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */
-        s3c_gpio_cfgrange_nopull(S5PV210_GPH3(0), rows, S3C_GPIO_SFN(3));
-
-        /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */
-        s3c_gpio_cfgrange_nopull(S5PV210_GPH2(0), cols, S3C_GPIO_SFN(3));
-}
diff --git a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c b/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
deleted file mode 100644
index 0512ada00522..000000000000
--- a/arch/arm/mach-s5pv210/setup-sdhci-gpio.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* linux/arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
- *
- * 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/types.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/card.h>
-
-#include <plat/gpio-cfg.h>
-#include <plat/sdhci.h>
-
-void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
-{
-        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-        /* Set all the necessary GPG0/GPG1 pins to special-function 2 */
-        s3c_gpio_cfgrange_nopull(S5PV210_GPG0(0), 2, S3C_GPIO_SFN(2));
-
-        switch (width) {
-        case 8:
-                /* GPG1[3:6] special-function 3 */
-                s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3));
-        case 4:
-                /* GPG0[3:6] special-function 2 */
-                s3c_gpio_cfgrange_nopull(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2));
-        default:
-                break;
-        }
-
-        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-                s3c_gpio_setpull(S5PV210_GPG0(2), S3C_GPIO_PULL_UP);
-                s3c_gpio_cfgpin(S5PV210_GPG0(2), S3C_GPIO_SFN(2));
-        }
-}
-
-void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
-{
-        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-        /* Set all the necessary GPG1[0:1] pins to special-function 2 */
-        s3c_gpio_cfgrange_nopull(S5PV210_GPG1(0), 2, S3C_GPIO_SFN(2));
-
-        /* Data pin GPG1[3:6] to special-function 2 */
-        s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(2));
-
-        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-                s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
-                s3c_gpio_cfgpin(S5PV210_GPG1(2), S3C_GPIO_SFN(2));
-        }
-}
-
-void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
-{
-        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-        /* Set all the necessary GPG2[0:1] pins to special-function 2 */
-        s3c_gpio_cfgrange_nopull(S5PV210_GPG2(0), 2, S3C_GPIO_SFN(2));
-
-        switch (width) {
-        case 8:
-                /* Data pin GPG3[3:6] to special-function 3 */
-                s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(3));
-        case 4:
-                /* Data pin GPG2[3:6] to special-function 2 */
-                s3c_gpio_cfgrange_nopull(S5PV210_GPG2(3), 4, S3C_GPIO_SFN(2));
-        default:
-                break;
-        }
-
-        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-                s3c_gpio_setpull(S5PV210_GPG2(2), S3C_GPIO_PULL_UP);
-                s3c_gpio_cfgpin(S5PV210_GPG2(2), S3C_GPIO_SFN(2));
-        }
-}
-
-void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
-{
-        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
-
-        /* Set all the necessary GPG3[0:1] pins to special-function 2 */
-        s3c_gpio_cfgrange_nopull(S5PV210_GPG3(0), 2, S3C_GPIO_SFN(2));
-
-        /* Data pin GPG3[3:6] to special-function 2 */
-        s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(2));
-
-        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
-                s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);
-                s3c_gpio_cfgpin(S5PV210_GPG3(2), S3C_GPIO_SFN(2));
-        }
-}
diff --git a/arch/arm/mach-s5pv210/setup-spi.c b/arch/arm/mach-s5pv210/setup-spi.c
deleted file mode 100644
index 81aecc162f82..000000000000
--- a/arch/arm/mach-s5pv210/setup-spi.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-spi.c
- *
- * Copyright (C) 2011 Samsung Electronics Ltd.
- *              http://www.samsung.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/gpio.h>
-#include <plat/gpio-cfg.h>
-
-#ifdef CONFIG_S3C64XX_DEV_SPI0
-int s3c64xx_spi0_cfg_gpio(void)
-{
-        s3c_gpio_cfgpin(S5PV210_GPB(0), S3C_GPIO_SFN(2));
-        s3c_gpio_setpull(S5PV210_GPB(0), S3C_GPIO_PULL_UP);
-        s3c_gpio_cfgall_range(S5PV210_GPB(2), 2,
-                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-        return 0;
-}
-#endif
-
-#ifdef CONFIG_S3C64XX_DEV_SPI1
-int s3c64xx_spi1_cfg_gpio(void)
-{
-        s3c_gpio_cfgpin(S5PV210_GPB(4), S3C_GPIO_SFN(2));
-        s3c_gpio_setpull(S5PV210_GPB(4), S3C_GPIO_PULL_UP);
-        s3c_gpio_cfgall_range(S5PV210_GPB(6), 2,
-                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-        return 0;
-}
-#endif
diff --git a/arch/arm/mach-s5pv210/setup-usb-phy.c b/arch/arm/mach-s5pv210/setup-usb-phy.c
deleted file mode 100644
index b2ee5333f89c..000000000000
--- a/arch/arm/mach-s5pv210/setup-usb-phy.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.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 Foundationr
- */
-
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-
-#include <mach/map.h>
-
-#include <plat/cpu.h>
-#include <plat/regs-usb-hsotg-phy.h>
-#include <plat/usb-phy.h>
-
-#define S5PV210_USB_PHY_CON     (S3C_VA_SYS + 0xE80C)
-#define S5PV210_USB_PHY0_EN     (1 << 0)
-#define S5PV210_USB_PHY1_EN     (1 << 1)
-
-static int s5pv210_usb_otgphy_init(struct platform_device *pdev)
-{
-        struct clk *xusbxti;
-        u32 phyclk;
-
-        writel(readl(S5PV210_USB_PHY_CON) | S5PV210_USB_PHY0_EN,
-                        S5PV210_USB_PHY_CON);
-
-        /* set clock frequency for PLL */
-        phyclk = readl(S3C_PHYCLK) & ~S3C_PHYCLK_CLKSEL_MASK;
-
-        xusbxti = clk_get(&pdev->dev, "xusbxti");
-        if (xusbxti && !IS_ERR(xusbxti)) {
-                switch (clk_get_rate(xusbxti)) {
-                case 12 * MHZ:
-                        phyclk |= S3C_PHYCLK_CLKSEL_12M;
-                        break;
-                case 24 * MHZ:
-                        phyclk |= S3C_PHYCLK_CLKSEL_24M;
-                        break;
-                default:
-                case 48 * MHZ:
-                        /* default reference clock */
-                        break;
-                }
-                clk_put(xusbxti);
-        }
-
-        /* TODO: select external clock/oscillator */
-        writel(phyclk | S3C_PHYCLK_CLK_FORCE, S3C_PHYCLK);
-
-        /* set to normal OTG PHY */
-        writel((readl(S3C_PHYPWR) & ~S3C_PHYPWR_NORMAL_MASK), S3C_PHYPWR);
-        mdelay(1);
-
-        /* reset OTG PHY and Link */
-        writel(S3C_RSTCON_PHY | S3C_RSTCON_HCLK | S3C_RSTCON_PHYCLK,
-                        S3C_RSTCON);
-        udelay(20);     /* at-least 10uS */
-        writel(0, S3C_RSTCON);
-
-        return 0;
-}
-
-static int s5pv210_usb_otgphy_exit(struct platform_device *pdev)
-{
-        writel((readl(S3C_PHYPWR) | S3C_PHYPWR_ANALOG_POWERDOWN |
-                                S3C_PHYPWR_OTG_DISABLE), S3C_PHYPWR);
-
-        writel(readl(S5PV210_USB_PHY_CON) & ~S5PV210_USB_PHY0_EN,
-                        S5PV210_USB_PHY_CON);
-
-        return 0;
-}
-
-int s5p_usb_phy_init(struct platform_device *pdev, int type)
-{
-        if (type == USB_PHY_TYPE_DEVICE)
-                return s5pv210_usb_otgphy_init(pdev);
-
-        return -EINVAL;
-}
-
-int s5p_usb_phy_exit(struct platform_device *pdev, int type)
-{
-        if (type == USB_PHY_TYPE_DEVICE)
-                return s5pv210_usb_otgphy_exit(pdev);
-
-        return -EINVAL;
-}
diff --git a/arch/arm/plat-samsung/s5p-sleep.S b/arch/arm/mach-s5pv210/sleep.S
index 25c68ceb9e2b..7c43ddd33ba8 100644
--- a/arch/arm/plat-samsung/s5p-sleep.S
+++ b/arch/arm/mach-s5pv210/sleep.S
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
  *              http://www.samsung.com
  *
- * Common S5P Sleep Code
+ * S5PV210 Sleep Code
  * Based on S3C64XX sleep code by:
  *      Ben Dooks, (c) 2008 Simtec Electronics
  *
@@ -10,16 +10,7 @@
  * 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/linkage.h>
 
@@ -40,6 +31,6 @@
          * resume code entry for bootloader to call
          */
 
-ENTRY(s3c_cpu_resume)
+ENTRY(s5pv210_cpu_resume)
         b       cpu_resume
-ENDPROC(s3c_cpu_resume)
+ENDPROC(s5pv210_cpu_resume)
diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h
index 12d376795abc..2054051eb797 100644
--- a/arch/arm/mach-sa1100/include/mach/memory.h
+++ b/arch/arm/mach-sa1100/include/mach/memory.h
@@ -10,11 +10,6 @@
 #include <asm/sizes.h>
 
 /*
- * Physical DRAM offset is 0xc0000000 on the SA1100
- */
-#define PLAT_PHYS_OFFSET        UL(0xc0000000)
-
-/*
  * Because of the wide memory address space between physical RAM banks on the
  * SA1100, it's much convenient to use Linux's SparseMEM support to implement
  * our memory map representation.  Assuming all memory nodes have equal access
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 798073057e51..e15dff790dbb 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -12,6 +12,7 @@ menuconfig ARCH_SHMOBILE_MULTI
         select NO_IOPORT_MAP
         select PINCTRL
         select ARCH_REQUIRE_GPIOLIB
+        select ARCH_HAS_OPP
 
 if ARCH_SHMOBILE_MULTI
 
@@ -25,6 +26,11 @@ config ARCH_R7S72100
         bool "RZ/A1H (R7S72100)"
         select SYS_SUPPORTS_SH_MTU2
 
+config ARCH_R8A7779
+        bool "R-Car H1 (R8A77790)"
+        select RENESAS_INTC_IRQPIN
+        select SYS_SUPPORTS_SH_TMU
+
 config ARCH_R8A7790
         bool "R-Car H2 (R8A77900)"
         select RENESAS_IRQC
@@ -51,6 +57,11 @@ config MACH_LAGER
         depends on ARCH_R8A7790
         select MICREL_PHY if SH_ETH
 
+config MACH_MARZEN
+        bool "MARZEN board"
+        depends on ARCH_R8A7779
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+
 comment "Renesas ARM SoCs System Configuration"
 endif
 
@@ -85,7 +96,6 @@ config ARCH_R8A73A4
         select CPU_V7
         select SH_CLK_CPG
         select RENESAS_IRQC
-        select ARCH_HAS_OPP
         select SYS_SUPPORTS_SH_CMT
         select SYS_SUPPORTS_SH_TMU
 
@@ -234,19 +244,6 @@ config MACH_MARZEN
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select USE_OF
 
-config MACH_MARZEN_REFERENCE
-        bool "MARZEN board - Reference Device Tree Implementation"
-        depends on ARCH_R8A7779
-        select ARCH_REQUIRE_GPIOLIB
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        select USE_OF
-        ---help---
-           Use reference implementation of Marzen 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_LAGER
         bool "Lager board"
         depends on ARCH_R8A7790
@@ -263,7 +260,6 @@ config MACH_KOELSCH
 config MACH_KZM9G
         bool "KZM-A9-GT board"
         depends on ARCH_SH73A0
-        select ARCH_HAS_OPP
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select SND_SOC_AK4642 if SND_SIMPLE_CARD
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 38d5fe825e93..fe3878a1a69a 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -34,31 +34,39 @@ obj-$(CONFIG_ARCH_R8A7791)	+= clock-r8a7791.o
 obj-$(CONFIG_ARCH_R7S72100)     += clock-r7s72100.o
 endif
 
+# CPU reset vector handling objects
+cpu-y                           := platsmp.o headsmp.o
+cpu-$(CONFIG_ARCH_R8A7790)      += platsmp-apmu.o
+cpu-$(CONFIG_ARCH_R8A7791)      += platsmp-apmu.o
+
 # SMP objects
-smp-y                           := platsmp.o headsmp.o
+smp-y                           := $(cpu-y)
 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_R8A7790)      += smp-r8a7790.o platsmp-apmu.o
-smp-$(CONFIG_ARCH_R8A7791)      += smp-r8a7791.o platsmp-apmu.o
+smp-$(CONFIG_ARCH_R8A7790)      += smp-r8a7790.o
+smp-$(CONFIG_ARCH_R8A7791)      += smp-r8a7791.o
 smp-$(CONFIG_ARCH_EMEV2)        += smp-emev2.o headsmp-scu.o platsmp-scu.o
 
-# IRQ objects
-obj-$(CONFIG_ARCH_SH7372)       += entry-intc.o
-
 # PM objects
 obj-$(CONFIG_SUSPEND)           += suspend.o
 obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
+obj-$(CONFIG_CPU_FREQ)          += cpufreq.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 pm-rcar.o
-obj-$(CONFIG_ARCH_R8A7790)      += pm-r8a7790.o pm-rcar.o
+obj-$(CONFIG_ARCH_R8A7790)      += pm-r8a7790.o pm-rcar.o $(cpu-y)
+obj-$(CONFIG_ARCH_R8A7791)      += pm-r8a7791.o pm-rcar.o $(cpu-y)
+
+# IRQ objects
+obj-$(CONFIG_ARCH_SH7372)       += entry-intc.o
 
 # Board objects
 ifdef CONFIG_ARCH_SHMOBILE_MULTI
 obj-$(CONFIG_MACH_GENMAI)       += board-genmai-reference.o
 obj-$(CONFIG_MACH_KOELSCH)      += board-koelsch-reference.o
 obj-$(CONFIG_MACH_LAGER)        += board-lager-reference.o
+obj-$(CONFIG_MACH_MARZEN)       += board-marzen-reference.o
 else
 obj-$(CONFIG_MACH_APE6EVM)      += board-ape6evm.o
 obj-$(CONFIG_MACH_APE6EVM_REFERENCE)    += board-ape6evm-reference.o
@@ -67,7 +75,6 @@ obj-$(CONFIG_MACH_BOCKW)	+= board-bockw.o
 obj-$(CONFIG_MACH_BOCKW_REFERENCE)      += board-bockw-reference.o
 obj-$(CONFIG_MACH_GENMAI)       += board-genmai.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_ARMADILLO800EVA)      += board-armadillo800eva.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)    += board-armadillo800eva-reference.o
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
index 918fccffa1b6..ebf97d4bcfd8 100644
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@ -13,7 +13,6 @@ loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
 loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000
 loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000
 loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
-loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000
 
 __ZRELADDR      := $(sort $(loadaddr-y))
    zreladdr-y   += $(__ZRELADDR)
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c
index 3276afcf3cc9..2f7723e5fe91 100644
--- a/arch/arm/mach-shmobile/board-ape6evm-reference.c
+++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c
@@ -24,11 +24,13 @@
 #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>
 
+#include "common.h"
+#include "r8a73a4.h"
+
 static void __init ape6evm_add_standard_devices(void)
 {
 
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index fe071a9130b7..1585b8830b13 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -33,12 +33,14 @@
 #include <linux/regulator/machine.h>
 #include <linux/sh_clk.h>
 #include <linux/smsc911x.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r8a73a4.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r8a73a4.h"
+
 /* LEDS */
 static struct gpio_led ape6evm_leds[] = {
         {
@@ -248,29 +250,29 @@ static void __init ape6evm_add_standard_devices(void)
 
         regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
 
-        platform_device_register_resndata(&platform_bus, "smsc911x", -1,
+        platform_device_register_resndata(NULL, "smsc911x", -1,
                                           lan9220_res, ARRAY_SIZE(lan9220_res),
                                           &lan9220_data, sizeof(lan9220_data));
 
         regulator_register_always_on(1, "MMC0 Vcc", vcc_mmc0_consumers,
                                      ARRAY_SIZE(vcc_mmc0_consumers), 2800000);
-        platform_device_register_resndata(&platform_bus, "sh_mmcif", 0,
+        platform_device_register_resndata(NULL, "sh_mmcif", 0,
                                           mmcif0_resources, ARRAY_SIZE(mmcif0_resources),
                                           &mmcif0_pdata, sizeof(mmcif0_pdata));
-        platform_device_register_data(&platform_bus, "reg-fixed-voltage", 2,
+        platform_device_register_data(NULL, "reg-fixed-voltage", 2,
                                       &vcc_sdhi0_info, sizeof(vcc_sdhi0_info));
-        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0,
+        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 0,
                                           sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
                                           &sdhi0_pdata, sizeof(sdhi0_pdata));
         regulator_register_always_on(3, "SDHI1 Vcc", vcc_sdhi1_consumers,
                                      ARRAY_SIZE(vcc_sdhi1_consumers), 3300000);
-        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 1,
+        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 1,
                                           sdhi1_resources, ARRAY_SIZE(sdhi1_resources),
                                           &sdhi1_pdata, sizeof(sdhi1_pdata));
-        platform_device_register_data(&platform_bus, "gpio-keys", -1,
+        platform_device_register_data(NULL, "gpio-keys", -1,
                                       &ape6evm_keys_pdata,
                                       sizeof(ape6evm_keys_pdata));
-        platform_device_register_data(&platform_bus, "leds-gpio", -1,
+        platform_device_register_data(NULL, "leds-gpio", -1,
                                       &ape6evm_leds_pdata,
                                       sizeof(ape6evm_leds_pdata));
 }
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
index f660fbb96e0b..84bc6cb6d5aa 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
@@ -24,11 +24,13 @@
 #include <linux/kernel.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
-#include <mach/common.h>
-#include <mach/r8a7740.h>
+
 #include <asm/mach/arch.h>
 #include <asm/hardware/cache-l2x0.h>
 
+#include "common.h"
+#include "r8a7740.h"
+
 /*
  * CON1         Camera Module
  * CON2         Extension Bus
@@ -53,11 +55,11 @@
  * CON22        Serial
  * CON23        LAN
  * CON24        USB3
- * LED1         Camera LED(Yellow)
+ * LED1         Camera LED (Yellow)
  * LED2         Power LED (Green)
- * ED3-LED6     User LED(Yellow)
- * LED7         LAN link LED(Green)
- * LED8         LAN activity LED(Yellow)
+ * LED3-LED6    User LED (Yellow)
+ * LED7         LAN link LED (Green)
+ * LED8         LAN activity LED (Yellow)
  */
 
 /*
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 30fcac73a540..6dbaad611a92 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -45,9 +45,7 @@
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/i2c-gpio.h>
 #include <linux/reboot.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r8a7740.h>
+
 #include <media/mt9t112.h>
 #include <media/sh_mobile_ceu.h>
 #include <media/soc_camera.h>
@@ -62,6 +60,10 @@
 #include <sound/sh_fsi.h>
 #include <sound/simple_card.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "pm-rmobile.h"
+#include "r8a7740.h"
 #include "sh-gpio.h"
 
 /*
@@ -578,6 +580,40 @@ static struct platform_device hdmi_lcdc_device = {
         },
 };
 
+/* LEDS */
+static struct gpio_led gpio_leds[] = {
+        {
+                .name           = "LED3",
+                .gpio           = 102,
+                .default_state  = LEDS_GPIO_DEFSTATE_ON,
+        }, {
+                .name           = "LED4",
+                .gpio           = 111,
+                .default_state  = LEDS_GPIO_DEFSTATE_ON,
+        }, {
+                .name           = "LED5",
+                .gpio           = 110,
+                .default_state  = LEDS_GPIO_DEFSTATE_ON,
+        }, {
+                .name           = "LED6",
+                .gpio           = 177,
+                .default_state  = LEDS_GPIO_DEFSTATE_ON,
+        },
+};
+
+static struct gpio_led_platform_data leds_gpio_info = {
+        .leds           = gpio_leds,
+        .num_leds       = ARRAY_SIZE(gpio_leds),
+};
+
+static struct platform_device leds_gpio_device = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &leds_gpio_info,
+        },
+};
+
 /* GPIO KEY */
 #define GPIO_KEY(c, g, d, ...) \
         { .code = c, .gpio = g, .desc = d, .active_low = 1, __VA_ARGS__ }
@@ -998,6 +1034,8 @@ static struct platform_device fsi_wm8978_device = {
         .id     = 0,
         .dev    = {
                 .platform_data  = &fsi_wm8978_info,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
+                .dma_mask = &fsi_wm8978_device.dev.coherent_dma_mask,
         },
 };
 
@@ -1021,6 +1059,8 @@ static struct platform_device fsi_hdmi_device = {
         .id     = 1,
         .dev    = {
                 .platform_data  = &fsi2_hdmi_info,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
+                .dma_mask = &fsi_hdmi_device.dev.coherent_dma_mask,
         },
 };
 
@@ -1069,6 +1109,7 @@ static struct platform_device *eva_devices[] __initdata = {
         &lcdc0_device,
         &pwm_device,
         &pwm_backlight_device,
+        &leds_gpio_device,
         &gpio_keys_device,
         &sh_eth_device,
         &vcc_sdhi0,
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
index 027373f8de82..ba840cd333b9 100644
--- a/arch/arm/mach-shmobile/board-bockw-reference.c
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -19,10 +19,12 @@
  */
 
 #include <linux/of_platform.h>
-#include <mach/common.h>
-#include <mach/r8a7778.h>
+
 #include <asm/mach/arch.h>
 
+#include "common.h"
+#include "r8a7778.h"
+
 /*
  *      see board-bock.c for checking detail of dip-switch
  */
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index f444be2f241e..8a83eb39d3f1 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -34,14 +34,16 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb/renesas_usbhs.h>
+
 #include <media/soc_camera.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r8a7778.h>
 #include <asm/mach/arch.h>
 #include <sound/rcar_snd.h>
 #include <sound/simple_card.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r8a7778.h"
+
 #define FPGA    0x18200000
 #define IRQ0MR  0x30
 #define COMCTLR 0x101c
@@ -177,7 +179,7 @@ static struct renesas_usbhs_platform_info usbhs_info __initdata = {
 #define USB1_DEVICE     "renesas_usbhs"
 #define ADD_USB_FUNC_DEVICE_IF_POSSIBLE()                       \
         platform_device_register_resndata(                      \
-                &platform_bus, "renesas_usbhs", -1,             \
+                NULL, "renesas_usbhs", -1,                      \
                 usbhsf_resources,                               \
                 ARRAY_SIZE(usbhsf_resources),                   \
                 &usbhs_info, sizeof(struct renesas_usbhs_platform_info))
@@ -236,7 +238,6 @@ static struct sh_eth_plat_data ether_platform_data __initdata = {
 };
 
 static struct platform_device_info ether_info __initdata = {
-        .parent         = &platform_bus,
         .name           = "r8a777x-ether",
         .id             = -1,
         .res            = ether_resources,
@@ -322,7 +323,6 @@ static struct resource vin##idx##_resources[] __initdata = {		\
 };                                                                      \
                                                                         \
 static struct platform_device_info vin##idx##_info __initdata = {       \
-        .parent         = &platform_bus,                                \
         .name           = "r8a7778-vin",                                \
         .id             = idx,                                          \
         .res            = vin##idx##_resources,                         \
@@ -621,10 +621,10 @@ static void __init bockw_init(void)
         /* VIN1 has a pin conflict with Ether */
         if (!IS_ENABLED(CONFIG_SH_ETH))
                 platform_device_register_full(&vin1_info);
-        platform_device_register_data(&platform_bus, "soc-camera-pdrv", 0,
+        platform_device_register_data(NULL, "soc-camera-pdrv", 0,
                                       &iclink0_ml86v7667,
                                       sizeof(iclink0_ml86v7667));
-        platform_device_register_data(&platform_bus, "soc-camera-pdrv", 1,
+        platform_device_register_data(NULL, "soc-camera-pdrv", 1,
                                       &iclink1_ml86v7667,
                                       sizeof(iclink1_ml86v7667));
 
@@ -637,12 +637,12 @@ static void __init bockw_init(void)
         r8a7778_pinmux_init();
 
         platform_device_register_resndata(
-                &platform_bus, "sh_mmcif", -1,
+                NULL, "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,
+                NULL, "rcar_usb_phy", -1,
                 usb_phy_resources,
                 ARRAY_SIZE(usb_phy_resources),
                 &usb_phy_platform_data,
@@ -668,7 +668,7 @@ static void __init bockw_init(void)
                 iowrite16(val, fpga + IRQ0MR);
 
                 platform_device_register_resndata(
-                        &platform_bus, "smsc911x", -1,
+                        NULL, "smsc911x", -1,
                         smsc911x_resources, ARRAY_SIZE(smsc911x_resources),
                         &smsc911x_data, sizeof(smsc911x_data));
         }
@@ -685,7 +685,7 @@ static void __init bockw_init(void)
                 iounmap(base);
 
                 platform_device_register_resndata(
-                        &platform_bus, "sh_mobile_sdhi", 0,
+                        NULL, "sh_mobile_sdhi", 0,
                         sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
                         &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
         }
@@ -700,7 +700,7 @@ static void __init bockw_init(void)
                 "ak4554-adc-dac", 1, NULL, 0);
 
         pdev = platform_device_register_resndata(
-                &platform_bus, "rcar_sound", -1,
+                NULL, "rcar_sound", -1,
                 rsnd_resources, ARRAY_SIZE(rsnd_resources),
                 &rsnd_info, sizeof(rsnd_info));
 
@@ -710,7 +710,6 @@ static void __init bockw_init(void)
 
         for (i = 0; i < ARRAY_SIZE(rsnd_card_info); i++) {
                 struct platform_device_info cardinfo = {
-                        .parent         = &platform_bus,
                         .name           = "asoc-simple-card",
                         .id             = i,
                         .data           = &rsnd_card_info[i],
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index 2ff6ad6e608e..e5448f7b868a 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -20,12 +20,14 @@
 
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/r7s72100.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+#include "clock.h"
+#include "common.h"
+#include "r7s72100.h"
+
 /*
  * This is a really crude hack to provide clkdev support to platform
  * devices until they get moved to DT.
@@ -47,7 +49,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
 };
 
 DT_MACHINE_START(GENMAI_DT, "genmai")
-        .init_early     = r7s72100_init_early,
+        .init_early     = shmobile_init_delay,
         .init_machine   = genmai_add_standard_devices,
         .dt_compat      = genmai_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c
index c94201ee8596..7bf2d8057535 100644
--- a/arch/arm/mach-shmobile/board-genmai.c
+++ b/arch/arm/mach-shmobile/board-genmai.c
@@ -25,12 +25,14 @@
 #include <linux/sh_eth.h>
 #include <linux/spi/rspi.h>
 #include <linux/spi/spi.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r7s72100.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r7s72100.h"
+
 /* Ether */
 static const struct sh_eth_plat_data ether_pdata __initconst = {
         .phy                    = 0x00, /* PD60610 */
@@ -46,7 +48,6 @@ static const struct resource ether_resources[] __initconst = {
 };
 
 static const struct platform_device_info ether_info __initconst = {
-        .parent         = &platform_bus,
         .name           = "r7s72100-ether",
         .id             = -1,
         .res            = ether_resources,
@@ -76,7 +77,7 @@ static const struct rspi_plat_data rspi_pdata __initconst = {
 };
 
 #define r7s72100_register_rspi(idx)                                        \
-        platform_device_register_resndata(&platform_bus, "rspi-rz", idx,   \
+        platform_device_register_resndata(NULL, "rspi-rz", idx,            \
                                         rspi##idx##_resources,             \
                                         ARRAY_SIZE(rspi##idx##_resources), \
                                         &rspi_pdata, sizeof(rspi_pdata))
@@ -118,7 +119,7 @@ R7S72100_SCIF(6, 0xe800a000, gic_iid(245));
 R7S72100_SCIF(7, 0xe800a800, gic_iid(249));
 
 #define r7s72100_register_scif(index)                                          \
-        platform_device_register_resndata(&platform_bus, "sh-sci", index,      \
+        platform_device_register_resndata(NULL, "sh-sci", index,               \
                                           scif##index##_resources,             \
                                           ARRAY_SIZE(scif##index##_resources), \
                                           &scif##index##_platform_data,        \
@@ -154,7 +155,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
 };
 
 DT_MACHINE_START(GENMAI_DT, "genmai")
-        .init_early     = r7s72100_init_early,
+        .init_early     = shmobile_init_delay,
         .init_machine   = genmai_add_standard_devices,
         .dt_compat      = genmai_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index d322a162b4b0..3ff88c138896 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -23,13 +23,15 @@
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/rcar-du.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/rcar-gen2.h>
-#include <mach/r8a7791.h>
+
 #include <asm/mach/arch.h>
 
+#include "clock.h"
+#include "common.h"
+#include "irqs.h"
+#include "r8a7791.h"
+#include "rcar-gen2.h"
+
 /* DU */
 static struct rcar_du_encoder_data koelsch_du_encoders[] = {
         {
@@ -92,24 +94,9 @@ static const struct clk_name clk_names[] __initconst = {
         { "lvds0", "lvds.0", "rcar-du-r8a7791" },
 };
 
-/*
- * This is a really crude hack to work around core platform clock issues
- */
-static const struct clk_name clk_enables[] __initconst = {
-        { "ether", NULL, "ee700000.ethernet" },
-        { "i2c2", NULL, "e6530000.i2c" },
-        { "msiof0", NULL, "e6e20000.spi" },
-        { "qspi_mod", NULL, "e6b10000.spi" },
-        { "sdhi0", NULL, "ee100000.sd" },
-        { "sdhi1", NULL, "ee140000.sd" },
-        { "sdhi2", NULL, "ee160000.sd" },
-        { "thermal", NULL, "e61f0000.thermal" },
-};
-
 static void __init koelsch_add_standard_devices(void)
 {
         shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
-        shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
         r8a7791_add_dt_devices();
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
@@ -128,5 +115,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch")
         .init_time      = rcar_gen2_timer_init,
         .init_machine   = koelsch_add_standard_devices,
         .init_late      = shmobile_init_late,
+        .reserve        = rcar_gen2_reserve,
         .dt_compat      = koelsch_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
index c6c68892caa3..b7d5bc7659cd 100644
--- a/arch/arm/mach-shmobile/board-koelsch.c
+++ b/arch/arm/mach-shmobile/board-koelsch.c
@@ -45,13 +45,15 @@
 #include <linux/spi/flash.h>
 #include <linux/spi/rspi.h>
 #include <linux/spi/spi.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r8a7791.h"
+#include "rcar-gen2.h"
+
 /* DU */
 static struct rcar_du_encoder_data koelsch_du_encoders[] = {
         {
@@ -118,7 +120,6 @@ static const struct resource ether_resources[] __initconst = {
 };
 
 static const struct platform_device_info ether_info __initconst = {
-        .parent         = &platform_bus,
         .name           = "r8a7791-ether",
         .id             = -1,
         .res            = ether_resources,
@@ -230,7 +231,6 @@ static const struct resource sata0_resources[] __initconst = {
 };
 
 static const struct platform_device_info sata0_info __initconst = {
-        .parent         = &platform_bus,
         .name           = "sata-r8a7791",
         .id             = 0,
         .res            = sata0_resources,
@@ -439,13 +439,13 @@ static void __init koelsch_add_standard_devices(void)
         r8a7791_pinmux_init();
         r8a7791_add_standard_devices();
         platform_device_register_full(&ether_info);
-        platform_device_register_data(&platform_bus, "leds-gpio", -1,
+        platform_device_register_data(NULL, "leds-gpio", -1,
                                       &koelsch_leds_pdata,
                                       sizeof(koelsch_leds_pdata));
-        platform_device_register_data(&platform_bus, "gpio-keys", -1,
+        platform_device_register_data(NULL, "gpio-keys", -1,
                                       &koelsch_keys_pdata,
                                       sizeof(koelsch_keys_pdata));
-        platform_device_register_resndata(&platform_bus, "qspi", 0,
+        platform_device_register_resndata(NULL, "qspi", 0,
                                           qspi_resources,
                                           ARRAY_SIZE(qspi_resources),
                                           &qspi_pdata, sizeof(qspi_pdata));
@@ -460,28 +460,28 @@ static void __init koelsch_add_standard_devices(void)
         koelsch_add_i2c(4);
         koelsch_add_i2c(5);
 
-        platform_device_register_data(&platform_bus, "reg-fixed-voltage", 0,
+        platform_device_register_data(NULL, "reg-fixed-voltage", 0,
                                       &vcc_sdhi0_info, sizeof(struct fixed_voltage_config));
-        platform_device_register_data(&platform_bus, "reg-fixed-voltage", 1,
+        platform_device_register_data(NULL, "reg-fixed-voltage", 1,
                                       &vcc_sdhi1_info, sizeof(struct fixed_voltage_config));
-        platform_device_register_data(&platform_bus, "reg-fixed-voltage", 2,
+        platform_device_register_data(NULL, "reg-fixed-voltage", 2,
                                       &vcc_sdhi2_info, sizeof(struct fixed_voltage_config));
-        platform_device_register_data(&platform_bus, "gpio-regulator", 0,
+        platform_device_register_data(NULL, "gpio-regulator", 0,
                                       &vccq_sdhi0_info, sizeof(struct gpio_regulator_config));
-        platform_device_register_data(&platform_bus, "gpio-regulator", 1,
+        platform_device_register_data(NULL, "gpio-regulator", 1,
                                       &vccq_sdhi1_info, sizeof(struct gpio_regulator_config));
-        platform_device_register_data(&platform_bus, "gpio-regulator", 2,
+        platform_device_register_data(NULL, "gpio-regulator", 2,
                                       &vccq_sdhi2_info, sizeof(struct gpio_regulator_config));
 
-        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0,
+        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 0,
                                           sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
                                           &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
 
-        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 1,
+        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 1,
                                           sdhi1_resources, ARRAY_SIZE(sdhi1_resources),
                                           &sdhi1_info, sizeof(struct sh_mobile_sdhi_info));
 
-        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 2,
+        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 2,
                                           sdhi2_resources, ARRAY_SIZE(sdhi2_resources),
                                           &sdhi2_info, sizeof(struct sh_mobile_sdhi_info));
 
@@ -526,5 +526,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch")
         .init_time      = rcar_gen2_timer_init,
         .init_machine   = koelsch_init,
         .init_late      = shmobile_init_late,
+        .reserve        = rcar_gen2_reserve,
         .dt_compat      = koelsch_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index a735a1d80c28..5d2621f202d1 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -25,12 +25,14 @@
 #include <linux/irq.h>
 #include <linux/input.h>
 #include <linux/of_platform.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>
 
+#include "common.h"
+#include "sh73a0.h"
+
 static void __init kzm_init(void)
 {
         sh73a0_add_standard_devices_dt();
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index f94ec8ca42c1..f8bc7f8f86ad 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -41,16 +41,18 @@
 #include <linux/usb/r8a66597.h>
 #include <linux/usb/renesas_usbhs.h>
 #include <linux/videodev2.h>
+
 #include <sound/sh_fsi.h>
 #include <sound/simple_card.h>
-#include <mach/irqs.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>
 #include <video/sh_mobile_lcdc.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "sh73a0.h"
+
 /*
  * external GPIO
  */
@@ -603,6 +605,8 @@ static struct platform_device fsi_ak4648_device = {
         .name   = "asoc-simple-card",
         .dev    = {
                 .platform_data  = &fsi2_ak4648_info,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
+                .dma_mask = &fsi_ak4648_device.dev.coherent_dma_mask,
         },
 };
 
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 749832e3f33c..41c808e56005 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -22,13 +22,15 @@
 #include <linux/init.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/rcar-du.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/rcar-gen2.h>
-#include <mach/r8a7790.h>
+
 #include <asm/mach/arch.h>
 
+#include "clock.h"
+#include "common.h"
+#include "irqs.h"
+#include "r8a7790.h"
+#include "rcar-gen2.h"
+
 /* DU */
 static struct rcar_du_encoder_data lager_du_encoders[] = {
         {
@@ -98,23 +100,9 @@ static const struct clk_name clk_names[] __initconst = {
         { "lvds1", "lvds.1", "rcar-du-r8a7790" },
 };
 
-/*
- * This is a really crude hack to work around core platform clock issues
- */
-static const struct clk_name clk_enables[] __initconst = {
-        { "ether", NULL, "ee700000.ethernet" },
-        { "msiof1", NULL, "e6e10000.spi" },
-        { "mmcif1", NULL, "ee220000.mmc" },
-        { "qspi_mod", NULL, "e6b10000.spi" },
-        { "sdhi0", NULL, "ee100000.sd" },
-        { "sdhi2", NULL, "ee140000.sd" },
-        { "thermal", NULL, "e61f0000.thermal" },
-};
-
 static void __init lager_add_standard_devices(void)
 {
         shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
-        shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
         r8a7790_add_dt_devices();
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
@@ -129,9 +117,10 @@ static const char *lager_boards_compat_dt[] __initdata = {
 
 DT_MACHINE_START(LAGER_DT, "lager")
         .smp            = smp_ops(r8a7790_smp_ops),
-        .init_early     = r8a7790_init_early,
+        .init_early     = shmobile_init_delay,
         .init_time      = rcar_gen2_timer_init,
         .init_machine   = lager_add_standard_devices,
         .init_late      = shmobile_init_late,
+        .reserve        = rcar_gen2_reserve,
         .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 f8b1e05463cc..e1d8215da0b0 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -31,6 +31,8 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/mtd.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_data/camera-rcar.h>
 #include <linux/platform_data/gpio-rcar.h>
@@ -43,22 +45,23 @@
 #include <linux/regulator/gpio-regulator.h>
 #include <linux/regulator/machine.h>
 #include <linux/sh_eth.h>
+#include <linux/spi/flash.h>
+#include <linux/spi/rspi.h>
+#include <linux/spi/spi.h>
 #include <linux/usb/phy.h>
 #include <linux/usb/renesas_usbhs.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r8a7790.h>
+
 #include <media/soc_camera.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/mtd.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/rspi.h>
-#include <linux/spi/spi.h>
 #include <sound/rcar_snd.h>
 #include <sound/simple_card.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r8a7790.h"
+#include "rcar-gen2.h"
+
 /*
  * SSI-AK4643
  *
@@ -277,7 +280,6 @@ static const struct resource ether_resources[] __initconst = {
 };
 
 static const struct platform_device_info ether_info __initconst = {
-        .parent         = &platform_bus,
         .name           = "r8a7790-ether",
         .id             = -1,
         .res            = ether_resources,
@@ -354,7 +356,6 @@ static void __init lager_add_vin_device(unsigned idx,
                                         struct rcar_vin_platform_data *pdata)
 {
         struct platform_device_info vin_info = {
-                .parent         = &platform_bus,
                 .name           = "r8a7790-vin",
                 .id             = idx,
                 .res            = &vin_resources[idx * 2],
@@ -391,7 +392,7 @@ LAGER_CAMERA(1, "adv7180", 0x20, NULL, RCAR_VIN_BT656);
 
 static void __init lager_add_camera1_device(void)
 {
-        platform_device_register_data(&platform_bus, "soc-camera-pdrv", 1,
+        platform_device_register_data(NULL, "soc-camera-pdrv", 1,
                                       &cam1_link, sizeof(cam1_link));
         lager_add_vin_device(1, &vin1_pdata);
 }
@@ -403,7 +404,6 @@ static const struct resource sata1_resources[] __initconst = {
 };
 
 static const struct platform_device_info sata1_info __initconst = {
-        .parent         = &platform_bus,
         .name           = "sata-r8a7790",
         .id             = 1,
         .res            = sata1_resources,
@@ -533,7 +533,7 @@ static struct usbhs_private usbhs_priv __initdata = {
 static void __init lager_register_usbhs(void)
 {
         usb_bind_phy("renesas_usbhs", 0, "usb_phy_rcar_gen2");
-        platform_device_register_resndata(&platform_bus,
+        platform_device_register_resndata(NULL,
                                           "renesas_usbhs", -1,
                                           usbhs_resources,
                                           ARRAY_SIZE(usbhs_resources),
@@ -608,7 +608,6 @@ static struct asoc_simple_card_info rsnd_card_info = {
 static void __init lager_add_rsnd_device(void)
 {
         struct platform_device_info cardinfo = {
-                .parent         = &platform_bus,
                 .name           = "asoc-simple-card",
                 .id             = -1,
                 .data           = &rsnd_card_info,
@@ -620,7 +619,7 @@ static void __init lager_add_rsnd_device(void)
                                 ARRAY_SIZE(i2c2_devices));
 
         platform_device_register_resndata(
-                &platform_bus, "rcar_sound", -1,
+                NULL, "rcar_sound", -1,
                 rsnd_resources, ARRAY_SIZE(rsnd_resources),
                 &rsnd_info, sizeof(rsnd_info));
 
@@ -663,7 +662,6 @@ static const struct resource pci1_resources[] __initconst = {
 };
 
 static const struct platform_device_info pci1_info __initconst = {
-        .parent         = &platform_bus,
         .name           = "pci-rcar-gen2",
         .id             = 1,
         .res            = pci1_resources,
@@ -684,7 +682,6 @@ static const struct resource pci2_resources[] __initconst = {
 };
 
 static const struct platform_device_info pci2_info __initconst = {
-        .parent         = &platform_bus,
         .name           = "pci-rcar-gen2",
         .id             = 2,
         .res            = pci2_resources,
@@ -795,16 +792,16 @@ static void __init lager_add_standard_devices(void)
         r8a7790_pinmux_init();
 
         r8a7790_add_standard_devices();
-        platform_device_register_data(&platform_bus, "leds-gpio", -1,
+        platform_device_register_data(NULL, "leds-gpio", -1,
                                       &lager_leds_pdata,
                                       sizeof(lager_leds_pdata));
-        platform_device_register_data(&platform_bus, "gpio-keys", -1,
+        platform_device_register_data(NULL, "gpio-keys", -1,
                                       &lager_keys_pdata,
                                       sizeof(lager_keys_pdata));
         regulator_register_always_on(fixed_regulator_idx++,
                                      "fixed-3.3V", fixed3v3_power_consumers,
                                      ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
-        platform_device_register_resndata(&platform_bus, "sh_mmcif", 1,
+        platform_device_register_resndata(NULL, "sh_mmcif", 1,
                                           mmcif1_resources, ARRAY_SIZE(mmcif1_resources),
                                           &mmcif1_pdata, sizeof(mmcif1_pdata));
 
@@ -812,27 +809,27 @@ static void __init lager_add_standard_devices(void)
 
         lager_add_du_device();
 
-        platform_device_register_resndata(&platform_bus, "qspi", 0,
+        platform_device_register_resndata(NULL, "qspi", 0,
                                           qspi_resources,
                                           ARRAY_SIZE(qspi_resources),
                                           &qspi_pdata, sizeof(qspi_pdata));
         spi_register_board_info(spi_info, ARRAY_SIZE(spi_info));
 
-        platform_device_register_data(&platform_bus, "reg-fixed-voltage", fixed_regulator_idx++,
+        platform_device_register_data(NULL, "reg-fixed-voltage", fixed_regulator_idx++,
                                       &vcc_sdhi0_info, sizeof(struct fixed_voltage_config));
-        platform_device_register_data(&platform_bus, "reg-fixed-voltage", fixed_regulator_idx++,
+        platform_device_register_data(NULL, "reg-fixed-voltage", fixed_regulator_idx++,
                                       &vcc_sdhi2_info, sizeof(struct fixed_voltage_config));
 
-        platform_device_register_data(&platform_bus, "gpio-regulator", gpio_regulator_idx++,
+        platform_device_register_data(NULL, "gpio-regulator", gpio_regulator_idx++,
                                       &vccq_sdhi0_info, sizeof(struct gpio_regulator_config));
-        platform_device_register_data(&platform_bus, "gpio-regulator", gpio_regulator_idx++,
+        platform_device_register_data(NULL, "gpio-regulator", gpio_regulator_idx++,
                                       &vccq_sdhi2_info, sizeof(struct gpio_regulator_config));
 
         lager_add_camera1_device();
 
         platform_device_register_full(&sata1_info);
 
-        platform_device_register_resndata(&platform_bus, "usb_phy_rcar_gen2",
+        platform_device_register_resndata(NULL, "usb_phy_rcar_gen2",
                                           -1, usbhs_phy_resources,
                                           ARRAY_SIZE(usbhs_phy_resources),
                                           &usbhs_phy_pdata,
@@ -843,10 +840,10 @@ static void __init lager_add_standard_devices(void)
 
         lager_add_rsnd_device();
 
-        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0,
+        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 0,
                                           sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
                                           &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
-        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 2,
+        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 2,
                                           sdhi2_resources, ARRAY_SIZE(sdhi2_resources),
                                           &sdhi2_info, sizeof(struct sh_mobile_sdhi_info));
 }
@@ -886,9 +883,10 @@ static const char * const lager_boards_compat_dt[] __initconst = {
 
 DT_MACHINE_START(LAGER_DT, "lager")
         .smp            = smp_ops(r8a7790_smp_ops),
-        .init_early     = r8a7790_init_early,
+        .init_early     = shmobile_init_delay,
         .init_time      = rcar_gen2_timer_init,
         .init_machine   = lager_init,
         .init_late      = shmobile_init_late,
+        .reserve        = rcar_gen2_reserve,
         .dt_compat      = lager_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 0ff4d8e45cf7..79f448e93abb 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -47,10 +47,11 @@
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
-#include <linux/sh_intc.h>
+#include <linux/sh_clk.h>
 #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>
@@ -58,15 +59,14 @@
 #include <media/soc_camera_platform.h>
 #include <sound/sh_fsi.h>
 #include <sound/simple_card.h>
-
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/sh7372.h>
-
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "pm-rmobile.h"
 #include "sh-gpio.h"
+#include "sh7372.h"
 
 /*
  * Address      Interface               BusWidth        note
@@ -523,6 +523,8 @@ static struct platform_device fsi_hdmi_device = {
         .id     = 1,
         .dev    = {
                 .platform_data  = &fsi2_hdmi_info,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
+                .dma_mask = &fsi_hdmi_device.dev.coherent_dma_mask,
         },
 };
 
@@ -919,6 +921,8 @@ static struct platform_device fsi_ak4643_device = {
         .name   = "asoc-simple-card",
         .dev    = {
                 .platform_data  = &fsi2_ak4643_info,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
+                .dma_mask = &fsi_ak4643_device.dev.coherent_dma_mask,
         },
 };
 
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 2773936bf7dc..21b3e1ca2261 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -19,19 +19,42 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <mach/r8a7779.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
+#include <linux/clk/shmobile.h>
+#include <linux/clocksource.h>
+#include <linux/of_platform.h>
+
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 
+#include "clock.h"
+#include "common.h"
+#include "irqs.h"
+#include "r8a7779.h"
+
+static void __init marzen_init_timer(void)
+{
+        r8a7779_clocks_init(r8a7779_read_mode_pins());
+        clocksource_of_init();
+}
+
+/*
+ * This is a really crude hack to provide clkdev support to platform
+ * devices until they get moved to DT.
+ */
+static const struct clk_name clk_names[] __initconst = {
+        { "tmu0", "fck", "sh-tmu.0" },
+};
+
 static void __init marzen_init(void)
 {
+        shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
         r8a7779_add_standard_devices_dt();
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
         r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */
 }
 
 static const char *marzen_boards_compat_dt[] __initdata = {
+        "renesas,marzen",
         "renesas,marzen-reference",
         NULL,
 };
@@ -39,7 +62,8 @@ static const char *marzen_boards_compat_dt[] __initdata = {
 DT_MACHINE_START(MARZEN, "marzen")
         .smp            = smp_ops(r8a7779_smp_ops),
         .map_io         = r8a7779_map_io,
-        .init_early     = r8a7779_init_delay,
+        .init_early     = shmobile_init_delay,
+        .init_time      = marzen_init_timer,
         .nr_irqs        = NR_IRQS_LEGACY,
         .init_irq       = r8a7779_init_irq_dt,
         .init_machine   = marzen_init,
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index d832a4477b4b..e5cf4201e769 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -41,14 +41,16 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mfd/tmio.h>
+
 #include <media/soc_camera.h>
-#include <mach/r8a7779.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/traps.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r8a7779.h"
+
 /* Fixed 3.3V regulator to be used by SDHI0 */
 static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
         REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
@@ -272,7 +274,6 @@ static struct resource vin##idx##_resources[] __initdata = {	\
 };                                                              \
                                                                 \
 static struct platform_device_info vin##idx##_info __initdata = { \
-        .parent         = &platform_bus,                        \
         .name           = "r8a7779-vin",                        \
         .id             = idx,                                  \
         .res            = vin##idx##_resources,                 \
diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c
index df187484de5d..3eb2ec401e0c 100644
--- a/arch/arm/mach-shmobile/clock-r7s72100.c
+++ b/arch/arm/mach-shmobile/clock-r7s72100.c
@@ -19,8 +19,9 @@
 #include <linux/io.h>
 #include <linux/sh_clk.h>
 #include <linux/clkdev.h>
-#include <mach/common.h>
-#include <mach/r7s72100.h>
+
+#include "common.h"
+#include "r7s72100.h"
 
 /* Frequency Control Registers */
 #define FRQCR           0xfcfe0010
diff --git a/arch/arm/mach-shmobile/clock-r8a73a4.c b/arch/arm/mach-shmobile/clock-r8a73a4.c
index b5bc22c6a858..c2330ea1802c 100644
--- a/arch/arm/mach-shmobile/clock-r8a73a4.c
+++ b/arch/arm/mach-shmobile/clock-r8a73a4.c
@@ -22,8 +22,8 @@
 #include <linux/kernel.h>
 #include <linux/sh_clk.h>
 #include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "common.h"
+#include "clock.h"
 
 #define CPG_BASE 0xe6150000
 #define CPG_LEN 0x270
@@ -574,11 +574,17 @@ static struct clk_lookup lookups[] = {
 
         /* MSTP */
         CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]),
+        CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]),
         CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]),
+        CLKDEV_DEV_ID("e6c50000.serial", &mstp_clks[MSTP203]),
         CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP206]),
+        CLKDEV_DEV_ID("e6c20000.serial", &mstp_clks[MSTP206]),
         CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP207]),
+        CLKDEV_DEV_ID("e6c30000.serial", &mstp_clks[MSTP207]),
         CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]),
+        CLKDEV_DEV_ID("e6ce0000.serial", &mstp_clks[MSTP216]),
         CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP217]),
+        CLKDEV_DEV_ID("e6cf0000.serial", &mstp_clks[MSTP217]),
         CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]),
         CLKDEV_DEV_ID("e6700020.dma-controller", &mstp_clks[MSTP218]),
         CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
@@ -598,6 +604,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("e6500000.i2c", &mstp_clks[MSTP318]),
         CLKDEV_DEV_ID("e6510000.i2c", &mstp_clks[MSTP323]),
         CLKDEV_ICK_ID("fck", "sh-cmt-48-gen2.1", &mstp_clks[MSTP329]),
+        CLKDEV_ICK_ID("fck", "e6130000.timer", &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]),
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index 50931e3c97c7..0794f0426e70 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -22,9 +22,10 @@
 #include <linux/io.h>
 #include <linux/sh_clk.h>
 #include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/r8a7740.h>
+
+#include "clock.h"
+#include "common.h"
+#include "r8a7740.h"
 
 /*
  *        |  MDx  |  XTAL1/EXTAL1   |  System   | EXTALR |
@@ -555,27 +556,27 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("sh_mobile_ceu.1",        &mstp_clks[MSTP128]),
 
         CLKDEV_DEV_ID("sh-sci.4",               &mstp_clks[MSTP200]),
-        CLKDEV_DEV_ID("e6c80000.sci",           &mstp_clks[MSTP200]),
+        CLKDEV_DEV_ID("e6c80000.serial",        &mstp_clks[MSTP200]),
         CLKDEV_DEV_ID("sh-sci.3",               &mstp_clks[MSTP201]),
-        CLKDEV_DEV_ID("e6c70000.sci",           &mstp_clks[MSTP201]),
+        CLKDEV_DEV_ID("e6c70000.serial",        &mstp_clks[MSTP201]),
         CLKDEV_DEV_ID("sh-sci.2",               &mstp_clks[MSTP202]),
-        CLKDEV_DEV_ID("e6c60000.sci",           &mstp_clks[MSTP202]),
+        CLKDEV_DEV_ID("e6c60000.serial",        &mstp_clks[MSTP202]),
         CLKDEV_DEV_ID("sh-sci.1",               &mstp_clks[MSTP203]),
-        CLKDEV_DEV_ID("e6c50000.sci",           &mstp_clks[MSTP203]),
+        CLKDEV_DEV_ID("e6c50000.serial",        &mstp_clks[MSTP203]),
         CLKDEV_DEV_ID("sh-sci.0",               &mstp_clks[MSTP204]),
-        CLKDEV_DEV_ID("e6c40000.sci",           &mstp_clks[MSTP204]),
+        CLKDEV_DEV_ID("e6c40000.serial",        &mstp_clks[MSTP204]),
         CLKDEV_DEV_ID("sh-sci.8",               &mstp_clks[MSTP206]),
-        CLKDEV_DEV_ID("e6c30000.sci",           &mstp_clks[MSTP206]),
+        CLKDEV_DEV_ID("e6c30000.serial",        &mstp_clks[MSTP206]),
         CLKDEV_DEV_ID("sh-sci.5",               &mstp_clks[MSTP207]),
-        CLKDEV_DEV_ID("e6cb0000.sci",           &mstp_clks[MSTP207]),
+        CLKDEV_DEV_ID("e6cb0000.serial",        &mstp_clks[MSTP207]),
         CLKDEV_DEV_ID("sh-dma-engine.3",        &mstp_clks[MSTP214]),
         CLKDEV_DEV_ID("sh-dma-engine.2",        &mstp_clks[MSTP216]),
         CLKDEV_DEV_ID("sh-dma-engine.1",        &mstp_clks[MSTP217]),
         CLKDEV_DEV_ID("sh-dma-engine.0",        &mstp_clks[MSTP218]),
         CLKDEV_DEV_ID("sh-sci.7",               &mstp_clks[MSTP222]),
-        CLKDEV_DEV_ID("e6cd0000.sci",           &mstp_clks[MSTP222]),
+        CLKDEV_DEV_ID("e6cd0000.serial",        &mstp_clks[MSTP222]),
         CLKDEV_DEV_ID("sh-sci.6",               &mstp_clks[MSTP230]),
-        CLKDEV_DEV_ID("e6cc0000.sci",           &mstp_clks[MSTP230]),
+        CLKDEV_DEV_ID("e6cc0000.serial",        &mstp_clks[MSTP230]),
 
         CLKDEV_DEV_ID("sh_fsi2",                &mstp_clks[MSTP328]),
         CLKDEV_DEV_ID("fe1f0000.sound",         &mstp_clks[MSTP328]),
@@ -598,8 +599,11 @@ static struct clk_lookup lookups[] = {
 
         /* ICK */
         CLKDEV_ICK_ID("fck",    "sh-tmu.1",             &mstp_clks[MSTP111]),
+        CLKDEV_ICK_ID("fck",    "fff90000.timer",       &mstp_clks[MSTP111]),
         CLKDEV_ICK_ID("fck",    "sh-tmu.0",             &mstp_clks[MSTP125]),
+        CLKDEV_ICK_ID("fck",    "fff80000.timer",       &mstp_clks[MSTP125]),
         CLKDEV_ICK_ID("fck",    "sh-cmt-48.1",          &mstp_clks[MSTP329]),
+        CLKDEV_ICK_ID("fck",    "e6138000.timer",       &mstp_clks[MSTP329]),
         CLKDEV_ICK_ID("host",   "renesas_usbhs",        &mstp_clks[MSTP416]),
         CLKDEV_ICK_ID("func",   "renesas_usbhs",        &mstp_clks[MSTP407]),
         CLKDEV_ICK_ID("phy",    "renesas_usbhs",        &mstp_clks[MSTP406]),
diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 13f8f3ab8840..67980a08a601 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -39,8 +39,8 @@
 #include <linux/io.h>
 #include <linux/sh_clk.h>
 #include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
 
 #define MSTPCR0         IOMEM(0xffc80030)
 #define MSTPCR1         IOMEM(0xffc80034)
@@ -202,11 +202,17 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP027]), /* I2C3 */
         CLKDEV_DEV_ID("ffc73000.i2c", &mstp_clks[MSTP027]), /* I2C3 */
         CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */
+        CLKDEV_DEV_ID("ffe40000.serial", &mstp_clks[MSTP026]), /* SCIF0 */
         CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */
+        CLKDEV_DEV_ID("ffe41000.serial", &mstp_clks[MSTP025]), /* SCIF1 */
         CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */
+        CLKDEV_DEV_ID("ffe42000.serial", &mstp_clks[MSTP024]), /* SCIF2 */
         CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP023]), /* SCIF3 */
+        CLKDEV_DEV_ID("ffe43000.serial", &mstp_clks[MSTP023]), /* SCIF3 */
         CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */
+        CLKDEV_DEV_ID("ffe44000.serial", &mstp_clks[MSTP022]), /* SCIF4 */
         CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */
+        CLKDEV_DEV_ID("ffe45000.serial", &mstp_clks[MSTP021]), /* SCIF5 */
         CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */
         CLKDEV_DEV_ID("fffc7000.spi", &mstp_clks[MSTP007]), /* HSPI0 */
         CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */
@@ -238,7 +244,9 @@ static struct clk_lookup lookups[] = {
         CLKDEV_ICK_ID("src.7", "rcar_sound", &mstp_clks[MSTP524]),
         CLKDEV_ICK_ID("src.8", "rcar_sound", &mstp_clks[MSTP523]),
         CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP016]),
+        CLKDEV_ICK_ID("fck", "ffd80000.timer", &mstp_clks[MSTP016]),
         CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[MSTP015]),
+        CLKDEV_ICK_ID("fck", "ffd81000.timer", &mstp_clks[MSTP015]),
 };
 
 void __init r8a7778_clock_init(void)
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index a13298bd37a8..c51f9db3f66f 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -23,8 +23,11 @@
 #include <linux/io.h>
 #include <linux/sh_clk.h>
 #include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include <linux/sh_timer.h>
+
+#include "clock.h"
+#include "common.h"
+#include "r8a7779.h"
 
 /*
  *              MD1 = 1                 MD1 = 0
@@ -52,9 +55,6 @@
 #define MSTPCR3         IOMEM(0xffc8003c)
 #define MSTPSR1         IOMEM(0xffc80044)
 
-#define MODEMR          0xffcc0020
-
-
 /* ioremap() through clock mapping mandatory to avoid
  * collision with ARM coherent DMA virtual memory range.
  */
@@ -207,14 +207,9 @@ static struct clk_lookup lookups[] = {
 
 void __init r8a7779_clock_init(void)
 {
-        void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
-        u32 mode;
+        u32 mode = r8a7779_read_mode_pins();
         int k, ret = 0;
 
-        BUG_ON(!modemr);
-        mode = ioread32(modemr);
-        iounmap(modemr);
-
         if (mode & MD(1)) {
                 plla_clk.rate = 1500000000;
 
@@ -268,3 +263,13 @@ void __init r8a7779_clock_init(void)
         else
                 panic("failed to setup r8a7779 clocks\n");
 }
+
+/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
+void __init __weak r8a7779_register_twd(void) { }
+
+void __init r8a7779_earlytimer_init(void)
+{
+        r8a7779_clock_init();
+        r8a7779_register_twd();
+        shmobile_earlytimer_init();
+}
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 296a057109e4..17435c1aa2fe 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -22,9 +22,11 @@
 #include <linux/kernel.h>
 #include <linux/sh_clk.h>
 #include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/r8a7790.h>
+
+#include "clock.h"
+#include "common.h"
+#include "r8a7790.h"
+#include "rcar-gen2.h"
 
 /*
  *   MD         EXTAL           PLL0    PLL1    PLL3
diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c
index e2fdfcc14436..10e193d707f5 100644
--- a/arch/arm/mach-shmobile/clock-r8a7791.c
+++ b/arch/arm/mach-shmobile/clock-r8a7791.c
@@ -23,9 +23,9 @@
 #include <linux/kernel.h>
 #include <linux/sh_clk.h>
 #include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/rcar-gen2.h>
+#include "clock.h"
+#include "common.h"
+#include "rcar-gen2.h"
 
 /*
  *   MD         EXTAL           PLL0    PLL1    PLL3
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index d16d9ca7f79e..7071676145c4 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -21,8 +21,8 @@
 #include <linux/io.h>
 #include <linux/sh_clk.h>
 #include <linux/clkdev.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
 
 /* SH7372 registers */
 #define FRQCRA          IOMEM(0xe6150000)
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index 0d9cd1fe0212..d8c4048b9e33 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -22,8 +22,8 @@
 #include <linux/sh_clk.h>
 #include <linux/clkdev.h>
 #include <asm/processor.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
 
 #define FRQCRA          IOMEM(0xe6150000)
 #define FRQCRB          IOMEM(0xe6150004)
@@ -638,16 +638,25 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("e6820000.i2c", &mstp_clks[MSTP116]), /* I2C0 */
         CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
         CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */
+        CLKDEV_DEV_ID("e6cd0000.serial", &mstp_clks[MSTP219]), /* SCIFA7 */
         CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */
         CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP217]), /* MP-DMAC */
         CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */
+        CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */
         CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */
+        CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */
         CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */
+        CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]), /* SCIFA0 */
         CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */
+        CLKDEV_DEV_ID("e6c50000.serial", &mstp_clks[MSTP203]), /* SCIFA1 */
         CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP202]), /* SCIFA2 */
+        CLKDEV_DEV_ID("e6c60000.serial", &mstp_clks[MSTP202]), /* SCIFA2 */
         CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP201]), /* SCIFA3 */
+        CLKDEV_DEV_ID("e6c70000.serial", &mstp_clks[MSTP201]), /* SCIFA3 */
         CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */
+        CLKDEV_DEV_ID("e6c80000.serial", &mstp_clks[MSTP200]), /* SCIFA4 */
         CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP331]), /* SCIFA6 */
+        CLKDEV_DEV_ID("e6cc0000.serial", &mstp_clks[MSTP331]), /* SCIFA6 */
         CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI */
         CLKDEV_DEV_ID("ec230000.sound", &mstp_clks[MSTP328]), /* FSI */
         CLKDEV_DEV_ID("sh_irda.0", &mstp_clks[MSTP325]), /* IrDA */
@@ -681,6 +690,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.0", &dsi0phy_clk),
         CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.1", &dsi1phy_clk),
         CLKDEV_ICK_ID("fck", "sh-cmt-48.1", &mstp_clks[MSTP329]), /* CMT1 */
+        CLKDEV_ICK_ID("fck", "e6138000.timer", &mstp_clks[MSTP329]), /* CMT1 */
         CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[MSTP125]), /* TMU0 */
 };
 
diff --git a/arch/arm/mach-shmobile/clock.c b/arch/arm/mach-shmobile/clock.c
index e7232a0373b9..806f94038cc4 100644
--- a/arch/arm/mach-shmobile/clock.c
+++ b/arch/arm/mach-shmobile/clock.c
@@ -25,7 +25,7 @@
 #ifdef CONFIG_COMMON_CLK
 #include <linux/clk.h>
 #include <linux/clkdev.h>
-#include <mach/clock.h>
+#include "clock.h"
 
 void __init shmobile_clk_workaround(const struct clk_name *clks,
                                     int nr_clks, bool enable)
@@ -49,8 +49,8 @@ void __init shmobile_clk_workaround(const struct clk_name *clks,
 #else /* CONFIG_COMMON_CLK */
 #include <linux/sh_clk.h>
 #include <linux/export.h>
-#include <mach/clock.h>
-#include <mach/common.h>
+#include "clock.h"
+#include "common.h"
 
 unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk)
 {
diff --git a/arch/arm/mach-shmobile/include/mach/clock.h b/arch/arm/mach-shmobile/clock.h
index 31b6417463e6..31b6417463e6 100644
--- a/arch/arm/mach-shmobile/include/mach/clock.h
+++ b/arch/arm/mach-shmobile/clock.h
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/common.h
index f7a360edcc35..98056081f0da 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/common.h
@@ -35,8 +35,10 @@ extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
 
 #ifdef CONFIG_SUSPEND
 int shmobile_suspend_init(void);
+void shmobile_smp_apmu_suspend_init(void);
 #else
 static inline int shmobile_suspend_init(void) { return 0; }
+static inline void shmobile_smp_apmu_suspend_init(void) { }
 #endif
 
 #ifdef CONFIG_CPU_IDLE
@@ -45,12 +47,19 @@ int shmobile_cpuidle_init(void);
 static inline int shmobile_cpuidle_init(void) { return 0; }
 #endif
 
+#ifdef CONFIG_CPU_FREQ
+int shmobile_cpufreq_init(void);
+#else
+static inline int shmobile_cpufreq_init(void) { return 0; }
+#endif
+
 extern void __iomem *shmobile_scu_base;
 
 static inline void __init shmobile_init_late(void)
 {
         shmobile_suspend_init();
         shmobile_cpuidle_init();
+        shmobile_cpufreq_init();
 }
 
 #endif /* __ARCH_MACH_COMMON_H */
diff --git a/arch/arm/mach-shmobile/console.c b/arch/arm/mach-shmobile/console.c
index 9411a5bf4fd6..f2e79f2376e1 100644
--- a/arch/arm/mach-shmobile/console.c
+++ b/arch/arm/mach-shmobile/console.c
@@ -19,8 +19,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <mach/common.h>
 #include <asm/mach/map.h>
+#include "common.h"
 
 void __init shmobile_setup_console(void)
 {
diff --git a/arch/arm/mach-shmobile/cpufreq.c b/arch/arm/mach-shmobile/cpufreq.c
new file mode 100644
index 000000000000..8a24b2be46ae
--- /dev/null
+++ b/arch/arm/mach-shmobile/cpufreq.c
@@ -0,0 +1,17 @@
+/*
+ * CPUFreq support code for SH-Mobile ARM
+ *
+ *  Copyright (C) 2014 Gaku Inami
+ *
+ * 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/platform_device.h>
+
+int __init shmobile_cpufreq_init(void)
+{
+        platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0);
+        return 0;
+}
diff --git a/arch/arm/mach-shmobile/include/mach/dma-register.h b/arch/arm/mach-shmobile/dma-register.h
index 97c40bd9b94f..97c40bd9b94f 100644
--- a/arch/arm/mach-shmobile/include/mach/dma-register.h
+++ b/arch/arm/mach-shmobile/dma-register.h
diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S
index e5be5c88644b..50c491567e11 100644
--- a/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@ -10,14 +10,18 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <linux/linkage.h>
 #include <linux/init.h>
+#include <linux/linkage.h>
+#include <linux/threads.h>
+#include <asm/assembler.h>
 #include <asm/memory.h>
 
+#ifdef CONFIG_SMP
 ENTRY(shmobile_invalidate_start)
         bl      v7_invalidate_l1
         b       secondary_startup
 ENDPROC(shmobile_invalidate_start)
+#endif
 
 /*
  * Reset vector for secondary CPUs.
@@ -68,14 +72,14 @@ shmobile_smp_boot_find_mpidr:
 
 shmobile_smp_boot_next:
         add     r1, r1, #1
-        cmp     r1, #CONFIG_NR_CPUS
+        cmp     r1, #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
+        ret     r9
 ENDPROC(shmobile_smp_boot)
 
 ENTRY(shmobile_smp_sleep)
@@ -85,10 +89,10 @@ ENDPROC(shmobile_smp_sleep)
 
         .globl  shmobile_smp_mpidr
 shmobile_smp_mpidr:
-1:      .space  CONFIG_NR_CPUS * 4
+1:      .space  NR_CPUS * 4
         .globl  shmobile_smp_fn
 shmobile_smp_fn:
-2:      .space  CONFIG_NR_CPUS * 4
+2:      .space  NR_CPUS * 4
         .globl  shmobile_smp_arg
 shmobile_smp_arg:
-3:      .space  CONFIG_NR_CPUS * 4
+3:      .space  NR_CPUS * 4
diff --git a/arch/arm/mach-shmobile/include/mach/irqs.h b/arch/arm/mach-shmobile/include/mach/irqs.h
index d241bfd6926d..5aee83f079e2 100644
--- a/arch/arm/mach-shmobile/include/mach/irqs.h
+++ b/arch/arm/mach-shmobile/include/mach/irqs.h
@@ -1,24 +1,10 @@
 #ifndef __ASM_MACH_IRQS_H
 #define __ASM_MACH_IRQS_H
 
-#include <linux/sh_intc.h>
-
-/* GIC */
-#define gic_spi(nr)             ((nr) + 32)
-#define gic_iid(nr)             (nr) /* ICCIAR / interrupt ID */
-
-/* INTCS */
-#define INTCS_VECT_BASE         0x3400
-#define INTCS_VECT(n, vect)     INTC_VECT((n), INTCS_VECT_BASE + (vect))
-#define intcs_evt2irq(evt)      evt2irq(INTCS_VECT_BASE + (evt))
+/* Stuck here until drivers/pinctl/sh-pfc gets rid of legacy code */
 
 /* External IRQ pins */
 #define IRQPIN_BASE             2000
 #define irq_pin(nr)             ((nr) + IRQPIN_BASE)
 
-/* GPIO IRQ */
-#define _GPIO_IRQ_BASE          2500
-#define GPIO_IRQ_BASE(x)        (_GPIO_IRQ_BASE + (32 * x))
-#define GPIO_IRQ(x, y)          (_GPIO_IRQ_BASE + (32 * x) + y)
-
 #endif /* __ASM_MACH_IRQS_H */
diff --git a/arch/arm/mach-shmobile/intc-sh7372.c b/arch/arm/mach-shmobile/intc-sh7372.c
index a91caad7db7c..e2af00b1bd9d 100644
--- a/arch/arm/mach-shmobile/intc-sh7372.c
+++ b/arch/arm/mach-shmobile/intc-sh7372.c
@@ -22,11 +22,10 @@
 #include <linux/module.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/sh_intc.h>
-#include <mach/intc.h>
-#include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include "intc.h"
+#include "irqs.h"
 
 enum {
         UNUSED_INTCA = 0,
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
index 19a26f4579b3..44457a94897b 100644
--- a/arch/arm/mach-shmobile/intc-sh73a0.c
+++ b/arch/arm/mach-shmobile/intc-sh73a0.c
@@ -22,15 +22,16 @@
 #include <linux/module.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/sh_intc.h>
 #include <linux/irqchip.h>
 #include <linux/irqchip/arm-gic.h>
-#include <mach/intc.h>
-#include <mach/irqs.h>
-#include <mach/sh73a0.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+#include "intc.h"
+#include "irqs.h"
+#include "sh73a0.h"
+
 enum {
         UNUSED = 0,
 
diff --git a/arch/arm/mach-shmobile/include/mach/intc.h b/arch/arm/mach-shmobile/intc.h
index a5603c76cfe0..a5603c76cfe0 100644
--- a/arch/arm/mach-shmobile/include/mach/intc.h
+++ b/arch/arm/mach-shmobile/intc.h
diff --git a/arch/arm/mach-shmobile/irqs.h b/arch/arm/mach-shmobile/irqs.h
new file mode 100644
index 000000000000..4ff2d2aa94f0
--- /dev/null
+++ b/arch/arm/mach-shmobile/irqs.h
@@ -0,0 +1,21 @@
+#ifndef __SHMOBILE_IRQS_H
+#define __SHMOBILE_IRQS_H
+
+#include <linux/sh_intc.h>
+#include <mach/irqs.h>
+
+/* GIC */
+#define gic_spi(nr)             ((nr) + 32)
+#define gic_iid(nr)             (nr) /* ICCIAR / interrupt ID */
+
+/* INTCS */
+#define INTCS_VECT_BASE         0x3400
+#define INTCS_VECT(n, vect)     INTC_VECT((n), INTCS_VECT_BASE + (vect))
+#define intcs_evt2irq(evt)      evt2irq(INTCS_VECT_BASE + (evt))
+
+/* GPIO IRQ */
+#define _GPIO_IRQ_BASE          2500
+#define GPIO_IRQ_BASE(x)        (_GPIO_IRQ_BASE + (32 * x))
+#define GPIO_IRQ(x, y)          (_GPIO_IRQ_BASE + (32 * x) + y)
+
+#endif /* __SHMOBILE_IRQS_H */
diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c
index 8cb641c00fdb..2c06810d3a70 100644
--- a/arch/arm/mach-shmobile/platsmp-apmu.c
+++ b/arch/arm/mach-shmobile/platsmp-apmu.c
@@ -7,27 +7,32 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/cpu_pm.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/of_address.h>
 #include <linux/smp.h>
+#include <linux/suspend.h>
+#include <linux/threads.h>
 #include <asm/cacheflush.h>
 #include <asm/cp15.h>
+#include <asm/proc-fns.h>
 #include <asm/smp_plat.h>
-#include <mach/common.h>
+#include <asm/suspend.h>
+#include "common.h"
 
 static struct {
         void __iomem *iomem;
         int bit;
-} apmu_cpus[CONFIG_NR_CPUS];
+} apmu_cpus[NR_CPUS];
 
 #define WUPCR_OFFS 0x10
 #define PSTR_OFFS 0x40
 #define CPUNCR_OFFS(n) (0x100 + (0x10 * (n)))
 
-static int apmu_power_on(void __iomem *p, int bit)
+static int __maybe_unused apmu_power_on(void __iomem *p, int bit)
 {
         /* request power on */
         writel_relaxed(BIT(bit), p + WUPCR_OFFS);
@@ -46,7 +51,7 @@ static int apmu_power_off(void __iomem *p, int bit)
         return 0;
 }
 
-static int apmu_power_off_poll(void __iomem *p, int bit)
+static int __maybe_unused apmu_power_off_poll(void __iomem *p, int bit)
 {
         int k;
 
@@ -69,7 +74,7 @@ static int apmu_wrap(int cpu, int (*fn)(void __iomem *p, int cpu))
 
 static void apmu_init_cpu(struct resource *res, int cpu, int bit)
 {
-        if (apmu_cpus[cpu].iomem)
+        if ((cpu >= ARRAY_SIZE(apmu_cpus)) || apmu_cpus[cpu].iomem)
                 return;
 
         apmu_cpus[cpu].iomem = ioremap_nocache(res->start, resource_size(res));
@@ -133,6 +138,7 @@ void __init shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus)
         apmu_parse_cfg(apmu_init_cpu);
 }
 
+#ifdef CONFIG_SMP
 int shmobile_smp_apmu_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
         /* For this particular CPU register boot vector */
@@ -140,8 +146,9 @@ int shmobile_smp_apmu_boot_secondary(unsigned int cpu, struct task_struct *idle)
 
         return apmu_wrap(cpu, apmu_power_on);
 }
+#endif
 
-#ifdef CONFIG_HOTPLUG_CPU
+#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_SUSPEND)
 /* nicked from arch/arm/mach-exynos/hotplug.c */
 static inline void cpu_enter_lowpower_a15(void)
 {
@@ -172,16 +179,40 @@ static inline void cpu_enter_lowpower_a15(void)
         dsb();
 }
 
-void shmobile_smp_apmu_cpu_die(unsigned int cpu)
+void shmobile_smp_apmu_cpu_shutdown(unsigned int cpu)
 {
-        /* For this particular CPU deregister boot vector */
-        shmobile_smp_hook(cpu, 0, 0);
 
         /* Select next sleep mode using the APMU */
         apmu_wrap(cpu, apmu_power_off);
 
         /* Do ARM specific CPU shutdown */
         cpu_enter_lowpower_a15();
+}
+
+static inline void 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, %2\n"
+                     "       mcr     p15, 0, %0, c1, c0, 1\n"
+                     : "=&r" (v)
+                     : "Ir" (CR_C), "Ir" (0x40)
+                     : "cc");
+}
+#endif
+
+#if defined(CONFIG_HOTPLUG_CPU)
+void shmobile_smp_apmu_cpu_die(unsigned int cpu)
+{
+        /* For this particular CPU deregister boot vector */
+        shmobile_smp_hook(cpu, 0, 0);
+
+        /* Shutdown CPU core */
+        shmobile_smp_apmu_cpu_shutdown(cpu);
 
         /* jump to shared mach-shmobile sleep / reset code */
         shmobile_smp_sleep();
@@ -192,3 +223,25 @@ int shmobile_smp_apmu_cpu_kill(unsigned int cpu)
         return apmu_wrap(cpu, apmu_power_off_poll);
 }
 #endif
+
+#if defined(CONFIG_SUSPEND)
+static int shmobile_smp_apmu_do_suspend(unsigned long cpu)
+{
+        shmobile_smp_hook(cpu, virt_to_phys(cpu_resume), 0);
+        shmobile_smp_apmu_cpu_shutdown(cpu);
+        cpu_do_idle(); /* WFI selects Core Standby */
+        return 1;
+}
+
+static int shmobile_smp_apmu_enter_suspend(suspend_state_t state)
+{
+        cpu_suspend(smp_processor_id(), shmobile_smp_apmu_do_suspend);
+        cpu_leave_lowpower();
+        return 0;
+}
+
+void __init shmobile_smp_apmu_suspend_init(void)
+{
+        shmobile_suspend_ops.enter = shmobile_smp_apmu_enter_suspend;
+}
+#endif
diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c
index 673ad6e80869..64663110ab6c 100644
--- a/arch/arm/mach-shmobile/platsmp-scu.c
+++ b/arch/arm/mach-shmobile/platsmp-scu.c
@@ -15,7 +15,7 @@
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
-#include <mach/common.h>
+#include "common.h"
 
 static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
                                           unsigned long action, void *hcpu)
diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index 9ebc246b8d7d..3923e09e966d 100644
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
-#include <mach/common.h>
+#include "common.h"
 
 extern unsigned long shmobile_smp_fn[];
 extern unsigned long shmobile_smp_arg[];
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index 40b87aa1d448..a0d44d537fa0 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -10,8 +10,8 @@
  */
 #include <linux/console.h>
 #include <linux/suspend.h>
-#include <mach/pm-rmobile.h>
-#include <mach/common.h>
+#include "common.h"
+#include "pm-rmobile.h"
 
 #ifdef CONFIG_PM
 static int r8a7740_pd_a4s_suspend(void)
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c
index d6fe189b2df6..69f70b7f7fb2 100644
--- a/arch/arm/mach-shmobile/pm-r8a7779.c
+++ b/arch/arm/mach-shmobile/pm-r8a7779.c
@@ -13,20 +13,33 @@
 #include <linux/suspend.h>
 #include <linux/err.h>
 #include <linux/pm_clock.h>
+#include <linux/pm_domain.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/console.h>
+
 #include <asm/io.h>
-#include <mach/common.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7779.h>
+
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7779.h"
 
 /* SYSC */
 #define SYSCIER 0x0c
 #define SYSCIMR 0x10
 
+struct r8a7779_pm_domain {
+        struct generic_pm_domain genpd;
+        struct rcar_sysc_ch ch;
+};
+
+static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)
+{
+        return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;
+}
+
 #if defined(CONFIG_PM) || defined(CONFIG_SMP)
 
 static void __init r8a7779_sysc_init(void)
diff --git a/arch/arm/mach-shmobile/pm-r8a7790.c b/arch/arm/mach-shmobile/pm-r8a7790.c
index fc82839e2c2a..80e8d95e54d3 100644
--- a/arch/arm/mach-shmobile/pm-r8a7790.c
+++ b/arch/arm/mach-shmobile/pm-r8a7790.c
@@ -11,9 +11,21 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/smp.h>
 #include <asm/io.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7790.h>
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7790.h"
+
+/* RST */
+#define RST             0xe6160000
+#define CA15BAR         0x0020
+#define CA7BAR          0x0030
+#define CA15RESCNT      0x0040
+#define CA7RESCNT       0x0044
+
+/* On-chip RAM */
+#define MERAM          0xe8080000
 
 /* SYSC */
 #define SYSCIER 0x0c
@@ -38,8 +50,33 @@ static inline void r8a7790_sysc_init(void) {}
 
 void __init r8a7790_pm_init(void)
 {
+        void __iomem *p;
+        u32 bar;
         static int once;
 
-        if (!once++)
-                r8a7790_sysc_init();
+        if (once++)
+                return;
+
+        /* MERAM for jump stub, because BAR requires 256KB aligned address */
+        p = ioremap_nocache(MERAM, shmobile_boot_size);
+        memcpy_toio(p, shmobile_boot_vector, shmobile_boot_size);
+        iounmap(p);
+
+        /* setup reset vectors */
+        p = ioremap_nocache(RST, 0x63);
+        bar = (MERAM >> 8) & 0xfffffc00;
+        writel_relaxed(bar, p + CA15BAR);
+        writel_relaxed(bar, p + CA7BAR);
+        writel_relaxed(bar | 0x10, p + CA15BAR);
+        writel_relaxed(bar | 0x10, p + CA7BAR);
+
+        /* de-assert reset for all CPUs */
+        writel_relaxed((readl_relaxed(p + CA15RESCNT) & ~0x0f) | 0xa5a50000,
+                       p + CA15RESCNT);
+        writel_relaxed((readl_relaxed(p + CA7RESCNT) & ~0x0f) | 0x5a5a0000,
+                       p + CA7RESCNT);
+        iounmap(p);
+
+        r8a7790_sysc_init();
+        shmobile_smp_apmu_suspend_init();
 }
diff --git a/arch/arm/mach-shmobile/pm-r8a7791.c b/arch/arm/mach-shmobile/pm-r8a7791.c
new file mode 100644
index 000000000000..25f107bb3657
--- /dev/null
+++ b/arch/arm/mach-shmobile/pm-r8a7791.c
@@ -0,0 +1,73 @@
+/*
+ * r8a7791 Power management support
+ *
+ * Copyright (C) 2014  Renesas Electronics Corporation
+ * Copyright (C) 2011  Renesas Solutions Corp.
+ * Copyright (C) 2011  Magnus Damm
+ *
+ * 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/kernel.h>
+#include <linux/smp.h>
+#include <asm/io.h>
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7791.h"
+
+#define RST             0xe6160000
+#define CA15BAR         0x0020
+#define CA15RESCNT      0x0040
+#define RAM             0xe6300000
+
+/* SYSC */
+#define SYSCIER 0x0c
+#define SYSCIMR 0x10
+
+#if defined(CONFIG_SMP)
+
+static void __init r8a7791_sysc_init(void)
+{
+        void __iomem *base = rcar_sysc_init(0xe6180000);
+
+        /* enable all interrupt sources, but do not use interrupt handler */
+        iowrite32(0x0131000e, base + SYSCIER);
+        iowrite32(0, base + SYSCIMR);
+}
+
+#else /* CONFIG_SMP */
+
+static inline void r8a7791_sysc_init(void) {}
+
+#endif /* CONFIG_SMP */
+
+void __init r8a7791_pm_init(void)
+{
+        void __iomem *p;
+        u32 bar;
+        static int once;
+
+        if (once++)
+                return;
+
+        /* RAM for jump stub, because BAR requires 256KB aligned address */
+        p = ioremap_nocache(RAM, shmobile_boot_size);
+        memcpy_toio(p, shmobile_boot_vector, shmobile_boot_size);
+        iounmap(p);
+
+        /* setup reset vectors */
+        p = ioremap_nocache(RST, 0x63);
+        bar = (RAM >> 8) & 0xfffffc00;
+        writel_relaxed(bar, p + CA15BAR);
+        writel_relaxed(bar | 0x10, p + CA15BAR);
+
+        /* enable clocks to all CPUs */
+        writel_relaxed((readl_relaxed(p + CA15RESCNT) & ~0x0f) | 0xa5a50000,
+                       p + CA15RESCNT);
+        iounmap(p);
+
+        r8a7791_sysc_init();
+        shmobile_smp_apmu_suspend_init();
+}
diff --git a/arch/arm/mach-shmobile/pm-rcar.c b/arch/arm/mach-shmobile/pm-rcar.c
index 1f465a12d1b1..34b8a5674f85 100644
--- a/arch/arm/mach-shmobile/pm-rcar.c
+++ b/arch/arm/mach-shmobile/pm-rcar.c
@@ -13,7 +13,7 @@
 #include <linux/mm.h>
 #include <linux/spinlock.h>
 #include <asm/io.h>
-#include <mach/pm-rcar.h>
+#include "pm-rcar.h"
 
 /* SYSC */
 #define SYSCSR 0x00
diff --git a/arch/arm/mach-shmobile/include/mach/pm-rcar.h b/arch/arm/mach-shmobile/pm-rcar.h
index ef3a1ef628f1..ef3a1ef628f1 100644
--- a/arch/arm/mach-shmobile/include/mach/pm-rcar.h
+++ b/arch/arm/mach-shmobile/pm-rcar.h
diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index f710235aff2f..ebdd16e94a84 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -17,7 +17,7 @@
 #include <linux/pm.h>
 #include <linux/pm_clock.h>
 #include <asm/io.h>
-#include <mach/pm-rmobile.h>
+#include "pm-rmobile.h"
 
 /* SYSC */
 #define SPDCR           IOMEM(0xe6180008)
diff --git a/arch/arm/mach-shmobile/include/mach/pm-rmobile.h b/arch/arm/mach-shmobile/pm-rmobile.h
index 690553a06887..690553a06887 100644
--- a/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
+++ b/arch/arm/mach-shmobile/pm-rmobile.h
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 0de75fd394b9..7e5c2676c489 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -21,13 +21,15 @@
 #include <linux/irq.h>
 #include <linux/bitrev.h>
 #include <linux/console.h>
+
 #include <asm/cpuidle.h>
 #include <asm/io.h>
 #include <asm/tlbflush.h>
 #include <asm/suspend.h>
-#include <mach/common.h>
-#include <mach/sh7372.h>
-#include <mach/pm-rmobile.h>
+
+#include "common.h"
+#include "pm-rmobile.h"
+#include "sh7372.h"
 
 /* DBG */
 #define DBGREG1 IOMEM(0xe6100020)
diff --git a/arch/arm/mach-shmobile/pm-sh73a0.c b/arch/arm/mach-shmobile/pm-sh73a0.c
index 99086e98fbbc..a7e466817965 100644
--- a/arch/arm/mach-shmobile/pm-sh73a0.c
+++ b/arch/arm/mach-shmobile/pm-sh73a0.c
@@ -9,7 +9,7 @@
  */
 
 #include <linux/suspend.h>
-#include <mach/common.h>
+#include "common.h"
 
 #ifdef CONFIG_SUSPEND
 static int sh73a0_enter_suspend(suspend_state_t suspend_state)
diff --git a/arch/arm/mach-shmobile/include/mach/r7s72100.h b/arch/arm/mach-shmobile/r7s72100.h
index 5f34b20ecd4a..efb723c88dd0 100644
--- a/arch/arm/mach-shmobile/include/mach/r7s72100.h
+++ b/arch/arm/mach-shmobile/r7s72100.h
@@ -3,6 +3,5 @@
 
 void r7s72100_add_dt_devices(void);
 void r7s72100_clock_init(void);
-void r7s72100_init_early(void);
 
 #endif /* __ASM_R7S72100_H__ */
diff --git a/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/arch/arm/mach-shmobile/r8a73a4.h
index ce8bdd1d8a8a..ce8bdd1d8a8a 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a73a4.h
+++ b/arch/arm/mach-shmobile/r8a73a4.h
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/r8a7740.h
index 5e3c9ec06303..1d1a5fd78b6b 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7740.h
+++ b/arch/arm/mach-shmobile/r8a7740.h
@@ -19,8 +19,6 @@
 #ifndef __ASM_R8A7740_H__
 #define __ASM_R8A7740_H__
 
-#include <mach/pm-rmobile.h>
-
 /*
  * MD_CKx pin
  */
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/r8a7778.h
index f4076a50e970..f4076a50e970 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/r8a7778.h
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/r8a7779.h
index 88eeceaf1088..5415c719dc19 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7779.h
+++ b/arch/arm/mach-shmobile/r8a7779.h
@@ -2,8 +2,6 @@
 #define __ASM_R8A7779_H__
 
 #include <linux/sh_clk.h>
-#include <linux/pm_domain.h>
-#include <mach/pm-rcar.h>
 
 /* HPB-DMA slave IDs */
 enum {
@@ -12,17 +10,6 @@ enum {
         HPBDMA_SLAVE_SDHI0_RX,
 };
 
-struct r8a7779_pm_domain {
-        struct generic_pm_domain genpd;
-        struct rcar_sysc_ch ch;
-};
-
-static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)
-{
-        return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;
-}
-
-extern void r8a7779_init_delay(void);
 extern void r8a7779_init_irq_extpin(int irlm);
 extern void r8a7779_init_irq_extpin_dt(int irlm);
 extern void r8a7779_init_irq_dt(void);
@@ -32,6 +19,7 @@ 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_init_late(void);
+extern u32 r8a7779_read_mode_pins(void);
 extern void r8a7779_clock_init(void);
 extern void r8a7779_pinmux_init(void);
 extern void r8a7779_pm_init(void);
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h b/arch/arm/mach-shmobile/r8a7790.h
index 0b95babe84ba..459827f1369b 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7790.h
+++ b/arch/arm/mach-shmobile/r8a7790.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_R8A7790_H__
 #define __ASM_R8A7790_H__
 
-#include <mach/rcar-gen2.h>
-
 /* DMA slave IDs */
 enum {
         RCAR_DMA_SLAVE_INVALID,
@@ -33,7 +31,6 @@ void r8a7790_add_dt_devices(void);
 void r8a7790_clock_init(void);
 void r8a7790_pinmux_init(void);
 void r8a7790_pm_init(void);
-void r8a7790_init_early(void);
 extern struct smp_operations r8a7790_smp_ops;
 
 #endif /* __ASM_R8A7790_H__ */
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7791.h b/arch/arm/mach-shmobile/r8a7791.h
index 664274cc4b64..86eae7bceb6f 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7791.h
+++ b/arch/arm/mach-shmobile/r8a7791.h
@@ -5,6 +5,7 @@ void r8a7791_add_standard_devices(void);
 void r8a7791_add_dt_devices(void);
 void r8a7791_clock_init(void);
 void r8a7791_pinmux_init(void);
+void r8a7791_pm_init(void);
 extern struct smp_operations r8a7791_smp_ops;
 
 #endif /* __ASM_R8A7791_H__ */
diff --git a/arch/arm/mach-shmobile/include/mach/rcar-gen2.h b/arch/arm/mach-shmobile/rcar-gen2.h
index 43f606eb2d82..ce53cb5f53a1 100644
--- a/arch/arm/mach-shmobile/include/mach/rcar-gen2.h
+++ b/arch/arm/mach-shmobile/rcar-gen2.h
@@ -4,5 +4,6 @@
 void rcar_gen2_timer_init(void);
 #define MD(nr) BIT(nr)
 u32 rcar_gen2_read_mode_pins(void);
+void rcar_gen2_reserve(void);
 
 #endif /* __ASM_RCAR_GEN2_H__ */
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index d953ff6e78a2..b06a9e8f59a5 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -16,14 +16,13 @@
  * 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/clk-provider.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/of_platform.h>
-#include <mach/common.h>
+#include <linux/mm.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
+#include "common.h"
 
 static struct map_desc emev2_io_desc[] __initdata = {
 #ifdef CONFIG_SMP
@@ -42,17 +41,6 @@ static void __init emev2_map_io(void)
         iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
 }
 
-static void __init emev2_init_delay(void)
-{
-        shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
-}
-
-static void __init emev2_add_standard_devices_dt(void)
-{
-        of_clk_init(NULL);
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
 static const char *emev2_boards_compat_dt[] __initconst = {
         "renesas,emev2",
         NULL,
@@ -63,8 +51,7 @@ extern struct smp_operations emev2_smp_ops;
 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,
-        .init_machine   = emev2_add_standard_devices_dt,
+        .init_early     = shmobile_init_delay,
         .init_late      = shmobile_init_late,
         .dt_compat      = emev2_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
index 412e179429cd..f3b3b14ba972 100644
--- a/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -22,18 +22,20 @@
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r7s72100.h>
+
 #include <asm/mach/arch.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r7s72100.h"
+
 static struct resource mtu2_resources[] __initdata = {
         DEFINE_RES_MEM(0xfcff0000, 0x400),
         DEFINE_RES_IRQ_NAMED(gic_iid(139), "tgi0a"),
 };
 
 #define r7s72100_register_mtu2()                                        \
-        platform_device_register_resndata(&platform_bus, "sh-mtu2",     \
+        platform_device_register_resndata(NULL, "sh-mtu2",              \
                                           -1, mtu2_resources,           \
                                           ARRAY_SIZE(mtu2_resources),   \
                                           NULL, 0)
@@ -43,11 +45,6 @@ void __init r7s72100_add_dt_devices(void)
         r7s72100_register_mtu2();
 }
 
-void __init r7s72100_init_early(void)
-{
-        shmobile_setup_delay(400, 1, 3); /* Cortex-A9 @ 400MHz */
-}
-
 #ifdef CONFIG_USE_OF
 static const char *r7s72100_boards_compat_dt[] __initdata = {
         "renesas,r7s72100",
@@ -55,7 +52,7 @@ static const char *r7s72100_boards_compat_dt[] __initdata = {
 };
 
 DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
-        .init_early     = r7s72100_init_early,
+        .init_early     = shmobile_init_delay,
         .dt_compat      = r7s72100_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 9333770cfac2..6683072a9d98 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -24,12 +24,14 @@
 #include <linux/serial_sci.h>
 #include <linux/sh_dma.h>
 #include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/r8a73a4.h>
+
 #include <asm/mach/arch.h>
 
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "r8a73a4.h"
+
 static const struct resource pfc_resources[] = {
         DEFINE_RES_MEM(0xe6050000, 0x9000),
 };
@@ -68,7 +70,7 @@ R8A73A4_SCIFB(4, 0xe6ce0000, gic_spi(150)); /* SCIFB2 */
 R8A73A4_SCIFB(5, 0xe6cf0000, gic_spi(151)); /* SCIFB3 */
 
 #define r8a73a4_register_scif(index)                                           \
-        platform_device_register_resndata(&platform_bus, "sh-sci", index,      \
+        platform_device_register_resndata(NULL, "sh-sci", index,               \
                                           scif##index##_resources,             \
                                           ARRAY_SIZE(scif##index##_resources), \
                                           &scif##index##_platform_data,        \
@@ -149,7 +151,7 @@ static const struct resource irqc1_resources[] = {
 };
 
 #define r8a73a4_register_irqc(idx)                                      \
-        platform_device_register_resndata(&platform_bus, "renesas_irqc", \
+        platform_device_register_resndata(NULL, "renesas_irqc",         \
                                           idx, irqc##idx##_resources,   \
                                           ARRAY_SIZE(irqc##idx##_resources), \
                                           &irqc##idx##_data,            \
@@ -179,7 +181,7 @@ static struct resource cmt1_resources[] = {
 };
 
 #define r8a7790_register_cmt(idx)                                       \
-        platform_device_register_resndata(&platform_bus, "sh-cmt-48-gen2", \
+        platform_device_register_resndata(NULL, "sh-cmt-48-gen2",       \
                                           idx, cmt##idx##_resources,    \
                                           ARRAY_SIZE(cmt##idx##_resources), \
                                           &cmt##idx##_platform_data,    \
@@ -187,12 +189,6 @@ static struct resource cmt1_resources[] = {
 
 void __init r8a73a4_add_dt_devices(void)
 {
-        r8a73a4_register_scif(0);
-        r8a73a4_register_scif(1);
-        r8a73a4_register_scif(2);
-        r8a73a4_register_scif(3);
-        r8a73a4_register_scif(4);
-        r8a73a4_register_scif(5);
         r8a7790_register_cmt(1);
 }
 
@@ -280,13 +276,19 @@ static struct resource dma_resources[] = {
 };
 
 #define r8a73a4_register_dmac()                                                 \
-        platform_device_register_resndata(&platform_bus, "sh-dma-engine", 0,    \
+        platform_device_register_resndata(NULL, "sh-dma-engine", 0,             \
                                 dma_resources, ARRAY_SIZE(dma_resources),       \
                                 &dma_pdata, sizeof(dma_pdata))
 
 void __init r8a73a4_add_standard_devices(void)
 {
         r8a73a4_add_dt_devices();
+        r8a73a4_register_scif(0);
+        r8a73a4_register_scif(1);
+        r8a73a4_register_scif(2);
+        r8a73a4_register_scif(3);
+        r8a73a4_register_scif(4);
+        r8a73a4_register_scif(5);
         r8a73a4_register_irqc(0);
         r8a73a4_register_irqc(1);
         r8a73a4_register_thermal();
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 35dec233301e..3d5eacaba3e6 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -31,16 +31,18 @@
 #include <linux/sh_dma.h>
 #include <linux/sh_timer.h>
 #include <linux/platform_data/sh_ipmmu.h>
-#include <mach/dma-register.h>
-#include <mach/r8a7740.h>
-#include <mach/pm-rmobile.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "pm-rmobile.h"
+#include "r8a7740.h"
+
 static struct map_desc r8a7740_io_desc[] __initdata = {
          /*
           * for CPGA/INTC/PFC
@@ -310,6 +312,10 @@ static struct platform_device ipmmu_device = {
 };
 
 static struct platform_device *r8a7740_devices_dt[] __initdata = {
+        &cmt1_device,
+};
+
+static struct platform_device *r8a7740_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
         &scif2_device,
@@ -319,10 +325,6 @@ static struct platform_device *r8a7740_devices_dt[] __initdata = {
         &scif6_device,
         &scif7_device,
         &scif8_device,
-        &cmt1_device,
-};
-
-static struct platform_device *r8a7740_early_devices[] __initdata = {
         &irqpin0_device,
         &irqpin1_device,
         &irqpin2_device,
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index d311ef903b39..f00a488dcf43 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -37,12 +37,14 @@
 #include <linux/usb/ehci_pdriver.h>
 #include <linux/usb/ohci_pdriver.h>
 #include <linux/dma-mapping.h>
-#include <mach/irqs.h>
-#include <mach/r8a7778.h>
-#include <mach/common.h>
+
 #include <asm/mach/arch.h>
 #include <asm/hardware/cache-l2x0.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r8a7778.h"
+
 /* SCIF */
 #define R8A7778_SCIF(index, baseaddr, irq)                      \
 static struct plat_sci_port scif##index##_platform_data = {     \
@@ -64,7 +66,7 @@ R8A7778_SCIF(4, 0xffe44000, gic_iid(0x6a));
 R8A7778_SCIF(5, 0xffe45000, gic_iid(0x6b));
 
 #define r8a7778_register_scif(index)                                           \
-        platform_device_register_resndata(&platform_bus, "sh-sci", index,      \
+        platform_device_register_resndata(NULL, "sh-sci", index,               \
                                           scif##index##_resources,             \
                                           ARRAY_SIZE(scif##index##_resources), \
                                           &scif##index##_platform_data,        \
@@ -84,7 +86,7 @@ static struct resource sh_tmu0_resources[] = {
 
 #define r8a7778_register_tmu(idx)                       \
         platform_device_register_resndata(              \
-                &platform_bus, "sh-tmu", idx,           \
+                NULL, "sh-tmu", idx,                    \
                 sh_tmu##idx##_resources,                \
                 ARRAY_SIZE(sh_tmu##idx##_resources),    \
                 &sh_tmu##idx##_platform_data,           \
@@ -173,7 +175,6 @@ static struct resource ohci_resources[] __initdata = {
 
 #define USB_PLATFORM_INFO(hci)                                  \
 static struct platform_device_info hci##_info __initdata = {    \
-        .parent         = &platform_bus,                        \
         .name           = #hci "-platform",                     \
         .id             = -1,                                   \
         .res            = hci##_resources,                      \
@@ -212,7 +213,7 @@ R8A7778_GPIO(4);
 
 #define r8a7778_register_gpio(idx)                              \
         platform_device_register_resndata(                      \
-                &platform_bus, "gpio_rcar", idx,                \
+                NULL, "gpio_rcar", idx,                         \
                 r8a7778_gpio##idx##_resources,                  \
                 ARRAY_SIZE(r8a7778_gpio##idx##_resources),      \
                 &r8a7778_gpio##idx##_platform_data,             \
@@ -292,12 +293,6 @@ void __init r8a7778_add_dt_devices(void)
         }
 #endif
 
-        r8a7778_register_scif(0);
-        r8a7778_register_scif(1);
-        r8a7778_register_scif(2);
-        r8a7778_register_scif(3);
-        r8a7778_register_scif(4);
-        r8a7778_register_scif(5);
         r8a7778_register_tmu(0);
 }
 
@@ -496,8 +491,8 @@ static struct resource hpb_dmae_resources[] __initdata = {
 
 static void __init r8a7778_register_hpb_dmae(void)
 {
-        platform_device_register_resndata(&platform_bus, "hpb-dma-engine", -1,
-                                          hpb_dmae_resources,
+        platform_device_register_resndata(NULL, "hpb-dma-engine",
+                                          -1, hpb_dmae_resources,
                                           ARRAY_SIZE(hpb_dmae_resources),
                                           &dma_platform_data,
                                           sizeof(dma_platform_data));
@@ -506,6 +501,12 @@ static void __init r8a7778_register_hpb_dmae(void)
 void __init r8a7778_add_standard_devices(void)
 {
         r8a7778_add_dt_devices();
+        r8a7778_register_scif(0);
+        r8a7778_register_scif(1);
+        r8a7778_register_scif(2);
+        r8a7778_register_scif(3);
+        r8a7778_register_scif(4);
+        r8a7778_register_scif(5);
         r8a7778_register_i2c(0);
         r8a7778_register_i2c(1);
         r8a7778_register_i2c(2);
@@ -565,7 +566,7 @@ void __init r8a7778_init_irq_extpin(int irlm)
         r8a7778_init_irq_extpin_dt(irlm);
         if (irlm)
                 platform_device_register_resndata(
-                        &platform_bus, "renesas_intc_irqpin", -1,
+                        NULL, "renesas_intc_irqpin", -1,
                         irqpin_resources, ARRAY_SIZE(irqpin_resources),
                         &irqpin_platform_data, sizeof(irqpin_platform_data));
 }
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index aba4ed652d54..236c1befb9e3 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -40,15 +40,17 @@
 #include <linux/usb/ehci_pdriver.h>
 #include <linux/usb/ohci_pdriver.h>
 #include <linux/pm_runtime.h>
-#include <mach/irqs.h>
-#include <mach/r8a7779.h>
-#include <mach/common.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
 #include <asm/hardware/cache-l2x0.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r8a7779.h"
+
 static struct map_desc r8a7779_io_desc[] __initdata = {
         /* 2M entity map for 0xf0000000 (MPCORE) */
         {
@@ -123,7 +125,7 @@ void __init r8a7779_init_irq_extpin(int irlm)
         r8a7779_init_irq_extpin_dt(irlm);
         if (irlm)
                 platform_device_register_resndata(
-                        &platform_bus, "renesas_intc_irqpin", -1,
+                        NULL, "renesas_intc_irqpin", -1,
                         irqpin0_resources, ARRAY_SIZE(irqpin0_resources),
                         &irqpin0_platform_data, sizeof(irqpin0_platform_data));
 }
@@ -632,24 +634,24 @@ static struct resource hpb_dmae_resources[] __initdata = {
 
 static void __init r8a7779_register_hpb_dmae(void)
 {
-        platform_device_register_resndata(&platform_bus, "hpb-dma-engine", -1,
-                                          hpb_dmae_resources,
+        platform_device_register_resndata(NULL, "hpb-dma-engine",
+                                          -1, hpb_dmae_resources,
                                           ARRAY_SIZE(hpb_dmae_resources),
                                           &dma_platform_data,
                                           sizeof(dma_platform_data));
 }
 
 static struct platform_device *r8a7779_devices_dt[] __initdata = {
+        &tmu0_device,
+};
+
+static struct platform_device *r8a7779_standard_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
         &scif2_device,
         &scif3_device,
         &scif4_device,
         &scif5_device,
-        &tmu0_device,
-};
-
-static struct platform_device *r8a7779_standard_devices[] __initdata = {
         &i2c0_device,
         &i2c1_device,
         &i2c2_device,
@@ -674,16 +676,6 @@ void __init r8a7779_add_standard_devices(void)
         r8a7779_register_hpb_dmae();
 }
 
-/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
-void __init __weak r8a7779_register_twd(void) { }
-
-void __init r8a7779_earlytimer_init(void)
-{
-        r8a7779_clock_init();
-        r8a7779_register_twd();
-        shmobile_earlytimer_init();
-}
-
 void __init r8a7779_add_early_devices(void)
 {
         early_platform_add_devices(r8a7779_devices_dt,
@@ -747,19 +739,28 @@ void __init r8a7779_init_irq_dt(void)
         __raw_writel(0x003fee3f, INT2SMSKCR4);
 }
 
-void __init r8a7779_init_delay(void)
+void __init r8a7779_add_standard_devices_dt(void)
 {
-        shmobile_setup_delay(1000, 2, 4); /* Cortex-A9 @ 1000MHz */
+        platform_add_devices(r8a7779_devices_dt,
+                             ARRAY_SIZE(r8a7779_devices_dt));
 }
 
-void __init r8a7779_add_standard_devices_dt(void)
+#define MODEMR          0xffcc0020
+
+u32 __init r8a7779_read_mode_pins(void)
 {
-        /* clocks are setup late during boot in the case of DT */
-        r8a7779_clock_init();
+        static u32 mode;
+        static bool mode_valid;
+
+        if (!mode_valid) {
+                void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
+                BUG_ON(!modemr);
+                mode = ioread32(modemr);
+                iounmap(modemr);
+                mode_valid = true;
+        }
 
-        platform_add_devices(r8a7779_devices_dt,
-                             ARRAY_SIZE(r8a7779_devices_dt));
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+        return mode;
 }
 
 static const char *r8a7779_compat_dt[] __initdata = {
@@ -769,7 +770,7 @@ static const char *r8a7779_compat_dt[] __initdata = {
 
 DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
         .map_io         = r8a7779_map_io,
-        .init_early     = r8a7779_init_delay,
+        .init_early     = shmobile_init_delay,
         .nr_irqs        = NR_IRQS_LEGACY,
         .init_irq       = r8a7779_init_irq_dt,
         .init_machine   = r8a7779_add_standard_devices_dt,
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 6bd08b127fa4..0c12b01bb9e3 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -26,12 +26,15 @@
 #include <linux/serial_sci.h>
 #include <linux/sh_dma.h>
 #include <linux/sh_timer.h>
-#include <mach/common.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/r8a7790.h>
+
 #include <asm/mach/arch.h>
 
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "r8a7790.h"
+#include "rcar-gen2.h"
+
 /* Audio-DMAC */
 #define AUDIO_DMAC_SLAVE(_id, _addr, t, r)                      \
 {                                                               \
@@ -113,7 +116,7 @@ static struct resource r8a7790_audio_dmac_resources[] = {
 
 #define r8a7790_register_audio_dmac(id)                         \
         platform_device_register_resndata(                      \
-                &platform_bus, "sh-dma-engine", id,             \
+                NULL, "sh-dma-engine", id,                      \
                 &r8a7790_audio_dmac_resources[id * 3],  3,      \
                 &r8a7790_audio_dmac_platform_data,              \
                 sizeof(r8a7790_audio_dmac_platform_data))
@@ -149,7 +152,7 @@ R8A7790_GPIO(4);
 R8A7790_GPIO(5);
 
 #define r8a7790_register_gpio(idx)                                      \
-        platform_device_register_resndata(&platform_bus, "gpio_rcar", idx, \
+        platform_device_register_resndata(NULL, "gpio_rcar", idx,       \
                 r8a7790_gpio##idx##_resources,                          \
                 ARRAY_SIZE(r8a7790_gpio##idx##_resources),              \
                 &r8a7790_gpio##idx##_platform_data,                     \
@@ -227,7 +230,7 @@ R8A7790_HSCIF(8, 0xe62c0000, gic_spi(154)); /* HSCIF0 */
 R8A7790_HSCIF(9, 0xe62c8000, gic_spi(155)); /* HSCIF1 */
 
 #define r8a7790_register_scif(index)                                           \
-        platform_device_register_resndata(&platform_bus, "sh-sci", index,      \
+        platform_device_register_resndata(NULL, "sh-sci", index,               \
                                           scif##index##_resources,             \
                                           ARRAY_SIZE(scif##index##_resources), \
                                           &scif##index##_platform_data,        \
@@ -246,7 +249,7 @@ static const struct resource irqc0_resources[] __initconst = {
 };
 
 #define r8a7790_register_irqc(idx)                                      \
-        platform_device_register_resndata(&platform_bus, "renesas_irqc", \
+        platform_device_register_resndata(NULL, "renesas_irqc",         \
                                           idx, irqc##idx##_resources,   \
                                           ARRAY_SIZE(irqc##idx##_resources), \
                                           &irqc##idx##_data,            \
@@ -273,7 +276,7 @@ static struct resource cmt0_resources[] = {
 };
 
 #define r8a7790_register_cmt(idx)                                       \
-        platform_device_register_resndata(&platform_bus, "sh-cmt-48-gen2", \
+        platform_device_register_resndata(NULL, "sh-cmt-48-gen2",       \
                                           idx, cmt##idx##_resources,    \
                                           ARRAY_SIZE(cmt##idx##_resources), \
                                           &cmt##idx##_platform_data,    \
@@ -307,13 +310,6 @@ void __init r8a7790_add_standard_devices(void)
         r8a7790_register_audio_dmac(1);
 }
 
-void __init r8a7790_init_early(void)
-{
-#ifndef CONFIG_ARM_ARCH_TIMER
-        shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
-#endif
-}
-
 #ifdef CONFIG_USE_OF
 
 static const char * const r8a7790_boards_compat_dt[] __initconst = {
@@ -323,8 +319,10 @@ static const char * const r8a7790_boards_compat_dt[] __initconst = {
 
 DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
         .smp            = smp_ops(r8a7790_smp_ops),
-        .init_early     = r8a7790_init_early,
+        .init_early     = shmobile_init_delay,
         .init_time      = rcar_gen2_timer_init,
+        .init_late      = shmobile_init_late,
+        .reserve        = rcar_gen2_reserve,
         .dt_compat      = r8a7790_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 04a96ddb3224..d47d8b16a43f 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -26,12 +26,14 @@
 #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/r8a7791.h>
-#include <mach/rcar-gen2.h>
+
 #include <asm/mach/arch.h>
 
+#include "common.h"
+#include "irqs.h"
+#include "r8a7791.h"
+#include "rcar-gen2.h"
+
 static const struct resource pfc_resources[] __initconst = {
         DEFINE_RES_MEM(0xe6060000, 0x250),
 };
@@ -65,7 +67,7 @@ R8A7791_GPIO(6, 0xe6055400, 32);
 R8A7791_GPIO(7, 0xe6055800, 26);
 
 #define r8a7791_register_gpio(idx)                                      \
-        platform_device_register_resndata(&platform_bus, "gpio_rcar", idx, \
+        platform_device_register_resndata(NULL, "gpio_rcar", idx,       \
                 r8a7791_gpio##idx##_resources,                          \
                 ARRAY_SIZE(r8a7791_gpio##idx##_resources),              \
                 &r8a7791_gpio##idx##_platform_data,                     \
@@ -122,7 +124,7 @@ R8A7791_SCIFA(13, 0xe6c78000, gic_spi(30)); /* SCIFA4 */
 R8A7791_SCIFA(14, 0xe6c80000, gic_spi(31)); /* SCIFA5 */
 
 #define r8a7791_register_scif(index)                                           \
-        platform_device_register_resndata(&platform_bus, "sh-sci", index,      \
+        platform_device_register_resndata(NULL, "sh-sci", index,               \
                                           scif##index##_resources,             \
                                           ARRAY_SIZE(scif##index##_resources), \
                                           &scif##index##_platform_data,        \
@@ -138,7 +140,7 @@ static struct resource cmt0_resources[] = {
 };
 
 #define r8a7791_register_cmt(idx)                                       \
-        platform_device_register_resndata(&platform_bus, "sh-cmt-48-gen2", \
+        platform_device_register_resndata(NULL, "sh-cmt-48-gen2",       \
                                           idx, cmt##idx##_resources,    \
                                           ARRAY_SIZE(cmt##idx##_resources), \
                                           &cmt##idx##_platform_data,    \
@@ -163,7 +165,7 @@ static struct resource irqc0_resources[] = {
 };
 
 #define r8a7791_register_irqc(idx)                                      \
-        platform_device_register_resndata(&platform_bus, "renesas_irqc", \
+        platform_device_register_resndata(NULL, "renesas_irqc",         \
                                           idx, irqc##idx##_resources,   \
                                           ARRAY_SIZE(irqc##idx##_resources), \
                                           &irqc##idx##_data,            \
@@ -217,6 +219,8 @@ DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")
         .smp            = smp_ops(r8a7791_smp_ops),
         .init_early     = shmobile_init_delay,
         .init_time      = rcar_gen2_timer_init,
+        .init_late      = shmobile_init_late,
+        .reserve        = rcar_gen2_reserve,
         .dt_compat      = r8a7791_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index 542c5a47173f..42d5b4308923 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -20,11 +20,14 @@
 
 #include <linux/clk/shmobile.h>
 #include <linux/clocksource.h>
+#include <linux/device.h>
+#include <linux/dma-contiguous.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <mach/common.h>
-#include <mach/rcar-gen2.h>
+#include <linux/of_fdt.h>
 #include <asm/mach/arch.h>
+#include "common.h"
+#include "rcar-gen2.h"
 
 #define MODEMR 0xe6160060
 
@@ -110,3 +113,72 @@ void __init rcar_gen2_timer_init(void)
 #endif
         clocksource_of_init();
 }
+
+struct memory_reserve_config {
+        u64 reserved;
+        u64 base, size;
+};
+
+static int __init rcar_gen2_scan_mem(unsigned long node, const char *uname,
+                                     int depth, void *data)
+{
+        const char *type = of_get_flat_dt_prop(node, "device_type", NULL);
+        const __be32 *reg, *endp;
+        int l;
+        struct memory_reserve_config *mrc = data;
+        u64 lpae_start = 1ULL << 32;
+
+        /* We are scanning "memory" nodes only */
+        if (type == NULL || strcmp(type, "memory"))
+                return 0;
+
+        reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l);
+        if (reg == NULL)
+                reg = of_get_flat_dt_prop(node, "reg", &l);
+        if (reg == NULL)
+                return 0;
+
+        endp = reg + (l / sizeof(__be32));
+        while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {
+                u64 base, size;
+
+                base = dt_mem_next_cell(dt_root_addr_cells, &reg);
+                size = dt_mem_next_cell(dt_root_size_cells, &reg);
+
+                if (base >= lpae_start)
+                        continue;
+
+                if ((base + size) >= lpae_start)
+                        size = lpae_start - base;
+
+                if (size < mrc->reserved)
+                        continue;
+
+                if (base < mrc->base)
+                        continue;
+
+                /* keep the area at top near the 32-bit legacy limit */
+                mrc->base = base + size - mrc->reserved;
+                mrc->size = mrc->reserved;
+        }
+
+        return 0;
+}
+
+struct cma *rcar_gen2_dma_contiguous;
+
+void __init rcar_gen2_reserve(void)
+{
+        struct memory_reserve_config mrc;
+
+        /* reserve 256 MiB at the top of the physical legacy 32-bit space */
+        memset(&mrc, 0, sizeof(mrc));
+        mrc.reserved = SZ_256M;
+
+        of_scan_flat_dt(rcar_gen2_scan_mem, &mrc);
+#ifdef CONFIG_DMA_CMA
+        if (mrc.size)
+                dma_contiguous_reserve_area(mrc.size, mrc.base, 0,
+                                            &rcar_gen2_dma_contiguous, true);
+#endif
+}
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 2a8b9f2a2f54..9cdfcdfd38fc 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -29,20 +29,22 @@
 #include <linux/io.h>
 #include <linux/serial_sci.h>
 #include <linux/sh_dma.h>
-#include <linux/sh_intc.h>
 #include <linux/sh_timer.h>
 #include <linux/pm_domain.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_data/sh_ipmmu.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/sh7372.h>
-#include <mach/common.h>
+
 #include <asm/mach/map.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "pm-rmobile.h"
+#include "sh7372.h"
+
 static struct map_desc sh7372_io_desc[] __initdata = {
         /* create a 1:1 entity map for 0xe6xxxxxx
          * used by CPGA, INTC and PFC.
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index ad00724a2269..2c802ae9b241 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -29,19 +29,20 @@
 #include <linux/io.h>
 #include <linux/serial_sci.h>
 #include <linux/sh_dma.h>
-#include <linux/sh_intc.h>
 #include <linux/sh_timer.h>
 #include <linux/platform_data/sh_ipmmu.h>
 #include <linux/platform_data/irq-renesas-intc-irqpin.h>
-#include <mach/dma-register.h>
-#include <mach/irqs.h>
-#include <mach/sh73a0.h>
-#include <mach/common.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 
+#include "common.h"
+#include "dma-register.h"
+#include "irqs.h"
+#include "sh73a0.h"
+
 static struct map_desc sh73a0_io_desc[] __initdata = {
         /* create a 1:1 entity map for 0xe6xxxxxx
          * used by CPGA, INTC and PFC.
@@ -696,6 +697,10 @@ static struct platform_device irqpin3_device = {
 };
 
 static struct platform_device *sh73a0_devices_dt[] __initdata = {
+        &cmt1_device,
+};
+
+static struct platform_device *sh73a0_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
         &scif2_device,
@@ -705,10 +710,6 @@ static struct platform_device *sh73a0_devices_dt[] __initdata = {
         &scif6_device,
         &scif7_device,
         &scif8_device,
-        &cmt1_device,
-};
-
-static struct platform_device *sh73a0_early_devices[] __initdata = {
         &tmu0_device,
         &ipmmu_device,
 };
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/sh7372.h
index 854a9f0ca040..4ad960d5075b 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/sh7372.h
@@ -11,10 +11,6 @@
 #ifndef __ASM_SH7372_H__
 #define __ASM_SH7372_H__
 
-#include <linux/sh_clk.h>
-#include <linux/pm_domain.h>
-#include <mach/pm-rmobile.h>
-
 /* DMA slave IDs */
 enum {
         SHDMA_SLAVE_INVALID,
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/sh73a0.h
index 359b582dc270..359b582dc270 100644
--- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
+++ b/arch/arm/mach-shmobile/sh73a0.h
diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c
index 2dfd748da7f3..6ff1df1df9a7 100644
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@ -23,9 +23,9 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <mach/common.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
+#include "common.h"
 
 #define EMEV2_SCU_BASE 0x1e000000
 #define EMEV2_SMU_BASE 0xe0110000
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index e7a3201473d0..3100e355c3fd 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -23,14 +23,16 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <mach/common.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7779.h>
+
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 #include <asm/smp_twd.h>
 
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7779.h"
+
 #define AVECR IOMEM(0xfe700040)
 #define R8A7779_SCU_BASE 0xf0000000
 
diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c
index 591052799e8f..2311694636e1 100644
--- a/arch/arm/mach-shmobile/smp-r8a7790.c
+++ b/arch/arm/mach-shmobile/smp-r8a7790.c
@@ -17,17 +17,12 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/io.h>
+
 #include <asm/smp_plat.h>
-#include <mach/common.h>
-#include <mach/pm-rcar.h>
-#include <mach/r8a7790.h>
 
-#define RST             0xe6160000
-#define CA15BAR         0x0020
-#define CA7BAR          0x0030
-#define CA15RESCNT      0x0040
-#define CA7RESCNT       0x0044
-#define MERAM           0xe8080000
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7790.h"
 
 static struct rcar_sysc_ch r8a7790_ca15_scu = {
         .chan_offs = 0x180, /* PWRSR5 .. PWRER5 */
@@ -41,32 +36,9 @@ static struct rcar_sysc_ch r8a7790_ca7_scu = {
 
 static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus)
 {
-        void __iomem *p;
-        u32 bar;
-
         /* let APMU code install data related to shmobile_boot_vector */
         shmobile_smp_apmu_prepare_cpus(max_cpus);
 
-        /* MERAM for jump stub, because BAR requires 256KB aligned address */
-        p = ioremap_nocache(MERAM, shmobile_boot_size);
-        memcpy_toio(p, shmobile_boot_vector, shmobile_boot_size);
-        iounmap(p);
-
-        /* setup reset vectors */
-        p = ioremap_nocache(RST, 0x63);
-        bar = (MERAM >> 8) & 0xfffffc00;
-        writel_relaxed(bar, p + CA15BAR);
-        writel_relaxed(bar, p + CA7BAR);
-        writel_relaxed(bar | 0x10, p + CA15BAR);
-        writel_relaxed(bar | 0x10, p + CA7BAR);
-
-        /* enable clocks to all CPUs */
-        writel_relaxed((readl_relaxed(p + CA15RESCNT) & ~0x0f) | 0xa5a50000,
-                       p + CA15RESCNT);
-        writel_relaxed((readl_relaxed(p + CA7RESCNT) & ~0x0f) | 0x5a5a0000,
-                       p + CA7RESCNT);
-        iounmap(p);
-
         /* turn on power to SCU */
         r8a7790_pm_init();
         rcar_sysc_power_up(&r8a7790_ca15_scu);
diff --git a/arch/arm/mach-shmobile/smp-r8a7791.c b/arch/arm/mach-shmobile/smp-r8a7791.c
index ec979529f30f..f743386166fb 100644
--- a/arch/arm/mach-shmobile/smp-r8a7791.c
+++ b/arch/arm/mach-shmobile/smp-r8a7791.c
@@ -17,39 +17,19 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/io.h>
+
 #include <asm/smp_plat.h>
-#include <mach/common.h>
-#include <mach/r8a7791.h>
-#include <mach/rcar-gen2.h>
 
-#define RST             0xe6160000
-#define CA15BAR         0x0020
-#define CA15RESCNT      0x0040
-#define RAM             0xe6300000
+#include "common.h"
+#include "r8a7791.h"
+#include "rcar-gen2.h"
 
 static void __init r8a7791_smp_prepare_cpus(unsigned int max_cpus)
 {
-        void __iomem *p;
-        u32 bar;
-
         /* let APMU code install data related to shmobile_boot_vector */
         shmobile_smp_apmu_prepare_cpus(max_cpus);
 
-        /* RAM for jump stub, because BAR requires 256KB aligned address */
-        p = ioremap_nocache(RAM, shmobile_boot_size);
-        memcpy_toio(p, shmobile_boot_vector, shmobile_boot_size);
-        iounmap(p);
-
-        /* setup reset vectors */
-        p = ioremap_nocache(RST, 0x63);
-        bar = (RAM >> 8) & 0xfffffc00;
-        writel_relaxed(bar, p + CA15BAR);
-        writel_relaxed(bar | 0x10, p + CA15BAR);
-
-        /* enable clocks to all CPUs */
-        writel_relaxed((readl_relaxed(p + CA15RESCNT) & ~0x0f) | 0xa5a50000,
-                       p + CA15RESCNT);
-        iounmap(p);
+        r8a7791_pm_init();
 }
 
 static int r8a7791_smp_boot_secondary(unsigned int cpu,
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index 13ba36a6831f..22d8f87b23e9 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -22,11 +22,13 @@
 #include <linux/smp.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <mach/common.h>
-#include <mach/sh73a0.h>
+
 #include <asm/smp_plat.h>
 #include <asm/smp_twd.h>
 
+#include "common.h"
+#include "sh73a0.h"
+
 #define WUPCR           IOMEM(0xe6151010)
 #define SRESCR          IOMEM(0xe6151018)
 #define PSTR            IOMEM(0xe6151040)
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index 68bc0b82226d..942efdc82a62 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -59,29 +59,37 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz,
 
 void __init shmobile_init_delay(void)
 {
-        struct device_node *np, *parent;
-        u32 max_freq, freq;
-
-        max_freq = 0;
-
-        parent = of_find_node_by_path("/cpus");
-        if (parent) {
-                for_each_child_of_node(parent, np) {
-                        if (!of_property_read_u32(np, "clock-frequency", &freq))
-                                max_freq = max(max_freq, freq);
-                }
-                of_node_put(parent);
-        }
+        struct device_node *np, *cpus;
+        bool is_a8_a9 = false;
+        bool is_a15 = false;
+        u32 max_freq = 0;
+
+        cpus = of_find_node_by_path("/cpus");
+        if (!cpus)
+                return;
+
+        for_each_child_of_node(cpus, np) {
+                u32 freq;
+
+                if (!of_property_read_u32(np, "clock-frequency", &freq))
+                        max_freq = max(max_freq, freq);
 
-        if (max_freq) {
-                if (of_find_compatible_node(NULL, NULL, "arm,cortex-a8"))
-                        shmobile_setup_delay_hz(max_freq, 1, 3);
-                else if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9"))
-                        shmobile_setup_delay_hz(max_freq, 1, 3);
-                else if (of_find_compatible_node(NULL, NULL, "arm,cortex-a15"))
-                        if (!IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
-                                shmobile_setup_delay_hz(max_freq, 2, 4);
+                if (of_device_is_compatible(np, "arm,cortex-a8") ||
+                    of_device_is_compatible(np, "arm,cortex-a9"))
+                        is_a8_a9 = true;
+                else if (of_device_is_compatible(np, "arm,cortex-a15"))
+                        is_a15 = true;
         }
+
+        of_node_put(cpus);
+
+        if (!max_freq)
+                return;
+
+        if (is_a8_a9)
+                shmobile_setup_delay_hz(max_freq, 1, 3);
+        else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
+                shmobile_setup_delay_hz(max_freq, 2, 4);
 }
 
 static void __init shmobile_late_time_init(void)
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index 90df2022276a..6fd4dc88160b 100644
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -19,6 +19,8 @@ config ARCH_SPEAR13XX
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
         select PINCTRL
+        select MFD_SYSCON
+        select MIGHT_HAVE_PCI
         help
           Supports for ARM's SPEAR13XX family
 
@@ -27,12 +29,14 @@ if ARCH_SPEAR13XX
 config MACH_SPEAR1310
         bool "SPEAr1310 Machine support with Device Tree"
         select PINCTRL_SPEAR1310
+        select PHY_ST_SPEAR1310_MIPHY
         help
           Supports ST SPEAr1310 machine configured via the device-tree
 
 config MACH_SPEAR1340
         bool "SPEAr1340 Machine support with Device Tree"
         select PINCTRL_SPEAR1340
+        select PHY_ST_SPEAR1340_MIPHY
         help
           Supports ST SPEAr1340 machine configured via the device-tree
 
diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h
index 5cdc53d9b653..f2d6a0176575 100644
--- a/arch/arm/mach-spear/include/mach/spear.h
+++ b/arch/arm/mach-spear/include/mach/spear.h
@@ -52,10 +52,10 @@
 #ifdef CONFIG_ARCH_SPEAR13XX
 
 #define PERIP_GRP2_BASE                         UL(0xB3000000)
-#define VA_PERIP_GRP2_BASE                      IOMEM(0xFE000000)
+#define VA_PERIP_GRP2_BASE                      IOMEM(0xF9000000)
 #define MCIF_SDHCI_BASE                         UL(0xB3000000)
 #define SYSRAM0_BASE                            UL(0xB3800000)
-#define VA_SYSRAM0_BASE                         IOMEM(0xFE800000)
+#define VA_SYSRAM0_BASE                         IOMEM(0xF9800000)
 #define SYS_LOCATION                            (VA_SYSRAM0_BASE + 0x600)
 
 #define PERIP_GRP1_BASE                         UL(0xE0000000)
diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c
index 824b12a56a42..d9ce4d8000f0 100644
--- a/arch/arm/mach-spear/spear1310.c
+++ b/arch/arm/mach-spear/spear1310.c
@@ -42,7 +42,7 @@ static const char * const spear1310_dt_board_compat[] = {
  * PHYSICAL             VIRTUAL
  * 0xD8000000           0xFA000000
  */
-struct map_desc spear1310_io_desc[] __initdata = {
+static struct map_desc spear1310_io_desc[] __initdata = {
         {
                 .virtual        = VA_SPEAR1310_RAS_GRP1_BASE,
                 .pfn            = __phys_to_pfn(SPEAR1310_RAS_GRP1_BASE),
diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c
index 7b6bff7154e1..3f3c0f124bd3 100644
--- a/arch/arm/mach-spear/spear1340.c
+++ b/arch/arm/mach-spear/spear1340.c
@@ -13,136 +13,13 @@
 
 #define pr_fmt(fmt) "SPEAr1340: " fmt
 
-#include <linux/ahci_platform.h>
-#include <linux/amba/serial.h>
-#include <linux/delay.h>
 #include <linux/of_platform.h>
 #include <asm/mach/arch.h>
 #include "generic.h"
-#include <mach/spear.h>
-
-/* FIXME: Move SATA PHY code into a standalone driver */
-
-/* Base addresses */
-#define SPEAR1340_SATA_BASE                     UL(0xB1000000)
-
-/* Power Management Registers */
-#define SPEAR1340_PCM_CFG                       (VA_MISC_BASE + 0x100)
-#define SPEAR1340_PCM_WKUP_CFG                  (VA_MISC_BASE + 0x104)
-#define SPEAR1340_SWITCH_CTR                    (VA_MISC_BASE + 0x108)
-
-#define SPEAR1340_PERIP1_SW_RST                 (VA_MISC_BASE + 0x318)
-#define SPEAR1340_PERIP2_SW_RST                 (VA_MISC_BASE + 0x31C)
-#define SPEAR1340_PERIP3_SW_RST                 (VA_MISC_BASE + 0x320)
-
-/* PCIE - SATA configuration registers */
-#define SPEAR1340_PCIE_SATA_CFG                 (VA_MISC_BASE + 0x424)
-        /* PCIE CFG MASks */
-        #define SPEAR1340_PCIE_CFG_DEVICE_PRESENT       (1 << 11)
-        #define SPEAR1340_PCIE_CFG_POWERUP_RESET        (1 << 10)
-        #define SPEAR1340_PCIE_CFG_CORE_CLK_EN          (1 << 9)
-        #define SPEAR1340_PCIE_CFG_AUX_CLK_EN           (1 << 8)
-        #define SPEAR1340_SATA_CFG_TX_CLK_EN            (1 << 4)
-        #define SPEAR1340_SATA_CFG_RX_CLK_EN            (1 << 3)
-        #define SPEAR1340_SATA_CFG_POWERUP_RESET        (1 << 2)
-        #define SPEAR1340_SATA_CFG_PM_CLK_EN            (1 << 1)
-        #define SPEAR1340_PCIE_SATA_SEL_PCIE            (0)
-        #define SPEAR1340_PCIE_SATA_SEL_SATA            (1)
-        #define SPEAR1340_SATA_PCIE_CFG_MASK            0xF1F
-        #define SPEAR1340_PCIE_CFG_VAL  (SPEAR1340_PCIE_SATA_SEL_PCIE | \
-                        SPEAR1340_PCIE_CFG_AUX_CLK_EN | \
-                        SPEAR1340_PCIE_CFG_CORE_CLK_EN | \
-                        SPEAR1340_PCIE_CFG_POWERUP_RESET | \
-                        SPEAR1340_PCIE_CFG_DEVICE_PRESENT)
-        #define SPEAR1340_SATA_CFG_VAL  (SPEAR1340_PCIE_SATA_SEL_SATA | \
-                        SPEAR1340_SATA_CFG_PM_CLK_EN | \
-                        SPEAR1340_SATA_CFG_POWERUP_RESET | \
-                        SPEAR1340_SATA_CFG_RX_CLK_EN | \
-                        SPEAR1340_SATA_CFG_TX_CLK_EN)
-
-#define SPEAR1340_PCIE_MIPHY_CFG                (VA_MISC_BASE + 0x428)
-        #define SPEAR1340_MIPHY_OSC_BYPASS_EXT          (1 << 31)
-        #define SPEAR1340_MIPHY_CLK_REF_DIV2            (1 << 27)
-        #define SPEAR1340_MIPHY_CLK_REF_DIV4            (2 << 27)
-        #define SPEAR1340_MIPHY_CLK_REF_DIV8            (3 << 27)
-        #define SPEAR1340_MIPHY_PLL_RATIO_TOP(x)        (x << 0)
-        #define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA \
-                        (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \
-                        SPEAR1340_MIPHY_CLK_REF_DIV2 | \
-                        SPEAR1340_MIPHY_PLL_RATIO_TOP(60))
-        #define SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK \
-                        (SPEAR1340_MIPHY_PLL_RATIO_TOP(120))
-        #define SPEAR1340_PCIE_SATA_MIPHY_CFG_PCIE \
-                        (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \
-                        SPEAR1340_MIPHY_PLL_RATIO_TOP(25))
-
-/* SATA device registration */
-static int sata_miphy_init(struct device *dev, void __iomem *addr)
-{
-        writel(SPEAR1340_SATA_CFG_VAL, SPEAR1340_PCIE_SATA_CFG);
-        writel(SPEAR1340_PCIE_SATA_MIPHY_CFG_SATA_25M_CRYSTAL_CLK,
-                        SPEAR1340_PCIE_MIPHY_CFG);
-        /* Switch on sata power domain */
-        writel((readl(SPEAR1340_PCM_CFG) | (0x800)), SPEAR1340_PCM_CFG);
-        msleep(20);
-        /* Disable PCIE SATA Controller reset */
-        writel((readl(SPEAR1340_PERIP1_SW_RST) & (~0x1000)),
-                        SPEAR1340_PERIP1_SW_RST);
-        msleep(20);
-
-        return 0;
-}
-
-void sata_miphy_exit(struct device *dev)
-{
-        writel(0, SPEAR1340_PCIE_SATA_CFG);
-        writel(0, SPEAR1340_PCIE_MIPHY_CFG);
-
-        /* Enable PCIE SATA Controller reset */
-        writel((readl(SPEAR1340_PERIP1_SW_RST) | (0x1000)),
-                        SPEAR1340_PERIP1_SW_RST);
-        msleep(20);
-        /* Switch off sata power domain */
-        writel((readl(SPEAR1340_PCM_CFG) & (~0x800)), SPEAR1340_PCM_CFG);
-        msleep(20);
-}
-
-int sata_suspend(struct device *dev)
-{
-        if (dev->power.power_state.event == PM_EVENT_FREEZE)
-                return 0;
-
-        sata_miphy_exit(dev);
-
-        return 0;
-}
-
-int sata_resume(struct device *dev)
-{
-        if (dev->power.power_state.event == PM_EVENT_THAW)
-                return 0;
-
-        return sata_miphy_init(dev, NULL);
-}
-
-static struct ahci_platform_data sata_pdata = {
-        .init = sata_miphy_init,
-        .exit = sata_miphy_exit,
-        .suspend = sata_suspend,
-        .resume = sata_resume,
-};
-
-/* Add SPEAr1340 auxdata to pass platform data */
-static struct of_dev_auxdata spear1340_auxdata_lookup[] __initdata = {
-        OF_DEV_AUXDATA("snps,spear-ahci", SPEAR1340_SATA_BASE, NULL,
-                        &sata_pdata),
-        {}
-};
 
 static void __init spear1340_dt_init(void)
 {
-        of_platform_populate(NULL, of_default_bus_match_table,
-                        spear1340_auxdata_lookup, NULL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
         platform_device_register_simple("spear-cpufreq", -1, NULL, 0);
 }
 
diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c
index c9897ea38980..2e463a93468d 100644
--- a/arch/arm/mach-spear/spear13xx.c
+++ b/arch/arm/mach-spear/spear13xx.c
@@ -52,12 +52,12 @@ void __init spear13xx_l2x0_init(void)
 /*
  * Following will create 16MB static virtual/physical mappings
  * PHYSICAL             VIRTUAL
- * 0xB3000000           0xFE000000
+ * 0xB3000000           0xF9000000
  * 0xE0000000           0xFD000000
  * 0xEC000000           0xFC000000
  * 0xED000000           0xFB000000
  */
-struct map_desc spear13xx_io_desc[] __initdata = {
+static struct map_desc spear13xx_io_desc[] __initdata = {
         {
                 .virtual        = (unsigned long)VA_PERIP_GRP2_BASE,
                 .pfn            = __phys_to_pfn(PERIP_GRP2_BASE),
diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c
index fa2c33ffac04..d4b624f8dfcb 100644
--- a/arch/arm/mach-sti/platsmp.c
+++ b/arch/arm/mach-sti/platsmp.c
@@ -36,7 +36,7 @@ static void write_pen_release(int val)
 
 static DEFINE_SPINLOCK(boot_lock);
 
-void sti_secondary_init(unsigned int cpu)
+static void sti_secondary_init(unsigned int cpu)
 {
         trace_hardirqs_off();
 
@@ -53,7 +53,7 @@ void sti_secondary_init(unsigned int cpu)
         spin_unlock(&boot_lock);
 }
 
-int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
         unsigned long timeout;
 
@@ -97,7 +97,7 @@ int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
         return pen_release != -1 ? -ENOSYS : 0;
 }
 
-void __init sti_smp_prepare_cpus(unsigned int max_cpus)
+static void __init sti_smp_prepare_cpus(unsigned int max_cpus)
 {
         void __iomem *scu_base = NULL;
         struct device_node *np = of_find_compatible_node(
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 0fbd4f156bfa..1aaa1e15ef70 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -4,7 +4,6 @@ menuconfig ARCH_SUNXI
         select CLKSRC_MMIO
         select GENERIC_IRQ_CHIP
         select PINCTRL
-        select PINCTRL_SUNXI
         select SUN4I_TIMER
 
 if ARCH_SUNXI
@@ -35,4 +34,12 @@ config MACH_SUN7I
         select HAVE_ARM_ARCH_TIMER
         select SUN5I_HSTIMER
 
+config MACH_SUN8I
+        bool "Allwinner A23 (sun8i) SoCs support"
+        default ARCH_SUNXI
+        select ARCH_HAS_RESET_CONTROLLER
+        select ARM_GIC
+        select MFD_SUN6I_PRCM
+        select RESET_CONTROLLER
+
 endif
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index b6085084e0ff..42d4753683ce 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -130,3 +130,12 @@ DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")
         .dt_compat      = sun7i_board_dt_compat,
         .restart        = sun4i_restart,
 MACHINE_END
+
+static const char * const sun8i_board_dt_compat[] = {
+        "allwinner,sun8i-a23",
+        NULL,
+};
+
+DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i (A23) Family")
+        .dt_compat      = sun8i_board_dt_compat,
+MACHINE_END
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 6fbfbb77dcd9..e48a74458c25 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -2,24 +2,18 @@ asflags-y				+= -march=armv7-a
 
 obj-y                                   += io.o
 obj-y                                   += irq.o
-obj-y                                   += fuse.o
-obj-y                                   += pmc.o
 obj-y                                   += flowctrl.o
-obj-y                                   += powergate.o
-obj-y                                   += apbio.o
 obj-y                                   += pm.o
 obj-y                                   += reset.o
 obj-y                                   += reset-handler.o
 obj-y                                   += sleep.o
 obj-y                                   += tegra.o
 obj-$(CONFIG_CPU_IDLE)                  += cpuidle.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra20_speedo.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)
@@ -28,7 +22,6 @@ endif
 obj-$(CONFIG_SMP)                       += platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.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)
diff --git a/arch/arm/mach-tegra/apbio.c b/arch/arm/mach-tegra/apbio.c
deleted file mode 100644
index bc471973cf04..000000000000
--- a/arch/arm/mach-tegra/apbio.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2010 NVIDIA Corporation.
- * Copyright (C) 2010 Google, Inc.
- *
- * 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/io.h>
-#include <linux/of.h>
-#include <linux/dmaengine.h>
-#include <linux/dma-mapping.h>
-#include <linux/spinlock.h>
-#include <linux/completion.h>
-#include <linux/sched.h>
-#include <linux/mutex.h>
-
-#include "apbio.h"
-#include "iomap.h"
-
-#if defined(CONFIG_TEGRA20_APB_DMA)
-static DEFINE_MUTEX(tegra_apb_dma_lock);
-static u32 *tegra_apb_bb;
-static dma_addr_t tegra_apb_bb_phys;
-static DECLARE_COMPLETION(tegra_apb_wait);
-
-static u32 tegra_apb_readl_direct(unsigned long offset);
-static void tegra_apb_writel_direct(u32 value, unsigned long offset);
-
-static struct dma_chan *tegra_apb_dma_chan;
-static struct dma_slave_config dma_sconfig;
-
-static bool tegra_apb_dma_init(void)
-{
-        dma_cap_mask_t mask;
-
-        mutex_lock(&tegra_apb_dma_lock);
-
-        /* Check to see if we raced to setup */
-        if (tegra_apb_dma_chan)
-                goto skip_init;
-
-        dma_cap_zero(mask);
-        dma_cap_set(DMA_SLAVE, mask);
-        tegra_apb_dma_chan = dma_request_channel(mask, NULL, NULL);
-        if (!tegra_apb_dma_chan) {
-                /*
-                 * This is common until the device is probed, so don't
-                 * shout about it.
-                 */
-                pr_debug("%s: can not allocate dma channel\n", __func__);
-                goto err_dma_alloc;
-        }
-
-        tegra_apb_bb = dma_alloc_coherent(NULL, sizeof(u32),
-                &tegra_apb_bb_phys, GFP_KERNEL);
-        if (!tegra_apb_bb) {
-                pr_err("%s: can not allocate bounce buffer\n", __func__);
-                goto err_buff_alloc;
-        }
-
-        dma_sconfig.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-        dma_sconfig.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-        dma_sconfig.src_maxburst = 1;
-        dma_sconfig.dst_maxburst = 1;
-
-skip_init:
-        mutex_unlock(&tegra_apb_dma_lock);
-        return true;
-
-err_buff_alloc:
-        dma_release_channel(tegra_apb_dma_chan);
-        tegra_apb_dma_chan = NULL;
-
-err_dma_alloc:
-        mutex_unlock(&tegra_apb_dma_lock);
-        return false;
-}
-
-static void apb_dma_complete(void *args)
-{
-        complete(&tegra_apb_wait);
-}
-
-static int do_dma_transfer(unsigned long apb_add,
-                enum dma_transfer_direction dir)
-{
-        struct dma_async_tx_descriptor *dma_desc;
-        int ret;
-
-        if (dir == DMA_DEV_TO_MEM)
-                dma_sconfig.src_addr = apb_add;
-        else
-                dma_sconfig.dst_addr = apb_add;
-
-        ret = dmaengine_slave_config(tegra_apb_dma_chan, &dma_sconfig);
-        if (ret)
-                return ret;
-
-        dma_desc = dmaengine_prep_slave_single(tegra_apb_dma_chan,
-                        tegra_apb_bb_phys, sizeof(u32), dir,
-                        DMA_PREP_INTERRUPT |  DMA_CTRL_ACK);
-        if (!dma_desc)
-                return -EINVAL;
-
-        dma_desc->callback = apb_dma_complete;
-        dma_desc->callback_param = NULL;
-
-        reinit_completion(&tegra_apb_wait);
-
-        dmaengine_submit(dma_desc);
-        dma_async_issue_pending(tegra_apb_dma_chan);
-        ret = wait_for_completion_timeout(&tegra_apb_wait,
-                msecs_to_jiffies(50));
-
-        if (WARN(ret == 0, "apb read dma timed out")) {
-                dmaengine_terminate_all(tegra_apb_dma_chan);
-                return -EFAULT;
-        }
-        return 0;
-}
-
-static u32 tegra_apb_readl_using_dma(unsigned long offset)
-{
-        int ret;
-
-        if (!tegra_apb_dma_chan && !tegra_apb_dma_init())
-                return tegra_apb_readl_direct(offset);
-
-        mutex_lock(&tegra_apb_dma_lock);
-        ret = do_dma_transfer(offset, DMA_DEV_TO_MEM);
-        if (ret < 0) {
-                pr_err("error in reading offset 0x%08lx using dma\n", offset);
-                *(u32 *)tegra_apb_bb = 0;
-        }
-        mutex_unlock(&tegra_apb_dma_lock);
-        return *((u32 *)tegra_apb_bb);
-}
-
-static void tegra_apb_writel_using_dma(u32 value, unsigned long offset)
-{
-        int ret;
-
-        if (!tegra_apb_dma_chan && !tegra_apb_dma_init()) {
-                tegra_apb_writel_direct(value, offset);
-                return;
-        }
-
-        mutex_lock(&tegra_apb_dma_lock);
-        *((u32 *)tegra_apb_bb) = value;
-        ret = do_dma_transfer(offset, DMA_MEM_TO_DEV);
-        if (ret < 0)
-                pr_err("error in writing offset 0x%08lx using dma\n", offset);
-        mutex_unlock(&tegra_apb_dma_lock);
-}
-#else
-#define tegra_apb_readl_using_dma tegra_apb_readl_direct
-#define tegra_apb_writel_using_dma tegra_apb_writel_direct
-#endif
-
-typedef u32 (*apbio_read_fptr)(unsigned long offset);
-typedef void (*apbio_write_fptr)(u32 value, unsigned long offset);
-
-static apbio_read_fptr apbio_read;
-static apbio_write_fptr apbio_write;
-
-static u32 tegra_apb_readl_direct(unsigned long offset)
-{
-        return readl(IO_ADDRESS(offset));
-}
-
-static void tegra_apb_writel_direct(u32 value, unsigned long offset)
-{
-        writel(value, IO_ADDRESS(offset));
-}
-
-void tegra_apb_io_init(void)
-{
-        /* Need to use dma only when it is Tegra20 based platform */
-        if (of_machine_is_compatible("nvidia,tegra20") ||
-                        !of_have_populated_dt()) {
-                apbio_read = tegra_apb_readl_using_dma;
-                apbio_write = tegra_apb_writel_using_dma;
-        } else {
-                apbio_read = tegra_apb_readl_direct;
-                apbio_write = tegra_apb_writel_direct;
-        }
-}
-
-u32 tegra_apb_readl(unsigned long offset)
-{
-        return apbio_read(offset);
-}
-
-void tegra_apb_writel(u32 value, unsigned long offset)
-{
-        apbio_write(value, offset);
-}
diff --git a/arch/arm/mach-tegra/apbio.h b/arch/arm/mach-tegra/apbio.h
deleted file mode 100644
index f05d71c303c7..000000000000
--- a/arch/arm/mach-tegra/apbio.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2010 NVIDIA Corporation.
- * Copyright (C) 2010 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef __MACH_TEGRA_APBIO_H
-#define __MACH_TEGRA_APBIO_H
-
-void tegra_apb_io_init(void);
-u32 tegra_apb_readl(unsigned long offset);
-void tegra_apb_writel(u32 value, unsigned long offset);
-#endif
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index 9c6029ba526f..fbe74c6806f3 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -17,9 +17,10 @@
  *
  */
 
+#include <linux/gpio/machine.h>
 #include <linux/platform_device.h>
-#include <linux/gpio/driver.h>
 #include <linux/rfkill-gpio.h>
+
 #include "board.h"
 
 static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index bcf5dbf69d58..da90c89296b9 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -28,13 +28,6 @@
 void __init tegra_map_common_io(void);
 void __init tegra_init_irq(void);
 
-int __init tegra_powergate_init(void);
-#if defined(CONFIG_ARCH_TEGRA_2x_SOC) && defined(CONFIG_DEBUG_FS)
-int __init tegra_powergate_debugfs_init(void);
-#else
-static inline int tegra_powergate_debugfs_init(void) { return 0; }
-#endif
-
 void __init tegra_paz00_wifikill_init(void);
 
 #endif
diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c
index b5fb7c110c64..e3ebdce3e71f 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra114.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra114.c
@@ -14,16 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
+#include <asm/firmware.h>
+#include <linux/clockchips.h>
 #include <linux/cpuidle.h>
 #include <linux/cpu_pm.h>
-#include <linux/clockchips.h>
-#include <asm/firmware.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
 #include <asm/cpuidle.h>
-#include <asm/suspend.h>
 #include <asm/smp_plat.h>
+#include <asm/suspend.h>
 
 #include "pm.h"
 #include "sleep.h"
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
index b82dcaee2ef4..b30bf5cba65b 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
@@ -19,23 +19,23 @@
  * more details.
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/clk/tegra.h>
+#include <linux/clockchips.h>
 #include <linux/cpuidle.h>
 #include <linux/cpu_pm.h>
-#include <linux/clockchips.h>
-#include <linux/clk/tegra.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
 #include <asm/cpuidle.h>
 #include <asm/proc-fns.h>
-#include <asm/suspend.h>
 #include <asm/smp_plat.h>
+#include <asm/suspend.h>
 
-#include "pm.h"
-#include "sleep.h"
+#include "flowctrl.h"
 #include "iomap.h"
 #include "irq.h"
-#include "flowctrl.h"
+#include "pm.h"
+#include "sleep.h"
 
 #ifdef CONFIG_PM_SLEEP
 static bool abort_flag;
diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c
index ed2a2a7bae4d..35561274f6cf 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra30.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra30.c
@@ -19,17 +19,17 @@
  * more details.
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/clk/tegra.h>
+#include <linux/clockchips.h>
 #include <linux/cpuidle.h>
 #include <linux/cpu_pm.h>
-#include <linux/clockchips.h>
-#include <linux/clk/tegra.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
 #include <asm/cpuidle.h>
 #include <asm/proc-fns.h>
-#include <asm/suspend.h>
 #include <asm/smp_plat.h>
+#include <asm/suspend.h>
 
 #include "pm.h"
 #include "sleep.h"
diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c
index 7bc5d8d667fe..316563141add 100644
--- a/arch/arm/mach-tegra/cpuidle.c
+++ b/arch/arm/mach-tegra/cpuidle.c
@@ -24,12 +24,13 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include "fuse.h"
+#include <soc/tegra/fuse.h>
+
 #include "cpuidle.h"
 
 void __init tegra_cpuidle_init(void)
 {
-        switch (tegra_chip_id) {
+        switch (tegra_get_chip_id()) {
         case TEGRA20:
                 if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
                         tegra20_cpuidle_init();
@@ -49,7 +50,7 @@ void __init tegra_cpuidle_init(void)
 
 void tegra_cpuidle_pcie_irqs_in_use(void)
 {
-        switch (tegra_chip_id) {
+        switch (tegra_get_chip_id()) {
         case TEGRA20:
                 if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
                         tegra20_cpuidle_pcie_irqs_in_use();
diff --git a/arch/arm/mach-tegra/flowctrl.c b/arch/arm/mach-tegra/flowctrl.c
index ce8ab8abf061..ec55d1de1b55 100644
--- a/arch/arm/mach-tegra/flowctrl.c
+++ b/arch/arm/mach-tegra/flowctrl.c
@@ -18,14 +18,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/cpumask.h>
 #include <linux/init.h>
-#include <linux/kernel.h>
 #include <linux/io.h>
-#include <linux/cpumask.h>
+#include <linux/kernel.h>
+
+#include <soc/tegra/fuse.h>
 
 #include "flowctrl.h"
 #include "iomap.h"
-#include "fuse.h"
 
 static u8 flowctrl_offset_halt_cpu[] = {
         FLOW_CTRL_HALT_CPU0_EVENTS,
@@ -76,7 +77,7 @@ void flowctrl_cpu_suspend_enter(unsigned int cpuid)
         int i;
 
         reg = flowctrl_read_cpu_csr(cpuid);
-        switch (tegra_chip_id) {
+        switch (tegra_get_chip_id()) {
         case TEGRA20:
                 /* clear wfe bitmap */
                 reg &= ~TEGRA20_FLOW_CTRL_CSR_WFE_BITMAP;
@@ -117,7 +118,7 @@ void flowctrl_cpu_suspend_exit(unsigned int cpuid)
 
         /* Disable powergating via flow controller for CPU0 */
         reg = flowctrl_read_cpu_csr(cpuid);
-        switch (tegra_chip_id) {
+        switch (tegra_get_chip_id()) {
         case TEGRA20:
                 /* clear wfe bitmap */
                 reg &= ~TEGRA20_FLOW_CTRL_CSR_WFE_BITMAP;
diff --git a/arch/arm/mach-tegra/fuse.c b/arch/arm/mach-tegra/fuse.c
deleted file mode 100644
index c9ac23b385be..000000000000
--- a/arch/arm/mach-tegra/fuse.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * arch/arm/mach-tegra/fuse.c
- *
- * Copyright (C) 2010 Google, Inc.
- * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
- *
- * Author:
- *      Colin Cross <ccross@android.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.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/export.h>
-#include <linux/random.h>
-#include <linux/clk.h>
-#include <linux/tegra-soc.h>
-
-#include "fuse.h"
-#include "iomap.h"
-#include "apbio.h"
-
-/* Tegra20 only */
-#define FUSE_UID_LOW            0x108
-#define FUSE_UID_HIGH           0x10c
-
-/* Tegra30 and later */
-#define FUSE_VENDOR_CODE        0x200
-#define FUSE_FAB_CODE           0x204
-#define FUSE_LOT_CODE_0         0x208
-#define FUSE_LOT_CODE_1         0x20c
-#define FUSE_WAFER_ID           0x210
-#define FUSE_X_COORDINATE       0x214
-#define FUSE_Y_COORDINATE       0x218
-
-#define FUSE_SKU_INFO           0x110
-
-#define TEGRA20_FUSE_SPARE_BIT          0x200
-#define TEGRA30_FUSE_SPARE_BIT          0x244
-
-int tegra_sku_id;
-int tegra_cpu_process_id;
-int tegra_core_process_id;
-int tegra_chip_id;
-int tegra_cpu_speedo_id;                /* only exist in Tegra30 and later */
-int tegra_soc_speedo_id;
-enum tegra_revision tegra_revision;
-
-static struct clk *fuse_clk;
-static int tegra_fuse_spare_bit;
-static void (*tegra_init_speedo_data)(void);
-
-/* The BCT to use at boot is specified by board straps that can be read
- * through a APB misc register and decoded. 2 bits, i.e. 4 possible BCTs.
- */
-int tegra_bct_strapping;
-
-#define STRAP_OPT 0x008
-#define GMI_AD0 (1 << 4)
-#define GMI_AD1 (1 << 5)
-#define RAM_ID_MASK (GMI_AD0 | GMI_AD1)
-#define RAM_CODE_SHIFT 4
-
-static const char *tegra_revision_name[TEGRA_REVISION_MAX] = {
-        [TEGRA_REVISION_UNKNOWN] = "unknown",
-        [TEGRA_REVISION_A01]     = "A01",
-        [TEGRA_REVISION_A02]     = "A02",
-        [TEGRA_REVISION_A03]     = "A03",
-        [TEGRA_REVISION_A03p]    = "A03 prime",
-        [TEGRA_REVISION_A04]     = "A04",
-};
-
-static void tegra_fuse_enable_clk(void)
-{
-        if (IS_ERR(fuse_clk))
-                fuse_clk = clk_get_sys(NULL, "fuse");
-        if (IS_ERR(fuse_clk))
-                return;
-        clk_prepare_enable(fuse_clk);
-}
-
-static void tegra_fuse_disable_clk(void)
-{
-        if (IS_ERR(fuse_clk))
-                return;
-        clk_disable_unprepare(fuse_clk);
-}
-
-u32 tegra_fuse_readl(unsigned long offset)
-{
-        return tegra_apb_readl(TEGRA_FUSE_BASE + offset);
-}
-
-bool tegra_spare_fuse(int bit)
-{
-        bool ret;
-
-        tegra_fuse_enable_clk();
-
-        ret = tegra_fuse_readl(tegra_fuse_spare_bit + bit * 4);
-
-        tegra_fuse_disable_clk();
-
-        return ret;
-}
-
-static enum tegra_revision tegra_get_revision(u32 id)
-{
-        u32 minor_rev = (id >> 16) & 0xf;
-
-        switch (minor_rev) {
-        case 1:
-                return TEGRA_REVISION_A01;
-        case 2:
-                return TEGRA_REVISION_A02;
-        case 3:
-                if (tegra_chip_id == TEGRA20 &&
-                        (tegra_spare_fuse(18) || tegra_spare_fuse(19)))
-                        return TEGRA_REVISION_A03p;
-                else
-                        return TEGRA_REVISION_A03;
-        case 4:
-                return TEGRA_REVISION_A04;
-        default:
-                return TEGRA_REVISION_UNKNOWN;
-        }
-}
-
-static void tegra_get_process_id(void)
-{
-        u32 reg;
-
-        tegra_fuse_enable_clk();
-
-        reg = tegra_fuse_readl(tegra_fuse_spare_bit);
-        tegra_cpu_process_id = (reg >> 6) & 3;
-        reg = tegra_fuse_readl(tegra_fuse_spare_bit);
-        tegra_core_process_id = (reg >> 12) & 3;
-
-        tegra_fuse_disable_clk();
-}
-
-u32 tegra_read_chipid(void)
-{
-        return readl_relaxed(IO_ADDRESS(TEGRA_APB_MISC_BASE) + 0x804);
-}
-
-static void __init tegra20_fuse_init_randomness(void)
-{
-        u32 randomness[2];
-
-        randomness[0] = tegra_fuse_readl(FUSE_UID_LOW);
-        randomness[1] = tegra_fuse_readl(FUSE_UID_HIGH);
-
-        add_device_randomness(randomness, sizeof(randomness));
-}
-
-/* Applies to Tegra30 or later */
-static void __init tegra30_fuse_init_randomness(void)
-{
-        u32 randomness[7];
-
-        randomness[0] = tegra_fuse_readl(FUSE_VENDOR_CODE);
-        randomness[1] = tegra_fuse_readl(FUSE_FAB_CODE);
-        randomness[2] = tegra_fuse_readl(FUSE_LOT_CODE_0);
-        randomness[3] = tegra_fuse_readl(FUSE_LOT_CODE_1);
-        randomness[4] = tegra_fuse_readl(FUSE_WAFER_ID);
-        randomness[5] = tegra_fuse_readl(FUSE_X_COORDINATE);
-        randomness[6] = tegra_fuse_readl(FUSE_Y_COORDINATE);
-
-        add_device_randomness(randomness, sizeof(randomness));
-}
-
-void __init tegra_init_fuse(void)
-{
-        u32 id;
-        u32 randomness[5];
-
-        u32 reg = readl(IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x48));
-        reg |= 1 << 28;
-        writel(reg, IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x48));
-
-        /*
-         * Enable FUSE clock. This needs to be hardcoded because the clock
-         * subsystem is not active during early boot.
-         */
-        reg = readl(IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x14));
-        reg |= 1 << 7;
-        writel(reg, IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x14));
-        fuse_clk = ERR_PTR(-EINVAL);
-
-        reg = tegra_fuse_readl(FUSE_SKU_INFO);
-        randomness[0] = reg;
-        tegra_sku_id = reg & 0xFF;
-
-        reg = tegra_apb_readl(TEGRA_APB_MISC_BASE + STRAP_OPT);
-        randomness[1] = reg;
-        tegra_bct_strapping = (reg & RAM_ID_MASK) >> RAM_CODE_SHIFT;
-
-        id = tegra_read_chipid();
-        randomness[2] = id;
-        tegra_chip_id = (id >> 8) & 0xff;
-
-        switch (tegra_chip_id) {
-        case TEGRA20:
-                tegra_fuse_spare_bit = TEGRA20_FUSE_SPARE_BIT;
-                tegra_init_speedo_data = &tegra20_init_speedo_data;
-                break;
-        case TEGRA30:
-                tegra_fuse_spare_bit = TEGRA30_FUSE_SPARE_BIT;
-                tegra_init_speedo_data = &tegra30_init_speedo_data;
-                break;
-        case TEGRA114:
-                tegra_init_speedo_data = &tegra114_init_speedo_data;
-                break;
-        default:
-                pr_warn("Tegra: unknown chip id %d\n", tegra_chip_id);
-                tegra_fuse_spare_bit = TEGRA20_FUSE_SPARE_BIT;
-                tegra_init_speedo_data = &tegra_get_process_id;
-        }
-
-        tegra_revision = tegra_get_revision(id);
-        tegra_init_speedo_data();
-        randomness[3] = (tegra_cpu_process_id << 16) | tegra_core_process_id;
-        randomness[4] = (tegra_cpu_speedo_id << 16) | tegra_soc_speedo_id;
-
-        add_device_randomness(randomness, sizeof(randomness));
-        switch (tegra_chip_id) {
-        case TEGRA20:
-                tegra20_fuse_init_randomness();
-                break;
-        case TEGRA30:
-        case TEGRA114:
-        default:
-                tegra30_fuse_init_randomness();
-                break;
-        }
-
-        pr_info("Tegra Revision: %s SKU: %d CPU Process: %d Core Process: %d\n",
-                tegra_revision_name[tegra_revision],
-                tegra_sku_id, tegra_cpu_process_id,
-                tegra_core_process_id);
-}
diff --git a/arch/arm/mach-tegra/fuse.h b/arch/arm/mach-tegra/fuse.h
deleted file mode 100644
index c01d04785d67..000000000000
--- a/arch/arm/mach-tegra/fuse.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2010 Google, Inc.
- * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
- *
- * Author:
- *      Colin Cross <ccross@android.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef __MACH_TEGRA_FUSE_H
-#define __MACH_TEGRA_FUSE_H
-
-#define SKU_ID_T20      8
-#define SKU_ID_T25SE    20
-#define SKU_ID_AP25     23
-#define SKU_ID_T25      24
-#define SKU_ID_AP25E    27
-#define SKU_ID_T25E     28
-
-#define TEGRA20         0x20
-#define TEGRA30         0x30
-#define TEGRA114        0x35
-#define TEGRA124        0x40
-
-#ifndef __ASSEMBLY__
-enum tegra_revision {
-        TEGRA_REVISION_UNKNOWN = 0,
-        TEGRA_REVISION_A01,
-        TEGRA_REVISION_A02,
-        TEGRA_REVISION_A03,
-        TEGRA_REVISION_A03p,
-        TEGRA_REVISION_A04,
-        TEGRA_REVISION_MAX,
-};
-
-extern int tegra_sku_id;
-extern int tegra_cpu_process_id;
-extern int tegra_core_process_id;
-extern int tegra_chip_id;
-extern int tegra_cpu_speedo_id;         /* only exist in Tegra30 and later */
-extern int tegra_soc_speedo_id;
-extern enum tegra_revision tegra_revision;
-
-extern int tegra_bct_strapping;
-
-unsigned long long tegra_chip_uid(void);
-void tegra_init_fuse(void);
-bool tegra_spare_fuse(int bit);
-u32 tegra_fuse_readl(unsigned long offset);
-
-#ifdef CONFIG_ARCH_TEGRA_2x_SOC
-void tegra20_init_speedo_data(void);
-#else
-static inline void tegra20_init_speedo_data(void) {}
-#endif
-
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
-void tegra30_init_speedo_data(void);
-#else
-static inline void tegra30_init_speedo_data(void) {}
-#endif
-
-#ifdef CONFIG_ARCH_TEGRA_114_SOC
-void tegra114_init_speedo_data(void);
-#else
-static inline void tegra114_init_speedo_data(void) {}
-#endif
-#endif /* __ASSEMBLY__ */
-
-#endif
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c
index ff26af26bd0c..6fc71f1534b0 100644
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@ -7,13 +7,16 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
+#include <linux/clk/tegra.h>
 #include <linux/kernel.h>
 #include <linux/smp.h>
-#include <linux/clk/tegra.h>
+
+#include <soc/tegra/common.h>
+#include <soc/tegra/fuse.h>
 
 #include <asm/smp_plat.h>
 
-#include "fuse.h"
 #include "sleep.h"
 
 static void (*tegra_hotplug_shutdown)(void);
@@ -36,6 +39,11 @@ int tegra_cpu_kill(unsigned cpu)
  */
 void __ref tegra_cpu_die(unsigned int cpu)
 {
+        if (!tegra_hotplug_shutdown) {
+                WARN(1, "hotplug is not yet initialized\n");
+                return;
+        }
+
         /* Clean L1 data cache */
         tegra_disable_clean_inv_dcache(TEGRA_FLUSH_CACHE_LOUIS);
 
@@ -46,17 +54,23 @@ void __ref tegra_cpu_die(unsigned int cpu)
         BUG();
 }
 
-void __init tegra_hotplug_init(void)
+static int __init tegra_hotplug_init(void)
 {
         if (!IS_ENABLED(CONFIG_HOTPLUG_CPU))
-                return;
+                return 0;
 
-        if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && tegra_chip_id == TEGRA20)
+        if (!soc_is_tegra())
+                return 0;
+
+        if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && tegra_get_chip_id() == TEGRA20)
                 tegra_hotplug_shutdown = tegra20_hotplug_shutdown;
-        if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC) && tegra_chip_id == TEGRA30)
+        if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC) && tegra_get_chip_id() == TEGRA30)
                 tegra_hotplug_shutdown = tegra30_hotplug_shutdown;
-        if (IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC) && tegra_chip_id == TEGRA114)
+        if (IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC) && tegra_get_chip_id() == TEGRA114)
                 tegra_hotplug_shutdown = tegra30_hotplug_shutdown;
-        if (IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) && tegra_chip_id == TEGRA124)
+        if (IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) && tegra_get_chip_id() == TEGRA124)
                 tegra_hotplug_shutdown = tegra30_hotplug_shutdown;
+
+        return 0;
 }
+pure_initcall(tegra_hotplug_init);
diff --git a/arch/arm/mach-tegra/io.c b/arch/arm/mach-tegra/io.c
index bb9c9c29d181..352de159d2c5 100644
--- a/arch/arm/mach-tegra/io.c
+++ b/arch/arm/mach-tegra/io.c
@@ -18,14 +18,14 @@
  *
  */
 
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/init.h>
-#include <linux/mm.h>
 #include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/module.h>
 
-#include <asm/page.h>
 #include <asm/mach/map.h>
+#include <asm/page.h>
 
 #include "board.h"
 #include "iomap.h"
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
index 1a74d562dca1..da7be13aecce 100644
--- a/arch/arm/mach-tegra/irq.c
+++ b/arch/arm/mach-tegra/irq.c
@@ -17,14 +17,14 @@
  *
  */
 
-#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/irq.h>
+#include <linux/kernel.h>
+#include <linux/of_address.h>
+#include <linux/of.h>
 #include <linux/syscore_ops.h>
 
 #include "board.h"
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 929d1046e2b4..b45086666648 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -11,27 +11,28 @@
  * 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/errno.h>
+
+#include <linux/clk/tegra.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/io.h>
 #include <linux/jiffies.h>
 #include <linux/smp.h>
-#include <linux/io.h>
-#include <linux/clk/tegra.h>
+
+#include <soc/tegra/fuse.h>
+#include <soc/tegra/pmc.h>
 
 #include <asm/cacheflush.h>
 #include <asm/mach-types.h>
-#include <asm/smp_scu.h>
 #include <asm/smp_plat.h>
-
-#include "fuse.h"
-#include "flowctrl.h"
-#include "reset.h"
-#include "pmc.h"
+#include <asm/smp_scu.h>
 
 #include "common.h"
+#include "flowctrl.h"
 #include "iomap.h"
+#include "reset.h"
 
 static cpumask_t tegra_cpu_init_mask;
 
@@ -170,13 +171,13 @@ static int tegra114_boot_secondary(unsigned int cpu, struct task_struct *idle)
 static int tegra_boot_secondary(unsigned int cpu,
                                           struct task_struct *idle)
 {
-        if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && tegra_chip_id == TEGRA20)
+        if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && tegra_get_chip_id() == TEGRA20)
                 return tegra20_boot_secondary(cpu, idle);
-        if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC) && tegra_chip_id == TEGRA30)
+        if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC) && tegra_get_chip_id() == TEGRA30)
                 return tegra30_boot_secondary(cpu, idle);
-        if (IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC) && tegra_chip_id == TEGRA114)
+        if (IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC) && tegra_get_chip_id() == TEGRA114)
                 return tegra114_boot_secondary(cpu, idle);
-        if (IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) && tegra_chip_id == TEGRA124)
+        if (IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) && tegra_get_chip_id() == TEGRA124)
                 return tegra114_boot_secondary(cpu, idle);
 
         return -EINVAL;
diff --git a/arch/arm/mach-tegra/pm-tegra20.c b/arch/arm/mach-tegra/pm-tegra20.c
index d65e1d786400..39ac2b723f2e 100644
--- a/arch/arm/mach-tegra/pm-tegra20.c
+++ b/arch/arm/mach-tegra/pm-tegra20.c
@@ -13,6 +13,7 @@
  * 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"
diff --git a/arch/arm/mach-tegra/pm-tegra30.c b/arch/arm/mach-tegra/pm-tegra30.c
index 8fa326d6ff1a..46cc19de9916 100644
--- a/arch/arm/mach-tegra/pm-tegra30.c
+++ b/arch/arm/mach-tegra/pm-tegra30.c
@@ -13,6 +13,7 @@
  * 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"
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index f55b05a29b55..b0f48a3946fa 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -16,30 +16,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
+#include <linux/clk/tegra.h>
 #include <linux/cpumask.h>
-#include <linux/delay.h>
 #include <linux/cpu_pm.h>
-#include <linux/suspend.h>
+#include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/clk/tegra.h>
+#include <linux/spinlock.h>
+#include <linux/suspend.h>
+
+#include <soc/tegra/fuse.h>
+#include <soc/tegra/pm.h>
+#include <soc/tegra/pmc.h>
 
-#include <asm/smp_plat.h>
 #include <asm/cacheflush.h>
-#include <asm/suspend.h>
 #include <asm/idmap.h>
 #include <asm/proc-fns.h>
+#include <asm/smp_plat.h>
+#include <asm/suspend.h>
 #include <asm/tlbflush.h>
 
-#include "iomap.h"
-#include "reset.h"
 #include "flowctrl.h"
-#include "fuse.h"
+#include "iomap.h"
 #include "pm.h"
-#include "pmc.h"
+#include "reset.h"
 #include "sleep.h"
 
 #ifdef CONFIG_PM_SLEEP
@@ -53,7 +55,7 @@ static int (*tegra_sleep_func)(unsigned long v2p);
 
 static void tegra_tear_down_cpu_init(void)
 {
-        switch (tegra_chip_id) {
+        switch (tegra_get_chip_id()) {
         case TEGRA20:
                 if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
                         tegra_tear_down_cpu = tegra20_tear_down_cpu;
@@ -143,7 +145,7 @@ bool tegra_set_cpu_in_lp2(void)
 
         if ((phy_cpu_id == 0) && cpumask_equal(cpu_lp2_mask, cpu_online_mask))
                 last_cpu = true;
-        else if (tegra_chip_id == TEGRA20 && phy_cpu_id == 1)
+        else if (tegra_get_chip_id() == TEGRA20 && phy_cpu_id == 1)
                 tegra20_cpu_set_resettable_soon();
 
         spin_unlock(&tegra_lp2_lock);
@@ -166,9 +168,29 @@ static int tegra_sleep_cpu(unsigned long v2p)
         return 0;
 }
 
+static void tegra_pm_set(enum tegra_suspend_mode mode)
+{
+        u32 value;
+
+        switch (tegra_get_chip_id()) {
+        case TEGRA20:
+        case TEGRA30:
+                break;
+        default:
+                /* Turn off CRAIL */
+                value = flowctrl_read_cpu_csr(0);
+                value &= ~FLOW_CTRL_CSR_ENABLE_EXT_MASK;
+                value |= FLOW_CTRL_CSR_ENABLE_EXT_CRAIL;
+                flowctrl_write_cpu_csr(0, value);
+                break;
+        }
+
+        tegra_pmc_enter_suspend_mode(mode);
+}
+
 void tegra_idle_lp2_last(void)
 {
-        tegra_pmc_pm_set(TEGRA_SUSPEND_LP2);
+        tegra_pm_set(TEGRA_SUSPEND_LP2);
 
         cpu_cluster_pm_enter();
         suspend_cpu_complex();
@@ -212,7 +234,7 @@ static int tegra_sleep_core(unsigned long v2p)
  */
 static bool tegra_lp1_iram_hook(void)
 {
-        switch (tegra_chip_id) {
+        switch (tegra_get_chip_id()) {
         case TEGRA20:
                 if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
                         tegra20_lp1_iram_hook();
@@ -242,7 +264,7 @@ static bool tegra_lp1_iram_hook(void)
 
 static bool tegra_sleep_core_init(void)
 {
-        switch (tegra_chip_id) {
+        switch (tegra_get_chip_id()) {
         case TEGRA20:
                 if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
                         tegra20_sleep_core_init();
@@ -267,8 +289,6 @@ static bool tegra_sleep_core_init(void)
 
 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_LPx_RESUME_AREA),
                 iram_save_size);
@@ -280,8 +300,6 @@ static void tegra_suspend_enter_lp1(void)
 
 static void tegra_suspend_exit_lp1(void)
 {
-        tegra_pmc_resume();
-
         /* restore IRAM */
         memcpy(IO_ADDRESS(TEGRA_IRAM_LPx_RESUME_AREA), iram_save_addr,
                 iram_save_size);
@@ -306,7 +324,7 @@ static int tegra_suspend_enter(suspend_state_t state)
 
         pr_info("Entering suspend state %s\n", lp_state[mode]);
 
-        tegra_pmc_pm_set(mode);
+        tegra_pm_set(mode);
 
         local_fiq_disable();
 
@@ -354,7 +372,6 @@ void __init tegra_init_suspend(void)
                 return;
 
         tegra_tear_down_cpu_init();
-        tegra_pmc_suspend_init();
 
         if (mode >= TEGRA_SUSPEND_LP1) {
                 if (!tegra_lp1_iram_hook() || !tegra_sleep_core_init()) {
diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h
index f4a89698e5b0..83bc87583446 100644
--- a/arch/arm/mach-tegra/pm.h
+++ b/arch/arm/mach-tegra/pm.h
@@ -21,12 +21,11 @@
 #ifndef _MACH_TEGRA_PM_H_
 #define _MACH_TEGRA_PM_H_
 
-#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);
 
@@ -42,15 +41,8 @@ void tegra_idle_lp2_last(void);
 extern void (*tegra_tear_down_cpu)(void);
 
 #ifdef CONFIG_PM_SLEEP
-enum tegra_suspend_mode tegra_pm_validate_suspend_mode(
-                                enum tegra_suspend_mode mode);
 void tegra_init_suspend(void);
 #else
-static inline enum tegra_suspend_mode tegra_pm_validate_suspend_mode(
-                                enum tegra_suspend_mode mode)
-{
-        return TEGRA_SUSPEND_NONE;
-}
 static inline void tegra_init_suspend(void) {}
 #endif
 
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
deleted file mode 100644
index 7c7123e7557b..000000000000
--- a/arch/arm/mach-tegra/pmc.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * Copyright (C) 2012,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 <linux/clk.h>
-#include <linux/io.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/tegra-powergate.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 */
-
-#define PMC_CTRL                        0x0
-#define PMC_CTRL_INTR_LOW               (1 << 17)
-#define PMC_PWRGATE_TOGGLE              0x30
-#define PMC_PWRGATE_TOGGLE_START        (1 << 8)
-#define PMC_REMOVE_CLAMPING             0x34
-#define PMC_PWRGATE_STATUS              0x38
-
-#define PMC_SCRATCH0                    0x50
-#define PMC_SCRATCH0_MODE_RECOVERY      (1 << 31)
-#define PMC_SCRATCH0_MODE_BOOTLOADER    (1 << 30)
-#define PMC_SCRATCH0_MODE_RCM           (1 << 1)
-#define PMC_SCRATCH0_MODE_MASK          (PMC_SCRATCH0_MODE_RECOVERY | \
-                                         PMC_SCRATCH0_MODE_BOOTLOADER | \
-                                         PMC_SCRATCH0_MODE_RCM)
-
-#define PMC_CPUPWRGOOD_TIMER    0xc8
-#define PMC_CPUPWROFF_TIMER     0xcc
-
-static u8 tegra_cpu_domains[] = {
-        0xFF,                   /* not available for CPU0 */
-        TEGRA_POWERGATE_CPU1,
-        TEGRA_POWERGATE_CPU2,
-        TEGRA_POWERGATE_CPU3,
-};
-static DEFINE_SPINLOCK(tegra_powergate_lock);
-
-static void __iomem *tegra_pmc_base;
-static bool tegra_pmc_invert_interrupt;
-static struct clk *tegra_pclk;
-
-struct pmc_pm_data {
-        u32 cpu_good_time;      /* CPU power good time in uS */
-        u32 cpu_off_time;       /* CPU power off time in uS */
-        u32 core_osc_time;      /* Core power good osc time in uS */
-        u32 core_pmu_time;      /* Core power good pmu time in uS */
-        u32 core_off_time;      /* Core power off time in uS */
-        bool corereq_high;      /* Core power request active-high */
-        bool sysclkreq_high;    /* System clock request active-high */
-        bool combined_req;      /* Combined pwr req for CPU & Core */
-        bool cpu_pwr_good_en;   /* CPU power good signal is enabled */
-        u32 lp0_vec_phy_addr;   /* The phy addr of LP0 warm boot code */
-        u32 lp0_vec_size;       /* The size of LP0 warm boot code */
-        enum tegra_suspend_mode suspend_mode;
-};
-static struct pmc_pm_data pmc_pm_data;
-
-static inline u32 tegra_pmc_readl(u32 reg)
-{
-        return readl(tegra_pmc_base + reg);
-}
-
-static inline void tegra_pmc_writel(u32 val, u32 reg)
-{
-        writel(val, tegra_pmc_base + reg);
-}
-
-static int tegra_pmc_get_cpu_powerdomain_id(int cpuid)
-{
-        if (cpuid <= 0 || cpuid >= num_possible_cpus())
-                return -EINVAL;
-        return tegra_cpu_domains[cpuid];
-}
-
-static bool tegra_pmc_powergate_is_powered(int id)
-{
-        return (tegra_pmc_readl(PMC_PWRGATE_STATUS) >> id) & 1;
-}
-
-static int tegra_pmc_powergate_set(int id, bool new_state)
-{
-        bool old_state;
-        unsigned long flags;
-
-        spin_lock_irqsave(&tegra_powergate_lock, flags);
-
-        old_state = tegra_pmc_powergate_is_powered(id);
-        WARN_ON(old_state == new_state);
-
-        tegra_pmc_writel(PMC_PWRGATE_TOGGLE_START | id, PMC_PWRGATE_TOGGLE);
-
-        spin_unlock_irqrestore(&tegra_powergate_lock, flags);
-
-        return 0;
-}
-
-static int tegra_pmc_powergate_remove_clamping(int id)
-{
-        u32 mask;
-
-        /*
-         * Tegra has a bug where PCIE and VDE clamping masks are
-         * swapped relatively to the partition ids.
-         */
-        if (id ==  TEGRA_POWERGATE_VDEC)
-                mask = (1 << TEGRA_POWERGATE_PCIE);
-        else if (id == TEGRA_POWERGATE_PCIE)
-                mask = (1 << TEGRA_POWERGATE_VDEC);
-        else
-                mask = (1 << id);
-
-        tegra_pmc_writel(mask, PMC_REMOVE_CLAMPING);
-
-        return 0;
-}
-
-bool tegra_pmc_cpu_is_powered(int cpuid)
-{
-        int id;
-
-        id = tegra_pmc_get_cpu_powerdomain_id(cpuid);
-        if (id < 0)
-                return false;
-        return tegra_pmc_powergate_is_powered(id);
-}
-
-int tegra_pmc_cpu_power_on(int cpuid)
-{
-        int id;
-
-        id = tegra_pmc_get_cpu_powerdomain_id(cpuid);
-        if (id < 0)
-                return id;
-        return tegra_pmc_powergate_set(id, true);
-}
-
-int tegra_pmc_cpu_remove_clamping(int cpuid)
-{
-        int id;
-
-        id = tegra_pmc_get_cpu_powerdomain_id(cpuid);
-        if (id < 0)
-                return id;
-        return tegra_pmc_powergate_remove_clamping(id);
-}
-
-void tegra_pmc_restart(enum reboot_mode mode, const char *cmd)
-{
-        u32 val;
-
-        val = tegra_pmc_readl(PMC_SCRATCH0);
-        val &= ~PMC_SCRATCH0_MODE_MASK;
-
-        if (cmd) {
-                if (strcmp(cmd, "recovery") == 0)
-                        val |= PMC_SCRATCH0_MODE_RECOVERY;
-
-                if (strcmp(cmd, "bootloader") == 0)
-                        val |= PMC_SCRATCH0_MODE_BOOTLOADER;
-
-                if (strcmp(cmd, "forced-recovery") == 0)
-                        val |= PMC_SCRATCH0_MODE_RCM;
-        }
-
-        tegra_pmc_writel(val, PMC_SCRATCH0);
-
-        val = tegra_pmc_readl(0);
-        val |= 0x10;
-        tegra_pmc_writel(val, 0);
-}
-
-#ifdef CONFIG_PM_SLEEP
-static void set_power_timers(u32 us_on, u32 us_off, unsigned long rate)
-{
-        unsigned long long ticks;
-        unsigned long long pclk;
-        static unsigned long tegra_last_pclk;
-
-        if (WARN_ON_ONCE(rate <= 0))
-                pclk = 100000000;
-        else
-                pclk = rate;
-
-        if ((rate != tegra_last_pclk)) {
-                ticks = (us_on * pclk) + 999999ull;
-                do_div(ticks, 1000000);
-                tegra_pmc_writel((unsigned long)ticks, PMC_CPUPWRGOOD_TIMER);
-
-                ticks = (us_off * pclk) + 999999ull;
-                do_div(ticks, 1000000);
-                tegra_pmc_writel((unsigned long)ticks, PMC_CPUPWROFF_TIMER);
-                wmb();
-        }
-        tegra_last_pclk = pclk;
-}
-
-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, 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;
-        default:
-                break;
-        }
-
-        set_power_timers(pmc_pm_data.cpu_good_time, pmc_pm_data.cpu_off_time,
-                         rate);
-
-        tegra_pmc_writel(reg, PMC_CTRL);
-}
-
-void tegra_pmc_suspend_init(void)
-{
-        u32 reg;
-
-        /* Always enable CPU power request */
-        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
-
-static const struct of_device_id matches[] __initconst = {
-        { .compatible = "nvidia,tegra124-pmc" },
-        { .compatible = "nvidia,tegra114-pmc" },
-        { .compatible = "nvidia,tegra30-pmc" },
-        { .compatible = "nvidia,tegra20-pmc" },
-        { }
-};
-
-void __init tegra_pmc_init_irq(void)
-{
-        struct device_node *np;
-        u32 val;
-
-        np = of_find_matching_node(NULL, matches);
-        BUG_ON(!np);
-
-        tegra_pmc_base = of_iomap(np, 0);
-
-        tegra_pmc_invert_interrupt = of_property_read_bool(np,
-                                     "nvidia,invert-interrupt");
-
-        val = tegra_pmc_readl(PMC_CTRL);
-        if (tegra_pmc_invert_interrupt)
-                val |= PMC_CTRL_INTR_LOW;
-        else
-                val &= ~PMC_CTRL_INTR_LOW;
-        tegra_pmc_writel(val, PMC_CTRL);
-}
-
-void __init tegra_pmc_init(void)
-{
-        struct device_node *np;
-        u32 prop;
-        enum tegra_suspend_mode suspend_mode;
-        u32 core_good_time[2] = {0, 0};
-        u32 lp0_vec[2] = {0, 0};
-
-        np = of_find_matching_node(NULL, matches);
-        BUG_ON(!np);
-
-        tegra_pclk = of_clk_get_by_name(np, "pclk");
-        WARN_ON(IS_ERR(tegra_pclk));
-
-        /* Grabbing the power management configurations */
-        if (of_property_read_u32(np, "nvidia,suspend-mode", &prop)) {
-                suspend_mode = TEGRA_SUSPEND_NONE;
-        } else {
-                switch (prop) {
-                case 0:
-                        suspend_mode = TEGRA_SUSPEND_LP0;
-                        break;
-                case 1:
-                        suspend_mode = TEGRA_SUSPEND_LP1;
-                        break;
-                case 2:
-                        suspend_mode = TEGRA_SUSPEND_LP2;
-                        break;
-                default:
-                        suspend_mode = TEGRA_SUSPEND_NONE;
-                        break;
-                }
-        }
-        suspend_mode = tegra_pm_validate_suspend_mode(suspend_mode);
-
-        if (of_property_read_u32(np, "nvidia,cpu-pwr-good-time", &prop))
-                suspend_mode = TEGRA_SUSPEND_NONE;
-        pmc_pm_data.cpu_good_time = prop;
-
-        if (of_property_read_u32(np, "nvidia,cpu-pwr-off-time", &prop))
-                suspend_mode = TEGRA_SUSPEND_NONE;
-        pmc_pm_data.cpu_off_time = prop;
-
-        if (of_property_read_u32_array(np, "nvidia,core-pwr-good-time",
-                        core_good_time, ARRAY_SIZE(core_good_time)))
-                suspend_mode = TEGRA_SUSPEND_NONE;
-        pmc_pm_data.core_osc_time = core_good_time[0];
-        pmc_pm_data.core_pmu_time = core_good_time[1];
-
-        if (of_property_read_u32(np, "nvidia,core-pwr-off-time",
-                                 &prop))
-                suspend_mode = TEGRA_SUSPEND_NONE;
-        pmc_pm_data.core_off_time = prop;
-
-        pmc_pm_data.corereq_high = of_property_read_bool(np,
-                                "nvidia,core-power-req-active-high");
-
-        pmc_pm_data.sysclkreq_high = of_property_read_bool(np,
-                                "nvidia,sys-clock-req-active-high");
-
-        pmc_pm_data.combined_req = of_property_read_bool(np,
-                                "nvidia,combined-power-req");
-
-        pmc_pm_data.cpu_pwr_good_en = of_property_read_bool(np,
-                                "nvidia,cpu-pwr-good-en");
-
-        if (of_property_read_u32_array(np, "nvidia,lp0-vec", lp0_vec,
-                                       ARRAY_SIZE(lp0_vec)))
-                if (suspend_mode == TEGRA_SUSPEND_LP0)
-                        suspend_mode = TEGRA_SUSPEND_LP1;
-
-        pmc_pm_data.lp0_vec_phy_addr = lp0_vec[0];
-        pmc_pm_data.lp0_vec_size = lp0_vec[1];
-
-        pmc_pm_data.suspend_mode = suspend_mode;
-}
diff --git a/arch/arm/mach-tegra/pmc.h b/arch/arm/mach-tegra/pmc.h
deleted file mode 100644
index 59e19c344298..000000000000
--- a/arch/arm/mach-tegra/pmc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2012 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/>.
- *
- */
-
-#ifndef __MACH_TEGRA_PMC_H
-#define __MACH_TEGRA_PMC_H
-
-#include <linux/reboot.h>
-
-enum tegra_suspend_mode {
-        TEGRA_SUSPEND_NONE = 0,
-        TEGRA_SUSPEND_LP2,      /* CPU voltage off */
-        TEGRA_SUSPEND_LP1,      /* CPU voltage off, DRAM self-refresh */
-        TEGRA_SUSPEND_LP0,      /* CPU + core voltage off, DRAM self-refresh */
-        TEGRA_MAX_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
-
-bool tegra_pmc_cpu_is_powered(int cpuid);
-int tegra_pmc_cpu_power_on(int cpuid);
-int tegra_pmc_cpu_remove_clamping(int cpuid);
-
-void tegra_pmc_restart(enum reboot_mode mode, const char *cmd);
-
-void tegra_pmc_init_irq(void);
-void tegra_pmc_init(void);
-
-#endif
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
deleted file mode 100644
index 4cefc5cd6bed..000000000000
--- a/arch/arm/mach-tegra/powergate.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- * drivers/powergate/tegra-powergate.c
- *
- * Copyright (c) 2010 Google, Inc
- *
- * Author:
- *      Colin Cross <ccross@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.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/clk.h>
-#include <linux/debugfs.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/export.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/reset.h>
-#include <linux/seq_file.h>
-#include <linux/spinlock.h>
-#include <linux/clk/tegra.h>
-#include <linux/tegra-powergate.h>
-
-#include "fuse.h"
-#include "iomap.h"
-
-#define DPD_SAMPLE              0x020
-#define  DPD_SAMPLE_ENABLE      (1 << 0)
-#define  DPD_SAMPLE_DISABLE     (0 << 0)
-
-#define PWRGATE_TOGGLE          0x30
-#define  PWRGATE_TOGGLE_START   (1 << 8)
-
-#define REMOVE_CLAMPING         0x34
-
-#define PWRGATE_STATUS          0x38
-
-#define IO_DPD_REQ              0x1b8
-#define  IO_DPD_REQ_CODE_IDLE   (0 << 30)
-#define  IO_DPD_REQ_CODE_OFF    (1 << 30)
-#define  IO_DPD_REQ_CODE_ON     (2 << 30)
-#define  IO_DPD_REQ_CODE_MASK   (3 << 30)
-
-#define IO_DPD_STATUS           0x1bc
-#define IO_DPD2_REQ             0x1c0
-#define IO_DPD2_STATUS          0x1c4
-#define SEL_DPD_TIM             0x1c8
-
-#define GPU_RG_CNTRL            0x2d4
-
-static int tegra_num_powerdomains;
-static int tegra_num_cpu_domains;
-static const u8 *tegra_cpu_domains;
-
-static const u8 tegra30_cpu_domains[] = {
-        TEGRA_POWERGATE_CPU,
-        TEGRA_POWERGATE_CPU1,
-        TEGRA_POWERGATE_CPU2,
-        TEGRA_POWERGATE_CPU3,
-};
-
-static const u8 tegra114_cpu_domains[] = {
-        TEGRA_POWERGATE_CPU0,
-        TEGRA_POWERGATE_CPU1,
-        TEGRA_POWERGATE_CPU2,
-        TEGRA_POWERGATE_CPU3,
-};
-
-static const u8 tegra124_cpu_domains[] = {
-        TEGRA_POWERGATE_CPU0,
-        TEGRA_POWERGATE_CPU1,
-        TEGRA_POWERGATE_CPU2,
-        TEGRA_POWERGATE_CPU3,
-};
-
-static DEFINE_SPINLOCK(tegra_powergate_lock);
-
-static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
-
-static u32 pmc_read(unsigned long reg)
-{
-        return readl(pmc + reg);
-}
-
-static void pmc_write(u32 val, unsigned long reg)
-{
-        writel(val, pmc + reg);
-}
-
-static int tegra_powergate_set(int id, bool new_state)
-{
-        bool status;
-        unsigned long flags;
-
-        spin_lock_irqsave(&tegra_powergate_lock, flags);
-
-        status = pmc_read(PWRGATE_STATUS) & (1 << id);
-
-        if (status == new_state) {
-                spin_unlock_irqrestore(&tegra_powergate_lock, flags);
-                return 0;
-        }
-
-        pmc_write(PWRGATE_TOGGLE_START | id, PWRGATE_TOGGLE);
-
-        spin_unlock_irqrestore(&tegra_powergate_lock, flags);
-
-        return 0;
-}
-
-int tegra_powergate_power_on(int id)
-{
-        if (id < 0 || id >= tegra_num_powerdomains)
-                return -EINVAL;
-
-        return tegra_powergate_set(id, true);
-}
-
-int tegra_powergate_power_off(int id)
-{
-        if (id < 0 || id >= tegra_num_powerdomains)
-                return -EINVAL;
-
-        return tegra_powergate_set(id, false);
-}
-EXPORT_SYMBOL(tegra_powergate_power_off);
-
-int tegra_powergate_is_powered(int id)
-{
-        u32 status;
-
-        if (id < 0 || id >= tegra_num_powerdomains)
-                return -EINVAL;
-
-        status = pmc_read(PWRGATE_STATUS) & (1 << id);
-        return !!status;
-}
-
-int tegra_powergate_remove_clamping(int id)
-{
-        u32 mask;
-
-        if (id < 0 || id >= tegra_num_powerdomains)
-                return -EINVAL;
-
-        /*
-         * The Tegra124 GPU has a separate register (with different semantics)
-         * to remove clamps.
-         */
-        if (tegra_chip_id == TEGRA124) {
-                if (id == TEGRA_POWERGATE_3D) {
-                        pmc_write(0, GPU_RG_CNTRL);
-                        return 0;
-                }
-        }
-
-        /*
-         * Tegra 2 has a bug where PCIE and VDE clamping masks are
-         * swapped relatively to the partition ids
-         */
-        if (id == TEGRA_POWERGATE_VDEC)
-                mask = (1 << TEGRA_POWERGATE_PCIE);
-        else if (id == TEGRA_POWERGATE_PCIE)
-                mask = (1 << TEGRA_POWERGATE_VDEC);
-        else
-                mask = (1 << id);
-
-        pmc_write(mask, REMOVE_CLAMPING);
-
-        return 0;
-}
-EXPORT_SYMBOL(tegra_powergate_remove_clamping);
-
-/* Must be called with clk disabled, and returns with clk enabled */
-int tegra_powergate_sequence_power_up(int id, struct clk *clk,
-                                        struct reset_control *rst)
-{
-        int ret;
-
-        reset_control_assert(rst);
-
-        ret = tegra_powergate_power_on(id);
-        if (ret)
-                goto err_power;
-
-        ret = clk_prepare_enable(clk);
-        if (ret)
-                goto err_clk;
-
-        udelay(10);
-
-        ret = tegra_powergate_remove_clamping(id);
-        if (ret)
-                goto err_clamp;
-
-        udelay(10);
-        reset_control_deassert(rst);
-
-        return 0;
-
-err_clamp:
-        clk_disable_unprepare(clk);
-err_clk:
-        tegra_powergate_power_off(id);
-err_power:
-        return ret;
-}
-EXPORT_SYMBOL(tegra_powergate_sequence_power_up);
-
-int tegra_cpu_powergate_id(int cpuid)
-{
-        if (cpuid > 0 && cpuid < tegra_num_cpu_domains)
-                return tegra_cpu_domains[cpuid];
-
-        return -EINVAL;
-}
-
-int __init tegra_powergate_init(void)
-{
-        switch (tegra_chip_id) {
-        case TEGRA20:
-                tegra_num_powerdomains = 7;
-                break;
-        case TEGRA30:
-                tegra_num_powerdomains = 14;
-                tegra_num_cpu_domains = 4;
-                tegra_cpu_domains = tegra30_cpu_domains;
-                break;
-        case TEGRA114:
-                tegra_num_powerdomains = 23;
-                tegra_num_cpu_domains = 4;
-                tegra_cpu_domains = tegra114_cpu_domains;
-                break;
-        case TEGRA124:
-                tegra_num_powerdomains = 25;
-                tegra_num_cpu_domains = 4;
-                tegra_cpu_domains = tegra124_cpu_domains;
-                break;
-        default:
-                /* Unknown Tegra variant. Disable powergating */
-                tegra_num_powerdomains = 0;
-                break;
-        }
-
-        return 0;
-}
-
-#ifdef CONFIG_DEBUG_FS
-
-static const char * const *powergate_name;
-
-static const char * const powergate_name_t20[] = {
-        [TEGRA_POWERGATE_CPU]   = "cpu",
-        [TEGRA_POWERGATE_3D]    = "3d",
-        [TEGRA_POWERGATE_VENC]  = "venc",
-        [TEGRA_POWERGATE_VDEC]  = "vdec",
-        [TEGRA_POWERGATE_PCIE]  = "pcie",
-        [TEGRA_POWERGATE_L2]    = "l2",
-        [TEGRA_POWERGATE_MPE]   = "mpe",
-};
-
-static const char * const powergate_name_t30[] = {
-        [TEGRA_POWERGATE_CPU]   = "cpu0",
-        [TEGRA_POWERGATE_3D]    = "3d0",
-        [TEGRA_POWERGATE_VENC]  = "venc",
-        [TEGRA_POWERGATE_VDEC]  = "vdec",
-        [TEGRA_POWERGATE_PCIE]  = "pcie",
-        [TEGRA_POWERGATE_L2]    = "l2",
-        [TEGRA_POWERGATE_MPE]   = "mpe",
-        [TEGRA_POWERGATE_HEG]   = "heg",
-        [TEGRA_POWERGATE_SATA]  = "sata",
-        [TEGRA_POWERGATE_CPU1]  = "cpu1",
-        [TEGRA_POWERGATE_CPU2]  = "cpu2",
-        [TEGRA_POWERGATE_CPU3]  = "cpu3",
-        [TEGRA_POWERGATE_CELP]  = "celp",
-        [TEGRA_POWERGATE_3D1]   = "3d1",
-};
-
-static const char * const powergate_name_t114[] = {
-        [TEGRA_POWERGATE_CPU]   = "crail",
-        [TEGRA_POWERGATE_3D]    = "3d",
-        [TEGRA_POWERGATE_VENC]  = "venc",
-        [TEGRA_POWERGATE_VDEC]  = "vdec",
-        [TEGRA_POWERGATE_MPE]   = "mpe",
-        [TEGRA_POWERGATE_HEG]   = "heg",
-        [TEGRA_POWERGATE_CPU1]  = "cpu1",
-        [TEGRA_POWERGATE_CPU2]  = "cpu2",
-        [TEGRA_POWERGATE_CPU3]  = "cpu3",
-        [TEGRA_POWERGATE_CELP]  = "celp",
-        [TEGRA_POWERGATE_CPU0]  = "cpu0",
-        [TEGRA_POWERGATE_C0NC]  = "c0nc",
-        [TEGRA_POWERGATE_C1NC]  = "c1nc",
-        [TEGRA_POWERGATE_DIS]   = "dis",
-        [TEGRA_POWERGATE_DISB]  = "disb",
-        [TEGRA_POWERGATE_XUSBA] = "xusba",
-        [TEGRA_POWERGATE_XUSBB] = "xusbb",
-        [TEGRA_POWERGATE_XUSBC] = "xusbc",
-};
-
-static const char * const powergate_name_t124[] = {
-        [TEGRA_POWERGATE_CPU]   = "crail",
-        [TEGRA_POWERGATE_3D]    = "3d",
-        [TEGRA_POWERGATE_VENC]  = "venc",
-        [TEGRA_POWERGATE_PCIE]  = "pcie",
-        [TEGRA_POWERGATE_VDEC]  = "vdec",
-        [TEGRA_POWERGATE_L2]    = "l2",
-        [TEGRA_POWERGATE_MPE]   = "mpe",
-        [TEGRA_POWERGATE_HEG]   = "heg",
-        [TEGRA_POWERGATE_SATA]  = "sata",
-        [TEGRA_POWERGATE_CPU1]  = "cpu1",
-        [TEGRA_POWERGATE_CPU2]  = "cpu2",
-        [TEGRA_POWERGATE_CPU3]  = "cpu3",
-        [TEGRA_POWERGATE_CELP]  = "celp",
-        [TEGRA_POWERGATE_CPU0]  = "cpu0",
-        [TEGRA_POWERGATE_C0NC]  = "c0nc",
-        [TEGRA_POWERGATE_C1NC]  = "c1nc",
-        [TEGRA_POWERGATE_SOR]   = "sor",
-        [TEGRA_POWERGATE_DIS]   = "dis",
-        [TEGRA_POWERGATE_DISB]  = "disb",
-        [TEGRA_POWERGATE_XUSBA] = "xusba",
-        [TEGRA_POWERGATE_XUSBB] = "xusbb",
-        [TEGRA_POWERGATE_XUSBC] = "xusbc",
-        [TEGRA_POWERGATE_VIC]   = "vic",
-        [TEGRA_POWERGATE_IRAM]  = "iram",
-};
-
-static int powergate_show(struct seq_file *s, void *data)
-{
-        int i;
-
-        seq_printf(s, " powergate powered\n");
-        seq_printf(s, "------------------\n");
-
-        for (i = 0; i < tegra_num_powerdomains; i++) {
-                if (!powergate_name[i])
-                        continue;
-
-                seq_printf(s, " %9s %7s\n", powergate_name[i],
-                        tegra_powergate_is_powered(i) ? "yes" : "no");
-        }
-
-        return 0;
-}
-
-static int powergate_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, powergate_show, inode->i_private);
-}
-
-static const struct file_operations powergate_fops = {
-        .open           = powergate_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-int __init tegra_powergate_debugfs_init(void)
-{
-        struct dentry *d;
-
-        switch (tegra_chip_id) {
-        case TEGRA20:
-                powergate_name = powergate_name_t20;
-                break;
-        case TEGRA30:
-                powergate_name = powergate_name_t30;
-                break;
-        case TEGRA114:
-                powergate_name = powergate_name_t114;
-                break;
-        case TEGRA124:
-                powergate_name = powergate_name_t124;
-                break;
-        }
-
-        if (powergate_name) {
-                d = debugfs_create_file("powergate", S_IRUGO, NULL, NULL,
-                        &powergate_fops);
-                if (!d)
-                        return -ENOMEM;
-        }
-
-        return 0;
-}
-
-#endif
-
-static int tegra_io_rail_prepare(int id, unsigned long *request,
-                                 unsigned long *status, unsigned int *bit)
-{
-        unsigned long rate, value;
-        struct clk *clk;
-
-        *bit = id % 32;
-
-        /*
-         * There are two sets of 30 bits to select IO rails, but bits 30 and
-         * 31 are control bits rather than IO rail selection bits.
-         */
-        if (id > 63 || *bit == 30 || *bit == 31)
-                return -EINVAL;
-
-        if (id < 32) {
-                *status = IO_DPD_STATUS;
-                *request = IO_DPD_REQ;
-        } else {
-                *status = IO_DPD2_STATUS;
-                *request = IO_DPD2_REQ;
-        }
-
-        clk = clk_get_sys(NULL, "pclk");
-        if (IS_ERR(clk))
-                return PTR_ERR(clk);
-
-        rate = clk_get_rate(clk);
-        clk_put(clk);
-
-        pmc_write(DPD_SAMPLE_ENABLE, DPD_SAMPLE);
-
-        /* must be at least 200 ns, in APB (PCLK) clock cycles */
-        value = DIV_ROUND_UP(1000000000, rate);
-        value = DIV_ROUND_UP(200, value);
-        pmc_write(value, SEL_DPD_TIM);
-
-        return 0;
-}
-
-static int tegra_io_rail_poll(unsigned long offset, unsigned long mask,
-                              unsigned long val, unsigned long timeout)
-{
-        unsigned long value;
-
-        timeout = jiffies + msecs_to_jiffies(timeout);
-
-        while (time_after(timeout, jiffies)) {
-                value = pmc_read(offset);
-                if ((value & mask) == val)
-                        return 0;
-
-                usleep_range(250, 1000);
-        }
-
-        return -ETIMEDOUT;
-}
-
-static void tegra_io_rail_unprepare(void)
-{
-        pmc_write(DPD_SAMPLE_DISABLE, DPD_SAMPLE);
-}
-
-int tegra_io_rail_power_on(int id)
-{
-        unsigned long request, status, value;
-        unsigned int bit, mask;
-        int err;
-
-        err = tegra_io_rail_prepare(id, &request, &status, &bit);
-        if (err < 0)
-                return err;
-
-        mask = 1 << bit;
-
-        value = pmc_read(request);
-        value |= mask;
-        value &= ~IO_DPD_REQ_CODE_MASK;
-        value |= IO_DPD_REQ_CODE_OFF;
-        pmc_write(value, request);
-
-        err = tegra_io_rail_poll(status, mask, 0, 250);
-        if (err < 0)
-                return err;
-
-        tegra_io_rail_unprepare();
-
-        return 0;
-}
-EXPORT_SYMBOL(tegra_io_rail_power_on);
-
-int tegra_io_rail_power_off(int id)
-{
-        unsigned long request, status, value;
-        unsigned int bit, mask;
-        int err;
-
-        err = tegra_io_rail_prepare(id, &request, &status, &bit);
-        if (err < 0)
-                return err;
-
-        mask = 1 << bit;
-
-        value = pmc_read(request);
-        value |= mask;
-        value &= ~IO_DPD_REQ_CODE_MASK;
-        value |= IO_DPD_REQ_CODE_ON;
-        pmc_write(value, request);
-
-        err = tegra_io_rail_poll(status, mask, mask, 250);
-        if (err < 0)
-                return err;
-
-        tegra_io_rail_unprepare();
-
-        return 0;
-}
-EXPORT_SYMBOL(tegra_io_rail_power_off);
diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S
index 578d4d1ad648..7b2baab0f0bd 100644
--- a/arch/arm/mach-tegra/reset-handler.S
+++ b/arch/arm/mach-tegra/reset-handler.S
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/linkage.h>
 #include <linux/init.h>
+#include <linux/linkage.h>
+
+#include <soc/tegra/fuse.h>
 
-#include <asm/cache.h>
 #include <asm/asm-offsets.h>
+#include <asm/cache.h>
 
 #include "flowctrl.h"
-#include "fuse.h"
 #include "iomap.h"
 #include "reset.h"
 #include "sleep.h"
diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c
index 146fe8e0ae7c..894c5c472184 100644
--- a/arch/arm/mach-tegra/reset.c
+++ b/arch/arm/mach-tegra/reset.c
@@ -14,20 +14,21 @@
  *
  */
 
+#include <linux/bitops.h>
+#include <linux/cpumask.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/cpumask.h>
-#include <linux/bitops.h>
+
+#include <soc/tegra/fuse.h>
 
 #include <asm/cacheflush.h>
-#include <asm/hardware/cache-l2x0.h>
 #include <asm/firmware.h>
+#include <asm/hardware/cache-l2x0.h>
 
 #include "iomap.h"
 #include "irammap.h"
 #include "reset.h"
 #include "sleep.h"
-#include "fuse.h"
 
 #define TEGRA_IRAM_RESET_BASE (TEGRA_IRAM_BASE + \
                                 TEGRA_IRAM_RESET_HANDLER_OFFSET)
@@ -53,12 +54,10 @@ static void __init tegra_cpu_reset_handler_set(const u32 reset_address)
          * Prevent further modifications to the physical reset vector.
          *  NOTE: Has no effect on chips prior to Tegra30.
          */
-        if (tegra_chip_id != TEGRA20) {
-                reg = readl(sb_ctrl);
-                reg |= 2;
-                writel(reg, sb_ctrl);
-                wmb();
-        }
+        reg = readl(sb_ctrl);
+        reg |= 2;
+        writel(reg, sb_ctrl);
+        wmb();
 }
 
 static void __init tegra_cpu_reset_handler_enable(void)
diff --git a/arch/arm/mach-tegra/sleep-tegra20.S b/arch/arm/mach-tegra/sleep-tegra20.S
index aaaf3abd2688..be4bc5f853f5 100644
--- a/arch/arm/mach-tegra/sleep-tegra20.S
+++ b/arch/arm/mach-tegra/sleep-tegra20.S
@@ -78,7 +78,7 @@ ENTRY(tegra20_hotplug_shutdown)
         /* Put this CPU down */
         cpu_id  r0
         bl      tegra20_cpu_shutdown
-        mov     pc, lr                  @ should never get here
+        ret     lr                      @ should never get here
 ENDPROC(tegra20_hotplug_shutdown)
 
 /*
@@ -96,7 +96,7 @@ ENDPROC(tegra20_hotplug_shutdown)
  */
 ENTRY(tegra20_cpu_shutdown)
         cmp     r0, #0
-        moveq   pc, lr                  @ must not be called for CPU 0
+        reteq   lr                      @ must not be called for CPU 0
         mov32   r1, TEGRA_PMC_VIRT + PMC_SCRATCH41
         mov     r12, #CPU_RESETTABLE
         str     r12, [r1]
@@ -117,7 +117,7 @@ ENTRY(tegra20_cpu_shutdown)
         cpu_id  r3
         cmp     r3, r0
         beq     .
-        mov     pc, lr
+        ret     lr
 ENDPROC(tegra20_cpu_shutdown)
 #endif
 
@@ -164,7 +164,7 @@ ENTRY(tegra_pen_lock)
         cmpeq   r12, r0                 @ !turn == cpu?
         beq     1b                      @ while !turn == cpu && flag[!cpu] == 1
 
-        mov     pc, lr                  @ locked
+        ret     lr                      @ locked
 ENDPROC(tegra_pen_lock)
 
 ENTRY(tegra_pen_unlock)
@@ -176,7 +176,7 @@ ENTRY(tegra_pen_unlock)
         addne   r2, r3, #PMC_SCRATCH39
         mov     r12, #0
         str     r12, [r2]
-        mov     pc, lr
+        ret     lr
 ENDPROC(tegra_pen_unlock)
 
 /*
@@ -189,7 +189,7 @@ ENTRY(tegra20_cpu_clear_resettable)
         mov32   r1, TEGRA_PMC_VIRT + PMC_SCRATCH41
         mov     r12, #CPU_NOT_RESETTABLE
         str     r12, [r1]
-        mov     pc, lr
+        ret     lr
 ENDPROC(tegra20_cpu_clear_resettable)
 
 /*
@@ -202,7 +202,7 @@ ENTRY(tegra20_cpu_set_resettable_soon)
         mov32   r1, TEGRA_PMC_VIRT + PMC_SCRATCH41
         mov     r12, #CPU_RESETTABLE_SOON
         str     r12, [r1]
-        mov     pc, lr
+        ret     lr
 ENDPROC(tegra20_cpu_set_resettable_soon)
 
 /*
@@ -217,7 +217,7 @@ ENTRY(tegra20_cpu_is_resettable_soon)
         cmp     r12, #CPU_RESETTABLE_SOON
         moveq   r0, #1
         movne   r0, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(tegra20_cpu_is_resettable_soon)
 
 /*
@@ -239,7 +239,7 @@ ENTRY(tegra20_sleep_core_finish)
         mov32   r1, TEGRA_IRAM_LPx_RESUME_AREA
         add     r0, r0, r1
 
-        mov     pc, r3
+        ret     r3
 ENDPROC(tegra20_sleep_core_finish)
 
 /*
@@ -402,7 +402,7 @@ exit_selfrefresh_loop:
 
         mov32   r0, TEGRA_PMC_BASE
         ldr     r0, [r0, #PMC_SCRATCH41]
-        mov     pc, r0                  @ jump to tegra_resume
+        ret     r0                      @ jump to tegra_resume
 ENDPROC(tegra20_lp1_reset)
 
 /*
@@ -455,7 +455,7 @@ tegra20_switch_cpu_to_clk32k:
         mov     r0, #0  /* brust policy = 32KHz */
         str     r0, [r5, #CLK_RESET_SCLK_BURST]
 
-        mov     pc, lr
+        ret     lr
 
 /*
  * tegra20_enter_sleep
@@ -535,7 +535,7 @@ padsave_done:
         adr     r2, tegra20_sclk_save
         str     r0, [r2]
         dsb
-        mov     pc, lr
+        ret     lr
 
 tegra20_sdram_pad_address:
         .word   TEGRA_APB_MISC_BASE + APB_MISC_XM2CFGCPADCTRL
diff --git a/arch/arm/mach-tegra/sleep-tegra30.S b/arch/arm/mach-tegra/sleep-tegra30.S
index b16d4a57fa59..5d8d13aeab93 100644
--- a/arch/arm/mach-tegra/sleep-tegra30.S
+++ b/arch/arm/mach-tegra/sleep-tegra30.S
@@ -16,14 +16,15 @@
 
 #include <linux/linkage.h>
 
-#include <asm/assembler.h>
+#include <soc/tegra/fuse.h>
+
 #include <asm/asm-offsets.h>
+#include <asm/assembler.h>
 #include <asm/cache.h>
 
+#include "flowctrl.h"
 #include "irammap.h"
-#include "fuse.h"
 #include "sleep.h"
-#include "flowctrl.h"
 
 #define EMC_CFG                         0xc
 #define EMC_ADR_CFG                     0x10
@@ -142,7 +143,7 @@ ENTRY(tegra30_hotplug_shutdown)
         /* Powergate this CPU */
         mov     r0, #TEGRA30_POWER_HOTPLUG_SHUTDOWN
         bl      tegra30_cpu_shutdown
-        mov     pc, lr                  @ should never get here
+        ret     lr                      @ should never get here
 ENDPROC(tegra30_hotplug_shutdown)
 
 /*
@@ -161,7 +162,7 @@ ENTRY(tegra30_cpu_shutdown)
         bne     _no_cpu0_chk    @ It's not Tegra30
 
         cmp     r3, #0
-        moveq   pc, lr          @ Must never be called for CPU 0
+        reteq   lr              @ Must never be called for CPU 0
 _no_cpu0_chk:
 
         ldr     r12, =TEGRA_FLOW_CTRL_VIRT
@@ -266,7 +267,7 @@ ENTRY(tegra30_sleep_core_finish)
         mov32   r1, TEGRA_IRAM_LPx_RESUME_AREA
         add     r0, r0, r1
 
-        mov     pc, r3
+        ret     r3
 ENDPROC(tegra30_sleep_core_finish)
 
 /*
@@ -285,7 +286,7 @@ ENTRY(tegra30_sleep_cpu_secondary_finish)
         mov     r0, #0                          @ power mode flags (!hotplug)
         bl      tegra30_cpu_shutdown
         mov     r0, #1                          @ never return here
-        mov     pc, r7
+        ret     r7
 ENDPROC(tegra30_sleep_cpu_secondary_finish)
 
 /*
@@ -529,7 +530,7 @@ __no_dual_emc_chanl:
 
         mov32   r0, TEGRA_PMC_BASE
         ldr     r0, [r0, #PMC_SCRATCH41]
-        mov     pc, r0                  @ jump to tegra_resume
+        ret     r0                      @ jump to tegra_resume
 ENDPROC(tegra30_lp1_reset)
 
         .align  L1_CACHE_SHIFT
@@ -659,7 +660,7 @@ _no_pll_in_iddq:
         mov     r0, #0  /* brust policy = 32KHz */
         str     r0, [r5, #CLK_RESET_SCLK_BURST]
 
-        mov     pc, lr
+        ret     lr
 
 /*
  * tegra30_enter_sleep
@@ -819,7 +820,7 @@ pmc_io_dpd_skip:
 
         dsb
 
-        mov     pc, lr
+        ret     lr
 
         .ltorg
 /* dummy symbol for end of IRAM */
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
index 8d06213fbc47..f024a5109e8e 100644
--- a/arch/arm/mach-tegra/sleep.S
+++ b/arch/arm/mach-tegra/sleep.S
@@ -87,7 +87,7 @@ ENTRY(tegra_init_l2_for_a15)
         mcrne   p15, 0x1, r0, c9, c0, 2
 _exit_init_l2_a15:
 
-        mov     pc, lr
+        ret     lr
 ENDPROC(tegra_init_l2_for_a15)
 
 /*
@@ -111,7 +111,7 @@ ENTRY(tegra_sleep_cpu_finish)
         add     r3, r3, r0
         mov     r0, r1
 
-        mov     pc, r3
+        ret     r3
 ENDPROC(tegra_sleep_cpu_finish)
 
 /*
@@ -139,7 +139,7 @@ ENTRY(tegra_shut_off_mmu)
         moveq   r3, #0
         streq   r3, [r2, #L2X0_CTRL]
 #endif
-        mov     pc, r0
+        ret     r0
 ENDPROC(tegra_shut_off_mmu)
         .popsection
 
@@ -156,6 +156,6 @@ ENTRY(tegra_switch_cpu_to_pllp)
         str     r0, [r5, #CLK_RESET_CCLK_BURST]
         mov     r0, #0
         str     r0, [r5, #CLK_RESET_CCLK_DIVIDER]
-        mov     pc, lr
+        ret     lr
 ENDPROC(tegra_switch_cpu_to_pllp)
 #endif
diff --git a/arch/arm/mach-tegra/sleep.h b/arch/arm/mach-tegra/sleep.h
index 339fe42cd6fb..92d46ec1361a 100644
--- a/arch/arm/mach-tegra/sleep.h
+++ b/arch/arm/mach-tegra/sleep.h
@@ -130,9 +130,6 @@ void tegra_disable_clean_inv_dcache(u32 flag);
 #ifdef CONFIG_HOTPLUG_CPU
 void tegra20_hotplug_shutdown(void);
 void tegra30_hotplug_shutdown(void);
-void tegra_hotplug_init(void);
-#else
-static inline void tegra_hotplug_init(void) {}
 #endif
 
 void tegra20_cpu_shutdown(int cpu);
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c
index 15ac9fcc96b1..5ef5173dec83 100644
--- a/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c
@@ -16,40 +16,40 @@
  *
  */
 
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/serial_8250.h>
 #include <linux/clk.h>
+#include <linux/clk/tegra.h>
 #include <linux/dma-mapping.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/irqchip.h>
 #include <linux/irqdomain.h>
-#include <linux/of.h>
+#include <linux/kernel.h>
 #include <linux/of_address.h>
 #include <linux/of_fdt.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/pda_power.h>
-#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/serial_8250.h>
 #include <linux/slab.h>
 #include <linux/sys_soc.h>
 #include <linux/usb/tegra_usb_phy.h>
-#include <linux/clk/tegra.h>
-#include <linux/irqchip.h>
+
+#include <soc/tegra/fuse.h>
+#include <soc/tegra/pmc.h>
 
 #include <asm/hardware/cache-l2x0.h>
-#include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
+#include <asm/mach-types.h>
 #include <asm/setup.h>
 #include <asm/trusted_foundations.h>
 
-#include "apbio.h"
 #include "board.h"
 #include "common.h"
 #include "cpuidle.h"
-#include "fuse.h"
 #include "iomap.h"
 #include "irq.h"
-#include "pmc.h"
 #include "pm.h"
 #include "reset.h"
 #include "sleep.h"
@@ -73,16 +73,11 @@ u32 tegra_uart_config[3] = {
 static void __init tegra_init_early(void)
 {
         of_register_trusted_foundations();
-        tegra_apb_io_init();
-        tegra_init_fuse();
         tegra_cpu_reset_handler_init();
-        tegra_powergate_init();
-        tegra_hotplug_init();
 }
 
 static void __init tegra_dt_init_irq(void)
 {
-        tegra_pmc_init_irq();
         tegra_init_irq();
         irqchip_init();
         tegra_legacy_irq_syscore_init();
@@ -94,8 +89,6 @@ static void __init tegra_dt_init(void)
         struct soc_device *soc_dev;
         struct device *parent = NULL;
 
-        tegra_pmc_init();
-
         tegra_clocks_apply_init_table();
 
         soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
@@ -103,8 +96,9 @@ static void __init tegra_dt_init(void)
                 goto out;
 
         soc_dev_attr->family = kasprintf(GFP_KERNEL, "Tegra");
-        soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d", tegra_revision);
-        soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%d", tegra_chip_id);
+        soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d",
+                                           tegra_sku_info.revision);
+        soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%u", tegra_get_chip_id());
 
         soc_dev = soc_device_register(soc_dev_attr);
         if (IS_ERR(soc_dev)) {
@@ -144,7 +138,6 @@ static void __init tegra_dt_init_late(void)
 
         tegra_init_suspend();
         tegra_cpuidle_init();
-        tegra_powergate_debugfs_init();
 
         for (i = 0; i < ARRAY_SIZE(board_init_funcs); i++) {
                 if (of_machine_is_compatible(board_init_funcs[i].machine)) {
diff --git a/arch/arm/mach-tegra/tegra114_speedo.c b/arch/arm/mach-tegra/tegra114_speedo.c
deleted file mode 100644
index 5218d4853cd3..000000000000
--- a/arch/arm/mach-tegra/tegra114_speedo.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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 <linux/bug.h>
-
-#include "fuse.h"
-
-#define CORE_PROCESS_CORNERS_NUM        2
-#define CPU_PROCESS_CORNERS_NUM         2
-
-enum {
-        THRESHOLD_INDEX_0,
-        THRESHOLD_INDEX_1,
-        THRESHOLD_INDEX_COUNT,
-};
-
-static const u32 core_process_speedos[][CORE_PROCESS_CORNERS_NUM] = {
-        {1123,     UINT_MAX},
-        {0,        UINT_MAX},
-};
-
-static const u32 cpu_process_speedos[][CPU_PROCESS_CORNERS_NUM] = {
-        {1695,     UINT_MAX},
-        {0,        UINT_MAX},
-};
-
-static void rev_sku_to_speedo_ids(int rev, int sku, int *threshold)
-{
-        u32 tmp;
-
-        switch (sku) {
-        case 0x00:
-        case 0x10:
-        case 0x05:
-        case 0x06:
-                tegra_cpu_speedo_id = 1;
-                tegra_soc_speedo_id = 0;
-                *threshold = THRESHOLD_INDEX_0;
-                break;
-
-        case 0x03:
-        case 0x04:
-                tegra_cpu_speedo_id = 2;
-                tegra_soc_speedo_id = 1;
-                *threshold = THRESHOLD_INDEX_1;
-                break;
-
-        default:
-                pr_err("Tegra114 Unknown SKU %d\n", sku);
-                tegra_cpu_speedo_id = 0;
-                tegra_soc_speedo_id = 0;
-                *threshold = THRESHOLD_INDEX_0;
-                break;
-        }
-
-        if (rev == TEGRA_REVISION_A01) {
-                tmp = tegra_fuse_readl(0x270) << 1;
-                tmp |= tegra_fuse_readl(0x26c);
-                if (!tmp)
-                        tegra_cpu_speedo_id = 0;
-        }
-}
-
-void tegra114_init_speedo_data(void)
-{
-        u32 cpu_speedo_val;
-        u32 core_speedo_val;
-        int threshold;
-        int i;
-
-        BUILD_BUG_ON(ARRAY_SIZE(cpu_process_speedos) !=
-                        THRESHOLD_INDEX_COUNT);
-        BUILD_BUG_ON(ARRAY_SIZE(core_process_speedos) !=
-                        THRESHOLD_INDEX_COUNT);
-
-        rev_sku_to_speedo_ids(tegra_revision, tegra_sku_id, &threshold);
-
-        cpu_speedo_val = tegra_fuse_readl(0x12c) + 1024;
-        core_speedo_val = tegra_fuse_readl(0x134);
-
-        for (i = 0; i < CPU_PROCESS_CORNERS_NUM; i++)
-                if (cpu_speedo_val < cpu_process_speedos[threshold][i])
-                        break;
-        tegra_cpu_process_id = i;
-
-        for (i = 0; i < CORE_PROCESS_CORNERS_NUM; i++)
-                if (core_speedo_val < core_process_speedos[threshold][i])
-                        break;
-        tegra_core_process_id = i;
-}
diff --git a/arch/arm/mach-tegra/tegra20_speedo.c b/arch/arm/mach-tegra/tegra20_speedo.c
deleted file mode 100644
index fa6eb570623f..000000000000
--- a/arch/arm/mach-tegra/tegra20_speedo.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2012, 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 <linux/bug.h>
-
-#include "fuse.h"
-
-#define CPU_SPEEDO_LSBIT                20
-#define CPU_SPEEDO_MSBIT                29
-#define CPU_SPEEDO_REDUND_LSBIT         30
-#define CPU_SPEEDO_REDUND_MSBIT         39
-#define CPU_SPEEDO_REDUND_OFFS  (CPU_SPEEDO_REDUND_MSBIT - CPU_SPEEDO_MSBIT)
-
-#define CORE_SPEEDO_LSBIT               40
-#define CORE_SPEEDO_MSBIT               47
-#define CORE_SPEEDO_REDUND_LSBIT        48
-#define CORE_SPEEDO_REDUND_MSBIT        55
-#define CORE_SPEEDO_REDUND_OFFS (CORE_SPEEDO_REDUND_MSBIT - CORE_SPEEDO_MSBIT)
-
-#define SPEEDO_MULT                     4
-
-#define PROCESS_CORNERS_NUM             4
-
-#define SPEEDO_ID_SELECT_0(rev)         ((rev) <= 2)
-#define SPEEDO_ID_SELECT_1(sku)         \
-        (((sku) != 20) && ((sku) != 23) && ((sku) != 24) && \
-         ((sku) != 27) && ((sku) != 28))
-
-enum {
-        SPEEDO_ID_0,
-        SPEEDO_ID_1,
-        SPEEDO_ID_2,
-        SPEEDO_ID_COUNT,
-};
-
-static const u32 cpu_process_speedos[][PROCESS_CORNERS_NUM] = {
-        {315, 366, 420, UINT_MAX},
-        {303, 368, 419, UINT_MAX},
-        {316, 331, 383, UINT_MAX},
-};
-
-static const u32 core_process_speedos[][PROCESS_CORNERS_NUM] = {
-        {165, 195, 224, UINT_MAX},
-        {165, 195, 224, UINT_MAX},
-        {165, 195, 224, UINT_MAX},
-};
-
-void tegra20_init_speedo_data(void)
-{
-        u32 reg;
-        u32 val;
-        int i;
-
-        BUILD_BUG_ON(ARRAY_SIZE(cpu_process_speedos) != SPEEDO_ID_COUNT);
-        BUILD_BUG_ON(ARRAY_SIZE(core_process_speedos) != SPEEDO_ID_COUNT);
-
-        if (SPEEDO_ID_SELECT_0(tegra_revision))
-                tegra_soc_speedo_id = SPEEDO_ID_0;
-        else if (SPEEDO_ID_SELECT_1(tegra_sku_id))
-                tegra_soc_speedo_id = SPEEDO_ID_1;
-        else
-                tegra_soc_speedo_id = SPEEDO_ID_2;
-
-        val = 0;
-        for (i = CPU_SPEEDO_MSBIT; i >= CPU_SPEEDO_LSBIT; i--) {
-                reg = tegra_spare_fuse(i) |
-                        tegra_spare_fuse(i + CPU_SPEEDO_REDUND_OFFS);
-                val = (val << 1) | (reg & 0x1);
-        }
-        val = val * SPEEDO_MULT;
-        pr_debug("%s CPU speedo value %u\n", __func__, val);
-
-        for (i = 0; i < (PROCESS_CORNERS_NUM - 1); i++) {
-                if (val <= cpu_process_speedos[tegra_soc_speedo_id][i])
-                        break;
-        }
-        tegra_cpu_process_id = i;
-
-        val = 0;
-        for (i = CORE_SPEEDO_MSBIT; i >= CORE_SPEEDO_LSBIT; i--) {
-                reg = tegra_spare_fuse(i) |
-                        tegra_spare_fuse(i + CORE_SPEEDO_REDUND_OFFS);
-                val = (val << 1) | (reg & 0x1);
-        }
-        val = val * SPEEDO_MULT;
-        pr_debug("%s Core speedo value %u\n", __func__, val);
-
-        for (i = 0; i < (PROCESS_CORNERS_NUM - 1); i++) {
-                if (val <= core_process_speedos[tegra_soc_speedo_id][i])
-                        break;
-        }
-        tegra_core_process_id = i;
-
-        pr_info("Tegra20 Soc Speedo ID %d", tegra_soc_speedo_id);
-}
diff --git a/arch/arm/mach-tegra/tegra30_speedo.c b/arch/arm/mach-tegra/tegra30_speedo.c
deleted file mode 100644
index 125cb16424a6..000000000000
--- a/arch/arm/mach-tegra/tegra30_speedo.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2012, 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 <linux/bug.h>
-
-#include "fuse.h"
-
-#define CORE_PROCESS_CORNERS_NUM        1
-#define CPU_PROCESS_CORNERS_NUM         6
-
-#define FUSE_SPEEDO_CALIB_0     0x114
-#define FUSE_PACKAGE_INFO       0X1FC
-#define FUSE_TEST_PROG_VER      0X128
-
-#define G_SPEEDO_BIT_MINUS1     58
-#define G_SPEEDO_BIT_MINUS1_R   59
-#define G_SPEEDO_BIT_MINUS2     60
-#define G_SPEEDO_BIT_MINUS2_R   61
-#define LP_SPEEDO_BIT_MINUS1    62
-#define LP_SPEEDO_BIT_MINUS1_R  63
-#define LP_SPEEDO_BIT_MINUS2    64
-#define LP_SPEEDO_BIT_MINUS2_R  65
-
-enum {
-        THRESHOLD_INDEX_0,
-        THRESHOLD_INDEX_1,
-        THRESHOLD_INDEX_2,
-        THRESHOLD_INDEX_3,
-        THRESHOLD_INDEX_4,
-        THRESHOLD_INDEX_5,
-        THRESHOLD_INDEX_6,
-        THRESHOLD_INDEX_7,
-        THRESHOLD_INDEX_8,
-        THRESHOLD_INDEX_9,
-        THRESHOLD_INDEX_10,
-        THRESHOLD_INDEX_11,
-        THRESHOLD_INDEX_COUNT,
-};
-
-static const u32 core_process_speedos[][CORE_PROCESS_CORNERS_NUM] = {
-        {180},
-        {170},
-        {195},
-        {180},
-        {168},
-        {192},
-        {180},
-        {170},
-        {195},
-        {180},
-        {180},
-        {180},
-};
-
-static const u32 cpu_process_speedos[][CPU_PROCESS_CORNERS_NUM] = {
-        {306, 338, 360, 376, UINT_MAX},
-        {295, 336, 358, 375, UINT_MAX},
-        {325, 325, 358, 375, UINT_MAX},
-        {325, 325, 358, 375, UINT_MAX},
-        {292, 324, 348, 364, UINT_MAX},
-        {324, 324, 348, 364, UINT_MAX},
-        {324, 324, 348, 364, UINT_MAX},
-        {295, 336, 358, 375, UINT_MAX},
-        {358, 358, 358, 358, 397, UINT_MAX},
-        {364, 364, 364, 364, 397, UINT_MAX},
-        {295, 336, 358, 375, 391, UINT_MAX},
-        {295, 336, 358, 375, 391, UINT_MAX},
-};
-
-static int threshold_index;
-static int package_id;
-
-static void fuse_speedo_calib(u32 *speedo_g, u32 *speedo_lp)
-{
-        u32 reg;
-        int ate_ver;
-        int bit_minus1;
-        int bit_minus2;
-
-        reg = tegra_fuse_readl(FUSE_SPEEDO_CALIB_0);
-
-        *speedo_lp = (reg & 0xFFFF) * 4;
-        *speedo_g = ((reg >> 16) & 0xFFFF) * 4;
-
-        ate_ver = tegra_fuse_readl(FUSE_TEST_PROG_VER);
-        pr_info("%s: ATE prog ver %d.%d\n", __func__, ate_ver/10, ate_ver%10);
-
-        if (ate_ver >= 26) {
-                bit_minus1 = tegra_spare_fuse(LP_SPEEDO_BIT_MINUS1);
-                bit_minus1 |= tegra_spare_fuse(LP_SPEEDO_BIT_MINUS1_R);
-                bit_minus2 = tegra_spare_fuse(LP_SPEEDO_BIT_MINUS2);
-                bit_minus2 |= tegra_spare_fuse(LP_SPEEDO_BIT_MINUS2_R);
-                *speedo_lp |= (bit_minus1 << 1) | bit_minus2;
-
-                bit_minus1 = tegra_spare_fuse(G_SPEEDO_BIT_MINUS1);
-                bit_minus1 |= tegra_spare_fuse(G_SPEEDO_BIT_MINUS1_R);
-                bit_minus2 = tegra_spare_fuse(G_SPEEDO_BIT_MINUS2);
-                bit_minus2 |= tegra_spare_fuse(G_SPEEDO_BIT_MINUS2_R);
-                *speedo_g |= (bit_minus1 << 1) | bit_minus2;
-        } else {
-                *speedo_lp |= 0x3;
-                *speedo_g |= 0x3;
-        }
-}
-
-static void rev_sku_to_speedo_ids(int rev, int sku)
-{
-        switch (rev) {
-        case TEGRA_REVISION_A01:
-                tegra_cpu_speedo_id = 0;
-                tegra_soc_speedo_id = 0;
-                threshold_index = THRESHOLD_INDEX_0;
-                break;
-        case TEGRA_REVISION_A02:
-        case TEGRA_REVISION_A03:
-                switch (sku) {
-                case 0x87:
-                case 0x82:
-                        tegra_cpu_speedo_id = 1;
-                        tegra_soc_speedo_id = 1;
-                        threshold_index = THRESHOLD_INDEX_1;
-                        break;
-                case 0x81:
-                        switch (package_id) {
-                        case 1:
-                                tegra_cpu_speedo_id = 2;
-                                tegra_soc_speedo_id = 2;
-                                threshold_index = THRESHOLD_INDEX_2;
-                                break;
-                        case 2:
-                                tegra_cpu_speedo_id = 4;
-                                tegra_soc_speedo_id = 1;
-                                threshold_index = THRESHOLD_INDEX_7;
-                                break;
-                        default:
-                                pr_err("Tegra30: Unknown pkg %d\n", package_id);
-                                BUG();
-                                break;
-                        }
-                        break;
-                case 0x80:
-                        switch (package_id) {
-                        case 1:
-                                tegra_cpu_speedo_id = 5;
-                                tegra_soc_speedo_id = 2;
-                                threshold_index = THRESHOLD_INDEX_8;
-                                break;
-                        case 2:
-                                tegra_cpu_speedo_id = 6;
-                                tegra_soc_speedo_id = 2;
-                                threshold_index = THRESHOLD_INDEX_9;
-                                break;
-                        default:
-                                pr_err("Tegra30: Unknown pkg %d\n", package_id);
-                                BUG();
-                                break;
-                        }
-                        break;
-                case 0x83:
-                        switch (package_id) {
-                        case 1:
-                                tegra_cpu_speedo_id = 7;
-                                tegra_soc_speedo_id = 1;
-                                threshold_index = THRESHOLD_INDEX_10;
-                                break;
-                        case 2:
-                                tegra_cpu_speedo_id = 3;
-                                tegra_soc_speedo_id = 2;
-                                threshold_index = THRESHOLD_INDEX_3;
-                                break;
-                        default:
-                                pr_err("Tegra30: Unknown pkg %d\n", package_id);
-                                BUG();
-                                break;
-                        }
-                        break;
-                case 0x8F:
-                        tegra_cpu_speedo_id = 8;
-                        tegra_soc_speedo_id = 1;
-                        threshold_index = THRESHOLD_INDEX_11;
-                        break;
-                case 0x08:
-                        tegra_cpu_speedo_id = 1;
-                        tegra_soc_speedo_id = 1;
-                        threshold_index = THRESHOLD_INDEX_4;
-                        break;
-                case 0x02:
-                        tegra_cpu_speedo_id = 2;
-                        tegra_soc_speedo_id = 2;
-                        threshold_index = THRESHOLD_INDEX_5;
-                        break;
-                case 0x04:
-                        tegra_cpu_speedo_id = 3;
-                        tegra_soc_speedo_id = 2;
-                        threshold_index = THRESHOLD_INDEX_6;
-                        break;
-                case 0:
-                        switch (package_id) {
-                        case 1:
-                                tegra_cpu_speedo_id = 2;
-                                tegra_soc_speedo_id = 2;
-                                threshold_index = THRESHOLD_INDEX_2;
-                                break;
-                        case 2:
-                                tegra_cpu_speedo_id = 3;
-                                tegra_soc_speedo_id = 2;
-                                threshold_index = THRESHOLD_INDEX_3;
-                                break;
-                        default:
-                                pr_err("Tegra30: Unknown pkg %d\n", package_id);
-                                BUG();
-                                break;
-                        }
-                        break;
-                default:
-                        pr_warn("Tegra30: Unknown SKU %d\n", sku);
-                        tegra_cpu_speedo_id = 0;
-                        tegra_soc_speedo_id = 0;
-                        threshold_index = THRESHOLD_INDEX_0;
-                        break;
-                }
-                break;
-        default:
-                pr_warn("Tegra30: Unknown chip rev %d\n", rev);
-                tegra_cpu_speedo_id = 0;
-                tegra_soc_speedo_id = 0;
-                threshold_index = THRESHOLD_INDEX_0;
-                break;
-        }
-}
-
-void tegra30_init_speedo_data(void)
-{
-        u32 cpu_speedo_val;
-        u32 core_speedo_val;
-        int i;
-
-        BUILD_BUG_ON(ARRAY_SIZE(cpu_process_speedos) !=
-                        THRESHOLD_INDEX_COUNT);
-        BUILD_BUG_ON(ARRAY_SIZE(core_process_speedos) !=
-                        THRESHOLD_INDEX_COUNT);
-
-        package_id = tegra_fuse_readl(FUSE_PACKAGE_INFO) & 0x0F;
-
-        rev_sku_to_speedo_ids(tegra_revision, tegra_sku_id);
-        fuse_speedo_calib(&cpu_speedo_val, &core_speedo_val);
-        pr_debug("%s CPU speedo value %u\n", __func__, cpu_speedo_val);
-        pr_debug("%s Core speedo value %u\n", __func__, core_speedo_val);
-
-        for (i = 0; i < CPU_PROCESS_CORNERS_NUM; i++) {
-                if (cpu_speedo_val < cpu_process_speedos[threshold_index][i])
-                        break;
-        }
-        tegra_cpu_process_id = i - 1;
-
-        if (tegra_cpu_process_id == -1) {
-                pr_warn("Tegra30: CPU speedo value %3d out of range",
-                       cpu_speedo_val);
-                tegra_cpu_process_id = 0;
-                tegra_cpu_speedo_id = 1;
-        }
-
-        for (i = 0; i < CORE_PROCESS_CORNERS_NUM; i++) {
-                if (core_speedo_val < core_process_speedos[threshold_index][i])
-                        break;
-        }
-        tegra_core_process_id = i - 1;
-
-        if (tegra_core_process_id == -1) {
-                pr_warn("Tegra30: CORE speedo value %3d out of range",
-                       core_speedo_val);
-                tegra_core_process_id = 0;
-                tegra_soc_speedo_id = 1;
-        }
-
-        pr_info("Tegra30: CPU Speedo ID %d, Soc Speedo ID %d",
-                tegra_cpu_speedo_id, tegra_soc_speedo_id);
-}
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index a4e139aa2441..32d744e91ec2 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -796,7 +796,7 @@ static struct ab8500_regulator_reg_init ab8505_reg_init[] = {
         INIT_REGULATOR_REGISTER(AB8505_CTRLVAUX6,              0x00, 0x00),
 };
 
-struct regulator_init_data ab8505_regulators[AB8505_NUM_REGULATORS] = {
+static struct regulator_init_data ab8505_regulators[AB8505_NUM_REGULATORS] = {
         /* supplies to the display/camera */
         [AB8505_LDO_AUX1] = {
                 .constraints = {
diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c
index 842ebedbdd1c..e97ee556f92f 100644
--- a/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@ -7,17 +7,15 @@
 #include <linux/io.h>
 #include <linux/of.h>
 
-#include <asm/cacheflush.h>
 #include <asm/hardware/cache-l2x0.h>
 
 #include "db8500-regs.h"
 #include "id.h"
 
-static void __iomem *l2x0_base;
-
 static int __init ux500_l2x0_unlock(void)
 {
         int i;
+        void __iomem *l2x0_base = __io_address(U8500_L2CC_BASE);
 
         /*
          * Unlock Data and Instruction Lock if locked. Ux500 U-Boot versions
@@ -45,23 +43,15 @@ static void ux500_l2c310_write_sec(unsigned long val, unsigned reg)
 
 static int __init ux500_l2x0_init(void)
 {
-        if (cpu_is_u8500_family() || cpu_is_ux540_family())
-                l2x0_base = __io_address(U8500_L2CC_BASE);
-        else
-                /* Non-Ux500 platform */
+        /* Multiplatform guard */
+        if (!((cpu_is_u8500_family() || cpu_is_ux540_family())))
                 return -ENODEV;
 
         /* Unlock before init */
         ux500_l2x0_unlock();
-
         outer_cache.write_sec = ux500_l2c310_write_sec;
-
-        if (of_have_populated_dt())
-                l2x0_of_init(0, ~0);
-        else
-                l2x0_init(l2x0_base, 0, ~0);
+        l2x0_of_init(0, ~0);
 
         return 0;
 }
-
 early_initcall(ux500_l2x0_init);
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index fa308f07fae5..6f63954c8bde 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -33,11 +33,11 @@
 #include "db8500-regs.h"
 #include "id.h"
 
-struct ab8500_platform_data ab8500_platdata = {
+static struct ab8500_platform_data ab8500_platdata = {
         .regulator      = &ab8500_regulator_plat_data,
 };
 
-struct prcmu_pdata db8500_prcmu_pdata = {
+static struct prcmu_pdata db8500_prcmu_pdata = {
         .ab_platdata    = &ab8500_platdata,
         .version_offset = DB8500_PRCMU_FW_VERSION_OFFSET,
         .legacy_offset  = DB8500_PRCMU_LEGACY_OFFSET,
@@ -82,7 +82,7 @@ static struct map_desc u9540_io_desc[] __initdata = {
         __IO_DEV_DESC(U8500_PRCMU_TCDM_BASE, SZ_4K + SZ_8K),
 };
 
-void __init u8500_map_io(void)
+static void __init u8500_map_io(void)
 {
         /*
          * Map the UARTs early so that the DEBUG_LL stuff continues to work.
@@ -119,7 +119,7 @@ static irqreturn_t db8500_pmu_handler(int irq, void *dev, irq_handler_t handler)
         return ret;
 }
 
-struct arm_pmu_platdata db8500_pmu_platdata = {
+static struct arm_pmu_platdata db8500_pmu_platdata = {
         .handle_irq             = db8500_pmu_handler,
 };
 
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index db16b5a04ad5..dbb2970ee7da 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -125,7 +125,7 @@ static void __init soc_info_populate(struct soc_device_attribute *soc_dev_attr,
         soc_dev_attr->revision = ux500_get_revision();
 }
 
-struct device_attribute ux500_soc_attr =
+static const struct device_attribute ux500_soc_attr =
         __ATTR(process,  S_IRUGO, ux500_get_process,  NULL);
 
 struct device * __init ux500_soc_device_init(const char *soc_id)
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index 87efda0aa348..ff28d8ad1ed7 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -16,7 +16,7 @@
 #include "db8500-regs.h"
 #include "id.h"
 
-const static struct of_device_id prcmu_timer_of_match[] __initconst = {
+static const struct of_device_id prcmu_timer_of_match[] __initconst = {
         { .compatible = "stericsson,db8500-prcmu-timer-4", },
         { },
 };
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index be83ba25f81b..08fb8c89f414 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -28,6 +28,7 @@
 #include <linux/of_platform.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
+#include <linux/platform_data/video-clcd-versatile.h>
 #include <linux/amba/pl061.h>
 #include <linux/amba/mmci.h>
 #include <linux/amba/pl022.h>
@@ -53,7 +54,6 @@
 #include <mach/platform.h>
 #include <asm/hardware/timer-sp.h>
 
-#include <plat/clcd.h>
 #include <plat/sched_clock.h>
 
 #include "core.h"
diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c
index 3621b000a0f6..9f9bc61ca64b 100644
--- a/arch/arm/mach-versatile/versatile_dt.c
+++ b/arch/arm/mach-versatile/versatile_dt.c
@@ -44,7 +44,6 @@ static const char *versatile_dt_match[] __initconst = {
 DT_MACHINE_START(VERSATILE_PB, "ARM-Versatile (Device Tree Support)")
         .map_io         = versatile_map_io,
         .init_early     = versatile_init_early,
-        .init_irq       = versatile_init_irq,
         .init_machine   = versatile_dt_init,
         .dt_compat      = versatile_dt_match,
         .restart        = versatile_restart,
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index d8b9330f896a..b2cfba16c4e8 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -13,7 +13,6 @@ menuconfig ARCH_VEXPRESS
         select ICST
         select NO_IOPORT_MAP
         select PLAT_VERSATILE
-        select PLAT_VERSATILE_CLCD
         select POWER_RESET
         select POWER_RESET_VEXPRESS
         select POWER_SUPPLY
@@ -64,7 +63,6 @@ config ARCH_VEXPRESS_DCSCB
 
 config ARCH_VEXPRESS_SPC
         bool "Versatile Express Serial Power Controller (SPC)"
-        select ARCH_HAS_OPP
         select PM_OPP
         help
           The TC2 (A15x2 A7x3) versatile express core tile integrates a logic
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index 86150d7a2e7d..27bea049380a 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -8,6 +8,7 @@
 #include <linux/platform_device.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
+#include <linux/platform_data/video-clcd-versatile.h>
 #include <linux/clkdev.h>
 #include <linux/vexpress.h>
 #include <linux/irqchip/arm-gic.h>
@@ -29,8 +30,6 @@
 #include <mach/motherboard.h>
 #include <mach/irqs.h>
 
-#include <plat/clcd.h>
-
 static struct map_desc ct_ca9x4_io_desc[] __initdata = {
         {
                 .virtual        = V2T_PERIPH,
diff --git a/arch/arm/mach-vexpress/tc2_pm.c b/arch/arm/mach-vexpress/tc2_pm.c
index b743a0ae02ce..2fb78b4648cb 100644
--- a/arch/arm/mach-vexpress/tc2_pm.c
+++ b/arch/arm/mach-vexpress/tc2_pm.c
@@ -152,7 +152,7 @@ static void tc2_pm_down(u64 residency)
         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) {
+                if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A15) {
                         /*
                          * On the Cortex-A15 we need to disable
                          * L2 prefetching before flushing the cache.
@@ -323,6 +323,21 @@ static void __naked tc2_pm_power_up_setup(unsigned int affinity_level)
 "       b       cci_enable_port_for_self ");
 }
 
+static void __init tc2_cache_off(void)
+{
+        pr_info("TC2: disabling cache during MCPM loopback test\n");
+        if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A15) {
+                /* disable L2 prefetching on the Cortex-A15 */
+                asm volatile(
+                "mcr    p15, 1, %0, c15, c0, 3 \n\t"
+                "isb    \n\t"
+                "dsb    "
+                : : "r" (0x400) );
+        }
+        v7_exit_coherency_flush(all);
+        cci_disable_port_by_cpu(read_cpuid_mpidr());
+}
+
 static int __init tc2_pm_init(void)
 {
         int ret, irq;
@@ -370,6 +385,8 @@ static int __init tc2_pm_init(void)
         ret = mcpm_platform_register(&tc2_pm_power_ops);
         if (!ret) {
                 mcpm_sync_init(tc2_pm_power_up_setup);
+                /* test if we can (re)enable the CCI on our own */
+                BUG_ON(mcpm_loopback(tc2_cache_off) != 0);
                 pr_info("TC2 power management initialized\n");
         }
         return ret;
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 4a73464cb11b..2da7be31e7e2 100644
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -44,7 +44,7 @@
 
 static void __iomem *pmc_base;
 
-void vt8500_restart(enum reboot_mode mode, const char *cmd)
+static void vt8500_restart(enum reboot_mode mode, const char *cmd)
 {
         if (pmc_base)
                 writel(1, pmc_base + VT8500_PMSR_REG);
@@ -60,7 +60,7 @@ static struct map_desc vt8500_io_desc[] __initdata = {
         },
 };
 
-void __init vt8500_map_io(void)
+static void __init vt8500_map_io(void)
 {
         iotable_init(vt8500_io_desc, ARRAY_SIZE(vt8500_io_desc));
 }
@@ -72,7 +72,7 @@ static void vt8500_power_off(void)
         asm("mcr%? p15, 0, %0, c7, c0, 4" : : "r" (0));
 }
 
-void __init vt8500_init(void)
+static void __init vt8500_init(void)
 {
         struct device_node *np;
 #if defined(CONFIG_FB_VT8500) || defined(CONFIG_FB_WM8505)
diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c
index b1eabaad50a5..213230ee57d1 100644
--- a/arch/arm/mach-w90x900/cpu.c
+++ b/arch/arm/mach-w90x900/cpu.c
@@ -178,7 +178,8 @@ static int __init nuc900_set_cpufreq(char *str)
         if (!*str)
                 return 0;
 
-        strict_strtoul(str, 0, &cpufreq);
+        if (kstrtoul(str, 0, &cpufreq))
+                return 0;
 
         nuc900_clock_source(NULL, "ext");
 
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index 0c164f81e72d..aaa5162c1509 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -1,6 +1,5 @@
 config ARCH_ZYNQ
         bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
-        select ARCH_HAS_OPP
         select ARCH_SUPPORTS_BIG_ENDIAN
         select ARM_AMBA
         select ARM_GIC
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index c348eaee7ee2..ae69809a9e47 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -669,7 +669,7 @@ config ARM_VIRT_EXT
           details.
 
 config SWP_EMULATE
-        bool "Emulate SWP/SWPB instructions"
+        bool "Emulate SWP/SWPB instructions" if !SMP
         depends on CPU_V7
         default y if SMP
         select HAVE_PROC_CPU if PROC_FS
@@ -854,7 +854,7 @@ config OUTER_CACHE_SYNC
 
 config CACHE_FEROCEON_L2
         bool "Enable the Feroceon L2 cache controller"
-        depends on ARCH_KIRKWOOD || ARCH_MV78XX0 || ARCH_MVEBU
+        depends on ARCH_MV78XX0 || ARCH_MVEBU
         default y
         select OUTER_CACHE
         help
@@ -907,8 +907,8 @@ config PL310_ERRATA_588369
            They are architecturally defined to behave as the execution of a
            clean operation followed immediately by an invalidate operation,
            both performing to the same memory location. This functionality
-           is not correctly implemented in PL310 as clean lines are not
-           invalidated as a result of these operations.
+           is not correctly implemented in PL310 prior to r2p0 (fixed in r2p0)
+           as clean lines are not invalidated as a result of these operations.
 
 config PL310_ERRATA_727915
         bool "PL310 errata: Background Clean & Invalidate by Way operation can cause data corruption"
@@ -918,7 +918,8 @@ config PL310_ERRATA_727915
           PL310 can handle normal accesses while it is in progress. Under very
           rare circumstances, due to this erratum, write data can be lost when
           PL310 treats a cacheable write transaction during a Clean &
-          Invalidate by Way operation.
+          Invalidate by Way operation.  Revisions prior to r3p1 are affected by
+          this errata (fixed in r3p1).
 
 config PL310_ERRATA_753970
         bool "PL310 errata: cache sync operation may be faulty"
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index b8cb1a2688a0..0c1ab49e5f7b 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -76,6 +76,7 @@
 
 static unsigned long ai_user;
 static unsigned long ai_sys;
+static void *ai_sys_last_pc;
 static unsigned long ai_skipped;
 static unsigned long ai_half;
 static unsigned long ai_word;
@@ -130,7 +131,7 @@ static const char *usermode_action[] = {
 static int alignment_proc_show(struct seq_file *m, void *v)
 {
         seq_printf(m, "User:\t\t%lu\n", ai_user);
-        seq_printf(m, "System:\t\t%lu\n", ai_sys);
+        seq_printf(m, "System:\t\t%lu (%pF)\n", ai_sys, ai_sys_last_pc);
         seq_printf(m, "Skipped:\t%lu\n", ai_skipped);
         seq_printf(m, "Half:\t\t%lu\n", ai_half);
         seq_printf(m, "Word:\t\t%lu\n", ai_word);
@@ -794,6 +795,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
                 goto user;
 
         ai_sys += 1;
+        ai_sys_last_pc = (void *)instruction_pointer(regs);
 
  fixup:
 
diff --git a/arch/arm/mm/cache-fa.S b/arch/arm/mm/cache-fa.S
index e505befe51b5..2f0c58836ae7 100644
--- a/arch/arm/mm/cache-fa.S
+++ b/arch/arm/mm/cache-fa.S
@@ -15,6 +15,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 #include <asm/memory.h>
 #include <asm/page.h>
 
@@ -45,7 +46,7 @@
 ENTRY(fa_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(fa_flush_icache_all)
 
 /*
@@ -71,7 +72,7 @@ __flush_whole_cache:
         mcrne   p15, 0, ip, c7, c5, 6           @ invalidate BTB
         mcrne   p15, 0, ip, c7, c10, 4          @ drain write buffer
         mcrne   p15, 0, ip, c7, c5, 4           @ prefetch flush
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -99,7 +100,7 @@ ENTRY(fa_flush_user_cache_range)
         mcrne   p15, 0, ip, c7, c5, 6           @ invalidate BTB
         mcrne   p15, 0, ip, c7, c10, 4          @ data write barrier
         mcrne   p15, 0, ip, c7, c5, 4           @ prefetch flush
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -135,7 +136,7 @@ ENTRY(fa_coherent_user_range)
         mcr     p15, 0, r0, c7, c5, 6           @ invalidate BTB
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
         mcr     p15, 0, r0, c7, c5, 4           @ prefetch flush
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -155,7 +156,7 @@ ENTRY(fa_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -181,7 +182,7 @@ fa_dma_inv_range:
         blo     1b
         mov     r0, #0
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -199,7 +200,7 @@ fa_dma_clean_range:
         blo     1b
         mov     r0, #0  
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start,end)
@@ -214,7 +215,7 @@ ENTRY(fa_dma_flush_range)
         blo     1b
         mov     r0, #0  
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -237,7 +238,7 @@ ENDPROC(fa_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(fa_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(fa_dma_unmap_area)
 
         .globl  fa_flush_kern_cache_louis
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 7c3fb41a462e..5f2c988a06ac 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -665,7 +665,7 @@ static int l2c310_cpu_enable_flz(struct notifier_block *nb, unsigned long act, v
 static void __init l2c310_enable(void __iomem *base, u32 aux, unsigned num_lock)
 {
         unsigned rev = readl_relaxed(base + L2X0_CACHE_ID) & L2X0_CACHE_ID_RTL_MASK;
-        bool cortex_a9 = read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9;
+        bool cortex_a9 = read_cpuid_part() == ARM_CPU_PART_CORTEX_A9;
 
         if (rev >= L310_CACHE_ID_RTL_R2P0) {
                 if (cortex_a9) {
diff --git a/arch/arm/mm/cache-nop.S b/arch/arm/mm/cache-nop.S
index 8e12ddca0031..f1cc9861031f 100644
--- a/arch/arm/mm/cache-nop.S
+++ b/arch/arm/mm/cache-nop.S
@@ -5,11 +5,12 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 
 #include "proc-macros.S"
 
 ENTRY(nop_flush_icache_all)
-        mov     pc, lr
+        ret     lr
 ENDPROC(nop_flush_icache_all)
 
         .globl nop_flush_kern_cache_all
@@ -29,7 +30,7 @@ ENDPROC(nop_flush_icache_all)
 
 ENTRY(nop_coherent_user_range)
         mov     r0, 0
-        mov     pc, lr
+        ret     lr
 ENDPROC(nop_coherent_user_range)
 
         .globl nop_flush_kern_dcache_area
diff --git a/arch/arm/mm/cache-v4.S b/arch/arm/mm/cache-v4.S
index a7ba68f59f0c..91e3adf155cb 100644
--- a/arch/arm/mm/cache-v4.S
+++ b/arch/arm/mm/cache-v4.S
@@ -9,6 +9,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 #include <asm/page.h>
 #include "proc-macros.S"
 
@@ -18,7 +19,7 @@
  *      Unconditionally clean and invalidate the entire icache.
  */
 ENTRY(v4_flush_icache_all)
-        mov     pc, lr
+        ret     lr
 ENDPROC(v4_flush_icache_all)
 
 /*
@@ -40,7 +41,7 @@ ENTRY(v4_flush_kern_cache_all)
 #ifdef CONFIG_CPU_CP15
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7, 0           @ flush ID cache
-        mov     pc, lr
+        ret     lr
 #else
         /* FALLTHROUGH */
 #endif
@@ -59,7 +60,7 @@ ENTRY(v4_flush_user_cache_range)
 #ifdef CONFIG_CPU_CP15
         mov     ip, #0
         mcr     p15, 0, ip, c7, c7, 0           @ flush ID cache
-        mov     pc, lr
+        ret     lr
 #else
         /* FALLTHROUGH */
 #endif
@@ -89,7 +90,7 @@ ENTRY(v4_coherent_kern_range)
  */
 ENTRY(v4_coherent_user_range)
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -116,7 +117,7 @@ ENTRY(v4_dma_flush_range)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c7, 0           @ flush ID cache
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_unmap_area(start, size, dir)
@@ -136,7 +137,7 @@ ENTRY(v4_dma_unmap_area)
  *      - dir   - DMA direction
  */
 ENTRY(v4_dma_map_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(v4_dma_unmap_area)
 ENDPROC(v4_dma_map_area)
 
diff --git a/arch/arm/mm/cache-v4wb.S b/arch/arm/mm/cache-v4wb.S
index cd4945321407..2522f8c8fbb1 100644
--- a/arch/arm/mm/cache-v4wb.S
+++ b/arch/arm/mm/cache-v4wb.S
@@ -9,6 +9,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 #include <asm/memory.h>
 #include <asm/page.h>
 #include "proc-macros.S"
@@ -58,7 +59,7 @@ flush_base:
 ENTRY(v4wb_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(v4wb_flush_icache_all)
 
 /*
@@ -94,7 +95,7 @@ __flush_whole_cache:
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -122,7 +123,7 @@ ENTRY(v4wb_flush_user_cache_range)
         blo     1b
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -170,7 +171,7 @@ ENTRY(v4wb_coherent_user_range)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 
 /*
@@ -195,7 +196,7 @@ v4wb_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -212,7 +213,7 @@ v4wb_dma_clean_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -248,7 +249,7 @@ ENDPROC(v4wb_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(v4wb_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(v4wb_dma_unmap_area)
 
         .globl  v4wb_flush_kern_cache_louis
diff --git a/arch/arm/mm/cache-v4wt.S b/arch/arm/mm/cache-v4wt.S
index 11e5e5838bc5..a0982ce49007 100644
--- a/arch/arm/mm/cache-v4wt.S
+++ b/arch/arm/mm/cache-v4wt.S
@@ -13,6 +13,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 #include <asm/page.h>
 #include "proc-macros.S"
 
@@ -48,7 +49,7 @@
 ENTRY(v4wt_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(v4wt_flush_icache_all)
 
 /*
@@ -71,7 +72,7 @@ __flush_whole_cache:
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, ip, c7, c6, 0           @ invalidate D cache
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -94,7 +95,7 @@ ENTRY(v4wt_flush_user_cache_range)
         add     r0, r0, #CACHE_DLINESIZE
         cmp     r0, r1
         blo     1b
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -126,7 +127,7 @@ ENTRY(v4wt_coherent_user_range)
         cmp     r0, r1
         blo     1b
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -160,7 +161,7 @@ v4wt_dma_inv_range:
         add     r0, r0, #CACHE_DLINESIZE
         cmp     r0, r1
         blo     1b
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -192,7 +193,7 @@ ENTRY(v4wt_dma_unmap_area)
  *      - dir   - DMA direction
  */
 ENTRY(v4wt_dma_map_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(v4wt_dma_unmap_area)
 ENDPROC(v4wt_dma_map_area)
 
diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S
index d8fd4d4bd3d4..24659952c278 100644
--- a/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
@@ -51,7 +51,7 @@ ENTRY(v6_flush_icache_all)
 #else
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I-cache
 #endif
-        mov     pc, lr
+        ret     lr
 ENDPROC(v6_flush_icache_all)
 
 /*
@@ -73,7 +73,7 @@ ENTRY(v6_flush_kern_cache_all)
 #else
         mcr     p15, 0, r0, c7, c15, 0          @ Cache clean+invalidate
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  *      v6_flush_cache_all()
@@ -98,7 +98,7 @@ ENTRY(v6_flush_user_cache_all)
  *      - we have a VIPT cache.
  */
 ENTRY(v6_flush_user_cache_range)
-        mov     pc, lr
+        ret     lr
 
 /*
  *      v6_coherent_kern_range(start,end)
@@ -150,7 +150,7 @@ ENTRY(v6_coherent_user_range)
 #else
         mcr     p15, 0, r0, c7, c5, 6           @ invalidate BTB
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  * Fault handling for the cache operation above. If the virtual address in r0
@@ -158,7 +158,7 @@ ENTRY(v6_coherent_user_range)
  */
 9001:
         mov     r0, #-EFAULT
-        mov     pc, lr
+        ret     lr
  UNWIND(.fnend          )
 ENDPROC(v6_coherent_user_range)
 ENDPROC(v6_coherent_kern_range)
@@ -188,7 +188,7 @@ ENTRY(v6_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c10, 4
 #endif
-        mov     pc, lr
+        ret     lr
 
 
 /*
@@ -239,7 +239,7 @@ v6_dma_inv_range:
         blo     1b
         mov     r0, #0
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      v6_dma_clean_range(start,end)
@@ -262,7 +262,7 @@ v6_dma_clean_range:
         blo     1b
         mov     r0, #0
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      v6_dma_flush_range(start,end)
@@ -290,7 +290,7 @@ ENTRY(v6_dma_flush_range)
         blo     1b
         mov     r0, #0
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -323,7 +323,7 @@ ENTRY(v6_dma_unmap_area)
         teq     r2, #DMA_TO_DEVICE
         bne     v6_dma_inv_range
 #endif
-        mov     pc, lr
+        ret     lr
 ENDPROC(v6_dma_unmap_area)
 
         .globl  v6_flush_kern_cache_louis
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index 615c99e38ba1..b966656d2c2d 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -61,7 +61,7 @@ ENTRY(v7_invalidate_l1)
        bgt     1b
        dsb     st
        isb
-       mov     pc, lr
+       ret     lr
 ENDPROC(v7_invalidate_l1)
 
 /*
@@ -76,7 +76,7 @@ ENTRY(v7_flush_icache_all)
         mov     r0, #0
         ALT_SMP(mcr     p15, 0, r0, c7, c1, 0)          @ invalidate I-cache inner shareable
         ALT_UP(mcr      p15, 0, r0, c7, c5, 0)          @ I+BTB cache invalidate
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_flush_icache_all)
 
  /*
@@ -94,7 +94,7 @@ ENTRY(v7_flush_dcache_louis)
         ALT_UP(ands     r3, r0, #(7 << 27))     @ extract LoUU from clidr
 #ifdef CONFIG_ARM_ERRATA_643719
         ALT_SMP(mrceq   p15, 0, r2, c0, c0, 0)  @ read main ID register
-        ALT_UP(moveq    pc, lr)                 @ LoUU is zero, so nothing to do
+        ALT_UP(reteq    lr)                     @ LoUU is zero, so nothing to do
         ldreq   r1, =0x410fc090                 @ ID of ARM Cortex A9 r0p?
         biceq   r2, r2, #0x0000000f             @ clear minor revision number
         teqeq   r2, r1                          @ test for errata affected core and if so...
@@ -102,7 +102,7 @@ ENTRY(v7_flush_dcache_louis)
 #endif
         ALT_SMP(mov     r3, r3, lsr #20)        @ r3 = LoUIS * 2
         ALT_UP(mov      r3, r3, lsr #26)        @ r3 = LoUU * 2
-        moveq   pc, lr                          @ return if level == 0
+        reteq   lr                              @ return if level == 0
         mov     r10, #0                         @ r10 (starting level) = 0
         b       flush_levels                    @ start flushing cache levels
 ENDPROC(v7_flush_dcache_louis)
@@ -168,7 +168,7 @@ finished:
         mcr     p15, 2, r10, c0, c0, 0          @ select current cache level in cssr
         dsb     st
         isb
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_flush_dcache_all)
 
 /*
@@ -191,7 +191,7 @@ ENTRY(v7_flush_kern_cache_all)
         ALT_UP(mcr      p15, 0, r0, c7, c5, 0)  @ I+BTB cache invalidate
  ARM(   ldmfd   sp!, {r4-r5, r7, r9-r11, lr}    )
  THUMB( ldmfd   sp!, {r4-r7, r9-r11, lr}        )
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_flush_kern_cache_all)
 
  /*
@@ -209,7 +209,7 @@ ENTRY(v7_flush_kern_cache_louis)
         ALT_UP(mcr      p15, 0, r0, c7, c5, 0)  @ I+BTB cache invalidate
  ARM(   ldmfd   sp!, {r4-r5, r7, r9-r11, lr}    )
  THUMB( ldmfd   sp!, {r4-r7, r9-r11, lr}        )
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_flush_kern_cache_louis)
 
 /*
@@ -235,7 +235,7 @@ ENTRY(v7_flush_user_cache_all)
  *      - we have a VIPT cache.
  */
 ENTRY(v7_flush_user_cache_range)
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_flush_user_cache_all)
 ENDPROC(v7_flush_user_cache_range)
 
@@ -296,7 +296,7 @@ ENTRY(v7_coherent_user_range)
         ALT_UP(mcr      p15, 0, r0, c7, c5, 6)  @ invalidate BTB
         dsb     ishst
         isb
-        mov     pc, lr
+        ret     lr
 
 /*
  * Fault handling for the cache operation above. If the virtual address in r0
@@ -307,7 +307,7 @@ ENTRY(v7_coherent_user_range)
         dsb
 #endif
         mov     r0, #-EFAULT
-        mov     pc, lr
+        ret     lr
  UNWIND(.fnend          )
 ENDPROC(v7_coherent_kern_range)
 ENDPROC(v7_coherent_user_range)
@@ -336,7 +336,7 @@ ENTRY(v7_flush_kern_dcache_area)
         cmp     r0, r1
         blo     1b
         dsb     st
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_flush_kern_dcache_area)
 
 /*
@@ -369,7 +369,7 @@ v7_dma_inv_range:
         cmp     r0, r1
         blo     1b
         dsb     st
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_dma_inv_range)
 
 /*
@@ -391,7 +391,7 @@ v7_dma_clean_range:
         cmp     r0, r1
         blo     1b
         dsb     st
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_dma_clean_range)
 
 /*
@@ -413,7 +413,7 @@ ENTRY(v7_dma_flush_range)
         cmp     r0, r1
         blo     1b
         dsb     st
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_dma_flush_range)
 
 /*
@@ -439,7 +439,7 @@ ENTRY(v7_dma_unmap_area)
         add     r1, r1, r0
         teq     r2, #DMA_TO_DEVICE
         bne     v7_dma_inv_range
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7_dma_unmap_area)
 
         __INITDATA
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 1f88db06b133..7a996aaa061e 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -26,6 +26,7 @@
 #include <linux/io.h>
 #include <linux/vmalloc.h>
 #include <linux/sizes.h>
+#include <linux/cma.h>
 
 #include <asm/memory.h>
 #include <asm/highmem.h>
diff --git a/arch/arm/mm/dump.c b/arch/arm/mm/dump.c
index c508f41a43bc..59424937e52b 100644
--- a/arch/arm/mm/dump.c
+++ b/arch/arm/mm/dump.c
@@ -126,8 +126,8 @@ static const struct prot_bits section_bits[] = {
                 .val    = PMD_SECT_USER,
                 .set    = "USR",
         }, {
-                .mask   = PMD_SECT_RDONLY,
-                .val    = PMD_SECT_RDONLY,
+                .mask   = L_PMD_SECT_RDONLY,
+                .val    = L_PMD_SECT_RDONLY,
                 .set    = "ro",
                 .clear  = "RW",
 #elif __LINUX_ARM_ARCH__ >= 6
diff --git a/arch/arm/mm/l2c-l2x0-resume.S b/arch/arm/mm/l2c-l2x0-resume.S
index 99b05f21a59a..fda415e4ca8f 100644
--- a/arch/arm/mm/l2c-l2x0-resume.S
+++ b/arch/arm/mm/l2c-l2x0-resume.S
@@ -6,6 +6,7 @@
  * This code can only be used to if you are running in the secure world.
  */
 #include <linux/linkage.h>
+#include <asm/assembler.h>
 #include <asm/hardware/cache-l2x0.h>
 
         .text
@@ -27,7 +28,7 @@ ENTRY(l2c310_early_resume)
 
         @ Check that the address has been initialised
         teq     r1, #0
-        moveq   pc, lr
+        reteq   lr
 
         @ The prefetch and power control registers are revision dependent
         @ and can be written whether or not the L2 cache is enabled
@@ -41,7 +42,7 @@ ENTRY(l2c310_early_resume)
         @ Don't setup the L2 cache if it is already enabled
         ldr     r0, [r1, #L2X0_CTRL]
         tst     r0, #L2X0_CTRL_EN
-        movne   pc, lr
+        retne   lr
 
         str     r3, [r1, #L310_TAG_LATENCY_CTRL]
         str     r4, [r1, #L310_DATA_LATENCY_CTRL]
@@ -51,7 +52,7 @@ ENTRY(l2c310_early_resume)
         str     r2, [r1, #L2X0_AUX_CTRL]
         mov     r9, #L2X0_CTRL_EN
         str     r9, [r1, #L2X0_CTRL]
-        mov     pc, lr
+        ret     lr
 ENDPROC(l2c310_early_resume)
 
         .align
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 6e3ba8d112a2..8348ed6b2efe 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1434,23 +1434,64 @@ void __init early_paging_init(const struct machine_desc *mdesc,
         dsb(ishst);
         isb();
 
-        /* remap level 1 table */
+        /*
+         * FIXME: This code is not architecturally compliant: we modify
+         * the mappings in-place, indeed while they are in use by this
+         * very same code.  This may lead to unpredictable behaviour of
+         * the CPU.
+         *
+         * Even modifying the mappings in a separate page table does
+         * not resolve this.
+         *
+         * The architecture strongly recommends that when a mapping is
+         * changed, that it is changed by first going via an invalid
+         * mapping and back to the new mapping.  This is to ensure that
+         * no TLB conflicts (caused by the TLB having more than one TLB
+         * entry match a translation) can occur.  However, doing that
+         * here will result in unmapping the code we are running.
+         */
+        pr_warn("WARNING: unsafe modification of in-place page tables - tainting kernel\n");
+        add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK);
+
+        /*
+         * Remap level 1 table.  This changes the physical addresses
+         * used to refer to the level 2 page tables to the high
+         * physical address alias, leaving everything else the same.
+         */
         for (i = 0; i < PTRS_PER_PGD; pud0++, i++) {
                 set_pud(pud0,
                         __pud(__pa(pmd0) | PMD_TYPE_TABLE | L_PGD_SWAPPER));
                 pmd0 += PTRS_PER_PMD;
         }
 
-        /* remap pmds for kernel mapping */
+        /*
+         * Remap the level 2 table, pointing the mappings at the high
+         * physical address alias of these pages.
+         */
         phys = __pa(map_start);
         do {
                 *pmdk++ = __pmd(phys | pmdprot);
                 phys += PMD_SIZE;
         } while (phys < map_end);
 
+        /*
+         * Ensure that the above updates are flushed out of the cache.
+         * This is not strictly correct; on a system where the caches
+         * are coherent with each other, but the MMU page table walks
+         * may not be coherent, flush_cache_all() may be a no-op, and
+         * this will fail.
+         */
         flush_cache_all();
+
+        /*
+         * Re-write the TTBR values to point them at the high physical
+         * alias of the page tables.  We expect __va() will work on
+         * cpu_get_pgd(), which returns the value of TTBR0.
+         */
         cpu_switch_mm(pgd0, &init_mm);
         cpu_set_ttbr(1, __pa(pgd0) + TTBR1_OFFSET);
+
+        /* Finally flush any stale TLB values. */
         local_flush_bp_all();
         local_flush_tlb_all();
 }
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index d1a2d05971e0..86ee5d47ce3c 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -73,7 +73,7 @@
  * cpu_arm1020_proc_init()
  */
 ENTRY(cpu_arm1020_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm1020_proc_fin()
@@ -83,7 +83,7 @@ ENTRY(cpu_arm1020_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm1020_reset(loc)
@@ -107,7 +107,7 @@ ENTRY(cpu_arm1020_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm1020_reset)
         .popsection
 
@@ -117,7 +117,7 @@ ENDPROC(cpu_arm1020_reset)
         .align  5
 ENTRY(cpu_arm1020_do_idle)
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 /* ================================= CACHE ================================ */
 
@@ -133,7 +133,7 @@ ENTRY(arm1020_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
 #endif
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm1020_flush_icache_all)
 
 /*
@@ -169,7 +169,7 @@ __flush_whole_cache:
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
 #endif
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -200,7 +200,7 @@ ENTRY(arm1020_flush_user_cache_range)
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
 #endif
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -242,7 +242,7 @@ ENTRY(arm1020_coherent_user_range)
         blo     1b
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -264,7 +264,7 @@ ENTRY(arm1020_flush_kern_dcache_area)
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -297,7 +297,7 @@ arm1020_dma_inv_range:
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -320,7 +320,7 @@ arm1020_dma_clean_range:
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -342,7 +342,7 @@ ENTRY(arm1020_dma_flush_range)
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -365,7 +365,7 @@ ENDPROC(arm1020_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm1020_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm1020_dma_unmap_area)
 
         .globl  arm1020_flush_kern_cache_louis
@@ -384,7 +384,7 @@ ENTRY(cpu_arm1020_dcache_clean_area)
         subs    r1, r1, #CACHE_DLINESIZE
         bhi     1b
 #endif
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -423,7 +423,7 @@ ENTRY(cpu_arm1020_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
 #endif /* CONFIG_MMU */
-        mov     pc, lr
+        ret     lr
         
 /*
  * cpu_arm1020_set_pte(ptep, pte)
@@ -441,7 +441,7 @@ ENTRY(cpu_arm1020_set_pte_ext)
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif /* CONFIG_MMU */
-        mov     pc, lr
+        ret     lr
 
         .type   __arm1020_setup, #function
 __arm1020_setup:
@@ -460,7 +460,7 @@ __arm1020_setup:
 #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
         orr     r0, r0, #0x4000                 @ .R.. .... .... ....
 #endif
-        mov     pc, lr
+        ret     lr
         .size   __arm1020_setup, . - __arm1020_setup
 
         /*
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index 9d89405c3d03..a6331d78601f 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -73,7 +73,7 @@
  * cpu_arm1020e_proc_init()
  */
 ENTRY(cpu_arm1020e_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm1020e_proc_fin()
@@ -83,7 +83,7 @@ ENTRY(cpu_arm1020e_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm1020e_reset(loc)
@@ -107,7 +107,7 @@ ENTRY(cpu_arm1020e_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm1020e_reset)
         .popsection
 
@@ -117,7 +117,7 @@ ENDPROC(cpu_arm1020e_reset)
         .align  5
 ENTRY(cpu_arm1020e_do_idle)
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 /* ================================= CACHE ================================ */
 
@@ -133,7 +133,7 @@ ENTRY(arm1020e_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
 #endif
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm1020e_flush_icache_all)
 
 /*
@@ -168,7 +168,7 @@ __flush_whole_cache:
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
 #endif
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -197,7 +197,7 @@ ENTRY(arm1020e_flush_user_cache_range)
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
 #endif
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -236,7 +236,7 @@ ENTRY(arm1020e_coherent_user_range)
         blo     1b
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -257,7 +257,7 @@ ENTRY(arm1020e_flush_kern_dcache_area)
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -286,7 +286,7 @@ arm1020e_dma_inv_range:
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -308,7 +308,7 @@ arm1020e_dma_clean_range:
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -328,7 +328,7 @@ ENTRY(arm1020e_dma_flush_range)
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -351,7 +351,7 @@ ENDPROC(arm1020e_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm1020e_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm1020e_dma_unmap_area)
 
         .globl  arm1020e_flush_kern_cache_louis
@@ -369,7 +369,7 @@ ENTRY(cpu_arm1020e_dcache_clean_area)
         subs    r1, r1, #CACHE_DLINESIZE
         bhi     1b
 #endif
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -407,7 +407,7 @@ ENTRY(cpu_arm1020e_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
 #endif
-        mov     pc, lr
+        ret     lr
         
 /*
  * cpu_arm1020e_set_pte(ptep, pte)
@@ -423,7 +423,7 @@ ENTRY(cpu_arm1020e_set_pte_ext)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
 #endif
 #endif /* CONFIG_MMU */
-        mov     pc, lr
+        ret     lr
 
         .type   __arm1020e_setup, #function
 __arm1020e_setup:
@@ -441,7 +441,7 @@ __arm1020e_setup:
 #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
         orr     r0, r0, #0x4000                 @ .R.. .... .... ....
 #endif
-        mov     pc, lr
+        ret     lr
         .size   __arm1020e_setup, . - __arm1020e_setup
 
         /*
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 6f01a0ae3b30..a126b7a59928 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -62,7 +62,7 @@
  * cpu_arm1022_proc_init()
  */
 ENTRY(cpu_arm1022_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm1022_proc_fin()
@@ -72,7 +72,7 @@ ENTRY(cpu_arm1022_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm1022_reset(loc)
@@ -96,7 +96,7 @@ ENTRY(cpu_arm1022_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm1022_reset)
         .popsection
 
@@ -106,7 +106,7 @@ ENDPROC(cpu_arm1022_reset)
         .align  5
 ENTRY(cpu_arm1022_do_idle)
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 /* ================================= CACHE ================================ */
 
@@ -122,7 +122,7 @@ ENTRY(arm1022_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
 #endif
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm1022_flush_icache_all)
 
 /*
@@ -156,7 +156,7 @@ __flush_whole_cache:
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
 #endif
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -185,7 +185,7 @@ ENTRY(arm1022_flush_user_cache_range)
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
 #endif
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -225,7 +225,7 @@ ENTRY(arm1022_coherent_user_range)
         blo     1b
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -246,7 +246,7 @@ ENTRY(arm1022_flush_kern_dcache_area)
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -275,7 +275,7 @@ arm1022_dma_inv_range:
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -297,7 +297,7 @@ arm1022_dma_clean_range:
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -317,7 +317,7 @@ ENTRY(arm1022_dma_flush_range)
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -340,7 +340,7 @@ ENDPROC(arm1022_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm1022_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm1022_dma_unmap_area)
 
         .globl  arm1022_flush_kern_cache_louis
@@ -358,7 +358,7 @@ ENTRY(cpu_arm1022_dcache_clean_area)
         subs    r1, r1, #CACHE_DLINESIZE
         bhi     1b
 #endif
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -389,7 +389,7 @@ ENTRY(cpu_arm1022_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
 #endif
-        mov     pc, lr
+        ret     lr
         
 /*
  * cpu_arm1022_set_pte_ext(ptep, pte, ext)
@@ -405,7 +405,7 @@ ENTRY(cpu_arm1022_set_pte_ext)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
 #endif
 #endif /* CONFIG_MMU */
-        mov     pc, lr
+        ret     lr
 
         .type   __arm1022_setup, #function
 __arm1022_setup:
@@ -423,7 +423,7 @@ __arm1022_setup:
 #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
         orr     r0, r0, #0x4000                 @ .R..............
 #endif
-        mov     pc, lr
+        ret     lr
         .size   __arm1022_setup, . - __arm1022_setup
 
         /*
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index 4799a24b43e6..fc294067e977 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -62,7 +62,7 @@
  * cpu_arm1026_proc_init()
  */
 ENTRY(cpu_arm1026_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm1026_proc_fin()
@@ -72,7 +72,7 @@ ENTRY(cpu_arm1026_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm1026_reset(loc)
@@ -96,7 +96,7 @@ ENTRY(cpu_arm1026_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm1026_reset)
         .popsection
 
@@ -106,7 +106,7 @@ ENDPROC(cpu_arm1026_reset)
         .align  5
 ENTRY(cpu_arm1026_do_idle)
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 /* ================================= CACHE ================================ */
 
@@ -122,7 +122,7 @@ ENTRY(arm1026_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
 #endif
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm1026_flush_icache_all)
 
 /*
@@ -151,7 +151,7 @@ __flush_whole_cache:
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
 #endif
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -180,7 +180,7 @@ ENTRY(arm1026_flush_user_cache_range)
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
 #endif
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -219,7 +219,7 @@ ENTRY(arm1026_coherent_user_range)
         blo     1b
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -240,7 +240,7 @@ ENTRY(arm1026_flush_kern_dcache_area)
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -269,7 +269,7 @@ arm1026_dma_inv_range:
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -291,7 +291,7 @@ arm1026_dma_clean_range:
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -311,7 +311,7 @@ ENTRY(arm1026_dma_flush_range)
         blo     1b
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -334,7 +334,7 @@ ENDPROC(arm1026_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm1026_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm1026_dma_unmap_area)
 
         .globl  arm1026_flush_kern_cache_louis
@@ -352,7 +352,7 @@ ENTRY(cpu_arm1026_dcache_clean_area)
         subs    r1, r1, #CACHE_DLINESIZE
         bhi     1b
 #endif
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -378,7 +378,7 @@ ENTRY(cpu_arm1026_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, r1, c8, c7, 0           @ invalidate I & D TLBs
 #endif
-        mov     pc, lr
+        ret     lr
         
 /*
  * cpu_arm1026_set_pte_ext(ptep, pte, ext)
@@ -394,7 +394,7 @@ ENTRY(cpu_arm1026_set_pte_ext)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
 #endif
 #endif /* CONFIG_MMU */
-        mov     pc, lr
+        ret     lr
 
         .type   __arm1026_setup, #function
 __arm1026_setup:
@@ -417,7 +417,7 @@ __arm1026_setup:
 #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
         orr     r0, r0, #0x4000                 @ .R.. .... .... ....
 #endif
-        mov     pc, lr
+        ret     lr
         .size   __arm1026_setup, . - __arm1026_setup
 
         /*
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index d42c37f9f5bc..2baa66b3ac9b 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -51,14 +51,14 @@
  */
 ENTRY(cpu_arm720_dcache_clean_area)
 ENTRY(cpu_arm720_proc_init)
-                mov     pc, lr
+                ret     lr
 
 ENTRY(cpu_arm720_proc_fin)
                 mrc     p15, 0, r0, c1, c0, 0
                 bic     r0, r0, #0x1000                 @ ...i............
                 bic     r0, r0, #0x000e                 @ ............wca.
                 mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-                mov     pc, lr
+                ret     lr
 
 /*
  * Function: arm720_proc_do_idle(void)
@@ -66,7 +66,7 @@ ENTRY(cpu_arm720_proc_fin)
  * Purpose : put the processor in proper idle mode
  */
 ENTRY(cpu_arm720_do_idle)
-                mov     pc, lr
+                ret     lr
 
 /*
  * Function: arm720_switch_mm(unsigned long pgd_phys)
@@ -81,7 +81,7 @@ ENTRY(cpu_arm720_switch_mm)
                 mcr     p15, 0, r0, c2, c0, 0           @ update page table ptr
                 mcr     p15, 0, r1, c8, c7, 0           @ flush TLB (v4)
 #endif
-                mov     pc, lr
+                ret     lr
 
 /*
  * Function: arm720_set_pte_ext(pte_t *ptep, pte_t pte, unsigned int ext)
@@ -94,7 +94,7 @@ ENTRY(cpu_arm720_set_pte_ext)
 #ifdef CONFIG_MMU
         armv3_set_pte_ext wc_disable=0
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  * Function: arm720_reset
@@ -112,7 +112,7 @@ ENTRY(cpu_arm720_reset)
                 bic     ip, ip, #0x000f                 @ ............wcam
                 bic     ip, ip, #0x2100                 @ ..v....s........
                 mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-                mov     pc, r0
+                ret     r0
 ENDPROC(cpu_arm720_reset)
                 .popsection
 
@@ -128,7 +128,7 @@ __arm710_setup:
         bic     r0, r0, r5
         ldr     r5, arm710_cr1_set
         orr     r0, r0, r5
-        mov     pc, lr                          @ __ret (head.S)
+        ret     lr                              @ __ret (head.S)
         .size   __arm710_setup, . - __arm710_setup
 
         /*
@@ -156,7 +156,7 @@ __arm720_setup:
         mrc     p15, 0, r0, c1, c0              @ get control register
         bic     r0, r0, r5
         orr     r0, r0, r6
-        mov     pc, lr                          @ __ret (head.S)
+        ret     lr                              @ __ret (head.S)
         .size   __arm720_setup, . - __arm720_setup
 
         /*
diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
index 9b0ae90cbf17..ac1ea6b3bce4 100644
--- a/arch/arm/mm/proc-arm740.S
+++ b/arch/arm/mm/proc-arm740.S
@@ -32,7 +32,7 @@ ENTRY(cpu_arm740_proc_init)
 ENTRY(cpu_arm740_do_idle)
 ENTRY(cpu_arm740_dcache_clean_area)
 ENTRY(cpu_arm740_switch_mm)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm740_proc_fin()
@@ -42,7 +42,7 @@ ENTRY(cpu_arm740_proc_fin)
         bic     r0, r0, #0x3f000000             @ bank/f/lock/s
         bic     r0, r0, #0x0000000c             @ w-buffer/cache
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm740_reset(loc)
@@ -56,7 +56,7 @@ ENTRY(cpu_arm740_reset)
         mrc     p15, 0, ip, c1, c0, 0           @ get ctrl register
         bic     ip, ip, #0x0000000c             @ ............wc..
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm740_reset)
         .popsection
 
@@ -115,7 +115,7 @@ __arm740_setup:
                                                 @ need some benchmark
         orr     r0, r0, #0x0000000d             @ MPU/Cache/WB
 
-        mov     pc, lr
+        ret     lr
 
         .size   __arm740_setup, . - __arm740_setup
 
diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
index f6cc3f63ce39..bf6ba4bc30ff 100644
--- a/arch/arm/mm/proc-arm7tdmi.S
+++ b/arch/arm/mm/proc-arm7tdmi.S
@@ -32,13 +32,13 @@ ENTRY(cpu_arm7tdmi_proc_init)
 ENTRY(cpu_arm7tdmi_do_idle)
 ENTRY(cpu_arm7tdmi_dcache_clean_area)
 ENTRY(cpu_arm7tdmi_switch_mm)
-                mov     pc, lr
+                ret     lr
 
 /*
  * cpu_arm7tdmi_proc_fin()
  */
 ENTRY(cpu_arm7tdmi_proc_fin)
-                mov     pc, lr
+                ret     lr
 
 /*
  * Function: cpu_arm7tdmi_reset(loc)
@@ -47,13 +47,13 @@ ENTRY(cpu_arm7tdmi_proc_fin)
  */
                 .pushsection    .idmap.text, "ax"
 ENTRY(cpu_arm7tdmi_reset)
-                mov     pc, r0
+                ret     r0
 ENDPROC(cpu_arm7tdmi_reset)
                 .popsection
 
                 .type   __arm7tdmi_setup, #function
 __arm7tdmi_setup:
-                mov     pc, lr
+                ret     lr
                 .size   __arm7tdmi_setup, . - __arm7tdmi_setup
 
                 __INITDATA
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 549557df6d57..22bf8dde4f84 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -63,7 +63,7 @@
  * cpu_arm920_proc_init()
  */
 ENTRY(cpu_arm920_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm920_proc_fin()
@@ -73,7 +73,7 @@ ENTRY(cpu_arm920_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm920_reset(loc)
@@ -97,7 +97,7 @@ ENTRY(cpu_arm920_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm920_reset)
         .popsection
 
@@ -107,7 +107,7 @@ ENDPROC(cpu_arm920_reset)
         .align  5
 ENTRY(cpu_arm920_do_idle)
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 
 #ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
@@ -120,7 +120,7 @@ ENTRY(cpu_arm920_do_idle)
 ENTRY(arm920_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm920_flush_icache_all)
 
 /*
@@ -151,7 +151,7 @@ __flush_whole_cache:
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -177,7 +177,7 @@ ENTRY(arm920_flush_user_cache_range)
         blo     1b
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -211,7 +211,7 @@ ENTRY(arm920_coherent_user_range)
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -231,7 +231,7 @@ ENTRY(arm920_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -257,7 +257,7 @@ arm920_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -276,7 +276,7 @@ arm920_dma_clean_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -293,7 +293,7 @@ ENTRY(arm920_dma_flush_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -316,7 +316,7 @@ ENDPROC(arm920_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm920_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm920_dma_unmap_area)
 
         .globl  arm920_flush_kern_cache_louis
@@ -332,7 +332,7 @@ ENTRY(cpu_arm920_dcache_clean_area)
         add     r0, r0, #CACHE_DLINESIZE
         subs    r1, r1, #CACHE_DLINESIZE
         bhi     1b
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -367,7 +367,7 @@ ENTRY(cpu_arm920_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm920_set_pte(ptep, pte, ext)
@@ -382,7 +382,7 @@ ENTRY(cpu_arm920_set_pte_ext)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif
-        mov     pc, lr
+        ret     lr
 
 /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
 .globl  cpu_arm920_suspend_size
@@ -423,7 +423,7 @@ __arm920_setup:
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         bic     r0, r0, r5
         orr     r0, r0, r6
-        mov     pc, lr
+        ret     lr
         .size   __arm920_setup, . - __arm920_setup
 
         /*
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index 2a758b06c6f6..0c6d5ac5a6d4 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -65,7 +65,7 @@
  * cpu_arm922_proc_init()
  */
 ENTRY(cpu_arm922_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm922_proc_fin()
@@ -75,7 +75,7 @@ ENTRY(cpu_arm922_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm922_reset(loc)
@@ -99,7 +99,7 @@ ENTRY(cpu_arm922_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm922_reset)
         .popsection
 
@@ -109,7 +109,7 @@ ENDPROC(cpu_arm922_reset)
         .align  5
 ENTRY(cpu_arm922_do_idle)
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 
 #ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
@@ -122,7 +122,7 @@ ENTRY(cpu_arm922_do_idle)
 ENTRY(arm922_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm922_flush_icache_all)
 
 /*
@@ -153,7 +153,7 @@ __flush_whole_cache:
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -179,7 +179,7 @@ ENTRY(arm922_flush_user_cache_range)
         blo     1b
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -213,7 +213,7 @@ ENTRY(arm922_coherent_user_range)
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -233,7 +233,7 @@ ENTRY(arm922_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -259,7 +259,7 @@ arm922_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -278,7 +278,7 @@ arm922_dma_clean_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -295,7 +295,7 @@ ENTRY(arm922_dma_flush_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -318,7 +318,7 @@ ENDPROC(arm922_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm922_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm922_dma_unmap_area)
 
         .globl  arm922_flush_kern_cache_louis
@@ -336,7 +336,7 @@ ENTRY(cpu_arm922_dcache_clean_area)
         subs    r1, r1, #CACHE_DLINESIZE
         bhi     1b
 #endif
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -371,7 +371,7 @@ ENTRY(cpu_arm922_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm922_set_pte_ext(ptep, pte, ext)
@@ -386,7 +386,7 @@ ENTRY(cpu_arm922_set_pte_ext)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif /* CONFIG_MMU */
-        mov     pc, lr
+        ret     lr
 
         .type   __arm922_setup, #function
 __arm922_setup:
@@ -401,7 +401,7 @@ __arm922_setup:
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         bic     r0, r0, r5
         orr     r0, r0, r6
-        mov     pc, lr
+        ret     lr
         .size   __arm922_setup, . - __arm922_setup
 
         /*
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index ba0d58e1a2a2..c32d073282ea 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -86,7 +86,7 @@
  * cpu_arm925_proc_init()
  */
 ENTRY(cpu_arm925_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm925_proc_fin()
@@ -96,7 +96,7 @@ ENTRY(cpu_arm925_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm925_reset(loc)
@@ -129,7 +129,7 @@ ENDPROC(cpu_arm925_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 
 /*
  * cpu_arm925_do_idle()
@@ -145,7 +145,7 @@ ENTRY(cpu_arm925_do_idle)
         mcr     p15, 0, r2, c1, c0, 0           @ Disable I cache
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
         mcr     p15, 0, r1, c1, c0, 0           @ Restore ICache enable
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_icache_all()
@@ -155,7 +155,7 @@ ENTRY(cpu_arm925_do_idle)
 ENTRY(arm925_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm925_flush_icache_all)
 
 /*
@@ -188,7 +188,7 @@ __flush_whole_cache:
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -225,7 +225,7 @@ ENTRY(arm925_flush_user_cache_range)
         blo     1b
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -259,7 +259,7 @@ ENTRY(arm925_coherent_user_range)
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -279,7 +279,7 @@ ENTRY(arm925_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -307,7 +307,7 @@ arm925_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -328,7 +328,7 @@ arm925_dma_clean_range:
         blo     1b
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -350,7 +350,7 @@ ENTRY(arm925_dma_flush_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -373,7 +373,7 @@ ENDPROC(arm925_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm925_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm925_dma_unmap_area)
 
         .globl  arm925_flush_kern_cache_louis
@@ -390,7 +390,7 @@ ENTRY(cpu_arm925_dcache_clean_area)
         bhi     1b
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -419,7 +419,7 @@ ENTRY(cpu_arm925_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm925_set_pte_ext(ptep, pte, ext)
@@ -436,7 +436,7 @@ ENTRY(cpu_arm925_set_pte_ext)
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif /* CONFIG_MMU */
-        mov     pc, lr
+        ret     lr
 
         .type   __arm925_setup, #function
 __arm925_setup:
@@ -469,7 +469,7 @@ __arm925_setup:
 #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
         orr     r0, r0, #0x4000                 @ .1.. .... .... ....
 #endif
-        mov     pc, lr
+        ret     lr
         .size   __arm925_setup, . - __arm925_setup
 
         /*
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 0f098f407c9f..252b2503038d 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -55,7 +55,7 @@
  * cpu_arm926_proc_init()
  */
 ENTRY(cpu_arm926_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm926_proc_fin()
@@ -65,7 +65,7 @@ ENTRY(cpu_arm926_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm926_reset(loc)
@@ -89,7 +89,7 @@ ENTRY(cpu_arm926_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm926_reset)
         .popsection
 
@@ -111,7 +111,7 @@ ENTRY(cpu_arm926_do_idle)
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
         mcr     p15, 0, r1, c1, c0, 0           @ Restore ICache enable
         msr     cpsr_c, r3                      @ Restore FIQ state
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_icache_all()
@@ -121,7 +121,7 @@ ENTRY(cpu_arm926_do_idle)
 ENTRY(arm926_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm926_flush_icache_all)
 
 /*
@@ -151,7 +151,7 @@ __flush_whole_cache:
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -188,7 +188,7 @@ ENTRY(arm926_flush_user_cache_range)
         blo     1b
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -222,7 +222,7 @@ ENTRY(arm926_coherent_user_range)
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -242,7 +242,7 @@ ENTRY(arm926_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -270,7 +270,7 @@ arm926_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -291,7 +291,7 @@ arm926_dma_clean_range:
         blo     1b
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -313,7 +313,7 @@ ENTRY(arm926_dma_flush_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -336,7 +336,7 @@ ENDPROC(arm926_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm926_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm926_dma_unmap_area)
 
         .globl  arm926_flush_kern_cache_louis
@@ -353,7 +353,7 @@ ENTRY(cpu_arm926_dcache_clean_area)
         bhi     1b
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -380,7 +380,7 @@ ENTRY(cpu_arm926_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm926_set_pte_ext(ptep, pte, ext)
@@ -397,7 +397,7 @@ ENTRY(cpu_arm926_set_pte_ext)
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif
-        mov     pc, lr
+        ret     lr
 
 /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
 .globl  cpu_arm926_suspend_size
@@ -448,7 +448,7 @@ __arm926_setup:
 #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
         orr     r0, r0, #0x4000                 @ .1.. .... .... ....
 #endif
-        mov     pc, lr
+        ret     lr
         .size   __arm926_setup, . - __arm926_setup
 
         /*
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
index 1c39a704ff6e..e5212d489377 100644
--- a/arch/arm/mm/proc-arm940.S
+++ b/arch/arm/mm/proc-arm940.S
@@ -31,7 +31,7 @@
  */
 ENTRY(cpu_arm940_proc_init)
 ENTRY(cpu_arm940_switch_mm)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm940_proc_fin()
@@ -41,7 +41,7 @@ ENTRY(cpu_arm940_proc_fin)
         bic     r0, r0, #0x00001000             @ i-cache
         bic     r0, r0, #0x00000004             @ d-cache
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm940_reset(loc)
@@ -58,7 +58,7 @@ ENTRY(cpu_arm940_reset)
         bic     ip, ip, #0x00000005             @ .............c.p
         bic     ip, ip, #0x00001000             @ i-cache
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm940_reset)
         .popsection
 
@@ -68,7 +68,7 @@ ENDPROC(cpu_arm940_reset)
         .align  5
 ENTRY(cpu_arm940_do_idle)
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_icache_all()
@@ -78,7 +78,7 @@ ENTRY(cpu_arm940_do_idle)
 ENTRY(arm940_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm940_flush_icache_all)
 
 /*
@@ -122,7 +122,7 @@ ENTRY(arm940_flush_user_cache_range)
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -170,7 +170,7 @@ ENTRY(arm940_flush_kern_dcache_area)
         bcs     1b                              @ segments 7 to 0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -191,7 +191,7 @@ arm940_dma_inv_range:
         subs    r1, r1, #1 << 4
         bcs     1b                              @ segments 7 to 0
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -215,7 +215,7 @@ ENTRY(cpu_arm940_dcache_clean_area)
         bcs     1b                              @ segments 7 to 0
 #endif
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -241,7 +241,7 @@ ENTRY(arm940_dma_flush_range)
         subs    r1, r1, #1 << 4
         bcs     1b                              @ segments 7 to 0
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -264,7 +264,7 @@ ENDPROC(arm940_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm940_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm940_dma_unmap_area)
 
         .globl  arm940_flush_kern_cache_louis
@@ -337,7 +337,7 @@ __arm940_setup:
         orr     r0, r0, #0x00001000             @ I-cache
         orr     r0, r0, #0x00000005             @ MPU/D-cache
 
-        mov     pc, lr
+        ret     lr
 
         .size   __arm940_setup, . - __arm940_setup
 
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
index 0289cd905e73..b3dd9b2d0b8e 100644
--- a/arch/arm/mm/proc-arm946.S
+++ b/arch/arm/mm/proc-arm946.S
@@ -38,7 +38,7 @@
  */
 ENTRY(cpu_arm946_proc_init)
 ENTRY(cpu_arm946_switch_mm)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm946_proc_fin()
@@ -48,7 +48,7 @@ ENTRY(cpu_arm946_proc_fin)
         bic     r0, r0, #0x00001000             @ i-cache
         bic     r0, r0, #0x00000004             @ d-cache
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_arm946_reset(loc)
@@ -65,7 +65,7 @@ ENTRY(cpu_arm946_reset)
         bic     ip, ip, #0x00000005             @ .............c.p
         bic     ip, ip, #0x00001000             @ i-cache
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_arm946_reset)
         .popsection
 
@@ -75,7 +75,7 @@ ENDPROC(cpu_arm946_reset)
         .align  5
 ENTRY(cpu_arm946_do_idle)
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_icache_all()
@@ -85,7 +85,7 @@ ENTRY(cpu_arm946_do_idle)
 ENTRY(arm946_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm946_flush_icache_all)
 
 /*
@@ -117,7 +117,7 @@ __flush_whole_cache:
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ flush I cache
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -156,7 +156,7 @@ ENTRY(arm946_flush_user_cache_range)
         blo     1b
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -191,7 +191,7 @@ ENTRY(arm946_coherent_user_range)
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -212,7 +212,7 @@ ENTRY(arm946_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -239,7 +239,7 @@ arm946_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -260,7 +260,7 @@ arm946_dma_clean_range:
         blo     1b
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -284,7 +284,7 @@ ENTRY(arm946_dma_flush_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -307,7 +307,7 @@ ENDPROC(arm946_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(arm946_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(arm946_dma_unmap_area)
 
         .globl  arm946_flush_kern_cache_louis
@@ -324,7 +324,7 @@ ENTRY(cpu_arm946_dcache_clean_area)
         bhi     1b
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
         .type   __arm946_setup, #function
 __arm946_setup:
@@ -392,7 +392,7 @@ __arm946_setup:
 #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
         orr     r0, r0, #0x00004000             @ .1.. .... .... ....
 #endif
-        mov     pc, lr
+        ret     lr
 
         .size   __arm946_setup, . - __arm946_setup
 
diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
index f51197ba754a..8227322bbb8f 100644
--- a/arch/arm/mm/proc-arm9tdmi.S
+++ b/arch/arm/mm/proc-arm9tdmi.S
@@ -32,13 +32,13 @@ ENTRY(cpu_arm9tdmi_proc_init)
 ENTRY(cpu_arm9tdmi_do_idle)
 ENTRY(cpu_arm9tdmi_dcache_clean_area)
 ENTRY(cpu_arm9tdmi_switch_mm)
-                mov     pc, lr
+                ret     lr
 
 /*
  * cpu_arm9tdmi_proc_fin()
  */
 ENTRY(cpu_arm9tdmi_proc_fin)
-                mov     pc, lr
+                ret     lr
 
 /*
  * Function: cpu_arm9tdmi_reset(loc)
@@ -47,13 +47,13 @@ ENTRY(cpu_arm9tdmi_proc_fin)
  */
                 .pushsection    .idmap.text, "ax"
 ENTRY(cpu_arm9tdmi_reset)
-                mov     pc, r0
+                ret     r0
 ENDPROC(cpu_arm9tdmi_reset)
                 .popsection
 
                 .type   __arm9tdmi_setup, #function
 __arm9tdmi_setup:
-                mov     pc, lr
+                ret     lr
                 .size   __arm9tdmi_setup, . - __arm9tdmi_setup
 
                 __INITDATA
diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S
index 2dfc0f1d3bfd..c494886892ba 100644
--- a/arch/arm/mm/proc-fa526.S
+++ b/arch/arm/mm/proc-fa526.S
@@ -32,7 +32,7 @@
  * cpu_fa526_proc_init()
  */
 ENTRY(cpu_fa526_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_fa526_proc_fin()
@@ -44,7 +44,7 @@ ENTRY(cpu_fa526_proc_fin)
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
         nop
         nop
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_fa526_reset(loc)
@@ -72,7 +72,7 @@ ENTRY(cpu_fa526_reset)
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
         nop
         nop
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_fa526_reset)
         .popsection
 
@@ -81,7 +81,7 @@ ENDPROC(cpu_fa526_reset)
  */
         .align  4
 ENTRY(cpu_fa526_do_idle)
-        mov     pc, lr
+        ret     lr
 
 
 ENTRY(cpu_fa526_dcache_clean_area)
@@ -90,7 +90,7 @@ ENTRY(cpu_fa526_dcache_clean_area)
         subs    r1, r1, #CACHE_DLINESIZE
         bhi     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -117,7 +117,7 @@ ENTRY(cpu_fa526_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate UTLB
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_fa526_set_pte_ext(ptep, pte, ext)
@@ -133,7 +133,7 @@ ENTRY(cpu_fa526_set_pte_ext)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif
-        mov     pc, lr
+        ret     lr
 
         .type   __fa526_setup, #function
 __fa526_setup:
@@ -162,7 +162,7 @@ __fa526_setup:
         bic     r0, r0, r5
         ldr     r5, fa526_cr1_set
         orr     r0, r0, r5
-        mov     pc, lr
+        ret     lr
         .size   __fa526_setup, . - __fa526_setup
 
         /*
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index db79b62c92fb..03a1b75f2e16 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -69,7 +69,7 @@ ENTRY(cpu_feroceon_proc_init)
         movne   r2, r2, lsr #2                  @ turned into # of sets
         sub     r2, r2, #(1 << 5)
         stmia   r1, {r2, r3}
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_feroceon_proc_fin()
@@ -86,7 +86,7 @@ ENTRY(cpu_feroceon_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_feroceon_reset(loc)
@@ -110,7 +110,7 @@ ENTRY(cpu_feroceon_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_feroceon_reset)
         .popsection
 
@@ -124,7 +124,7 @@ ENTRY(cpu_feroceon_do_idle)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c10, 4          @ Drain write buffer
         mcr     p15, 0, r0, c7, c0, 4           @ Wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_icache_all()
@@ -134,7 +134,7 @@ ENTRY(cpu_feroceon_do_idle)
 ENTRY(feroceon_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(feroceon_flush_icache_all)
 
 /*
@@ -169,7 +169,7 @@ __flush_whole_cache:
         mov     ip, #0
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -198,7 +198,7 @@ ENTRY(feroceon_flush_user_cache_range)
         tst     r2, #VM_EXEC
         mov     ip, #0
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -233,7 +233,7 @@ ENTRY(feroceon_coherent_user_range)
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -254,7 +254,7 @@ ENTRY(feroceon_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
         .align  5
 ENTRY(feroceon_range_flush_kern_dcache_area)
@@ -268,7 +268,7 @@ ENTRY(feroceon_range_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -295,7 +295,7 @@ feroceon_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
         .align  5
 feroceon_range_dma_inv_range:
@@ -311,7 +311,7 @@ feroceon_range_dma_inv_range:
         mcr     p15, 5, r0, c15, c14, 0         @ D inv range start
         mcr     p15, 5, r1, c15, c14, 1         @ D inv range top
         msr     cpsr_c, r2                      @ restore interrupts
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -331,7 +331,7 @@ feroceon_dma_clean_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
         .align  5
 feroceon_range_dma_clean_range:
@@ -344,7 +344,7 @@ feroceon_range_dma_clean_range:
         mcr     p15, 5, r1, c15, c13, 1         @ D clean range top
         msr     cpsr_c, r2                      @ restore interrupts
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -362,7 +362,7 @@ ENTRY(feroceon_dma_flush_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
         .align  5
 ENTRY(feroceon_range_dma_flush_range)
@@ -375,7 +375,7 @@ ENTRY(feroceon_range_dma_flush_range)
         mcr     p15, 5, r1, c15, c15, 1         @ D clean/inv range top
         msr     cpsr_c, r2                      @ restore interrupts
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -412,7 +412,7 @@ ENDPROC(feroceon_range_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(feroceon_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(feroceon_dma_unmap_area)
 
         .globl  feroceon_flush_kern_cache_louis
@@ -461,7 +461,7 @@ ENTRY(cpu_feroceon_dcache_clean_area)
         bhi     1b
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -490,9 +490,9 @@ ENTRY(cpu_feroceon_switch_mm)
 
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
-        mov     pc, r2
+        ret     r2
 #else
-        mov     pc, lr
+        ret     lr
 #endif
 
 /*
@@ -512,7 +512,7 @@ ENTRY(cpu_feroceon_set_pte_ext)
 #endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif
-        mov     pc, lr
+        ret     lr
 
 /* Suspend/resume support: taken from arch/arm/mm/proc-arm926.S */
 .globl  cpu_feroceon_suspend_size
@@ -554,7 +554,7 @@ __feroceon_setup:
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         bic     r0, r0, r5
         orr     r0, r0, r6
-        mov     pc, lr
+        ret     lr
         .size   __feroceon_setup, . - __feroceon_setup
 
         /*
diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
index 40acba595731..53d393455f13 100644
--- a/arch/arm/mm/proc-mohawk.S
+++ b/arch/arm/mm/proc-mohawk.S
@@ -45,7 +45,7 @@
  * cpu_mohawk_proc_init()
  */
 ENTRY(cpu_mohawk_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_mohawk_proc_fin()
@@ -55,7 +55,7 @@ ENTRY(cpu_mohawk_proc_fin)
         bic     r0, r0, #0x1800                 @ ...iz...........
         bic     r0, r0, #0x0006                 @ .............ca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_mohawk_reset(loc)
@@ -79,7 +79,7 @@ ENTRY(cpu_mohawk_reset)
         bic     ip, ip, #0x0007                 @ .............cam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_mohawk_reset)
         .popsection
 
@@ -93,7 +93,7 @@ ENTRY(cpu_mohawk_do_idle)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c10, 4          @ drain write buffer
         mcr     p15, 0, r0, c7, c0, 4           @ wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_icache_all()
@@ -103,7 +103,7 @@ ENTRY(cpu_mohawk_do_idle)
 ENTRY(mohawk_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(mohawk_flush_icache_all)
 
 /*
@@ -128,7 +128,7 @@ __flush_whole_cache:
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcrne   p15, 0, ip, c7, c10, 0          @ drain write buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, flags)
@@ -158,7 +158,7 @@ ENTRY(mohawk_flush_user_cache_range)
         blo     1b
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -194,7 +194,7 @@ ENTRY(mohawk_coherent_user_range)
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
         mov     r0, #0
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -214,7 +214,7 @@ ENTRY(mohawk_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -240,7 +240,7 @@ mohawk_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -259,7 +259,7 @@ mohawk_dma_clean_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -277,7 +277,7 @@ ENTRY(mohawk_dma_flush_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -300,7 +300,7 @@ ENDPROC(mohawk_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(mohawk_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(mohawk_dma_unmap_area)
 
         .globl  mohawk_flush_kern_cache_louis
@@ -315,7 +315,7 @@ ENTRY(cpu_mohawk_dcache_clean_area)
         subs    r1, r1, #CACHE_DLINESIZE
         bhi     1b
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_mohawk_switch_mm(pgd)
@@ -333,7 +333,7 @@ ENTRY(cpu_mohawk_switch_mm)
         orr     r0, r0, #0x18                   @ cache the page table in L2
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_mohawk_set_pte_ext(ptep, pte, ext)
@@ -346,7 +346,7 @@ ENTRY(cpu_mohawk_set_pte_ext)
         mov     r0, r0
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
-        mov     pc, lr
+        ret     lr
 
 .globl  cpu_mohawk_suspend_size
 .equ    cpu_mohawk_suspend_size, 4 * 6
@@ -400,7 +400,7 @@ __mohawk_setup:
         mrc     p15, 0, r0, c1, c0              @ get control register
         bic     r0, r0, r5
         orr     r0, r0, r6
-        mov     pc, lr
+        ret     lr
 
         .size   __mohawk_setup, . - __mohawk_setup
 
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index c45319c8f1d9..8008a0461cf5 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -38,7 +38,7 @@
 ENTRY(cpu_sa110_proc_init)
         mov     r0, #0
         mcr     p15, 0, r0, c15, c1, 2          @ Enable clock switching
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_sa110_proc_fin()
@@ -50,7 +50,7 @@ ENTRY(cpu_sa110_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_sa110_reset(loc)
@@ -74,7 +74,7 @@ ENTRY(cpu_sa110_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_sa110_reset)
         .popsection
 
@@ -103,7 +103,7 @@ ENTRY(cpu_sa110_do_idle)
         mov     r0, r0                          @ safety
         mov     r0, r0                          @ safety
         mcr     p15, 0, r0, c15, c1, 2          @ enable clock switching
-        mov     pc, lr
+        ret     lr
 
 /* ================================= CACHE ================================ */
 
@@ -121,7 +121,7 @@ ENTRY(cpu_sa110_dcache_clean_area)
         add     r0, r0, #DCACHELINESIZE
         subs    r1, r1, #DCACHELINESIZE
         bhi     1b
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -141,7 +141,7 @@ ENTRY(cpu_sa110_switch_mm)
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
         ldr     pc, [sp], #4
 #else
-        mov     pc, lr
+        ret     lr
 #endif
 
 /*
@@ -157,7 +157,7 @@ ENTRY(cpu_sa110_set_pte_ext)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif
-        mov     pc, lr
+        ret     lr
 
         .type   __sa110_setup, #function
 __sa110_setup:
@@ -173,7 +173,7 @@ __sa110_setup:
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         bic     r0, r0, r5
         orr     r0, r0, r6
-        mov     pc, lr
+        ret     lr
         .size   __sa110_setup, . - __sa110_setup
 
         /*
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index 09d241ae2dbe..89f97ac648a9 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -43,7 +43,7 @@ ENTRY(cpu_sa1100_proc_init)
         mov     r0, #0
         mcr     p15, 0, r0, c15, c1, 2          @ Enable clock switching
         mcr     p15, 0, r0, c9, c0, 5           @ Allow read-buffer operations from userland
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_sa1100_proc_fin()
@@ -58,7 +58,7 @@ ENTRY(cpu_sa1100_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x000e                 @ ............wca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_sa1100_reset(loc)
@@ -82,7 +82,7 @@ ENTRY(cpu_sa1100_reset)
         bic     ip, ip, #0x000f                 @ ............wcam
         bic     ip, ip, #0x1100                 @ ...i...s........
         mcr     p15, 0, ip, c1, c0, 0           @ ctrl register
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_sa1100_reset)
         .popsection
 
@@ -113,7 +113,7 @@ ENTRY(cpu_sa1100_do_idle)
         mcr     p15, 0, r0, c15, c8, 2          @ wait for interrupt
         mov     r0, r0                          @ safety
         mcr     p15, 0, r0, c15, c1, 2          @ enable clock switching
-        mov     pc, lr
+        ret     lr
 
 /* ================================= CACHE ================================ */
 
@@ -131,7 +131,7 @@ ENTRY(cpu_sa1100_dcache_clean_area)
         add     r0, r0, #DCACHELINESIZE
         subs    r1, r1, #DCACHELINESIZE
         bhi     1b
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -152,7 +152,7 @@ ENTRY(cpu_sa1100_switch_mm)
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
         ldr     pc, [sp], #4
 #else
-        mov     pc, lr
+        ret     lr
 #endif
 
 /*
@@ -168,7 +168,7 @@ ENTRY(cpu_sa1100_set_pte_ext)
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif
-        mov     pc, lr
+        ret     lr
 
 .globl  cpu_sa1100_suspend_size
 .equ    cpu_sa1100_suspend_size, 4 * 3
@@ -211,7 +211,7 @@ __sa1100_setup:
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         bic     r0, r0, r5
         orr     r0, r0, r6
-        mov     pc, lr
+        ret     lr
         .size   __sa1100_setup, . - __sa1100_setup
 
         /*
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 32b3558321c4..d0390f4b3f18 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -36,14 +36,14 @@
 #define PMD_FLAGS_SMP   PMD_SECT_WBWA|PMD_SECT_S
 
 ENTRY(cpu_v6_proc_init)
-        mov     pc, lr
+        ret     lr
 
 ENTRY(cpu_v6_proc_fin)
         mrc     p15, 0, r0, c1, c0, 0           @ ctrl register
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x0006                 @ .............ca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  *      cpu_v6_reset(loc)
@@ -62,7 +62,7 @@ ENTRY(cpu_v6_reset)
         mcr     p15, 0, r1, c1, c0, 0           @ disable MMU
         mov     r1, #0
         mcr     p15, 0, r1, c7, c5, 4           @ ISB
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_v6_reset)
         .popsection
 
@@ -77,14 +77,14 @@ ENTRY(cpu_v6_do_idle)
         mov     r1, #0
         mcr     p15, 0, r1, c7, c10, 4          @ DWB - WFI may enter a low-power mode
         mcr     p15, 0, r1, c7, c0, 4           @ wait for interrupt
-        mov     pc, lr
+        ret     lr
 
 ENTRY(cpu_v6_dcache_clean_area)
 1:      mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         add     r0, r0, #D_CACHE_LINE_SIZE
         subs    r1, r1, #D_CACHE_LINE_SIZE
         bhi     1b
-        mov     pc, lr
+        ret     lr
 
 /*
  *      cpu_v6_switch_mm(pgd_phys, tsk)
@@ -113,7 +113,7 @@ ENTRY(cpu_v6_switch_mm)
 #endif
         mcr     p15, 0, r1, c13, c0, 1          @ set context ID
 #endif
-        mov     pc, lr
+        ret     lr
 
 /*
  *      cpu_v6_set_pte_ext(ptep, pte, ext)
@@ -131,7 +131,7 @@ ENTRY(cpu_v6_set_pte_ext)
 #ifdef CONFIG_MMU
         armv6_set_pte_ext cpu_v6
 #endif
-        mov     pc, lr
+        ret     lr
 
 /* Suspend/resume support: taken from arch/arm/mach-s3c64xx/sleep.S */
 .globl  cpu_v6_suspend_size
@@ -241,7 +241,7 @@ __v6_setup:
         mcreq   p15, 0, r5, c1, c0, 1           @ write aux control reg
         orreq   r0, r0, #(1 << 21)              @ low interrupt latency configuration
 #endif
-        mov     pc, lr                          @ return to head.S:__ret
+        ret     lr                              @ return to head.S:__ret
 
         /*
          *         V X F   I D LR
diff --git a/arch/arm/mm/proc-v7-2level.S b/arch/arm/mm/proc-v7-2level.S
index 1f52915f2b28..ed448d8a596b 100644
--- a/arch/arm/mm/proc-v7-2level.S
+++ b/arch/arm/mm/proc-v7-2level.S
@@ -59,7 +59,7 @@ ENTRY(cpu_v7_switch_mm)
         mcr     p15, 0, r0, c2, c0, 0           @ set TTB 0
         isb
 #endif
-        mov     pc, lr
+        bx      lr
 ENDPROC(cpu_v7_switch_mm)
 
 /*
@@ -106,7 +106,7 @@ ENTRY(cpu_v7_set_pte_ext)
         ALT_SMP(W(nop))
         ALT_UP (mcr     p15, 0, r0, c7, c10, 1)         @ flush_pte
 #endif
-        mov     pc, lr
+        bx      lr
 ENDPROC(cpu_v7_set_pte_ext)
 
         /*
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S
index 22e3ad63500c..1a24e9232ec8 100644
--- a/arch/arm/mm/proc-v7-3level.S
+++ b/arch/arm/mm/proc-v7-3level.S
@@ -19,6 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+#include <asm/assembler.h>
 
 #define TTB_IRGN_NC     (0 << 8)
 #define TTB_IRGN_WBWA   (1 << 8)
@@ -61,7 +62,7 @@ ENTRY(cpu_v7_switch_mm)
         mcrr    p15, 0, rpgdl, rpgdh, c2                @ set TTB 0
         isb
 #endif
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7_switch_mm)
 
 #ifdef __ARMEB__
@@ -86,13 +87,18 @@ ENTRY(cpu_v7_set_pte_ext)
         tst     rh, #1 << (57 - 32)             @ L_PTE_NONE
         bicne   rl, #L_PTE_VALID
         bne     1f
-        tst     rh, #1 << (55 - 32)             @ L_PTE_DIRTY
-        orreq   rl, #L_PTE_RDONLY
+
+        eor     ip, rh, #1 << (55 - 32) @ toggle L_PTE_DIRTY in temp reg to
+                                        @ test for !L_PTE_DIRTY || L_PTE_RDONLY
+        tst     ip, #1 << (55 - 32) | 1 << (58 - 32)
+        orrne   rl, #PTE_AP2
+        biceq   rl, #PTE_AP2
+
 1:      strd    r2, r3, [r0]
         ALT_SMP(W(nop))
         ALT_UP (mcr     p15, 0, r0, c7, c10, 1)         @ flush_pte
 #endif
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7_set_pte_ext)
 
         /*
@@ -140,12 +146,11 @@ ENDPROC(cpu_v7_set_pte_ext)
         mov     \tmp, \ttbr1, lsr #(32 - ARCH_PGD_SHIFT)        @ upper bits
         mov     \ttbr1, \ttbr1, lsl #ARCH_PGD_SHIFT             @ lower bits
         addls   \ttbr1, \ttbr1, #TTBR1_OFFSET
-        mcrr    p15, 1, \ttbr1, \zero, c2                       @ load TTBR1
+        adcls   \tmp, \tmp, #0
+        mcrr    p15, 1, \ttbr1, \tmp, c2                        @ load TTBR1
         mov     \tmp, \ttbr0, lsr #(32 - ARCH_PGD_SHIFT)        @ upper bits
         mov     \ttbr0, \ttbr0, lsl #ARCH_PGD_SHIFT             @ lower bits
-        mcrr    p15, 0, \ttbr0, \zero, c2                       @ load TTBR0
-        mcrr    p15, 1, \ttbr1, \zero, c2                       @ load TTBR1
-        mcrr    p15, 0, \ttbr0, \zero, c2                       @ load TTBR0
+        mcrr    p15, 0, \ttbr0, \tmp, c2                        @ load TTBR0
         .endm
 
         /*
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 3db2c2f04a30..b5d67db20897 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -26,7 +26,7 @@
 #endif
 
 ENTRY(cpu_v7_proc_init)
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7_proc_init)
 
 ENTRY(cpu_v7_proc_fin)
@@ -34,7 +34,7 @@ ENTRY(cpu_v7_proc_fin)
         bic     r0, r0, #0x1000                 @ ...i............
         bic     r0, r0, #0x0006                 @ .............ca.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7_proc_fin)
 
 /*
@@ -71,20 +71,20 @@ ENDPROC(cpu_v7_reset)
 ENTRY(cpu_v7_do_idle)
         dsb                                     @ WFI may enter a low-power mode
         wfi
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7_do_idle)
 
 ENTRY(cpu_v7_dcache_clean_area)
         ALT_SMP(W(nop))                 @ MP extensions imply L1 PTW
         ALT_UP_B(1f)
-        mov     pc, lr
+        ret     lr
 1:      dcache_line_size r2, r3
 2:      mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         add     r0, r0, r2
         subs    r1, r1, r2
         bhi     2b
         dsb     ishst
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7_dcache_clean_area)
 
         string  cpu_v7_name, "ARMv7 Processor"
@@ -152,6 +152,40 @@ ENTRY(cpu_v7_do_resume)
 ENDPROC(cpu_v7_do_resume)
 #endif
 
+/*
+ * Cortex-A9 processor functions
+ */
+        globl_equ       cpu_ca9mp_proc_init,    cpu_v7_proc_init
+        globl_equ       cpu_ca9mp_proc_fin,     cpu_v7_proc_fin
+        globl_equ       cpu_ca9mp_reset,        cpu_v7_reset
+        globl_equ       cpu_ca9mp_do_idle,      cpu_v7_do_idle
+        globl_equ       cpu_ca9mp_dcache_clean_area, cpu_v7_dcache_clean_area
+        globl_equ       cpu_ca9mp_switch_mm,    cpu_v7_switch_mm
+        globl_equ       cpu_ca9mp_set_pte_ext,  cpu_v7_set_pte_ext
+.globl  cpu_ca9mp_suspend_size
+.equ    cpu_ca9mp_suspend_size, cpu_v7_suspend_size + 4 * 2
+#ifdef CONFIG_ARM_CPU_SUSPEND
+ENTRY(cpu_ca9mp_do_suspend)
+        stmfd   sp!, {r4 - r5}
+        mrc     p15, 0, r4, c15, c0, 1          @ Diagnostic register
+        mrc     p15, 0, r5, c15, c0, 0          @ Power register
+        stmia   r0!, {r4 - r5}
+        ldmfd   sp!, {r4 - r5}
+        b       cpu_v7_do_suspend
+ENDPROC(cpu_ca9mp_do_suspend)
+
+ENTRY(cpu_ca9mp_do_resume)
+        ldmia   r0!, {r4 - r5}
+        mrc     p15, 0, r10, c15, c0, 1         @ Read Diagnostic register
+        teq     r4, r10                         @ Already restored?
+        mcrne   p15, 0, r4, c15, c0, 1          @ No, so restore it
+        mrc     p15, 0, r10, c15, c0, 0         @ Read Power register
+        teq     r5, r10                         @ Already restored?
+        mcrne   p15, 0, r5, c15, c0, 0          @ No, so restore it
+        b       cpu_v7_do_resume
+ENDPROC(cpu_ca9mp_do_resume)
+#endif
+
 #ifdef CONFIG_CPU_PJ4B
         globl_equ       cpu_pj4b_switch_mm,     cpu_v7_switch_mm
         globl_equ       cpu_pj4b_set_pte_ext,   cpu_v7_set_pte_ext
@@ -163,7 +197,7 @@ ENTRY(cpu_pj4b_do_idle)
         dsb                                     @ WFI may enter a low-power mode
         wfi
         dsb                                     @barrier
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_pj4b_do_idle)
 #else
         globl_equ       cpu_pj4b_do_idle,       cpu_v7_do_idle
@@ -184,16 +218,16 @@ ENDPROC(cpu_pj4b_do_suspend)
 
 ENTRY(cpu_pj4b_do_resume)
         ldmia   r0!, {r6 - r10}
-        mcr     p15, 1, r6, c15, c1, 0  @ save CP15 - extra features
-        mcr     p15, 1, r7, c15, c2, 0  @ save CP15 - Aux Func Modes Ctrl 0
-        mcr     p15, 1, r8, c15, c1, 2  @ save CP15 - Aux Debug Modes Ctrl 2
-        mcr     p15, 1, r9, c15, c1, 1  @ save CP15 - Aux Debug Modes Ctrl 1
-        mcr     p15, 0, r10, c9, c14, 0  @ save CP15 - PMC
+        mcr     p15, 1, r6, c15, c1, 0  @ restore CP15 - extra features
+        mcr     p15, 1, r7, c15, c2, 0  @ restore CP15 - Aux Func Modes Ctrl 0
+        mcr     p15, 1, r8, c15, c1, 2  @ restore CP15 - Aux Debug Modes Ctrl 2
+        mcr     p15, 1, r9, c15, c1, 1  @ restore CP15 - Aux Debug Modes Ctrl 1
+        mcr     p15, 0, r10, c9, c14, 0  @ restore CP15 - PMC
         b cpu_v7_do_resume
 ENDPROC(cpu_pj4b_do_resume)
 #endif
 .globl  cpu_pj4b_suspend_size
-.equ    cpu_pj4b_suspend_size, 4 * 14
+.equ    cpu_pj4b_suspend_size, cpu_v7_suspend_size + 4 * 5
 
 #endif
 
@@ -216,6 +250,7 @@ __v7_cr7mp_setup:
 __v7_ca7mp_setup:
 __v7_ca12mp_setup:
 __v7_ca15mp_setup:
+__v7_b15mp_setup:
 __v7_ca17mp_setup:
         mov     r10, #0
 1:
@@ -407,7 +442,7 @@ __v7_setup:
         bic     r0, r0, r5                      @ clear bits them
         orr     r0, r0, r6                      @ set them
  THUMB( orr     r0, r0, #1 << 30        )       @ Thumb exceptions
-        mov     pc, lr                          @ return to head.S:__ret
+        ret     lr                              @ return to head.S:__ret
 ENDPROC(__v7_setup)
 
         .align  2
@@ -418,6 +453,7 @@ __v7_setup_stack:
 
         @ define struct processor (see <asm/proc-fns.h> and proc-macros.S)
         define_processor_functions v7, dabort=v7_early_abort, pabort=v7_pabort, suspend=1
+        define_processor_functions ca9mp, dabort=v7_early_abort, pabort=v7_pabort, suspend=1
 #ifdef CONFIG_CPU_PJ4B
         define_processor_functions pj4b, dabort=v7_early_abort, pabort=v7_pabort, suspend=1
 #endif
@@ -470,7 +506,7 @@ __v7_ca5mp_proc_info:
 __v7_ca9mp_proc_info:
         .long   0x410fc090
         .long   0xff0ffff0
-        __v7_proc __v7_ca9mp_setup
+        __v7_proc __v7_ca9mp_setup, proc_fns = ca9mp_processor_functions
         .size   __v7_ca9mp_proc_info, . - __v7_ca9mp_proc_info
 
 #endif  /* CONFIG_ARM_LPAE */
@@ -528,6 +564,16 @@ __v7_ca15mp_proc_info:
         .size   __v7_ca15mp_proc_info, . - __v7_ca15mp_proc_info
 
         /*
+         * Broadcom Corporation Brahma-B15 processor.
+         */
+        .type   __v7_b15mp_proc_info, #object
+__v7_b15mp_proc_info:
+        .long   0x420f00f0
+        .long   0xff0ffff0
+        __v7_proc __v7_b15mp_setup, hwcaps = HWCAP_IDIV
+        .size   __v7_b15mp_proc_info, . - __v7_b15mp_proc_info
+
+        /*
          * ARM Ltd. Cortex A17 processor.
          */
         .type   __v7_ca17mp_proc_info, #object
diff --git a/arch/arm/mm/proc-v7m.S b/arch/arm/mm/proc-v7m.S
index 1ca37c72f12f..d1e68b553d3b 100644
--- a/arch/arm/mm/proc-v7m.S
+++ b/arch/arm/mm/proc-v7m.S
@@ -16,11 +16,11 @@
 #include "proc-macros.S"
 
 ENTRY(cpu_v7m_proc_init)
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7m_proc_init)
 
 ENTRY(cpu_v7m_proc_fin)
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7m_proc_fin)
 
 /*
@@ -34,7 +34,7 @@ ENDPROC(cpu_v7m_proc_fin)
  */
         .align  5
 ENTRY(cpu_v7m_reset)
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_v7m_reset)
 
 /*
@@ -46,18 +46,18 @@ ENDPROC(cpu_v7m_reset)
  */
 ENTRY(cpu_v7m_do_idle)
         wfi
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7m_do_idle)
 
 ENTRY(cpu_v7m_dcache_clean_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7m_dcache_clean_area)
 
 /*
  * There is no MMU, so here is nothing to do.
  */
 ENTRY(cpu_v7m_switch_mm)
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7m_switch_mm)
 
 .globl  cpu_v7m_suspend_size
@@ -65,11 +65,11 @@ ENDPROC(cpu_v7m_switch_mm)
 
 #ifdef CONFIG_ARM_CPU_SUSPEND
 ENTRY(cpu_v7m_do_suspend)
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7m_do_suspend)
 
 ENTRY(cpu_v7m_do_resume)
-        mov     pc, lr
+        ret     lr
 ENDPROC(cpu_v7m_do_resume)
 #endif
 
@@ -120,7 +120,7 @@ __v7m_setup:
         ldr     r12, [r0, V7M_SCB_CCR]  @ system control register
         orr     r12, #V7M_SCB_CCR_STKALIGN
         str     r12, [r0, V7M_SCB_CCR]
-        mov     pc, lr
+        ret     lr
 ENDPROC(__v7m_setup)
 
         .align 2
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index dc1645890042..f8acdfece036 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -83,7 +83,7 @@
  * Nothing too exciting at the moment
  */
 ENTRY(cpu_xsc3_proc_init)
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_xsc3_proc_fin()
@@ -93,7 +93,7 @@ ENTRY(cpu_xsc3_proc_fin)
         bic     r0, r0, #0x1800                 @ ...IZ...........
         bic     r0, r0, #0x0006                 @ .............CA.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_xsc3_reset(loc)
@@ -119,7 +119,7 @@ ENTRY(cpu_xsc3_reset)
         @ CAUTION: MMU turned off from this point.  We count on the pipeline
         @ already containing those two last instructions to survive.
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I and D TLBs
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_xsc3_reset)
         .popsection
 
@@ -138,7 +138,7 @@ ENDPROC(cpu_xsc3_reset)
 ENTRY(cpu_xsc3_do_idle)
         mov     r0, #1
         mcr     p14, 0, r0, c7, c0, 0           @ go to idle
-        mov     pc, lr
+        ret     lr
 
 /* ================================= CACHE ================================ */
 
@@ -150,7 +150,7 @@ ENTRY(cpu_xsc3_do_idle)
 ENTRY(xsc3_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(xsc3_flush_icache_all)
 
 /*
@@ -176,7 +176,7 @@ __flush_whole_cache:
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate L1 I cache and BTB
         mcrne   p15, 0, ip, c7, c10, 4          @ data write barrier
         mcrne   p15, 0, ip, c7, c5, 4           @ prefetch flush
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, vm_flags)
@@ -205,7 +205,7 @@ ENTRY(xsc3_flush_user_cache_range)
         mcrne   p15, 0, ip, c7, c5, 6           @ invalidate BTB
         mcrne   p15, 0, ip, c7, c10, 4          @ data write barrier
         mcrne   p15, 0, ip, c7, c5, 4           @ prefetch flush
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -232,7 +232,7 @@ ENTRY(xsc3_coherent_user_range)
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate L1 I cache and BTB
         mcr     p15, 0, r0, c7, c10, 4          @ data write barrier
         mcr     p15, 0, r0, c7, c5, 4           @ prefetch flush
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -253,7 +253,7 @@ ENTRY(xsc3_flush_kern_dcache_area)
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate L1 I cache and BTB
         mcr     p15, 0, r0, c7, c10, 4          @ data write barrier
         mcr     p15, 0, r0, c7, c5, 4           @ prefetch flush
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -277,7 +277,7 @@ xsc3_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ data write barrier
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -294,7 +294,7 @@ xsc3_dma_clean_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ data write barrier
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -311,7 +311,7 @@ ENTRY(xsc3_dma_flush_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ data write barrier
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -334,7 +334,7 @@ ENDPROC(xsc3_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(xsc3_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(xsc3_dma_unmap_area)
 
         .globl  xsc3_flush_kern_cache_louis
@@ -348,7 +348,7 @@ ENTRY(cpu_xsc3_dcache_clean_area)
         add     r0, r0, #CACHELINESIZE
         subs    r1, r1, #CACHELINESIZE
         bhi     1b
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -406,7 +406,7 @@ ENTRY(cpu_xsc3_set_pte_ext)
         orr     r2, r2, ip
 
         xscale_set_pte_ext_epilogue
-        mov     pc, lr
+        ret     lr
 
         .ltorg
         .align
@@ -478,7 +478,7 @@ __xsc3_setup:
         bic     r0, r0, r5                      @ ..V. ..R. .... ..A.
         orr     r0, r0, r6                      @ ..VI Z..S .... .C.M (mmu)
                                                 @ ...I Z..S .... .... (uc)
-        mov     pc, lr
+        ret     lr
 
         .size   __xsc3_setup, . - __xsc3_setup
 
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index d19b1cfcad91..23259f104c66 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -118,7 +118,7 @@ ENTRY(cpu_xscale_proc_init)
         mrc     p15, 0, r1, c1, c0, 1
         bic     r1, r1, #1
         mcr     p15, 0, r1, c1, c0, 1
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_xscale_proc_fin()
@@ -128,7 +128,7 @@ ENTRY(cpu_xscale_proc_fin)
         bic     r0, r0, #0x1800                 @ ...IZ...........
         bic     r0, r0, #0x0006                 @ .............CA.
         mcr     p15, 0, r0, c1, c0, 0           @ disable caches
-        mov     pc, lr
+        ret     lr
 
 /*
  * cpu_xscale_reset(loc)
@@ -160,7 +160,7 @@ ENTRY(cpu_xscale_reset)
         @ CAUTION: MMU turned off from this point. We count on the pipeline
         @ already containing those two last instructions to survive.
         mcr     p15, 0, ip, c8, c7, 0           @ invalidate I & D TLBs
-        mov     pc, r0
+        ret     r0
 ENDPROC(cpu_xscale_reset)
         .popsection
 
@@ -179,7 +179,7 @@ ENDPROC(cpu_xscale_reset)
 ENTRY(cpu_xscale_do_idle)
         mov     r0, #1
         mcr     p14, 0, r0, c7, c0, 0           @ Go to IDLE
-        mov     pc, lr
+        ret     lr
 
 /* ================================= CACHE ================================ */
 
@@ -191,7 +191,7 @@ ENTRY(cpu_xscale_do_idle)
 ENTRY(xscale_flush_icache_all)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ invalidate I cache
-        mov     pc, lr
+        ret     lr
 ENDPROC(xscale_flush_icache_all)
 
 /*
@@ -216,7 +216,7 @@ __flush_whole_cache:
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ Invalidate I cache & BTB
         mcrne   p15, 0, ip, c7, c10, 4          @ Drain Write (& Fill) Buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_user_cache_range(start, end, vm_flags)
@@ -245,7 +245,7 @@ ENTRY(xscale_flush_user_cache_range)
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 6           @ Invalidate BTB
         mcrne   p15, 0, ip, c7, c10, 4          @ Drain Write (& Fill) Buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_kern_range(start, end)
@@ -269,7 +269,7 @@ ENTRY(xscale_coherent_kern_range)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ Invalidate I cache & BTB
         mcr     p15, 0, r0, c7, c10, 4          @ Drain Write (& Fill) Buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      coherent_user_range(start, end)
@@ -291,7 +291,7 @@ ENTRY(xscale_coherent_user_range)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 6           @ Invalidate BTB
         mcr     p15, 0, r0, c7, c10, 4          @ Drain Write (& Fill) Buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      flush_kern_dcache_area(void *addr, size_t size)
@@ -312,7 +312,7 @@ ENTRY(xscale_flush_kern_dcache_area)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c5, 0           @ Invalidate I cache & BTB
         mcr     p15, 0, r0, c7, c10, 4          @ Drain Write (& Fill) Buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_inv_range(start, end)
@@ -336,7 +336,7 @@ xscale_dma_inv_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ Drain Write (& Fill) Buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_clean_range(start, end)
@@ -353,7 +353,7 @@ xscale_dma_clean_range:
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ Drain Write (& Fill) Buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_flush_range(start, end)
@@ -371,7 +371,7 @@ ENTRY(xscale_dma_flush_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r0, c7, c10, 4          @ Drain Write (& Fill) Buffer
-        mov     pc, lr
+        ret     lr
 
 /*
  *      dma_map_area(start, size, dir)
@@ -407,7 +407,7 @@ ENDPROC(xscale_80200_A0_A1_dma_map_area)
  *      - dir   - DMA direction
  */
 ENTRY(xscale_dma_unmap_area)
-        mov     pc, lr
+        ret     lr
 ENDPROC(xscale_dma_unmap_area)
 
         .globl  xscale_flush_kern_cache_louis
@@ -458,7 +458,7 @@ ENTRY(cpu_xscale_dcache_clean_area)
         add     r0, r0, #CACHELINESIZE
         subs    r1, r1, #CACHELINESIZE
         bhi     1b
-        mov     pc, lr
+        ret     lr
 
 /* =============================== PageTable ============================== */
 
@@ -521,7 +521,7 @@ ENTRY(cpu_xscale_set_pte_ext)
         orr     r2, r2, ip
 
         xscale_set_pte_ext_epilogue
-        mov     pc, lr
+        ret     lr
 
         .ltorg
         .align
@@ -572,7 +572,7 @@ __xscale_setup:
         mrc     p15, 0, r0, c1, c0, 0           @ get control register
         bic     r0, r0, r5
         orr     r0, r0, r6
-        mov     pc, lr
+        ret     lr
         .size   __xscale_setup, . - __xscale_setup
 
         /*
diff --git a/arch/arm/mm/tlb-fa.S b/arch/arm/mm/tlb-fa.S
index d3ddcf9a76ca..d2d9ecbe0aac 100644
--- a/arch/arm/mm/tlb-fa.S
+++ b/arch/arm/mm/tlb-fa.S
@@ -18,6 +18,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 #include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
@@ -37,7 +38,7 @@ ENTRY(fa_flush_user_tlb_range)
         vma_vm_mm ip, r2
         act_mm  r3                              @ get current->active_mm
         eors    r3, ip, r3                      @ == mm ?
-        movne   pc, lr                          @ no, we dont do anything
+        retne   lr                              @ no, we dont do anything
         mov     r3, #0
         mcr     p15, 0, r3, c7, c10, 4          @ drain WB
         bic     r0, r0, #0x0ff
@@ -47,7 +48,7 @@ ENTRY(fa_flush_user_tlb_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, r3, c7, c10, 4          @ data write barrier
-        mov     pc, lr
+        ret     lr
 
 
 ENTRY(fa_flush_kern_tlb_range)
@@ -61,7 +62,7 @@ ENTRY(fa_flush_kern_tlb_range)
         blo     1b
         mcr     p15, 0, r3, c7, c10, 4          @ data write barrier
         mcr     p15, 0, r3, c7, c5, 4           @ prefetch flush (isb)
-        mov     pc, lr
+        ret     lr
 
         __INITDATA
 
diff --git a/arch/arm/mm/tlb-v4.S b/arch/arm/mm/tlb-v4.S
index 17a025ade573..a2b5dca42048 100644
--- a/arch/arm/mm/tlb-v4.S
+++ b/arch/arm/mm/tlb-v4.S
@@ -14,6 +14,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 #include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
@@ -33,7 +34,7 @@ ENTRY(v4_flush_user_tlb_range)
         vma_vm_mm ip, r2
         act_mm  r3                              @ get current->active_mm
         eors    r3, ip, r3                              @ == mm ?
-        movne   pc, lr                          @ no, we dont do anything
+        retne   lr                              @ no, we dont do anything
 .v4_flush_kern_tlb_range:
         bic     r0, r0, #0x0ff
         bic     r0, r0, #0xf00
@@ -41,7 +42,7 @@ ENTRY(v4_flush_user_tlb_range)
         add     r0, r0, #PAGE_SZ
         cmp     r0, r1
         blo     1b
-        mov     pc, lr
+        ret     lr
 
 /*
  *      v4_flush_kern_tlb_range(start, end)
diff --git a/arch/arm/mm/tlb-v4wb.S b/arch/arm/mm/tlb-v4wb.S
index c04598fa4d4a..5a093b458dbc 100644
--- a/arch/arm/mm/tlb-v4wb.S
+++ b/arch/arm/mm/tlb-v4wb.S
@@ -14,6 +14,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 #include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
@@ -33,7 +34,7 @@ ENTRY(v4wb_flush_user_tlb_range)
         vma_vm_mm ip, r2
         act_mm  r3                              @ get current->active_mm
         eors    r3, ip, r3                              @ == mm ?
-        movne   pc, lr                          @ no, we dont do anything
+        retne   lr                              @ no, we dont do anything
         vma_vm_flags r2, r2
         mcr     p15, 0, r3, c7, c10, 4          @ drain WB
         tst     r2, #VM_EXEC
@@ -44,7 +45,7 @@ ENTRY(v4wb_flush_user_tlb_range)
         add     r0, r0, #PAGE_SZ
         cmp     r0, r1
         blo     1b
-        mov     pc, lr
+        ret     lr
 
 /*
  *      v4_flush_kern_tlb_range(start, end)
@@ -65,7 +66,7 @@ ENTRY(v4wb_flush_kern_tlb_range)
         add     r0, r0, #PAGE_SZ
         cmp     r0, r1
         blo     1b
-        mov     pc, lr
+        ret     lr
 
         __INITDATA
 
diff --git a/arch/arm/mm/tlb-v4wbi.S b/arch/arm/mm/tlb-v4wbi.S
index 1f6062b6c1c1..058861548f68 100644
--- a/arch/arm/mm/tlb-v4wbi.S
+++ b/arch/arm/mm/tlb-v4wbi.S
@@ -14,6 +14,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
+#include <asm/assembler.h>
 #include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
@@ -32,7 +33,7 @@ ENTRY(v4wbi_flush_user_tlb_range)
         vma_vm_mm ip, r2
         act_mm  r3                              @ get current->active_mm
         eors    r3, ip, r3                      @ == mm ?
-        movne   pc, lr                          @ no, we dont do anything
+        retne   lr                              @ no, we dont do anything
         mov     r3, #0
         mcr     p15, 0, r3, c7, c10, 4          @ drain WB
         vma_vm_flags r2, r2
@@ -44,7 +45,7 @@ ENTRY(v4wbi_flush_user_tlb_range)
         add     r0, r0, #PAGE_SZ
         cmp     r0, r1
         blo     1b
-        mov     pc, lr
+        ret     lr
 
 ENTRY(v4wbi_flush_kern_tlb_range)
         mov     r3, #0
@@ -56,7 +57,7 @@ ENTRY(v4wbi_flush_kern_tlb_range)
         add     r0, r0, #PAGE_SZ
         cmp     r0, r1
         blo     1b
-        mov     pc, lr
+        ret     lr
 
         __INITDATA
 
diff --git a/arch/arm/mm/tlb-v6.S b/arch/arm/mm/tlb-v6.S
index eca07f550a0b..6f689be638bd 100644
--- a/arch/arm/mm/tlb-v6.S
+++ b/arch/arm/mm/tlb-v6.S
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
+#include <asm/assembler.h>
 #include <asm/page.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
@@ -55,7 +56,7 @@ ENTRY(v6wbi_flush_user_tlb_range)
         cmp     r0, r1
         blo     1b
         mcr     p15, 0, ip, c7, c10, 4          @ data synchronization barrier
-        mov     pc, lr
+        ret     lr
 
 /*
  *      v6wbi_flush_kern_tlb_range(start,end)
@@ -84,7 +85,7 @@ ENTRY(v6wbi_flush_kern_tlb_range)
         blo     1b
         mcr     p15, 0, r2, c7, c10, 4          @ data synchronization barrier
         mcr     p15, 0, r2, c7, c5, 4           @ prefetch flush (isb)
-        mov     pc, lr
+        ret     lr
 
         __INIT
 
diff --git a/arch/arm/mm/tlb-v7.S b/arch/arm/mm/tlb-v7.S
index 355308767bae..e5101a3bc57c 100644
--- a/arch/arm/mm/tlb-v7.S
+++ b/arch/arm/mm/tlb-v7.S
@@ -57,7 +57,7 @@ ENTRY(v7wbi_flush_user_tlb_range)
         cmp     r0, r1
         blo     1b
         dsb     ish
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7wbi_flush_user_tlb_range)
 
 /*
@@ -86,7 +86,7 @@ ENTRY(v7wbi_flush_kern_tlb_range)
         blo     1b
         dsb     ish
         isb
-        mov     pc, lr
+        ret     lr
 ENDPROC(v7wbi_flush_kern_tlb_range)
 
         __INIT
diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index fb5503ce016f..a37b989a2f91 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -56,7 +56,7 @@
 #define FLAG_NEED_X_RESET       (1 << 0)
 
 struct jit_ctx {
-        const struct sk_filter *skf;
+        const struct bpf_prog *skf;
         unsigned idx;
         unsigned prologue_bytes;
         int ret0_fp_idx;
@@ -465,7 +465,7 @@ static inline void update_on_xread(struct jit_ctx *ctx)
 static int build_body(struct jit_ctx *ctx)
 {
         void *load_func[] = {jit_get_skb_b, jit_get_skb_h, jit_get_skb_w};
-        const struct sk_filter *prog = ctx->skf;
+        const struct bpf_prog *prog = ctx->skf;
         const struct sock_filter *inst;
         unsigned i, load_order, off, condt;
         int imm12;
@@ -857,7 +857,7 @@ b_epilogue:
 }
 
 
-void bpf_jit_compile(struct sk_filter *fp)
+void bpf_jit_compile(struct bpf_prog *fp)
 {
         struct jit_ctx ctx;
         unsigned tmp_idx;
@@ -926,7 +926,7 @@ out:
         return;
 }
 
-void bpf_jit_free(struct sk_filter *fp)
+void bpf_jit_free(struct bpf_prog *fp)
 {
         if (fp->jited)
                 module_free(NULL, fp->bpf_func);
diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S
index d18dde95b8aa..5d65be1f1e8a 100644
--- a/arch/arm/nwfpe/entry.S
+++ b/arch/arm/nwfpe/entry.S
@@ -19,7 +19,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-
+#include <asm/assembler.h>
 #include <asm/opcodes.h>
 
 /* This is the kernel's entry point into the floating point emulator.
@@ -92,7 +92,7 @@ emulate:
         mov     r0, r6                  @ prepare for EmulateAll()
         bl      EmulateAll              @ emulate the instruction
         cmp     r0, #0                  @ was emulation successful
-        moveq   pc, r4                  @ no, return failure
+        reteq   r4                      @ no, return failure
 
 next:
 .Lx1:   ldrt    r6, [r5], #4            @ get the next instruction and
@@ -102,7 +102,7 @@ next:
         teq     r2, #0x0C000000
         teqne   r2, #0x0D000000
         teqne   r2, #0x0E000000
-        movne   pc, r9                  @ return ok if not a fp insn
+        retne   r9                      @ return ok if not a fp insn
 
         str     r5, [sp, #S_PC]         @ update PC copy in regs
 
@@ -115,7 +115,7 @@ next:
         @ plain LDR instruction.  Weird, but it seems harmless.
         .pushsection .fixup,"ax"
         .align  2
-.Lfix:  mov     pc, r9                  @ let the user eat segfaults
+.Lfix:  ret     r9                      @ let the user eat segfaults
         .popsection
 
         .pushsection __ex_table,"a"
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 99c63d4b6af8..cc649a1e46da 100644
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -33,12 +33,14 @@ static struct op_perf_name {
         char *perf_name;
         char *op_name;
 } op_perf_name_map[] = {
-        { "xscale1",            "arm/xscale1"   },
-        { "xscale1",            "arm/xscale2"   },
-        { "v6",                 "arm/armv6"     },
-        { "v6mpcore",           "arm/mpcore"    },
-        { "ARMv7 Cortex-A8",    "arm/armv7"     },
-        { "ARMv7 Cortex-A9",    "arm/armv7-ca9" },
+        { "armv5_xscale1",      "arm/xscale1"   },
+        { "armv5_xscale2",      "arm/xscale2"   },
+        { "armv6_1136",         "arm/armv6"     },
+        { "armv6_1156",         "arm/armv6"     },
+        { "armv6_1176",         "arm/armv6"     },
+        { "armv6_11mpcore",     "arm/mpcore"    },
+        { "armv7_cortex_a8",    "arm/armv7"     },
+        { "armv7_cortex_a9",    "arm/armv7-ca9" },
 };
 
 char *op_name_from_perf_id(void)
@@ -107,10 +109,7 @@ static void arm_backtrace(struct pt_regs * const regs, unsigned int depth)
 
         if (!user_mode(regs)) {
                 struct stackframe frame;
-                frame.fp = regs->ARM_fp;
-                frame.sp = regs->ARM_sp;
-                frame.lr = regs->ARM_lr;
-                frame.pc = regs->ARM_pc;
+                arm_get_current_stackframe(regs, &frame);
                 walk_stackframe(&frame, report_trace, &depth);
                 return;
         }
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index b5608b1f9fbd..c2baa8ede543 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -698,6 +698,8 @@ int omap_request_dma(int dev_id, const char *dev_name,
         unsigned long flags;
         struct omap_dma_lch *chan;
 
+        WARN(strcmp(dev_name, "DMA engine"), "Using deprecated platform DMA API - please update to DMA engine");
+
         spin_lock_irqsave(&dma_chan_lock, flags);
         for (ch = 0; ch < dma_chan_count; ch++) {
                 if (free_ch == -1 && dma_chan[ch].dev_id == -1) {
@@ -2100,7 +2102,7 @@ static int omap_system_dma_probe(struct platform_device *pdev)
                 omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE,
                                 DMA_DEFAULT_FIFO_DEPTH, 0);
 
-        if (dma_omap2plus()) {
+        if (dma_omap2plus() && !(d->dev_caps & DMA_ENGINE_HANDLE_IRQ)) {
                 strcpy(irq_name, "0");
                 dma_irq = platform_get_irq_byname(pdev, irq_name);
                 if (dma_irq < 0) {
@@ -2145,7 +2147,8 @@ static int omap_system_dma_remove(struct platform_device *pdev)
                 char irq_name[4];
                 strcpy(irq_name, "0");
                 dma_irq = platform_get_irq_byname(pdev, irq_name);
-                remove_irq(dma_irq, &omap24xx_dma_irq);
+                if (dma_irq >= 0)
+                        remove_irq(dma_irq, &omap24xx_dma_irq);
         } else {
                 int irq_rel = 0;
                 for ( ; irq_rel < dma_chan_count; irq_rel++) {
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 301b892d97d9..c87aefbf3a13 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -6,30 +6,16 @@
 
 config PLAT_SAMSUNG
         bool
-        depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS
+        depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_EXYNOS || ARCH_S5PV210
         default y
         select GENERIC_IRQ_CHIP
         select NO_IOPORT_MAP
         help
           Base platform code for all Samsung SoC based systems
 
-config PLAT_S5P
-        bool
-        depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
-        default y
-        select ARCH_REQUIRE_GPIOLIB
-        select ARM_VIC
-        select NO_IOPORT_MAP
-        select PLAT_SAMSUNG
-        select S3C_GPIO_TRACK
-        select S5P_GPIO_DRVSTR
-        select SAMSUNG_CLKSRC if !COMMON_CLK
-        help
-          Base platform code for Samsung's S5P series SoC.
-
 config SAMSUNG_PM
         bool
-        depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5P64X0 || S5P_PM)
+        depends on PM && (PLAT_S3C24XX || ARCH_S3C64XX)
         default y
         help
           Base platform power management code for samsung code
@@ -65,65 +51,6 @@ config SAMSUNG_ATAGS
 
 if SAMSUNG_ATAGS
 
-# clock options
-
-config SAMSUNG_CLOCK
-        bool
-        default y if !COMMON_CLK
-
-config SAMSUNG_CLKSRC
-        bool
-        help
-          Select the clock code for the clksrc implementation
-          used by newer systems such as the S3C64XX.
-
-config S5P_CLOCK
-        def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
-        help
-          Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
-
-# options for IRQ support
-
-config S5P_IRQ
-        def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
-        help
-          Support common interrupt part for ARCH_S5P SoCs
-
-config S5P_EXT_INT
-        bool
-        help
-          Use the external interrupts (other than GPIO interrupts.)
-          Note: Do not choose this for S5P6440 and S5P6450.
-
-config S5P_GPIO_INT
-        bool
-        help
-          Common code for the GPIO interrupts (other than external interrupts.)
-
-# options for gpio configuration support
-
-config S5P_GPIO_DRVSTR
-        bool
-        help
-          Internal configuration to get and set correct GPIO driver strength
-          helper
-
-config SAMSUNG_GPIO_EXTRA
-        int "Number of additional GPIO pins"
-        default 128 if SAMSUNG_GPIO_EXTRA128
-        default 64 if SAMSUNG_GPIO_EXTRA64
-        default 0
-        help
-          Use additional GPIO space in addition to the GPIO's the SOC
-          provides. This allows expanding the GPIO space for use with
-          GPIO expanders.
-
-config SAMSUNG_GPIO_EXTRA64
-        bool
-
-config SAMSUNG_GPIO_EXTRA128
-        bool
-
 config S3C_GPIO_SPACE
         int "Space between gpio banks"
         default 0
@@ -139,12 +66,6 @@ config S3C_GPIO_TRACK
           Internal configuration option to enable the s3c specific gpio
           chip tracking if the platform requires it.
 
-# uart options
-
-config S5P_DEV_UART
-        def_bool y
-        depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
-
 # ADC driver
 
 config S3C_ADC
@@ -302,66 +223,6 @@ config SAMSUNG_DEV_BACKLIGHT
         help
           Compile in platform device definition LCD backlight with PWM Timer
 
-config S5P_DEV_CSIS0
-        bool
-        help
-          Compile in platform device definitions for MIPI-CSIS channel 0
-
-config S5P_DEV_CSIS1
-        bool
-        help
-          Compile in platform device definitions for MIPI-CSIS channel 1
-
-config S5P_DEV_FIMC0
-        bool
-        help
-          Compile in platform device definitions for FIMC controller 0
-
-config S5P_DEV_FIMC1
-        bool
-        help
-          Compile in platform device definitions for FIMC controller 1
-
-config S5P_DEV_FIMC2
-        bool
-        help
-          Compile in platform device definitions for FIMC controller 2
-
-config S5P_DEV_FIMC3
-        bool
-        help
-          Compile in platform device definitions for FIMC controller 3
-
-config S5P_DEV_FIMD0
-        bool
-        help
-          Compile in platform device definitions for FIMD controller 0
-
-config S5P_DEV_G2D
-        bool
-        help
-          Compile in platform device definitions for G2D device
-
-config S5P_DEV_I2C_HDMIPHY
-        bool
-        help
-          Compile in platform device definitions for I2C HDMIPHY controller
-
-config S5P_DEV_JPEG
-        bool
-        help
-          Compile in platform device definitions for JPEG codec
-
-config S5P_DEV_ONENAND
-        bool
-        help
-          Compile in platform device definition for OneNAND controller
-
-config S5P_DEV_TV
-        bool
-        help
-          Compile in platform device definition for TV interface
-
 config S3C24XX_PWM
         bool "PWM device support"
         select PWM
@@ -382,12 +243,6 @@ config S3C_DMA
         help
           Internal configuration for S3C DMA core
 
-config S5P_IRQ_PM
-        bool
-        default y if S5P_PM
-        help
-          Legacy IRQ power management for S5P platforms
-
 config SAMSUNG_PM_GPIO
         bool
         default y if GPIO_SAMSUNG && PM
@@ -397,7 +252,7 @@ config SAMSUNG_PM_GPIO
 
 config SAMSUNG_DMADEV
         bool "Use legacy Samsung DMA abstraction"
-        depends on CPU_S5PV210 || CPU_S5PC100 || ARCH_S5P64X0 || ARCH_S3C64XX
+        depends on CPU_S5PV210 || ARCH_S3C64XX
         select DMADEVICES
         default y
         help
@@ -470,18 +325,6 @@ config SAMSUNG_WDT_RESET
           Compile support for system restart by triggering watchdog reset.
           Used on SoCs that do not provide dedicated reset control.
 
-config S5P_PM
-        bool
-        help
-          Common code for power management support on S5P and newer SoCs
-          Note: Do not select this for S5P6440 and S5P6450.
-
-config S5P_SLEEP
-        bool
-        help
-          Internal config node to apply common S5P sleep management code.
-          Can be selected by S5P and newer SoCs with similar sleep procedure.
-
 config DEBUG_S3C_UART
         depends on PLAT_SAMSUNG
         int
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 5e5beaa9ae15..5fe175017f07 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -5,7 +5,6 @@
 # Licensed under GPLv2
 
 ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include
-ccflags-$(CONFIG_ARCH_EXYNOS)   += -I$(srctree)/arch/arm/mach-exynos/include
 
 obj-y                           :=
 obj-m                           :=
@@ -16,15 +15,6 @@ obj-				:=
 
 obj-y                           += init.o cpu.o
 
-obj-$(CONFIG_SAMSUNG_CLOCK)     += clock.o
-
-obj-$(CONFIG_SAMSUNG_CLKSRC)    += clock-clksrc.o
-obj-$(CONFIG_S5P_CLOCK)         += s5p-clock.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
-
 # ADC
 
 obj-$(CONFIG_S3C_ADC)   += adc.o
@@ -36,7 +26,6 @@ obj-$(CONFIG_SAMSUNG_ATAGS)	+= platformdata.o
 obj-$(CONFIG_SAMSUNG_ATAGS)     += devs.o
 obj-$(CONFIG_SAMSUNG_ATAGS)     += dev-uart.o
 obj-$(CONFIG_S5P_DEV_MFC)       += s5p-dev-mfc.o
-obj-$(CONFIG_S5P_DEV_UART)      += s5p-dev-uart.o
 
 obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)     += dev-backlight.o
 
@@ -58,7 +47,3 @@ obj-$(CONFIG_SAMSUNG_PM_DEBUG)	+= pm-debug.o
 
 obj-$(CONFIG_SAMSUNG_WAKEMASK)  += wakeup-mask.o
 obj-$(CONFIG_SAMSUNG_WDT_RESET) += watchdog-reset.o
-
-obj-$(CONFIG_S5P_PM)            += s5p-pm.o
-obj-$(CONFIG_S5P_IRQ_PM)        += s5p-irq-pm.o
-obj-$(CONFIG_S5P_SLEEP)         += s5p-sleep.o
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index 79690f2f6d3f..468352633101 100644
--- a/arch/arm/plat-samsung/adc.c
+++ b/arch/arm/plat-samsung/adc.c
@@ -43,7 +43,7 @@ enum s3c_cpu_type {
         TYPE_ADCV1, /* S3C24XX */
         TYPE_ADCV11, /* S3C2443 */
         TYPE_ADCV12, /* S3C2416, S3C2450 */
-        TYPE_ADCV2, /* S3C64XX, S5P64X0, S5PC100 */
+        TYPE_ADCV2, /* S3C64XX */
         TYPE_ADCV3, /* S5PV210, S5PC110, EXYNOS4210 */
 };
 
diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c
deleted file mode 100644
index 786a4107a157..000000000000
--- a/arch/arm/plat-samsung/clock-clksrc.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* linux/arch/arm/plat-samsung/clock-clksrc.c
- *
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * 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/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/io.h>
-
-#include <plat/clock.h>
-#include <plat/clock-clksrc.h>
-#include <plat/cpu-freq.h>
-
-static inline struct clksrc_clk *to_clksrc(struct clk *clk)
-{
-        return container_of(clk, struct clksrc_clk, clk);
-}
-
-static inline u32 bit_mask(u32 shift, u32 nr_bits)
-{
-        u32 mask = 0xffffffff >> (32 - nr_bits);
-
-        return mask << shift;
-}
-
-static unsigned long s3c_getrate_clksrc(struct clk *clk)
-{
-        struct clksrc_clk *sclk = to_clksrc(clk);
-        unsigned long rate = clk_get_rate(clk->parent);
-        u32 clkdiv = __raw_readl(sclk->reg_div.reg);
-        u32 mask = bit_mask(sclk->reg_div.shift, sclk->reg_div.size);
-
-        clkdiv &= mask;
-        clkdiv >>= sclk->reg_div.shift;
-        clkdiv++;
-
-        rate /= clkdiv;
-        return rate;
-}
-
-static int s3c_setrate_clksrc(struct clk *clk, unsigned long rate)
-{
-        struct clksrc_clk *sclk = to_clksrc(clk);
-        void __iomem *reg = sclk->reg_div.reg;
-        unsigned int div;
-        u32 mask = bit_mask(sclk->reg_div.shift, sclk->reg_div.size);
-        u32 val;
-
-        rate = clk_round_rate(clk, rate);
-        div = clk_get_rate(clk->parent) / rate;
-        if (div > (1 << sclk->reg_div.size))
-                return -EINVAL;
-
-        val = __raw_readl(reg);
-        val &= ~mask;
-        val |= (div - 1) << sclk->reg_div.shift;
-        __raw_writel(val, reg);
-
-        return 0;
-}
-
-static int s3c_setparent_clksrc(struct clk *clk, struct clk *parent)
-{
-        struct clksrc_clk *sclk = to_clksrc(clk);
-        struct clksrc_sources *srcs = sclk->sources;
-        u32 clksrc = __raw_readl(sclk->reg_src.reg);
-        u32 mask = bit_mask(sclk->reg_src.shift, sclk->reg_src.size);
-        int src_nr = -1;
-        int ptr;
-
-        for (ptr = 0; ptr < srcs->nr_sources; ptr++)
-                if (srcs->sources[ptr] == parent) {
-                        src_nr = ptr;
-                        break;
-                }
-
-        if (src_nr >= 0) {
-                clk->parent = parent;
-
-                clksrc &= ~mask;
-                clksrc |= src_nr << sclk->reg_src.shift;
-
-                __raw_writel(clksrc, sclk->reg_src.reg);
-                return 0;
-        }
-
-        return -EINVAL;
-}
-
-static unsigned long s3c_roundrate_clksrc(struct clk *clk,
-                                              unsigned long rate)
-{
-        struct clksrc_clk *sclk = to_clksrc(clk);
-        unsigned long parent_rate = clk_get_rate(clk->parent);
-        int max_div = 1 << sclk->reg_div.size;
-        int div;
-
-        if (rate >= parent_rate)
-                rate = parent_rate;
-        else {
-                div = parent_rate / rate;
-                if (parent_rate % rate)
-                        div++;
-
-                if (div == 0)
-                        div = 1;
-                if (div > max_div)
-                        div = max_div;
-
-                rate = parent_rate / div;
-        }
-
-        return rate;
-}
-
-/* Clock initialisation code */
-
-void __init_or_cpufreq s3c_set_clksrc(struct clksrc_clk *clk, bool announce)
-{
-        struct clksrc_sources *srcs = clk->sources;
-        u32 mask = bit_mask(clk->reg_src.shift, clk->reg_src.size);
-        u32 clksrc;
-
-        if (!clk->reg_src.reg) {
-                if (!clk->clk.parent)
-                        printk(KERN_ERR "%s: no parent clock specified\n",
-                                clk->clk.name);
-                return;
-        }
-
-        clksrc = __raw_readl(clk->reg_src.reg);
-        clksrc &= mask;
-        clksrc >>= clk->reg_src.shift;
-
-        if (clksrc > srcs->nr_sources || !srcs->sources[clksrc]) {
-                printk(KERN_ERR "%s: bad source %d\n",
-                       clk->clk.name, clksrc);
-                return;
-        }
-
-        clk->clk.parent = srcs->sources[clksrc];
-
-        if (announce)
-                printk(KERN_INFO "%s: source is %s (%d), rate is %ld\n",
-                       clk->clk.name, clk->clk.parent->name, clksrc,
-                       clk_get_rate(&clk->clk));
-}
-
-static struct clk_ops clksrc_ops = {
-        .set_parent     = s3c_setparent_clksrc,
-        .get_rate       = s3c_getrate_clksrc,
-        .set_rate       = s3c_setrate_clksrc,
-        .round_rate     = s3c_roundrate_clksrc,
-};
-
-static struct clk_ops clksrc_ops_nodiv = {
-        .set_parent     = s3c_setparent_clksrc,
-};
-
-static struct clk_ops clksrc_ops_nosrc = {
-        .get_rate       = s3c_getrate_clksrc,
-        .set_rate       = s3c_setrate_clksrc,
-        .round_rate     = s3c_roundrate_clksrc,
-};
-
-void __init s3c_register_clksrc(struct clksrc_clk *clksrc, int size)
-{
-        int ret;
-
-        for (; size > 0; size--, clksrc++) {
-                if (!clksrc->reg_div.reg && !clksrc->reg_src.reg)
-                        printk(KERN_ERR "%s: clock %s has no registers set\n",
-                               __func__, clksrc->clk.name);
-
-                /* fill in the default functions */
-
-                if (!clksrc->clk.ops) {
-                        if (!clksrc->reg_div.reg)
-                                clksrc->clk.ops = &clksrc_ops_nodiv;
-                        else if (!clksrc->reg_src.reg)
-                                clksrc->clk.ops = &clksrc_ops_nosrc;
-                        else
-                                clksrc->clk.ops = &clksrc_ops;
-                }
-
-                /* setup the clocksource, but do not announce it
-                 * as it may be re-set by the setup routines
-                 * called after the rest of the clocks have been
-                 * registered
-                 */
-                s3c_set_clksrc(clksrc, false);
-
-                ret = s3c24xx_register_clock(&clksrc->clk);
-
-                if (ret < 0) {
-                        printk(KERN_ERR "%s: failed to register %s (%d)\n",
-                               __func__, clksrc->clk.name, ret);
-                }
-        }
-}
diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
deleted file mode 100644
index d103ac1a52af..000000000000
--- a/arch/arm/plat-samsung/clock.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/* linux/arch/arm/plat-s3c24xx/clock.c
- *
- * Copyright 2004-2005 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C24XX Core clock control support
- *
- * Based on, and code from linux/arch/arm/mach-versatile/clock.c
- **
- **  Copyright (C) 2004 ARM Limited.
- **  Written by Deep Blue Solutions Limited.
- *
- *
- * 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/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/device.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/clk.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#if defined(CONFIG_DEBUG_FS)
-#include <linux/debugfs.h>
-#endif
-
-#include <asm/irq.h>
-
-#include <plat/cpu-freq.h>
-
-#include <plat/clock.h>
-#include <plat/cpu.h>
-
-#include <linux/serial_core.h>
-#include <linux/serial_s3c.h> /* for s3c24xx_uart_devs */
-
-/* clock information */
-
-static LIST_HEAD(clocks);
-
-/* We originally used an mutex here, but some contexts (see resume)
- * are calling functions such as clk_set_parent() with IRQs disabled
- * causing an BUG to be triggered.
- */
-DEFINE_SPINLOCK(clocks_lock);
-
-/* Global watchdog clock used by arch_wtd_reset() callback */
-struct clk *s3c2410_wdtclk;
-static int __init s3c_wdt_reset_init(void)
-{
-        s3c2410_wdtclk = clk_get(NULL, "watchdog");
-        if (IS_ERR(s3c2410_wdtclk))
-                printk(KERN_WARNING "%s: warning: cannot get watchdog clock\n", __func__);
-        return 0;
-}
-arch_initcall(s3c_wdt_reset_init);
-
-/* enable and disable calls for use with the clk struct */
-
-static int clk_null_enable(struct clk *clk, int enable)
-{
-        return 0;
-}
-
-int clk_enable(struct clk *clk)
-{
-        unsigned long flags;
-
-        if (IS_ERR(clk) || clk == NULL)
-                return -EINVAL;
-
-        clk_enable(clk->parent);
-
-        spin_lock_irqsave(&clocks_lock, flags);
-
-        if ((clk->usage++) == 0)
-                (clk->enable)(clk, 1);
-
-        spin_unlock_irqrestore(&clocks_lock, flags);
-        return 0;
-}
-
-void clk_disable(struct clk *clk)
-{
-        unsigned long flags;
-
-        if (IS_ERR(clk) || clk == NULL)
-                return;
-
-        spin_lock_irqsave(&clocks_lock, flags);
-
-        if ((--clk->usage) == 0)
-                (clk->enable)(clk, 0);
-
-        spin_unlock_irqrestore(&clocks_lock, flags);
-        clk_disable(clk->parent);
-}
-
-
-unsigned long clk_get_rate(struct clk *clk)
-{
-        if (IS_ERR_OR_NULL(clk))
-                return 0;
-
-        if (clk->rate != 0)
-                return clk->rate;
-
-        if (clk->ops != NULL && clk->ops->get_rate != NULL)
-                return (clk->ops->get_rate)(clk);
-
-        if (clk->parent != NULL)
-                return clk_get_rate(clk->parent);
-
-        return clk->rate;
-}
-
-long clk_round_rate(struct clk *clk, unsigned long rate)
-{
-        if (!IS_ERR_OR_NULL(clk) && clk->ops && clk->ops->round_rate)
-                return (clk->ops->round_rate)(clk, rate);
-
-        return rate;
-}
-
-int clk_set_rate(struct clk *clk, unsigned long rate)
-{
-        unsigned long flags;
-        int ret;
-
-        if (IS_ERR_OR_NULL(clk))
-                return -EINVAL;
-
-        /* We do not default just do a clk->rate = rate as
-         * the clock may have been made this way by choice.
-         */
-
-        WARN_ON(clk->ops == NULL);
-        WARN_ON(clk->ops && clk->ops->set_rate == NULL);
-
-        if (clk->ops == NULL || clk->ops->set_rate == NULL)
-                return -EINVAL;
-
-        spin_lock_irqsave(&clocks_lock, flags);
-        ret = (clk->ops->set_rate)(clk, rate);
-        spin_unlock_irqrestore(&clocks_lock, flags);
-
-        return ret;
-}
-
-struct clk *clk_get_parent(struct clk *clk)
-{
-        return clk->parent;
-}
-
-int clk_set_parent(struct clk *clk, struct clk *parent)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        if (IS_ERR_OR_NULL(clk) || IS_ERR_OR_NULL(parent))
-                return -EINVAL;
-
-        spin_lock_irqsave(&clocks_lock, flags);
-
-        if (clk->ops && clk->ops->set_parent)
-                ret = (clk->ops->set_parent)(clk, parent);
-
-        spin_unlock_irqrestore(&clocks_lock, flags);
-
-        return ret;
-}
-
-EXPORT_SYMBOL(clk_enable);
-EXPORT_SYMBOL(clk_disable);
-EXPORT_SYMBOL(clk_get_rate);
-EXPORT_SYMBOL(clk_round_rate);
-EXPORT_SYMBOL(clk_set_rate);
-EXPORT_SYMBOL(clk_get_parent);
-EXPORT_SYMBOL(clk_set_parent);
-
-/* base clocks */
-
-int clk_default_setrate(struct clk *clk, unsigned long rate)
-{
-        clk->rate = rate;
-        return 0;
-}
-
-struct clk_ops clk_ops_def_setrate = {
-        .set_rate       = clk_default_setrate,
-};
-
-struct clk clk_xtal = {
-        .name           = "xtal",
-        .rate           = 0,
-        .parent         = NULL,
-        .ctrlbit        = 0,
-};
-
-struct clk clk_ext = {
-        .name           = "ext",
-};
-
-struct clk clk_epll = {
-        .name           = "epll",
-};
-
-struct clk clk_mpll = {
-        .name           = "mpll",
-        .ops            = &clk_ops_def_setrate,
-};
-
-struct clk clk_upll = {
-        .name           = "upll",
-        .parent         = NULL,
-        .ctrlbit        = 0,
-};
-
-struct clk clk_f = {
-        .name           = "fclk",
-        .rate           = 0,
-        .parent         = &clk_mpll,
-        .ctrlbit        = 0,
-};
-
-struct clk clk_h = {
-        .name           = "hclk",
-        .rate           = 0,
-        .parent         = NULL,
-        .ctrlbit        = 0,
-        .ops            = &clk_ops_def_setrate,
-};
-
-struct clk clk_p = {
-        .name           = "pclk",
-        .rate           = 0,
-        .parent         = NULL,
-        .ctrlbit        = 0,
-        .ops            = &clk_ops_def_setrate,
-};
-
-struct clk clk_usb_bus = {
-        .name           = "usb-bus",
-        .rate           = 0,
-        .parent         = &clk_upll,
-};
-
-
-struct clk s3c24xx_uclk = {
-        .name           = "uclk",
-};
-
-/* initialise the clock system */
-
-/**
- * s3c24xx_register_clock() - register a clock
- * @clk: The clock to register
- *
- * Add the specified clock to the list of clocks known by the system.
- */
-int s3c24xx_register_clock(struct clk *clk)
-{
-        if (clk->enable == NULL)
-                clk->enable = clk_null_enable;
-
-        /* fill up the clk_lookup structure and register it*/
-        clk->lookup.dev_id = clk->devname;
-        clk->lookup.con_id = clk->name;
-        clk->lookup.clk = clk;
-        clkdev_add(&clk->lookup);
-
-        return 0;
-}
-
-/**
- * s3c24xx_register_clocks() - register an array of clock pointers
- * @clks: Pointer to an array of struct clk pointers
- * @nr_clks: The number of clocks in the @clks array.
- *
- * Call s3c24xx_register_clock() for all the clock pointers contained
- * in the @clks list. Returns the number of failures.
- */
-int s3c24xx_register_clocks(struct clk **clks, int nr_clks)
-{
-        int fails = 0;
-
-        for (; nr_clks > 0; nr_clks--, clks++) {
-                if (s3c24xx_register_clock(*clks) < 0) {
-                        struct clk *clk = *clks;
-                        printk(KERN_ERR "%s: failed to register %p: %s\n",
-                               __func__, clk, clk->name);
-                        fails++;
-                }
-        }
-
-        return fails;
-}
-
-/**
- * s3c_register_clocks() - register an array of clocks
- * @clkp: Pointer to the first clock in the array.
- * @nr_clks: Number of clocks to register.
- *
- * Call s3c24xx_register_clock() on the @clkp array given, printing an
- * error if it fails to register the clock (unlikely).
- */
-void __init s3c_register_clocks(struct clk *clkp, int nr_clks)
-{
-        int ret;
-
-        for (; nr_clks > 0; nr_clks--, clkp++) {
-                ret = s3c24xx_register_clock(clkp);
-
-                if (ret < 0) {
-                        printk(KERN_ERR "Failed to register clock %s (%d)\n",
-                               clkp->name, ret);
-                }
-        }
-}
-
-/**
- * s3c_disable_clocks() - disable an array of clocks
- * @clkp: Pointer to the first clock in the array.
- * @nr_clks: Number of clocks to register.
- *
- * for internal use only at initialisation time. disable the clocks in the
- * @clkp array.
- */
-
-void __init s3c_disable_clocks(struct clk *clkp, int nr_clks)
-{
-        for (; nr_clks > 0; nr_clks--, clkp++)
-                (clkp->enable)(clkp, 0);
-}
-
-/* initialise all the clocks */
-
-int __init s3c24xx_register_baseclocks(unsigned long xtal)
-{
-        printk(KERN_INFO "S3C24XX Clocks, Copyright 2004 Simtec Electronics\n");
-
-        clk_xtal.rate = xtal;
-
-        /* register our clocks */
-
-        if (s3c24xx_register_clock(&clk_xtal) < 0)
-                printk(KERN_ERR "failed to register master xtal\n");
-
-        if (s3c24xx_register_clock(&clk_mpll) < 0)
-                printk(KERN_ERR "failed to register mpll clock\n");
-
-        if (s3c24xx_register_clock(&clk_upll) < 0)
-                printk(KERN_ERR "failed to register upll clock\n");
-
-        if (s3c24xx_register_clock(&clk_f) < 0)
-                printk(KERN_ERR "failed to register cpu fclk\n");
-
-        if (s3c24xx_register_clock(&clk_h) < 0)
-                printk(KERN_ERR "failed to register cpu hclk\n");
-
-        if (s3c24xx_register_clock(&clk_p) < 0)
-                printk(KERN_ERR "failed to register cpu pclk\n");
-
-        return 0;
-}
-
-#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
-/* debugfs support to trace clock tree hierarchy and attributes */
-
-static struct dentry *clk_debugfs_root;
-
-static void clock_tree_show_one(struct seq_file *s, struct clk *c, int level)
-{
-        struct clk *child;
-        const char *state;
-        char buf[255] = { 0 };
-        int n = 0;
-
-        if (c->name)
-                n = snprintf(buf, sizeof(buf) - 1, "%s", c->name);
-
-        if (c->devname)
-                n += snprintf(buf + n, sizeof(buf) - 1 - n, ":%s", c->devname);
-
-        state = (c->usage > 0) ? "on" : "off";
-
-        seq_printf(s, "%*s%-*s %-6s %-3d %-10lu\n",
-                   level * 3 + 1, "",
-                   50 - level * 3, buf,
-                   state, c->usage, clk_get_rate(c));
-
-        list_for_each_entry(child, &clocks, list) {
-                if (child->parent != c)
-                        continue;
-
-                clock_tree_show_one(s, child, level + 1);
-        }
-}
-
-static int clock_tree_show(struct seq_file *s, void *data)
-{
-        struct clk *c;
-        unsigned long flags;
-
-        seq_printf(s, " clock state ref rate\n");
-        seq_printf(s, "----------------------------------------------------\n");
-
-        spin_lock_irqsave(&clocks_lock, flags);
-
-        list_for_each_entry(c, &clocks, list)
-                if (c->parent == NULL)
-                        clock_tree_show_one(s, c, 0);
-
-        spin_unlock_irqrestore(&clocks_lock, flags);
-        return 0;
-}
-
-static int clock_tree_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, clock_tree_show, inode->i_private);
-}
-
-static const struct file_operations clock_tree_fops = {
-        .open           = clock_tree_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-static int clock_rate_show(void *data, u64 *val)
-{
-        struct clk *c = data;
-        *val = clk_get_rate(c);
-        return 0;
-}
-DEFINE_SIMPLE_ATTRIBUTE(clock_rate_fops, clock_rate_show, NULL, "%llu\n");
-
-static int clk_debugfs_register_one(struct clk *c)
-{
-        int err;
-        struct dentry *d;
-        struct clk *pa = c->parent;
-        char s[255];
-        char *p = s;
-
-        p += sprintf(p, "%s", c->devname);
-
-        d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root);
-        if (!d)
-                return -ENOMEM;
-
-        c->dent = d;
-
-        d = debugfs_create_u8("usecount", S_IRUGO, c->dent, (u8 *)&c->usage);
-        if (!d) {
-                err = -ENOMEM;
-                goto err_out;
-        }
-
-        d = debugfs_create_file("rate", S_IRUGO, c->dent, c, &clock_rate_fops);
-        if (!d) {
-                err = -ENOMEM;
-                goto err_out;
-        }
-        return 0;
-
-err_out:
-        debugfs_remove_recursive(c->dent);
-        return err;
-}
-
-static int clk_debugfs_register(struct clk *c)
-{
-        int err;
-        struct clk *pa = c->parent;
-
-        if (pa && !pa->dent) {
-                err = clk_debugfs_register(pa);
-                if (err)
-                        return err;
-        }
-
-        if (!c->dent) {
-                err = clk_debugfs_register_one(c);
-                if (err)
-                        return err;
-        }
-        return 0;
-}
-
-static int __init clk_debugfs_init(void)
-{
-        struct clk *c;
-        struct dentry *d;
-        int err = -ENOMEM;
-
-        d = debugfs_create_dir("clock", NULL);
-        if (!d)
-                return -ENOMEM;
-        clk_debugfs_root = d;
-
-        d = debugfs_create_file("clock_tree", S_IRUGO, clk_debugfs_root, NULL,
-                                 &clock_tree_fops);
-        if (!d)
-                goto err_out;
-
-        list_for_each_entry(c, &clocks, list) {
-                err = clk_debugfs_register(c);
-                if (err)
-                        goto err_out;
-        }
-        return 0;
-
-err_out:
-        debugfs_remove_recursive(clk_debugfs_root);
-        return err;
-}
-late_initcall(clk_debugfs_init);
-
-#endif /* defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) */
diff --git a/arch/arm/plat-samsung/cpu.c b/arch/arm/plat-samsung/cpu.c
index 364963a0a344..360618ee39e5 100644
--- a/arch/arm/plat-samsung/cpu.c
+++ b/arch/arm/plat-samsung/cpu.c
@@ -15,8 +15,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 
-
-#include <mach/map.h>
+#include <plat/map-base.h>
 #include <plat/cpu.h>
 
 unsigned long samsung_cpu_id;
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index ead4f1c94058..83c7d154bde0 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -53,7 +53,6 @@
 #include <linux/platform_data/ata-samsung_cf.h>
 #include <plat/fb.h>
 #include <plat/fb-s3c2410.h>
-#include <plat/hdmi.h>
 #include <linux/platform_data/hwmon-s3c.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 #include <plat/keypad.h>
@@ -145,23 +144,6 @@ struct platform_device s3c_device_camif = {
 };
 #endif /* CONFIG_CPU_S3C2440 */
 
-/* ASOC DMA */
-
-#ifdef CONFIG_PLAT_S5P 
-static struct resource samsung_asoc_idma_resource = DEFINE_RES_IRQ(IRQ_I2S0);
-
-struct platform_device samsung_asoc_idma = {
-        .name           = "samsung-idma",
-        .id             = -1,
-        .num_resources  = 1,
-        .resource       = &samsung_asoc_idma_resource,
-        .dev            = {
-                .dma_mask               = &samsung_device_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        }
-};
-#endif
-
 /* FB */
 
 #ifdef CONFIG_S3C_DEV_FB
@@ -190,151 +172,6 @@ void __init s3c_fb_set_platdata(struct s3c_fb_platdata *pd)
 }
 #endif /* CONFIG_S3C_DEV_FB */
 
-/* FIMC */
-
-#ifdef CONFIG_S5P_DEV_FIMC0
-static struct resource s5p_fimc0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_FIMC0, SZ_4K),
-        [1] = DEFINE_RES_IRQ(IRQ_FIMC0),
-};
-
-struct platform_device s5p_device_fimc0 = {
-        .name           = "s5p-fimc",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(s5p_fimc0_resource),
-        .resource       = s5p_fimc0_resource,
-        .dev            = {
-                .dma_mask               = &samsung_device_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-
-struct platform_device s5p_device_fimc_md = {
-        .name   = "s5p-fimc-md",
-        .id     = -1,
-};
-#endif /* CONFIG_S5P_DEV_FIMC0 */
-
-#ifdef CONFIG_S5P_DEV_FIMC1
-static struct resource s5p_fimc1_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_FIMC1, SZ_4K),
-        [1] = DEFINE_RES_IRQ(IRQ_FIMC1),
-};
-
-struct platform_device s5p_device_fimc1 = {
-        .name           = "s5p-fimc",
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(s5p_fimc1_resource),
-        .resource       = s5p_fimc1_resource,
-        .dev            = {
-                .dma_mask               = &samsung_device_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-#endif /* CONFIG_S5P_DEV_FIMC1 */
-
-#ifdef CONFIG_S5P_DEV_FIMC2
-static struct resource s5p_fimc2_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_FIMC2, SZ_4K),
-        [1] = DEFINE_RES_IRQ(IRQ_FIMC2),
-};
-
-struct platform_device s5p_device_fimc2 = {
-        .name           = "s5p-fimc",
-        .id             = 2,
-        .num_resources  = ARRAY_SIZE(s5p_fimc2_resource),
-        .resource       = s5p_fimc2_resource,
-        .dev            = {
-                .dma_mask               = &samsung_device_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-#endif /* CONFIG_S5P_DEV_FIMC2 */
-
-#ifdef CONFIG_S5P_DEV_FIMC3
-static struct resource s5p_fimc3_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_FIMC3, SZ_4K),
-        [1] = DEFINE_RES_IRQ(IRQ_FIMC3),
-};
-
-struct platform_device s5p_device_fimc3 = {
-        .name           = "s5p-fimc",
-        .id             = 3,
-        .num_resources  = ARRAY_SIZE(s5p_fimc3_resource),
-        .resource       = s5p_fimc3_resource,
-        .dev            = {
-                .dma_mask               = &samsung_device_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-#endif /* CONFIG_S5P_DEV_FIMC3 */
-
-/* G2D */
-
-#ifdef CONFIG_S5P_DEV_G2D
-static struct resource s5p_g2d_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_G2D, SZ_4K),
-        [1] = DEFINE_RES_IRQ(IRQ_2D),
-};
-
-struct platform_device s5p_device_g2d = {
-        .name           = "s5p-g2d",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(s5p_g2d_resource),
-        .resource       = s5p_g2d_resource,
-        .dev            = {
-                .dma_mask               = &samsung_device_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-#endif /* CONFIG_S5P_DEV_G2D */
-
-#ifdef CONFIG_S5P_DEV_JPEG
-static struct resource s5p_jpeg_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_JPEG, SZ_4K),
-        [1] = DEFINE_RES_IRQ(IRQ_JPEG),
-};
-
-struct platform_device s5p_device_jpeg = {
-        .name           = "s5p-jpeg",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(s5p_jpeg_resource),
-        .resource       = s5p_jpeg_resource,
-        .dev            = {
-                .dma_mask               = &samsung_device_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-#endif /*  CONFIG_S5P_DEV_JPEG */
-
-/* FIMD0 */
-
-#ifdef CONFIG_S5P_DEV_FIMD0
-static struct resource s5p_fimd0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K),
-        [1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"),
-        [2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"),
-        [3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"),
-};
-
-struct platform_device s5p_device_fimd0 = {
-        .name           = "s5p-fb",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(s5p_fimd0_resource),
-        .resource       = s5p_fimd0_resource,
-        .dev            = {
-                .dma_mask               = &samsung_device_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-
-void __init s5p_fimd0_set_platdata(struct s3c_fb_platdata *pd)
-{
-        s3c_set_platdata(pd, sizeof(struct s3c_fb_platdata),
-                         &s5p_device_fimd0);
-}
-#endif /* CONFIG_S5P_DEV_FIMD0 */
-
 /* HWMON */
 
 #ifdef CONFIG_S3C_DEV_HWMON
@@ -722,60 +559,6 @@ void __init s3c_i2c7_set_platdata(struct s3c2410_platform_i2c *pd)
 }
 #endif /* CONFIG_S3C_DEV_I2C7 */
 
-/* I2C HDMIPHY */
-
-#ifdef CONFIG_S5P_DEV_I2C_HDMIPHY
-static struct resource s5p_i2c_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_IIC_HDMIPHY, SZ_4K),
-        [1] = DEFINE_RES_IRQ(IRQ_IIC_HDMIPHY),
-};
-
-struct platform_device s5p_device_i2c_hdmiphy = {
-        .name           = "s3c2440-hdmiphy-i2c",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5p_i2c_resource),
-        .resource       = s5p_i2c_resource,
-};
-
-void __init s5p_i2c_hdmiphy_set_platdata(struct s3c2410_platform_i2c *pd)
-{
-        struct s3c2410_platform_i2c *npd;
-
-        if (!pd) {
-                pd = &default_i2c_data;
-
-                if (soc_is_s5pv210())
-                        pd->bus_num = 3;
-                else
-                        pd->bus_num = 0;
-        }
-
-        npd = s3c_set_platdata(pd, sizeof(struct s3c2410_platform_i2c),
-                               &s5p_device_i2c_hdmiphy);
-}
-
-static struct s5p_hdmi_platform_data s5p_hdmi_def_platdata;
-
-void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
-                                  struct i2c_board_info *mhl_info, int mhl_bus)
-{
-        struct s5p_hdmi_platform_data *pd = &s5p_hdmi_def_platdata;
-
-        if (soc_is_s5pv210())
-                pd->hdmiphy_bus = 3;
-        else
-                pd->hdmiphy_bus = 0;
-
-        pd->hdmiphy_info = hdmiphy_info;
-        pd->mhl_info = mhl_info;
-        pd->mhl_bus = mhl_bus;
-
-        s3c_set_platdata(pd, sizeof(struct s5p_hdmi_platform_data),
-                         &s5p_device_hdmi);
-}
-
-#endif /* CONFIG_S5P_DEV_I2C_HDMIPHY */
-
 /* I2S */
 
 #ifdef CONFIG_PLAT_S3C24XX
@@ -879,36 +662,6 @@ void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *pd)
 }
 #endif /* CONFIG_PLAT_S3C24XX */
 
-/* MIPI CSIS */
-
-#ifdef CONFIG_S5P_DEV_CSIS0
-static struct resource s5p_mipi_csis0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_MIPI_CSIS0, SZ_16K),
-        [1] = DEFINE_RES_IRQ(IRQ_MIPI_CSIS0),
-};
-
-struct platform_device s5p_device_mipi_csis0 = {
-        .name           = "s5p-mipi-csis",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(s5p_mipi_csis0_resource),
-        .resource       = s5p_mipi_csis0_resource,
-};
-#endif /* CONFIG_S5P_DEV_CSIS0 */
-
-#ifdef CONFIG_S5P_DEV_CSIS1
-static struct resource s5p_mipi_csis1_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_MIPI_CSIS1, SZ_16K),
-        [1] = DEFINE_RES_IRQ(IRQ_MIPI_CSIS1),
-};
-
-struct platform_device s5p_device_mipi_csis1 = {
-        .name           = "s5p-mipi-csis",
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(s5p_mipi_csis1_resource),
-        .resource       = s5p_mipi_csis1_resource,
-};
-#endif
-
 /* NAND */
 
 #ifdef CONFIG_S3C_DEV_NAND
@@ -1052,43 +805,6 @@ void __init s3c64xx_onenand1_set_platdata(struct onenand_platform_data *pdata)
 }
 #endif /* CONFIG_S3C64XX_DEV_ONENAND1 */
 
-#ifdef CONFIG_S5P_DEV_ONENAND
-static struct resource s5p_onenand_resources[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_ONENAND, SZ_128K),
-        [1] = DEFINE_RES_MEM(S5P_PA_ONENAND_DMA, SZ_8K),
-        [2] = DEFINE_RES_IRQ(IRQ_ONENAND_AUDI),
-};
-
-struct platform_device s5p_device_onenand = {
-        .name           = "s5pc110-onenand",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5p_onenand_resources),
-        .resource       = s5p_onenand_resources,
-};
-#endif /* CONFIG_S5P_DEV_ONENAND */
-
-/* PMU */
-
-#if defined(CONFIG_PLAT_S5P) && !defined(CONFIG_ARCH_EXYNOS)
-static struct resource s5p_pmu_resource[] = {
-        DEFINE_RES_IRQ(IRQ_PMU)
-};
-
-static struct platform_device s5p_device_pmu = {
-        .name           = "arm-pmu",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5p_pmu_resource),
-        .resource       = s5p_pmu_resource,
-};
-
-static int __init s5p_pmu_init(void)
-{
-        platform_device_register(&s5p_device_pmu);
-        return 0;
-}
-arch_initcall(s5p_pmu_init);
-#endif /* CONFIG_PLAT_S5P */
-
 /* PWM Timer */
 
 #ifdef CONFIG_SAMSUNG_DEV_PWM
@@ -1251,52 +967,6 @@ void __init s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *pd)
 }
 #endif /* CONFIG_SAMSUNG_DEV_TS */
 
-/* TV */
-
-#ifdef CONFIG_S5P_DEV_TV
-
-static struct resource s5p_hdmi_resources[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_HDMI, SZ_1M),
-        [1] = DEFINE_RES_IRQ(IRQ_HDMI),
-};
-
-struct platform_device s5p_device_hdmi = {
-        .name           = "s5p-hdmi",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5p_hdmi_resources),
-        .resource       = s5p_hdmi_resources,
-};
-
-static struct resource s5p_sdo_resources[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_SDO, SZ_64K),
-        [1] = DEFINE_RES_IRQ(IRQ_SDO),
-};
-
-struct platform_device s5p_device_sdo = {
-        .name           = "s5p-sdo",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5p_sdo_resources),
-        .resource       = s5p_sdo_resources,
-};
-
-static struct resource s5p_mixer_resources[] = {
-        [0] = DEFINE_RES_MEM_NAMED(S5P_PA_MIXER, SZ_64K, "mxr"),
-        [1] = DEFINE_RES_MEM_NAMED(S5P_PA_VP, SZ_64K, "vp"),
-        [2] = DEFINE_RES_IRQ_NAMED(IRQ_MIXER, "irq"),
-};
-
-struct platform_device s5p_device_mixer = {
-        .name           = "s5p-mixer",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5p_mixer_resources),
-        .resource       = s5p_mixer_resources,
-        .dev            = {
-                .dma_mask               = &samsung_device_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        }
-};
-#endif /* CONFIG_S5P_DEV_TV */
-
 /* USB */
 
 #ifdef CONFIG_S3C_DEV_USB_HOST
diff --git a/arch/arm/plat-samsung/include/plat/camport.h b/arch/arm/plat-samsung/include/plat/camport.h
deleted file mode 100644
index a5708bf84b3a..000000000000
--- a/arch/arm/plat-samsung/include/plat/camport.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co., Ltd.
- *
- * S5P series camera interface helper functions
- *
- * 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 __PLAT_SAMSUNG_CAMPORT_H_
-#define __PLAT_SAMSUNG_CAMPORT_H_ __FILE__
-
-enum s5p_camport_id {
-        S5P_CAMPORT_A,
-        S5P_CAMPORT_B,
-};
-
-/*
- * The helper functions to configure GPIO for the camera parallel bus.
- * The camera port can be multiplexed with any FIMC entity, even multiple
- * FIMC entities are allowed to be attached to a single port simultaneously.
- * These functions are to be used in the board setup code.
- */
-int s5pv210_fimc_setup_gpio(enum s5p_camport_id id);
-int exynos4_fimc_setup_gpio(enum s5p_camport_id id);
-
-#endif /* __PLAT_SAMSUNG_CAMPORT_H */
diff --git a/arch/arm/plat-samsung/include/plat/clock-clksrc.h b/arch/arm/plat-samsung/include/plat/clock-clksrc.h
deleted file mode 100644
index 50a8ca7c3760..000000000000
--- a/arch/arm/plat-samsung/include/plat/clock-clksrc.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/clock-clksrc.h
- *
- * Parts taken from arch/arm/plat-s3c64xx/clock.c
- *      Copyright 2008 Openmoko, Inc.
- *      Copyright 2008 Simtec Electronics
- *              Ben Dooks <ben@simtec.co.uk>
- *              http://armlinux.simtec.co.uk/
- *
- * Copyright 2009 Ben Dooks <ben-linux@fluff.org>
- * Copyright 2009 Harald Welte
- *
- * 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.
-*/
-
-/**
- * struct clksrc_sources - list of sources for a given clock
- * @sources: array of pointers to clocks
- * @nr_sources: The size of @sources
- */
-struct clksrc_sources {
-        unsigned int    nr_sources;
-        struct clk      **sources;
-};
-
-/**
- * struct clksrc_reg - register definition for clock control bits
- * @reg: pointer to the register in virtual memory.
- * @shift: the shift in bits to where the bitfield is.
- * @size: the size in bits of the bitfield.
- *
- * This specifies the size and position of the bits we are interested
- * in within the register specified by @reg.
- */
-struct clksrc_reg {
-        void __iomem            *reg;
-        unsigned short          shift;
-        unsigned short          size;
-};
-
-/**
- * struct clksrc_clk - class of clock for newer style samsung devices.
- * @clk: the standard clock representation
- * @sources: the sources for this clock
- * @reg_src: the register definition for selecting the clock's source
- * @reg_div: the register definition for the clock's output divisor
- *
- * This clock implements the features required by the newer SoCs where
- * the standard clock block provides an input mux and a post-mux divisor
- * to provide the periperhal's clock.
- *
- * The array of @sources provides the mapping of mux position to the
- * clock, and @reg_src shows the code where to modify to change the mux
- * position. The @reg_div defines how to change the divider settings on
- * the output.
- */
-struct clksrc_clk {
-        struct clk              clk;
-        struct clksrc_sources   *sources;
-
-        struct clksrc_reg       reg_src;
-        struct clksrc_reg       reg_div;
-};
-
-/**
- * s3c_set_clksrc() - setup the clock from the register settings
- * @clk: The clock to setup.
- * @announce: true to announce the setting to printk().
- *
- * Setup the clock from the current register settings, for when the
- * kernel boots or if it is resuming from a possibly unknown state.
- */
-extern void s3c_set_clksrc(struct clksrc_clk *clk, bool announce);
-
-/**
- * s3c_register_clksrc() register clocks from an array of clksrc clocks
- * @srcs: The array of clocks to register
- * @size: The size of the @srcs array.
- *
- * Initialise and register the array of clocks described by @srcs.
- */
-extern void s3c_register_clksrc(struct clksrc_clk *srcs, int size);
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
deleted file mode 100644
index 63239f409807..000000000000
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* linux/arch/arm/plat-s3c/include/plat/clock.h
- *
- * Copyright (c) 2004-2005 Simtec Electronics
- *      http://www.simtec.co.uk/products/SWLINUX/
- *      Written by Ben Dooks, <ben@simtec.co.uk>
- *
- * 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_CLOCK_H
-#define __ASM_PLAT_CLOCK_H __FILE__
-
-#include <linux/spinlock.h>
-#include <linux/clkdev.h>
-
-struct clk;
-
-/**
- * struct clk_ops - standard clock operations
- * @set_rate: set the clock rate, see clk_set_rate().
- * @get_rate: get the clock rate, see clk_get_rate().
- * @round_rate: round a given clock rate, see clk_round_rate().
- * @set_parent: set the clock's parent, see clk_set_parent().
- *
- * Group the common clock implementations together so that we
- * don't have to keep setting the same fields again. We leave
- * enable in struct clk.
- *
- * Adding an extra layer of indirection into the process should
- * not be a problem as it is unlikely these operations are going
- * to need to be called quickly.
- */
-struct clk_ops {
-        int                 (*set_rate)(struct clk *c, unsigned long rate);
-        unsigned long       (*get_rate)(struct clk *c);
-        unsigned long       (*round_rate)(struct clk *c, unsigned long rate);
-        int                 (*set_parent)(struct clk *c, struct clk *parent);
-};
-
-struct clk {
-        struct list_head      list;
-        struct module        *owner;
-        struct clk           *parent;
-        const char           *name;
-        const char              *devname;
-        int                   id;
-        int                   usage;
-        unsigned long         rate;
-        unsigned long         ctrlbit;
-
-        struct clk_ops          *ops;
-        int                 (*enable)(struct clk *, int enable);
-        struct clk_lookup       lookup;
-#if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
-        struct dentry           *dent;  /* For visible tree hierarchy */
-#endif
-};
-
-/* other clocks which may be registered by board support */
-
-extern struct clk s3c24xx_dclk0;
-extern struct clk s3c24xx_dclk1;
-extern struct clk s3c24xx_clkout0;
-extern struct clk s3c24xx_clkout1;
-extern struct clk s3c24xx_uclk;
-
-extern struct clk clk_usb_bus;
-
-/* core clock support */
-
-extern struct clk clk_f;
-extern struct clk clk_h;
-extern struct clk clk_p;
-extern struct clk clk_mpll;
-extern struct clk clk_upll;
-extern struct clk clk_epll;
-extern struct clk clk_xtal;
-extern struct clk clk_ext;
-
-/* S3C2443/S3C2416 specific clocks */
-extern struct clksrc_clk clk_epllref;
-extern struct clksrc_clk clk_esysclk;
-
-/* S3C24XX UART clocks */
-extern struct clk s3c24xx_clk_uart0;
-extern struct clk s3c24xx_clk_uart1;
-extern struct clk s3c24xx_clk_uart2;
-
-/* S3C64XX specific clocks */
-extern struct clk clk_h2;
-extern struct clk clk_27m;
-extern struct clk clk_48m;
-extern struct clk clk_xusbxti;
-
-extern int clk_default_setrate(struct clk *clk, unsigned long rate);
-extern struct clk_ops clk_ops_def_setrate;
-
-/* exports for arch/arm/mach-s3c2410
- *
- * Please DO NOT use these outside of arch/arm/mach-s3c2410
-*/
-
-extern spinlock_t clocks_lock;
-
-extern int s3c2410_clkcon_enable(struct clk *clk, int enable);
-
-extern int s3c24xx_register_clock(struct clk *clk);
-extern int s3c24xx_register_clocks(struct clk **clk, int nr_clks);
-
-extern void s3c_register_clocks(struct clk *clk, int nr_clks);
-extern void s3c_disable_clocks(struct clk *clkp, int nr_clks);
-
-extern int s3c24xx_register_baseclocks(unsigned long xtal);
-
-extern void s5p_register_clocks(unsigned long xtal_freq);
-
-extern void s3c24xx_setup_clocks(unsigned long fclk,
-                                 unsigned long hclk,
-                                 unsigned long pclk);
-
-extern void s3c2410_setup_clocks(void);
-extern void s3c2412_setup_clocks(void);
-extern void s3c244x_setup_clocks(void);
-
-/* S3C2410 specific clock functions */
-
-extern int s3c2410_baseclk_add(void);
-
-/* S3C2443/S3C2416 specific clock functions */
-
-typedef unsigned int (*pll_fn)(unsigned int reg, unsigned int base);
-
-extern void s3c2443_common_setup_clocks(pll_fn get_mpll);
-extern void s3c2443_common_init_clocks(int xtal, pll_fn get_mpll,
-                                       unsigned int *divs, int nr_divs,
-                                       int divmask);
-
-extern int s3c2443_clkcon_enable_h(struct clk *clk, int enable);
-extern int s3c2443_clkcon_enable_p(struct clk *clk, int enable);
-extern int s3c2443_clkcon_enable_s(struct clk *clk, int enable);
-
-/* S3C64XX specific functions and clocks */
-
-extern int s3c64xx_sclk_ctrl(struct clk *clk, int enable);
-
-/* Global watchdog clock used by arch_wtd_reset() callback */
-
-extern struct clk *s3c2410_wdtclk;
-
-#endif /* __ASM_PLAT_CLOCK_H */
diff --git a/arch/arm/plat-samsung/include/plat/cpu-freq-core.h b/arch/arm/plat-samsung/include/plat/cpu-freq-core.h
index 72d4178ad23b..317c52303288 100644
--- a/arch/arm/plat-samsung/include/plat/cpu-freq-core.h
+++ b/arch/arm/plat-samsung/include/plat/cpu-freq-core.h
@@ -140,7 +140,6 @@ struct s3c_cpufreq_config {
  *      any frequency changes. This is really only need by devices like the
  *      S3C2410 where there is no or limited divider between the PLL and the
  *      ARMCLK.
- * @resume_clocks: Update the clocks on resume.
  * @get_iotiming: Get the current IO timing data, mainly for use at start.
  * @set_iotiming: Update the IO timings from the cached copies calculated
  *      from the @calc_iotiming entry when changing the frequency.
@@ -169,8 +168,6 @@ struct s3c_cpufreq_info {
 
         /* driver routines */
 
-        void            (*resume_clocks)(void);
-
         int             (*get_iotiming)(struct s3c_cpufreq_config *cfg,
                                         struct s3c_iotimings *timings);
 
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
index 5a237db9f9eb..61d14f3a0426 100644
--- a/arch/arm/plat-samsung/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@ -33,13 +33,6 @@ extern unsigned long samsung_cpu_id;
 #define S3C6410_CPU_ID          0x36410000
 #define S3C64XX_CPU_MASK        0xFFFFF000
 
-#define S5P6440_CPU_ID          0x56440000
-#define S5P6450_CPU_ID          0x36450000
-#define S5P64XX_CPU_MASK        0xFFFFF000
-
-#define S5PC100_CPU_ID          0x43100000
-#define S5PC100_CPU_MASK        0xFFFFF000
-
 #define S5PV210_CPU_ID          0x43110000
 #define S5PV210_CPU_MASK        0xFFFFF000
 
@@ -54,10 +47,6 @@ IS_SAMSUNG_CPU(s3c24xx, S3C24XX_CPU_ID, S3C24XX_CPU_MASK)
 IS_SAMSUNG_CPU(s3c2412, S3C2412_CPU_ID, S3C2412_CPU_MASK)
 IS_SAMSUNG_CPU(s3c6400, S3C6400_CPU_ID, S3C64XX_CPU_MASK)
 IS_SAMSUNG_CPU(s3c6410, S3C6410_CPU_ID, S3C64XX_CPU_MASK)
-IS_SAMSUNG_CPU(s5p6440, S5P6440_CPU_ID, S5P64XX_CPU_MASK)
-IS_SAMSUNG_CPU(s5p6450, S5P6450_CPU_ID, S5P64XX_CPU_MASK)
-IS_SAMSUNG_CPU(s5pc100, S5PC100_CPU_ID, S5PC100_CPU_MASK)
-IS_SAMSUNG_CPU(s5pv210, S5PV210_CPU_ID, S5PV210_CPU_MASK)
 
 #if defined(CONFIG_CPU_S3C2410) || defined(CONFIG_CPU_S3C2412) || \
     defined(CONFIG_CPU_S3C2416) || defined(CONFIG_CPU_S3C2440) || \
@@ -86,30 +75,6 @@ IS_SAMSUNG_CPU(s5pv210, S5PV210_CPU_ID, S5PV210_CPU_MASK)
 # define soc_is_s3c64xx()       0
 #endif
 
-#if defined(CONFIG_CPU_S5P6440)
-# define soc_is_s5p6440()       is_samsung_s5p6440()
-#else
-# define soc_is_s5p6440()       0
-#endif
-
-#if defined(CONFIG_CPU_S5P6450)
-# define soc_is_s5p6450()       is_samsung_s5p6450()
-#else
-# define soc_is_s5p6450()       0
-#endif
-
-#if defined(CONFIG_CPU_S5PC100)
-# define soc_is_s5pc100()       is_samsung_s5pc100()
-#else
-# define soc_is_s5pc100()       0
-#endif
-
-#if defined(CONFIG_CPU_S5PV210)
-# define soc_is_s5pv210()       is_samsung_s5pv210()
-#else
-# define soc_is_s5pv210()       0
-#endif
-
 #define IODESC_ENT(x) { (unsigned long)S3C24XX_VA_##x, __phys_to_pfn(S3C24XX_PA_##x), S3C24XX_SZ_##x, MT_DEVICE }
 
 #ifndef KHZ
@@ -145,12 +110,9 @@ extern void s3c_init_cpu(unsigned long idcode,
 
 /* core initialisation functions */
 
-extern void s5p_init_irq(u32 *vic, u32 num_vic);
-
 extern void s3c24xx_init_io(struct map_desc *mach_desc, int size);
 
 extern void s3c64xx_init_cpu(void);
-extern void s5p_init_cpu(void __iomem *cpuid_addr);
 
 extern unsigned int samsung_rev(void);
 
@@ -177,9 +139,5 @@ extern struct bus_type s3c2440_subsys;
 extern struct bus_type s3c2442_subsys;
 extern struct bus_type s3c2443_subsys;
 extern struct bus_type s3c6410_subsys;
-extern struct bus_type s5p64x0_subsys;
-extern struct bus_type s5pv210_subsys;
-
-extern void (*s5pc1xx_idle)(void);
 
 #endif
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index eece188ed188..e23fed311e5f 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -25,9 +25,6 @@ struct s3c24xx_uart_resources {
 
 extern struct s3c24xx_uart_resources s3c2410_uart_resources[];
 extern struct s3c24xx_uart_resources s3c64xx_uart_resources[];
-extern struct s3c24xx_uart_resources s5p_uart_resources[];
-extern struct s3c24xx_uart_resources exynos4_uart_resources[];
-extern struct s3c24xx_uart_resources exynos5_uart_resources[];
 
 extern struct platform_device *s3c24xx_uart_devs[];
 extern struct platform_device *s3c24xx_uart_src[];
@@ -75,62 +72,6 @@ extern struct platform_device s3c_device_usb_hsotg;
 extern struct platform_device s3c_device_usb_hsudc;
 extern struct platform_device s3c_device_wdt;
 
-extern struct platform_device s5p_device_fimc0;
-extern struct platform_device s5p_device_fimc1;
-extern struct platform_device s5p_device_fimc2;
-extern struct platform_device s5p_device_fimc3;
-extern struct platform_device s5p_device_fimc_md;
-extern struct platform_device s5p_device_jpeg;
-extern struct platform_device s5p_device_g2d;
-extern struct platform_device s5p_device_fimd0;
-extern struct platform_device s5p_device_hdmi;
-extern struct platform_device s5p_device_i2c_hdmiphy;
-extern struct platform_device s5p_device_mfc;
-extern struct platform_device s5p_device_mfc_l;
-extern struct platform_device s5p_device_mfc_r;
-extern struct platform_device s5p_device_mipi_csis0;
-extern struct platform_device s5p_device_mipi_csis1;
-extern struct platform_device s5p_device_mixer;
-extern struct platform_device s5p_device_onenand;
-extern struct platform_device s5p_device_sdo;
-
-extern struct platform_device s5p6440_device_iis;
-extern struct platform_device s5p6440_device_pcm;
-
-extern struct platform_device s5p6450_device_iis0;
-extern struct platform_device s5p6450_device_iis1;
-extern struct platform_device s5p6450_device_iis2;
-extern struct platform_device s5p6450_device_pcm0;
-
-
-extern struct platform_device s5pc100_device_ac97;
-extern struct platform_device s5pc100_device_iis0;
-extern struct platform_device s5pc100_device_iis1;
-extern struct platform_device s5pc100_device_iis2;
-extern struct platform_device s5pc100_device_pcm0;
-extern struct platform_device s5pc100_device_pcm1;
-extern struct platform_device s5pc100_device_spdif;
-
-extern struct platform_device s5pv210_device_ac97;
-extern struct platform_device s5pv210_device_iis0;
-extern struct platform_device s5pv210_device_iis1;
-extern struct platform_device s5pv210_device_iis2;
-extern struct platform_device s5pv210_device_pcm0;
-extern struct platform_device s5pv210_device_pcm1;
-extern struct platform_device s5pv210_device_pcm2;
-extern struct platform_device s5pv210_device_spdif;
-
-extern struct platform_device exynos4_device_ac97;
-extern struct platform_device exynos4_device_ahci;
-extern struct platform_device exynos4_device_i2s0;
-extern struct platform_device exynos4_device_i2s1;
-extern struct platform_device exynos4_device_i2s2;
-extern struct platform_device exynos4_device_ohci;
-extern struct platform_device exynos4_device_pcm0;
-extern struct platform_device exynos4_device_pcm1;
-extern struct platform_device exynos4_device_pcm2;
-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;
diff --git a/arch/arm/plat-samsung/include/plat/fb-core.h b/arch/arm/plat-samsung/include/plat/fb-core.h
index 6abcbf139cee..bca383efcf6d 100644
--- a/arch/arm/plat-samsung/include/plat/fb-core.h
+++ b/arch/arm/plat-samsung/include/plat/fb-core.h
@@ -26,19 +26,4 @@ static inline void s3c_fb_setname(char *name)
 #endif
 }
 
-/* Re-define device name depending on support. */
-static inline void s5p_fb_setname(int id, char *name)
-{
-        switch (id) {
-#ifdef CONFIG_S5P_DEV_FIMD0
-        case 0:
-                s5p_device_fimd0.name = name;
-        break;
-#endif
-        default:
-                printk(KERN_ERR "%s: invalid device id(%d)\n", __func__, id);
-        break;
-        }
-}
-
 #endif /* __ASM_PLAT_FB_CORE_H */
diff --git a/arch/arm/plat-samsung/include/plat/fb.h b/arch/arm/plat-samsung/include/plat/fb.h
index 9ae507270785..b89f8f208515 100644
--- a/arch/arm/plat-samsung/include/plat/fb.h
+++ b/arch/arm/plat-samsung/include/plat/fb.h
@@ -26,46 +26,10 @@
 extern void s3c_fb_set_platdata(struct s3c_fb_platdata *pd);
 
 /**
- * s5p_fimd0_set_platdata() - Setup the FB device with platform data.
- * @pd: The platform data to set. The data is copied from the passed structure
- *      so the machine data can mark the data __initdata so that any unused
- *      machines will end up dumping their data at runtime.
- */
-extern void s5p_fimd0_set_platdata(struct s3c_fb_platdata *pd);
-
-/**
  * s3c64xx_fb_gpio_setup_24bpp() - S3C64XX setup function for 24bpp LCD
  *
  * Initialise the GPIO for an 24bpp LCD display on the RGB interface.
  */
 extern void s3c64xx_fb_gpio_setup_24bpp(void);
 
-/**
- * s5pc100_fb_gpio_setup_24bpp() - S5PC100 setup function for 24bpp LCD
- *
- * Initialise the GPIO for an 24bpp LCD display on the RGB interface.
- */
-extern void s5pc100_fb_gpio_setup_24bpp(void);
-
-/**
- * s5pv210_fb_gpio_setup_24bpp() - S5PV210/S5PC110 setup function for 24bpp LCD
- *
- * Initialise the GPIO for an 24bpp LCD display on the RGB interface.
- */
-extern void s5pv210_fb_gpio_setup_24bpp(void);
-
-/**
- * exynos4_fimd0_gpio_setup_24bpp() - Exynos4 setup function for 24bpp LCD0
- *
- * Initialise the GPIO for an 24bpp LCD display on the RGB interface 0.
- */
-extern void exynos4_fimd0_gpio_setup_24bpp(void);
-
-/**
- * s5p64x0_fb_gpio_setup_24bpp() - S5P6440/S5P6450 setup function for 24bpp LCD
- *
- * Initialise the GPIO for an 24bpp LCD display on the RGB interface.
- */
-extern void s5p64x0_fb_gpio_setup_24bpp(void);
-
 #endif /* __PLAT_S3C_FB_H */
diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h b/arch/arm/plat-samsung/include/plat/fimc-core.h
deleted file mode 100644
index 1d6cb2b8b094..000000000000
--- a/arch/arm/plat-samsung/include/plat/fimc-core.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * arch/arm/plat-samsung/include/plat/fimc-core.h
- *
- * Copyright 2010 Samsung Electronics Co., Ltd.
- *      Sylwester Nawrocki <s.nawrocki@samsung.com>
- *
- * Samsung camera interface driver core functions
- *
- * 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_FIMC_CORE_H
-#define __ASM_PLAT_FIMC_CORE_H __FILE__
-
-/*
- * These functions are only for use with the core support code, such as
- * the CPU-specific initialization code.
- */
-
-/* Re-define device name to differentiate the subsystem in various SoCs. */
-static inline void s3c_fimc_setname(int id, char *name)
-{
-        switch (id) {
-#ifdef CONFIG_S5P_DEV_FIMC0
-        case 0:
-                s5p_device_fimc0.name = name;
-                break;
-#endif
-#ifdef CONFIG_S5P_DEV_FIMC1
-        case 1:
-                s5p_device_fimc1.name = name;
-                break;
-#endif
-#ifdef CONFIG_S5P_DEV_FIMC2
-        case 2:
-                s5p_device_fimc2.name = name;
-                break;
-#endif
-#ifdef CONFIG_S5P_DEV_FIMC3
-        case 3:
-                s5p_device_fimc3.name = name;
-                break;
-#endif
-        default:
-                break;
-        }
-}
-
-#endif /* __ASM_PLAT_FIMC_CORE_H */
diff --git a/arch/arm/plat-samsung/include/plat/gpio-cfg.h b/arch/arm/plat-samsung/include/plat/gpio-cfg.h
index 08740eed050c..b5294eff18b5 100644
--- a/arch/arm/plat-samsung/include/plat/gpio-cfg.h
+++ b/arch/arm/plat-samsung/include/plat/gpio-cfg.h
@@ -27,7 +27,6 @@
 #include <linux/types.h>
 
 typedef unsigned int __bitwise__ samsung_gpio_pull_t;
-typedef unsigned int __bitwise__ s5p_gpio_drvstr_t;
 
 /* forward declaration if gpio-core.h hasn't been included */
 struct samsung_gpio_chip;
@@ -180,67 +179,4 @@ static inline int s3c_gpio_cfgrange_nopull(unsigned int pin, unsigned int size,
         return s3c_gpio_cfgall_range(pin, size, cfg, S3C_GPIO_PULL_NONE);
 }
 
-/* Define values for the drvstr available for each gpio pin.
- *
- * These values control the value of the output signal driver strength,
- * configurable on most pins on the S5P series.
- */
-#define S5P_GPIO_DRVSTR_LV1     ((__force s5p_gpio_drvstr_t)0x0)
-#define S5P_GPIO_DRVSTR_LV2     ((__force s5p_gpio_drvstr_t)0x2)
-#define S5P_GPIO_DRVSTR_LV3     ((__force s5p_gpio_drvstr_t)0x1)
-#define S5P_GPIO_DRVSTR_LV4     ((__force s5p_gpio_drvstr_t)0x3)
-
-/**
- * s5c_gpio_get_drvstr() - get the driver streght value of a gpio pin
- * @pin: The pin number to get the settings for
- *
- * Read the driver streght value for the specified pin.
-*/
-extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr(unsigned int pin);
-
-/**
- * s3c_gpio_set_drvstr() - set the driver streght value of a gpio pin
- * @pin: The pin number to configure the driver streght value
- * @drvstr: The new value of the driver strength
- *
- * This function sets the driver strength value for the specified pin.
- * It will return 0 if successful, or a negative error code if the pin
- * cannot support the requested setting.
-*/
-extern int s5p_gpio_set_drvstr(unsigned int pin, s5p_gpio_drvstr_t drvstr);
-
-/**
- * s5p_register_gpio_interrupt() - register interrupt support for a gpio group
- * @pin: The pin number from the group to be registered
- *
- * This function registers gpio interrupt support for the group that the
- * specified pin belongs to.
- *
- * The total number of gpio pins is quite large ob s5p series. Registering
- * irq support for all of them would be a resource waste. Because of that the
- * interrupt support for standard gpio pins is registered dynamically.
- *
- * It will return the irq number of the interrupt that has been registered
- * or -ENOMEM if no more gpio interrupts can be registered. It is allowed
- * to call this function more than once for the same gpio group (the group
- * will be registered only once).
- */
-extern int s5p_register_gpio_interrupt(int pin);
-
-/** s5p_register_gpioint_bank() - add gpio bank for further gpio interrupt
- * registration (see s5p_register_gpio_interrupt function)
- * @chain_irq: chained irq number for the gpio int handler for this bank
- * @start: start gpio group number of this bank
- * @nr_groups: number of gpio groups handled by this bank
- *
- * This functions registers initial information about gpio banks that
- * can be later used by the s5p_register_gpio_interrupt() function to
- * enable support for gpio interrupt for particular gpio group.
- */
-#ifdef CONFIG_S5P_GPIO_INT
-extern int s5p_register_gpioint_bank(int chain_irq, int start, int nr_groups);
-#else
-#define s5p_register_gpioint_bank(chain_irq, start, nr_groups) do { } while (0)
-#endif
-
 #endif /* __PLAT_GPIO_CFG_H */
diff --git a/arch/arm/plat-samsung/include/plat/gpio-core.h b/arch/arm/plat-samsung/include/plat/gpio-core.h
index cf5aae5b0975..6ce11bfdc37e 100644
--- a/arch/arm/plat-samsung/include/plat/gpio-core.h
+++ b/arch/arm/plat-samsung/include/plat/gpio-core.h
@@ -14,6 +14,9 @@
 #ifndef __PLAT_SAMSUNG_GPIO_CORE_H
 #define __PLAT_SAMSUNG_GPIO_CORE_H
 
+/* Bring in machine-local definitions, especially S3C_GPIO_END */
+#include <mach/gpio-samsung.h>
+
 #define GPIOCON_OFF     (0x00)
 #define GPIODAT_OFF     (0x04)
 
diff --git a/arch/arm/plat-samsung/include/plat/hdmi.h b/arch/arm/plat-samsung/include/plat/hdmi.h
deleted file mode 100644
index 331d046ac2c5..000000000000
--- a/arch/arm/plat-samsung/include/plat/hdmi.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2012 Samsung Electronics Co.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.
- */
-
-#ifndef __PLAT_SAMSUNG_HDMI_H
-#define __PLAT_SAMSUNG_HDMI_H __FILE__
-
-extern void s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
-                                  struct i2c_board_info *mhl_info, int mhl_bus);
-
-#endif /* __PLAT_SAMSUNG_HDMI_H */
diff --git a/arch/arm/plat-samsung/include/plat/irqs.h b/arch/arm/plat-samsung/include/plat/irqs.h
deleted file mode 100644
index 039001c0ef05..000000000000
--- a/arch/arm/plat-samsung/include/plat/irqs.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/irqs.h
- *
- * Copyright (c) 2009 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P Common IRQ 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 __PLAT_SAMSUNG_IRQS_H
-#define __PLAT_SAMSUNG_IRQS_H __FILE__
-
-/* we keep the first set of CPU IRQs out of the range of
- * the ISA space, so that the PC104 has them to itself
- * and we don't end up having to do horrible things to the
- * standard ISA drivers....
- *
- * note, since we're using the VICs, our start must be a
- * mulitple of 32 to allow the common code to work
- */
-
-#define S5P_IRQ_OFFSET          (32)
-
-#define S5P_IRQ(x)              ((x) + S5P_IRQ_OFFSET)
-
-#define S5P_VIC0_BASE           S5P_IRQ(0)
-#define S5P_VIC1_BASE           S5P_IRQ(32)
-#define S5P_VIC2_BASE           S5P_IRQ(64)
-#define S5P_VIC3_BASE           S5P_IRQ(96)
-
-#define VIC_BASE(x)             (S5P_VIC0_BASE + ((x)*32))
-
-#define IRQ_VIC0_BASE           S5P_VIC0_BASE
-#define IRQ_VIC1_BASE           S5P_VIC1_BASE
-#define IRQ_VIC2_BASE           S5P_VIC2_BASE
-
-/* VIC based IRQs */
-
-#define S5P_IRQ_VIC0(x)         (S5P_VIC0_BASE + (x))
-#define S5P_IRQ_VIC1(x)         (S5P_VIC1_BASE + (x))
-#define S5P_IRQ_VIC2(x)         (S5P_VIC2_BASE + (x))
-#define S5P_IRQ_VIC3(x)         (S5P_VIC3_BASE + (x))
-
-#define IRQ_EINT(x)             ((x) < 16 ? ((x) + S5P_EINT_BASE1) \
-                                        : ((x) - 16 + S5P_EINT_BASE2))
-
-#define EINT_OFFSET(irq)        ((irq) < S5P_EINT_BASE2 ? \
-                                                ((irq) - S5P_EINT_BASE1) : \
-                                                ((irq) + 16 - S5P_EINT_BASE2))
-
-#define IRQ_EINT_BIT(x)         EINT_OFFSET(x)
-
-/* Typically only a few gpio chips require gpio interrupt support.
-   To avoid memory waste irq descriptors are allocated only for
-   S5P_GPIOINT_GROUP_COUNT chips, each with total number of
-   S5P_GPIOINT_GROUP_SIZE pins/irqs. Each GPIOINT group can be assiged
-   to any gpio chip with the s5p_register_gpio_interrupt() function */
-#define S5P_GPIOINT_GROUP_COUNT 4
-#define S5P_GPIOINT_GROUP_SIZE  8
-#define S5P_GPIOINT_COUNT       (S5P_GPIOINT_GROUP_COUNT * S5P_GPIOINT_GROUP_SIZE)
-
-/* IRQ types common for all s5p platforms */
-#define S5P_IRQ_TYPE_LEVEL_LOW          (0x00)
-#define S5P_IRQ_TYPE_LEVEL_HIGH         (0x01)
-#define S5P_IRQ_TYPE_EDGE_FALLING       (0x02)
-#define S5P_IRQ_TYPE_EDGE_RISING        (0x03)
-#define S5P_IRQ_TYPE_EDGE_BOTH          (0x04)
-
-#endif /* __PLAT_SAMSUNG_IRQS_H */
diff --git a/arch/arm/plat-samsung/include/plat/map-s5p.h b/arch/arm/plat-samsung/include/plat/map-s5p.h
index c18678610bc0..f5b9d3ff9cd4 100644
--- a/arch/arm/plat-samsung/include/plat/map-s5p.h
+++ b/arch/arm/plat-samsung/include/plat/map-s5p.h
@@ -15,7 +15,6 @@
 
 #define S5P_VA_CHIPID           S3C_ADDR(0x02000000)
 #define S5P_VA_CMU              S3C_ADDR(0x02100000)
-#define S5P_VA_PMU              S3C_ADDR(0x02180000)
 #define S5P_VA_GPIO             S3C_ADDR(0x02200000)
 #define S5P_VA_GPIO1            S5P_VA_GPIO
 #define S5P_VA_GPIO2            S3C_ADDR(0x02240000)
diff --git a/arch/arm/plat-samsung/include/plat/mfc.h b/arch/arm/plat-samsung/include/plat/mfc.h
deleted file mode 100644
index 033654e91e22..000000000000
--- a/arch/arm/plat-samsung/include/plat/mfc.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co.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.
- */
-
-#ifndef __PLAT_SAMSUNG_MFC_H
-#define __PLAT_SAMSUNG_MFC_H __FILE__
-
-struct s5p_mfc_dt_meminfo {
-        unsigned long   loff;
-        unsigned long   lsize;
-        unsigned long   roff;
-        unsigned long   rsize;
-        char            *compatible;
-};
-
-/**
- * s5p_mfc_reserve_mem - function to early reserve memory for MFC driver
- * @rbase:      base address for MFC 'right' memory interface
- * @rsize:      size of the memory reserved for MFC 'right' interface
- * @lbase:      base address for MFC 'left' memory interface
- * @lsize:      size of the memory reserved for MFC 'left' interface
- *
- * This function reserves system memory for both MFC device memory
- * interfaces and registers it to respective struct device entries as
- * coherent memory.
- */
-void __init s5p_mfc_reserve_mem(phys_addr_t rbase, unsigned int rsize,
-                                phys_addr_t lbase, unsigned int lsize);
-
-#endif /* __PLAT_SAMSUNG_MFC_H */
diff --git a/arch/arm/plat-samsung/include/plat/pll.h b/arch/arm/plat-samsung/include/plat/pll.h
deleted file mode 100644
index 357af7c1c664..000000000000
--- a/arch/arm/plat-samsung/include/plat/pll.h
+++ /dev/null
@@ -1,323 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/pll.h
- *
- * Copyright (c) 2009-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 PLL codes
- *
- * 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/div64.h>
-
-#define S3C24XX_PLL_MDIV_MASK           (0xFF)
-#define S3C24XX_PLL_PDIV_MASK           (0x1F)
-#define S3C24XX_PLL_SDIV_MASK           (0x3)
-#define S3C24XX_PLL_MDIV_SHIFT          (12)
-#define S3C24XX_PLL_PDIV_SHIFT          (4)
-#define S3C24XX_PLL_SDIV_SHIFT          (0)
-
-static inline unsigned int s3c24xx_get_pll(unsigned int pllval,
-                                           unsigned int baseclk)
-{
-        unsigned int mdiv, pdiv, sdiv;
-        uint64_t fvco;
-
-        mdiv = (pllval >> S3C24XX_PLL_MDIV_SHIFT) & S3C24XX_PLL_MDIV_MASK;
-        pdiv = (pllval >> S3C24XX_PLL_PDIV_SHIFT) & S3C24XX_PLL_PDIV_MASK;
-        sdiv = (pllval >> S3C24XX_PLL_SDIV_SHIFT) & S3C24XX_PLL_SDIV_MASK;
-
-        fvco = (uint64_t)baseclk * (mdiv + 8);
-        do_div(fvco, (pdiv + 2) << sdiv);
-
-        return (unsigned int)fvco;
-}
-
-#define S3C2416_PLL_MDIV_MASK           (0x3FF)
-#define S3C2416_PLL_PDIV_MASK           (0x3F)
-#define S3C2416_PLL_SDIV_MASK           (0x7)
-#define S3C2416_PLL_MDIV_SHIFT          (14)
-#define S3C2416_PLL_PDIV_SHIFT          (5)
-#define S3C2416_PLL_SDIV_SHIFT          (0)
-
-static inline unsigned int s3c2416_get_pll(unsigned int pllval,
-                                           unsigned int baseclk)
-{
-        unsigned int mdiv, pdiv, sdiv;
-        uint64_t fvco;
-
-        mdiv = (pllval >> S3C2416_PLL_MDIV_SHIFT) & S3C2416_PLL_MDIV_MASK;
-        pdiv = (pllval >> S3C2416_PLL_PDIV_SHIFT) & S3C2416_PLL_PDIV_MASK;
-        sdiv = (pllval >> S3C2416_PLL_SDIV_SHIFT) & S3C2416_PLL_SDIV_MASK;
-
-        fvco = (uint64_t)baseclk * mdiv;
-        do_div(fvco, (pdiv << sdiv));
-
-        return (unsigned int)fvco;
-}
-
-#define S3C6400_PLL_MDIV_MASK           (0x3FF)
-#define S3C6400_PLL_PDIV_MASK           (0x3F)
-#define S3C6400_PLL_SDIV_MASK           (0x7)
-#define S3C6400_PLL_MDIV_SHIFT          (16)
-#define S3C6400_PLL_PDIV_SHIFT          (8)
-#define S3C6400_PLL_SDIV_SHIFT          (0)
-
-static inline unsigned long s3c6400_get_pll(unsigned long baseclk,
-                                            u32 pllcon)
-{
-        u32 mdiv, pdiv, sdiv;
-        u64 fvco = baseclk;
-
-        mdiv = (pllcon >> S3C6400_PLL_MDIV_SHIFT) & S3C6400_PLL_MDIV_MASK;
-        pdiv = (pllcon >> S3C6400_PLL_PDIV_SHIFT) & S3C6400_PLL_PDIV_MASK;
-        sdiv = (pllcon >> S3C6400_PLL_SDIV_SHIFT) & S3C6400_PLL_SDIV_MASK;
-
-        fvco *= mdiv;
-        do_div(fvco, (pdiv << sdiv));
-
-        return (unsigned long)fvco;
-}
-
-#define PLL6553X_MDIV_MASK      (0x7F)
-#define PLL6553X_PDIV_MASK      (0x1F)
-#define PLL6553X_SDIV_MASK      (0x3)
-#define PLL6553X_KDIV_MASK      (0xFFFF)
-#define PLL6553X_MDIV_SHIFT     (16)
-#define PLL6553X_PDIV_SHIFT     (8)
-#define PLL6553X_SDIV_SHIFT     (0)
-
-static inline unsigned long s3c_get_pll6553x(unsigned long baseclk,
-                                             u32 pll_con0, u32 pll_con1)
-{
-        unsigned long result;
-        u32 mdiv, pdiv, sdiv, kdiv;
-        u64 tmp;
-
-        mdiv = (pll_con0 >> PLL6553X_MDIV_SHIFT) & PLL6553X_MDIV_MASK;
-        pdiv = (pll_con0 >> PLL6553X_PDIV_SHIFT) & PLL6553X_PDIV_MASK;
-        sdiv = (pll_con0 >> PLL6553X_SDIV_SHIFT) & PLL6553X_SDIV_MASK;
-        kdiv = pll_con1 & PLL6553X_KDIV_MASK;
-
-        /*
-         * We need to multiple baseclk by mdiv (the integer part) and kdiv
-         * which is in 2^16ths, so shift mdiv up (does not overflow) and
-         * add kdiv before multiplying. The use of tmp is to avoid any
-         * overflows before shifting bac down into result when multipling
-         * by the mdiv and kdiv pair.
-         */
-
-        tmp = baseclk;
-        tmp *= (mdiv << 16) + kdiv;
-        do_div(tmp, (pdiv << sdiv));
-        result = tmp >> 16;
-
-        return result;
-}
-
-#define PLL35XX_MDIV_MASK       (0x3FF)
-#define PLL35XX_PDIV_MASK       (0x3F)
-#define PLL35XX_SDIV_MASK       (0x7)
-#define PLL35XX_MDIV_SHIFT      (16)
-#define PLL35XX_PDIV_SHIFT      (8)
-#define PLL35XX_SDIV_SHIFT      (0)
-
-static inline unsigned long s5p_get_pll35xx(unsigned long baseclk, u32 pll_con)
-{
-        u32 mdiv, pdiv, sdiv;
-        u64 fvco = baseclk;
-
-        mdiv = (pll_con >> PLL35XX_MDIV_SHIFT) & PLL35XX_MDIV_MASK;
-        pdiv = (pll_con >> PLL35XX_PDIV_SHIFT) & PLL35XX_PDIV_MASK;
-        sdiv = (pll_con >> PLL35XX_SDIV_SHIFT) & PLL35XX_SDIV_MASK;
-
-        fvco *= mdiv;
-        do_div(fvco, (pdiv << sdiv));
-
-        return (unsigned long)fvco;
-}
-
-#define PLL36XX_KDIV_MASK       (0xFFFF)
-#define PLL36XX_MDIV_MASK       (0x1FF)
-#define PLL36XX_PDIV_MASK       (0x3F)
-#define PLL36XX_SDIV_MASK       (0x7)
-#define PLL36XX_MDIV_SHIFT      (16)
-#define PLL36XX_PDIV_SHIFT      (8)
-#define PLL36XX_SDIV_SHIFT      (0)
-
-static inline unsigned long s5p_get_pll36xx(unsigned long baseclk,
-                                            u32 pll_con0, u32 pll_con1)
-{
-        unsigned long result;
-        u32 mdiv, pdiv, sdiv, kdiv;
-        u64 tmp;
-
-        mdiv = (pll_con0 >> PLL36XX_MDIV_SHIFT) & PLL36XX_MDIV_MASK;
-        pdiv = (pll_con0 >> PLL36XX_PDIV_SHIFT) & PLL36XX_PDIV_MASK;
-        sdiv = (pll_con0 >> PLL36XX_SDIV_SHIFT) & PLL36XX_SDIV_MASK;
-        kdiv = pll_con1 & PLL36XX_KDIV_MASK;
-
-        tmp = baseclk;
-
-        tmp *= (mdiv << 16) + kdiv;
-        do_div(tmp, (pdiv << sdiv));
-        result = tmp >> 16;
-
-        return result;
-}
-
-#define PLL45XX_MDIV_MASK       (0x3FF)
-#define PLL45XX_PDIV_MASK       (0x3F)
-#define PLL45XX_SDIV_MASK       (0x7)
-#define PLL45XX_MDIV_SHIFT      (16)
-#define PLL45XX_PDIV_SHIFT      (8)
-#define PLL45XX_SDIV_SHIFT      (0)
-
-enum pll45xx_type_t {
-        pll_4500,
-        pll_4502,
-        pll_4508
-};
-
-static inline unsigned long s5p_get_pll45xx(unsigned long baseclk, u32 pll_con,
-                                            enum pll45xx_type_t pll_type)
-{
-        u32 mdiv, pdiv, sdiv;
-        u64 fvco = baseclk;
-
-        mdiv = (pll_con >> PLL45XX_MDIV_SHIFT) & PLL45XX_MDIV_MASK;
-        pdiv = (pll_con >> PLL45XX_PDIV_SHIFT) & PLL45XX_PDIV_MASK;
-        sdiv = (pll_con >> PLL45XX_SDIV_SHIFT) & PLL45XX_SDIV_MASK;
-
-        if (pll_type == pll_4508)
-                sdiv = sdiv - 1;
-
-        fvco *= mdiv;
-        do_div(fvco, (pdiv << sdiv));
-
-        return (unsigned long)fvco;
-}
-
-/* CON0 bit-fields */
-#define PLL46XX_MDIV_MASK       (0x1FF)
-#define PLL46XX_PDIV_MASK       (0x3F)
-#define PLL46XX_SDIV_MASK       (0x7)
-#define PLL46XX_LOCKED_SHIFT    (29)
-#define PLL46XX_MDIV_SHIFT      (16)
-#define PLL46XX_PDIV_SHIFT      (8)
-#define PLL46XX_SDIV_SHIFT      (0)
-
-/* CON1 bit-fields */
-#define PLL46XX_MRR_MASK        (0x1F)
-#define PLL46XX_MFR_MASK        (0x3F)
-#define PLL46XX_KDIV_MASK       (0xFFFF)
-#define PLL4650C_KDIV_MASK      (0xFFF)
-#define PLL46XX_MRR_SHIFT       (24)
-#define PLL46XX_MFR_SHIFT       (16)
-#define PLL46XX_KDIV_SHIFT      (0)
-
-enum pll46xx_type_t {
-        pll_4600,
-        pll_4650,
-        pll_4650c,
-};
-
-static inline unsigned long s5p_get_pll46xx(unsigned long baseclk,
-                                            u32 pll_con0, u32 pll_con1,
-                                            enum pll46xx_type_t pll_type)
-{
-        unsigned long result;
-        u32 mdiv, pdiv, sdiv, kdiv;
-        u64 tmp;
-
-        mdiv = (pll_con0 >> PLL46XX_MDIV_SHIFT) & PLL46XX_MDIV_MASK;
-        pdiv = (pll_con0 >> PLL46XX_PDIV_SHIFT) & PLL46XX_PDIV_MASK;
-        sdiv = (pll_con0 >> PLL46XX_SDIV_SHIFT) & PLL46XX_SDIV_MASK;
-        kdiv = pll_con1 & PLL46XX_KDIV_MASK;
-
-        if (pll_type == pll_4650c)
-                kdiv = pll_con1 & PLL4650C_KDIV_MASK;
-        else
-                kdiv = pll_con1 & PLL46XX_KDIV_MASK;
-
-        tmp = baseclk;
-
-        if (pll_type == pll_4600) {
-                tmp *= (mdiv << 16) + kdiv;
-                do_div(tmp, (pdiv << sdiv));
-                result = tmp >> 16;
-        } else {
-                tmp *= (mdiv << 10) + kdiv;
-                do_div(tmp, (pdiv << sdiv));
-                result = tmp >> 10;
-        }
-
-        return result;
-}
-
-#define PLL90XX_MDIV_MASK       (0xFF)
-#define PLL90XX_PDIV_MASK       (0x3F)
-#define PLL90XX_SDIV_MASK       (0x7)
-#define PLL90XX_KDIV_MASK       (0xffff)
-#define PLL90XX_LOCKED_SHIFT    (29)
-#define PLL90XX_MDIV_SHIFT      (16)
-#define PLL90XX_PDIV_SHIFT      (8)
-#define PLL90XX_SDIV_SHIFT      (0)
-#define PLL90XX_KDIV_SHIFT      (0)
-
-static inline unsigned long s5p_get_pll90xx(unsigned long baseclk,
-                                            u32 pll_con, u32 pll_conk)
-{
-        unsigned long result;
-        u32 mdiv, pdiv, sdiv, kdiv;
-        u64 tmp;
-
-        mdiv = (pll_con >> PLL90XX_MDIV_SHIFT) & PLL90XX_MDIV_MASK;
-        pdiv = (pll_con >> PLL90XX_PDIV_SHIFT) & PLL90XX_PDIV_MASK;
-        sdiv = (pll_con >> PLL90XX_SDIV_SHIFT) & PLL90XX_SDIV_MASK;
-        kdiv = pll_conk & PLL90XX_KDIV_MASK;
-
-        /*
-         * We need to multiple baseclk by mdiv (the integer part) and kdiv
-         * which is in 2^16ths, so shift mdiv up (does not overflow) and
-         * add kdiv before multiplying. The use of tmp is to avoid any
-         * overflows before shifting bac down into result when multipling
-         * by the mdiv and kdiv pair.
-         */
-
-        tmp = baseclk;
-        tmp *= (mdiv << 16) + kdiv;
-        do_div(tmp, (pdiv << sdiv));
-        result = tmp >> 16;
-
-        return result;
-}
-
-#define PLL65XX_MDIV_MASK       (0x3FF)
-#define PLL65XX_PDIV_MASK       (0x3F)
-#define PLL65XX_SDIV_MASK       (0x7)
-#define PLL65XX_MDIV_SHIFT      (16)
-#define PLL65XX_PDIV_SHIFT      (8)
-#define PLL65XX_SDIV_SHIFT      (0)
-
-static inline unsigned long s5p_get_pll65xx(unsigned long baseclk, u32 pll_con)
-{
-        u32 mdiv, pdiv, sdiv;
-        u64 fvco = baseclk;
-
-        mdiv = (pll_con >> PLL65XX_MDIV_SHIFT) & PLL65XX_MDIV_MASK;
-        pdiv = (pll_con >> PLL65XX_PDIV_SHIFT) & PLL65XX_PDIV_MASK;
-        sdiv = (pll_con >> PLL65XX_SDIV_SHIFT) & PLL65XX_SDIV_MASK;
-
-        fvco *= mdiv;
-        do_div(fvco, (pdiv << sdiv));
-
-        return (unsigned long)fvco;
-}
diff --git a/arch/arm/plat-samsung/include/plat/s5p-clock.h b/arch/arm/plat-samsung/include/plat/s5p-clock.h
deleted file mode 100644
index 8364b4bea8b8..000000000000
--- a/arch/arm/plat-samsung/include/plat/s5p-clock.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/s5p-clock.h
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Header file for s5p clock 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_S5P_CLOCK_H
-#define __ASM_PLAT_S5P_CLOCK_H __FILE__
-
-#include <linux/clk.h>
-
-#define GET_DIV(clk, field) ((((clk) & field##_MASK) >> field##_SHIFT) + 1)
-
-#define clk_fin_apll clk_ext_xtal_mux
-#define clk_fin_bpll clk_ext_xtal_mux
-#define clk_fin_cpll clk_ext_xtal_mux
-#define clk_fin_mpll clk_ext_xtal_mux
-#define clk_fin_epll clk_ext_xtal_mux
-#define clk_fin_dpll clk_ext_xtal_mux
-#define clk_fin_vpll clk_ext_xtal_mux
-#define clk_fin_hpll clk_ext_xtal_mux
-
-extern struct clk clk_ext_xtal_mux;
-extern struct clk clk_xusbxti;
-extern struct clk clk_48m;
-extern struct clk s5p_clk_27m;
-extern struct clk clk_fout_apll;
-extern struct clk clk_fout_bpll;
-extern struct clk clk_fout_bpll_div2;
-extern struct clk clk_fout_cpll;
-extern struct clk clk_fout_mpll;
-extern struct clk clk_fout_mpll_div2;
-extern struct clk clk_fout_epll;
-extern struct clk clk_fout_dpll;
-extern struct clk clk_fout_vpll;
-extern struct clk clk_arm;
-extern struct clk clk_vpll;
-
-extern struct clksrc_sources clk_src_apll;
-extern struct clksrc_sources clk_src_bpll;
-extern struct clksrc_sources clk_src_bpll_fout;
-extern struct clksrc_sources clk_src_cpll;
-extern struct clksrc_sources clk_src_mpll;
-extern struct clksrc_sources clk_src_mpll_fout;
-extern struct clksrc_sources clk_src_epll;
-extern struct clksrc_sources clk_src_dpll;
-
-extern int s5p_gatectrl(void __iomem *reg, struct clk *clk, int enable);
-
-/* Common EPLL operations for S5P platform */
-extern int s5p_epll_enable(struct clk *clk, int enable);
-extern unsigned long s5p_epll_get_rate(struct clk *clk);
-
-/* SPDIF clk operations common for S5PC100/V210/C110 and Exynos4 */
-extern int s5p_spdif_set_rate(struct clk *clk, unsigned long rate);
-extern unsigned long s5p_spdif_get_rate(struct clk *clk);
-
-extern struct clk_ops s5p_sclk_spdif_ops;
-#endif /* __ASM_PLAT_S5P_CLOCK_H */
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h
index bf650218b40e..2787553c3ae2 100644
--- a/arch/arm/plat-samsung/include/plat/sdhci.h
+++ b/arch/arm/plat-samsung/include/plat/sdhci.h
@@ -56,22 +56,7 @@ extern void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
 extern void s3c2416_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
 extern void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
 extern void s3c64xx_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
-extern void s5pc100_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
-extern void s5pc100_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
-extern void s5pc100_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
 extern void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
-extern void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
-extern void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
-extern void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
-extern void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *, int w);
-extern void exynos4_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
-extern void exynos4_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
-extern void exynos4_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
-extern void exynos4_setup_sdhci3_cfg_gpio(struct platform_device *, int w);
-extern void s5p64x0_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
-extern void s5p64x0_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
-extern void s5p6440_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
-extern void s5p6450_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
 
 /* S3C2416 SDHCI setup */
 
@@ -151,115 +136,6 @@ static inline void s3c6400_default_sdhci2(void) { }
 
 #endif /* CONFIG_S3C64XX_SETUP_SDHCI */
 
-/* S5P64X0 SDHCI setup */
-
-#ifdef CONFIG_S5P64X0_SETUP_SDHCI_GPIO
-static inline void s5p64x0_default_sdhci0(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.cfg_gpio = s5p64x0_setup_sdhci0_cfg_gpio;
-#endif
-}
-
-static inline void s5p64x0_default_sdhci1(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.cfg_gpio = s5p64x0_setup_sdhci1_cfg_gpio;
-#endif
-}
-
-static inline void s5p6440_default_sdhci2(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.cfg_gpio = s5p6440_setup_sdhci2_cfg_gpio;
-#endif
-}
-
-static inline void s5p6450_default_sdhci2(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.cfg_gpio = s5p6450_setup_sdhci2_cfg_gpio;
-#endif
-}
-
-#else
-static inline void s5p64x0_default_sdhci0(void) { }
-static inline void s5p64x0_default_sdhci1(void) { }
-static inline void s5p6440_default_sdhci2(void) { }
-static inline void s5p6450_default_sdhci2(void) { }
-
-#endif /* CONFIG_S5P64X0_SETUP_SDHCI_GPIO */
-
-/* S5PC100 SDHCI setup */
-
-#ifdef CONFIG_S5PC100_SETUP_SDHCI
-static inline void s5pc100_default_sdhci0(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.cfg_gpio = s5pc100_setup_sdhci0_cfg_gpio;
-#endif
-}
-
-static inline void s5pc100_default_sdhci1(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.cfg_gpio = s5pc100_setup_sdhci1_cfg_gpio;
-#endif
-}
-
-static inline void s5pc100_default_sdhci2(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.cfg_gpio = s5pc100_setup_sdhci2_cfg_gpio;
-#endif
-}
-
-#else
-static inline void s5pc100_default_sdhci0(void) { }
-static inline void s5pc100_default_sdhci1(void) { }
-static inline void s5pc100_default_sdhci2(void) { }
-
-#endif /* CONFIG_S5PC100_SETUP_SDHCI */
-
-/* S5PV210 SDHCI setup */
-
-#ifdef CONFIG_S5PV210_SETUP_SDHCI
-static inline void s5pv210_default_sdhci0(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.cfg_gpio = s5pv210_setup_sdhci0_cfg_gpio;
-#endif
-}
-
-static inline void s5pv210_default_sdhci1(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.cfg_gpio = s5pv210_setup_sdhci1_cfg_gpio;
-#endif
-}
-
-static inline void s5pv210_default_sdhci2(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.cfg_gpio = s5pv210_setup_sdhci2_cfg_gpio;
-#endif
-}
-
-static inline void s5pv210_default_sdhci3(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC3
-        s3c_hsmmc3_def_platdata.cfg_gpio = s5pv210_setup_sdhci3_cfg_gpio;
-#endif
-}
-
-#else
-static inline void s5pv210_default_sdhci0(void) { }
-static inline void s5pv210_default_sdhci1(void) { }
-static inline void s5pv210_default_sdhci2(void) { }
-static inline void s5pv210_default_sdhci3(void) { }
-
-#endif /* CONFIG_S5PV210_SETUP_SDHCI */
-
 static inline void s3c_sdhci_setname(int id, char *name)
 {
         switch (id) {
diff --git a/arch/arm/plat-samsung/include/plat/tv-core.h b/arch/arm/plat-samsung/include/plat/tv-core.h
deleted file mode 100644
index 3bc34f3ce28f..000000000000
--- a/arch/arm/plat-samsung/include/plat/tv-core.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * arch/arm/plat-samsung/include/plat/tv.h
- *
- * Copyright 2011 Samsung Electronics Co., Ltd.
- *      Tomasz Stanislawski <t.stanislaws@samsung.com>
- *
- * Samsung TV driver core functions
- *
- * 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 __SAMSUNG_PLAT_TV_H
-#define __SAMSUNG_PLAT_TV_H __FILE__
-
-/*
- * These functions are only for use with the core support code, such as
- * the CPU-specific initialization code.
- */
-
-/* Re-define device name to differentiate the subsystem in various SoCs. */
-static inline void s5p_hdmi_setname(char *name)
-{
-#ifdef CONFIG_S5P_DEV_TV
-        s5p_device_hdmi.name = name;
-#endif
-}
-
-static inline void s5p_mixer_setname(char *name)
-{
-#ifdef CONFIG_S5P_DEV_TV
-        s5p_device_mixer.name = name;
-#endif
-}
-
-static inline void s5p_sdo_setname(char *name)
-{
-#ifdef CONFIG_S5P_DEV_TV
-        s5p_device_sdo.name = name;
-#endif
-}
-
-#endif /* __SAMSUNG_PLAT_TV_H */
diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c
index a1f925f3121f..11fbbc26e49f 100644
--- a/arch/arm/plat-samsung/init.c
+++ b/arch/arm/plat-samsung/init.c
@@ -30,7 +30,6 @@
 
 #include <plat/cpu.h>
 #include <plat/devs.h>
-#include <plat/clock.h>
 
 static struct cpu_table *cpu;
 
diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c
index da268813901b..f9a09262f2fa 100644
--- a/arch/arm/plat-samsung/pm-gpio.c
+++ b/arch/arm/plat-samsung/pm-gpio.c
@@ -19,9 +19,7 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 
-#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX)
 #include <mach/gpio-samsung.h>
-#endif
 
 #include <plat/gpio-core.h>
 #include <plat/pm.h>
@@ -196,7 +194,7 @@ struct samsung_gpio_pm samsung_gpio_pm_2bit = {
         .resume = samsung_gpio_pm_2bit_resume,
 };
 
-#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P)
+#if defined(CONFIG_ARCH_S3C64XX)
 static void samsung_gpio_pm_4bit_save(struct samsung_gpio_chip *chip)
 {
         chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);
@@ -306,7 +304,7 @@ struct samsung_gpio_pm samsung_gpio_pm_4bit = {
         .save   = samsung_gpio_pm_4bit_save,
         .resume = samsung_gpio_pm_4bit_resume,
 };
-#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P */
+#endif /* CONFIG_ARCH_S3C64XX */
 
 /**
  * samsung_pm_save_gpio() - save gpio chip data for suspend
diff --git a/arch/arm/plat-samsung/s5p-clock.c b/arch/arm/plat-samsung/s5p-clock.c
deleted file mode 100644
index 48a159911037..000000000000
--- a/arch/arm/plat-samsung/s5p-clock.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright 2009 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P - Common clock 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.
-*/
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/io.h>
-#include <asm/div64.h>
-
-#include <mach/regs-clock.h>
-
-#include <plat/clock.h>
-#include <plat/clock-clksrc.h>
-#include <plat/s5p-clock.h>
-
-/* fin_apll, fin_mpll and fin_epll are all the same clock, which we call
- * clk_ext_xtal_mux.
-*/
-struct clk clk_ext_xtal_mux = {
-        .name           = "ext_xtal",
-        .id             = -1,
-};
-
-struct clk clk_xusbxti = {
-        .name           = "xusbxti",
-        .id             = -1,
-        .rate           = 24000000,
-};
-
-struct clk s5p_clk_27m = {
-        .name           = "clk_27m",
-        .id             = -1,
-        .rate           = 27000000,
-};
-
-/* 48MHz USB Phy clock output */
-struct clk clk_48m = {
-        .name           = "clk_48m",
-        .id             = -1,
-        .rate           = 48000000,
-};
-
-/* APLL clock output
- * No need .ctrlbit, this is always on
-*/
-struct clk clk_fout_apll = {
-        .name           = "fout_apll",
-        .id             = -1,
-};
-
-/* BPLL clock output */
-
-struct clk clk_fout_bpll = {
-        .name           = "fout_bpll",
-        .id             = -1,
-};
-
-struct clk clk_fout_bpll_div2 = {
-        .name           = "fout_bpll_div2",
-        .id             = -1,
-};
-
-/* CPLL clock output */
-
-struct clk clk_fout_cpll = {
-        .name           = "fout_cpll",
-        .id             = -1,
-};
-
-/* MPLL clock output
- * No need .ctrlbit, this is always on
-*/
-struct clk clk_fout_mpll = {
-        .name           = "fout_mpll",
-        .id             = -1,
-};
-
-struct clk clk_fout_mpll_div2 = {
-        .name           = "fout_mpll_div2",
-        .id             = -1,
-};
-
-/* EPLL clock output */
-struct clk clk_fout_epll = {
-        .name           = "fout_epll",
-        .id             = -1,
-        .ctrlbit        = (1 << 31),
-};
-
-/* DPLL clock output */
-struct clk clk_fout_dpll = {
-        .name           = "fout_dpll",
-        .id             = -1,
-        .ctrlbit        = (1 << 31),
-};
-
-/* VPLL clock output */
-struct clk clk_fout_vpll = {
-        .name           = "fout_vpll",
-        .id             = -1,
-        .ctrlbit        = (1 << 31),
-};
-
-/* Possible clock sources for APLL Mux */
-static struct clk *clk_src_apll_list[] = {
-        [0] = &clk_fin_apll,
-        [1] = &clk_fout_apll,
-};
-
-struct clksrc_sources clk_src_apll = {
-        .sources        = clk_src_apll_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_apll_list),
-};
-
-/* Possible clock sources for BPLL Mux */
-static struct clk *clk_src_bpll_list[] = {
-        [0] = &clk_fin_bpll,
-        [1] = &clk_fout_bpll,
-};
-
-struct clksrc_sources clk_src_bpll = {
-        .sources        = clk_src_bpll_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_bpll_list),
-};
-
-static struct clk *clk_src_bpll_fout_list[] = {
-        [0] = &clk_fout_bpll_div2,
-        [1] = &clk_fout_bpll,
-};
-
-struct clksrc_sources clk_src_bpll_fout = {
-        .sources        = clk_src_bpll_fout_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_bpll_fout_list),
-};
-
-/* Possible clock sources for CPLL Mux */
-static struct clk *clk_src_cpll_list[] = {
-        [0] = &clk_fin_cpll,
-        [1] = &clk_fout_cpll,
-};
-
-struct clksrc_sources clk_src_cpll = {
-        .sources        = clk_src_cpll_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_cpll_list),
-};
-
-/* Possible clock sources for MPLL Mux */
-static struct clk *clk_src_mpll_list[] = {
-        [0] = &clk_fin_mpll,
-        [1] = &clk_fout_mpll,
-};
-
-struct clksrc_sources clk_src_mpll = {
-        .sources        = clk_src_mpll_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_mpll_list),
-};
-
-static struct clk *clk_src_mpll_fout_list[] = {
-        [0] = &clk_fout_mpll_div2,
-        [1] = &clk_fout_mpll,
-};
-
-struct clksrc_sources clk_src_mpll_fout = {
-        .sources        = clk_src_mpll_fout_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_mpll_fout_list),
-};
-
-/* Possible clock sources for EPLL Mux */
-static struct clk *clk_src_epll_list[] = {
-        [0] = &clk_fin_epll,
-        [1] = &clk_fout_epll,
-};
-
-struct clksrc_sources clk_src_epll = {
-        .sources        = clk_src_epll_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_epll_list),
-};
-
-/* Possible clock sources for DPLL Mux */
-static struct clk *clk_src_dpll_list[] = {
-        [0] = &clk_fin_dpll,
-        [1] = &clk_fout_dpll,
-};
-
-struct clksrc_sources clk_src_dpll = {
-        .sources        = clk_src_dpll_list,
-        .nr_sources     = ARRAY_SIZE(clk_src_dpll_list),
-};
-
-struct clk clk_vpll = {
-        .name           = "vpll",
-        .id             = -1,
-};
-
-int s5p_gatectrl(void __iomem *reg, struct clk *clk, int enable)
-{
-        unsigned int ctrlbit = clk->ctrlbit;
-        u32 con;
-
-        con = __raw_readl(reg);
-        con = enable ? (con | ctrlbit) : (con & ~ctrlbit);
-        __raw_writel(con, reg);
-        return 0;
-}
-
-int s5p_epll_enable(struct clk *clk, int enable)
-{
-        unsigned int ctrlbit = clk->ctrlbit;
-        unsigned int epll_con = __raw_readl(S5P_EPLL_CON) & ~ctrlbit;
-
-        if (enable)
-                __raw_writel(epll_con | ctrlbit, S5P_EPLL_CON);
-        else
-                __raw_writel(epll_con, S5P_EPLL_CON);
-
-        return 0;
-}
-
-unsigned long s5p_epll_get_rate(struct clk *clk)
-{
-        return clk->rate;
-}
-
-int s5p_spdif_set_rate(struct clk *clk, unsigned long rate)
-{
-        struct clk *pclk;
-        int ret;
-
-        pclk = clk_get_parent(clk);
-        if (IS_ERR(pclk))
-                return -EINVAL;
-
-        ret = pclk->ops->set_rate(pclk, rate);
-        clk_put(pclk);
-
-        return ret;
-}
-
-unsigned long s5p_spdif_get_rate(struct clk *clk)
-{
-        struct clk *pclk;
-        int rate;
-
-        pclk = clk_get_parent(clk);
-        if (IS_ERR(pclk))
-                return -EINVAL;
-
-        rate = pclk->ops->get_rate(pclk);
-        clk_put(pclk);
-
-        return rate;
-}
-
-struct clk_ops s5p_sclk_spdif_ops = {
-        .set_rate       = s5p_spdif_set_rate,
-        .get_rate       = s5p_spdif_get_rate,
-};
-
-static struct clk *s5p_clks[] __initdata = {
-        &clk_ext_xtal_mux,
-        &clk_48m,
-        &s5p_clk_27m,
-        &clk_fout_apll,
-        &clk_fout_mpll,
-        &clk_fout_epll,
-        &clk_fout_dpll,
-        &clk_fout_vpll,
-        &clk_vpll,
-        &clk_xusbxti,
-};
-
-void __init s5p_register_clocks(unsigned long xtal_freq)
-{
-        int ret;
-
-        clk_ext_xtal_mux.rate = xtal_freq;
-
-        ret = s3c24xx_register_clocks(s5p_clks, ARRAY_SIZE(s5p_clks));
-        if (ret > 0)
-                printk(KERN_ERR "Failed to register s5p clocks\n");
-}
diff --git a/arch/arm/plat-samsung/s5p-dev-mfc.c b/arch/arm/plat-samsung/s5p-dev-mfc.c
index 469b86260fe3..0b04b6b0fa30 100644
--- a/arch/arm/plat-samsung/s5p-dev-mfc.c
+++ b/arch/arm/plat-samsung/s5p-dev-mfc.c
@@ -17,56 +17,16 @@
 #include <linux/of_fdt.h>
 #include <linux/of.h>
 
-#include <plat/mfc.h>
-
-#ifdef CONFIG_SAMSUNG_ATAGS
-#include <mach/map.h>
-#include <mach/irqs.h>
-#include <plat/devs.h>
-
-static struct resource s5p_mfc_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_MFC, SZ_64K),
-        [1] = DEFINE_RES_IRQ(IRQ_MFC),
-};
-
-struct platform_device s5p_device_mfc = {
-        .name           = "s5p-mfc",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(s5p_mfc_resource),
-        .resource       = s5p_mfc_resource,
-};
-
-/*
- * MFC hardware has 2 memory interfaces which are modelled as two separate
- * platform devices to let dma-mapping distinguish between them.
- *
- * MFC parent device (s5p_device_mfc) must be registered before memory
- * interface specific devices (s5p_device_mfc_l and s5p_device_mfc_r).
- */
-
-struct platform_device s5p_device_mfc_l = {
-        .name           = "s5p-mfc-l",
-        .id             = -1,
-        .dev            = {
-                .parent                 = &s5p_device_mfc.dev,
-                .dma_mask               = &s5p_device_mfc_l.dev.coherent_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-
-struct platform_device s5p_device_mfc_r = {
-        .name           = "s5p-mfc-r",
-        .id             = -1,
-        .dev            = {
-                .parent                 = &s5p_device_mfc.dev,
-                .dma_mask               = &s5p_device_mfc_r.dev.coherent_dma_mask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-#else
 static struct platform_device s5p_device_mfc_l;
 static struct platform_device s5p_device_mfc_r;
-#endif
+
+struct s5p_mfc_dt_meminfo {
+        unsigned long   loff;
+        unsigned long   lsize;
+        unsigned long   roff;
+        unsigned long   rsize;
+        char            *compatible;
+};
 
 struct s5p_mfc_reserved_mem {
         phys_addr_t     base;
@@ -77,7 +37,7 @@ struct s5p_mfc_reserved_mem {
 static struct s5p_mfc_reserved_mem s5p_mfc_mem[2] __initdata;
 
 
-void __init s5p_mfc_reserve_mem(phys_addr_t rbase, unsigned int rsize,
+static void __init s5p_mfc_reserve_mem(phys_addr_t rbase, unsigned int rsize,
                                 phys_addr_t lbase, unsigned int lsize)
 {
         int i;
@@ -100,28 +60,6 @@ void __init s5p_mfc_reserve_mem(phys_addr_t rbase, unsigned int rsize,
         }
 }
 
-#ifdef CONFIG_SAMSUNG_ATAGS
-static int __init s5p_mfc_memory_init(void)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(s5p_mfc_mem); i++) {
-                struct s5p_mfc_reserved_mem *area = &s5p_mfc_mem[i];
-                if (!area->base)
-                        continue;
-
-                if (dma_declare_coherent_memory(area->dev, area->base,
-                                area->base, area->size,
-                                DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE) == 0)
-                        printk(KERN_ERR "Failed to declare coherent memory for MFC device (%ld bytes at 0x%08lx)\n",
-                               area->size, (unsigned long) area->base);
-        }
-        return 0;
-}
-device_initcall(s5p_mfc_memory_init);
-#endif
-
-#ifdef CONFIG_OF
 int __init s5p_fdt_alloc_mfc_mem(unsigned long node, const char *uname,
                                 int depth, void *data)
 {
@@ -154,4 +92,3 @@ int __init s5p_fdt_alloc_mfc_mem(unsigned long node, const char *uname,
 
         return 1;
 }
-#endif
diff --git a/arch/arm/plat-samsung/s5p-dev-uart.c b/arch/arm/plat-samsung/s5p-dev-uart.c
deleted file mode 100644
index 8c4487af98c8..000000000000
--- a/arch/arm/plat-samsung/s5p-dev-uart.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2009,2012 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Base S5P UART resource and device definitions
- *
- * 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/types.h>
-#include <linux/interrupt.h>
-#include <linux/list.h>
-#include <linux/ioport.h>
-#include <linux/platform_device.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/irq.h>
-#include <mach/map.h>
-
-#include <plat/devs.h>
-
- /* Serial port registrations */
-
-static struct resource s5p_uart0_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_UART0, S5P_SZ_UART),
-        [1] = DEFINE_RES_IRQ(IRQ_UART0),
-};
-
-static struct resource s5p_uart1_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_UART1, S5P_SZ_UART),
-        [1] = DEFINE_RES_IRQ(IRQ_UART1),
-};
-
-static struct resource s5p_uart2_resource[] = {
-        [0] = DEFINE_RES_MEM(S5P_PA_UART2, S5P_SZ_UART),
-        [1] = DEFINE_RES_IRQ(IRQ_UART2),
-};
-
-static struct resource s5p_uart3_resource[] = {
-#if CONFIG_SERIAL_SAMSUNG_UARTS > 3
-        [0] = DEFINE_RES_MEM(S5P_PA_UART3, S5P_SZ_UART),
-        [1] = DEFINE_RES_IRQ(IRQ_UART3),
-#endif
-};
-
-static struct resource s5p_uart4_resource[] = {
-#if CONFIG_SERIAL_SAMSUNG_UARTS > 4
-        [0] = DEFINE_RES_MEM(S5P_PA_UART4, S5P_SZ_UART),
-        [1] = DEFINE_RES_IRQ(IRQ_UART4),
-#endif
-};
-
-static struct resource s5p_uart5_resource[] = {
-#if CONFIG_SERIAL_SAMSUNG_UARTS > 5
-        [0] = DEFINE_RES_MEM(S5P_PA_UART5, S5P_SZ_UART),
-        [1] = DEFINE_RES_IRQ(IRQ_UART5),
-#endif
-};
-
-struct s3c24xx_uart_resources s5p_uart_resources[] __initdata = {
-        [0] = {
-                .resources      = s5p_uart0_resource,
-                .nr_resources   = ARRAY_SIZE(s5p_uart0_resource),
-        },
-        [1] = {
-                .resources      = s5p_uart1_resource,
-                .nr_resources   = ARRAY_SIZE(s5p_uart1_resource),
-        },
-        [2] = {
-                .resources      = s5p_uart2_resource,
-                .nr_resources   = ARRAY_SIZE(s5p_uart2_resource),
-        },
-        [3] = {
-                .resources      = s5p_uart3_resource,
-                .nr_resources   = ARRAY_SIZE(s5p_uart3_resource),
-        },
-        [4] = {
-                .resources      = s5p_uart4_resource,
-                .nr_resources   = ARRAY_SIZE(s5p_uart4_resource),
-        },
-        [5] = {
-                .resources      = s5p_uart5_resource,
-                .nr_resources   = ARRAY_SIZE(s5p_uart5_resource),
-        },
-};
diff --git a/arch/arm/plat-samsung/s5p-irq-eint.c b/arch/arm/plat-samsung/s5p-irq-eint.c
deleted file mode 100644
index ebee4dc11a94..000000000000
--- a/arch/arm/plat-samsung/s5p-irq-eint.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P - IRQ EINT 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.
-*/
-
-#include <linux/kernel.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <linux/device.h>
-#include <linux/gpio.h>
-#include <linux/irqchip/arm-vic.h>
-#include <linux/of.h>
-
-#include <plat/regs-irqtype.h>
-
-#include <mach/map.h>
-#include <plat/cpu.h>
-#include <plat/pm.h>
-
-#include <plat/gpio-cfg.h>
-#include <mach/regs-gpio.h>
-
-static inline void s5p_irq_eint_mask(struct irq_data *data)
-{
-        u32 mask;
-
-        mask = __raw_readl(S5P_EINT_MASK(EINT_REG_NR(data->irq)));
-        mask |= eint_irq_to_bit(data->irq);
-        __raw_writel(mask, S5P_EINT_MASK(EINT_REG_NR(data->irq)));
-}
-
-static void s5p_irq_eint_unmask(struct irq_data *data)
-{
-        u32 mask;
-
-        mask = __raw_readl(S5P_EINT_MASK(EINT_REG_NR(data->irq)));
-        mask &= ~(eint_irq_to_bit(data->irq));
-        __raw_writel(mask, S5P_EINT_MASK(EINT_REG_NR(data->irq)));
-}
-
-static inline void s5p_irq_eint_ack(struct irq_data *data)
-{
-        __raw_writel(eint_irq_to_bit(data->irq),
-                     S5P_EINT_PEND(EINT_REG_NR(data->irq)));
-}
-
-static void s5p_irq_eint_maskack(struct irq_data *data)
-{
-        /* compiler should in-line these */
-        s5p_irq_eint_mask(data);
-        s5p_irq_eint_ack(data);
-}
-
-static int s5p_irq_eint_set_type(struct irq_data *data, unsigned int type)
-{
-        int offs = EINT_OFFSET(data->irq);
-        int shift;
-        u32 ctrl, mask;
-        u32 newvalue = 0;
-
-        switch (type) {
-        case IRQ_TYPE_EDGE_RISING:
-                newvalue = S5P_IRQ_TYPE_EDGE_RISING;
-                break;
-
-        case IRQ_TYPE_EDGE_FALLING:
-                newvalue = S5P_IRQ_TYPE_EDGE_FALLING;
-                break;
-
-        case IRQ_TYPE_EDGE_BOTH:
-                newvalue = S5P_IRQ_TYPE_EDGE_BOTH;
-                break;
-
-        case IRQ_TYPE_LEVEL_LOW:
-                newvalue = S5P_IRQ_TYPE_LEVEL_LOW;
-                break;
-
-        case IRQ_TYPE_LEVEL_HIGH:
-                newvalue = S5P_IRQ_TYPE_LEVEL_HIGH;
-                break;
-
-        default:
-                printk(KERN_ERR "No such irq type %d", type);
-                return -EINVAL;
-        }
-
-        shift = (offs & 0x7) * 4;
-        mask = 0x7 << shift;
-
-        ctrl = __raw_readl(S5P_EINT_CON(EINT_REG_NR(data->irq)));
-        ctrl &= ~mask;
-        ctrl |= newvalue << shift;
-        __raw_writel(ctrl, S5P_EINT_CON(EINT_REG_NR(data->irq)));
-
-        if ((0 <= offs) && (offs < 8))
-                s3c_gpio_cfgpin(EINT_GPIO_0(offs & 0x7), EINT_MODE);
-
-        else if ((8 <= offs) && (offs < 16))
-                s3c_gpio_cfgpin(EINT_GPIO_1(offs & 0x7), EINT_MODE);
-
-        else if ((16 <= offs) && (offs < 24))
-                s3c_gpio_cfgpin(EINT_GPIO_2(offs & 0x7), EINT_MODE);
-
-        else if ((24 <= offs) && (offs < 32))
-                s3c_gpio_cfgpin(EINT_GPIO_3(offs & 0x7), EINT_MODE);
-
-        else
-                printk(KERN_ERR "No such irq number %d", offs);
-
-        return 0;
-}
-
-static struct irq_chip s5p_irq_eint = {
-        .name           = "s5p-eint",
-        .irq_mask       = s5p_irq_eint_mask,
-        .irq_unmask     = s5p_irq_eint_unmask,
-        .irq_mask_ack   = s5p_irq_eint_maskack,
-        .irq_ack        = s5p_irq_eint_ack,
-        .irq_set_type   = s5p_irq_eint_set_type,
-#ifdef CONFIG_PM
-        .irq_set_wake   = s3c_irqext_wake,
-#endif
-};
-
-/* s5p_irq_demux_eint
- *
- * This function demuxes the IRQ from the group0 external interrupts,
- * from EINTs 16 to 31. It is designed to be inlined into the specific
- * handler s5p_irq_demux_eintX_Y.
- *
- * Each EINT pend/mask registers handle eight of them.
- */
-static inline void s5p_irq_demux_eint(unsigned int start)
-{
-        u32 status = __raw_readl(S5P_EINT_PEND(EINT_REG_NR(start)));
-        u32 mask = __raw_readl(S5P_EINT_MASK(EINT_REG_NR(start)));
-        unsigned int irq;
-
-        status &= ~mask;
-        status &= 0xff;
-
-        while (status) {
-                irq = fls(status) - 1;
-                generic_handle_irq(irq + start);
-                status &= ~(1 << irq);
-        }
-}
-
-static void s5p_irq_demux_eint16_31(unsigned int irq, struct irq_desc *desc)
-{
-        s5p_irq_demux_eint(IRQ_EINT(16));
-        s5p_irq_demux_eint(IRQ_EINT(24));
-}
-
-static inline void s5p_irq_vic_eint_mask(struct irq_data *data)
-{
-        void __iomem *base = irq_data_get_irq_chip_data(data);
-
-        s5p_irq_eint_mask(data);
-        writel(1 << EINT_OFFSET(data->irq), base + VIC_INT_ENABLE_CLEAR);
-}
-
-static void s5p_irq_vic_eint_unmask(struct irq_data *data)
-{
-        void __iomem *base = irq_data_get_irq_chip_data(data);
-
-        s5p_irq_eint_unmask(data);
-        writel(1 << EINT_OFFSET(data->irq), base + VIC_INT_ENABLE);
-}
-
-static inline void s5p_irq_vic_eint_ack(struct irq_data *data)
-{
-        __raw_writel(eint_irq_to_bit(data->irq),
-                     S5P_EINT_PEND(EINT_REG_NR(data->irq)));
-}
-
-static void s5p_irq_vic_eint_maskack(struct irq_data *data)
-{
-        s5p_irq_vic_eint_mask(data);
-        s5p_irq_vic_eint_ack(data);
-}
-
-static struct irq_chip s5p_irq_vic_eint = {
-        .name           = "s5p_vic_eint",
-        .irq_mask       = s5p_irq_vic_eint_mask,
-        .irq_unmask     = s5p_irq_vic_eint_unmask,
-        .irq_mask_ack   = s5p_irq_vic_eint_maskack,
-        .irq_ack        = s5p_irq_vic_eint_ack,
-        .irq_set_type   = s5p_irq_eint_set_type,
-#ifdef CONFIG_PM
-        .irq_set_wake   = s3c_irqext_wake,
-#endif
-};
-
-static int __init s5p_init_irq_eint(void)
-{
-        int irq;
-
-        if (of_have_populated_dt())
-                return -ENODEV;
-
-        for (irq = IRQ_EINT(0); irq <= IRQ_EINT(15); irq++)
-                irq_set_chip(irq, &s5p_irq_vic_eint);
-
-        for (irq = IRQ_EINT(16); irq <= IRQ_EINT(31); irq++) {
-                irq_set_chip_and_handler(irq, &s5p_irq_eint, handle_level_irq);
-                set_irq_flags(irq, IRQF_VALID);
-        }
-
-        irq_set_chained_handler(IRQ_EINT16_31, s5p_irq_demux_eint16_31);
-        return 0;
-}
-
-arch_initcall(s5p_init_irq_eint);
diff --git a/arch/arm/plat-samsung/s5p-irq-gpioint.c b/arch/arm/plat-samsung/s5p-irq-gpioint.c
deleted file mode 100644
index fafdb059043a..000000000000
--- a/arch/arm/plat-samsung/s5p-irq-gpioint.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- * Author: Kyungmin Park <kyungmin.park@samsung.com>
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- * Author: Marek Szyprowski <m.szyprowski@samsung.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/interrupt.h>
-#include <linux/irq.h>
-#include <linux/irqchip/chained_irq.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <linux/slab.h>
-
-#include <mach/map.h>
-#include <plat/gpio-core.h>
-#include <plat/gpio-cfg.h>
-
-#define GPIO_BASE(chip)         ((void __iomem *)((unsigned long)((chip)->base) & 0xFFFFF000u))
-
-#define CON_OFFSET              0x700
-#define MASK_OFFSET             0x900
-#define PEND_OFFSET             0xA00
-#define REG_OFFSET(x)           ((x) << 2)
-
-struct s5p_gpioint_bank {
-        struct list_head        list;
-        int                     start;
-        int                     nr_groups;
-        int                     irq;
-        struct samsung_gpio_chip        **chips;
-        void                    (*handler)(unsigned int, struct irq_desc *);
-};
-
-static LIST_HEAD(banks);
-
-static int s5p_gpioint_set_type(struct irq_data *d, unsigned int type)
-{
-        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
-        struct irq_chip_type *ct = gc->chip_types;
-        unsigned int shift = (d->irq - gc->irq_base) << 2;
-
-        switch (type) {
-        case IRQ_TYPE_EDGE_RISING:
-                type = S5P_IRQ_TYPE_EDGE_RISING;
-                break;
-        case IRQ_TYPE_EDGE_FALLING:
-                type = S5P_IRQ_TYPE_EDGE_FALLING;
-                break;
-        case IRQ_TYPE_EDGE_BOTH:
-                type = S5P_IRQ_TYPE_EDGE_BOTH;
-                break;
-        case IRQ_TYPE_LEVEL_HIGH:
-                type = S5P_IRQ_TYPE_LEVEL_HIGH;
-                break;
-        case IRQ_TYPE_LEVEL_LOW:
-                type = S5P_IRQ_TYPE_LEVEL_LOW;
-                break;
-        case IRQ_TYPE_NONE:
-        default:
-                printk(KERN_WARNING "No irq type\n");
-                return -EINVAL;
-        }
-
-        gc->type_cache &= ~(0x7 << shift);
-        gc->type_cache |= type << shift;
-        writel(gc->type_cache, gc->reg_base + ct->regs.type);
-        return 0;
-}
-
-static void s5p_gpioint_handler(unsigned int irq, struct irq_desc *desc)
-{
-        struct s5p_gpioint_bank *bank = irq_get_handler_data(irq);
-        int group, pend_offset, mask_offset;
-        unsigned int pend, mask;
-
-        struct irq_chip *chip = irq_get_chip(irq);
-        chained_irq_enter(chip, desc);
-
-        for (group = 0; group < bank->nr_groups; group++) {
-                struct samsung_gpio_chip *chip = bank->chips[group];
-                if (!chip)
-                        continue;
-
-                pend_offset = REG_OFFSET(group);
-                pend = __raw_readl(GPIO_BASE(chip) + PEND_OFFSET + pend_offset);
-                if (!pend)
-                        continue;
-
-                mask_offset = REG_OFFSET(group);
-                mask = __raw_readl(GPIO_BASE(chip) + MASK_OFFSET + mask_offset);
-                pend &= ~mask;
-
-                while (pend) {
-                        int offset = fls(pend) - 1;
-                        int real_irq = chip->irq_base + offset;
-                        generic_handle_irq(real_irq);
-                        pend &= ~BIT(offset);
-                }
-        }
-        chained_irq_exit(chip, desc);
-}
-
-static __init int s5p_gpioint_add(struct samsung_gpio_chip *chip)
-{
-        static int used_gpioint_groups = 0;
-        int group = chip->group;
-        struct s5p_gpioint_bank *b, *bank = NULL;
-        struct irq_chip_generic *gc;
-        struct irq_chip_type *ct;
-
-        if (used_gpioint_groups >= S5P_GPIOINT_GROUP_COUNT)
-                return -ENOMEM;
-
-        list_for_each_entry(b, &banks, list) {
-                if (group >= b->start && group < b->start + b->nr_groups) {
-                        bank = b;
-                        break;
-                }
-        }
-        if (!bank)
-                return -EINVAL;
-
-        if (!bank->handler) {
-                bank->chips = kzalloc(sizeof(struct samsung_gpio_chip *) *
-                                      bank->nr_groups, GFP_KERNEL);
-                if (!bank->chips)
-                        return -ENOMEM;
-
-                irq_set_chained_handler(bank->irq, s5p_gpioint_handler);
-                irq_set_handler_data(bank->irq, bank);
-                bank->handler = s5p_gpioint_handler;
-                printk(KERN_INFO "Registered chained gpio int handler for interrupt %d.\n",
-                       bank->irq);
-        }
-
-        /*
-         * chained GPIO irq has been successfully registered, allocate new gpio
-         * int group and assign irq nubmers
-         */
-        chip->irq_base = S5P_GPIOINT_BASE +
-                         used_gpioint_groups * S5P_GPIOINT_GROUP_SIZE;
-        used_gpioint_groups++;
-
-        bank->chips[group - bank->start] = chip;
-
-        gc = irq_alloc_generic_chip("s5p_gpioint", 1, chip->irq_base,
-                                    GPIO_BASE(chip),
-                                    handle_level_irq);
-        if (!gc)
-                return -ENOMEM;
-        ct = gc->chip_types;
-        ct->chip.irq_ack = irq_gc_ack_set_bit;
-        ct->chip.irq_mask = irq_gc_mask_set_bit;
-        ct->chip.irq_unmask = irq_gc_mask_clr_bit;
-        ct->chip.irq_set_type = s5p_gpioint_set_type,
-        ct->regs.ack = PEND_OFFSET + REG_OFFSET(group - bank->start);
-        ct->regs.mask = MASK_OFFSET + REG_OFFSET(group - bank->start);
-        ct->regs.type = CON_OFFSET + REG_OFFSET(group - bank->start);
-        irq_setup_generic_chip(gc, IRQ_MSK(chip->chip.ngpio),
-                               IRQ_GC_INIT_MASK_CACHE,
-                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
-        return 0;
-}
-
-int __init s5p_register_gpio_interrupt(int pin)
-{
-        struct samsung_gpio_chip *my_chip = samsung_gpiolib_getchip(pin);
-        int offset, group;
-        int ret;
-
-        if (!my_chip)
-                return -EINVAL;
-
-        offset = pin - my_chip->chip.base;
-        group = my_chip->group;
-
-        /* check if the group has been already registered */
-        if (my_chip->irq_base)
-                goto success;
-
-        /* register gpio group */
-        ret = s5p_gpioint_add(my_chip);
-        if (ret == 0) {
-                my_chip->chip.to_irq = samsung_gpiolib_to_irq;
-                printk(KERN_INFO "Registered interrupt support for gpio group %d.\n",
-                       group);
-                goto success;
-        }
-        return ret;
-success:
-        my_chip->bitmap_gpio_int |= BIT(offset);
-
-        return my_chip->irq_base + offset;
-}
-
-int __init s5p_register_gpioint_bank(int chain_irq, int start, int nr_groups)
-{
-        struct s5p_gpioint_bank *bank;
-
-        bank = kzalloc(sizeof(*bank), GFP_KERNEL);
-        if (!bank)
-                return -ENOMEM;
-
-        bank->start = start;
-        bank->nr_groups = nr_groups;
-        bank->irq = chain_irq;
-
-        list_add_tail(&bank->list, &banks);
-        return 0;
-}
diff --git a/arch/arm/plat-samsung/s5p-irq-pm.c b/arch/arm/plat-samsung/s5p-irq-pm.c
deleted file mode 100644
index 52b16943617e..000000000000
--- a/arch/arm/plat-samsung/s5p-irq-pm.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Based on arch/arm/plat-s3c24xx/irq-pm.c,
- * Copyright (c) 2003,2004 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * 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/module.h>
-#include <linux/interrupt.h>
-
-#include <plat/cpu.h>
-#include <plat/irqs.h>
-#include <plat/pm.h>
-#include <mach/map.h>
-
-#include <mach/regs-gpio.h>
-#include <mach/regs-irq.h>
-
-/* state for IRQs over sleep */
-
-/* default is to allow for EINT0..EINT31, and IRQ_RTC_TIC, IRQ_RTC_ALARM,
- * as wakeup sources
- *
- * set bit to 1 in allow bitfield to enable the wakeup settings on it
-*/
-
-unsigned long s3c_irqwake_intallow      = 0x00000006L;
-unsigned long s3c_irqwake_eintallow     = 0xffffffffL;
-
-int s3c_irq_wake(struct irq_data *data, unsigned int state)
-{
-        unsigned long irqbit;
-        unsigned int irq_rtc_tic, irq_rtc_alarm;
-
-        irq_rtc_tic = IRQ_RTC_TIC;
-        irq_rtc_alarm = IRQ_RTC_ALARM;
-
-        if (data->irq == irq_rtc_tic || data->irq == irq_rtc_alarm) {
-                irqbit = 1 << (data->irq + 1 - irq_rtc_alarm);
-
-                if (!state)
-                        s3c_irqwake_intmask |= irqbit;
-                else
-                        s3c_irqwake_intmask &= ~irqbit;
-        } else {
-                return -ENOENT;
-        }
-
-        return 0;
-}
-
-static struct sleep_save eint_save[] = {
-        SAVE_ITEM(S5P_EINT_CON(0)),
-        SAVE_ITEM(S5P_EINT_CON(1)),
-        SAVE_ITEM(S5P_EINT_CON(2)),
-        SAVE_ITEM(S5P_EINT_CON(3)),
-
-        SAVE_ITEM(S5P_EINT_FLTCON(0)),
-        SAVE_ITEM(S5P_EINT_FLTCON(1)),
-        SAVE_ITEM(S5P_EINT_FLTCON(2)),
-        SAVE_ITEM(S5P_EINT_FLTCON(3)),
-        SAVE_ITEM(S5P_EINT_FLTCON(4)),
-        SAVE_ITEM(S5P_EINT_FLTCON(5)),
-        SAVE_ITEM(S5P_EINT_FLTCON(6)),
-        SAVE_ITEM(S5P_EINT_FLTCON(7)),
-
-        SAVE_ITEM(S5P_EINT_MASK(0)),
-        SAVE_ITEM(S5P_EINT_MASK(1)),
-        SAVE_ITEM(S5P_EINT_MASK(2)),
-        SAVE_ITEM(S5P_EINT_MASK(3)),
-};
-
-int s3c24xx_irq_suspend(void)
-{
-        s3c_pm_do_save(eint_save, ARRAY_SIZE(eint_save));
-
-        return 0;
-}
-
-void s3c24xx_irq_resume(void)
-{
-        s3c_pm_do_restore(eint_save, ARRAY_SIZE(eint_save));
-}
-
diff --git a/arch/arm/plat-samsung/s5p-irq.c b/arch/arm/plat-samsung/s5p-irq.c
deleted file mode 100644
index ddfaca9c79d8..000000000000
--- a/arch/arm/plat-samsung/s5p-irq.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2009 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5P - 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/io.h>
-#include <linux/irqchip/arm-vic.h>
-
-#include <mach/irqs.h>
-#include <mach/map.h>
-#include <plat/cpu.h>
-
-void __init s5p_init_irq(u32 *vic, u32 num_vic)
-{
-#ifdef CONFIG_ARM_VIC
-        int irq;
-
-        /* initialize the VICs */
-        for (irq = 0; irq < num_vic; irq++)
-                vic_init(VA_VIC(irq), VIC_BASE(irq), vic[irq], 0);
-#endif
-}
diff --git a/arch/arm/plat-samsung/s5p-pm.c b/arch/arm/plat-samsung/s5p-pm.c
deleted file mode 100644
index 0747468f0936..000000000000
--- a/arch/arm/plat-samsung/s5p-pm.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * S5P Power Manager (Suspend-To-RAM) support
- *
- * Based on arch/arm/plat-s3c24xx/pm.c
- * Copyright (c) 2004,2006 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * 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/suspend.h>
-#include <plat/pm.h>
-
-#define PFX "s5p pm: "
-
-/* s3c_pm_configure_extint
- *
- * configure all external interrupt pins
-*/
-
-void s3c_pm_configure_extint(void)
-{
-        /* nothing here yet */
-}
-
-void s3c_pm_restore_core(void)
-{
-        /* nothing here yet */
-}
-
-void s3c_pm_save_core(void)
-{
-        /* nothing here yet */
-}
-
diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
index fce41e93b6a4..a301ca2c7d00 100644
--- a/arch/arm/plat-versatile/Kconfig
+++ b/arch/arm/plat-versatile/Kconfig
@@ -3,9 +3,6 @@ if PLAT_VERSATILE
 config PLAT_VERSATILE_CLOCK
         bool
 
-config PLAT_VERSATILE_CLCD
-        bool
-
 config PLAT_VERSATILE_SCHED_CLOCK
         def_bool y
 
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile
index 2e0c472958ae..03c4900ac3f4 100644
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@ -1,6 +1,5 @@
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
 
 obj-$(CONFIG_PLAT_VERSATILE_CLOCK) += clock.o
-obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o
 obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o
 obj-$(CONFIG_SMP) += headsmp.o platsmp.o
diff --git a/arch/arm/plat-versatile/clcd.c b/arch/arm/plat-versatile/clcd.c
deleted file mode 100644
index 6628cc27efc5..000000000000
--- a/arch/arm/plat-versatile/clcd.c
+++ /dev/null
@@ -1,182 +0,0 @@
-#include <linux/device.h>
-#include <linux/dma-mapping.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/clcd.h>
-#include <plat/clcd.h>
-
-static struct clcd_panel vga = {
-        .mode           = {
-                .name           = "VGA",
-                .refresh        = 60,
-                .xres           = 640,
-                .yres           = 480,
-                .pixclock       = 39721,
-                .left_margin    = 40,
-                .right_margin   = 24,
-                .upper_margin   = 32,
-                .lower_margin   = 11,
-                .hsync_len      = 96,
-                .vsync_len      = 2,
-                .sync           = 0,
-                .vmode          = FB_VMODE_NONINTERLACED,
-        },
-        .width          = -1,
-        .height         = -1,
-        .tim2           = TIM2_BCD | TIM2_IPC,
-        .cntl           = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
-        .caps           = CLCD_CAP_5551 | CLCD_CAP_565 | CLCD_CAP_888,
-        .bpp            = 16,
-};
-
-static struct clcd_panel xvga = {
-        .mode           = {
-                .name           = "XVGA",
-                .refresh        = 60,
-                .xres           = 1024,
-                .yres           = 768,
-                .pixclock       = 15748,
-                .left_margin    = 152,
-                .right_margin   = 48,
-                .upper_margin   = 23,
-                .lower_margin   = 3,
-                .hsync_len      = 104,
-                .vsync_len      = 4,
-                .sync           = 0,
-                .vmode          = FB_VMODE_NONINTERLACED,
-        },
-        .width          = -1,
-        .height         = -1,
-        .tim2           = TIM2_BCD | TIM2_IPC,
-        .cntl           = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
-        .caps           = CLCD_CAP_5551 | CLCD_CAP_565 | CLCD_CAP_888,
-        .bpp            = 16,
-};
-
-/* Sanyo TM38QV67A02A - 3.8 inch QVGA (320x240) Color TFT */
-static struct clcd_panel sanyo_tm38qv67a02a = {
-        .mode           = {
-                .name           = "Sanyo TM38QV67A02A",
-                .refresh        = 116,
-                .xres           = 320,
-                .yres           = 240,
-                .pixclock       = 100000,
-                .left_margin    = 6,
-                .right_margin   = 6,
-                .upper_margin   = 5,
-                .lower_margin   = 5,
-                .hsync_len      = 6,
-                .vsync_len      = 6,
-                .sync           = 0,
-                .vmode          = FB_VMODE_NONINTERLACED,
-        },
-        .width          = -1,
-        .height         = -1,
-        .tim2           = TIM2_BCD,
-        .cntl           = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
-        .caps           = CLCD_CAP_5551,
-        .bpp            = 16,
-};
-
-static struct clcd_panel sanyo_2_5_in = {
-        .mode           = {
-                .name           = "Sanyo QVGA Portrait",
-                .refresh        = 116,
-                .xres           = 240,
-                .yres           = 320,
-                .pixclock       = 100000,
-                .left_margin    = 20,
-                .right_margin   = 10,
-                .upper_margin   = 2,
-                .lower_margin   = 2,
-                .hsync_len      = 10,
-                .vsync_len      = 2,
-                .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-                .vmode          = FB_VMODE_NONINTERLACED,
-        },
-        .width          = -1,
-        .height         = -1,
-        .tim2           = TIM2_IVS | TIM2_IHS | TIM2_IPC,
-        .cntl           = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
-        .caps           = CLCD_CAP_5551,
-        .bpp            = 16,
-};
-
-/* Epson L2F50113T00 - 2.2 inch 176x220 Color TFT */
-static struct clcd_panel epson_l2f50113t00 = {
-        .mode           = {
-                .name           = "Epson L2F50113T00",
-                .refresh        = 390,
-                .xres           = 176,
-                .yres           = 220,
-                .pixclock       = 62500,
-                .left_margin    = 3,
-                .right_margin   = 2,
-                .upper_margin   = 1,
-                .lower_margin   = 0,
-                .hsync_len      = 3,
-                .vsync_len      = 2,
-                .sync           = 0,
-                .vmode          = FB_VMODE_NONINTERLACED,
-        },
-        .width          = -1,
-        .height         = -1,
-        .tim2           = TIM2_BCD | TIM2_IPC,
-        .cntl           = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
-        .caps           = CLCD_CAP_5551,
-        .bpp            = 16,
-};
-
-static struct clcd_panel *panels[] = {
-        &vga,
-        &xvga,
-        &sanyo_tm38qv67a02a,
-        &sanyo_2_5_in,
-        &epson_l2f50113t00,
-};
-
-struct clcd_panel *versatile_clcd_get_panel(const char *name)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(panels); i++)
-                if (strcmp(panels[i]->mode.name, name) == 0)
-                        break;
-
-        if (i < ARRAY_SIZE(panels))
-                return panels[i];
-
-        pr_err("CLCD: couldn't get parameters for panel %s\n", name);
-
-        return NULL;
-}
-
-int versatile_clcd_setup_dma(struct clcd_fb *fb, unsigned long framesize)
-{
-        dma_addr_t dma;
-
-        fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev, framesize,
-                                                    &dma, GFP_KERNEL);
-        if (!fb->fb.screen_base) {
-                pr_err("CLCD: unable to map framebuffer\n");
-                return -ENOMEM;
-        }
-
-        fb->fb.fix.smem_start   = dma;
-        fb->fb.fix.smem_len     = framesize;
-
-        return 0;
-}
-
-int versatile_clcd_mmap_dma(struct clcd_fb *fb, struct vm_area_struct *vma)
-{
-        return dma_mmap_writecombine(&fb->dev->dev, vma,
-                                     fb->fb.screen_base,
-                                     fb->fb.fix.smem_start,
-                                     fb->fb.fix.smem_len);
-}
-
-void versatile_clcd_remove_dma(struct clcd_fb *fb)
-{
-        dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,
-                              fb->fb.screen_base, fb->fb.fix.smem_start);
-}
diff --git a/arch/arm/plat-versatile/include/plat/clcd.h b/arch/arm/plat-versatile/include/plat/clcd.h
deleted file mode 100644
index 6bb6a1d2019b..000000000000
--- a/arch/arm/plat-versatile/include/plat/clcd.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef PLAT_CLCD_H
-#define PLAT_CLCD_H
-
-struct clcd_panel *versatile_clcd_get_panel(const char *);
-int versatile_clcd_setup_dma(struct clcd_fb *, unsigned long);
-int versatile_clcd_mmap_dma(struct clcd_fb *, struct vm_area_struct *);
-void versatile_clcd_remove_dma(struct clcd_fb *);
-
-#endif
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index fe6ca574d093..2e78760f3495 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -34,7 +34,7 @@ ENDPROC(do_vfp)
 
 ENTRY(vfp_null_entry)
         dec_preempt_count_ti r10, r4
-        mov     pc, lr
+        ret     lr
 ENDPROC(vfp_null_entry)
 
         .align  2
@@ -49,7 +49,7 @@ ENTRY(vfp_testing_entry)
         dec_preempt_count_ti r10, r4
         ldr     r0, VFP_arch_address
         str     r0, [r0]                @ set to non-zero value
-        mov     pc, r9                  @ we have handled the fault
+        ret     r9                      @ we have handled the fault
 ENDPROC(vfp_testing_entry)
 
         .align  2
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index be807625ed8c..cda654cbf2c2 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -183,7 +183,7 @@ vfp_hw_state_valid:
                                         @ always subtract 4 from the following
                                         @ instruction address.
         dec_preempt_count_ti r10, r4
-        mov     pc, r9                  @ we think we have handled things
+        ret     r9                      @ we think we have handled things
 
 
 look_for_VFP_exceptions:
@@ -202,7 +202,7 @@ look_for_VFP_exceptions:
 
         DBGSTR  "not VFP"
         dec_preempt_count_ti r10, r4
-        mov     pc, lr
+        ret     lr
 
 process_exception:
         DBGSTR  "bounce"
@@ -234,7 +234,7 @@ ENTRY(vfp_save_state)
         VFPFMRX r12, FPINST2            @ FPINST2 if needed (and present)
 1:
         stmia   r0, {r1, r2, r3, r12}   @ save FPEXC, FPSCR, FPINST, FPINST2
-        mov     pc, lr
+        ret     lr
 ENDPROC(vfp_save_state)
 
         .align
@@ -245,7 +245,7 @@ vfp_current_hw_state_address:
 #ifdef CONFIG_THUMB2_KERNEL
         adr     \tmp, 1f
         add     \tmp, \tmp, \base, lsl \shift
-        mov     pc, \tmp
+        ret     \tmp
 #else
         add     pc, pc, \base, lsl \shift
         mov     r0, r0
@@ -257,10 +257,10 @@ ENTRY(vfp_get_float)
         tbl_branch r0, r3, #3
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
 1:      mrc     p10, 0, r0, c\dr, c0, 0 @ fmrs  r0, s0
-        mov     pc, lr
+        ret     lr
         .org    1b + 8
 1:      mrc     p10, 0, r0, c\dr, c0, 4 @ fmrs  r0, s1
-        mov     pc, lr
+        ret     lr
         .org    1b + 8
         .endr
 ENDPROC(vfp_get_float)
@@ -269,10 +269,10 @@ ENTRY(vfp_put_float)
         tbl_branch r1, r3, #3
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
 1:      mcr     p10, 0, r0, c\dr, c0, 0 @ fmsr  r0, s0
-        mov     pc, lr
+        ret     lr
         .org    1b + 8
 1:      mcr     p10, 0, r0, c\dr, c0, 4 @ fmsr  r0, s1
-        mov     pc, lr
+        ret     lr
         .org    1b + 8
         .endr
 ENDPROC(vfp_put_float)
@@ -281,14 +281,14 @@ ENTRY(vfp_get_double)
         tbl_branch r0, r3, #3
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
 1:      fmrrd   r0, r1, d\dr
-        mov     pc, lr
+        ret     lr
         .org    1b + 8
         .endr
 #ifdef CONFIG_VFPv3
         @ d16 - d31 registers
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
 1:      mrrc    p11, 3, r0, r1, c\dr    @ fmrrd r0, r1, d\dr
-        mov     pc, lr
+        ret     lr
         .org    1b + 8
         .endr
 #endif
@@ -296,21 +296,21 @@ ENTRY(vfp_get_double)
         @ virtual register 16 (or 32 if VFPv3) for compare with zero
         mov     r0, #0
         mov     r1, #0
-        mov     pc, lr
+        ret     lr
 ENDPROC(vfp_get_double)
 
 ENTRY(vfp_put_double)
         tbl_branch r2, r3, #3
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
 1:      fmdrr   d\dr, r0, r1
-        mov     pc, lr
+        ret     lr
         .org    1b + 8
         .endr
 #ifdef CONFIG_VFPv3
         @ d16 - d31 registers
         .irp    dr,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
 1:      mcrr    p11, 3, r0, r1, c\dr    @ fmdrr r0, r1, d\dr
-        mov     pc, lr
+        ret     lr
         .org    1b + 8
         .endr
 #endif
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 1e632430570b..98544c5f86e9 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -181,8 +181,7 @@ static void xen_restart(enum reboot_mode reboot_mode, const char *cmd)
         struct sched_shutdown r = { .reason = SHUTDOWN_reboot };
         int rc;
         rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
-        if (rc)
-                BUG();
+        BUG_ON(rc);
 }
 
 static void xen_power_off(void)
@@ -190,8 +189,7 @@ static void xen_power_off(void)
         struct sched_shutdown r = { .reason = SHUTDOWN_poweroff };
         int rc;
         rc = HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
-        if (rc)
-                BUG();
+        BUG_ON(rc);
 }
 
 static int xen_cpu_notification(struct notifier_block *self,
diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c
index 91cf08ba1e95..e43791829ace 100644
--- a/arch/arm/xen/grant-table.c
+++ b/arch/arm/xen/grant-table.c
@@ -45,14 +45,7 @@ void arch_gnttab_unmap(void *shared, unsigned long nr_gframes)
         return;
 }
 
-int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes,
-                           unsigned long max_nr_gframes,
-                           grant_status_t **__shared)
-{
-        return -ENOSYS;
-}
-
-int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)
+int arch_gnttab_init(unsigned long nr_shared)
 {
         return 0;
 }
diff --git a/arch/arm/xen/hypercall.S b/arch/arm/xen/hypercall.S
index 44e3a5f10c4c..f00e08075938 100644
--- a/arch/arm/xen/hypercall.S
+++ b/arch/arm/xen/hypercall.S
@@ -58,7 +58,7 @@
 ENTRY(HYPERVISOR_##hypercall)                   \
         mov r12, #__HYPERVISOR_##hypercall;     \
         __HVC(XEN_IMM);                                         \
-        mov pc, lr;                                                     \
+        ret lr;                                 \
 ENDPROC(HYPERVISOR_##hypercall)
 
 #define HYPERCALL0 HYPERCALL_SIMPLE
@@ -74,7 +74,7 @@ ENTRY(HYPERVISOR_##hypercall)			\
         mov r12, #__HYPERVISOR_##hypercall;     \
         __HVC(XEN_IMM);                                         \
         ldm sp!, {r4}                                           \
-        mov pc, lr                                                      \
+        ret lr                                  \
 ENDPROC(HYPERVISOR_##hypercall)
 
                 .text
@@ -101,5 +101,5 @@ ENTRY(privcmd_call)
         ldr r4, [sp, #4]
         __HVC(XEN_IMM)
         ldm sp!, {r4}
-        mov pc, lr
+        ret lr
 ENDPROC(privcmd_call);
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index b0f9c9db9590..fd4e81a4e1ce 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1,6 +1,7 @@
 config ARM64
         def_bool y
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+        select ARCH_HAS_SG_CHAIN
         select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
         select ARCH_USE_CMPXCHG_LOCKREF
         select ARCH_SUPPORTS_ATOMIC_RMW
diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts
index 6541962f5d70..b2f56229aa5e 100644
--- a/arch/arm64/boot/dts/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm-mustang.dts
@@ -28,3 +28,7 @@
 &serial0 {
         status = "ok";
 };
+
+&menet {
+        status = "ok";
+};
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
index 40aa96ce13c4..c0aceef7f5b3 100644
--- a/arch/arm64/boot/dts/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
@@ -167,14 +167,13 @@
                                 clock-output-names = "ethclk";
                         };
 
-                        eth8clk: eth8clk {
+                        menetclk: menetclk {
                                 compatible = "apm,xgene-device-clock";
                                 #clock-cells = <1>;
                                 clocks = <&ethclk 0>;
-                                clock-names = "eth8clk";
                                 reg = <0x0 0x1702C000 0x0 0x1000>;
                                 reg-names = "csr-reg";
-                                clock-output-names = "eth8clk";
+                                clock-output-names = "menetclk";
                         };
 
                         sataphy1clk: sataphy1clk@1f21c000 {
@@ -397,5 +396,30 @@
                         #clock-cells = <1>;
                         clocks = <&rtcclk 0>;
                 };
+
+                menet: ethernet@17020000 {
+                        compatible = "apm,xgene-enet";
+                        status = "disabled";
+                        reg = <0x0 0x17020000 0x0 0xd100>,
+                              <0x0 0X17030000 0x0 0X400>,
+                              <0x0 0X10000000 0x0 0X200>;
+                        reg-names = "enet_csr", "ring_csr", "ring_cmd";
+                        interrupts = <0x0 0x3c 0x4>;
+                        dma-coherent;
+                        clocks = <&menetclk 0>;
+                        local-mac-address = [00 01 73 00 00 01];
+                        phy-connection-type = "rgmii";
+                        phy-handle = <&menetphy>;
+                        mdio {
+                                compatible = "apm,xgene-mdio";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                menetphy: menetphy@3 {
+                                        compatible = "ethernet-phy-id001c.c915";
+                                        reg = <0x3>;
+                                };
+
+                        };
+                };
         };
 };
diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
index 6e9b5b36921c..7fb343779498 100644
--- a/arch/arm64/include/asm/debug-monitors.h
+++ b/arch/arm64/include/asm/debug-monitors.h
@@ -18,6 +18,15 @@
 
 #ifdef __KERNEL__
 
+/* Low-level stepping controls. */
+#define DBG_MDSCR_SS            (1 << 0)
+#define DBG_SPSR_SS             (1 << 21)
+
+/* MDSCR_EL1 enabling bits */
+#define DBG_MDSCR_KDE           (1 << 13)
+#define DBG_MDSCR_MDE           (1 << 15)
+#define DBG_MDSCR_MASK          ~(DBG_MDSCR_KDE | DBG_MDSCR_MDE)
+
 #define DBG_ESR_EVT(x)          (((x) >> 27) & 0x7)
 
 /* AArch64 */
@@ -73,11 +82,6 @@
 
 #define CACHE_FLUSH_IS_SAFE             1
 
-enum debug_el {
-        DBG_ACTIVE_EL0 = 0,
-        DBG_ACTIVE_EL1,
-};
-
 /* AArch32 */
 #define DBG_ESR_EVT_BKPT        0x4
 #define DBG_ESR_EVT_VECC        0x5
@@ -115,6 +119,11 @@ void unregister_break_hook(struct break_hook *hook);
 
 u8 debug_monitors_arch(void);
 
+enum debug_el {
+        DBG_ACTIVE_EL0 = 0,
+        DBG_ACTIVE_EL1,
+};
+
 void enable_debug_monitors(enum debug_el el);
 void disable_debug_monitors(enum debug_el el);
 
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index 3d6903006a8a..cc83520459ed 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -76,9 +76,10 @@
  */
 #define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \
                          HCR_TVM | HCR_BSU_IS | HCR_FB | HCR_TAC | \
-                         HCR_AMO | HCR_IMO | HCR_FMO | \
-                         HCR_SWIO | HCR_TIDCP | HCR_RW)
+                         HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW)
 #define HCR_VIRT_EXCP_MASK (HCR_VA | HCR_VI | HCR_VF)
+#define HCR_INT_OVERRIDE   (HCR_FMO | HCR_IMO)
+
 
 /* Hyp System Control Register (SCTLR_EL2) bits */
 #define SCTLR_EL2_EE    (1 << 25)
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h
index 9fcd54b1e16d..483842180f8f 100644
--- a/arch/arm64/include/asm/kvm_asm.h
+++ b/arch/arm64/include/asm/kvm_asm.h
@@ -18,6 +18,8 @@
 #ifndef __ARM_KVM_ASM_H__
 #define __ARM_KVM_ASM_H__
 
+#include <asm/virt.h>
+
 /*
  * 0 is reserved as an invalid value.
  * Order *must* be kept in sync with the hyp switch code.
@@ -43,14 +45,25 @@
 #define AMAIR_EL1       19      /* Aux Memory Attribute Indirection Register */
 #define CNTKCTL_EL1     20      /* Timer Control Register (EL1) */
 #define PAR_EL1         21      /* Physical Address Register */
+#define MDSCR_EL1       22      /* Monitor Debug System Control Register */
+#define DBGBCR0_EL1     23      /* Debug Breakpoint Control Registers (0-15) */
+#define DBGBCR15_EL1    38
+#define DBGBVR0_EL1     39      /* Debug Breakpoint Value Registers (0-15) */
+#define DBGBVR15_EL1    54
+#define DBGWCR0_EL1     55      /* Debug Watchpoint Control Registers (0-15) */
+#define DBGWCR15_EL1    70
+#define DBGWVR0_EL1     71      /* Debug Watchpoint Value Registers (0-15) */
+#define DBGWVR15_EL1    86
+#define MDCCINT_EL1     87      /* Monitor Debug Comms Channel Interrupt Enable Reg */
+
 /* 32bit specific registers. Keep them at the end of the range */
-#define DACR32_EL2      22      /* Domain Access Control Register */
-#define IFSR32_EL2      23      /* Instruction Fault Status Register */
-#define FPEXC32_EL2     24      /* Floating-Point Exception Control Register */
-#define DBGVCR32_EL2    25      /* Debug Vector Catch Register */
-#define TEECR32_EL1     26      /* ThumbEE Configuration Register */
-#define TEEHBR32_EL1    27      /* ThumbEE Handler Base Register */
-#define NR_SYS_REGS     28
+#define DACR32_EL2      88      /* Domain Access Control Register */
+#define IFSR32_EL2      89      /* Instruction Fault Status Register */
+#define FPEXC32_EL2     90      /* Floating-Point Exception Control Register */
+#define DBGVCR32_EL2    91      /* Debug Vector Catch Register */
+#define TEECR32_EL1     92      /* ThumbEE Configuration Register */
+#define TEEHBR32_EL1    93      /* ThumbEE Handler Base Register */
+#define NR_SYS_REGS     94
 
 /* 32bit mapping */
 #define c0_MPIDR        (MPIDR_EL1 * 2) /* MultiProcessor ID Register */
@@ -82,11 +95,23 @@
 #define c10_AMAIR0      (AMAIR_EL1 * 2) /* Aux Memory Attr Indirection Reg */
 #define c10_AMAIR1      (c10_AMAIR0 + 1)/* Aux Memory Attr Indirection Reg */
 #define c14_CNTKCTL     (CNTKCTL_EL1 * 2) /* Timer Control Register (PL1) */
-#define NR_CP15_REGS    (NR_SYS_REGS * 2)
+
+#define cp14_DBGDSCRext (MDSCR_EL1 * 2)
+#define cp14_DBGBCR0    (DBGBCR0_EL1 * 2)
+#define cp14_DBGBVR0    (DBGBVR0_EL1 * 2)
+#define cp14_DBGBXVR0   (cp14_DBGBVR0 + 1)
+#define cp14_DBGWCR0    (DBGWCR0_EL1 * 2)
+#define cp14_DBGWVR0    (DBGWVR0_EL1 * 2)
+#define cp14_DBGDCCINT  (MDCCINT_EL1 * 2)
+
+#define NR_COPRO_REGS   (NR_SYS_REGS * 2)
 
 #define ARM_EXCEPTION_IRQ         0
 #define ARM_EXCEPTION_TRAP        1
 
+#define KVM_ARM64_DEBUG_DIRTY_SHIFT     0
+#define KVM_ARM64_DEBUG_DIRTY           (1 << KVM_ARM64_DEBUG_DIRTY_SHIFT)
+
 #ifndef __ASSEMBLY__
 struct kvm;
 struct kvm_vcpu;
@@ -96,13 +121,21 @@ extern char __kvm_hyp_init_end[];
 
 extern char __kvm_hyp_vector[];
 
-extern char __kvm_hyp_code_start[];
-extern char __kvm_hyp_code_end[];
+#define __kvm_hyp_code_start    __hyp_text_start
+#define __kvm_hyp_code_end      __hyp_text_end
 
 extern void __kvm_flush_vm_context(void);
 extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa);
 
 extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);
+
+extern u64 __vgic_v3_get_ich_vtr_el2(void);
+
+extern char __save_vgic_v2_state[];
+extern char __restore_vgic_v2_state[];
+extern char __save_vgic_v3_state[];
+extern char __restore_vgic_v3_state[];
+
 #endif
 
 #endif /* __ARM_KVM_ASM_H__ */
diff --git a/arch/arm64/include/asm/kvm_coproc.h b/arch/arm64/include/asm/kvm_coproc.h
index 9a59301cd014..0b52377a6c11 100644
--- a/arch/arm64/include/asm/kvm_coproc.h
+++ b/arch/arm64/include/asm/kvm_coproc.h
@@ -39,7 +39,8 @@ void kvm_register_target_sys_reg_table(unsigned int target,
                                        struct kvm_sys_reg_target_table *table);
 
 int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu, struct kvm_run *run);
-int kvm_handle_cp14_access(struct kvm_vcpu *vcpu, struct kvm_run *run);
+int kvm_handle_cp14_32(struct kvm_vcpu *vcpu, struct kvm_run *run);
+int kvm_handle_cp14_64(struct kvm_vcpu *vcpu, struct kvm_run *run);
 int kvm_handle_cp15_32(struct kvm_vcpu *vcpu, struct kvm_run *run);
 int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run);
 int kvm_handle_sys_reg(struct kvm_vcpu *vcpu, struct kvm_run *run);
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index dd8ecfc3f995..fdc3e21abd8d 100644
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -213,6 +213,17 @@ static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,
                 default:
                         return be64_to_cpu(data);
                 }
+        } else {
+                switch (len) {
+                case 1:
+                        return data & 0xff;
+                case 2:
+                        return le16_to_cpu(data & 0xffff);
+                case 4:
+                        return le32_to_cpu(data & 0xffffffff);
+                default:
+                        return le64_to_cpu(data);
+                }
         }
 
         return data;            /* Leave LE untouched */
@@ -233,6 +244,17 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu,
                 default:
                         return cpu_to_be64(data);
                 }
+        } else {
+                switch (len) {
+                case 1:
+                        return data & 0xff;
+                case 2:
+                        return cpu_to_le16(data & 0xffff);
+                case 4:
+                        return cpu_to_le32(data & 0xffffffff);
+                default:
+                        return cpu_to_le64(data);
+                }
         }
 
         return data;            /* Leave LE untouched */
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 92242ce06309..e10c45a578e3 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -86,7 +86,7 @@ struct kvm_cpu_context {
         struct kvm_regs gp_regs;
         union {
                 u64 sys_regs[NR_SYS_REGS];
-                u32 cp15[NR_CP15_REGS];
+                u32 copro[NR_COPRO_REGS];
         };
 };
 
@@ -101,6 +101,9 @@ struct kvm_vcpu_arch {
         /* Exception Information */
         struct kvm_vcpu_fault_info fault;
 
+        /* Debug state */
+        u64 debug_flags;
+
         /* Pointer to host CPU context */
         kvm_cpu_context_t *host_cpu_context;
 
@@ -138,7 +141,20 @@ struct kvm_vcpu_arch {
 
 #define vcpu_gp_regs(v)         (&(v)->arch.ctxt.gp_regs)
 #define vcpu_sys_reg(v,r)       ((v)->arch.ctxt.sys_regs[(r)])
-#define vcpu_cp15(v,r)          ((v)->arch.ctxt.cp15[(r)])
+/*
+ * CP14 and CP15 live in the same array, as they are backed by the
+ * same system registers.
+ */
+#define vcpu_cp14(v,r)          ((v)->arch.ctxt.copro[(r)])
+#define vcpu_cp15(v,r)          ((v)->arch.ctxt.copro[(r)])
+
+#ifdef CONFIG_CPU_BIG_ENDIAN
+#define vcpu_cp15_64_high(v,r)  vcpu_cp15((v),(r))
+#define vcpu_cp15_64_low(v,r)   vcpu_cp15((v),(r) + 1)
+#else
+#define vcpu_cp15_64_high(v,r)  vcpu_cp15((v),(r) + 1)
+#define vcpu_cp15_64_low(v,r)   vcpu_cp15((v),(r))
+#endif
 
 struct kvm_vm_stat {
         u32 remote_tlb_flush;
@@ -200,4 +216,32 @@ static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr,
                      hyp_stack_ptr, vector_ptr);
 }
 
+struct vgic_sr_vectors {
+        void    *save_vgic;
+        void    *restore_vgic;
+};
+
+static inline void vgic_arch_setup(const struct vgic_params *vgic)
+{
+        extern struct vgic_sr_vectors __vgic_sr_vectors;
+
+        switch(vgic->type)
+        {
+        case VGIC_V2:
+                __vgic_sr_vectors.save_vgic     = __save_vgic_v2_state;
+                __vgic_sr_vectors.restore_vgic  = __restore_vgic_v2_state;
+                break;
+
+#ifdef CONFIG_ARM_GIC_V3
+        case VGIC_V3:
+                __vgic_sr_vectors.save_vgic     = __save_vgic_v3_state;
+                __vgic_sr_vectors.restore_vgic  = __restore_vgic_v3_state;
+                break;
+#endif
+
+        default:
+                BUG();
+        }
+}
+
 #endif /* __ARM64_KVM_HOST_H__ */
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
index 7d29847a893b..8e138c7c53ac 100644
--- a/arch/arm64/include/asm/kvm_mmu.h
+++ b/arch/arm64/include/asm/kvm_mmu.h
@@ -125,6 +125,21 @@ static inline void kvm_set_s2pmd_writable(pmd_t *pmd)
 #define kvm_pud_addr_end(addr, end)     pud_addr_end(addr, end)
 #define kvm_pmd_addr_end(addr, end)     pmd_addr_end(addr, end)
 
+static inline bool kvm_page_empty(void *ptr)
+{
+        struct page *ptr_page = virt_to_page(ptr);
+        return page_count(ptr_page) == 1;
+}
+
+#define kvm_pte_table_empty(ptep) kvm_page_empty(ptep)
+#ifndef CONFIG_ARM64_64K_PAGES
+#define kvm_pmd_table_empty(pmdp) kvm_page_empty(pmdp)
+#else
+#define kvm_pmd_table_empty(pmdp) (0)
+#endif
+#define kvm_pud_table_empty(pudp) (0)
+
+
 struct kvm;
 
 #define kvm_flush_dcache_to_poc(a,l)    __flush_dcache_area((a), (l))
diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h
index 7a3f462133b0..22b16232bd60 100644
--- a/arch/arm64/include/asm/page.h
+++ b/arch/arm64/include/asm/page.h
@@ -28,9 +28,6 @@
 #define PAGE_SIZE               (_AC(1,UL) << PAGE_SHIFT)
 #define PAGE_MASK               (~(PAGE_SIZE-1))
 
-/* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
-#define __HAVE_ARCH_GATE_AREA           1
-
 /*
  * The idmap and swapper page tables need some space reserved in the kernel
  * image. Both require pgd, pud (4 levels only) and pmd tables to (section)
diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h
index 7c275e3b640f..eeaa97559bab 100644
--- a/arch/arm64/include/asm/signal32.h
+++ b/arch/arm64/include/asm/signal32.h
@@ -24,22 +24,21 @@
 
 extern const compat_ulong_t aarch32_sigret_code[6];
 
-int compat_setup_frame(int usig, struct k_sigaction *ka, sigset_t *set,
+int compat_setup_frame(int usig, struct ksignal *ksig, sigset_t *set,
                        struct pt_regs *regs);
-int compat_setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set, struct pt_regs *regs);
+int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs);
 
 void compat_setup_restart_syscall(struct pt_regs *regs);
 #else
 
-static inline int compat_setup_frame(int usid, struct k_sigaction *ka,
+static inline int compat_setup_frame(int usid, struct ksignal *ksig,
                                      sigset_t *set, struct pt_regs *regs)
 {
         return -ENOSYS;
 }
 
-static inline int compat_setup_rt_frame(int usig, struct k_sigaction *ka,
-                                        siginfo_t *info, sigset_t *set,
+static inline int compat_setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
                                         struct pt_regs *regs)
 {
         return -ENOSYS;
diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h
index 215ad4649dd7..7a5df5252dd7 100644
--- a/arch/arm64/include/asm/virt.h
+++ b/arch/arm64/include/asm/virt.h
@@ -50,6 +50,10 @@ static inline bool is_hyp_mode_mismatched(void)
         return __boot_cpu_mode[0] != __boot_cpu_mode[1];
 }
 
+/* The section containing the hypervisor text */
+extern char __hyp_text_start[];
+extern char __hyp_text_end[];
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* ! __ASM__VIRT_H */
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index 646f888387cd..9a9fce090d58 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -120,6 +120,7 @@ int main(void)
   DEFINE(VCPU_ESR_EL2,          offsetof(struct kvm_vcpu, arch.fault.esr_el2));
   DEFINE(VCPU_FAR_EL2,          offsetof(struct kvm_vcpu, arch.fault.far_el2));
   DEFINE(VCPU_HPFAR_EL2,        offsetof(struct kvm_vcpu, arch.fault.hpfar_el2));
+  DEFINE(VCPU_DEBUG_FLAGS,      offsetof(struct kvm_vcpu, arch.debug_flags));
   DEFINE(VCPU_HCR_EL2,          offsetof(struct kvm_vcpu, arch.hcr_el2));
   DEFINE(VCPU_IRQ_LINES,        offsetof(struct kvm_vcpu, arch.irq_lines));
   DEFINE(VCPU_HOST_CONTEXT,     offsetof(struct kvm_vcpu, arch.host_cpu_context));
@@ -129,13 +130,24 @@ int main(void)
   DEFINE(KVM_TIMER_ENABLED,     offsetof(struct kvm, arch.timer.enabled));
   DEFINE(VCPU_KVM,              offsetof(struct kvm_vcpu, kvm));
   DEFINE(VCPU_VGIC_CPU,         offsetof(struct kvm_vcpu, arch.vgic_cpu));
-  DEFINE(VGIC_CPU_HCR,          offsetof(struct vgic_cpu, vgic_hcr));
-  DEFINE(VGIC_CPU_VMCR,         offsetof(struct vgic_cpu, vgic_vmcr));
-  DEFINE(VGIC_CPU_MISR,         offsetof(struct vgic_cpu, vgic_misr));
-  DEFINE(VGIC_CPU_EISR,         offsetof(struct vgic_cpu, vgic_eisr));
-  DEFINE(VGIC_CPU_ELRSR,        offsetof(struct vgic_cpu, vgic_elrsr));
-  DEFINE(VGIC_CPU_APR,          offsetof(struct vgic_cpu, vgic_apr));
-  DEFINE(VGIC_CPU_LR,           offsetof(struct vgic_cpu, vgic_lr));
+  DEFINE(VGIC_SAVE_FN,          offsetof(struct vgic_sr_vectors, save_vgic));
+  DEFINE(VGIC_RESTORE_FN,       offsetof(struct vgic_sr_vectors, restore_vgic));
+  DEFINE(VGIC_SR_VECTOR_SZ,     sizeof(struct vgic_sr_vectors));
+  DEFINE(VGIC_V2_CPU_HCR,       offsetof(struct vgic_cpu, vgic_v2.vgic_hcr));
+  DEFINE(VGIC_V2_CPU_VMCR,      offsetof(struct vgic_cpu, vgic_v2.vgic_vmcr));
+  DEFINE(VGIC_V2_CPU_MISR,      offsetof(struct vgic_cpu, vgic_v2.vgic_misr));
+  DEFINE(VGIC_V2_CPU_EISR,      offsetof(struct vgic_cpu, vgic_v2.vgic_eisr));
+  DEFINE(VGIC_V2_CPU_ELRSR,     offsetof(struct vgic_cpu, vgic_v2.vgic_elrsr));
+  DEFINE(VGIC_V2_CPU_APR,       offsetof(struct vgic_cpu, vgic_v2.vgic_apr));
+  DEFINE(VGIC_V2_CPU_LR,        offsetof(struct vgic_cpu, vgic_v2.vgic_lr));
+  DEFINE(VGIC_V3_CPU_HCR,       offsetof(struct vgic_cpu, vgic_v3.vgic_hcr));
+  DEFINE(VGIC_V3_CPU_VMCR,      offsetof(struct vgic_cpu, vgic_v3.vgic_vmcr));
+  DEFINE(VGIC_V3_CPU_MISR,      offsetof(struct vgic_cpu, vgic_v3.vgic_misr));
+  DEFINE(VGIC_V3_CPU_EISR,      offsetof(struct vgic_cpu, vgic_v3.vgic_eisr));
+  DEFINE(VGIC_V3_CPU_ELRSR,     offsetof(struct vgic_cpu, vgic_v3.vgic_elrsr));
+  DEFINE(VGIC_V3_CPU_AP0R,      offsetof(struct vgic_cpu, vgic_v3.vgic_ap0r));
+  DEFINE(VGIC_V3_CPU_AP1R,      offsetof(struct vgic_cpu, vgic_v3.vgic_ap1r));
+  DEFINE(VGIC_V3_CPU_LR,        offsetof(struct vgic_cpu, vgic_v3.vgic_lr));
   DEFINE(VGIC_CPU_NR_LR,        offsetof(struct vgic_cpu, nr_lr));
   DEFINE(KVM_VTTBR,             offsetof(struct kvm, arch.vttbr));
   DEFINE(KVM_VGIC_VCTRL,        offsetof(struct kvm, arch.vgic.vctrl_base));
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index fe5b94078d82..b056369fd47d 100644
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -30,15 +30,6 @@
 #include <asm/cputype.h>
 #include <asm/system_misc.h>
 
-/* Low-level stepping controls. */
-#define DBG_MDSCR_SS            (1 << 0)
-#define DBG_SPSR_SS             (1 << 21)
-
-/* MDSCR_EL1 enabling bits */
-#define DBG_MDSCR_KDE           (1 << 13)
-#define DBG_MDSCR_MDE           (1 << 15)
-#define DBG_MDSCR_MASK          ~(DBG_MDSCR_KDE | DBG_MDSCR_MDE)
-
 /* Determine debug architecture. */
 u8 debug_monitors_arch(void)
 {
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index e72f3100958f..5dbb7bd3b838 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -463,6 +463,8 @@ static int __init arm64_enter_virtual_mode(void)
         efi_native_runtime_setup();
         set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
 
+        efi.runtime_version = efi.systab->hdr.revision;
+
         return 0;
 
 err_unmap:
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index 6357b9c6c90e..6fa792137eda 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -209,19 +209,13 @@ static int setup_sigframe(struct rt_sigframe __user *sf,
         return err;
 }
 
-static struct rt_sigframe __user *get_sigframe(struct k_sigaction *ka,
+static struct rt_sigframe __user *get_sigframe(struct ksignal *ksig,
                                                struct pt_regs *regs)
 {
         unsigned long sp, sp_top;
         struct rt_sigframe __user *frame;
 
-        sp = sp_top = regs->sp;
-
-        /*
-         * This is the X/Open sanctioned signal stack switching.
-         */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
-                sp = sp_top = current->sas_ss_sp + current->sas_ss_size;
+        sp = sp_top = sigsp(regs->sp, ksig);
 
         sp = (sp - sizeof(struct rt_sigframe)) & ~15;
         frame = (struct rt_sigframe __user *)sp;
@@ -253,13 +247,13 @@ static void setup_return(struct pt_regs *regs, struct k_sigaction *ka,
         regs->regs[30] = (unsigned long)sigtramp;
 }
 
-static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs);
+        frame = get_sigframe(ksig, regs);
         if (!frame)
                 return 1;
 
@@ -269,9 +263,9 @@ static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
         err |= __save_altstack(&frame->uc.uc_stack, regs->sp);
         err |= setup_sigframe(frame, regs, set);
         if (err == 0) {
-                setup_return(regs, ka, frame, usig);
-                if (ka->sa.sa_flags & SA_SIGINFO) {
-                        err |= copy_siginfo_to_user(&frame->info, info);
+                setup_return(regs, &ksig->ka, frame, usig);
+                if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
+                        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
                         regs->regs[1] = (unsigned long)&frame->info;
                         regs->regs[2] = (unsigned long)&frame->uc;
                 }
@@ -291,13 +285,12 @@ static void setup_restart_syscall(struct pt_regs *regs)
 /*
  * OK, we're invoking a handler
  */
-static void handle_signal(unsigned long sig, struct k_sigaction *ka,
-                          siginfo_t *info, struct pt_regs *regs)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         struct thread_info *thread = current_thread_info();
         struct task_struct *tsk = current;
         sigset_t *oldset = sigmask_to_save();
-        int usig = sig;
+        int usig = ksig->sig;
         int ret;
 
         /*
@@ -310,13 +303,12 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
          * Set up the stack frame
          */
         if (is_compat_task()) {
-                if (ka->sa.sa_flags & SA_SIGINFO)
-                        ret = compat_setup_rt_frame(usig, ka, info, oldset,
-                                                    regs);
+                if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                        ret = compat_setup_rt_frame(usig, ksig, oldset, regs);
                 else
-                        ret = compat_setup_frame(usig, ka, oldset, regs);
+                        ret = compat_setup_frame(usig, ksig, oldset, regs);
         } else {
-                ret = setup_rt_frame(usig, ka, info, oldset, regs);
+                ret = setup_rt_frame(usig, ksig, oldset, regs);
         }
 
         /*
@@ -324,18 +316,14 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
          */
         ret |= !valid_user_regs(&regs->user_regs);
 
-        if (ret != 0) {
-                force_sigsegv(sig, tsk);
-                return;
-        }
-
         /*
          * Fast forward the stepping logic so we step into the signal
          * handler.
          */
-        user_fastforward_single_step(tsk);
+        if (!ret)
+                user_fastforward_single_step(tsk);
 
-        signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 /*
@@ -350,10 +338,9 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
 static void do_signal(struct pt_regs *regs)
 {
         unsigned long continue_addr = 0, restart_addr = 0;
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr, retval = 0;
+        int retval = 0;
         int syscall = (int)regs->syscallno;
+        struct ksignal ksig;
 
         /*
          * If we were from a system call, check for system call restarting...
@@ -387,8 +374,7 @@ static void do_signal(struct pt_regs *regs)
          * Get the signal to deliver. When running under ptrace, at this point
          * the debugger may change all of our registers.
          */
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /*
                  * Depending on the signal settings, we may need to revert the
                  * decision to restart the system call, but skip this if a
@@ -398,12 +384,12 @@ static void do_signal(struct pt_regs *regs)
                     (retval == -ERESTARTNOHAND ||
                      retval == -ERESTART_RESTARTBLOCK ||
                      (retval == -ERESTARTSYS &&
-                      !(ka.sa.sa_flags & SA_RESTART)))) {
+                      !(ksig.ka.sa.sa_flags & SA_RESTART)))) {
                         regs->regs[0] = -EINTR;
                         regs->pc = continue_addr;
                 }
 
-                handle_signal(signr, &ka, &info, regs);
+                handle_signal(&ksig, regs);
                 return;
         }
 
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
index c5ee208321c3..1b9ad02837cf 100644
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -407,20 +407,14 @@ badframe:
         return 0;
 }
 
-static void __user *compat_get_sigframe(struct k_sigaction *ka,
+static void __user *compat_get_sigframe(struct ksignal *ksig,
                                         struct pt_regs *regs,
                                         int framesize)
 {
-        compat_ulong_t sp = regs->compat_sp;
+        compat_ulong_t sp = sigsp(regs->compat_sp, ksig);
         void __user *frame;
 
         /*
-         * This is the X/Open sanctioned signal stack switching.
-         */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
-                sp = current->sas_ss_sp + current->sas_ss_size;
-
-        /*
          * ATPCS B01 mandates 8-byte alignment
          */
         frame = compat_ptr((compat_uptr_t)((sp - framesize) & ~7));
@@ -520,18 +514,18 @@ static int compat_setup_sigframe(struct compat_sigframe __user *sf,
 /*
  * 32-bit signal handling routines called from signal.c
  */
-int compat_setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
+int compat_setup_rt_frame(int usig, struct ksignal *ksig,
                           sigset_t *set, struct pt_regs *regs)
 {
         struct compat_rt_sigframe __user *frame;
         int err = 0;
 
-        frame = compat_get_sigframe(ka, regs, sizeof(*frame));
+        frame = compat_get_sigframe(ksig, regs, sizeof(*frame));
 
         if (!frame)
                 return 1;
 
-        err |= copy_siginfo_to_user32(&frame->info, info);
+        err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
 
         __put_user_error(0, &frame->sig.uc.uc_flags, err);
         __put_user_error(0, &frame->sig.uc.uc_link, err);
@@ -541,7 +535,7 @@ int compat_setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
         err |= compat_setup_sigframe(&frame->sig, regs, set);
 
         if (err == 0) {
-                compat_setup_return(regs, ka, frame->sig.retcode, frame, usig);
+                compat_setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
                 regs->regs[1] = (compat_ulong_t)(unsigned long)&frame->info;
                 regs->regs[2] = (compat_ulong_t)(unsigned long)&frame->sig.uc;
         }
@@ -549,13 +543,13 @@ int compat_setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
         return err;
 }
 
-int compat_setup_frame(int usig, struct k_sigaction *ka, sigset_t *set,
+int compat_setup_frame(int usig, struct ksignal *ksig, sigset_t *set,
                        struct pt_regs *regs)
 {
         struct compat_sigframe __user *frame;
         int err = 0;
 
-        frame = compat_get_sigframe(ka, regs, sizeof(*frame));
+        frame = compat_get_sigframe(ksig, regs, sizeof(*frame));
 
         if (!frame)
                 return 1;
@@ -564,7 +558,7 @@ int compat_setup_frame(int usig, struct k_sigaction *ka, sigset_t *set,
 
         err |= compat_setup_sigframe(frame, regs, set);
         if (err == 0)
-                compat_setup_return(regs, ka, frame->retcode, frame, usig);
+                compat_setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
 
         return err;
 }
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 3e2f5ebbf63e..474339718105 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -51,6 +51,9 @@
 #include <asm/tlbflush.h>
 #include <asm/ptrace.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/ipi.h>
+
 /*
  * as from 2.5, kernels no longer have an init_tasks structure
  * so we need some other way of telling a new secondary core
@@ -313,8 +316,6 @@ void __init smp_prepare_boot_cpu(void)
         set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
 }
 
-static void (*smp_cross_call)(const struct cpumask *, unsigned int);
-
 /*
  * Enumerate the possible CPU set from the device tree and build the
  * cpu logical map array containing MPIDR values related to logical
@@ -469,32 +470,15 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         }
 }
 
+static void (*__smp_cross_call)(const struct cpumask *, unsigned int);
 
 void __init set_smp_cross_call(void (*fn)(const struct cpumask *, unsigned int))
 {
-        smp_cross_call = fn;
+        __smp_cross_call = fn;
 }
 
-void arch_send_call_function_ipi_mask(const struct cpumask *mask)
-{
-        smp_cross_call(mask, IPI_CALL_FUNC);
-}
-
-void arch_send_call_function_single_ipi(int cpu)
-{
-        smp_cross_call(cpumask_of(cpu), IPI_CALL_FUNC_SINGLE);
-}
-
-#ifdef CONFIG_IRQ_WORK
-void arch_irq_work_raise(void)
-{
-        if (smp_cross_call)
-                smp_cross_call(cpumask_of(smp_processor_id()), IPI_IRQ_WORK);
-}
-#endif
-
-static const char *ipi_types[NR_IPI] = {
-#define S(x,s)  [x - IPI_RESCHEDULE] = s
+static const char *ipi_types[NR_IPI] __tracepoint_string = {
+#define S(x,s)  [x] = s
         S(IPI_RESCHEDULE, "Rescheduling interrupts"),
         S(IPI_CALL_FUNC, "Function call interrupts"),
         S(IPI_CALL_FUNC_SINGLE, "Single function call interrupts"),
@@ -503,12 +487,18 @@ static const char *ipi_types[NR_IPI] = {
         S(IPI_IRQ_WORK, "IRQ work interrupts"),
 };
 
+static void smp_cross_call(const struct cpumask *target, unsigned int ipinr)
+{
+        trace_ipi_raise(target, ipi_types[ipinr]);
+        __smp_cross_call(target, ipinr);
+}
+
 void show_ipi_list(struct seq_file *p, int prec)
 {
         unsigned int cpu, i;
 
         for (i = 0; i < NR_IPI; i++) {
-                seq_printf(p, "%*s%u:%s", prec - 1, "IPI", i + IPI_RESCHEDULE,
+                seq_printf(p, "%*s%u:%s", prec - 1, "IPI", i,
                            prec >= 4 ? " " : "");
                 for_each_online_cpu(cpu)
                         seq_printf(p, "%10u ",
@@ -528,6 +518,24 @@ u64 smp_irq_stat_cpu(unsigned int cpu)
         return sum;
 }
 
+void arch_send_call_function_ipi_mask(const struct cpumask *mask)
+{
+        smp_cross_call(mask, IPI_CALL_FUNC);
+}
+
+void arch_send_call_function_single_ipi(int cpu)
+{
+        smp_cross_call(cpumask_of(cpu), IPI_CALL_FUNC_SINGLE);
+}
+
+#ifdef CONFIG_IRQ_WORK
+void arch_irq_work_raise(void)
+{
+        if (__smp_cross_call)
+                smp_cross_call(cpumask_of(smp_processor_id()), IPI_IRQ_WORK);
+}
+#endif
+
 static DEFINE_RAW_SPINLOCK(stop_lock);
 
 /*
@@ -559,8 +567,10 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
         unsigned int cpu = smp_processor_id();
         struct pt_regs *old_regs = set_irq_regs(regs);
 
-        if (ipinr >= IPI_RESCHEDULE && ipinr < IPI_RESCHEDULE + NR_IPI)
-                __inc_irq_stat(cpu, ipi_irqs[ipinr - IPI_RESCHEDULE]);
+        if ((unsigned)ipinr < NR_IPI) {
+                trace_ipi_entry(ipi_types[ipinr]);
+                __inc_irq_stat(cpu, ipi_irqs[ipinr]);
+        }
 
         switch (ipinr) {
         case IPI_RESCHEDULE:
@@ -605,6 +615,9 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
                 pr_crit("CPU%u: Unknown IPI message 0x%x\n", cpu, ipinr);
                 break;
         }
+
+        if ((unsigned)ipinr < NR_IPI)
+                trace_ipi_exit(ipi_types[ipinr]);
         set_irq_regs(old_regs);
 }
 
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index 24f2e8c62479..32aeea083d93 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -195,31 +195,12 @@ up_fail:
 }
 
 /*
- * We define AT_SYSINFO_EHDR, so we need these function stubs to keep
- * Linux happy.
- */
-int in_gate_area_no_mm(unsigned long addr)
-{
-        return 0;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long addr)
-{
-        return 0;
-}
-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-        return NULL;
-}
-
-/*
  * Update the vDSO data page to keep in sync with kernel timekeeping.
  */
 void update_vsyscall(struct timekeeper *tk)
 {
         struct timespec xtime_coarse;
-        u32 use_syscall = strcmp(tk->clock->name, "arch_sys_counter");
+        u32 use_syscall = strcmp(tk->tkr.clock->name, "arch_sys_counter");
 
         ++vdso_data->tb_seq_count;
         smp_wmb();
@@ -232,11 +213,11 @@ void update_vsyscall(struct timekeeper *tk)
         vdso_data->wtm_clock_nsec               = tk->wall_to_monotonic.tv_nsec;
 
         if (!use_syscall) {
-                vdso_data->cs_cycle_last        = tk->clock->cycle_last;
+                vdso_data->cs_cycle_last        = tk->tkr.cycle_last;
                 vdso_data->xtime_clock_sec      = tk->xtime_sec;
-                vdso_data->xtime_clock_nsec     = tk->xtime_nsec;
-                vdso_data->cs_mult              = tk->mult;
-                vdso_data->cs_shift             = tk->shift;
+                vdso_data->xtime_clock_nsec     = tk->tkr.xtime_nsec;
+                vdso_data->cs_mult              = tk->tkr.mult;
+                vdso_data->cs_shift             = tk->tkr.shift;
         }
 
         smp_wmb();
diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
index 72a9fd583ad3..32a096174b94 100644
--- a/arch/arm64/kvm/Makefile
+++ b/arch/arm64/kvm/Makefile
@@ -20,4 +20,8 @@ kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o
 kvm-$(CONFIG_KVM_ARM_HOST) += guest.o reset.o sys_regs.o sys_regs_generic_v8.o
 
 kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic.o
+kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v2.o
+kvm-$(CONFIG_KVM_ARM_VGIC) += vgic-v2-switch.o
+kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic-v3.o
+kvm-$(CONFIG_KVM_ARM_VGIC) += vgic-v3-switch.o
 kvm-$(CONFIG_KVM_ARM_TIMER) += $(KVM)/arm/arch_timer.o
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 60b5c31f3c10..8d1ec2887a26 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -136,13 +136,67 @@ static unsigned long num_core_regs(void)
 }
 
 /**
+ * ARM64 versions of the TIMER registers, always available on arm64
+ */
+
+#define NUM_TIMER_REGS 3
+
+static bool is_timer_reg(u64 index)
+{
+        switch (index) {
+        case KVM_REG_ARM_TIMER_CTL:
+        case KVM_REG_ARM_TIMER_CNT:
+        case KVM_REG_ARM_TIMER_CVAL:
+                return true;
+        }
+        return false;
+}
+
+static int copy_timer_indices(struct kvm_vcpu *vcpu, u64 __user *uindices)
+{
+        if (put_user(KVM_REG_ARM_TIMER_CTL, uindices))
+                return -EFAULT;
+        uindices++;
+        if (put_user(KVM_REG_ARM_TIMER_CNT, uindices))
+                return -EFAULT;
+        uindices++;
+        if (put_user(KVM_REG_ARM_TIMER_CVAL, uindices))
+                return -EFAULT;
+
+        return 0;
+}
+
+static int set_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
+{
+        void __user *uaddr = (void __user *)(long)reg->addr;
+        u64 val;
+        int ret;
+
+        ret = copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id));
+        if (ret != 0)
+                return ret;
+
+        return kvm_arm_timer_set_reg(vcpu, reg->id, val);
+}
+
+static int get_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
+{
+        void __user *uaddr = (void __user *)(long)reg->addr;
+        u64 val;
+
+        val = kvm_arm_timer_get_reg(vcpu, reg->id);
+        return copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id));
+}
+
+/**
  * kvm_arm_num_regs - how many registers do we present via KVM_GET_ONE_REG
  *
  * This is for all registers.
  */
 unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu)
 {
-        return num_core_regs() + kvm_arm_num_sys_reg_descs(vcpu);
+        return num_core_regs() + kvm_arm_num_sys_reg_descs(vcpu)
+                + NUM_TIMER_REGS;
 }
 
 /**
@@ -154,6 +208,7 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices)
 {
         unsigned int i;
         const u64 core_reg = KVM_REG_ARM64 | KVM_REG_SIZE_U64 | KVM_REG_ARM_CORE;
+        int ret;
 
         for (i = 0; i < sizeof(struct kvm_regs) / sizeof(__u32); i++) {
                 if (put_user(core_reg | i, uindices))
@@ -161,6 +216,11 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices)
                 uindices++;
         }
 
+        ret = copy_timer_indices(vcpu, uindices);
+        if (ret)
+                return ret;
+        uindices += NUM_TIMER_REGS;
+
         return kvm_arm_copy_sys_reg_indices(vcpu, uindices);
 }
 
@@ -174,6 +234,9 @@ int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
         if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE)
                 return get_core_reg(vcpu, reg);
 
+        if (is_timer_reg(reg->id))
+                return get_timer_reg(vcpu, reg);
+
         return kvm_arm_sys_reg_get_reg(vcpu, reg);
 }
 
@@ -187,6 +250,9 @@ int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
         if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE)
                 return set_core_reg(vcpu, reg);
 
+        if (is_timer_reg(reg->id))
+                return set_timer_reg(vcpu, reg);
+
         return kvm_arm_sys_reg_set_reg(vcpu, reg);
 }
 
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
index 182415e1a952..e28be510380c 100644
--- a/arch/arm64/kvm/handle_exit.c
+++ b/arch/arm64/kvm/handle_exit.c
@@ -73,9 +73,9 @@ static exit_handle_fn arm_exit_handlers[] = {
         [ESR_EL2_EC_WFI]        = kvm_handle_wfx,
         [ESR_EL2_EC_CP15_32]    = kvm_handle_cp15_32,
         [ESR_EL2_EC_CP15_64]    = kvm_handle_cp15_64,
-        [ESR_EL2_EC_CP14_MR]    = kvm_handle_cp14_access,
+        [ESR_EL2_EC_CP14_MR]    = kvm_handle_cp14_32,
         [ESR_EL2_EC_CP14_LS]    = kvm_handle_cp14_load_store,
-        [ESR_EL2_EC_CP14_64]    = kvm_handle_cp14_access,
+        [ESR_EL2_EC_CP14_64]    = kvm_handle_cp14_64,
         [ESR_EL2_EC_HVC32]      = handle_hvc,
         [ESR_EL2_EC_SMC32]      = handle_smc,
         [ESR_EL2_EC_HVC64]      = handle_hvc,
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index b0d1512acf08..b72aa9f9215c 100644
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -16,11 +16,11 @@
  */
 
 #include <linux/linkage.h>
-#include <linux/irqchip/arm-gic.h>
 
 #include <asm/assembler.h>
 #include <asm/memory.h>
 #include <asm/asm-offsets.h>
+#include <asm/debug-monitors.h>
 #include <asm/fpsimdmacros.h>
 #include <asm/kvm.h>
 #include <asm/kvm_asm.h>
@@ -36,9 +36,6 @@
         .pushsection    .hyp.text, "ax"
         .align  PAGE_SHIFT
 
-__kvm_hyp_code_start:
-        .globl __kvm_hyp_code_start
-
 .macro save_common_regs
         // x2: base address for cpu context
         // x3: tmp register
@@ -215,6 +212,7 @@ __kvm_hyp_code_start:
         mrs     x22,    amair_el1
         mrs     x23,    cntkctl_el1
         mrs     x24,    par_el1
+        mrs     x25,    mdscr_el1
 
         stp     x4, x5, [x3]
         stp     x6, x7, [x3, #16]
@@ -226,7 +224,202 @@ __kvm_hyp_code_start:
         stp     x18, x19, [x3, #112]
         stp     x20, x21, [x3, #128]
         stp     x22, x23, [x3, #144]
-        str     x24, [x3, #160]
+        stp     x24, x25, [x3, #160]
+.endm
+
+.macro save_debug
+        // x2: base address for cpu context
+        // x3: tmp register
+
+        mrs     x26, id_aa64dfr0_el1
+        ubfx    x24, x26, #12, #4       // Extract BRPs
+        ubfx    x25, x26, #20, #4       // Extract WRPs
+        mov     w26, #15
+        sub     w24, w26, w24           // How many BPs to skip
+        sub     w25, w26, w25           // How many WPs to skip
+
+        add     x3, x2, #CPU_SYSREG_OFFSET(DBGBCR0_EL1)
+
+        adr     x26, 1f
+        add     x26, x26, x24, lsl #2
+        br      x26
+1:
+        mrs     x20, dbgbcr15_el1
+        mrs     x19, dbgbcr14_el1
+        mrs     x18, dbgbcr13_el1
+        mrs     x17, dbgbcr12_el1
+        mrs     x16, dbgbcr11_el1
+        mrs     x15, dbgbcr10_el1
+        mrs     x14, dbgbcr9_el1
+        mrs     x13, dbgbcr8_el1
+        mrs     x12, dbgbcr7_el1
+        mrs     x11, dbgbcr6_el1
+        mrs     x10, dbgbcr5_el1
+        mrs     x9, dbgbcr4_el1
+        mrs     x8, dbgbcr3_el1
+        mrs     x7, dbgbcr2_el1
+        mrs     x6, dbgbcr1_el1
+        mrs     x5, dbgbcr0_el1
+
+        adr     x26, 1f
+        add     x26, x26, x24, lsl #2
+        br      x26
+
+1:
+        str     x20, [x3, #(15 * 8)]
+        str     x19, [x3, #(14 * 8)]
+        str     x18, [x3, #(13 * 8)]
+        str     x17, [x3, #(12 * 8)]
+        str     x16, [x3, #(11 * 8)]
+        str     x15, [x3, #(10 * 8)]
+        str     x14, [x3, #(9 * 8)]
+        str     x13, [x3, #(8 * 8)]
+        str     x12, [x3, #(7 * 8)]
+        str     x11, [x3, #(6 * 8)]
+        str     x10, [x3, #(5 * 8)]
+        str     x9, [x3, #(4 * 8)]
+        str     x8, [x3, #(3 * 8)]
+        str     x7, [x3, #(2 * 8)]
+        str     x6, [x3, #(1 * 8)]
+        str     x5, [x3, #(0 * 8)]
+
+        add     x3, x2, #CPU_SYSREG_OFFSET(DBGBVR0_EL1)
+
+        adr     x26, 1f
+        add     x26, x26, x24, lsl #2
+        br      x26
+1:
+        mrs     x20, dbgbvr15_el1
+        mrs     x19, dbgbvr14_el1
+        mrs     x18, dbgbvr13_el1
+        mrs     x17, dbgbvr12_el1
+        mrs     x16, dbgbvr11_el1
+        mrs     x15, dbgbvr10_el1
+        mrs     x14, dbgbvr9_el1
+        mrs     x13, dbgbvr8_el1
+        mrs     x12, dbgbvr7_el1
+        mrs     x11, dbgbvr6_el1
+        mrs     x10, dbgbvr5_el1
+        mrs     x9, dbgbvr4_el1
+        mrs     x8, dbgbvr3_el1
+        mrs     x7, dbgbvr2_el1
+        mrs     x6, dbgbvr1_el1
+        mrs     x5, dbgbvr0_el1
+
+        adr     x26, 1f
+        add     x26, x26, x24, lsl #2
+        br      x26
+
+1:
+        str     x20, [x3, #(15 * 8)]
+        str     x19, [x3, #(14 * 8)]
+        str     x18, [x3, #(13 * 8)]
+        str     x17, [x3, #(12 * 8)]
+        str     x16, [x3, #(11 * 8)]
+        str     x15, [x3, #(10 * 8)]
+        str     x14, [x3, #(9 * 8)]
+        str     x13, [x3, #(8 * 8)]
+        str     x12, [x3, #(7 * 8)]
+        str     x11, [x3, #(6 * 8)]
+        str     x10, [x3, #(5 * 8)]
+        str     x9, [x3, #(4 * 8)]
+        str     x8, [x3, #(3 * 8)]
+        str     x7, [x3, #(2 * 8)]
+        str     x6, [x3, #(1 * 8)]
+        str     x5, [x3, #(0 * 8)]
+
+        add     x3, x2, #CPU_SYSREG_OFFSET(DBGWCR0_EL1)
+
+        adr     x26, 1f
+        add     x26, x26, x25, lsl #2
+        br      x26
+1:
+        mrs     x20, dbgwcr15_el1
+        mrs     x19, dbgwcr14_el1
+        mrs     x18, dbgwcr13_el1
+        mrs     x17, dbgwcr12_el1
+        mrs     x16, dbgwcr11_el1
+        mrs     x15, dbgwcr10_el1
+        mrs     x14, dbgwcr9_el1
+        mrs     x13, dbgwcr8_el1
+        mrs     x12, dbgwcr7_el1
+        mrs     x11, dbgwcr6_el1
+        mrs     x10, dbgwcr5_el1
+        mrs     x9, dbgwcr4_el1
+        mrs     x8, dbgwcr3_el1
+        mrs     x7, dbgwcr2_el1
+        mrs     x6, dbgwcr1_el1
+        mrs     x5, dbgwcr0_el1
+
+        adr     x26, 1f
+        add     x26, x26, x25, lsl #2
+        br      x26
+
+1:
+        str     x20, [x3, #(15 * 8)]
+        str     x19, [x3, #(14 * 8)]
+        str     x18, [x3, #(13 * 8)]
+        str     x17, [x3, #(12 * 8)]
+        str     x16, [x3, #(11 * 8)]
+        str     x15, [x3, #(10 * 8)]
+        str     x14, [x3, #(9 * 8)]
+        str     x13, [x3, #(8 * 8)]
+        str     x12, [x3, #(7 * 8)]
+        str     x11, [x3, #(6 * 8)]
+        str     x10, [x3, #(5 * 8)]
+        str     x9, [x3, #(4 * 8)]
+        str     x8, [x3, #(3 * 8)]
+        str     x7, [x3, #(2 * 8)]
+        str     x6, [x3, #(1 * 8)]
+        str     x5, [x3, #(0 * 8)]
+
+        add     x3, x2, #CPU_SYSREG_OFFSET(DBGWVR0_EL1)
+
+        adr     x26, 1f
+        add     x26, x26, x25, lsl #2
+        br      x26
+1:
+        mrs     x20, dbgwvr15_el1
+        mrs     x19, dbgwvr14_el1
+        mrs     x18, dbgwvr13_el1
+        mrs     x17, dbgwvr12_el1
+        mrs     x16, dbgwvr11_el1
+        mrs     x15, dbgwvr10_el1
+        mrs     x14, dbgwvr9_el1
+        mrs     x13, dbgwvr8_el1
+        mrs     x12, dbgwvr7_el1
+        mrs     x11, dbgwvr6_el1
+        mrs     x10, dbgwvr5_el1
+        mrs     x9, dbgwvr4_el1
+        mrs     x8, dbgwvr3_el1
+        mrs     x7, dbgwvr2_el1
+        mrs     x6, dbgwvr1_el1
+        mrs     x5, dbgwvr0_el1
+
+        adr     x26, 1f
+        add     x26, x26, x25, lsl #2
+        br      x26
+
+1:
+        str     x20, [x3, #(15 * 8)]
+        str     x19, [x3, #(14 * 8)]
+        str     x18, [x3, #(13 * 8)]
+        str     x17, [x3, #(12 * 8)]
+        str     x16, [x3, #(11 * 8)]
+        str     x15, [x3, #(10 * 8)]
+        str     x14, [x3, #(9 * 8)]
+        str     x13, [x3, #(8 * 8)]
+        str     x12, [x3, #(7 * 8)]
+        str     x11, [x3, #(6 * 8)]
+        str     x10, [x3, #(5 * 8)]
+        str     x9, [x3, #(4 * 8)]
+        str     x8, [x3, #(3 * 8)]
+        str     x7, [x3, #(2 * 8)]
+        str     x6, [x3, #(1 * 8)]
+        str     x5, [x3, #(0 * 8)]
+
+        mrs     x21, mdccint_el1
+        str     x21, [x2, #CPU_SYSREG_OFFSET(MDCCINT_EL1)]
 .endm
 
 .macro restore_sysregs
@@ -245,7 +438,7 @@ __kvm_hyp_code_start:
         ldp     x18, x19, [x3, #112]
         ldp     x20, x21, [x3, #128]
         ldp     x22, x23, [x3, #144]
-        ldr     x24, [x3, #160]
+        ldp     x24, x25, [x3, #160]
 
         msr     vmpidr_el2,     x4
         msr     csselr_el1,     x5
@@ -268,6 +461,198 @@ __kvm_hyp_code_start:
         msr     amair_el1,      x22
         msr     cntkctl_el1,    x23
         msr     par_el1,        x24
+        msr     mdscr_el1,      x25
+.endm
+
+.macro restore_debug
+        // x2: base address for cpu context
+        // x3: tmp register
+
+        mrs     x26, id_aa64dfr0_el1
+        ubfx    x24, x26, #12, #4       // Extract BRPs
+        ubfx    x25, x26, #20, #4       // Extract WRPs
+        mov     w26, #15
+        sub     w24, w26, w24           // How many BPs to skip
+        sub     w25, w26, w25           // How many WPs to skip
+
+        add     x3, x2, #CPU_SYSREG_OFFSET(DBGBCR0_EL1)
+
+        adr     x26, 1f
+        add     x26, x26, x24, lsl #2
+        br      x26
+1:
+        ldr     x20, [x3, #(15 * 8)]
+        ldr     x19, [x3, #(14 * 8)]
+        ldr     x18, [x3, #(13 * 8)]
+        ldr     x17, [x3, #(12 * 8)]
+        ldr     x16, [x3, #(11 * 8)]
+        ldr     x15, [x3, #(10 * 8)]
+        ldr     x14, [x3, #(9 * 8)]
+        ldr     x13, [x3, #(8 * 8)]
+        ldr     x12, [x3, #(7 * 8)]
+        ldr     x11, [x3, #(6 * 8)]
+        ldr     x10, [x3, #(5 * 8)]
+        ldr     x9, [x3, #(4 * 8)]
+        ldr     x8, [x3, #(3 * 8)]
+        ldr     x7, [x3, #(2 * 8)]
+        ldr     x6, [x3, #(1 * 8)]
+        ldr     x5, [x3, #(0 * 8)]
+
+        adr     x26, 1f
+        add     x26, x26, x24, lsl #2
+        br      x26
+1:
+        msr     dbgbcr15_el1, x20
+        msr     dbgbcr14_el1, x19
+        msr     dbgbcr13_el1, x18
+        msr     dbgbcr12_el1, x17
+        msr     dbgbcr11_el1, x16
+        msr     dbgbcr10_el1, x15
+        msr     dbgbcr9_el1, x14
+        msr     dbgbcr8_el1, x13
+        msr     dbgbcr7_el1, x12
+        msr     dbgbcr6_el1, x11
+        msr     dbgbcr5_el1, x10
+        msr     dbgbcr4_el1, x9
+        msr     dbgbcr3_el1, x8
+        msr     dbgbcr2_el1, x7
+        msr     dbgbcr1_el1, x6
+        msr     dbgbcr0_el1, x5
+
+        add     x3, x2, #CPU_SYSREG_OFFSET(DBGBVR0_EL1)
+
+        adr     x26, 1f
+        add     x26, x26, x24, lsl #2
+        br      x26
+1:
+        ldr     x20, [x3, #(15 * 8)]
+        ldr     x19, [x3, #(14 * 8)]
+        ldr     x18, [x3, #(13 * 8)]
+        ldr     x17, [x3, #(12 * 8)]
+        ldr     x16, [x3, #(11 * 8)]
+        ldr     x15, [x3, #(10 * 8)]
+        ldr     x14, [x3, #(9 * 8)]
+        ldr     x13, [x3, #(8 * 8)]
+        ldr     x12, [x3, #(7 * 8)]
+        ldr     x11, [x3, #(6 * 8)]
+        ldr     x10, [x3, #(5 * 8)]
+        ldr     x9, [x3, #(4 * 8)]
+        ldr     x8, [x3, #(3 * 8)]
+        ldr     x7, [x3, #(2 * 8)]
+        ldr     x6, [x3, #(1 * 8)]
+        ldr     x5, [x3, #(0 * 8)]
+
+        adr     x26, 1f
+        add     x26, x26, x24, lsl #2
+        br      x26
+1:
+        msr     dbgbvr15_el1, x20
+        msr     dbgbvr14_el1, x19
+        msr     dbgbvr13_el1, x18
+        msr     dbgbvr12_el1, x17
+        msr     dbgbvr11_el1, x16
+        msr     dbgbvr10_el1, x15
+        msr     dbgbvr9_el1, x14
+        msr     dbgbvr8_el1, x13
+        msr     dbgbvr7_el1, x12
+        msr     dbgbvr6_el1, x11
+        msr     dbgbvr5_el1, x10
+        msr     dbgbvr4_el1, x9
+        msr     dbgbvr3_el1, x8
+        msr     dbgbvr2_el1, x7
+        msr     dbgbvr1_el1, x6
+        msr     dbgbvr0_el1, x5
+
+        add     x3, x2, #CPU_SYSREG_OFFSET(DBGWCR0_EL1)
+
+        adr     x26, 1f
+        add     x26, x26, x25, lsl #2
+        br      x26
+1:
+        ldr     x20, [x3, #(15 * 8)]
+        ldr     x19, [x3, #(14 * 8)]
+        ldr     x18, [x3, #(13 * 8)]
+        ldr     x17, [x3, #(12 * 8)]
+        ldr     x16, [x3, #(11 * 8)]
+        ldr     x15, [x3, #(10 * 8)]
+        ldr     x14, [x3, #(9 * 8)]
+        ldr     x13, [x3, #(8 * 8)]
+        ldr     x12, [x3, #(7 * 8)]
+        ldr     x11, [x3, #(6 * 8)]
+        ldr     x10, [x3, #(5 * 8)]
+        ldr     x9, [x3, #(4 * 8)]
+        ldr     x8, [x3, #(3 * 8)]
+        ldr     x7, [x3, #(2 * 8)]
+        ldr     x6, [x3, #(1 * 8)]
+        ldr     x5, [x3, #(0 * 8)]
+
+        adr     x26, 1f
+        add     x26, x26, x25, lsl #2
+        br      x26
+1:
+        msr     dbgwcr15_el1, x20
+        msr     dbgwcr14_el1, x19
+        msr     dbgwcr13_el1, x18
+        msr     dbgwcr12_el1, x17
+        msr     dbgwcr11_el1, x16
+        msr     dbgwcr10_el1, x15
+        msr     dbgwcr9_el1, x14
+        msr     dbgwcr8_el1, x13
+        msr     dbgwcr7_el1, x12
+        msr     dbgwcr6_el1, x11
+        msr     dbgwcr5_el1, x10
+        msr     dbgwcr4_el1, x9
+        msr     dbgwcr3_el1, x8
+        msr     dbgwcr2_el1, x7
+        msr     dbgwcr1_el1, x6
+        msr     dbgwcr0_el1, x5
+
+        add     x3, x2, #CPU_SYSREG_OFFSET(DBGWVR0_EL1)
+
+        adr     x26, 1f
+        add     x26, x26, x25, lsl #2
+        br      x26
+1:
+        ldr     x20, [x3, #(15 * 8)]
+        ldr     x19, [x3, #(14 * 8)]
+        ldr     x18, [x3, #(13 * 8)]
+        ldr     x17, [x3, #(12 * 8)]
+        ldr     x16, [x3, #(11 * 8)]
+        ldr     x15, [x3, #(10 * 8)]
+        ldr     x14, [x3, #(9 * 8)]
+        ldr     x13, [x3, #(8 * 8)]
+        ldr     x12, [x3, #(7 * 8)]
+        ldr     x11, [x3, #(6 * 8)]
+        ldr     x10, [x3, #(5 * 8)]
+        ldr     x9, [x3, #(4 * 8)]
+        ldr     x8, [x3, #(3 * 8)]
+        ldr     x7, [x3, #(2 * 8)]
+        ldr     x6, [x3, #(1 * 8)]
+        ldr     x5, [x3, #(0 * 8)]
+
+        adr     x26, 1f
+        add     x26, x26, x25, lsl #2
+        br      x26
+1:
+        msr     dbgwvr15_el1, x20
+        msr     dbgwvr14_el1, x19
+        msr     dbgwvr13_el1, x18
+        msr     dbgwvr12_el1, x17
+        msr     dbgwvr11_el1, x16
+        msr     dbgwvr10_el1, x15
+        msr     dbgwvr9_el1, x14
+        msr     dbgwvr8_el1, x13
+        msr     dbgwvr7_el1, x12
+        msr     dbgwvr6_el1, x11
+        msr     dbgwvr5_el1, x10
+        msr     dbgwvr4_el1, x9
+        msr     dbgwvr3_el1, x8
+        msr     dbgwvr2_el1, x7
+        msr     dbgwvr1_el1, x6
+        msr     dbgwvr0_el1, x5
+
+        ldr     x21, [x2, #CPU_SYSREG_OFFSET(MDCCINT_EL1)]
+        msr     mdccint_el1, x21
 .endm
 
 .macro skip_32bit_state tmp, target
@@ -282,6 +667,35 @@ __kvm_hyp_code_start:
         tbz     \tmp, #12, \target
 .endm
 
+.macro skip_debug_state tmp, target
+        ldr     \tmp, [x0, #VCPU_DEBUG_FLAGS]
+        tbz     \tmp, #KVM_ARM64_DEBUG_DIRTY_SHIFT, \target
+.endm
+
+.macro compute_debug_state target
+        // Compute debug state: If any of KDE, MDE or KVM_ARM64_DEBUG_DIRTY
+        // is set, we do a full save/restore cycle and disable trapping.
+        add     x25, x0, #VCPU_CONTEXT
+
+        // Check the state of MDSCR_EL1
+        ldr     x25, [x25, #CPU_SYSREG_OFFSET(MDSCR_EL1)]
+        and     x26, x25, #DBG_MDSCR_KDE
+        and     x25, x25, #DBG_MDSCR_MDE
+        adds    xzr, x25, x26
+        b.eq    9998f           // Nothing to see there
+
+        // If any interesting bits was set, we must set the flag
+        mov     x26, #KVM_ARM64_DEBUG_DIRTY
+        str     x26, [x0, #VCPU_DEBUG_FLAGS]
+        b       9999f           // Don't skip restore
+
+9998:
+        // Otherwise load the flags from memory in case we recently
+        // trapped
+        skip_debug_state x25, \target
+9999:
+.endm
+
 .macro save_guest_32bit_state
         skip_32bit_state x3, 1f
 
@@ -297,10 +711,13 @@ __kvm_hyp_code_start:
         mrs     x4, dacr32_el2
         mrs     x5, ifsr32_el2
         mrs     x6, fpexc32_el2
-        mrs     x7, dbgvcr32_el2
         stp     x4, x5, [x3]
-        stp     x6, x7, [x3, #16]
+        str     x6, [x3, #16]
 
+        skip_debug_state x8, 2f
+        mrs     x7, dbgvcr32_el2
+        str     x7, [x3, #24]
+2:
         skip_tee_state x8, 1f
 
         add     x3, x2, #CPU_SYSREG_OFFSET(TEECR32_EL1)
@@ -323,12 +740,15 @@ __kvm_hyp_code_start:
 
         add     x3, x2, #CPU_SYSREG_OFFSET(DACR32_EL2)
         ldp     x4, x5, [x3]
-        ldp     x6, x7, [x3, #16]
+        ldr     x6, [x3, #16]
         msr     dacr32_el2, x4
         msr     ifsr32_el2, x5
         msr     fpexc32_el2, x6
-        msr     dbgvcr32_el2, x7
 
+        skip_debug_state x8, 2f
+        ldr     x7, [x3, #24]
+        msr     dbgvcr32_el2, x7
+2:
         skip_tee_state x8, 1f
 
         add     x3, x2, #CPU_SYSREG_OFFSET(TEECR32_EL1)
@@ -339,11 +759,8 @@ __kvm_hyp_code_start:
 .endm
 
 .macro activate_traps
-        ldr     x2, [x0, #VCPU_IRQ_LINES]
-        ldr     x1, [x0, #VCPU_HCR_EL2]
-        orr     x2, x2, x1
-        msr     hcr_el2, x2
-
+        ldr     x2, [x0, #VCPU_HCR_EL2]
+        msr     hcr_el2, x2
         ldr     x2, =(CPTR_EL2_TTA)
         msr     cptr_el2, x2
 
@@ -353,6 +770,14 @@ __kvm_hyp_code_start:
         mrs     x2, mdcr_el2
         and     x2, x2, #MDCR_EL2_HPMN_MASK
         orr     x2, x2, #(MDCR_EL2_TPM | MDCR_EL2_TPMCR)
+        orr     x2, x2, #(MDCR_EL2_TDRA | MDCR_EL2_TDOSA)
+
+        // Check for KVM_ARM64_DEBUG_DIRTY, and set debug to trap
+        // if not dirty.
+        ldr     x3, [x0, #VCPU_DEBUG_FLAGS]
+        tbnz    x3, #KVM_ARM64_DEBUG_DIRTY_SHIFT, 1f
+        orr     x2, x2,  #MDCR_EL2_TDA
+1:
         msr     mdcr_el2, x2
 .endm
 
@@ -379,100 +804,33 @@ __kvm_hyp_code_start:
 .endm
 
 /*
- * Save the VGIC CPU state into memory
- * x0: Register pointing to VCPU struct
- * Do not corrupt x1!!!
+ * Call into the vgic backend for state saving
  */
 .macro save_vgic_state
-        /* Get VGIC VCTRL base into x2 */
-        ldr     x2, [x0, #VCPU_KVM]
-        kern_hyp_va     x2
-        ldr     x2, [x2, #KVM_VGIC_VCTRL]
-        kern_hyp_va     x2
-        cbz     x2, 2f          // disabled
-
-        /* Compute the address of struct vgic_cpu */
-        add     x3, x0, #VCPU_VGIC_CPU
-
-        /* Save all interesting registers */
-        ldr     w4, [x2, #GICH_HCR]
-        ldr     w5, [x2, #GICH_VMCR]
-        ldr     w6, [x2, #GICH_MISR]
-        ldr     w7, [x2, #GICH_EISR0]
-        ldr     w8, [x2, #GICH_EISR1]
-        ldr     w9, [x2, #GICH_ELRSR0]
-        ldr     w10, [x2, #GICH_ELRSR1]
-        ldr     w11, [x2, #GICH_APR]
-CPU_BE( rev     w4,  w4  )
-CPU_BE( rev     w5,  w5  )
-CPU_BE( rev     w6,  w6  )
-CPU_BE( rev     w7,  w7  )
-CPU_BE( rev     w8,  w8  )
-CPU_BE( rev     w9,  w9  )
-CPU_BE( rev     w10, w10 )
-CPU_BE( rev     w11, w11 )
-
-        str     w4, [x3, #VGIC_CPU_HCR]
-        str     w5, [x3, #VGIC_CPU_VMCR]
-        str     w6, [x3, #VGIC_CPU_MISR]
-        str     w7, [x3, #VGIC_CPU_EISR]
-        str     w8, [x3, #(VGIC_CPU_EISR + 4)]
-        str     w9, [x3, #VGIC_CPU_ELRSR]
-        str     w10, [x3, #(VGIC_CPU_ELRSR + 4)]
-        str     w11, [x3, #VGIC_CPU_APR]
-
-        /* Clear GICH_HCR */
-        str     wzr, [x2, #GICH_HCR]
-
-        /* Save list registers */
-        add     x2, x2, #GICH_LR0
-        ldr     w4, [x3, #VGIC_CPU_NR_LR]
-        add     x3, x3, #VGIC_CPU_LR
-1:      ldr     w5, [x2], #4
-CPU_BE( rev     w5, w5 )
-        str     w5, [x3], #4
-        sub     w4, w4, #1
-        cbnz    w4, 1b
-2:
+        adr     x24, __vgic_sr_vectors
+        ldr     x24, [x24, VGIC_SAVE_FN]
+        kern_hyp_va     x24
+        blr     x24
+        mrs     x24, hcr_el2
+        mov     x25, #HCR_INT_OVERRIDE
+        neg     x25, x25
+        and     x24, x24, x25
+        msr     hcr_el2, x24
 .endm
 
 /*
- * Restore the VGIC CPU state from memory
- * x0: Register pointing to VCPU struct
+ * Call into the vgic backend for state restoring
  */
 .macro restore_vgic_state
-        /* Get VGIC VCTRL base into x2 */
-        ldr     x2, [x0, #VCPU_KVM]
-        kern_hyp_va     x2
-        ldr     x2, [x2, #KVM_VGIC_VCTRL]
-        kern_hyp_va     x2
-        cbz     x2, 2f          // disabled
-
-        /* Compute the address of struct vgic_cpu */
-        add     x3, x0, #VCPU_VGIC_CPU
-
-        /* We only restore a minimal set of registers */
-        ldr     w4, [x3, #VGIC_CPU_HCR]
-        ldr     w5, [x3, #VGIC_CPU_VMCR]
-        ldr     w6, [x3, #VGIC_CPU_APR]
-CPU_BE( rev     w4, w4 )
-CPU_BE( rev     w5, w5 )
-CPU_BE( rev     w6, w6 )
-
-        str     w4, [x2, #GICH_HCR]
-        str     w5, [x2, #GICH_VMCR]
-        str     w6, [x2, #GICH_APR]
-
-        /* Restore list registers */
-        add     x2, x2, #GICH_LR0
-        ldr     w4, [x3, #VGIC_CPU_NR_LR]
-        add     x3, x3, #VGIC_CPU_LR
-1:      ldr     w5, [x3], #4
-CPU_BE( rev     w5, w5 )
-        str     w5, [x2], #4
-        sub     w4, w4, #1
-        cbnz    w4, 1b
-2:
+        mrs     x24, hcr_el2
+        ldr     x25, [x0, #VCPU_IRQ_LINES]
+        orr     x24, x24, #HCR_INT_OVERRIDE
+        orr     x24, x24, x25
+        msr     hcr_el2, x24
+        adr     x24, __vgic_sr_vectors
+        ldr     x24, [x24, #VGIC_RESTORE_FN]
+        kern_hyp_va     x24
+        blr     x24
 .endm
 
 .macro save_timer_state
@@ -537,6 +895,14 @@ __restore_sysregs:
         restore_sysregs
         ret
 
+__save_debug:
+        save_debug
+        ret
+
+__restore_debug:
+        restore_debug
+        ret
+
 __save_fpsimd:
         save_fpsimd
         ret
@@ -568,6 +934,9 @@ ENTRY(__kvm_vcpu_run)
         bl __save_fpsimd
         bl __save_sysregs
 
+        compute_debug_state 1f
+        bl      __save_debug
+1:
         activate_traps
         activate_vm
 
@@ -579,6 +948,10 @@ ENTRY(__kvm_vcpu_run)
 
         bl __restore_sysregs
         bl __restore_fpsimd
+
+        skip_debug_state x3, 1f
+        bl      __restore_debug
+1:
         restore_guest_32bit_state
         restore_guest_regs
 
@@ -595,6 +968,10 @@ __kvm_vcpu_return:
         save_guest_regs
         bl __save_fpsimd
         bl __save_sysregs
+
+        skip_debug_state x3, 1f
+        bl      __save_debug
+1:
         save_guest_32bit_state
 
         save_timer_state
@@ -609,6 +986,14 @@ __kvm_vcpu_return:
 
         bl __restore_sysregs
         bl __restore_fpsimd
+
+        skip_debug_state x3, 1f
+        // Clear the dirty flag for the next run, as all the state has
+        // already been saved. Note that we nuke the whole 64bit word.
+        // If we ever add more flags, we'll have to be more careful...
+        str     xzr, [x0, #VCPU_DEBUG_FLAGS]
+        bl      __restore_debug
+1:
         restore_host_regs
 
         mov     x0, x1
@@ -653,6 +1038,12 @@ ENTRY(__kvm_flush_vm_context)
         ret
 ENDPROC(__kvm_flush_vm_context)
 
+        // struct vgic_sr_vectors __vgi_sr_vectors;
+        .align 3
+ENTRY(__vgic_sr_vectors)
+        .skip   VGIC_SR_VECTOR_SZ
+ENDPROC(__vgic_sr_vectors)
+
 __kvm_hyp_panic:
         // Guess the context by looking at VTTBR:
         // If zero, then we're already a host.
@@ -830,7 +1221,7 @@ el1_trap:
         mrs     x2, far_el2
 
 2:      mrs     x0, tpidr_el2
-        str     x1, [x0, #VCPU_ESR_EL2]
+        str     w1, [x0, #VCPU_ESR_EL2]
         str     x2, [x0, #VCPU_FAR_EL2]
         str     x3, [x0, #VCPU_HPFAR_EL2]
 
@@ -880,7 +1271,4 @@ ENTRY(__kvm_hyp_vector)
         ventry  el1_error_invalid               // Error 32-bit EL1
 ENDPROC(__kvm_hyp_vector)
 
-__kvm_hyp_code_end:
-        .globl  __kvm_hyp_code_end
-
         .popsection
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index c59a1bdab5eb..5805e7c4a4dd 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -30,6 +30,7 @@
 #include <asm/kvm_mmu.h>
 #include <asm/cacheflush.h>
 #include <asm/cputype.h>
+#include <asm/debug-monitors.h>
 #include <trace/events/kvm.h>
 
 #include "sys_regs.h"
@@ -137,10 +138,11 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu,
         if (!p->is_aarch32) {
                 vcpu_sys_reg(vcpu, r->reg) = val;
         } else {
-                vcpu_cp15(vcpu, r->reg) = val & 0xffffffffUL;
                 if (!p->is_32bit)
-                        vcpu_cp15(vcpu, r->reg + 1) = val >> 32;
+                        vcpu_cp15_64_high(vcpu, r->reg) = val >> 32;
+                vcpu_cp15_64_low(vcpu, r->reg) = val & 0xffffffffUL;
         }
+
         return true;
 }
 
@@ -163,18 +165,9 @@ static bool access_sctlr(struct kvm_vcpu *vcpu,
         return true;
 }
 
-/*
- * We could trap ID_DFR0 and tell the guest we don't support performance
- * monitoring.  Unfortunately the patch to make the kernel check ID_DFR0 was
- * NAKed, so it will read the PMCR anyway.
- *
- * Therefore we tell the guest we have 0 counters.  Unfortunately, we
- * must always support PMCCNTR (the cycle counter): we just RAZ/WI for
- * all PM registers, which doesn't crash the guest kernel at least.
- */
-static bool pm_fake(struct kvm_vcpu *vcpu,
-                    const struct sys_reg_params *p,
-                    const struct sys_reg_desc *r)
+static bool trap_raz_wi(struct kvm_vcpu *vcpu,
+                        const struct sys_reg_params *p,
+                        const struct sys_reg_desc *r)
 {
         if (p->is_write)
                 return ignore_write(vcpu, p);
@@ -182,6 +175,73 @@ static bool pm_fake(struct kvm_vcpu *vcpu,
                 return read_zero(vcpu, p);
 }
 
+static bool trap_oslsr_el1(struct kvm_vcpu *vcpu,
+                           const struct sys_reg_params *p,
+                           const struct sys_reg_desc *r)
+{
+        if (p->is_write) {
+                return ignore_write(vcpu, p);
+        } else {
+                *vcpu_reg(vcpu, p->Rt) = (1 << 3);
+                return true;
+        }
+}
+
+static bool trap_dbgauthstatus_el1(struct kvm_vcpu *vcpu,
+                                   const struct sys_reg_params *p,
+                                   const struct sys_reg_desc *r)
+{
+        if (p->is_write) {
+                return ignore_write(vcpu, p);
+        } else {
+                u32 val;
+                asm volatile("mrs %0, dbgauthstatus_el1" : "=r" (val));
+                *vcpu_reg(vcpu, p->Rt) = val;
+                return true;
+        }
+}
+
+/*
+ * We want to avoid world-switching all the DBG registers all the
+ * time:
+ * 
+ * - If we've touched any debug register, it is likely that we're
+ *   going to touch more of them. It then makes sense to disable the
+ *   traps and start doing the save/restore dance
+ * - If debug is active (DBG_MDSCR_KDE or DBG_MDSCR_MDE set), it is
+ *   then mandatory to save/restore the registers, as the guest
+ *   depends on them.
+ * 
+ * For this, we use a DIRTY bit, indicating the guest has modified the
+ * debug registers, used as follow:
+ *
+ * On guest entry:
+ * - If the dirty bit is set (because we're coming back from trapping),
+ *   disable the traps, save host registers, restore guest registers.
+ * - If debug is actively in use (DBG_MDSCR_KDE or DBG_MDSCR_MDE set),
+ *   set the dirty bit, disable the traps, save host registers,
+ *   restore guest registers.
+ * - Otherwise, enable the traps
+ *
+ * On guest exit:
+ * - If the dirty bit is set, save guest registers, restore host
+ *   registers and clear the dirty bit. This ensure that the host can
+ *   now use the debug registers.
+ */
+static bool trap_debug_regs(struct kvm_vcpu *vcpu,
+                            const struct sys_reg_params *p,
+                            const struct sys_reg_desc *r)
+{
+        if (p->is_write) {
+                vcpu_sys_reg(vcpu, r->reg) = *vcpu_reg(vcpu, p->Rt);
+                vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;
+        } else {
+                *vcpu_reg(vcpu, p->Rt) = vcpu_sys_reg(vcpu, r->reg);
+        }
+
+        return true;
+}
+
 static void reset_amair_el1(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
 {
         u64 amair;
@@ -198,9 +258,39 @@ static void reset_mpidr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)
         vcpu_sys_reg(vcpu, MPIDR_EL1) = (1UL << 31) | (vcpu->vcpu_id & 0xff);
 }
 
+/* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in one go */
+#define DBG_BCR_BVR_WCR_WVR_EL1(n)                                      \
+        /* DBGBVRn_EL1 */                                               \
+        { Op0(0b10), Op1(0b000), CRn(0b0000), CRm((n)), Op2(0b100),     \
+          trap_debug_regs, reset_val, (DBGBVR0_EL1 + (n)), 0 },         \
+        /* DBGBCRn_EL1 */                                               \
+        { Op0(0b10), Op1(0b000), CRn(0b0000), CRm((n)), Op2(0b101),     \
+          trap_debug_regs, reset_val, (DBGBCR0_EL1 + (n)), 0 },         \
+        /* DBGWVRn_EL1 */                                               \
+        { Op0(0b10), Op1(0b000), CRn(0b0000), CRm((n)), Op2(0b110),     \
+          trap_debug_regs, reset_val, (DBGWVR0_EL1 + (n)), 0 },         \
+        /* DBGWCRn_EL1 */                                               \
+        { Op0(0b10), Op1(0b000), CRn(0b0000), CRm((n)), Op2(0b111),     \
+          trap_debug_regs, reset_val, (DBGWCR0_EL1 + (n)), 0 }
+
 /*
  * Architected system registers.
  * Important: Must be sorted ascending by Op0, Op1, CRn, CRm, Op2
+ *
+ * We could trap ID_DFR0 and tell the guest we don't support performance
+ * monitoring.  Unfortunately the patch to make the kernel check ID_DFR0 was
+ * NAKed, so it will read the PMCR anyway.
+ *
+ * Therefore we tell the guest we have 0 counters.  Unfortunately, we
+ * must always support PMCCNTR (the cycle counter): we just RAZ/WI for
+ * all PM registers, which doesn't crash the guest kernel at least.
+ *
+ * Debug handling: We do trap most, if not all debug related system
+ * registers. The implementation is good enough to ensure that a guest
+ * can use these with minimal performance degradation. The drawback is
+ * that we don't implement any of the external debug, none of the
+ * OSlock protocol. This should be revisited if we ever encounter a
+ * more demanding guest...
  */
 static const struct sys_reg_desc sys_reg_descs[] = {
         /* DC ISW */
@@ -213,12 +303,71 @@ static const struct sys_reg_desc sys_reg_descs[] = {
         { Op0(0b01), Op1(0b000), CRn(0b0111), CRm(0b1110), Op2(0b010),
           access_dcsw },
 
+        DBG_BCR_BVR_WCR_WVR_EL1(0),
+        DBG_BCR_BVR_WCR_WVR_EL1(1),
+        /* MDCCINT_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0000), CRm(0b0010), Op2(0b000),
+          trap_debug_regs, reset_val, MDCCINT_EL1, 0 },
+        /* MDSCR_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0000), CRm(0b0010), Op2(0b010),
+          trap_debug_regs, reset_val, MDSCR_EL1, 0 },
+        DBG_BCR_BVR_WCR_WVR_EL1(2),
+        DBG_BCR_BVR_WCR_WVR_EL1(3),
+        DBG_BCR_BVR_WCR_WVR_EL1(4),
+        DBG_BCR_BVR_WCR_WVR_EL1(5),
+        DBG_BCR_BVR_WCR_WVR_EL1(6),
+        DBG_BCR_BVR_WCR_WVR_EL1(7),
+        DBG_BCR_BVR_WCR_WVR_EL1(8),
+        DBG_BCR_BVR_WCR_WVR_EL1(9),
+        DBG_BCR_BVR_WCR_WVR_EL1(10),
+        DBG_BCR_BVR_WCR_WVR_EL1(11),
+        DBG_BCR_BVR_WCR_WVR_EL1(12),
+        DBG_BCR_BVR_WCR_WVR_EL1(13),
+        DBG_BCR_BVR_WCR_WVR_EL1(14),
+        DBG_BCR_BVR_WCR_WVR_EL1(15),
+
+        /* MDRAR_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0001), CRm(0b0000), Op2(0b000),
+          trap_raz_wi },
+        /* OSLAR_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0001), CRm(0b0000), Op2(0b100),
+          trap_raz_wi },
+        /* OSLSR_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0001), CRm(0b0001), Op2(0b100),
+          trap_oslsr_el1 },
+        /* OSDLR_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0001), CRm(0b0011), Op2(0b100),
+          trap_raz_wi },
+        /* DBGPRCR_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0001), CRm(0b0100), Op2(0b100),
+          trap_raz_wi },
+        /* DBGCLAIMSET_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0111), CRm(0b1000), Op2(0b110),
+          trap_raz_wi },
+        /* DBGCLAIMCLR_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0111), CRm(0b1001), Op2(0b110),
+          trap_raz_wi },
+        /* DBGAUTHSTATUS_EL1 */
+        { Op0(0b10), Op1(0b000), CRn(0b0111), CRm(0b1110), Op2(0b110),
+          trap_dbgauthstatus_el1 },
+
         /* TEECR32_EL1 */
         { Op0(0b10), Op1(0b010), CRn(0b0000), CRm(0b0000), Op2(0b000),
           NULL, reset_val, TEECR32_EL1, 0 },
         /* TEEHBR32_EL1 */
         { Op0(0b10), Op1(0b010), CRn(0b0001), CRm(0b0000), Op2(0b000),
           NULL, reset_val, TEEHBR32_EL1, 0 },
+
+        /* MDCCSR_EL1 */
+        { Op0(0b10), Op1(0b011), CRn(0b0000), CRm(0b0001), Op2(0b000),
+          trap_raz_wi },
+        /* DBGDTR_EL0 */
+        { Op0(0b10), Op1(0b011), CRn(0b0000), CRm(0b0100), Op2(0b000),
+          trap_raz_wi },
+        /* DBGDTR[TR]X_EL0 */
+        { Op0(0b10), Op1(0b011), CRn(0b0000), CRm(0b0101), Op2(0b000),
+          trap_raz_wi },
+
         /* DBGVCR32_EL2 */
         { Op0(0b10), Op1(0b100), CRn(0b0000), CRm(0b0111), Op2(0b000),
           NULL, reset_val, DBGVCR32_EL2, 0 },
@@ -260,10 +409,10 @@ static const struct sys_reg_desc sys_reg_descs[] = {
 
         /* PMINTENSET_EL1 */
         { Op0(0b11), Op1(0b000), CRn(0b1001), CRm(0b1110), Op2(0b001),
-          pm_fake },
+          trap_raz_wi },
         /* PMINTENCLR_EL1 */
         { Op0(0b11), Op1(0b000), CRn(0b1001), CRm(0b1110), Op2(0b010),
-          pm_fake },
+          trap_raz_wi },
 
         /* MAIR_EL1 */
         { Op0(0b11), Op1(0b000), CRn(0b1010), CRm(0b0010), Op2(0b000),
@@ -292,43 +441,43 @@ static const struct sys_reg_desc sys_reg_descs[] = {
 
         /* PMCR_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b000),
-          pm_fake },
+          trap_raz_wi },
         /* PMCNTENSET_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b001),
-          pm_fake },
+          trap_raz_wi },
         /* PMCNTENCLR_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b010),
-          pm_fake },
+          trap_raz_wi },
         /* PMOVSCLR_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b011),
-          pm_fake },
+          trap_raz_wi },
         /* PMSWINC_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b100),
-          pm_fake },
+          trap_raz_wi },
         /* PMSELR_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b101),
-          pm_fake },
+          trap_raz_wi },
         /* PMCEID0_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b110),
-          pm_fake },
+          trap_raz_wi },
         /* PMCEID1_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1100), Op2(0b111),
-          pm_fake },
+          trap_raz_wi },
         /* PMCCNTR_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1101), Op2(0b000),
-          pm_fake },
+          trap_raz_wi },
         /* PMXEVTYPER_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1101), Op2(0b001),
-          pm_fake },
+          trap_raz_wi },
         /* PMXEVCNTR_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1101), Op2(0b010),
-          pm_fake },
+          trap_raz_wi },
         /* PMUSERENR_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1110), Op2(0b000),
-          pm_fake },
+          trap_raz_wi },
         /* PMOVSSET_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1001), CRm(0b1110), Op2(0b011),
-          pm_fake },
+          trap_raz_wi },
 
         /* TPIDR_EL0 */
         { Op0(0b11), Op1(0b011), CRn(0b1101), CRm(0b0000), Op2(0b010),
@@ -348,13 +497,161 @@ static const struct sys_reg_desc sys_reg_descs[] = {
           NULL, reset_val, FPEXC32_EL2, 0x70 },
 };
 
+static bool trap_dbgidr(struct kvm_vcpu *vcpu,
+                        const struct sys_reg_params *p,
+                        const struct sys_reg_desc *r)
+{
+        if (p->is_write) {
+                return ignore_write(vcpu, p);
+        } else {
+                u64 dfr = read_cpuid(ID_AA64DFR0_EL1);
+                u64 pfr = read_cpuid(ID_AA64PFR0_EL1);
+                u32 el3 = !!((pfr >> 12) & 0xf);
+
+                *vcpu_reg(vcpu, p->Rt) = ((((dfr >> 20) & 0xf) << 28) |
+                                          (((dfr >> 12) & 0xf) << 24) |
+                                          (((dfr >> 28) & 0xf) << 20) |
+                                          (6 << 16) | (el3 << 14) | (el3 << 12));
+                return true;
+        }
+}
+
+static bool trap_debug32(struct kvm_vcpu *vcpu,
+                         const struct sys_reg_params *p,
+                         const struct sys_reg_desc *r)
+{
+        if (p->is_write) {
+                vcpu_cp14(vcpu, r->reg) = *vcpu_reg(vcpu, p->Rt);
+                vcpu->arch.debug_flags |= KVM_ARM64_DEBUG_DIRTY;
+        } else {
+                *vcpu_reg(vcpu, p->Rt) = vcpu_cp14(vcpu, r->reg);
+        }
+
+        return true;
+}
+
+#define DBG_BCR_BVR_WCR_WVR(n)                                  \
+        /* DBGBVRn */                                           \
+        { Op1( 0), CRn( 0), CRm((n)), Op2( 4), trap_debug32,    \
+          NULL, (cp14_DBGBVR0 + (n) * 2) },                     \
+        /* DBGBCRn */                                           \
+        { Op1( 0), CRn( 0), CRm((n)), Op2( 5), trap_debug32,    \
+          NULL, (cp14_DBGBCR0 + (n) * 2) },                     \
+        /* DBGWVRn */                                           \
+        { Op1( 0), CRn( 0), CRm((n)), Op2( 6), trap_debug32,    \
+          NULL, (cp14_DBGWVR0 + (n) * 2) },                     \
+        /* DBGWCRn */                                           \
+        { Op1( 0), CRn( 0), CRm((n)), Op2( 7), trap_debug32,    \
+          NULL, (cp14_DBGWCR0 + (n) * 2) }
+
+#define DBGBXVR(n)                                              \
+        { Op1( 0), CRn( 1), CRm((n)), Op2( 1), trap_debug32,    \
+          NULL, cp14_DBGBXVR0 + n * 2 }
+
+/*
+ * Trapped cp14 registers. We generally ignore most of the external
+ * debug, on the principle that they don't really make sense to a
+ * guest. Revisit this one day, whould this principle change.
+ */
+static const struct sys_reg_desc cp14_regs[] = {
+        /* DBGIDR */
+        { Op1( 0), CRn( 0), CRm( 0), Op2( 0), trap_dbgidr },
+        /* DBGDTRRXext */
+        { Op1( 0), CRn( 0), CRm( 0), Op2( 2), trap_raz_wi },
+
+        DBG_BCR_BVR_WCR_WVR(0),
+        /* DBGDSCRint */
+        { Op1( 0), CRn( 0), CRm( 1), Op2( 0), trap_raz_wi },
+        DBG_BCR_BVR_WCR_WVR(1),
+        /* DBGDCCINT */
+        { Op1( 0), CRn( 0), CRm( 2), Op2( 0), trap_debug32 },
+        /* DBGDSCRext */
+        { Op1( 0), CRn( 0), CRm( 2), Op2( 2), trap_debug32 },
+        DBG_BCR_BVR_WCR_WVR(2),
+        /* DBGDTR[RT]Xint */
+        { Op1( 0), CRn( 0), CRm( 3), Op2( 0), trap_raz_wi },
+        /* DBGDTR[RT]Xext */
+        { Op1( 0), CRn( 0), CRm( 3), Op2( 2), trap_raz_wi },
+        DBG_BCR_BVR_WCR_WVR(3),
+        DBG_BCR_BVR_WCR_WVR(4),
+        DBG_BCR_BVR_WCR_WVR(5),
+        /* DBGWFAR */
+        { Op1( 0), CRn( 0), CRm( 6), Op2( 0), trap_raz_wi },
+        /* DBGOSECCR */
+        { Op1( 0), CRn( 0), CRm( 6), Op2( 2), trap_raz_wi },
+        DBG_BCR_BVR_WCR_WVR(6),
+        /* DBGVCR */
+        { Op1( 0), CRn( 0), CRm( 7), Op2( 0), trap_debug32 },
+        DBG_BCR_BVR_WCR_WVR(7),
+        DBG_BCR_BVR_WCR_WVR(8),
+        DBG_BCR_BVR_WCR_WVR(9),
+        DBG_BCR_BVR_WCR_WVR(10),
+        DBG_BCR_BVR_WCR_WVR(11),
+        DBG_BCR_BVR_WCR_WVR(12),
+        DBG_BCR_BVR_WCR_WVR(13),
+        DBG_BCR_BVR_WCR_WVR(14),
+        DBG_BCR_BVR_WCR_WVR(15),
+
+        /* DBGDRAR (32bit) */
+        { Op1( 0), CRn( 1), CRm( 0), Op2( 0), trap_raz_wi },
+
+        DBGBXVR(0),
+        /* DBGOSLAR */
+        { Op1( 0), CRn( 1), CRm( 0), Op2( 4), trap_raz_wi },
+        DBGBXVR(1),
+        /* DBGOSLSR */
+        { Op1( 0), CRn( 1), CRm( 1), Op2( 4), trap_oslsr_el1 },
+        DBGBXVR(2),
+        DBGBXVR(3),
+        /* DBGOSDLR */
+        { Op1( 0), CRn( 1), CRm( 3), Op2( 4), trap_raz_wi },
+        DBGBXVR(4),
+        /* DBGPRCR */
+        { Op1( 0), CRn( 1), CRm( 4), Op2( 4), trap_raz_wi },
+        DBGBXVR(5),
+        DBGBXVR(6),
+        DBGBXVR(7),
+        DBGBXVR(8),
+        DBGBXVR(9),
+        DBGBXVR(10),
+        DBGBXVR(11),
+        DBGBXVR(12),
+        DBGBXVR(13),
+        DBGBXVR(14),
+        DBGBXVR(15),
+
+        /* DBGDSAR (32bit) */
+        { Op1( 0), CRn( 2), CRm( 0), Op2( 0), trap_raz_wi },
+
+        /* DBGDEVID2 */
+        { Op1( 0), CRn( 7), CRm( 0), Op2( 7), trap_raz_wi },
+        /* DBGDEVID1 */
+        { Op1( 0), CRn( 7), CRm( 1), Op2( 7), trap_raz_wi },
+        /* DBGDEVID */
+        { Op1( 0), CRn( 7), CRm( 2), Op2( 7), trap_raz_wi },
+        /* DBGCLAIMSET */
+        { Op1( 0), CRn( 7), CRm( 8), Op2( 6), trap_raz_wi },
+        /* DBGCLAIMCLR */
+        { Op1( 0), CRn( 7), CRm( 9), Op2( 6), trap_raz_wi },
+        /* DBGAUTHSTATUS */
+        { Op1( 0), CRn( 7), CRm(14), Op2( 6), trap_dbgauthstatus_el1 },
+};
+
+/* Trapped cp14 64bit registers */
+static const struct sys_reg_desc cp14_64_regs[] = {
+        /* DBGDRAR (64bit) */
+        { Op1( 0), CRm( 1), .access = trap_raz_wi },
+
+        /* DBGDSAR (64bit) */
+        { Op1( 0), CRm( 2), .access = trap_raz_wi },
+};
+
 /*
  * Trapped cp15 registers. TTBR0/TTBR1 get a double encoding,
  * depending on the way they are accessed (as a 32bit or a 64bit
  * register).
  */
 static const struct sys_reg_desc cp15_regs[] = {
-        { Op1( 0), CRn( 0), CRm( 2), Op2( 0), access_vm_reg, NULL, c2_TTBR0 },
         { Op1( 0), CRn( 1), CRm( 0), Op2( 0), access_sctlr, NULL, c1_SCTLR },
         { Op1( 0), CRn( 2), CRm( 0), Op2( 0), access_vm_reg, NULL, c2_TTBR0 },
         { Op1( 0), CRn( 2), CRm( 0), Op2( 1), access_vm_reg, NULL, c2_TTBR1 },
@@ -374,26 +671,30 @@ static const struct sys_reg_desc cp15_regs[] = {
         { Op1( 0), CRn( 7), CRm(10), Op2( 2), access_dcsw },
         { Op1( 0), CRn( 7), CRm(14), Op2( 2), access_dcsw },
 
-        { Op1( 0), CRn( 9), CRm(12), Op2( 0), pm_fake },
-        { Op1( 0), CRn( 9), CRm(12), Op2( 1), pm_fake },
-        { Op1( 0), CRn( 9), CRm(12), Op2( 2), pm_fake },
-        { Op1( 0), CRn( 9), CRm(12), Op2( 3), pm_fake },
-        { Op1( 0), CRn( 9), CRm(12), Op2( 5), pm_fake },
-        { Op1( 0), CRn( 9), CRm(12), Op2( 6), pm_fake },
-        { Op1( 0), CRn( 9), CRm(12), Op2( 7), pm_fake },
-        { Op1( 0), CRn( 9), CRm(13), Op2( 0), pm_fake },
-        { Op1( 0), CRn( 9), CRm(13), Op2( 1), pm_fake },
-        { Op1( 0), CRn( 9), CRm(13), Op2( 2), pm_fake },
-        { Op1( 0), CRn( 9), CRm(14), Op2( 0), pm_fake },
-        { Op1( 0), CRn( 9), CRm(14), Op2( 1), pm_fake },
-        { Op1( 0), CRn( 9), CRm(14), Op2( 2), pm_fake },
+        /* PMU */
+        { Op1( 0), CRn( 9), CRm(12), Op2( 0), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(12), Op2( 1), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(12), Op2( 2), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(12), Op2( 3), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(12), Op2( 5), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(12), Op2( 6), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(12), Op2( 7), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(13), Op2( 0), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(13), Op2( 1), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(13), Op2( 2), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(14), Op2( 0), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(14), Op2( 1), trap_raz_wi },
+        { Op1( 0), CRn( 9), CRm(14), Op2( 2), trap_raz_wi },
 
         { Op1( 0), CRn(10), CRm( 2), Op2( 0), access_vm_reg, NULL, c10_PRRR },
         { Op1( 0), CRn(10), CRm( 2), Op2( 1), access_vm_reg, NULL, c10_NMRR },
         { Op1( 0), CRn(10), CRm( 3), Op2( 0), access_vm_reg, NULL, c10_AMAIR0 },
         { Op1( 0), CRn(10), CRm( 3), Op2( 1), access_vm_reg, NULL, c10_AMAIR1 },
         { Op1( 0), CRn(13), CRm( 0), Op2( 1), access_vm_reg, NULL, c13_CID },
+};
 
+static const struct sys_reg_desc cp15_64_regs[] = {
+        { Op1( 0), CRn( 0), CRm( 2), Op2( 0), access_vm_reg, NULL, c2_TTBR0 },
         { Op1( 1), CRn( 0), CRm( 2), Op2( 0), access_vm_reg, NULL, c2_TTBR1 },
 };
 
@@ -454,26 +755,29 @@ int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu, struct kvm_run *run)
         return 1;
 }
 
-int kvm_handle_cp14_access(struct kvm_vcpu *vcpu, struct kvm_run *run)
-{
-        kvm_inject_undefined(vcpu);
-        return 1;
-}
-
-static void emulate_cp15(struct kvm_vcpu *vcpu,
-                         const struct sys_reg_params *params)
+/*
+ * emulate_cp --  tries to match a sys_reg access in a handling table, and
+ *                call the corresponding trap handler.
+ *
+ * @params: pointer to the descriptor of the access
+ * @table: array of trap descriptors
+ * @num: size of the trap descriptor array
+ *
+ * Return 0 if the access has been handled, and -1 if not.
+ */
+static int emulate_cp(struct kvm_vcpu *vcpu,
+                      const struct sys_reg_params *params,
+                      const struct sys_reg_desc *table,
+                      size_t num)
 {
-        size_t num;
-        const struct sys_reg_desc *table, *r;
+        const struct sys_reg_desc *r;
 
-        table = get_target_table(vcpu->arch.target, false, &num);
+        if (!table)
+                return -1;      /* Not handled */
 
-        /* Search target-specific then generic table. */
         r = find_reg(params, table, num);
-        if (!r)
-                r = find_reg(params, cp15_regs, ARRAY_SIZE(cp15_regs));
 
-        if (likely(r)) {
+        if (r) {
                 /*
                  * Not having an accessor means that we have
                  * configured a trap that we don't know how to
@@ -485,22 +789,51 @@ static void emulate_cp15(struct kvm_vcpu *vcpu,
                 if (likely(r->access(vcpu, params, r))) {
                         /* Skip instruction, since it was emulated */
                         kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
-                        return;
                 }
-                /* If access function fails, it should complain. */
+
+                /* Handled */
+                return 0;
         }
 
-        kvm_err("Unsupported guest CP15 access at: %08lx\n", *vcpu_pc(vcpu));
+        /* Not handled */
+        return -1;
+}
+
+static void unhandled_cp_access(struct kvm_vcpu *vcpu,
+                                struct sys_reg_params *params)
+{
+        u8 hsr_ec = kvm_vcpu_trap_get_class(vcpu);
+        int cp;
+
+        switch(hsr_ec) {
+        case ESR_EL2_EC_CP15_32:
+        case ESR_EL2_EC_CP15_64:
+                cp = 15;
+                break;
+        case ESR_EL2_EC_CP14_MR:
+        case ESR_EL2_EC_CP14_64:
+                cp = 14;
+                break;
+        default:
+                WARN_ON((cp = -1));
+        }
+
+        kvm_err("Unsupported guest CP%d access at: %08lx\n",
+                cp, *vcpu_pc(vcpu));
         print_sys_reg_instr(params);
         kvm_inject_undefined(vcpu);
 }
 
 /**
- * kvm_handle_cp15_64 -- handles a mrrc/mcrr trap on a guest CP15 access
+ * kvm_handle_cp_64 -- handles a mrrc/mcrr trap on a guest CP15 access
  * @vcpu: The VCPU pointer
  * @run:  The kvm_run struct
  */
-int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run)
+static int kvm_handle_cp_64(struct kvm_vcpu *vcpu,
+                            const struct sys_reg_desc *global,
+                            size_t nr_global,
+                            const struct sys_reg_desc *target_specific,
+                            size_t nr_specific)
 {
         struct sys_reg_params params;
         u32 hsr = kvm_vcpu_get_hsr(vcpu);
@@ -529,8 +862,14 @@ int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run)
                 *vcpu_reg(vcpu, params.Rt) = val;
         }
 
-        emulate_cp15(vcpu, &params);
+        if (!emulate_cp(vcpu, &params, target_specific, nr_specific))
+                goto out;
+        if (!emulate_cp(vcpu, &params, global, nr_global))
+                goto out;
 
+        unhandled_cp_access(vcpu, &params);
+
+out:
         /* Do the opposite hack for the read side */
         if (!params.is_write) {
                 u64 val = *vcpu_reg(vcpu, params.Rt);
@@ -546,7 +885,11 @@ int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run)
  * @vcpu: The VCPU pointer
  * @run:  The kvm_run struct
  */
-int kvm_handle_cp15_32(struct kvm_vcpu *vcpu, struct kvm_run *run)
+static int kvm_handle_cp_32(struct kvm_vcpu *vcpu,
+                            const struct sys_reg_desc *global,
+                            size_t nr_global,
+                            const struct sys_reg_desc *target_specific,
+                            size_t nr_specific)
 {
         struct sys_reg_params params;
         u32 hsr = kvm_vcpu_get_hsr(vcpu);
@@ -561,10 +904,51 @@ int kvm_handle_cp15_32(struct kvm_vcpu *vcpu, struct kvm_run *run)
         params.Op1 = (hsr >> 14) & 0x7;
         params.Op2 = (hsr >> 17) & 0x7;
 
-        emulate_cp15(vcpu, &params);
+        if (!emulate_cp(vcpu, &params, target_specific, nr_specific))
+                return 1;
+        if (!emulate_cp(vcpu, &params, global, nr_global))
+                return 1;
+
+        unhandled_cp_access(vcpu, &params);
         return 1;
 }
 
+int kvm_handle_cp15_64(struct kvm_vcpu *vcpu, struct kvm_run *run)
+{
+        const struct sys_reg_desc *target_specific;
+        size_t num;
+
+        target_specific = get_target_table(vcpu->arch.target, false, &num);
+        return kvm_handle_cp_64(vcpu,
+                                cp15_64_regs, ARRAY_SIZE(cp15_64_regs),
+                                target_specific, num);
+}
+
+int kvm_handle_cp15_32(struct kvm_vcpu *vcpu, struct kvm_run *run)
+{
+        const struct sys_reg_desc *target_specific;
+        size_t num;
+
+        target_specific = get_target_table(vcpu->arch.target, false, &num);
+        return kvm_handle_cp_32(vcpu,
+                                cp15_regs, ARRAY_SIZE(cp15_regs),
+                                target_specific, num);
+}
+
+int kvm_handle_cp14_64(struct kvm_vcpu *vcpu, struct kvm_run *run)
+{
+        return kvm_handle_cp_64(vcpu,
+                                cp14_64_regs, ARRAY_SIZE(cp14_64_regs),
+                                NULL, 0);
+}
+
+int kvm_handle_cp14_32(struct kvm_vcpu *vcpu, struct kvm_run *run)
+{
+        return kvm_handle_cp_32(vcpu,
+                                cp14_regs, ARRAY_SIZE(cp14_regs),
+                                NULL, 0);
+}
+
 static int emulate_sys_reg(struct kvm_vcpu *vcpu,
                            const struct sys_reg_params *params)
 {
@@ -776,17 +1160,15 @@ static struct sys_reg_desc invariant_sys_regs[] = {
           NULL, get_ctr_el0 },
 };
 
-static int reg_from_user(void *val, const void __user *uaddr, u64 id)
+static int reg_from_user(u64 *val, const void __user *uaddr, u64 id)
 {
-        /* This Just Works because we are little endian. */
         if (copy_from_user(val, uaddr, KVM_REG_SIZE(id)) != 0)
                 return -EFAULT;
         return 0;
 }
 
-static int reg_to_user(void __user *uaddr, const void *val, u64 id)
+static int reg_to_user(void __user *uaddr, const u64 *val, u64 id)
 {
-        /* This Just Works because we are little endian. */
         if (copy_to_user(uaddr, val, KVM_REG_SIZE(id)) != 0)
                 return -EFAULT;
         return 0;
@@ -962,7 +1344,7 @@ static unsigned int num_demux_regs(void)
 
 static int write_demux_regids(u64 __user *uindices)
 {
-        u64 val = KVM_REG_ARM | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX;
+        u64 val = KVM_REG_ARM64 | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX;
         unsigned int i;
 
         val |= KVM_REG_ARM_DEMUX_ID_CCSIDR;
@@ -1069,14 +1451,32 @@ int kvm_arm_copy_sys_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices)
         return write_demux_regids(uindices);
 }
 
+static int check_sysreg_table(const struct sys_reg_desc *table, unsigned int n)
+{
+        unsigned int i;
+
+        for (i = 1; i < n; i++) {
+                if (cmp_sys_reg(&table[i-1], &table[i]) >= 0) {
+                        kvm_err("sys_reg table %p out of order (%d)\n", table, i - 1);
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
 void kvm_sys_reg_table_init(void)
 {
         unsigned int i;
         struct sys_reg_desc clidr;
 
         /* Make sure tables are unique and in order. */
-        for (i = 1; i < ARRAY_SIZE(sys_reg_descs); i++)
-                BUG_ON(cmp_sys_reg(&sys_reg_descs[i-1], &sys_reg_descs[i]) >= 0);
+        BUG_ON(check_sysreg_table(sys_reg_descs, ARRAY_SIZE(sys_reg_descs)));
+        BUG_ON(check_sysreg_table(cp14_regs, ARRAY_SIZE(cp14_regs)));
+        BUG_ON(check_sysreg_table(cp14_64_regs, ARRAY_SIZE(cp14_64_regs)));
+        BUG_ON(check_sysreg_table(cp15_regs, ARRAY_SIZE(cp15_regs)));
+        BUG_ON(check_sysreg_table(cp15_64_regs, ARRAY_SIZE(cp15_64_regs)));
+        BUG_ON(check_sysreg_table(invariant_sys_regs, ARRAY_SIZE(invariant_sys_regs)));
 
         /* We abuse the reset function to overwrite the table itself. */
         for (i = 0; i < ARRAY_SIZE(invariant_sys_regs); i++)
diff --git a/arch/arm64/kvm/vgic-v2-switch.S b/arch/arm64/kvm/vgic-v2-switch.S
new file mode 100644
index 000000000000..ae211772f991
--- /dev/null
+++ b/arch/arm64/kvm/vgic-v2-switch.S
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2012,2013 - ARM Ltd
+ * Author: Marc Zyngier <marc.zyngier@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 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/linkage.h>
+#include <linux/irqchip/arm-gic.h>
+
+#include <asm/assembler.h>
+#include <asm/memory.h>
+#include <asm/asm-offsets.h>
+#include <asm/kvm.h>
+#include <asm/kvm_asm.h>
+#include <asm/kvm_arm.h>
+#include <asm/kvm_mmu.h>
+
+        .text
+        .pushsection    .hyp.text, "ax"
+
+/*
+ * Save the VGIC CPU state into memory
+ * x0: Register pointing to VCPU struct
+ * Do not corrupt x1!!!
+ */
+ENTRY(__save_vgic_v2_state)
+__save_vgic_v2_state:
+        /* Get VGIC VCTRL base into x2 */
+        ldr     x2, [x0, #VCPU_KVM]
+        kern_hyp_va     x2
+        ldr     x2, [x2, #KVM_VGIC_VCTRL]
+        kern_hyp_va     x2
+        cbz     x2, 2f          // disabled
+
+        /* Compute the address of struct vgic_cpu */
+        add     x3, x0, #VCPU_VGIC_CPU
+
+        /* Save all interesting registers */
+        ldr     w4, [x2, #GICH_HCR]
+        ldr     w5, [x2, #GICH_VMCR]
+        ldr     w6, [x2, #GICH_MISR]
+        ldr     w7, [x2, #GICH_EISR0]
+        ldr     w8, [x2, #GICH_EISR1]
+        ldr     w9, [x2, #GICH_ELRSR0]
+        ldr     w10, [x2, #GICH_ELRSR1]
+        ldr     w11, [x2, #GICH_APR]
+CPU_BE( rev     w4,  w4  )
+CPU_BE( rev     w5,  w5  )
+CPU_BE( rev     w6,  w6  )
+CPU_BE( rev     w7,  w7  )
+CPU_BE( rev     w8,  w8  )
+CPU_BE( rev     w9,  w9  )
+CPU_BE( rev     w10, w10 )
+CPU_BE( rev     w11, w11 )
+
+        str     w4, [x3, #VGIC_V2_CPU_HCR]
+        str     w5, [x3, #VGIC_V2_CPU_VMCR]
+        str     w6, [x3, #VGIC_V2_CPU_MISR]
+        str     w7, [x3, #VGIC_V2_CPU_EISR]
+        str     w8, [x3, #(VGIC_V2_CPU_EISR + 4)]
+        str     w9, [x3, #VGIC_V2_CPU_ELRSR]
+        str     w10, [x3, #(VGIC_V2_CPU_ELRSR + 4)]
+        str     w11, [x3, #VGIC_V2_CPU_APR]
+
+        /* Clear GICH_HCR */
+        str     wzr, [x2, #GICH_HCR]
+
+        /* Save list registers */
+        add     x2, x2, #GICH_LR0
+        ldr     w4, [x3, #VGIC_CPU_NR_LR]
+        add     x3, x3, #VGIC_V2_CPU_LR
+1:      ldr     w5, [x2], #4
+CPU_BE( rev     w5, w5 )
+        str     w5, [x3], #4
+        sub     w4, w4, #1
+        cbnz    w4, 1b
+2:
+        ret
+ENDPROC(__save_vgic_v2_state)
+
+/*
+ * Restore the VGIC CPU state from memory
+ * x0: Register pointing to VCPU struct
+ */
+ENTRY(__restore_vgic_v2_state)
+__restore_vgic_v2_state:
+        /* Get VGIC VCTRL base into x2 */
+        ldr     x2, [x0, #VCPU_KVM]
+        kern_hyp_va     x2
+        ldr     x2, [x2, #KVM_VGIC_VCTRL]
+        kern_hyp_va     x2
+        cbz     x2, 2f          // disabled
+
+        /* Compute the address of struct vgic_cpu */
+        add     x3, x0, #VCPU_VGIC_CPU
+
+        /* We only restore a minimal set of registers */
+        ldr     w4, [x3, #VGIC_V2_CPU_HCR]
+        ldr     w5, [x3, #VGIC_V2_CPU_VMCR]
+        ldr     w6, [x3, #VGIC_V2_CPU_APR]
+CPU_BE( rev     w4, w4 )
+CPU_BE( rev     w5, w5 )
+CPU_BE( rev     w6, w6 )
+
+        str     w4, [x2, #GICH_HCR]
+        str     w5, [x2, #GICH_VMCR]
+        str     w6, [x2, #GICH_APR]
+
+        /* Restore list registers */
+        add     x2, x2, #GICH_LR0
+        ldr     w4, [x3, #VGIC_CPU_NR_LR]
+        add     x3, x3, #VGIC_V2_CPU_LR
+1:      ldr     w5, [x3], #4
+CPU_BE( rev     w5, w5 )
+        str     w5, [x2], #4
+        sub     w4, w4, #1
+        cbnz    w4, 1b
+2:
+        ret
+ENDPROC(__restore_vgic_v2_state)
+
+        .popsection
diff --git a/arch/arm64/kvm/vgic-v3-switch.S b/arch/arm64/kvm/vgic-v3-switch.S
new file mode 100644
index 000000000000..d16046999e06
--- /dev/null
+++ b/arch/arm64/kvm/vgic-v3-switch.S
@@ -0,0 +1,267 @@
+/*
+ * Copyright (C) 2012,2013 - ARM Ltd
+ * Author: Marc Zyngier <marc.zyngier@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 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/linkage.h>
+#include <linux/irqchip/arm-gic-v3.h>
+
+#include <asm/assembler.h>
+#include <asm/memory.h>
+#include <asm/asm-offsets.h>
+#include <asm/kvm.h>
+#include <asm/kvm_asm.h>
+#include <asm/kvm_arm.h>
+
+        .text
+        .pushsection    .hyp.text, "ax"
+
+/*
+ * We store LRs in reverse order to let the CPU deal with streaming
+ * access. Use this macro to make it look saner...
+ */
+#define LR_OFFSET(n)    (VGIC_V3_CPU_LR + (15 - n) * 8)
+
+/*
+ * Save the VGIC CPU state into memory
+ * x0: Register pointing to VCPU struct
+ * Do not corrupt x1!!!
+ */
+.macro  save_vgic_v3_state
+        // Compute the address of struct vgic_cpu
+        add     x3, x0, #VCPU_VGIC_CPU
+
+        // Make sure stores to the GIC via the memory mapped interface
+        // are now visible to the system register interface
+        dsb     st
+
+        // Save all interesting registers
+        mrs_s   x4, ICH_HCR_EL2
+        mrs_s   x5, ICH_VMCR_EL2
+        mrs_s   x6, ICH_MISR_EL2
+        mrs_s   x7, ICH_EISR_EL2
+        mrs_s   x8, ICH_ELSR_EL2
+
+        str     w4, [x3, #VGIC_V3_CPU_HCR]
+        str     w5, [x3, #VGIC_V3_CPU_VMCR]
+        str     w6, [x3, #VGIC_V3_CPU_MISR]
+        str     w7, [x3, #VGIC_V3_CPU_EISR]
+        str     w8, [x3, #VGIC_V3_CPU_ELRSR]
+
+        msr_s   ICH_HCR_EL2, xzr
+
+        mrs_s   x21, ICH_VTR_EL2
+        mvn     w22, w21
+        ubfiz   w23, w22, 2, 4  // w23 = (15 - ListRegs) * 4
+
+        adr     x24, 1f
+        add     x24, x24, x23
+        br      x24
+
+1:
+        mrs_s   x20, ICH_LR15_EL2
+        mrs_s   x19, ICH_LR14_EL2
+        mrs_s   x18, ICH_LR13_EL2
+        mrs_s   x17, ICH_LR12_EL2
+        mrs_s   x16, ICH_LR11_EL2
+        mrs_s   x15, ICH_LR10_EL2
+        mrs_s   x14, ICH_LR9_EL2
+        mrs_s   x13, ICH_LR8_EL2
+        mrs_s   x12, ICH_LR7_EL2
+        mrs_s   x11, ICH_LR6_EL2
+        mrs_s   x10, ICH_LR5_EL2
+        mrs_s   x9, ICH_LR4_EL2
+        mrs_s   x8, ICH_LR3_EL2
+        mrs_s   x7, ICH_LR2_EL2
+        mrs_s   x6, ICH_LR1_EL2
+        mrs_s   x5, ICH_LR0_EL2
+
+        adr     x24, 1f
+        add     x24, x24, x23
+        br      x24
+
+1:
+        str     x20, [x3, #LR_OFFSET(15)]
+        str     x19, [x3, #LR_OFFSET(14)]
+        str     x18, [x3, #LR_OFFSET(13)]
+        str     x17, [x3, #LR_OFFSET(12)]
+        str     x16, [x3, #LR_OFFSET(11)]
+        str     x15, [x3, #LR_OFFSET(10)]
+        str     x14, [x3, #LR_OFFSET(9)]
+        str     x13, [x3, #LR_OFFSET(8)]
+        str     x12, [x3, #LR_OFFSET(7)]
+        str     x11, [x3, #LR_OFFSET(6)]
+        str     x10, [x3, #LR_OFFSET(5)]
+        str     x9, [x3, #LR_OFFSET(4)]
+        str     x8, [x3, #LR_OFFSET(3)]
+        str     x7, [x3, #LR_OFFSET(2)]
+        str     x6, [x3, #LR_OFFSET(1)]
+        str     x5, [x3, #LR_OFFSET(0)]
+
+        tbnz    w21, #29, 6f    // 6 bits
+        tbz     w21, #30, 5f    // 5 bits
+                                // 7 bits
+        mrs_s   x20, ICH_AP0R3_EL2
+        str     w20, [x3, #(VGIC_V3_CPU_AP0R + 3*4)]
+        mrs_s   x19, ICH_AP0R2_EL2
+        str     w19, [x3, #(VGIC_V3_CPU_AP0R + 2*4)]
+6:      mrs_s   x18, ICH_AP0R1_EL2
+        str     w18, [x3, #(VGIC_V3_CPU_AP0R + 1*4)]
+5:      mrs_s   x17, ICH_AP0R0_EL2
+        str     w17, [x3, #VGIC_V3_CPU_AP0R]
+
+        tbnz    w21, #29, 6f    // 6 bits
+        tbz     w21, #30, 5f    // 5 bits
+                                // 7 bits
+        mrs_s   x20, ICH_AP1R3_EL2
+        str     w20, [x3, #(VGIC_V3_CPU_AP1R + 3*4)]
+        mrs_s   x19, ICH_AP1R2_EL2
+        str     w19, [x3, #(VGIC_V3_CPU_AP1R + 2*4)]
+6:      mrs_s   x18, ICH_AP1R1_EL2
+        str     w18, [x3, #(VGIC_V3_CPU_AP1R + 1*4)]
+5:      mrs_s   x17, ICH_AP1R0_EL2
+        str     w17, [x3, #VGIC_V3_CPU_AP1R]
+
+        // Restore SRE_EL1 access and re-enable SRE at EL1.
+        mrs_s   x5, ICC_SRE_EL2
+        orr     x5, x5, #ICC_SRE_EL2_ENABLE
+        msr_s   ICC_SRE_EL2, x5
+        isb
+        mov     x5, #1
+        msr_s   ICC_SRE_EL1, x5
+.endm
+
+/*
+ * Restore the VGIC CPU state from memory
+ * x0: Register pointing to VCPU struct
+ */
+.macro  restore_vgic_v3_state
+        // Disable SRE_EL1 access. Necessary, otherwise
+        // ICH_VMCR_EL2.VFIQEn becomes one, and FIQ happens...
+        msr_s   ICC_SRE_EL1, xzr
+        isb
+
+        // Compute the address of struct vgic_cpu
+        add     x3, x0, #VCPU_VGIC_CPU
+
+        // Restore all interesting registers
+        ldr     w4, [x3, #VGIC_V3_CPU_HCR]
+        ldr     w5, [x3, #VGIC_V3_CPU_VMCR]
+
+        msr_s   ICH_HCR_EL2, x4
+        msr_s   ICH_VMCR_EL2, x5
+
+        mrs_s   x21, ICH_VTR_EL2
+
+        tbnz    w21, #29, 6f    // 6 bits
+        tbz     w21, #30, 5f    // 5 bits
+                                // 7 bits
+        ldr     w20, [x3, #(VGIC_V3_CPU_AP1R + 3*4)]
+        msr_s   ICH_AP1R3_EL2, x20
+        ldr     w19, [x3, #(VGIC_V3_CPU_AP1R + 2*4)]
+        msr_s   ICH_AP1R2_EL2, x19
+6:      ldr     w18, [x3, #(VGIC_V3_CPU_AP1R + 1*4)]
+        msr_s   ICH_AP1R1_EL2, x18
+5:      ldr     w17, [x3, #VGIC_V3_CPU_AP1R]
+        msr_s   ICH_AP1R0_EL2, x17
+
+        tbnz    w21, #29, 6f    // 6 bits
+        tbz     w21, #30, 5f    // 5 bits
+                                // 7 bits
+        ldr     w20, [x3, #(VGIC_V3_CPU_AP0R + 3*4)]
+        msr_s   ICH_AP0R3_EL2, x20
+        ldr     w19, [x3, #(VGIC_V3_CPU_AP0R + 2*4)]
+        msr_s   ICH_AP0R2_EL2, x19
+6:      ldr     w18, [x3, #(VGIC_V3_CPU_AP0R + 1*4)]
+        msr_s   ICH_AP0R1_EL2, x18
+5:      ldr     w17, [x3, #VGIC_V3_CPU_AP0R]
+        msr_s   ICH_AP0R0_EL2, x17
+
+        and     w22, w21, #0xf
+        mvn     w22, w21
+        ubfiz   w23, w22, 2, 4  // w23 = (15 - ListRegs) * 4
+
+        adr     x24, 1f
+        add     x24, x24, x23
+        br      x24
+
+1:
+        ldr     x20, [x3, #LR_OFFSET(15)]
+        ldr     x19, [x3, #LR_OFFSET(14)]
+        ldr     x18, [x3, #LR_OFFSET(13)]
+        ldr     x17, [x3, #LR_OFFSET(12)]
+        ldr     x16, [x3, #LR_OFFSET(11)]
+        ldr     x15, [x3, #LR_OFFSET(10)]
+        ldr     x14, [x3, #LR_OFFSET(9)]
+        ldr     x13, [x3, #LR_OFFSET(8)]
+        ldr     x12, [x3, #LR_OFFSET(7)]
+        ldr     x11, [x3, #LR_OFFSET(6)]
+        ldr     x10, [x3, #LR_OFFSET(5)]
+        ldr     x9, [x3, #LR_OFFSET(4)]
+        ldr     x8, [x3, #LR_OFFSET(3)]
+        ldr     x7, [x3, #LR_OFFSET(2)]
+        ldr     x6, [x3, #LR_OFFSET(1)]
+        ldr     x5, [x3, #LR_OFFSET(0)]
+
+        adr     x24, 1f
+        add     x24, x24, x23
+        br      x24
+
+1:
+        msr_s   ICH_LR15_EL2, x20
+        msr_s   ICH_LR14_EL2, x19
+        msr_s   ICH_LR13_EL2, x18
+        msr_s   ICH_LR12_EL2, x17
+        msr_s   ICH_LR11_EL2, x16
+        msr_s   ICH_LR10_EL2, x15
+        msr_s   ICH_LR9_EL2,  x14
+        msr_s   ICH_LR8_EL2,  x13
+        msr_s   ICH_LR7_EL2,  x12
+        msr_s   ICH_LR6_EL2,  x11
+        msr_s   ICH_LR5_EL2,  x10
+        msr_s   ICH_LR4_EL2,   x9
+        msr_s   ICH_LR3_EL2,   x8
+        msr_s   ICH_LR2_EL2,   x7
+        msr_s   ICH_LR1_EL2,   x6
+        msr_s   ICH_LR0_EL2,   x5
+
+        // Ensure that the above will have reached the
+        // (re)distributors. This ensure the guest will read
+        // the correct values from the memory-mapped interface.
+        isb
+        dsb     sy
+
+        // Prevent the guest from touching the GIC system registers
+        mrs_s   x5, ICC_SRE_EL2
+        and     x5, x5, #~ICC_SRE_EL2_ENABLE
+        msr_s   ICC_SRE_EL2, x5
+.endm
+
+ENTRY(__save_vgic_v3_state)
+        save_vgic_v3_state
+        ret
+ENDPROC(__save_vgic_v3_state)
+
+ENTRY(__restore_vgic_v3_state)
+        restore_vgic_v3_state
+        ret
+ENDPROC(__restore_vgic_v3_state)
+
+ENTRY(__vgic_v3_get_ich_vtr_el2)
+        mrs_s   x0, ICH_VTR_EL2
+        ret
+ENDPROC(__vgic_v3_get_ich_vtr_el2)
+
+        .popsection
diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c
index 1ba09e4c02b1..91146b416cdb 100644
--- a/arch/avr32/boards/atngw100/mrmt.c
+++ b/arch/avr32/boards/atngw100/mrmt.c
@@ -17,6 +17,8 @@
 #include <linux/types.h>
 #include <linux/fb.h>
 #include <linux/leds.h>
+#include <linux/pwm.h>
+#include <linux/leds_pwm.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 #include <linux/atmel_serial.h>
@@ -155,21 +157,28 @@ static struct platform_device rmt_ts_device = {
 
 #ifdef CONFIG_BOARD_MRMT_BL_PWM
 /* PWM LEDs: LCD Backlight, etc */
-static struct gpio_led rmt_pwm_led[] = {
-        /* here the "gpio" is actually a PWM channel */
-        { .name = "backlight",  .gpio = PWM_CH_BL, },
+static struct pwm_lookup pwm_lookup[] = {
+        PWM_LOOKUP("at91sam9rl-pwm", PWM_CH_BL, "leds_pwm", "ds1",
+                   5000, PWM_POLARITY_INVERSED),
 };
 
-static struct gpio_led_platform_data rmt_pwm_led_data = {
-        .num_leds       = ARRAY_SIZE(rmt_pwm_led),
-        .leds           = rmt_pwm_led,
+static struct led_pwm pwm_leds[] = {
+        {
+                .name = "backlight",
+                .max_brightness = 255,
+        },
+};
+
+static struct led_pwm_platform_data pwm_data = {
+        .num_leds       = ARRAY_SIZE(pwm_leds),
+        .leds           = pwm_leds,
 };
 
-static struct platform_device rmt_pwm_led_dev = {
-        .name           = "leds-atmel-pwm",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &rmt_pwm_led_data,
+static struct platform_device leds_pwm = {
+        .name   = "leds_pwm",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &pwm_data,
         },
 };
 #endif
@@ -325,7 +334,8 @@ static int __init mrmt1_init(void)
 #ifdef CONFIG_BOARD_MRMT_BL_PWM
         /* Use PWM for Backlight controls */
         at32_add_device_pwm(1 << PWM_CH_BL);
-        platform_device_register(&rmt_pwm_led_dev);
+        pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
+        platform_device_register(&leds_pwm);
 #else
         /* Backlight always on */
         udelay( 1 );
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
index 1f121497b517..234cb071c601 100644
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -18,7 +18,10 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/atmel-mci.h>
-#include <linux/atmel-pwm-bl.h>
+#include <linux/pwm.h>
+#include <linux/pwm_backlight.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
@@ -33,6 +36,8 @@
 #include <mach/board.h>
 #include <mach/portmux.h>
 
+#define PWM_BL_CH 2
+
 /* Oscillator frequencies. These are board-specific */
 unsigned long at32_board_osc_rates[3] = {
         [0] = 32768,    /* 32.768 kHz on RTC osc */
@@ -227,29 +232,36 @@ void __init favr32_setup_leds(void)
         platform_device_register(&favr32_led_dev);
 }
 
-static struct atmel_pwm_bl_platform_data atmel_pwm_bl_pdata = {
-        .pwm_channel            = 2,
-        .pwm_frequency          = 200000,
-        .pwm_compare_max        = 345,
-        .pwm_duty_max           = 345,
-        .pwm_duty_min           = 90,
-        .pwm_active_low         = 1,
-        .gpio_on                = GPIO_PIN_PA(28),
-        .on_active_low          = 0,
+static struct pwm_lookup pwm_lookup[] = {
+        PWM_LOOKUP("at91sam9rl-pwm", PWM_BL_CH, "pwm-backlight.0", NULL,
+                   5000, PWM_POLARITY_INVERSED),
 };
 
-static struct platform_device atmel_pwm_bl_dev = {
-        .name           = "atmel-pwm-bl",
-        .id             = 0,
-        .dev            = {
-                .platform_data = &atmel_pwm_bl_pdata,
+static struct regulator_consumer_supply fixed_power_consumers[] = {
+        REGULATOR_SUPPLY("power", "pwm-backlight.0"),
+};
+
+static struct platform_pwm_backlight_data pwm_bl_data = {
+        .enable_gpio            = GPIO_PIN_PA(28),
+        .max_brightness         = 255,
+        .dft_brightness         = 255,
+        .lth_brightness         = 50,
+};
+
+static struct platform_device pwm_bl_device = {
+        .name = "pwm-backlight",
+        .dev = {
+                .platform_data = &pwm_bl_data,
         },
 };
 
 static void __init favr32_setup_atmel_pwm_bl(void)
 {
-        platform_device_register(&atmel_pwm_bl_dev);
-        at32_select_gpio(atmel_pwm_bl_pdata.gpio_on, 0);
+        pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
+        regulator_register_always_on(0, "fixed", fixed_power_consumers,
+                                    ARRAY_SIZE(fixed_power_consumers), 3300000);
+        platform_device_register(&pwm_bl_device);
+        at32_select_gpio(pwm_bl_data.enable_gpio, 0);
 }
 
 void __init setup_board(void)
@@ -339,7 +351,7 @@ static int __init favr32_init(void)
 
         set_abdac_rate(at32_add_device_abdac(0, &abdac0_data));
 
-        at32_add_device_pwm(1 << atmel_pwm_bl_pdata.pwm_channel);
+        at32_add_device_pwm(1 << PWM_BL_CH);
         at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
         at32_add_device_mci(0, &mci0_data);
         at32_add_device_usba(0, NULL);
diff --git a/arch/avr32/boards/hammerhead/flash.c b/arch/avr32/boards/hammerhead/flash.c
index 776c3cb9b6e4..e86280ccd8fa 100644
--- a/arch/avr32/boards/hammerhead/flash.c
+++ b/arch/avr32/boards/hammerhead/flash.c
@@ -190,14 +190,19 @@ static int __init hammerhead_usbh_init(void)
 
         /* setup gclk0 to run from osc1 */
         gclk = clk_get(NULL, "gclk0");
-        if (IS_ERR(gclk))
+        if (IS_ERR(gclk)) {
+                ret = PTR_ERR(gclk);
                 goto err_gclk;
+        }
 
         osc = clk_get(NULL, "osc1");
-        if (IS_ERR(osc))
+        if (IS_ERR(osc)) {
+                ret = PTR_ERR(osc);
                 goto err_osc;
+        }
 
-        if (clk_set_parent(gclk, osc)) {
+        ret = clk_set_parent(gclk, osc);
+        if (ret < 0) {
                 pr_debug("hammerhead: failed to set osc1 for USBH clock\n");
                 goto err_set_clk;
         }
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index ed137e335796..83d896cc2aed 100644
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -22,6 +22,8 @@
 #include <linux/irq.h>
 #include <linux/fb.h>
 #include <linux/atmel-mci.h>
+#include <linux/pwm.h>
+#include <linux/leds_pwm.h>
 
 #include <asm/io.h>
 #include <asm/setup.h>
@@ -167,24 +169,29 @@ static struct i2c_board_info __initdata i2c_info[] = {
         },
 };
 
-#ifdef CONFIG_LEDS_ATMEL_PWM
-static struct gpio_led stk_pwm_led[] = {
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+static struct pwm_lookup pwm_lookup[] = {
+        PWM_LOOKUP("at91sam9rl-pwm", 0, "leds_pwm", "backlight",
+                   5000, PWM_POLARITY_NORMAL),
+};
+
+static struct led_pwm pwm_leds[] = {
         {
                 .name   = "backlight",
-                .gpio   = 0,            /* PWM channel 0 (LCD backlight) */
+                .max_brightness = 255,
         },
 };
 
-static struct gpio_led_platform_data stk_pwm_led_data = {
-        .num_leds       = ARRAY_SIZE(stk_pwm_led),
-        .leds           = stk_pwm_led,
+static struct led_pwm_platform_data pwm_data = {
+        .num_leds       = ARRAY_SIZE(pwm_leds),
+        .leds           = pwm_leds,
 };
 
-static struct platform_device stk_pwm_led_dev = {
-        .name   = "leds-atmel-pwm",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &stk_pwm_led_data,
+static struct platform_device leds_pwm = {
+        .name   = "leds_pwm",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &pwm_data,
         },
 };
 #endif
@@ -278,9 +285,10 @@ static int __init merisc_init(void)
 
         at32_add_device_mci(0, &mci0_data);
 
-#ifdef CONFIG_LEDS_ATMEL_PWM
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+        pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
         at32_add_device_pwm((1 << 0) | (1 << 2));
-        platform_device_register(&stk_pwm_led_dev);
+        platform_device_register(&leds_pwm);
 #else
         at32_add_device_pwm((1 << 2));
 #endif
diff --git a/arch/avr32/configs/atngw100_mrmt_defconfig b/arch/avr32/configs/atngw100_mrmt_defconfig
index 9a57da44eb6f..6838781e966f 100644
--- a/arch/avr32/configs/atngw100_mrmt_defconfig
+++ b/arch/avr32/configs/atngw100_mrmt_defconfig
@@ -56,7 +56,6 @@ CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_DATAFLASH=y
 CONFIG_BLK_DEV_LOOP=y
-CONFIG_ATMEL_PWM=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_MACB=y
@@ -104,8 +103,8 @@ CONFIG_MMC=y
 CONFIG_MMC_ATMELMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_ATMEL_PWM=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -114,6 +113,8 @@ CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_AT32AP700X=m
 CONFIG_DMADEVICES=y
 CONFIG_UIO=y
+CONFIG_PWM=y
+CONFIG_PWM_ATMEL=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT3_FS=y
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index 2813dd2b9138..b056820eef33 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -64,7 +64,6 @@ CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_MISC_DEVICES=y
-CONFIG_ATMEL_PWM=m
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_SSC=m
 # CONFIG_SCSI_PROC_FS is not set
@@ -133,14 +132,16 @@ CONFIG_MMC_TEST=m
 CONFIG_MMC_ATMELMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_ATMEL_PWM=m
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_PWM=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AT32AP700X=y
 CONFIG_DMADEVICES=y
+CONFIG_PWM=y
+CONFIG_PWM_ATMEL=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig
index f8ff3a3baad4..0cd23a303da1 100644
--- a/arch/avr32/configs/atstk1003_defconfig
+++ b/arch/avr32/configs/atstk1003_defconfig
@@ -53,7 +53,6 @@ CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_MISC_DEVICES=y
-CONFIG_ATMEL_PWM=m
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_SSC=m
 # CONFIG_SCSI_PROC_FS is not set
@@ -112,14 +111,16 @@ CONFIG_MMC_TEST=m
 CONFIG_MMC_ATMELMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_ATMEL_PWM=m
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_PWM=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AT32AP700X=y
 CONFIG_DMADEVICES=y
+CONFIG_PWM=y
+CONFIG_PWM_ATMEL=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig
index 992228e54e38..ac1041f5f85a 100644
--- a/arch/avr32/configs/atstk1004_defconfig
+++ b/arch/avr32/configs/atstk1004_defconfig
@@ -53,7 +53,6 @@ CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_MISC_DEVICES=y
-CONFIG_ATMEL_PWM=m
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_SSC=m
 # CONFIG_SCSI_PROC_FS is not set
@@ -111,14 +110,16 @@ CONFIG_MMC_TEST=m
 CONFIG_MMC_ATMELMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_ATMEL_PWM=m
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_PWM=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AT32AP700X=y
 CONFIG_DMADEVICES=y
+CONFIG_PWM=y
+CONFIG_PWM_ATMEL=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig
index b8e698b0d1fa..ea4f670cb995 100644
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
@@ -67,7 +67,6 @@ CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_MISC_DEVICES=y
-CONFIG_ATMEL_PWM=m
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_SSC=m
 # CONFIG_SCSI_PROC_FS is not set
@@ -136,14 +135,16 @@ CONFIG_MMC_TEST=m
 CONFIG_MMC_ATMELMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_ATMEL_PWM=m
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_PWM=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AT32AP700X=y
 CONFIG_DMADEVICES=y
+CONFIG_PWM=y
+CONFIG_PWM_ATMEL=m
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig
index 07bed3f7eb5e..b3eb67dc05ac 100644
--- a/arch/avr32/configs/favr-32_defconfig
+++ b/arch/avr32/configs/favr-32_defconfig
@@ -67,7 +67,6 @@ CONFIG_MTD_PHYSMAP=y
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=m
-CONFIG_ATMEL_PWM=m
 CONFIG_ATMEL_TCLIB=y
 CONFIG_ATMEL_SSC=m
 CONFIG_NETDEVICES=y
@@ -108,7 +107,7 @@ CONFIG_FB=y
 CONFIG_FB_ATMEL=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_ATMEL_PWM=m
+CONFIG_BACKLIGHT_PWM=m
 CONFIG_SOUND=m
 CONFIG_SOUND_PRIME=m
 # CONFIG_HID_SUPPORT is not set
@@ -123,7 +122,6 @@ CONFIG_MMC=y
 CONFIG_MMC_ATMELMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_ATMEL_PWM=m
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
@@ -132,6 +130,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_AT32AP700X=y
 CONFIG_DMADEVICES=y
+CONFIG_PWM=y
+CONFIG_PWM_ATMEL=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig
index 91df6b2986be..b9ef4cc85d08 100644
--- a/arch/avr32/configs/merisc_defconfig
+++ b/arch/avr32/configs/merisc_defconfig
@@ -55,7 +55,6 @@ CONFIG_MTD_ABSENT=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_BLOCK2MTD=y
 CONFIG_BLK_DEV_LOOP=y
-CONFIG_ATMEL_PWM=y
 CONFIG_ATMEL_SSC=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
@@ -103,12 +102,14 @@ CONFIG_MMC=y
 CONFIG_MMC_ATMELMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_ATMEL_PWM=y
+CONFIG_LEDS_PWM=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
 CONFIG_RTC_DRV_PCF8563=y
 CONFIG_DMADEVICES=y
 CONFIG_UIO=y
+CONFIG_PWM=y
+CONFIG_PWM_ATMEL=m
 CONFIG_EXT2_FS=y
 # CONFIG_DNOTIFY is not set
 CONFIG_FUSE_FS=y
diff --git a/arch/avr32/kernel/signal.c b/arch/avr32/kernel/signal.c
index b80c0b3d2bab..d309fbcc3bd6 100644
--- a/arch/avr32/kernel/signal.c
+++ b/arch/avr32/kernel/signal.c
@@ -127,24 +127,20 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs)
 }
 
 static inline void __user *
-get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, int framesize)
+get_sigframe(struct ksignal *ksig, struct pt_regs *regs, int framesize)
 {
-        unsigned long sp = regs->sp;
-
-        if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
-                sp = current->sas_ss_sp + current->sas_ss_size;
+        unsigned long sp = sigsp(regs->sp, ksig);
 
         return (void __user *)((sp - framesize) & ~3);
 }
 
 static int
-setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-               sigset_t *set, struct pt_regs *regs)
+setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
         err = -EFAULT;
         if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
                 goto out;
@@ -164,7 +160,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err = __put_user(0x3008d733 | (__NR_rt_sigreturn << 20),
                          &frame->retcode);
 
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         /* Set up the ucontext */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -176,12 +172,12 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         if (err)
                 goto out;
 
-        regs->r12 = sig;
+        regs->r12 = ksig->sig;
         regs->r11 = (unsigned long) &frame->info;
         regs->r10 = (unsigned long) &frame->uc;
         regs->sp = (unsigned long) frame;
-        if (ka->sa.sa_flags & SA_RESTORER)
-                regs->lr = (unsigned long)ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER)
+                regs->lr = (unsigned long)ksig->ka.sa.sa_restorer;
         else {
                 printk(KERN_NOTICE "[%s:%d] did not set SA_RESTORER\n",
                        current->comm, current->pid);
@@ -189,10 +185,10 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         }
 
         pr_debug("SIG deliver [%s:%d]: sig=%d sp=0x%lx pc=0x%lx->0x%p lr=0x%lx\n",
-                 current->comm, current->pid, sig, regs->sp,
-                 regs->pc, ka->sa.sa_handler, regs->lr);
+                 current->comm, current->pid, ksig->sig, regs->sp,
+                 regs->pc, ksig->ka.sa.sa_handler, regs->lr);
 
-        regs->pc = (unsigned long) ka->sa.sa_handler;
+        regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
 
 out:
         return err;
@@ -208,15 +204,14 @@ static inline void setup_syscall_restart(struct pt_regs *regs)
 }
 
 static inline void
-handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
-              struct pt_regs *regs, int syscall)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs, int syscall)
 {
         int ret;
 
         /*
          * Set up the stack frame
          */
-        ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);
+        ret = setup_rt_frame(ksig, sigmask_to_save(), regs);
 
         /*
          * Check that the resulting registers are sane
@@ -226,10 +221,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
         /*
          * Block the signal if we were successful.
          */
-        if (ret != 0)
-                force_sigsegv(sig, current);
-        else
-                signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 /*
@@ -239,9 +231,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
  */
 static void do_signal(struct pt_regs *regs, int syscall)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         /*
          * We want the common case to go fast, which is why we may in
@@ -251,18 +241,18 @@ static void do_signal(struct pt_regs *regs, int syscall)
         if (!user_mode(regs))
                 return;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+        get_signal(&ksig);
         if (syscall) {
                 switch (regs->r12) {
                 case -ERESTART_RESTARTBLOCK:
                 case -ERESTARTNOHAND:
-                        if (signr > 0) {
+                        if (ksig.sig > 0) {
                                 regs->r12 = -EINTR;
                                 break;
                         }
                         /* fall through */
                 case -ERESTARTSYS:
-                        if (signr > 0 && !(ka.sa.sa_flags & SA_RESTART)) {
+                        if (ksig.sig > 0 && !(ksig.ka.sa.sa_flags & SA_RESTART)) {
                                 regs->r12 = -EINTR;
                                 break;
                         }
@@ -272,13 +262,13 @@ static void do_signal(struct pt_regs *regs, int syscall)
                 }
         }
 
-        if (signr == 0) {
+        if (!ksig.sig) {
                 /* No signal to deliver -- put the saved sigmask back */
                 restore_saved_sigmask();
                 return;
         }
 
-        handle_signal(signr, &ka, &info, regs, syscall);
+        handle_signal(&ksig, regs, syscall);
 }
 
 asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti)
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index a1f4d1e91b52..db85b5ec3351 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1553,7 +1553,7 @@ static struct resource atmel_pwm0_resource[] __initdata = {
         IRQ(24),
 };
 static struct clk atmel_pwm0_mck = {
-        .name           = "pwm_clk",
+        .name           = "at91sam9rl-pwm",
         .parent         = &pbb_clk,
         .mode           = pbb_clk_mode,
         .get_rate       = pbb_clk_get_rate,
@@ -1568,7 +1568,7 @@ struct platform_device *__init at32_add_device_pwm(u32 mask)
         if (!mask)
                 return NULL;
 
-        pdev = platform_device_alloc("atmel_pwm", 0);
+        pdev = platform_device_alloc("at91sam9rl-pwm", 0);
         if (!pdev)
                 return NULL;
 
@@ -1576,9 +1576,6 @@ struct platform_device *__init at32_add_device_pwm(u32 mask)
                                 ARRAY_SIZE(atmel_pwm0_resource)))
                 goto out_free_pdev;
 
-        if (platform_device_add_data(pdev, &mask, sizeof(mask)))
-                goto out_free_pdev;
-
         pin_mask = 0;
         if (mask & (1 << 0))
                 pin_mask |= (1 << 28);
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c
index b022af6c48f8..ef275571d885 100644
--- a/arch/blackfin/kernel/signal.c
+++ b/arch/blackfin/kernel/signal.c
@@ -135,40 +135,31 @@ static inline int rt_setup_sigcontext(struct sigcontext *sc, struct pt_regs *reg
         return err;
 }
 
-static inline void *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+static inline void *get_sigframe(struct ksignal *ksig,
                                  size_t frame_size)
 {
-        unsigned long usp;
+        unsigned long usp = sigsp(rdusp(), ksig);
 
-        /* Default to using normal stack.  */
-        usp = rdusp();
-
-        /* This is the X/Open sanctioned signal stack switching.  */
-        if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (!on_sig_stack(usp))
-                        usp = current->sas_ss_sp + current->sas_ss_size;
-        }
         return (void *)((usp - frame_size) & -8UL);
 }
 
 static int
-setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
-               sigset_t * set, struct pt_regs *regs)
+setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         err |= __put_user((current_thread_info()->exec_domain
                            && current_thread_info()->exec_domain->signal_invmap
-                           && sig < 32
+                           && ksig->sig < 32
                            ? current_thread_info()->exec_domain->
-                           signal_invmap[sig] : sig), &frame->sig);
+                           signal_invmap[ksig->sig] : ksig->sig), &frame->sig);
 
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -183,7 +174,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
         /* Set up registers for signal handler */
         if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
-                        (struct fdpic_func_descriptor *) ka->sa.sa_handler;
+                        (struct fdpic_func_descriptor *) ksig->ka.sa.sa_handler;
                 u32 pc, p3;
                 err |= __get_user(pc, &funcptr->text);
                 err |= __get_user(p3, &funcptr->GOT);
@@ -192,7 +183,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
                 regs->pc = pc;
                 regs->p3 = p3;
         } else
-                regs->pc = (unsigned long)ka->sa.sa_handler;
+                regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
         wrusp((unsigned long)frame);
         regs->rets = SIGRETURN_STUB;
 
@@ -237,20 +228,19 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
  * OK, we're invoking a handler
  */
 static void
-handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,
-              struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
+        int ret;
+
         /* are we from a system call? to see pt_regs->orig_p0 */
         if (regs->orig_p0 >= 0)
                 /* If so, check system call restarting.. */
-                handle_restart(regs, ka, 1);
+                handle_restart(regs, &ksig->ka, 1);
 
         /* set up the stack frame */
-        if (setup_rt_frame(sig, ka, info, sigmask_to_save(), regs) < 0)
-                force_sigsegv(sig, current);
-        else 
-                signal_delivered(sig, info, ka, regs,
-                                test_thread_flag(TIF_SINGLESTEP));
+        ret = setup_rt_frame(ksig, sigmask_to_save(), regs);
+
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -264,16 +254,13 @@ handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,
  */
 asmlinkage void do_signal(struct pt_regs *regs)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         current->thread.esp0 = (unsigned long)regs;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(signr, &info, &ka, regs);
+                handle_signal(&ksig, regs);
                 return;
         }
 
diff --git a/arch/c6x/kernel/signal.c b/arch/c6x/kernel/signal.c
index 3998b24e26f2..fe68226f6c4d 100644
--- a/arch/c6x/kernel/signal.c
+++ b/arch/c6x/kernel/signal.c
@@ -127,17 +127,11 @@ static int setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
         return err;
 }
 
-static inline void __user *get_sigframe(struct k_sigaction *ka,
+static inline void __user *get_sigframe(struct ksignal *ksig,
                                         struct pt_regs *regs,
                                         unsigned long framesize)
 {
-        unsigned long sp = regs->sp;
-
-        /*
-         * This is the X/Open sanctioned signal stack switching.
-         */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && sas_ss_flags(sp) == 0)
-                sp = current->sas_ss_sp + current->sas_ss_size;
+        unsigned long sp = sigsp(regs->sp, ksig);
 
         /*
          * No matter what happens, 'sp' must be dword
@@ -146,21 +140,21 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
         return (void __user *)((sp - framesize) & ~7);
 }
 
-static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
-                           sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
         unsigned long __user *retcode;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto segv_and_exit;
+                return -EFAULT;
 
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         /* Clear all the bits of the ucontext we don't use.  */
         err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext));
@@ -188,7 +182,7 @@ static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
 #undef COPY
 
         if (err)
-                goto segv_and_exit;
+                return -EFAULT;
 
         flush_icache_range((unsigned long) &frame->retcode,
                            (unsigned long) &frame->retcode + RETCODE_SIZE);
@@ -198,10 +192,10 @@ static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
         /* Change user context to branch to signal handler */
         regs->sp = (unsigned long) frame - 8;
         regs->b3 = (unsigned long) retcode;
-        regs->pc = (unsigned long) ka->sa.sa_handler;
+        regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
 
         /* Give the signal number to the handler */
-        regs->a4 = signr;
+        regs->a4 = ksig->sig;
 
         /*
          * For realtime signals we must also set the second and third
@@ -212,10 +206,6 @@ static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
         regs->a6 = (unsigned long)&frame->uc;
 
         return 0;
-
-segv_and_exit:
-        force_sigsegv(signr, current);
-        return -EFAULT;
 }
 
 static inline void
@@ -245,10 +235,11 @@ do_restart:
 /*
  * handle the actual delivery of a signal to userspace
  */
-static void handle_signal(int sig,
-                         siginfo_t *info, struct k_sigaction *ka,
-                         struct pt_regs *regs, int syscall)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs,
+                          int syscall)
 {
+        int ret;
+
         /* Are we from a system call? */
         if (syscall) {
                 /* If so, check system call restarting.. */
@@ -259,7 +250,7 @@ static void handle_signal(int sig,
                         break;
 
                 case -ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 regs->a4 = -EINTR;
                                 break;
                         }
@@ -272,9 +263,8 @@ static void handle_signal(int sig,
         }
 
         /* Set up the stack frame */
-        if (setup_rt_frame(sig, ka, info, sigmask_to_save(), regs) < 0)
-                return;
-        signal_delivered(sig, info, ka, regs, 0);
+        ret = setup_rt_frame(ksig, sigmask_to_save(), regs);
+        signal_setup_done(ret, ksig, 0);
 }
 
 /*
@@ -282,18 +272,15 @@ static void handle_signal(int sig,
  */
 static void do_signal(struct pt_regs *regs, int syscall)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
+        struct ksignal ksig;
 
         /* we want the common case to go fast, which is why we may in certain
          * cases get here from kernel mode */
         if (!user_mode(regs))
                 return;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
-                handle_signal(signr, &info, &ka, regs, syscall);
+        if (get_signal(&ksig)) {
+                handle_signal(&ksig, regs, syscall);
                 return;
         }
 
diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c
index 61ce6273a895..9b32d338838b 100644
--- a/arch/cris/arch-v10/kernel/signal.c
+++ b/arch/cris/arch-v10/kernel/signal.c
@@ -203,15 +203,9 @@ static int setup_sigcontext(struct sigcontext __user *sc,
  * - usually on the stack. */
 
 static inline void __user *
-get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
+get_sigframe(struct ksignal *ksig, size_t frame_size)
 {
-        unsigned long sp = rdusp();
-
-        /* This is the X/Open sanctioned signal stack switching.  */
-        if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (! on_sig_stack(sp))
-                        sp = current->sas_ss_sp + current->sas_ss_size;
-        }
+        unsigned long sp = sigsp(rdusp(), ksig);
 
         /* make sure the frame is dword-aligned */
 
@@ -228,33 +222,33 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
  * user-mode trampoline.
  */
 
-static int setup_frame(int sig, struct k_sigaction *ka,
-                       sigset_t *set, struct pt_regs *regs)
+static int setup_frame(struct ksignal *ksig, sigset_t *set,
+                       struct pt_regs *regs)
 {
         struct sigframe __user *frame;
         unsigned long return_ip;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         err |= setup_sigcontext(&frame->sc, regs, set->sig[0]);
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (_NSIG_WORDS > 1) {
                 err |= __copy_to_user(frame->extramask, &set->sig[1],
                                       sizeof(frame->extramask));
         }
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                return_ip = (unsigned long)ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                return_ip = (unsigned long)ksig->ka.sa.sa_restorer;
         } else {
                 /* trampoline - the desired return ip is the retcode itself */
                 return_ip = (unsigned long)&frame->retcode;
@@ -265,42 +259,38 @@ static int setup_frame(int sig, struct k_sigaction *ka,
         }
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up registers for signal handler */
 
-        regs->irp = (unsigned long) ka->sa.sa_handler;  /* what we enter NOW   */
+        regs->irp = (unsigned long) ksig->ka.sa.sa_handler;  /* what we enter NOW   */
         regs->srp = return_ip;                          /* what we enter LATER */
-        regs->r10 = sig;                                /* first argument is signo */
+        regs->r10 = ksig->sig;                                /* first argument is signo */
 
         /* actually move the usp to reflect the stacked frame */
 
         wrusp((unsigned long)frame);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-        sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
         unsigned long return_ip;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Clear all the bits of the ucontext we don't use.  */
         err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext));
@@ -312,12 +302,12 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= __save_altstack(&frame->uc.uc_stack, rdusp());
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                return_ip = (unsigned long)ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                return_ip = (unsigned long)ksig->ka.sa.sa_restorer;
         } else {
                 /* trampoline - the desired return ip is the retcode itself */
                 return_ip = (unsigned long)&frame->retcode;
@@ -329,18 +319,18 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         }
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* TODO what is the current->exec_domain stuff and invmap ? */
 
         /* Set up registers for signal handler */
 
         /* What we enter NOW   */
-        regs->irp = (unsigned long) ka->sa.sa_handler;
+        regs->irp = (unsigned long) ksig->ka.sa.sa_handler;
         /* What we enter LATER */
         regs->srp = return_ip;
         /* First argument is signo */
-        regs->r10 = sig;
+        regs->r10 = ksig->sig;
         /* Second argument is (siginfo_t *) */
         regs->r11 = (unsigned long)&frame->info;
         /* Third argument is unused */
@@ -350,19 +340,14 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         wrusp((unsigned long)frame);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 /*
  * OK, we're invoking a handler
  */
 
-static inline void handle_signal(int canrestart, unsigned long sig,
-        siginfo_t *info, struct k_sigaction *ka,
-        struct pt_regs *regs)
+static inline void handle_signal(int canrestart, struct ksignal *ksig,
+                                 struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
@@ -383,7 +368,7 @@ static inline void handle_signal(int canrestart, unsigned long sig,
                         /* ERESTARTSYS means to restart the syscall if
                          * there is no handler or the handler was
                          * registered with SA_RESTART */
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 regs->r10 = -EINTR;
                                 break;
                         }
@@ -396,13 +381,12 @@ static inline void handle_signal(int canrestart, unsigned long sig,
         }
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame(ksig, oldset, regs);
         else
-                ret = setup_frame(sig, ka, oldset, regs);
+                ret = setup_frame(ksig, oldset, regs);
 
-        if (ret == 0)
-                signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 /*
@@ -419,9 +403,7 @@ static inline void handle_signal(int canrestart, unsigned long sig,
 
 void do_signal(int canrestart, struct pt_regs *regs)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         /*
          * We want the common case to go fast, which
@@ -432,10 +414,9 @@ void do_signal(int canrestart, struct pt_regs *regs)
         if (!user_mode(regs))
                 return;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(canrestart, signr, &info, &ka, regs);
+                handle_signal(canrestart, &ksig, regs);
                 return;
         }
 
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index 01d1375c9004..78ce3b1c9bcb 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -189,17 +189,9 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
 
 /* Figure out where to put the new signal frame - usually on the stack. */
 static inline void __user *
-get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
+get_sigframe(struct ksignal *ksig, size_t frame_size)
 {
-        unsigned long sp;
-
-        sp = rdusp();
-
-        /* This is the X/Open sanctioned signal stack switching. */
-        if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (!on_sig_stack(sp))
-                        sp = current->sas_ss_sp + current->sas_ss_size;
-        }
+        unsigned long sp = sigsp(rdusp(), ksig);
 
         /* Make sure the frame is dword-aligned. */
         sp &= ~3;
@@ -215,23 +207,22 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
  * trampoline.
   */
 static int
-setup_frame(int sig, struct k_sigaction *ka,  sigset_t *set,
-            struct pt_regs * regs)
+setup_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         int err;
         unsigned long return_ip;
         struct signal_frame __user *frame;
 
         err = 0;
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         err |= setup_sigcontext(&frame->sc, regs, set->sig[0]);
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (_NSIG_WORDS > 1) {
                 err |= __copy_to_user(frame->extramask, &set->sig[1],
@@ -239,14 +230,14 @@ setup_frame(int sig, struct k_sigaction *ka,  sigset_t *set,
         }
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Set up to return from user-space. If provided, use a stub
          * already located in user-space.
          */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                return_ip = (unsigned long)ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                return_ip = (unsigned long)ksig->ka.sa.sa_restorer;
         } else {
                 /* Trampoline - the desired return ip is in the signal return page. */
                 return_ip = cris_signal_return_page;
@@ -264,7 +255,7 @@ setup_frame(int sig, struct k_sigaction *ka,  sigset_t *set,
         }
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Set up registers for signal handler.
@@ -273,42 +264,37 @@ setup_frame(int sig, struct k_sigaction *ka,  sigset_t *set,
          * Where the code enter later.
          * First argument, signo.
          */
-        regs->erp = (unsigned long) ka->sa.sa_handler;
+        regs->erp = (unsigned long) ksig->ka.sa.sa_handler;
         regs->srp = return_ip;
-        regs->r10 = sig;
+        regs->r10 = ksig->sig;
 
         /* Actually move the USP to reflect the stacked frame. */
         wrusp((unsigned long)frame);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 static int
-setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-               sigset_t *set, struct pt_regs * regs)
+setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         int err;
         unsigned long return_ip;
         struct rt_signal_frame __user *frame;
 
         err = 0;
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* TODO: what is the current->exec_domain stuff and invmap ? */
 
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Clear all the bits of the ucontext we don't use.  */
         err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext));
@@ -317,14 +303,14 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= __save_altstack(&frame->uc.uc_stack, rdusp());
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Set up to return from user-space. If provided, use a stub
          * already located in user-space.
          */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                return_ip = (unsigned long) ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                return_ip = (unsigned long) ksig->ka.sa.sa_restorer;
         } else {
                 /* Trampoline - the desired return ip is in the signal return page. */
                 return_ip = cris_signal_return_page + 6;
@@ -345,7 +331,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         }
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Set up registers for signal handler.
@@ -356,9 +342,9 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
          * Second argument is (siginfo_t *).
          * Third argument is unused.
          */
-        regs->erp = (unsigned long) ka->sa.sa_handler;
+        regs->erp = (unsigned long) ksig->ka.sa.sa_handler;
         regs->srp = return_ip;
-        regs->r10 = sig;
+        regs->r10 = ksig->sig;
         regs->r11 = (unsigned long) &frame->info;
         regs->r12 = 0;
 
@@ -366,17 +352,11 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         wrusp((unsigned long)frame);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 /* Invoke a signal handler to, well, handle the signal. */
 static inline void
-handle_signal(int canrestart, unsigned long sig,
-              siginfo_t *info, struct k_sigaction *ka,
-              struct pt_regs * regs)
+handle_signal(int canrestart, struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
@@ -404,7 +384,7 @@ handle_signal(int canrestart, unsigned long sig,
                                  * there is no handler, or the handler
                                  * was registered with SA_RESTART.
                                  */
-                                if (!(ka->sa.sa_flags & SA_RESTART)) {
+                                if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                         regs->r10 = -EINTR;
                                         break;
                                 }
@@ -423,13 +403,12 @@ handle_signal(int canrestart, unsigned long sig,
         }
 
         /* Set up the stack frame. */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame(ksig, oldset, regs);
         else
-                ret = setup_frame(sig, ka, oldset, regs);
+                ret = setup_frame(ksig, oldset, regs);
 
-        if (ret == 0)
-                signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 /*
@@ -446,9 +425,7 @@ handle_signal(int canrestart, unsigned long sig,
 void
 do_signal(int canrestart, struct pt_regs *regs)
 {
-        int signr;
-        siginfo_t info;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         /*
          * The common case should go fast, which is why this point is
@@ -458,11 +435,9 @@ do_signal(int canrestart, struct pt_regs *regs)
         if (!user_mode(regs))
                 return;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(canrestart, signr, &info, &ka, regs);
+                handle_signal(canrestart, &ksig, regs);
                 return;
         }
 
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index afff5105909d..31742dfadff9 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -13,6 +13,7 @@ generic-y += linkage.h
 generic-y += mcs_spinlock.h
 generic-y += module.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
 generic-y += vga.h
 generic-y += xor.h
diff --git a/arch/cris/include/asm/scatterlist.h b/arch/cris/include/asm/scatterlist.h
deleted file mode 100644
index f11f8f40ec4a..000000000000
--- a/arch/cris/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_CRIS_SCATTERLIST_H
-#define __ASM_CRIS_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* !(__ASM_CRIS_SCATTERLIST_H) */
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild
index 87b95eb8aee5..5b73921b6e9d 100644
--- a/arch/frv/include/asm/Kbuild
+++ b/arch/frv/include/asm/Kbuild
@@ -5,4 +5,5 @@ generic-y += exec.h
 generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
diff --git a/arch/frv/include/asm/scatterlist.h b/arch/frv/include/asm/scatterlist.h
deleted file mode 100644
index 0e5eb3018468..000000000000
--- a/arch/frv/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/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index d822700d4f15..dc3d59de0870 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -158,19 +158,10 @@ static int setup_sigcontext(struct sigcontext __user *sc, unsigned long mask)
 /*
  * Determine which stack to use..
  */
-static inline void __user *get_sigframe(struct k_sigaction *ka,
+static inline void __user *get_sigframe(struct ksignal *ksig,
                                         size_t frame_size)
 {
-        unsigned long sp;
-
-        /* Default to using normal stack */
-        sp = __frame->sp;
-
-        /* This is the X/Open sanctioned signal stack switching.  */
-        if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (! sas_ss_flags(sp))
-                        sp = current->sas_ss_sp + current->sas_ss_size;
-        }
+        unsigned long sp = sigsp(__frame->sp, ksig);
 
         return (void __user *) ((sp - frame_size) & ~7UL);
 
@@ -180,17 +171,17 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
 /*
  *
  */
-static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
+static int setup_frame(struct ksignal *ksig, sigset_t *set)
 {
         struct sigframe __user *frame;
-        int rsig;
+        int rsig, sig = ksig->sig;
 
         set_fs(USER_DS);
 
-        frame = get_sigframe(ka, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         rsig = sig;
         if (sig < 32 &&
@@ -199,22 +190,22 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
                 rsig = __current_thread_info->exec_domain->signal_invmap[sig];
 
         if (__put_user(rsig, &frame->sig) < 0)
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (setup_sigcontext(&frame->sc, set->sig[0]))
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (_NSIG_WORDS > 1) {
                 if (__copy_to_user(frame->extramask, &set->sig[1],
                                    sizeof(frame->extramask)))
-                        goto give_sigsegv;
+                        return -EFAULT;
         }
 
         /* Set up to return from userspace.  If provided, use a stub
          * already in userspace.  */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                if (__put_user(ka->sa.sa_restorer, &frame->pretcode) < 0)
-                        goto give_sigsegv;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                if (__put_user(ksig->ka.sa.sa_restorer, &frame->pretcode) < 0)
+                        return -EFAULT;
         }
         else {
                 /* Set up the following code on the stack:
@@ -224,7 +215,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
                 if (__put_user((__sigrestore_t)frame->retcode, &frame->pretcode) ||
                     __put_user(0x8efc0000|__NR_sigreturn, &frame->retcode[0]) ||
                     __put_user(0xc0700000, &frame->retcode[1]))
-                        goto give_sigsegv;
+                        return -EFAULT;
 
                 flush_icache_range((unsigned long) frame->retcode,
                                    (unsigned long) (frame->retcode + 2));
@@ -233,14 +224,14 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
         /* Set up registers for the signal handler */
         if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
-                        (struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
+                        (struct fdpic_func_descriptor __user *) ksig->ka.sa.sa_handler;
                 struct fdpic_func_descriptor desc;
                 if (copy_from_user(&desc, funcptr, sizeof(desc)))
-                        goto give_sigsegv;
+                        return -EFAULT;
                 __frame->pc = desc.text;
                 __frame->gr15 = desc.GOT;
         } else {
-                __frame->pc   = (unsigned long) ka->sa.sa_handler;
+                __frame->pc   = (unsigned long) ksig->ka.sa.sa_handler;
                 __frame->gr15 = 0;
         }
 
@@ -255,29 +246,23 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
 #endif
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
-
 } /* end setup_frame() */
 
 /*****************************************************************************/
 /*
  *
  */
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
 {
         struct rt_sigframe __user *frame;
-        int rsig;
+        int rsig, sig = ksig->sig;
 
         set_fs(USER_DS);
 
-        frame = get_sigframe(ka, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         rsig = sig;
         if (sig < 32 &&
@@ -288,28 +273,28 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         if (__put_user(rsig,            &frame->sig) ||
             __put_user(&frame->info,    &frame->pinfo) ||
             __put_user(&frame->uc,      &frame->puc))
-                goto give_sigsegv;
+                return -EFAULT;
 
-        if (copy_siginfo_to_user(&frame->info, info))
-                goto give_sigsegv;
+        if (copy_siginfo_to_user(&frame->info, &ksig->info))
+                return -EFAULT;
 
         /* Create the ucontext.  */
         if (__put_user(0, &frame->uc.uc_flags) ||
             __put_user(NULL, &frame->uc.uc_link) ||
             __save_altstack(&frame->uc.uc_stack, __frame->sp))
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (setup_sigcontext(&frame->uc.uc_mcontext, set->sig[0]))
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (__copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  If provided, use a stub
          * already in userspace.  */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                if (__put_user(ka->sa.sa_restorer, &frame->pretcode))
-                        goto give_sigsegv;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                if (__put_user(ksig->ka.sa.sa_restorer, &frame->pretcode))
+                        return -EFAULT;
         }
         else {
                 /* Set up the following code on the stack:
@@ -319,7 +304,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 if (__put_user((__sigrestore_t)frame->retcode, &frame->pretcode) ||
                     __put_user(0x8efc0000|__NR_rt_sigreturn, &frame->retcode[0]) ||
                     __put_user(0xc0700000, &frame->retcode[1]))
-                        goto give_sigsegv;
+                        return -EFAULT;
 
                 flush_icache_range((unsigned long) frame->retcode,
                                    (unsigned long) (frame->retcode + 2));
@@ -328,14 +313,14 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         /* Set up registers for signal handler */
         if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
-                        (struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
+                        (struct fdpic_func_descriptor __user *) ksig->ka.sa.sa_handler;
                 struct fdpic_func_descriptor desc;
                 if (copy_from_user(&desc, funcptr, sizeof(desc)))
-                        goto give_sigsegv;
+                        return -EFAULT;
                 __frame->pc = desc.text;
                 __frame->gr15 = desc.GOT;
         } else {
-                __frame->pc   = (unsigned long) ka->sa.sa_handler;
+                __frame->pc   = (unsigned long) ksig->ka.sa.sa_handler;
                 __frame->gr15 = 0;
         }
 
@@ -349,21 +334,15 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                sig, current->comm, current->pid, frame, __frame->pc,
                frame->pretcode);
 #endif
-
         return 0;
 
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
-
 } /* end setup_rt_frame() */
 
 /*****************************************************************************/
 /*
  * OK, we're invoking a handler
  */
-static void handle_signal(unsigned long sig, siginfo_t *info,
-                         struct k_sigaction *ka)
+static void handle_signal(struct ksignal *ksig)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
@@ -378,7 +357,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
                         break;
 
                 case -ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 __frame->gr8 = -EINTR;
                                 break;
                         }
@@ -392,16 +371,12 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
         }
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame(ksig, oldset);
         else
-                ret = setup_frame(sig, ka, oldset);
-
-        if (ret)
-                return;
+                ret = setup_frame(ksig, oldset);
 
-        signal_delivered(sig, info, ka, __frame,
-                                 test_thread_flag(TIF_SINGLESTEP));
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 } /* end handle_signal() */
 
 /*****************************************************************************/
@@ -412,13 +387,10 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
  */
 static void do_signal(void)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
+        struct ksignal ksig;
 
-        signr = get_signal_to_deliver(&info, &ka, __frame, NULL);
-        if (signr > 0) {
-                handle_signal(signr, &info, &ka);
+        if (get_signal(&ksig)) {
+                handle_signal(&ksig);
                 return;
         }
 
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 0fd6138f6203..4dc89d1f9c48 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -23,7 +23,6 @@ config HEXAGON
         select GENERIC_IOMAP
         select GENERIC_SMP_IDLE_THREAD
         select STACKTRACE_SUPPORT
-        select KTIME_SCALAR
         select GENERIC_CLOCKEVENTS
         select GENERIC_CLOCKEVENTS_BROADCAST
         select MODULES_USE_ELF_RELA
diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
index f4ca594fdf8c..263511719a4a 100644
--- a/arch/hexagon/include/asm/cache.h
+++ b/arch/hexagon/include/asm/cache.h
@@ -28,7 +28,7 @@
 #define __cacheline_aligned     __aligned(L1_CACHE_BYTES)
 #define ____cacheline_aligned   __aligned(L1_CACHE_BYTES)
 
-/* See http://kerneltrap.org/node/15100  */
+/* See http://lwn.net/Articles/262554/ */
 #define __read_mostly
 
 #endif
diff --git a/arch/hexagon/kernel/signal.c b/arch/hexagon/kernel/signal.c
index d7c73874b515..eadd70e47e7e 100644
--- a/arch/hexagon/kernel/signal.c
+++ b/arch/hexagon/kernel/signal.c
@@ -36,18 +36,10 @@ struct rt_sigframe {
         struct ucontext uc;
 };
 
-static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
                           size_t frame_size)
 {
-        unsigned long sp = regs->r29;
-
-        /* check if we would overflow the alt stack */
-        if (on_sig_stack(sp) && !likely(on_sig_stack(sp - frame_size)))
-                return (void __user __force *)-1UL;
-
-        /* Switch to signal stack if appropriate */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0))
-                sp = current->sas_ss_sp + current->sas_ss_size;
+        unsigned long sp = sigsp(regs->r29, ksig);
 
         return (void __user *)((sp - frame_size) & ~(sizeof(long long) - 1));
 }
@@ -112,20 +104,20 @@ static int restore_sigcontext(struct pt_regs *regs,
 /*
  * Setup signal stack frame with siginfo structure
  */
-static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set,  struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         int err = 0;
         struct rt_sigframe __user *frame;
         struct hexagon_vdso *vdso = current->mm->context.vdso;
 
-        frame = get_sigframe(ka, regs, sizeof(struct rt_sigframe));
+        frame = get_sigframe(ksig, regs, sizeof(struct rt_sigframe));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(struct rt_sigframe)))
-                goto    sigsegv;
+                return -EFAULT;
 
-        if (copy_siginfo_to_user(&frame->info, info))
-                goto    sigsegv;
+        if (copy_siginfo_to_user(&frame->info, &ksig->info))
+                return -EFAULT;
 
         /* The on-stack signal trampoline is no longer executed;
          * however, the libgcc signal frame unwinding code checks for
@@ -137,29 +129,26 @@ static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
         err |= __save_altstack(&frame->uc.uc_stack, user_stack_pointer(regs));
         if (err)
-                goto sigsegv;
+                return -EFAULT;
 
         /* Load r0/r1 pair with signumber/siginfo pointer... */
         regs->r0100 = ((unsigned long long)((unsigned long)&frame->info) << 32)
-                | (unsigned long long)signr;
+                | (unsigned long long)ksig->sig;
         regs->r02 = (unsigned long) &frame->uc;
         regs->r31 = (unsigned long) vdso->rt_signal_trampoline;
         pt_psp(regs) = (unsigned long) frame;
-        pt_set_elr(regs, (unsigned long)ka->sa.sa_handler);
+        pt_set_elr(regs, (unsigned long)ksig->ka.sa.sa_handler);
 
         return 0;
-
-sigsegv:
-        force_sigsegv(signr, current);
-        return -EFAULT;
 }
 
 /*
  * Setup invocation of signal handler
  */
-static void handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,
-                         struct pt_regs *regs)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
+        int ret;
+
         /*
          * If we're handling a signal that aborted a system call,
          * set up the error return value before adding the signal
@@ -173,7 +162,7 @@ static void handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,
                         regs->r00 = -EINTR;
                         break;
                 case -ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 regs->r00 = -EINTR;
                                 break;
                         }
@@ -193,11 +182,9 @@ static void handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,
          * only set up the rt_frame flavor.
          */
         /* If there was an error on setup, no signal was delivered. */
-        if (setup_rt_frame(sig, ka, info, sigmask_to_save(), regs) < 0)
-                return;
+        ret = setup_rt_frame(ksig, sigmask_to_save(), regs);
 
-        signal_delivered(sig, info, ka, regs,
-                        test_thread_flag(TIF_SINGLESTEP));
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -205,17 +192,13 @@ static void handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,
  */
 void do_signal(struct pt_regs *regs)
 {
-        struct k_sigaction sigact;
-        siginfo_t info;
-        int signo;
+        struct ksignal ksig;
 
         if (!user_mode(regs))
                 return;
 
-        signo = get_signal_to_deliver(&info, &sigact, regs, NULL);
-
-        if (signo > 0) {
-                handle_signal(signo, &info, &sigact, regs);
+        if (get_signal(&ksig)) {
+                handle_signal(&ksig, regs);
                 return;
         }
 
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 2f3abcf8f6bc..64aefb76bd69 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -10,6 +10,7 @@ config IA64
         select ARCH_MIGHT_HAVE_PC_SERIO
         select PCI if (!IA64_HP_SIM)
         select ACPI if (!IA64_HP_SIM)
+        select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
         select PM if (!IA64_HP_SIM)
         select HAVE_UNSTABLE_SCHED_CLOCK
         select HAVE_IDE
@@ -27,6 +28,7 @@ config IA64
         select HAVE_MEMBLOCK
         select HAVE_MEMBLOCK_NODE_MAP
         select HAVE_VIRT_CPU_ACCOUNTING
+        select ARCH_HAS_SG_CHAIN
         select VIRT_TO_BUS
         select ARCH_DISCARD_MEMBLOCK
         select GENERIC_IRQ_PROBE
@@ -547,6 +549,8 @@ source "drivers/sn/Kconfig"
 config KEXEC
         bool "kexec system call"
         depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
+        select CRYPTO
+        select CRYPTO_SHA256
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index f37238f45bcd..5441b14994fc 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -76,7 +76,7 @@ vmlinux.gz: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $@
 
 unwcheck: vmlinux
-        -$(Q)READELF=$(READELF) python $(srctree)/arch/ia64/scripts/unwcheck.py $<
+        -$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $<
 
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index 0da4aa2602ae..e8317d2d6c8d 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -5,5 +5,6 @@ generic-y += hash.h
 generic-y += kvm_para.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
 generic-y += vtime.h
diff --git a/arch/ia64/include/asm/acenv.h b/arch/ia64/include/asm/acenv.h
index 3f9eaeec9873..35ff13afbf34 100644
--- a/arch/ia64/include/asm/acenv.h
+++ b/arch/ia64/include/asm/acenv.h
@@ -19,8 +19,6 @@
 
 /* Asm macros */
 
-#ifdef CONFIG_ACPI
-
 static inline int
 ia64_acpi_acquire_global_lock(unsigned int *lock)
 {
@@ -51,6 +49,4 @@ ia64_acpi_release_global_lock(unsigned int *lock)
 #define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq)                             \
         ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))
 
-#endif
-
 #endif /* _ASM_IA64_ACENV_H */
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index 75dc59a793d6..a1d91ab4c5ef 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -40,6 +40,11 @@ extern int acpi_lapic;
 #define acpi_noirq 0    /* ACPI always enabled on IA64 */
 #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
 #define acpi_strict 1   /* no ACPI spec workarounds on IA64 */
+
+static inline bool acpi_has_cpu_in_madt(void)
+{
+        return !!acpi_lapic;
+}
 #endif
 #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
 static inline void disable_acpi(void) { }
diff --git a/arch/ia64/include/asm/page.h b/arch/ia64/include/asm/page.h
index f1e1b2e3cdb3..1f1bf144fe62 100644
--- a/arch/ia64/include/asm/page.h
+++ b/arch/ia64/include/asm/page.h
@@ -231,4 +231,6 @@ get_order (unsigned long size)
 #define PERCPU_ADDR             (-PERCPU_PAGE_SIZE)
 #define LOAD_OFFSET             (KERNEL_START - KERNEL_TR_PAGE_SIZE)
 
+#define __HAVE_ARCH_GATE_AREA   1
+
 #endif /* _ASM_IA64_PAGE_H */
diff --git a/arch/ia64/include/asm/scatterlist.h b/arch/ia64/include/asm/scatterlist.h
deleted file mode 100644
index 08fd93bff1db..000000000000
--- a/arch/ia64/include/asm/scatterlist.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _ASM_IA64_SCATTERLIST_H
-#define _ASM_IA64_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-#define ARCH_HAS_SG_CHAIN
-
-#endif /* _ASM_IA64_SCATTERLIST_H */
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index fb13dc5e8f8c..4254f5d3218c 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -11,7 +11,7 @@
 
 
 
-#define NR_syscalls                     315 /* length of syscall table */
+#define NR_syscalls                     316 /* length of syscall table */
 
 /*
  * The following defines stop scripts/checksyscalls.sh from complaining about
diff --git a/arch/ia64/include/uapi/asm/unistd.h b/arch/ia64/include/uapi/asm/unistd.h
index 7de0a2d65da4..99801c3be914 100644
--- a/arch/ia64/include/uapi/asm/unistd.h
+++ b/arch/ia64/include/uapi/asm/unistd.h
@@ -328,5 +328,6 @@
 #define __NR_sched_setattr              1336
 #define __NR_sched_getattr              1337
 #define __NR_renameat2                  1338
+#define __NR_getrandom                  1339
 
 #endif /* _UAPI_ASM_IA64_UNISTD_H */
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index ba3d03503e84..4c13837a9269 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1776,6 +1776,7 @@ sys_call_table:
         data8 sys_sched_setattr
         data8 sys_sched_getattr
         data8 sys_renameat2
+        data8 sys_getrandom
 
         .org sys_call_table + 8*NR_syscalls     // guard against failures to increase NR_syscalls
 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 33cab9a8adff..6d92170be457 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -309,12 +309,11 @@ force_sigsegv_info (int sig, void __user *addr)
         si.si_uid = from_kuid_munged(current_user_ns(), current_uid());
         si.si_addr = addr;
         force_sig_info(SIGSEGV, &si, current);
-        return 0;
+        return 1;
 }
 
 static long
-setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
-             struct sigscratch *scr)
+setup_frame(struct ksignal *ksig, sigset_t *set, struct sigscratch *scr)
 {
         extern char __kernel_sigtramp[];
         unsigned long tramp_addr, new_rbs = 0, new_sp;
@@ -323,7 +322,7 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
 
         new_sp = scr->pt.r12;
         tramp_addr = (unsigned long) __kernel_sigtramp;
-        if (ka->sa.sa_flags & SA_ONSTACK) {
+        if (ksig->ka.sa.sa_flags & SA_ONSTACK) {
                 int onstack = sas_ss_flags(new_sp);
 
                 if (onstack == 0) {
@@ -347,29 +346,29 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
                          */
                         check_sp = (new_sp - sizeof(*frame)) & -STACK_ALIGN;
                         if (!likely(on_sig_stack(check_sp)))
-                                return force_sigsegv_info(sig, (void __user *)
+                                return force_sigsegv_info(ksig->sig, (void __user *)
                                                           check_sp);
                 }
         }
         frame = (void __user *) ((new_sp - sizeof(*frame)) & -STACK_ALIGN);
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                return force_sigsegv_info(sig, frame);
+                return force_sigsegv_info(ksig->sig, frame);
 
-        err  = __put_user(sig, &frame->arg0);
+        err  = __put_user(ksig->sig, &frame->arg0);
         err |= __put_user(&frame->info, &frame->arg1);
         err |= __put_user(&frame->sc, &frame->arg2);
         err |= __put_user(new_rbs, &frame->sc.sc_rbs_base);
         err |= __put_user(0, &frame->sc.sc_loadrs);     /* initialize to zero */
-        err |= __put_user(ka->sa.sa_handler, &frame->handler);
+        err |= __put_user(ksig->ka.sa.sa_handler, &frame->handler);
 
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         err |= __save_altstack(&frame->sc.sc_stack, scr->pt.r12);
         err |= setup_sigcontext(&frame->sc, set, scr);
 
         if (unlikely(err))
-                return force_sigsegv_info(sig, frame);
+                return force_sigsegv_info(ksig->sig, frame);
 
         scr->pt.r12 = (unsigned long) frame - 16;       /* new stack pointer */
         scr->pt.ar_fpsr = FPSR_DEFAULT;                 /* reset fpsr for signal handler */
@@ -394,22 +393,20 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
 
 #if DEBUG_SIG
         printk("SIG deliver (%s:%d): sig=%d sp=%lx ip=%lx handler=%p\n",
-               current->comm, current->pid, sig, scr->pt.r12, frame->sc.sc_ip, frame->handler);
+               current->comm, current->pid, ksig->sig, scr->pt.r12, frame->sc.sc_ip, frame->handler);
 #endif
-        return 1;
+        return 0;
 }
 
 static long
-handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
-               struct sigscratch *scr)
+handle_signal (struct ksignal *ksig, struct sigscratch *scr)
 {
-        if (!setup_frame(sig, ka, info, sigmask_to_save(), scr))
-                return 0;
+        int ret = setup_frame(ksig, sigmask_to_save(), scr);
 
-        signal_delivered(sig, info, ka, &scr->pt,
-                                 test_thread_flag(TIF_SINGLESTEP));
+        if (!ret)
+                signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 
-        return 1;
+        return ret;
 }
 
 /*
@@ -419,17 +416,16 @@ handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
 void
 ia64_do_signal (struct sigscratch *scr, long in_syscall)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
         long restart = in_syscall;
         long errno = scr->pt.r8;
+        struct ksignal ksig;
 
         /*
          * This only loops in the rare cases of handle_signal() failing, in which case we
          * need to push through a forced SIGSEGV.
          */
         while (1) {
-                int signr = get_signal_to_deliver(&info, &ka, &scr->pt, NULL);
+                get_signal(&ksig);
 
                 /*
                  * get_signal_to_deliver() may have run a debugger (via notify_parent())
@@ -446,7 +442,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
                          */
                         restart = 0;
 
-                if (signr <= 0)
+                if (ksig.sig <= 0)
                         break;
 
                 if (unlikely(restart)) {
@@ -458,7 +454,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
                                 break;
 
                               case ERESTARTSYS:
-                                if ((ka.sa.sa_flags & SA_RESTART) == 0) {
+                                if ((ksig.ka.sa.sa_flags & SA_RESTART) == 0) {
                                         scr->pt.r8 = EINTR;
                                         /* note: scr->pt.r10 is already -1 */
                                         break;
@@ -473,7 +469,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
                  * Whee!  Actually deliver the signal.  If the delivery failed, we need to
                  * continue to iterate in this loop so we can deliver the SIGSEGV...
                  */
-                if (handle_signal(signr, &ka, &info, scr))
+                if (handle_signal(&ksig, scr))
                         return;
         }
 
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 71c52bc7c28d..9a0104a38cd3 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -384,21 +384,6 @@ static struct irqaction timer_irqaction = {
         .name =         "timer"
 };
 
-static struct platform_device rtc_efi_dev = {
-        .name = "rtc-efi",
-        .id = -1,
-};
-
-static int __init rtc_init(void)
-{
-        if (platform_device_register(&rtc_efi_dev) < 0)
-                printk(KERN_ERR "unable to register rtc device...\n");
-
-        /* not necessarily an error */
-        return 0;
-}
-module_init(rtc_init);
-
 void read_persistent_clock(struct timespec *ts)
 {
         efi_gettimeofday(ts);
@@ -441,7 +426,7 @@ void update_vsyscall_tz(void)
 }
 
 void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
-                        struct clocksource *c, u32 mult)
+                         struct clocksource *c, u32 mult, cycle_t cycle_last)
 {
         write_seqcount_begin(&fsyscall_gtod_data.seq);
 
@@ -450,7 +435,7 @@ void update_vsyscall_old(struct timespec *wall, struct timespec *wtm,
         fsyscall_gtod_data.clk_mult = mult;
         fsyscall_gtod_data.clk_shift = c->shift;
         fsyscall_gtod_data.clk_fsys_mmio = c->archdata.fsys_mmio;
-        fsyscall_gtod_data.clk_cycle_last = c->cycle_last;
+        fsyscall_gtod_data.clk_cycle_last = cycle_last;
 
         /* copy kernel time structures */
         fsyscall_gtod_data.wall_time.tv_sec = wall->tv_sec;
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index 990b86420cc6..3d50ea955c4c 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -25,6 +25,7 @@ config KVM
         select PREEMPT_NOTIFIERS
         select ANON_INODES
         select HAVE_KVM_IRQCHIP
+        select HAVE_KVM_IRQFD
         select HAVE_KVM_IRQ_ROUTING
         select KVM_APIC_ARCHITECTURE
         select KVM_MMIO
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 6a4309bb821a..0729ba6acddf 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -190,7 +190,7 @@ void kvm_arch_check_processor_compat(void *rtn)
         *(int *)rtn = 0;
 }
 
-int kvm_dev_ioctl_check_extension(long ext)
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 {
 
         int r;
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 25c350264a41..6b3345758d3e 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -278,6 +278,37 @@ setup_gate (void)
         ia64_patch_gate();
 }
 
+static struct vm_area_struct gate_vma;
+
+static int __init gate_vma_init(void)
+{
+        gate_vma.vm_mm = NULL;
+        gate_vma.vm_start = FIXADDR_USER_START;
+        gate_vma.vm_end = FIXADDR_USER_END;
+        gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
+        gate_vma.vm_page_prot = __P101;
+
+        return 0;
+}
+__initcall(gate_vma_init);
+
+struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
+{
+        return &gate_vma;
+}
+
+int in_gate_area_no_mm(unsigned long addr)
+{
+        if ((addr >= FIXADDR_USER_START) && (addr < FIXADDR_USER_END))
+                return 1;
+        return 0;
+}
+
+int in_gate_area(struct mm_struct *mm, unsigned long addr)
+{
+        return in_gate_area_no_mm(addr);
+}
+
 void ia64_mmu_init(void *my_cpu_data)
 {
         unsigned long pta, impl_va_bits;
@@ -631,7 +662,8 @@ int arch_add_memory(int nid, u64 start, u64 size)
 
         pgdat = NODE_DATA(nid);
 
-        zone = pgdat->node_zones + ZONE_NORMAL;
+        zone = pgdat->node_zones +
+                zone_for_memory(nid, start, size, ZONE_NORMAL);
         ret = __add_pages(nid, zone, start_pfn, nr_pages);
 
         if (ret)
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index 67779a74b62d..accc10a3dc78 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -6,4 +6,5 @@ generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += module.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
diff --git a/arch/m32r/include/asm/scatterlist.h b/arch/m32r/include/asm/scatterlist.h
deleted file mode 100644
index 7370b8b6243e..000000000000
--- a/arch/m32r/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_M32R_SCATTERLIST_H
-#define _ASM_M32R_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* _ASM_M32R_SCATTERLIST_H */
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index d503568cb753..95408b8f130a 100644
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -162,28 +162,22 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
  * Determine which stack to use..
  */
 static inline void __user *
-get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
+get_sigframe(struct ksignal *ksig, unsigned long sp, size_t frame_size)
 {
-        /* This is the X/Open sanctioned signal stack switching.  */
-        if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (sas_ss_flags(sp) == 0)
-                        sp = current->sas_ss_sp + current->sas_ss_size;
-        }
-
-        return (void __user *)((sp - frame_size) & -8ul);
+        return (void __user *)((sigsp(sp, ksig) - frame_size) & -8ul);
 }
 
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                           sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
         int err = 0;
-        int signal;
+        int signal, sig = ksig->sig;
 
-        frame = get_sigframe(ka, regs->spu, sizeof(*frame));
+        frame = get_sigframe(ksig, regs->spu, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         signal = current_thread_info()->exec_domain
                 && current_thread_info()->exec_domain->signal_invmap
@@ -193,13 +187,13 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
         err |= __put_user(signal, &frame->sig);
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -208,17 +202,17 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0]);
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  */
-        regs->lr = (unsigned long)ka->sa.sa_restorer;
+        regs->lr = (unsigned long)ksig->ka.sa.sa_restorer;
 
         /* Set up registers for signal handler */
         regs->spu = (unsigned long)frame;
         regs->r0 = signal;      /* Arg for signal handler */
         regs->r1 = (unsigned long)&frame->info;
         regs->r2 = (unsigned long)&frame->uc;
-        regs->bpc = (unsigned long)ka->sa.sa_handler;
+        regs->bpc = (unsigned long)ksig->ka.sa.sa_handler;
 
         set_fs(USER_DS);
 
@@ -228,10 +222,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 #endif
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 static int prev_insn(struct pt_regs *regs)
@@ -252,9 +242,10 @@ static int prev_insn(struct pt_regs *regs)
  */
 
 static void
-handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
-              struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
+        int ret;
+
         /* Are we from a system call? */
         if (regs->syscall_nr >= 0) {
                 /* If so, check system call restarting.. */
@@ -265,7 +256,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
                                 break;
 
                         case -ERESTARTSYS:
-                                if (!(ka->sa.sa_flags & SA_RESTART)) {
+                                if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                         regs->r0 = -EINTR;
                                         break;
                                 }
@@ -278,10 +269,9 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
         }
 
         /* Set up the stack frame */
-        if (setup_rt_frame(sig, ka, info, sigmask_to_save(), regs))
-                return;
+        ret = setup_rt_frame(ksig, sigmask_to_save(), regs);
 
-        signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 /*
@@ -291,9 +281,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
  */
 static void do_signal(struct pt_regs *regs)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         /*
          * We want the common case to go fast, which
@@ -304,8 +292,7 @@ static void do_signal(struct pt_regs *regs)
         if (!user_mode(regs))
                 return;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Re-enable any watchpoints before delivering the
                  * signal to user space. The processor register will
                  * have been cleared if the watchpoint triggered
@@ -313,7 +300,7 @@ static void do_signal(struct pt_regs *regs)
                  */
 
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(signr, &ka, &info, regs);
+                handle_signal(&ksig, regs);
 
                 return;
         }
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 87b7c7581b1d..3ff8c9a25335 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -91,6 +91,8 @@ config MMU_SUN3
 config KEXEC
         bool "kexec system call"
         depends on M68KCLASSIC
+        select CRYPTO
+        select CRYPTO_SHA256
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index d7eac833a94f..399df883c8bb 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -257,7 +257,6 @@ CONFIG_BLK_DEV_GAYLE=y
 CONFIG_BLK_DEV_BUDDHA=y
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 650ee75de6cd..be16740c0749 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -244,7 +244,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 3142e69342fa..391e185d73be 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -251,7 +251,6 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_BLK_DEV_FALCON_IDE=y
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 0daa8a172f30..d0e705d1a063 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -242,7 +242,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 88af78f7bad9..fdc7e9672249 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -244,7 +244,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 66f915574a85..3d345641d5a0 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -251,7 +251,6 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_BLK_DEV_MAC_IDE=y
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 5eaa49924fa6..59aa42096000 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -273,7 +273,6 @@ CONFIG_BLK_DEV_MAC_IDE=y
 CONFIG_BLK_DEV_Q40IDE=y
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 324d0b4d8351..066b24af095e 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -241,7 +241,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index f0cb4338952e..9326ea664a5b 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -242,7 +242,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index d6cf0880c463..d7d1101e31b5 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -249,7 +249,6 @@ CONFIG_BLK_DEV_IDECD=y
 CONFIG_BLK_DEV_Q40IDE=y
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index f4e88d1c7472..98522e8fb852 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -239,7 +239,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 49f4032c1ad6..5128a8c3f4e3 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -239,7 +239,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_DUMMY_IRQ=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/m68k/include/asm/pgtable_no.h b/arch/m68k/include/asm/pgtable_no.h
index c527fc2ecf82..11859b86b1f9 100644
--- a/arch/m68k/include/asm/pgtable_no.h
+++ b/arch/m68k/include/asm/pgtable_no.h
@@ -46,11 +46,6 @@ static inline int pte_file(pte_t pte) { return 0; }
 #define ZERO_PAGE(vaddr)        (virt_to_page(0))
 
 /*
- * These would be in other places but having them here reduces the diffs.
- */
-extern unsigned int kobjsize(const void *objp);
-
-/*
  * No page table caches to initialise.
  */
 #define pgtable_cache_init()    do { } while (0)
diff --git a/arch/m68k/include/asm/virtconvert.h b/arch/m68k/include/asm/virtconvert.h
index f35229b8651d..b8a82fb1cef8 100644
--- a/arch/m68k/include/asm/virtconvert.h
+++ b/arch/m68k/include/asm/virtconvert.h
@@ -26,16 +26,12 @@ static inline void *phys_to_virt(unsigned long address)
 }
 
 /* Permanent address of a page. */
-#ifdef CONFIG_MMU
-#ifdef CONFIG_SINGLE_MEMORY_CHUNK
+#if defined(CONFIG_MMU) && defined(CONFIG_SINGLE_MEMORY_CHUNK)
 #define page_to_phys(page) \
         __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT))
 #else
 #define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
 #endif
-#else
-#define page_to_phys(page)      (((page) - mem_map) << PAGE_SHIFT)
-#endif
 
 /*
  * IO bus memory addresses are 1:1 with the physical address,
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index 57fd286e4b0b..967a8b7e1527 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -835,38 +835,30 @@ static inline int rt_setup_ucontext(struct ucontext __user *uc, struct pt_regs *
 }
 
 static inline void __user *
-get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
+get_sigframe(struct ksignal *ksig, size_t frame_size)
 {
-        unsigned long usp;
-
-        /* Default to using normal stack.  */
-        usp = rdusp();
+        unsigned long usp = sigsp(rdusp(), ksig);
 
-        /* This is the X/Open sanctioned signal stack switching.  */
-        if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (!sas_ss_flags(usp))
-                        usp = current->sas_ss_sp + current->sas_ss_size;
-        }
         return (void __user *)((usp - frame_size) & -8UL);
 }
 
-static int setup_frame (int sig, struct k_sigaction *ka,
-                         sigset_t *set, struct pt_regs *regs)
+static int setup_frame(struct ksignal *ksig, sigset_t *set,
+                        struct pt_regs *regs)
 {
         struct sigframe __user *frame;
         int fsize = frame_extra_sizes(regs->format);
         struct sigcontext context;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
 
         if (fsize < 0) {
 #ifdef DEBUG
                 printk ("setup_frame: Unknown frame format %#x\n",
                         regs->format);
 #endif
-                goto give_sigsegv;
+                return -EFAULT;
         }
 
-        frame = get_sigframe(ka, regs, sizeof(*frame) + fsize);
+        frame = get_sigframe(ksig, sizeof(*frame) + fsize);
 
         if (fsize)
                 err |= copy_to_user (frame + 1, regs + 1, fsize);
@@ -899,7 +891,7 @@ static int setup_frame (int sig, struct k_sigaction *ka,
 #endif
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         push_cache ((unsigned long) &frame->retcode);
 
@@ -908,7 +900,7 @@ static int setup_frame (int sig, struct k_sigaction *ka,
          * to destroy is successfully copied to sigframe.
          */
         wrusp ((unsigned long) frame);
-        regs->pc = (unsigned long) ka->sa.sa_handler;
+        regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
         adjustformat(regs);
 
         /*
@@ -934,28 +926,24 @@ static int setup_frame (int sig, struct k_sigaction *ka,
                 tregs->sr = regs->sr;
         }
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return err;
 }
 
-static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
-                            sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                           struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
         int fsize = frame_extra_sizes(regs->format);
-        int err = 0;
+        int err = 0, sig = ksig->sig;
 
         if (fsize < 0) {
 #ifdef DEBUG
                 printk ("setup_frame: Unknown frame format %#x\n",
                         regs->format);
 #endif
-                goto give_sigsegv;
+                return -EFAULT;
         }
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, sizeof(*frame));
 
         if (fsize)
                 err |= copy_to_user (&frame->uc.uc_extra, regs + 1, fsize);
@@ -968,7 +956,7 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
                           &frame->sig);
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -996,7 +984,7 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
 #endif /* CONFIG_MMU */
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         push_cache ((unsigned long) &frame->retcode);
 
@@ -1005,7 +993,7 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
          * to destroy is successfully copied to sigframe.
          */
         wrusp ((unsigned long) frame);
-        regs->pc = (unsigned long) ka->sa.sa_handler;
+        regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
         adjustformat(regs);
 
         /*
@@ -1031,10 +1019,6 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
                 tregs->sr = regs->sr;
         }
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return err;
 }
 
 static inline void
@@ -1074,26 +1058,22 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
  * OK, we're invoking a handler
  */
 static void
-handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
-              struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int err;
         /* are we from a system call? */
         if (regs->orig_d0 >= 0)
                 /* If so, check system call restarting.. */
-                handle_restart(regs, ka, 1);
+                handle_restart(regs, &ksig->ka, 1);
 
         /* set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                err = setup_rt_frame(sig, ka, info, oldset, regs);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                err = setup_rt_frame(ksig, oldset, regs);
         else
-                err = setup_frame(sig, ka, oldset, regs);
-
-        if (err)
-                return;
+                err = setup_frame(ksig, oldset, regs);
 
-        signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(err, ksig, 0);
 
         if (test_thread_flag(TIF_DELAYED_TRACE)) {
                 regs->sr &= ~0x8000;
@@ -1108,16 +1088,13 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
  */
 static void do_signal(struct pt_regs *regs)
 {
-        siginfo_t info;
-        struct k_sigaction ka;
-        int signr;
+        struct ksignal ksig;
 
         current->thread.esp0 = (unsigned long) regs;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(signr, &ka, &info, regs);
+                handle_signal(&ksig, regs);
                 return;
         }
 
diff --git a/arch/metag/kernel/cachepart.c b/arch/metag/kernel/cachepart.c
index 0a2385fa2a1d..04b7d4f8429a 100644
--- a/arch/metag/kernel/cachepart.c
+++ b/arch/metag/kernel/cachepart.c
@@ -55,7 +55,7 @@ unsigned int get_global_icache_size(void)
         return (get_icache_size() * ((temp >> SYSC_xCPARTG_AND_S) + 1)) >> 4;
 }
 
-static unsigned int get_thread_cache_size(unsigned int cache, int thread_id)
+static int get_thread_cache_size(unsigned int cache, int thread_id)
 {
         unsigned int cache_size;
         unsigned int t_cache_part;
@@ -94,7 +94,7 @@ static unsigned int get_thread_cache_size(unsigned int cache, int thread_id)
 
 void check_for_cache_aliasing(int thread_id)
 {
-        unsigned int thread_cache_size;
+        int thread_cache_size;
         unsigned int cache_type;
         for (cache_type = ICACHE; cache_type <= DCACHE; cache_type++) {
                 thread_cache_size =
diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c
index b9e4a82d2bd4..0d100d5c1407 100644
--- a/arch/metag/kernel/signal.c
+++ b/arch/metag/kernel/signal.c
@@ -140,13 +140,9 @@ static int setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
 /*
  * Determine which stack to use..
  */
-static void __user *get_sigframe(struct k_sigaction *ka, unsigned long sp,
-                                 size_t frame_size)
+static void __user *get_sigframe(struct ksignal *ksig, unsigned long sp)
 {
-        /* Meta stacks grows upwards */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0))
-                sp = current->sas_ss_sp;
-
+        sp = sigsp(sp, ksig);
         sp = (sp + 7) & ~7;                     /* 8byte align stack */
 
         return (void __user *)sp;
@@ -159,7 +155,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
         int err;
         unsigned long code;
 
-        frame = get_sigframe(&ksig->ka, regs->REG_SP, sizeof(*frame));
+        frame = get_sigframe(ksig, regs->REG_SP);
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 return -EFAULT;
 
diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
index 3c52fa6d0f8e..3c32075d2945 100644
--- a/arch/metag/mm/hugetlbpage.c
+++ b/arch/metag/mm/hugetlbpage.c
@@ -173,7 +173,7 @@ new_search:
                                 mm->context.part_huge = 0;
                         return addr;
                 }
-                if (vma && (vma->vm_flags & MAP_HUGETLB)) {
+                if (vma->vm_flags & MAP_HUGETLB) {
                         /* space after a huge vma in 2nd level page table? */
                         if (vma->vm_end & HUGEPT_MASK) {
                                 after_huge = 1;
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index 35b3ecaf25d5..27a3acda6c19 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -7,5 +7,6 @@ generic-y += exec.h
 generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += syscalls.h
 generic-y += trace_clock.h
diff --git a/arch/microblaze/include/asm/delay.h b/arch/microblaze/include/asm/delay.h
index 66fc24c24238..60cb39deb533 100644
--- a/arch/microblaze/include/asm/delay.h
+++ b/arch/microblaze/include/asm/delay.h
@@ -61,13 +61,29 @@ extern inline void __udelay(unsigned int x)
 extern void __bad_udelay(void);         /* deliberately undefined */
 extern void __bad_ndelay(void);         /* deliberately undefined */
 
-#define udelay(n) (__builtin_constant_p(n) ? \
-        ((n) > __MAX_UDELAY ? __bad_udelay() : __udelay((n) * (19 * HZ))) : \
-        __udelay((n) * (19 * HZ)))
+#define udelay(n)                                               \
+        ({                                                      \
+                if (__builtin_constant_p(n)) {                  \
+                        if ((n) / __MAX_UDELAY >= 1)            \
+                                __bad_udelay();                 \
+                        else                                    \
+                                __udelay((n) * (19 * HZ));      \
+                } else {                                        \
+                        __udelay((n) * (19 * HZ));              \
+                }                                               \
+        })
 
-#define ndelay(n) (__builtin_constant_p(n) ? \
-        ((n) > __MAX_NDELAY ? __bad_ndelay() : __udelay((n) * HZ)) : \
-        __udelay((n) * HZ))
+#define ndelay(n)                                               \
+        ({                                                      \
+                if (__builtin_constant_p(n)) {                  \
+                        if ((n) / __MAX_NDELAY >= 1)            \
+                                __bad_ndelay();                 \
+                        else                                    \
+                                __udelay((n) * HZ);             \
+                } else {                                        \
+                        __udelay((n) * HZ);                     \
+                }                                               \
+        })
 
 #define muldiv(a, b, c)         (((a)*(b))/(c))
 
diff --git a/arch/microblaze/include/asm/scatterlist.h b/arch/microblaze/include/asm/scatterlist.h
deleted file mode 100644
index 35d786fe93ae..000000000000
--- a/arch/microblaze/include/asm/scatterlist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/scatterlist.h>
diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h
index 8d0791b49b31..4e1ddc930a68 100644
--- a/arch/microblaze/include/uapi/asm/unistd.h
+++ b/arch/microblaze/include/uapi/asm/unistd.h
@@ -398,5 +398,6 @@
 #define __NR_finit_module       380
 #define __NR_sched_setattr      381
 #define __NR_sched_getattr      382
+#define __NR_renameat2          383
 
 #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index 49a07a4d76d0..8955a3829cf0 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -145,22 +145,19 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
  * Determine which stack to use..
  */
 static inline void __user *
-get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
+get_sigframe(struct ksignal *ksig, struct pt_regs *regs, size_t frame_size)
 {
         /* Default to using normal stack */
-        unsigned long sp = regs->r1;
-
-        if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && !on_sig_stack(sp))
-                sp = current->sas_ss_sp + current->sas_ss_size;
+        unsigned long sp = sigsp(regs->r1, ksig);
 
         return (void __user *)((sp - frame_size) & -8UL);
 }
 
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                        sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
         int signal;
         unsigned long address = 0;
 #ifdef CONFIG_MMU
@@ -168,10 +165,10 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         pte_t *ptep;
 #endif
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         signal = current_thread_info()->exec_domain
                 && current_thread_info()->exec_domain->signal_invmap
@@ -179,8 +176,8 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 ? current_thread_info()->exec_domain->signal_invmap[sig]
                 : sig;
 
-        if (info)
-                err |= copy_siginfo_to_user(&frame->info, info);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         /* Create the ucontext. */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -227,7 +224,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         flush_dcache_range(address, address + 8);
 #endif
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up registers for signal handler */
         regs->r1 = (unsigned long) frame;
@@ -237,7 +234,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->r6 = (unsigned long) &frame->info; /* arg 1: siginfo */
         regs->r7 = (unsigned long) &frame->uc; /* arg2: ucontext */
         /* Offset to handle microblaze rtid r14, 0 */
-        regs->pc = (unsigned long)ka->sa.sa_handler;
+        regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
 
         set_fs(USER_DS);
 
@@ -247,10 +244,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 #endif
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 /* Handle restarting system calls */
@@ -283,23 +276,15 @@ do_restart:
  */
 
 static void
-handle_signal(unsigned long sig, struct k_sigaction *ka,
-                siginfo_t *info, struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset, regs);
-        else
-                ret = setup_rt_frame(sig, ka, NULL, oldset, regs);
+        ret = setup_rt_frame(ksig, oldset, regs);
 
-        if (ret)
-                return;
-
-        signal_delivered(sig, info, ka, regs,
-                        test_thread_flag(TIF_SINGLESTEP));
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -313,21 +298,19 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
  */
 static void do_signal(struct pt_regs *regs, int in_syscall)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
+
 #ifdef DEBUG_SIG
         pr_info("do signal: %p %d\n", regs, in_syscall);
         pr_info("do signal2: %lx %lx %ld [%lx]\n", regs->pc, regs->r1,
                         regs->r12, current_thread_info()->flags);
 #endif
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Whee! Actually deliver the signal. */
                 if (in_syscall)
-                        handle_restart(regs, &ka, 1);
-                handle_signal(signr, &ka, &info, regs);
+                        handle_restart(regs, &ksig.ka, 1);
+                handle_signal(&ksig, regs);
                 return;
         }
 
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S
index 329dfbad810b..1a23d5d5480c 100644
--- a/arch/microblaze/kernel/syscall_table.S
+++ b/arch/microblaze/kernel/syscall_table.S
@@ -380,6 +380,7 @@ ENTRY(sys_call_table)
         .long sys_process_vm_readv
         .long sys_process_vm_writev
         .long sys_kcmp
-        .long sys_finit_module
+        .long sys_finit_module          /* 380 */
         .long sys_sched_setattr
         .long sys_sched_getattr
+        .long sys_renameat2
diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile
index 844960e8ae18..70c7ae6a3fb5 100644
--- a/arch/microblaze/lib/Makefile
+++ b/arch/microblaze/lib/Makefile
@@ -18,14 +18,6 @@ endif
 
 lib-y += uaccess_old.o
 
-lib-y += ashldi3.o
-lib-y += ashrdi3.o
-lib-y += cmpdi2.o
-lib-y += divsi3.o
-lib-y += lshrdi3.o
-lib-y += modsi3.o
-lib-y += muldi3.o
-lib-y += mulsi3.o
-lib-y += ucmpdi2.o
-lib-y += udivsi3.o
-lib-y += umodsi3.o
+# libgcc-style stuff needed in the kernel
+obj-y += ashldi3.o ashrdi3.o cmpdi2.o divsi3.o lshrdi3.o modsi3.o
+obj-y += muldi3.o mulsi3.o ucmpdi2.o udivsi3.o umodsi3.o
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 10f270bd3e25..df51e78a72cc 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -71,6 +71,7 @@ config MIPS_ALCHEMY
         select SYS_SUPPORTS_APM_EMULATION
         select ARCH_REQUIRE_GPIOLIB
         select SYS_SUPPORTS_ZBOOT
+        select COMMON_CLK
 
 config AR7
         bool "Texas Instruments AR7"
@@ -129,6 +130,8 @@ config BCM47XX
         select SYS_SUPPORTS_MIPS16
         select SYS_HAS_EARLY_PRINTK
         select USE_GENERIC_EARLY_PRINTK_8250
+        select GPIOLIB
+        select LEDS_GPIO_REGISTER
         help
          Support for BCM47XX based boards
 
@@ -137,6 +140,7 @@ config BCM63XX
         select BOOT_RAW
         select CEVT_R4K
         select CSRC_R4K
+        select SYNC_R4K
         select DMA_NONCOHERENT
         select IRQ_CPU
         select SYS_SUPPORTS_32BIT_KERNEL
@@ -2056,6 +2060,7 @@ config MIPS_CPS
           support is unavailable.
 
 config MIPS_CPS_PM
+        select MIPS_CPC
         bool
 
 config MIPS_GIC_IPI
@@ -2109,9 +2114,9 @@ config CPU_MICROMIPS
           microMIPS ISA
 
 config CPU_HAS_MSA
-        bool "Support for the MIPS SIMD Architecture"
+        bool "Support for the MIPS SIMD Architecture (EXPERIMENTAL)"
         depends on CPU_SUPPORTS_MSA
-        default y
+        depends on 64BIT || MIPS_O32_FP64_SUPPORT
         help
           MIPS SIMD Architecture (MSA) introduces 128 bit wide vector registers
           and a set of SIMD instructions to operate on them. When this option
@@ -2391,6 +2396,8 @@ source "kernel/Kconfig.preempt"
 
 config KEXEC
         bool "Kexec system call"
+        select CRYPTO
+        select CRYPTO_SHA256
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index a8521de14791..9336509f47ad 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -151,8 +151,10 @@ cflags-$(CONFIG_CPU_NEVADA)	+= $(call cc-option,-march=rm5200,-march=r5000) \
                         -Wa,--trap
 cflags-$(CONFIG_CPU_RM7000)     += $(call cc-option,-march=rm7000,-march=r5000) \
                         -Wa,--trap
-cflags-$(CONFIG_CPU_SB1)        += $(call cc-option,-march=sb1 -mno-mdmx -mno-mips3d,-march=r5000) \
+cflags-$(CONFIG_CPU_SB1)        += $(call cc-option,-march=sb1,-march=r5000) \
                         -Wa,--trap
+cflags-$(CONFIG_CPU_SB1)        += $(call cc-option,-mno-mdmx)
+cflags-$(CONFIG_CPU_SB1)        += $(call cc-option,-mno-mips3d)
 cflags-$(CONFIG_CPU_R8000)      += -march=r8000 -Wa,--trap
 cflags-$(CONFIG_CPU_R10000)     += $(call cc-option,-march=r10000,-march=r8000) \
                         -Wa,--trap
diff --git a/arch/mips/alchemy/board-mtx1.c b/arch/mips/alchemy/board-mtx1.c
index 25a59a23547e..1e3b102389ef 100644
--- a/arch/mips/alchemy/board-mtx1.c
+++ b/arch/mips/alchemy/board-mtx1.c
@@ -85,10 +85,10 @@ void __init board_setup(void)
 #endif /* IS_ENABLED(CONFIG_USB_OHCI_HCD) */
 
         /* Initialize sys_pinfunc */
-        au_writel(SYS_PF_NI2, SYS_PINFUNC);
+        alchemy_wrsys(SYS_PF_NI2, AU1000_SYS_PINFUNC);
 
         /* Initialize GPIO */
-        au_writel(~0, KSEG1ADDR(AU1000_SYS_PHYS_ADDR) + SYS_TRIOUTCLR);
+        alchemy_wrsys(~0, AU1000_SYS_TRIOUTCLR);
         alchemy_gpio_direction_output(0, 0);    /* Disable M66EN (PCI 66MHz) */
         alchemy_gpio_direction_output(3, 1);    /* Disable PCI CLKRUN# */
         alchemy_gpio_direction_output(1, 1);    /* Enable EXT_IO3 */
diff --git a/arch/mips/alchemy/board-xxs1500.c b/arch/mips/alchemy/board-xxs1500.c
index 3fb814be0e91..0fc53e08a894 100644
--- a/arch/mips/alchemy/board-xxs1500.c
+++ b/arch/mips/alchemy/board-xxs1500.c
@@ -87,9 +87,9 @@ void __init board_setup(void)
         alchemy_gpio2_enable();
 
         /* Set multiple use pins (UART3/GPIO) to UART (it's used as UART too) */
-        pin_func  = au_readl(SYS_PINFUNC) & ~SYS_PF_UR3;
+        pin_func  = alchemy_rdsys(AU1000_SYS_PINFUNC) & ~SYS_PF_UR3;
         pin_func |= SYS_PF_UR3;
-        au_writel(pin_func, SYS_PINFUNC);
+        alchemy_wrsys(pin_func, AU1000_SYS_PINFUNC);
 
         /* Enable UART */
         alchemy_uart_enable(AU1000_UART3_PHYS_ADDR);
diff --git a/arch/mips/alchemy/common/Makefile b/arch/mips/alchemy/common/Makefile
index cb83d8d21aef..f64744f3b59f 100644
--- a/arch/mips/alchemy/common/Makefile
+++ b/arch/mips/alchemy/common/Makefile
@@ -5,8 +5,8 @@
 # Makefile for the Alchemy Au1xx0 CPUs, generic files.
 #
 
-obj-y += prom.o time.o clocks.o platform.o power.o setup.o \
-        sleeper.o dma.o dbdma.o vss.o irq.o usb.o
+obj-y += prom.o time.o clock.o platform.o power.o \
+         setup.o sleeper.o dma.o dbdma.o vss.o irq.o usb.o
 
 # optional gpiolib support
 ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),)
diff --git a/arch/mips/alchemy/common/clock.c b/arch/mips/alchemy/common/clock.c
new file mode 100644
index 000000000000..d7557cde271a
--- /dev/null
+++ b/arch/mips/alchemy/common/clock.c
@@ -0,0 +1,1094 @@
+/*
+ * Alchemy clocks.
+ *
+ * Exposes all configurable internal clock sources to the clk framework.
+ *
+ * We have:
+ *  - Root source, usually 12MHz supplied by an external crystal
+ *  - 3 PLLs which generate multiples of root rate [AUX, CPU, AUX2]
+ *
+ * Dividers:
+ *  - 6 clock dividers with:
+ *   * selectable source [one of the PLLs],
+ *   * output divided between [2 .. 512 in steps of 2] (!Au1300)
+ *     or [1 .. 256 in steps of 1] (Au1300),
+ *   * can be enabled individually.
+ *
+ * - up to 6 "internal" (fixed) consumers which:
+ *   * take either AUXPLL or one of the above 6 dividers as input,
+ *   * divide this input by 1, 2, or 4 (and 3 on Au1300).
+ *   * can be disabled separately.
+ *
+ * Misc clocks:
+ * - sysbus clock: CPU core clock (CPUPLL) divided by 2, 3 or 4.
+ *    depends on board design and should be set by bootloader, read-only.
+ * - peripheral clock: half the rate of sysbus clock, source for a lot
+ *    of peripheral blocks, read-only.
+ * - memory clock: clk rate to main memory chips, depends on board
+ *    design and is read-only,
+ * - lrclk: the static bus clock signal for synchronous operation.
+ *    depends on board design, must be set by bootloader,
+ *    but may be required to correctly configure devices attached to
+ *    the static bus. The Au1000/1500/1100 manuals call it LCLK, on
+ *    later models it's called RCLK.
+ */
+
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/clk-provider.h>
+#include <linux/clkdev.h>
+#include <linux/clk-private.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+#include <asm/mach-au1x00/au1000.h>
+
+/* Base clock: 12MHz is the default in all databooks, and I haven't
+ * found any board yet which uses a different rate.
+ */
+#define ALCHEMY_ROOTCLK_RATE    12000000
+
+/*
+ * the internal sources which can be driven by the PLLs and dividers.
+ * Names taken from the databooks, refer to them for more information,
+ * especially which ones are share a clock line.
+ */
+static const char * const alchemy_au1300_intclknames[] = {
+        "lcd_intclk", "gpemgp_clk", "maempe_clk", "maebsa_clk",
+        "EXTCLK0", "EXTCLK1"
+};
+
+static const char * const alchemy_au1200_intclknames[] = {
+        "lcd_intclk", NULL, NULL, NULL, "EXTCLK0", "EXTCLK1"
+};
+
+static const char * const alchemy_au1550_intclknames[] = {
+        "usb_clk", "psc0_intclk", "psc1_intclk", "pci_clko",
+        "EXTCLK0", "EXTCLK1"
+};
+
+static const char * const alchemy_au1100_intclknames[] = {
+        "usb_clk", "lcd_intclk", NULL, "i2s_clk", "EXTCLK0", "EXTCLK1"
+};
+
+static const char * const alchemy_au1500_intclknames[] = {
+        NULL, "usbd_clk", "usbh_clk", "pci_clko", "EXTCLK0", "EXTCLK1"
+};
+
+static const char * const alchemy_au1000_intclknames[] = {
+        "irda_clk", "usbd_clk", "usbh_clk", "i2s_clk", "EXTCLK0",
+        "EXTCLK1"
+};
+
+/* aliases for a few on-chip sources which are either shared
+ * or have gone through name changes.
+ */
+static struct clk_aliastable {
+        char *alias;
+        char *base;
+        int cputype;
+} alchemy_clk_aliases[] __initdata = {
+        { "usbh_clk", "usb_clk",    ALCHEMY_CPU_AU1100 },
+        { "usbd_clk", "usb_clk",    ALCHEMY_CPU_AU1100 },
+        { "irda_clk", "usb_clk",    ALCHEMY_CPU_AU1100 },
+        { "usbh_clk", "usb_clk",    ALCHEMY_CPU_AU1550 },
+        { "usbd_clk", "usb_clk",    ALCHEMY_CPU_AU1550 },
+        { "psc2_intclk", "usb_clk", ALCHEMY_CPU_AU1550 },
+        { "psc3_intclk", "EXTCLK0", ALCHEMY_CPU_AU1550 },
+        { "psc0_intclk", "EXTCLK0", ALCHEMY_CPU_AU1200 },
+        { "psc1_intclk", "EXTCLK1", ALCHEMY_CPU_AU1200 },
+        { "psc0_intclk", "EXTCLK0", ALCHEMY_CPU_AU1300 },
+        { "psc2_intclk", "EXTCLK0", ALCHEMY_CPU_AU1300 },
+        { "psc1_intclk", "EXTCLK1", ALCHEMY_CPU_AU1300 },
+        { "psc3_intclk", "EXTCLK1", ALCHEMY_CPU_AU1300 },
+
+        { NULL, NULL, 0 },
+};
+
+#define IOMEM(x)        ((void __iomem *)(KSEG1ADDR(CPHYSADDR(x))))
+
+/* access locks to SYS_FREQCTRL0/1 and SYS_CLKSRC registers */
+static spinlock_t alchemy_clk_fg0_lock;
+static spinlock_t alchemy_clk_fg1_lock;
+static spinlock_t alchemy_clk_csrc_lock;
+
+/* CPU Core clock *****************************************************/
+
+static unsigned long alchemy_clk_cpu_recalc(struct clk_hw *hw,
+                                            unsigned long parent_rate)
+{
+        unsigned long t;
+
+        /*
+         * On early Au1000, sys_cpupll was write-only. Since these
+         * silicon versions of Au1000 are not sold, we don't bend
+         * over backwards trying to determine the frequency.
+         */
+        if (unlikely(au1xxx_cpu_has_pll_wo()))
+                t = 396000000;
+        else {
+                t = alchemy_rdsys(AU1000_SYS_CPUPLL) & 0x7f;
+                t *= parent_rate;
+        }
+
+        return t;
+}
+
+static struct clk_ops alchemy_clkops_cpu = {
+        .recalc_rate    = alchemy_clk_cpu_recalc,
+};
+
+static struct clk __init *alchemy_clk_setup_cpu(const char *parent_name,
+                                                int ctype)
+{
+        struct clk_init_data id;
+        struct clk_hw *h;
+
+        h = kzalloc(sizeof(*h), GFP_KERNEL);
+        if (!h)
+                return ERR_PTR(-ENOMEM);
+
+        id.name = ALCHEMY_CPU_CLK;
+        id.parent_names = &parent_name;
+        id.num_parents = 1;
+        id.flags = CLK_IS_BASIC;
+        id.ops = &alchemy_clkops_cpu;
+        h->init = &id;
+
+        return clk_register(NULL, h);
+}
+
+/* AUXPLLs ************************************************************/
+
+struct alchemy_auxpll_clk {
+        struct clk_hw hw;
+        unsigned long reg;      /* au1300 has also AUXPLL2 */
+        int maxmult;            /* max multiplier */
+};
+#define to_auxpll_clk(x) container_of(x, struct alchemy_auxpll_clk, hw)
+
+static unsigned long alchemy_clk_aux_recalc(struct clk_hw *hw,
+                                            unsigned long parent_rate)
+{
+        struct alchemy_auxpll_clk *a = to_auxpll_clk(hw);
+
+        return (alchemy_rdsys(a->reg) & 0xff) * parent_rate;
+}
+
+static int alchemy_clk_aux_setr(struct clk_hw *hw,
+                                unsigned long rate,
+                                unsigned long parent_rate)
+{
+        struct alchemy_auxpll_clk *a = to_auxpll_clk(hw);
+        unsigned long d = rate;
+
+        if (rate)
+                d /= parent_rate;
+        else
+                d = 0;
+
+        /* minimum is 84MHz, max is 756-1032 depending on variant */
+        if (((d < 7) && (d != 0)) || (d > a->maxmult))
+                return -EINVAL;
+
+        alchemy_wrsys(d, a->reg);
+        return 0;
+}
+
+static long alchemy_clk_aux_roundr(struct clk_hw *hw,
+                                            unsigned long rate,
+                                            unsigned long *parent_rate)
+{
+        struct alchemy_auxpll_clk *a = to_auxpll_clk(hw);
+        unsigned long mult;
+
+        if (!rate || !*parent_rate)
+                return 0;
+
+        mult = rate / (*parent_rate);
+
+        if (mult && (mult < 7))
+                mult = 7;
+        if (mult > a->maxmult)
+                mult = a->maxmult;
+
+        return (*parent_rate) * mult;
+}
+
+static struct clk_ops alchemy_clkops_aux = {
+        .recalc_rate    = alchemy_clk_aux_recalc,
+        .set_rate       = alchemy_clk_aux_setr,
+        .round_rate     = alchemy_clk_aux_roundr,
+};
+
+static struct clk __init *alchemy_clk_setup_aux(const char *parent_name,
+                                                char *name, int maxmult,
+                                                unsigned long reg)
+{
+        struct clk_init_data id;
+        struct clk *c;
+        struct alchemy_auxpll_clk *a;
+
+        a = kzalloc(sizeof(*a), GFP_KERNEL);
+        if (!a)
+                return ERR_PTR(-ENOMEM);
+
+        id.name = name;
+        id.parent_names = &parent_name;
+        id.num_parents = 1;
+        id.flags = CLK_GET_RATE_NOCACHE;
+        id.ops = &alchemy_clkops_aux;
+
+        a->reg = reg;
+        a->maxmult = maxmult;
+        a->hw.init = &id;
+
+        c = clk_register(NULL, &a->hw);
+        if (!IS_ERR(c))
+                clk_register_clkdev(c, name, NULL);
+        else
+                kfree(a);
+
+        return c;
+}
+
+/* sysbus_clk *********************************************************/
+
+static struct clk __init  *alchemy_clk_setup_sysbus(const char *pn)
+{
+        unsigned long v = (alchemy_rdsys(AU1000_SYS_POWERCTRL) & 3) + 2;
+        struct clk *c;
+
+        c = clk_register_fixed_factor(NULL, ALCHEMY_SYSBUS_CLK,
+                                      pn, 0, 1, v);
+        if (!IS_ERR(c))
+                clk_register_clkdev(c, ALCHEMY_SYSBUS_CLK, NULL);
+        return c;
+}
+
+/* Peripheral Clock ***************************************************/
+
+static struct clk __init *alchemy_clk_setup_periph(const char *pn)
+{
+        /* Peripheral clock runs at half the rate of sysbus clk */
+        struct clk *c;
+
+        c = clk_register_fixed_factor(NULL, ALCHEMY_PERIPH_CLK,
+                                      pn, 0, 1, 2);
+        if (!IS_ERR(c))
+                clk_register_clkdev(c, ALCHEMY_PERIPH_CLK, NULL);
+        return c;
+}
+
+/* mem clock **********************************************************/
+
+static struct clk __init *alchemy_clk_setup_mem(const char *pn, int ct)
+{
+        void __iomem *addr = IOMEM(AU1000_MEM_PHYS_ADDR);
+        unsigned long v;
+        struct clk *c;
+        int div;
+
+        switch (ct) {
+        case ALCHEMY_CPU_AU1550:
+        case ALCHEMY_CPU_AU1200:
+                v = __raw_readl(addr + AU1550_MEM_SDCONFIGB);
+                div = (v & (1 << 15)) ? 1 : 2;
+                break;
+        case ALCHEMY_CPU_AU1300:
+                v = __raw_readl(addr + AU1550_MEM_SDCONFIGB);
+                div = (v & (1 << 31)) ? 1 : 2;
+                break;
+        case ALCHEMY_CPU_AU1000:
+        case ALCHEMY_CPU_AU1500:
+        case ALCHEMY_CPU_AU1100:
+        default:
+                div = 2;
+                break;
+        }
+
+        c = clk_register_fixed_factor(NULL, ALCHEMY_MEM_CLK, pn,
+                                      0, 1, div);
+        if (!IS_ERR(c))
+                clk_register_clkdev(c, ALCHEMY_MEM_CLK, NULL);
+        return c;
+}
+
+/* lrclk: external synchronous static bus clock ***********************/
+
+static struct clk __init *alchemy_clk_setup_lrclk(const char *pn)
+{
+        /* MEM_STCFG0[15:13] = divisor.
+         * L/RCLK = periph_clk / (divisor + 1)
+         * On Au1000, Au1500, Au1100 it's called LCLK,
+         * on later models it's called RCLK, but it's the same thing.
+         */
+        struct clk *c;
+        unsigned long v = alchemy_rdsmem(AU1000_MEM_STCFG0) >> 13;
+
+        v = (v & 7) + 1;
+        c = clk_register_fixed_factor(NULL, ALCHEMY_LR_CLK,
+                                      pn, 0, 1, v);
+        if (!IS_ERR(c))
+                clk_register_clkdev(c, ALCHEMY_LR_CLK, NULL);
+        return c;
+}
+
+/* Clock dividers and muxes *******************************************/
+
+/* data for fgen and csrc mux-dividers */
+struct alchemy_fgcs_clk {
+        struct clk_hw hw;
+        spinlock_t *reglock;    /* register lock                  */
+        unsigned long reg;      /* SYS_FREQCTRL0/1                */
+        int shift;              /* offset in register             */
+        int parent;             /* parent before disable [Au1300] */
+        int isen;               /* is it enabled?                 */
+        int *dt;                /* dividertable for csrc          */
+};
+#define to_fgcs_clk(x) container_of(x, struct alchemy_fgcs_clk, hw)
+
+static long alchemy_calc_div(unsigned long rate, unsigned long prate,
+                               int scale, int maxdiv, unsigned long *rv)
+{
+        long div1, div2;
+
+        div1 = prate / rate;
+        if ((prate / div1) > rate)
+                div1++;
+
+        if (scale == 2) {       /* only div-by-multiple-of-2 possible */
+                if (div1 & 1)
+                        div1++; /* stay <=prate */
+        }
+
+        div2 = (div1 / scale) - 1;      /* value to write to register */
+
+        if (div2 > maxdiv)
+                div2 = maxdiv;
+        if (rv)
+                *rv = div2;
+
+        div1 = ((div2 + 1) * scale);
+        return div1;
+}
+
+static long alchemy_clk_fgcs_detr(struct clk_hw *hw, unsigned long rate,
+                                        unsigned long *best_parent_rate,
+                                        struct clk **best_parent_clk,
+                                        int scale, int maxdiv)
+{
+        struct clk *pc, *bpc, *free;
+        long tdv, tpr, pr, nr, br, bpr, diff, lastdiff;
+        int j;
+
+        lastdiff = INT_MAX;
+        bpr = 0;
+        bpc = NULL;
+        br = -EINVAL;
+        free = NULL;
+
+        /* look at the rates each enabled parent supplies and select
+         * the one that gets closest to but not over the requested rate.
+         */
+        for (j = 0; j < 7; j++) {
+                pc = clk_get_parent_by_index(hw->clk, j);
+                if (!pc)
+                        break;
+
+                /* if this parent is currently unused, remember it.
+                 * XXX: I know it's a layering violation, but it works
+                 * so well.. (if (!clk_has_active_children(pc)) )
+                 */
+                if (pc->prepare_count == 0) {
+                        if (!free)
+                                free = pc;
+                }
+
+                pr = clk_get_rate(pc);
+                if (pr < rate)
+                        continue;
+
+                /* what can hardware actually provide */
+                tdv = alchemy_calc_div(rate, pr, scale, maxdiv, NULL);
+                nr = pr / tdv;
+                diff = rate - nr;
+                if (nr > rate)
+                        continue;
+
+                if (diff < lastdiff) {
+                        lastdiff = diff;
+                        bpr = pr;
+                        bpc = pc;
+                        br = nr;
+                }
+                if (diff == 0)
+                        break;
+        }
+
+        /* if we couldn't get the exact rate we wanted from the enabled
+         * parents, maybe we can tell an available disabled/inactive one
+         * to give us a rate we can divide down to the requested rate.
+         */
+        if (lastdiff && free) {
+                for (j = (maxdiv == 4) ? 1 : scale; j <= maxdiv; j += scale) {
+                        tpr = rate * j;
+                        if (tpr < 0)
+                                break;
+                        pr = clk_round_rate(free, tpr);
+
+                        tdv = alchemy_calc_div(rate, pr, scale, maxdiv, NULL);
+                        nr = pr / tdv;
+                        diff = rate - nr;
+                        if (nr > rate)
+                                continue;
+                        if (diff < lastdiff) {
+                                lastdiff = diff;
+                                bpr = pr;
+                                bpc = free;
+                                br = nr;
+                        }
+                        if (diff == 0)
+                                break;
+                }
+        }
+
+        *best_parent_rate = bpr;
+        *best_parent_clk = bpc;
+        return br;
+}
+
+static int alchemy_clk_fgv1_en(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long v, flags;
+
+        spin_lock_irqsave(c->reglock, flags);
+        v = alchemy_rdsys(c->reg);
+        v |= (1 << 1) << c->shift;
+        alchemy_wrsys(v, c->reg);
+        spin_unlock_irqrestore(c->reglock, flags);
+
+        return 0;
+}
+
+static int alchemy_clk_fgv1_isen(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long v = alchemy_rdsys(c->reg) >> (c->shift + 1);
+
+        return v & 1;
+}
+
+static void alchemy_clk_fgv1_dis(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long v, flags;
+
+        spin_lock_irqsave(c->reglock, flags);
+        v = alchemy_rdsys(c->reg);
+        v &= ~((1 << 1) << c->shift);
+        alchemy_wrsys(v, c->reg);
+        spin_unlock_irqrestore(c->reglock, flags);
+}
+
+static int alchemy_clk_fgv1_setp(struct clk_hw *hw, u8 index)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long v, flags;
+
+        spin_lock_irqsave(c->reglock, flags);
+        v = alchemy_rdsys(c->reg);
+        if (index)
+                v |= (1 << c->shift);
+        else
+                v &= ~(1 << c->shift);
+        alchemy_wrsys(v, c->reg);
+        spin_unlock_irqrestore(c->reglock, flags);
+
+        return 0;
+}
+
+static u8 alchemy_clk_fgv1_getp(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+
+        return (alchemy_rdsys(c->reg) >> c->shift) & 1;
+}
+
+static int alchemy_clk_fgv1_setr(struct clk_hw *hw, unsigned long rate,
+                                 unsigned long parent_rate)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long div, v, flags, ret;
+        int sh = c->shift + 2;
+
+        if (!rate || !parent_rate || rate > (parent_rate / 2))
+                return -EINVAL;
+        ret = alchemy_calc_div(rate, parent_rate, 2, 512, &div);
+        spin_lock_irqsave(c->reglock, flags);
+        v = alchemy_rdsys(c->reg);
+        v &= ~(0xff << sh);
+        v |= div << sh;
+        alchemy_wrsys(v, c->reg);
+        spin_unlock_irqrestore(c->reglock, flags);
+
+        return 0;
+}
+
+static unsigned long alchemy_clk_fgv1_recalc(struct clk_hw *hw,
+                                             unsigned long parent_rate)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long v = alchemy_rdsys(c->reg) >> (c->shift + 2);
+
+        v = ((v & 0xff) + 1) * 2;
+        return parent_rate / v;
+}
+
+static long alchemy_clk_fgv1_detr(struct clk_hw *hw, unsigned long rate,
+                                        unsigned long *best_parent_rate,
+                                        struct clk **best_parent_clk)
+{
+        return alchemy_clk_fgcs_detr(hw, rate, best_parent_rate,
+                                     best_parent_clk, 2, 512);
+}
+
+/* Au1000, Au1100, Au15x0, Au12x0 */
+static struct clk_ops alchemy_clkops_fgenv1 = {
+        .recalc_rate    = alchemy_clk_fgv1_recalc,
+        .determine_rate = alchemy_clk_fgv1_detr,
+        .set_rate       = alchemy_clk_fgv1_setr,
+        .set_parent     = alchemy_clk_fgv1_setp,
+        .get_parent     = alchemy_clk_fgv1_getp,
+        .enable         = alchemy_clk_fgv1_en,
+        .disable        = alchemy_clk_fgv1_dis,
+        .is_enabled     = alchemy_clk_fgv1_isen,
+};
+
+static void __alchemy_clk_fgv2_en(struct alchemy_fgcs_clk *c)
+{
+        unsigned long v = alchemy_rdsys(c->reg);
+
+        v &= ~(3 << c->shift);
+        v |= (c->parent & 3) << c->shift;
+        alchemy_wrsys(v, c->reg);
+        c->isen = 1;
+}
+
+static int alchemy_clk_fgv2_en(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long flags;
+
+        /* enable by setting the previous parent clock */
+        spin_lock_irqsave(c->reglock, flags);
+        __alchemy_clk_fgv2_en(c);
+        spin_unlock_irqrestore(c->reglock, flags);
+
+        return 0;
+}
+
+static int alchemy_clk_fgv2_isen(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+
+        return ((alchemy_rdsys(c->reg) >> c->shift) & 3) != 0;
+}
+
+static void alchemy_clk_fgv2_dis(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long v, flags;
+
+        spin_lock_irqsave(c->reglock, flags);
+        v = alchemy_rdsys(c->reg);
+        v &= ~(3 << c->shift);  /* set input mux to "disabled" state */
+        alchemy_wrsys(v, c->reg);
+        c->isen = 0;
+        spin_unlock_irqrestore(c->reglock, flags);
+}
+
+static int alchemy_clk_fgv2_setp(struct clk_hw *hw, u8 index)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long flags;
+
+        spin_lock_irqsave(c->reglock, flags);
+        c->parent = index + 1;  /* value to write to register */
+        if (c->isen)
+                __alchemy_clk_fgv2_en(c);
+        spin_unlock_irqrestore(c->reglock, flags);
+
+        return 0;
+}
+
+static u8 alchemy_clk_fgv2_getp(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long flags, v;
+
+        spin_lock_irqsave(c->reglock, flags);
+        v = c->parent - 1;
+        spin_unlock_irqrestore(c->reglock, flags);
+        return v;
+}
+
+/* fg0-2 and fg4-6 share a "scale"-bit. With this bit cleared, the
+ * dividers behave exactly as on previous models (dividers are multiples
+ * of 2); with the bit set, dividers are multiples of 1, halving their
+ * range, but making them also much more flexible.
+ */
+static int alchemy_clk_fgv2_setr(struct clk_hw *hw, unsigned long rate,
+                                 unsigned long parent_rate)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        int sh = c->shift + 2;
+        unsigned long div, v, flags, ret;
+
+        if (!rate || !parent_rate || rate > parent_rate)
+                return -EINVAL;
+
+        v = alchemy_rdsys(c->reg) & (1 << 30); /* test "scale" bit */
+        ret = alchemy_calc_div(rate, parent_rate, v ? 1 : 2,
+                               v ? 256 : 512, &div);
+
+        spin_lock_irqsave(c->reglock, flags);
+        v = alchemy_rdsys(c->reg);
+        v &= ~(0xff << sh);
+        v |= (div & 0xff) << sh;
+        alchemy_wrsys(v, c->reg);
+        spin_unlock_irqrestore(c->reglock, flags);
+
+        return 0;
+}
+
+static unsigned long alchemy_clk_fgv2_recalc(struct clk_hw *hw,
+                                             unsigned long parent_rate)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        int sh = c->shift + 2;
+        unsigned long v, t;
+
+        v = alchemy_rdsys(c->reg);
+        t = parent_rate / (((v >> sh) & 0xff) + 1);
+        if ((v & (1 << 30)) == 0)               /* test scale bit */
+                t /= 2;
+
+        return t;
+}
+
+static long alchemy_clk_fgv2_detr(struct clk_hw *hw, unsigned long rate,
+                                        unsigned long *best_parent_rate,
+                                        struct clk **best_parent_clk)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        int scale, maxdiv;
+
+        if (alchemy_rdsys(c->reg) & (1 << 30)) {
+                scale = 1;
+                maxdiv = 256;
+        } else {
+                scale = 2;
+                maxdiv = 512;
+        }
+
+        return alchemy_clk_fgcs_detr(hw, rate, best_parent_rate,
+                                     best_parent_clk, scale, maxdiv);
+}
+
+/* Au1300 larger input mux, no separate disable bit, flexible divider */
+static struct clk_ops alchemy_clkops_fgenv2 = {
+        .recalc_rate    = alchemy_clk_fgv2_recalc,
+        .determine_rate = alchemy_clk_fgv2_detr,
+        .set_rate       = alchemy_clk_fgv2_setr,
+        .set_parent     = alchemy_clk_fgv2_setp,
+        .get_parent     = alchemy_clk_fgv2_getp,
+        .enable         = alchemy_clk_fgv2_en,
+        .disable        = alchemy_clk_fgv2_dis,
+        .is_enabled     = alchemy_clk_fgv2_isen,
+};
+
+static const char * const alchemy_clk_fgv1_parents[] = {
+        ALCHEMY_CPU_CLK, ALCHEMY_AUXPLL_CLK
+};
+
+static const char * const alchemy_clk_fgv2_parents[] = {
+        ALCHEMY_AUXPLL2_CLK, ALCHEMY_CPU_CLK, ALCHEMY_AUXPLL_CLK
+};
+
+static const char * const alchemy_clk_fgen_names[] = {
+        ALCHEMY_FG0_CLK, ALCHEMY_FG1_CLK, ALCHEMY_FG2_CLK,
+        ALCHEMY_FG3_CLK, ALCHEMY_FG4_CLK, ALCHEMY_FG5_CLK };
+
+static int __init alchemy_clk_init_fgens(int ctype)
+{
+        struct clk *c;
+        struct clk_init_data id;
+        struct alchemy_fgcs_clk *a;
+        unsigned long v;
+        int i, ret;
+
+        switch (ctype) {
+        case ALCHEMY_CPU_AU1000...ALCHEMY_CPU_AU1200:
+                id.ops = &alchemy_clkops_fgenv1;
+                id.parent_names = (const char **)alchemy_clk_fgv1_parents;
+                id.num_parents = 2;
+                break;
+        case ALCHEMY_CPU_AU1300:
+                id.ops = &alchemy_clkops_fgenv2;
+                id.parent_names = (const char **)alchemy_clk_fgv2_parents;
+                id.num_parents = 3;
+                break;
+        default:
+                return -ENODEV;
+        }
+        id.flags = CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE;
+
+        a = kzalloc((sizeof(*a)) * 6, GFP_KERNEL);
+        if (!a)
+                return -ENOMEM;
+
+        spin_lock_init(&alchemy_clk_fg0_lock);
+        spin_lock_init(&alchemy_clk_fg1_lock);
+        ret = 0;
+        for (i = 0; i < 6; i++) {
+                id.name = alchemy_clk_fgen_names[i];
+                a->shift = 10 * (i < 3 ? i : i - 3);
+                if (i > 2) {
+                        a->reg = AU1000_SYS_FREQCTRL1;
+                        a->reglock = &alchemy_clk_fg1_lock;
+                } else {
+                        a->reg = AU1000_SYS_FREQCTRL0;
+                        a->reglock = &alchemy_clk_fg0_lock;
+                }
+
+                /* default to first parent if bootloader has set
+                 * the mux to disabled state.
+                 */
+                if (ctype == ALCHEMY_CPU_AU1300) {
+                        v = alchemy_rdsys(a->reg);
+                        a->parent = (v >> a->shift) & 3;
+                        if (!a->parent) {
+                                a->parent = 1;
+                                a->isen = 0;
+                        } else
+                                a->isen = 1;
+                }
+
+                a->hw.init = &id;
+                c = clk_register(NULL, &a->hw);
+                if (IS_ERR(c))
+                        ret++;
+                else
+                        clk_register_clkdev(c, id.name, NULL);
+                a++;
+        }
+
+        return ret;
+}
+
+/* internal sources muxes *********************************************/
+
+static int alchemy_clk_csrc_isen(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long v = alchemy_rdsys(c->reg);
+
+        return (((v >> c->shift) >> 2) & 7) != 0;
+}
+
+static void __alchemy_clk_csrc_en(struct alchemy_fgcs_clk *c)
+{
+        unsigned long v = alchemy_rdsys(c->reg);
+
+        v &= ~((7 << 2) << c->shift);
+        v |= ((c->parent & 7) << 2) << c->shift;
+        alchemy_wrsys(v, c->reg);
+        c->isen = 1;
+}
+
+static int alchemy_clk_csrc_en(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long flags;
+
+        /* enable by setting the previous parent clock */
+        spin_lock_irqsave(c->reglock, flags);
+        __alchemy_clk_csrc_en(c);
+        spin_unlock_irqrestore(c->reglock, flags);
+
+        return 0;
+}
+
+static void alchemy_clk_csrc_dis(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long v, flags;
+
+        spin_lock_irqsave(c->reglock, flags);
+        v = alchemy_rdsys(c->reg);
+        v &= ~((3 << 2) << c->shift);   /* mux to "disabled" state */
+        alchemy_wrsys(v, c->reg);
+        c->isen = 0;
+        spin_unlock_irqrestore(c->reglock, flags);
+}
+
+static int alchemy_clk_csrc_setp(struct clk_hw *hw, u8 index)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long flags;
+
+        spin_lock_irqsave(c->reglock, flags);
+        c->parent = index + 1;  /* value to write to register */
+        if (c->isen)
+                __alchemy_clk_csrc_en(c);
+        spin_unlock_irqrestore(c->reglock, flags);
+
+        return 0;
+}
+
+static u8 alchemy_clk_csrc_getp(struct clk_hw *hw)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+
+        return c->parent - 1;
+}
+
+static unsigned long alchemy_clk_csrc_recalc(struct clk_hw *hw,
+                                             unsigned long parent_rate)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long v = (alchemy_rdsys(c->reg) >> c->shift) & 3;
+
+        return parent_rate / c->dt[v];
+}
+
+static int alchemy_clk_csrc_setr(struct clk_hw *hw, unsigned long rate,
+                                 unsigned long parent_rate)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        unsigned long d, v, flags;
+        int i;
+
+        if (!rate || !parent_rate || rate > parent_rate)
+                return -EINVAL;
+
+        d = (parent_rate + (rate / 2)) / rate;
+        if (d > 4)
+                return -EINVAL;
+        if ((d == 3) && (c->dt[2] != 3))
+                d = 4;
+
+        for (i = 0; i < 4; i++)
+                if (c->dt[i] == d)
+                        break;
+
+        if (i >= 4)
+                return -EINVAL; /* oops */
+
+        spin_lock_irqsave(c->reglock, flags);
+        v = alchemy_rdsys(c->reg);
+        v &= ~(3 << c->shift);
+        v |= (i & 3) << c->shift;
+        alchemy_wrsys(v, c->reg);
+        spin_unlock_irqrestore(c->reglock, flags);
+
+        return 0;
+}
+
+static long alchemy_clk_csrc_detr(struct clk_hw *hw, unsigned long rate,
+                                        unsigned long *best_parent_rate,
+                                        struct clk **best_parent_clk)
+{
+        struct alchemy_fgcs_clk *c = to_fgcs_clk(hw);
+        int scale = c->dt[2] == 3 ? 1 : 2; /* au1300 check */
+
+        return alchemy_clk_fgcs_detr(hw, rate, best_parent_rate,
+                                     best_parent_clk, scale, 4);
+}
+
+static struct clk_ops alchemy_clkops_csrc = {
+        .recalc_rate    = alchemy_clk_csrc_recalc,
+        .determine_rate = alchemy_clk_csrc_detr,
+        .set_rate       = alchemy_clk_csrc_setr,
+        .set_parent     = alchemy_clk_csrc_setp,
+        .get_parent     = alchemy_clk_csrc_getp,
+        .enable         = alchemy_clk_csrc_en,
+        .disable        = alchemy_clk_csrc_dis,
+        .is_enabled     = alchemy_clk_csrc_isen,
+};
+
+static const char * const alchemy_clk_csrc_parents[] = {
+        /* disabled at index 0 */ ALCHEMY_AUXPLL_CLK,
+        ALCHEMY_FG0_CLK, ALCHEMY_FG1_CLK, ALCHEMY_FG2_CLK,
+        ALCHEMY_FG3_CLK, ALCHEMY_FG4_CLK, ALCHEMY_FG5_CLK
+};
+
+/* divider tables */
+static int alchemy_csrc_dt1[] = { 1, 4, 1, 2 }; /* rest */
+static int alchemy_csrc_dt2[] = { 1, 4, 3, 2 }; /* Au1300 */
+
+static int __init alchemy_clk_setup_imux(int ctype)
+{
+        struct alchemy_fgcs_clk *a;
+        const char * const *names;
+        struct clk_init_data id;
+        unsigned long v;
+        int i, ret, *dt;
+        struct clk *c;
+
+        id.ops = &alchemy_clkops_csrc;
+        id.parent_names = (const char **)alchemy_clk_csrc_parents;
+        id.num_parents = 7;
+        id.flags = CLK_SET_RATE_PARENT | CLK_GET_RATE_NOCACHE;
+
+        dt = alchemy_csrc_dt1;
+        switch (ctype) {
+        case ALCHEMY_CPU_AU1000:
+                names = alchemy_au1000_intclknames;
+                break;
+        case ALCHEMY_CPU_AU1500:
+                names = alchemy_au1500_intclknames;
+                break;
+        case ALCHEMY_CPU_AU1100:
+                names = alchemy_au1100_intclknames;
+                break;
+        case ALCHEMY_CPU_AU1550:
+                names = alchemy_au1550_intclknames;
+                break;
+        case ALCHEMY_CPU_AU1200:
+                names = alchemy_au1200_intclknames;
+                break;
+        case ALCHEMY_CPU_AU1300:
+                dt = alchemy_csrc_dt2;
+                names = alchemy_au1300_intclknames;
+                break;
+        default:
+                return -ENODEV;
+        }
+
+        a = kzalloc((sizeof(*a)) * 6, GFP_KERNEL);
+        if (!a)
+                return -ENOMEM;
+
+        spin_lock_init(&alchemy_clk_csrc_lock);
+        ret = 0;
+
+        for (i = 0; i < 6; i++) {
+                id.name = names[i];
+                if (!id.name)
+                        goto next;
+
+                a->shift = i * 5;
+                a->reg = AU1000_SYS_CLKSRC;
+                a->reglock = &alchemy_clk_csrc_lock;
+                a->dt = dt;
+
+                /* default to first parent clock if mux is initially
+                 * set to disabled state.
+                 */
+                v = alchemy_rdsys(a->reg);
+                a->parent = ((v >> a->shift) >> 2) & 7;
+                if (!a->parent) {
+                        a->parent = 1;
+                        a->isen = 0;
+                } else
+                        a->isen = 1;
+
+                a->hw.init = &id;
+                c = clk_register(NULL, &a->hw);
+                if (IS_ERR(c))
+                        ret++;
+                else
+                        clk_register_clkdev(c, id.name, NULL);
+next:
+                a++;
+        }
+
+        return ret;
+}
+
+
+/**********************************************************************/
+
+
+#define ERRCK(x)                                                \
+        if (IS_ERR(x)) {                                        \
+                ret = PTR_ERR(x);                               \
+                goto out;                                       \
+        }
+
+static int __init alchemy_clk_init(void)
+{
+        int ctype = alchemy_get_cputype(), ret, i;
+        struct clk_aliastable *t = alchemy_clk_aliases;
+        struct clk *c;
+
+        /* Root of the Alchemy clock tree: external 12MHz crystal osc */
+        c = clk_register_fixed_rate(NULL, ALCHEMY_ROOT_CLK, NULL,
+                                           CLK_IS_ROOT,
+                                           ALCHEMY_ROOTCLK_RATE);
+        ERRCK(c)
+
+        /* CPU core clock */
+        c = alchemy_clk_setup_cpu(ALCHEMY_ROOT_CLK, ctype);
+        ERRCK(c)
+
+        /* AUXPLLs: max 1GHz on Au1300, 748MHz on older models */
+        i = (ctype == ALCHEMY_CPU_AU1300) ? 84 : 63;
+        c = alchemy_clk_setup_aux(ALCHEMY_ROOT_CLK, ALCHEMY_AUXPLL_CLK,
+                                  i, AU1000_SYS_AUXPLL);
+        ERRCK(c)
+
+        if (ctype == ALCHEMY_CPU_AU1300) {
+                c = alchemy_clk_setup_aux(ALCHEMY_ROOT_CLK,
+                                          ALCHEMY_AUXPLL2_CLK, i,
+                                          AU1300_SYS_AUXPLL2);
+                ERRCK(c)
+        }
+
+        /* sysbus clock: cpu core clock divided by 2, 3 or 4 */
+        c = alchemy_clk_setup_sysbus(ALCHEMY_CPU_CLK);
+        ERRCK(c)
+
+        /* peripheral clock: runs at half rate of sysbus clk */
+        c = alchemy_clk_setup_periph(ALCHEMY_SYSBUS_CLK);
+        ERRCK(c)
+
+        /* SDR/DDR memory clock */
+        c = alchemy_clk_setup_mem(ALCHEMY_SYSBUS_CLK, ctype);
+        ERRCK(c)
+
+        /* L/RCLK: external static bus clock for synchronous mode */
+        c = alchemy_clk_setup_lrclk(ALCHEMY_PERIPH_CLK);
+        ERRCK(c)
+
+        /* Frequency dividers 0-5 */
+        ret = alchemy_clk_init_fgens(ctype);
+        if (ret) {
+                ret = -ENODEV;
+                goto out;
+        }
+
+        /* diving muxes for internal sources */
+        ret = alchemy_clk_setup_imux(ctype);
+        if (ret) {
+                ret = -ENODEV;
+                goto out;
+        }
+
+        /* set up aliases drivers might look for */
+        while (t->base) {
+                if (t->cputype == ctype)
+                        clk_add_alias(t->alias, NULL, t->base, NULL);
+                t++;
+        }
+
+        pr_info("Alchemy clocktree installed\n");
+        return 0;
+
+out:
+        return ret;
+}
+postcore_initcall(alchemy_clk_init);
diff --git a/arch/mips/alchemy/common/clocks.c b/arch/mips/alchemy/common/clocks.c
deleted file mode 100644
index f38298a8b98c..000000000000
--- a/arch/mips/alchemy/common/clocks.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * BRIEF MODULE DESCRIPTION
- *      Simple Au1xx0 clocks routines.
- *
- * Copyright 2001, 2008 MontaVista Software Inc.
- * Author: MontaVista Software, Inc. <source@mvista.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  SOFTWARE  IS PROVIDED   ``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   THE AUTHOR  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.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/module.h>
-#include <linux/spinlock.h>
-#include <asm/time.h>
-#include <asm/mach-au1x00/au1000.h>
-
-/*
- * I haven't found anyone that doesn't use a 12 MHz source clock,
- * but just in case.....
- */
-#define AU1000_SRC_CLK  12000000
-
-static unsigned int au1x00_clock; /*  Hz */
-static unsigned long uart_baud_base;
-
-/*
- * Set the au1000_clock
- */
-void set_au1x00_speed(unsigned int new_freq)
-{
-        au1x00_clock = new_freq;
-}
-
-unsigned int get_au1x00_speed(void)
-{
-        return au1x00_clock;
-}
-EXPORT_SYMBOL(get_au1x00_speed);
-
-/*
- * The UART baud base is not known at compile time ... if
- * we want to be able to use the same code on different
- * speed CPUs.
- */
-unsigned long get_au1x00_uart_baud_base(void)
-{
-        return uart_baud_base;
-}
-
-void set_au1x00_uart_baud_base(unsigned long new_baud_base)
-{
-        uart_baud_base = new_baud_base;
-}
-
-/*
- * We read the real processor speed from the PLL.  This is important
- * because it is more accurate than computing it from the 32 KHz
- * counter, if it exists.  If we don't have an accurate processor
- * speed, all of the peripherals that derive their clocks based on
- * this advertised speed will introduce error and sometimes not work
- * properly.  This function is further convoluted to still allow configurations
- * to do that in case they have really, really old silicon with a
- * write-only PLL register.                     -- Dan
- */
-unsigned long au1xxx_calc_clock(void)
-{
-        unsigned long cpu_speed;
-
-        /*
-         * On early Au1000, sys_cpupll was write-only. Since these
-         * silicon versions of Au1000 are not sold by AMD, we don't bend
-         * over backwards trying to determine the frequency.
-         */
-        if (au1xxx_cpu_has_pll_wo())
-                cpu_speed = 396000000;
-        else
-                cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK;
-
-        /* On Alchemy CPU:counter ratio is 1:1 */
-        mips_hpt_frequency = cpu_speed;
-        /* Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16) */
-        set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)
-                                                          & 0x03) + 2) * 16));
-
-        set_au1x00_speed(cpu_speed);
-
-        return cpu_speed;
-}
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c
index 19d5642c16d9..745695db5ba0 100644
--- a/arch/mips/alchemy/common/dbdma.c
+++ b/arch/mips/alchemy/common/dbdma.c
@@ -341,7 +341,7 @@ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
                         (dtp->dev_flags & DEV_FLAGS_SYNC))
                                 i |= DDMA_CFG_SYNC;
                 cp->ddma_cfg = i;
-                au_sync();
+                wmb(); /* drain writebuffer */
 
                 /*
                  * Return a non-zero value that can be used to find the channel
@@ -631,7 +631,7 @@ u32 au1xxx_dbdma_put_source(u32 chanid, dma_addr_t buf, int nbytes, u32 flags)
          */
         dma_cache_wback_inv((unsigned long)buf, nbytes);
         dp->dscr_cmd0 |= DSCR_CMD0_V;   /* Let it rip */
-        au_sync();
+        wmb(); /* drain writebuffer */
         dma_cache_wback_inv((unsigned long)dp, sizeof(*dp));
         ctp->chan_ptr->ddma_dbell = 0;
 
@@ -693,7 +693,7 @@ u32 au1xxx_dbdma_put_dest(u32 chanid, dma_addr_t buf, int nbytes, u32 flags)
          */
         dma_cache_inv((unsigned long)buf, nbytes);
         dp->dscr_cmd0 |= DSCR_CMD0_V;   /* Let it rip */
-        au_sync();
+        wmb(); /* drain writebuffer */
         dma_cache_wback_inv((unsigned long)dp, sizeof(*dp));
         ctp->chan_ptr->ddma_dbell = 0;
 
@@ -760,7 +760,7 @@ void au1xxx_dbdma_stop(u32 chanid)
 
         cp = ctp->chan_ptr;
         cp->ddma_cfg &= ~DDMA_CFG_EN;   /* Disable channel */
-        au_sync();
+        wmb(); /* drain writebuffer */
         while (!(cp->ddma_stat & DDMA_STAT_H)) {
                 udelay(1);
                 halt_timeout++;
@@ -771,7 +771,7 @@ void au1xxx_dbdma_stop(u32 chanid)
         }
         /* clear current desc valid and doorbell */
         cp->ddma_stat |= (DDMA_STAT_DB | DDMA_STAT_V);
-        au_sync();
+        wmb(); /* drain writebuffer */
 }
 EXPORT_SYMBOL(au1xxx_dbdma_stop);
 
@@ -789,9 +789,9 @@ void au1xxx_dbdma_start(u32 chanid)
         cp = ctp->chan_ptr;
         cp->ddma_desptr = virt_to_phys(ctp->cur_ptr);
         cp->ddma_cfg |= DDMA_CFG_EN;    /* Enable channel */
-        au_sync();
+        wmb(); /* drain writebuffer */
         cp->ddma_dbell = 0;
-        au_sync();
+        wmb(); /* drain writebuffer */
 }
 EXPORT_SYMBOL(au1xxx_dbdma_start);
 
@@ -832,7 +832,7 @@ u32 au1xxx_get_dma_residue(u32 chanid)
 
         /* This is only valid if the channel is stopped. */
         rv = cp->ddma_bytecnt;
-        au_sync();
+        wmb(); /* drain writebuffer */
 
         return rv;
 }
@@ -868,7 +868,7 @@ static irqreturn_t dbdma_interrupt(int irq, void *dev_id)
         au1x_dma_chan_t *cp;
 
         intstat = dbdma_gptr->ddma_intstat;
-        au_sync();
+        wmb(); /* drain writebuffer */
         chan_index = __ffs(intstat);
 
         ctp = chan_tab_ptr[chan_index];
@@ -877,7 +877,7 @@ static irqreturn_t dbdma_interrupt(int irq, void *dev_id)
 
         /* Reset interrupt. */
         cp->ddma_irq = 0;
-        au_sync();
+        wmb(); /* drain writebuffer */
 
         if (ctp->chan_callback)
                 ctp->chan_callback(irq, ctp->chan_callparam);
@@ -1061,7 +1061,7 @@ static int __init dbdma_setup(unsigned int irq, dbdev_tab_t *idtable)
         dbdma_gptr->ddma_config = 0;
         dbdma_gptr->ddma_throttle = 0;
         dbdma_gptr->ddma_inten = 0xffff;
-        au_sync();
+        wmb(); /* drain writebuffer */
 
         ret = request_irq(irq, dbdma_interrupt, 0, "dbdma", (void *)dbdma_gptr);
         if (ret)
diff --git a/arch/mips/alchemy/common/dma.c b/arch/mips/alchemy/common/dma.c
index 9b624e2c0fcf..4fb6207b883b 100644
--- a/arch/mips/alchemy/common/dma.c
+++ b/arch/mips/alchemy/common/dma.c
@@ -141,17 +141,17 @@ void dump_au1000_dma_channel(unsigned int dmanr)
 
         printk(KERN_INFO "Au1000 DMA%d Register Dump:\n", dmanr);
         printk(KERN_INFO "  mode = 0x%08x\n",
-               au_readl(chan->io + DMA_MODE_SET));
+               __raw_readl(chan->io + DMA_MODE_SET));
         printk(KERN_INFO "  addr = 0x%08x\n",
-               au_readl(chan->io + DMA_PERIPHERAL_ADDR));
+               __raw_readl(chan->io + DMA_PERIPHERAL_ADDR));
         printk(KERN_INFO "  start0 = 0x%08x\n",
-               au_readl(chan->io + DMA_BUFFER0_START));
+               __raw_readl(chan->io + DMA_BUFFER0_START));
         printk(KERN_INFO "  start1 = 0x%08x\n",
-               au_readl(chan->io + DMA_BUFFER1_START));
+               __raw_readl(chan->io + DMA_BUFFER1_START));
         printk(KERN_INFO "  count0 = 0x%08x\n",
-               au_readl(chan->io + DMA_BUFFER0_COUNT));
+               __raw_readl(chan->io + DMA_BUFFER0_COUNT));
         printk(KERN_INFO "  count1 = 0x%08x\n",
-               au_readl(chan->io + DMA_BUFFER1_COUNT));
+               __raw_readl(chan->io + DMA_BUFFER1_COUNT));
 }
 
 /*
@@ -204,7 +204,8 @@ int request_au1000_dma(int dev_id, const char *dev_str,
         }
 
         /* fill it in */
-        chan->io = KSEG1ADDR(AU1000_DMA_PHYS_ADDR) + i * DMA_CHANNEL_LEN;
+        chan->io = (void __iomem *)(KSEG1ADDR(AU1000_DMA_PHYS_ADDR) +
+                        i * DMA_CHANNEL_LEN);
         chan->dev_id = dev_id;
         chan->dev_str = dev_str;
         chan->fifo_addr = dev->fifo_addr;
diff --git a/arch/mips/alchemy/common/irq.c b/arch/mips/alchemy/common/irq.c
index 63a71817a00c..6cb60abfdcc9 100644
--- a/arch/mips/alchemy/common/irq.c
+++ b/arch/mips/alchemy/common/irq.c
@@ -389,13 +389,12 @@ static int au1x_ic1_setwake(struct irq_data *d, unsigned int on)
                 return -EINVAL;
 
         local_irq_save(flags);
-        wakemsk = __raw_readl((void __iomem *)SYS_WAKEMSK);
+        wakemsk = alchemy_rdsys(AU1000_SYS_WAKEMSK);
         if (on)
                 wakemsk |= 1 << bit;
         else
                 wakemsk &= ~(1 << bit);
-        __raw_writel(wakemsk, (void __iomem *)SYS_WAKEMSK);
-        wmb();
+        alchemy_wrsys(wakemsk, AU1000_SYS_WAKEMSK);
         local_irq_restore(flags);
 
         return 0;
diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c
index 9837a134a6d6..d77a64f4c78b 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -11,6 +11,7 @@
  * warranty of any kind, whether express or implied.
  */
 
+#include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/etherdevice.h>
 #include <linux/init.h>
@@ -99,10 +100,20 @@ static struct platform_device au1xx0_uart_device = {
 
 static void __init alchemy_setup_uarts(int ctype)
 {
-        unsigned int uartclk = get_au1x00_uart_baud_base() * 16;
+        long uartclk;
         int s = sizeof(struct plat_serial8250_port);
         int c = alchemy_get_uarts(ctype);
         struct plat_serial8250_port *ports;
+        struct clk *clk = clk_get(NULL, ALCHEMY_PERIPH_CLK);
+
+        if (IS_ERR(clk))
+                return;
+        if (clk_prepare_enable(clk)) {
+                clk_put(clk);
+                return;
+        }
+        uartclk = clk_get_rate(clk);
+        clk_put(clk);
 
         ports = kzalloc(s * (c + 1), GFP_KERNEL);
         if (!ports) {
@@ -420,7 +431,7 @@ static void __init alchemy_setup_macs(int ctype)
                 memcpy(au1xxx_eth1_platform_data.mac, ethaddr, 6);
 
         /* Register second MAC if enabled in pinfunc */
-        if (!(au_readl(SYS_PINFUNC) & (u32)SYS_PF_NI2)) {
+        if (!(alchemy_rdsys(AU1000_SYS_PINFUNC) & SYS_PF_NI2)) {
                 ret = platform_device_register(&au1xxx_eth1_device);
                 if (ret)
                         printk(KERN_INFO "Alchemy: failed to register MAC1\n");
diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c
index bdb28dee8fdd..921ed30b440c 100644
--- a/arch/mips/alchemy/common/power.c
+++ b/arch/mips/alchemy/common/power.c
@@ -54,28 +54,28 @@ static unsigned int sleep_static_memctlr[4][3];
 static void save_core_regs(void)
 {
         /* Clocks and PLLs. */
-        sleep_sys_clocks[0] = au_readl(SYS_FREQCTRL0);
-        sleep_sys_clocks[1] = au_readl(SYS_FREQCTRL1);
-        sleep_sys_clocks[2] = au_readl(SYS_CLKSRC);
-        sleep_sys_clocks[3] = au_readl(SYS_CPUPLL);
-        sleep_sys_clocks[4] = au_readl(SYS_AUXPLL);
+        sleep_sys_clocks[0] = alchemy_rdsys(AU1000_SYS_FREQCTRL0);
+        sleep_sys_clocks[1] = alchemy_rdsys(AU1000_SYS_FREQCTRL1);
+        sleep_sys_clocks[2] = alchemy_rdsys(AU1000_SYS_CLKSRC);
+        sleep_sys_clocks[3] = alchemy_rdsys(AU1000_SYS_CPUPLL);
+        sleep_sys_clocks[4] = alchemy_rdsys(AU1000_SYS_AUXPLL);
 
         /* pin mux config */
-        sleep_sys_pinfunc = au_readl(SYS_PINFUNC);
+        sleep_sys_pinfunc = alchemy_rdsys(AU1000_SYS_PINFUNC);
 
         /* Save the static memory controller configuration. */
-        sleep_static_memctlr[0][0] = au_readl(MEM_STCFG0);
-        sleep_static_memctlr[0][1] = au_readl(MEM_STTIME0);
-        sleep_static_memctlr[0][2] = au_readl(MEM_STADDR0);
-        sleep_static_memctlr[1][0] = au_readl(MEM_STCFG1);
-        sleep_static_memctlr[1][1] = au_readl(MEM_STTIME1);
-        sleep_static_memctlr[1][2] = au_readl(MEM_STADDR1);
-        sleep_static_memctlr[2][0] = au_readl(MEM_STCFG2);
-        sleep_static_memctlr[2][1] = au_readl(MEM_STTIME2);
-        sleep_static_memctlr[2][2] = au_readl(MEM_STADDR2);
-        sleep_static_memctlr[3][0] = au_readl(MEM_STCFG3);
-        sleep_static_memctlr[3][1] = au_readl(MEM_STTIME3);
-        sleep_static_memctlr[3][2] = au_readl(MEM_STADDR3);
+        sleep_static_memctlr[0][0] = alchemy_rdsmem(AU1000_MEM_STCFG0);
+        sleep_static_memctlr[0][1] = alchemy_rdsmem(AU1000_MEM_STTIME0);
+        sleep_static_memctlr[0][2] = alchemy_rdsmem(AU1000_MEM_STADDR0);
+        sleep_static_memctlr[1][0] = alchemy_rdsmem(AU1000_MEM_STCFG1);
+        sleep_static_memctlr[1][1] = alchemy_rdsmem(AU1000_MEM_STTIME1);
+        sleep_static_memctlr[1][2] = alchemy_rdsmem(AU1000_MEM_STADDR1);
+        sleep_static_memctlr[2][0] = alchemy_rdsmem(AU1000_MEM_STCFG2);
+        sleep_static_memctlr[2][1] = alchemy_rdsmem(AU1000_MEM_STTIME2);
+        sleep_static_memctlr[2][2] = alchemy_rdsmem(AU1000_MEM_STADDR2);
+        sleep_static_memctlr[3][0] = alchemy_rdsmem(AU1000_MEM_STCFG3);
+        sleep_static_memctlr[3][1] = alchemy_rdsmem(AU1000_MEM_STTIME3);
+        sleep_static_memctlr[3][2] = alchemy_rdsmem(AU1000_MEM_STADDR3);
 }
 
 static void restore_core_regs(void)
@@ -85,30 +85,28 @@ static void restore_core_regs(void)
          * one of those Au1000 with a write-only PLL, where we dont
          * have a valid value)
          */
-        au_writel(sleep_sys_clocks[0], SYS_FREQCTRL0);
-        au_writel(sleep_sys_clocks[1], SYS_FREQCTRL1);
-        au_writel(sleep_sys_clocks[2], SYS_CLKSRC);
-        au_writel(sleep_sys_clocks[4], SYS_AUXPLL);
+        alchemy_wrsys(sleep_sys_clocks[0], AU1000_SYS_FREQCTRL0);
+        alchemy_wrsys(sleep_sys_clocks[1], AU1000_SYS_FREQCTRL1);
+        alchemy_wrsys(sleep_sys_clocks[2], AU1000_SYS_CLKSRC);
+        alchemy_wrsys(sleep_sys_clocks[4], AU1000_SYS_AUXPLL);
         if (!au1xxx_cpu_has_pll_wo())
-                au_writel(sleep_sys_clocks[3], SYS_CPUPLL);
-        au_sync();
+                alchemy_wrsys(sleep_sys_clocks[3], AU1000_SYS_CPUPLL);
 
-        au_writel(sleep_sys_pinfunc, SYS_PINFUNC);
-        au_sync();
+        alchemy_wrsys(sleep_sys_pinfunc, AU1000_SYS_PINFUNC);
 
         /* Restore the static memory controller configuration. */
-        au_writel(sleep_static_memctlr[0][0], MEM_STCFG0);
-        au_writel(sleep_static_memctlr[0][1], MEM_STTIME0);
-        au_writel(sleep_static_memctlr[0][2], MEM_STADDR0);
-        au_writel(sleep_static_memctlr[1][0], MEM_STCFG1);
-        au_writel(sleep_static_memctlr[1][1], MEM_STTIME1);
-        au_writel(sleep_static_memctlr[1][2], MEM_STADDR1);
-        au_writel(sleep_static_memctlr[2][0], MEM_STCFG2);
-        au_writel(sleep_static_memctlr[2][1], MEM_STTIME2);
-        au_writel(sleep_static_memctlr[2][2], MEM_STADDR2);
-        au_writel(sleep_static_memctlr[3][0], MEM_STCFG3);
-        au_writel(sleep_static_memctlr[3][1], MEM_STTIME3);
-        au_writel(sleep_static_memctlr[3][2], MEM_STADDR3);
+        alchemy_wrsmem(sleep_static_memctlr[0][0], AU1000_MEM_STCFG0);
+        alchemy_wrsmem(sleep_static_memctlr[0][1], AU1000_MEM_STTIME0);
+        alchemy_wrsmem(sleep_static_memctlr[0][2], AU1000_MEM_STADDR0);
+        alchemy_wrsmem(sleep_static_memctlr[1][0], AU1000_MEM_STCFG1);
+        alchemy_wrsmem(sleep_static_memctlr[1][1], AU1000_MEM_STTIME1);
+        alchemy_wrsmem(sleep_static_memctlr[1][2], AU1000_MEM_STADDR1);
+        alchemy_wrsmem(sleep_static_memctlr[2][0], AU1000_MEM_STCFG2);
+        alchemy_wrsmem(sleep_static_memctlr[2][1], AU1000_MEM_STTIME2);
+        alchemy_wrsmem(sleep_static_memctlr[2][2], AU1000_MEM_STADDR2);
+        alchemy_wrsmem(sleep_static_memctlr[3][0], AU1000_MEM_STCFG3);
+        alchemy_wrsmem(sleep_static_memctlr[3][1], AU1000_MEM_STTIME3);
+        alchemy_wrsmem(sleep_static_memctlr[3][2], AU1000_MEM_STADDR3);
 }
 
 void au_sleep(void)
diff --git a/arch/mips/alchemy/common/setup.c b/arch/mips/alchemy/common/setup.c
index 8267e3c97721..ea8f41869e56 100644
--- a/arch/mips/alchemy/common/setup.c
+++ b/arch/mips/alchemy/common/setup.c
@@ -27,12 +27,9 @@
 
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/jiffies.h>
-#include <linux/module.h>
 
 #include <asm/dma-coherence.h>
 #include <asm/mipsregs.h>
-#include <asm/time.h>
 
 #include <au1000.h>
 
@@ -41,18 +38,6 @@ extern void set_cpuspec(void);
 
 void __init plat_mem_setup(void)
 {
-        unsigned long est_freq;
-
-        /* determine core clock */
-        est_freq = au1xxx_calc_clock();
-        est_freq += 5000;    /* round */
-        est_freq -= est_freq % 10000;
-        printk(KERN_INFO "(PRId %08x) @ %lu.%02lu MHz\n", read_c0_prid(),
-               est_freq / 1000000, ((est_freq % 1000000) * 100) / 1000000);
-
-        /* this is faster than wasting cycles trying to approximate it */
-        preset_lpj = (est_freq >> 1) / HZ;
-
         if (au1xxx_cpu_needs_config_od())
                 /* Various early Au1xx0 errata corrected by this */
                 set_c0_config(1 << 19); /* Set Config[OD] */
diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c
index 93fa586d52e2..50e17e13c18b 100644
--- a/arch/mips/alchemy/common/time.c
+++ b/arch/mips/alchemy/common/time.c
@@ -46,7 +46,7 @@
 
 static cycle_t au1x_counter1_read(struct clocksource *cs)
 {
-        return au_readl(SYS_RTCREAD);
+        return alchemy_rdsys(AU1000_SYS_RTCREAD);
 }
 
 static struct clocksource au1x_counter1_clocksource = {
@@ -60,12 +60,11 @@ static struct clocksource au1x_counter1_clocksource = {
 static int au1x_rtcmatch2_set_next_event(unsigned long delta,
                                          struct clock_event_device *cd)
 {
-        delta += au_readl(SYS_RTCREAD);
+        delta += alchemy_rdsys(AU1000_SYS_RTCREAD);
         /* wait for register access */
-        while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M21)
+        while (alchemy_rdsys(AU1000_SYS_CNTRCTRL) & SYS_CNTRL_M21)
                 ;
-        au_writel(delta, SYS_RTCMATCH2);
-        au_sync();
+        alchemy_wrsys(delta, AU1000_SYS_RTCMATCH2);
 
         return 0;
 }
@@ -112,31 +111,29 @@ static int __init alchemy_time_init(unsigned int m2int)
          * (the 32S bit seems to be stuck set to 1 once a single clock-
          * edge is detected, hence the timeouts).
          */
-        if (CNTR_OK != (au_readl(SYS_COUNTER_CNTRL) & CNTR_OK))
+        if (CNTR_OK != (alchemy_rdsys(AU1000_SYS_CNTRCTRL) & CNTR_OK))
                 goto cntr_err;
 
         /*
          * setup counter 1 (RTC) to tick at full speed
          */
         t = 0xffffff;
-        while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S) && --t)
+        while ((alchemy_rdsys(AU1000_SYS_CNTRCTRL) & SYS_CNTRL_T1S) && --t)
                 asm volatile ("nop");
         if (!t)
                 goto cntr_err;
 
-        au_writel(0, SYS_RTCTRIM);      /* 32.768 kHz */
-        au_sync();
+        alchemy_wrsys(0, AU1000_SYS_RTCTRIM);   /* 32.768 kHz */
 
         t = 0xffffff;
-        while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && --t)
+        while ((alchemy_rdsys(AU1000_SYS_CNTRCTRL) & SYS_CNTRL_C1S) && --t)
                 asm volatile ("nop");
         if (!t)
                 goto cntr_err;
-        au_writel(0, SYS_RTCWRITE);
-        au_sync();
+        alchemy_wrsys(0, AU1000_SYS_RTCWRITE);
 
         t = 0xffffff;
-        while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && --t)
+        while ((alchemy_rdsys(AU1000_SYS_CNTRCTRL) & SYS_CNTRL_C1S) && --t)
                 asm volatile ("nop");
         if (!t)
                 goto cntr_err;
diff --git a/arch/mips/alchemy/common/usb.c b/arch/mips/alchemy/common/usb.c
index d193dbea84a1..297805ade849 100644
--- a/arch/mips/alchemy/common/usb.c
+++ b/arch/mips/alchemy/common/usb.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include <linux/clk.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -387,10 +388,25 @@ static inline void au1200_usb_init(void)
         udelay(1000);
 }
 
-static inline void au1000_usb_init(unsigned long rb, int reg)
+static inline int au1000_usb_init(unsigned long rb, int reg)
 {
         void __iomem *base = (void __iomem *)KSEG1ADDR(rb + reg);
         unsigned long r = __raw_readl(base);
+        struct clk *c;
+
+        /* 48MHz check. Don't init if no one can provide it */
+        c = clk_get(NULL, "usbh_clk");
+        if (IS_ERR(c))
+                return -ENODEV;
+        if (clk_round_rate(c, 48000000) != 48000000) {
+                clk_put(c);
+                return -ENODEV;
+        }
+        if (clk_set_rate(c, 48000000)) {
+                clk_put(c);
+                return -ENODEV;
+        }
+        clk_put(c);
 
 #if defined(__BIG_ENDIAN)
         r |= USBHEN_BE;
@@ -400,6 +416,8 @@ static inline void au1000_usb_init(unsigned long rb, int reg)
         __raw_writel(r, base);
         wmb();
         udelay(1000);
+
+        return 0;
 }
 
 
@@ -407,8 +425,15 @@ static inline void __au1xx0_ohci_control(int enable, unsigned long rb, int creg)
 {
         void __iomem *base = (void __iomem *)KSEG1ADDR(rb);
         unsigned long r = __raw_readl(base + creg);
+        struct clk *c = clk_get(NULL, "usbh_clk");
+
+        if (IS_ERR(c))
+                return;
 
         if (enable) {
+                if (clk_prepare_enable(c))
+                        goto out;
+
                 __raw_writel(r | USBHEN_CE, base + creg);
                 wmb();
                 udelay(1000);
@@ -423,7 +448,10 @@ static inline void __au1xx0_ohci_control(int enable, unsigned long rb, int creg)
         } else {
                 __raw_writel(r & ~(USBHEN_CE | USBHEN_E), base + creg);
                 wmb();
+                clk_disable_unprepare(c);
         }
+out:
+        clk_put(c);
 }
 
 static inline int au1000_usb_control(int block, int enable, unsigned long rb,
@@ -457,11 +485,11 @@ int alchemy_usb_control(int block, int enable)
         case ALCHEMY_CPU_AU1500:
         case ALCHEMY_CPU_AU1100:
                 ret = au1000_usb_control(block, enable,
-                                AU1000_USB_OHCI_PHYS_ADDR, AU1000_OHCICFG);
+                        AU1000_USB_OHCI_PHYS_ADDR, AU1000_OHCICFG);
                 break;
         case ALCHEMY_CPU_AU1550:
                 ret = au1000_usb_control(block, enable,
-                                AU1550_USB_OHCI_PHYS_ADDR, AU1550_OHCICFG);
+                        AU1550_USB_OHCI_PHYS_ADDR, AU1550_OHCICFG);
                 break;
         case ALCHEMY_CPU_AU1200:
                 ret = au1200_usb_control(block, enable);
@@ -569,14 +597,18 @@ static struct syscore_ops alchemy_usb_pm_ops = {
 
 static int __init alchemy_usb_init(void)
 {
+        int ret = 0;
+
         switch (alchemy_get_cputype()) {
         case ALCHEMY_CPU_AU1000:
         case ALCHEMY_CPU_AU1500:
         case ALCHEMY_CPU_AU1100:
-                au1000_usb_init(AU1000_USB_OHCI_PHYS_ADDR, AU1000_OHCICFG);
+                ret = au1000_usb_init(AU1000_USB_OHCI_PHYS_ADDR,
+                                      AU1000_OHCICFG);
                 break;
         case ALCHEMY_CPU_AU1550:
-                au1000_usb_init(AU1550_USB_OHCI_PHYS_ADDR, AU1550_OHCICFG);
+                ret = au1000_usb_init(AU1550_USB_OHCI_PHYS_ADDR,
+                                      AU1550_OHCICFG);
                 break;
         case ALCHEMY_CPU_AU1200:
                 au1200_usb_init();
@@ -586,8 +618,9 @@ static int __init alchemy_usb_init(void)
                 break;
         }
 
-        register_syscore_ops(&alchemy_usb_pm_ops);
+        if (!ret)
+                register_syscore_ops(&alchemy_usb_pm_ops);
 
-        return 0;
+        return ret;
 }
 arch_initcall(alchemy_usb_init);
diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c
index 92dd929d4057..001102e197f1 100644
--- a/arch/mips/alchemy/devboards/db1000.c
+++ b/arch/mips/alchemy/devboards/db1000.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/gpio.h>
 #include <linux/init.h>
@@ -496,6 +497,7 @@ int __init db1000_dev_setup(void)
         int board = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
         int c0, c1, d0, d1, s0, s1, flashsize = 32,  twosocks = 1;
         unsigned long pfc;
+        struct clk *c, *p;
 
         if (board == BCSR_WHOAMI_DB1500) {
                 c0 = AU1500_GPIO2_INT;
@@ -518,14 +520,25 @@ int __init db1000_dev_setup(void)
                 gpio_direction_input(20);       /* sd1 cd# */
 
                 /* spi_gpio on SSI0 pins */
-                pfc = __raw_readl((void __iomem *)SYS_PINFUNC);
+                pfc = alchemy_rdsys(AU1000_SYS_PINFUNC);
                 pfc |= (1 << 0);        /* SSI0 pins as GPIOs */
-                __raw_writel(pfc, (void __iomem *)SYS_PINFUNC);
-                wmb();
+                alchemy_wrsys(pfc, AU1000_SYS_PINFUNC);
 
                 spi_register_board_info(db1100_spi_info,
                                         ARRAY_SIZE(db1100_spi_info));
 
+                /* link LCD clock to AUXPLL */
+                p = clk_get(NULL, "auxpll_clk");
+                c = clk_get(NULL, "lcd_intclk");
+                if (!IS_ERR(c) && !IS_ERR(p)) {
+                        clk_set_parent(c, p);
+                        clk_set_rate(c, clk_get_rate(p));
+                }
+                if (!IS_ERR(c))
+                        clk_put(c);
+                if (!IS_ERR(p))
+                        clk_put(p);
+
                 platform_add_devices(db1100_devs, ARRAY_SIZE(db1100_devs));
                 platform_device_register(&db1100_spi_dev);
         } else if (board == BCSR_WHOAMI_DB1000) {
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index 9e46667f2597..776188908dfc 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/gpio.h>
 #include <linux/i2c.h>
@@ -129,7 +130,6 @@ static int __init db1200_detect_board(void)
 
 int __init db1200_board_setup(void)
 {
-        unsigned long freq0, clksrc, div, pfc;
         unsigned short whoami;
 
         if (db1200_detect_board())
@@ -149,34 +149,6 @@ int __init db1200_board_setup(void)
                 "  Board-ID %d  Daughtercard ID %d\n", get_system_type(),
                 (whoami >> 4) & 0xf, (whoami >> 8) & 0xf, whoami & 0xf);
 
-        /* SMBus/SPI on PSC0, Audio on PSC1 */
-        pfc = __raw_readl((void __iomem *)SYS_PINFUNC);
-        pfc &= ~(SYS_PINFUNC_P0A | SYS_PINFUNC_P0B);
-        pfc &= ~(SYS_PINFUNC_P1A | SYS_PINFUNC_P1B | SYS_PINFUNC_FS3);
-        pfc |= SYS_PINFUNC_P1C; /* SPI is configured later */
-        __raw_writel(pfc, (void __iomem *)SYS_PINFUNC);
-        wmb();
-
-        /* Clock configurations: PSC0: ~50MHz via Clkgen0, derived from
-         * CPU clock; all other clock generators off/unused.
-         */
-        div = (get_au1x00_speed() + 25000000) / 50000000;
-        if (div & 1)
-                div++;
-        div = ((div >> 1) - 1) & 0xff;
-
-        freq0 = div << SYS_FC_FRDIV0_BIT;
-        __raw_writel(freq0, (void __iomem *)SYS_FREQCTRL0);
-        wmb();
-        freq0 |= SYS_FC_FE0;    /* enable F0 */
-        __raw_writel(freq0, (void __iomem *)SYS_FREQCTRL0);
-        wmb();
-
-        /* psc0_intclk comes 1:1 from F0 */
-        clksrc = SYS_CS_MUX_FQ0 << SYS_CS_ME0_BIT;
-        __raw_writel(clksrc, (void __iomem *)SYS_CLKSRC);
-        wmb();
-
         return 0;
 }
 
@@ -250,7 +222,7 @@ static void au1200_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
 
 static int au1200_nand_device_ready(struct mtd_info *mtd)
 {
-        return __raw_readl((void __iomem *)MEM_STSTAT) & 1;
+        return alchemy_rdsmem(AU1000_MEM_STSTAT) & 1;
 }
 
 static struct mtd_partition db1200_nand_parts[] = {
@@ -847,6 +819,7 @@ int __init db1200_dev_setup(void)
         unsigned long pfc;
         unsigned short sw;
         int swapped, bid;
+        struct clk *c;
 
         bid = BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI));
         if ((bid == BCSR_WHOAMI_PB1200_DDR1) ||
@@ -859,6 +832,24 @@ int __init db1200_dev_setup(void)
         irq_set_irq_type(AU1200_GPIO7_INT, IRQ_TYPE_LEVEL_LOW);
         bcsr_init_irq(DB1200_INT_BEGIN, DB1200_INT_END, AU1200_GPIO7_INT);
 
+        /* SMBus/SPI on PSC0, Audio on PSC1 */
+        pfc = alchemy_rdsys(AU1000_SYS_PINFUNC);
+        pfc &= ~(SYS_PINFUNC_P0A | SYS_PINFUNC_P0B);
+        pfc &= ~(SYS_PINFUNC_P1A | SYS_PINFUNC_P1B | SYS_PINFUNC_FS3);
+        pfc |= SYS_PINFUNC_P1C; /* SPI is configured later */
+        alchemy_wrsys(pfc, AU1000_SYS_PINFUNC);
+
+        /* get 50MHz for I2C driver on PSC0 */
+        c = clk_get(NULL, "psc0_intclk");
+        if (!IS_ERR(c)) {
+                pfc = clk_round_rate(c, 50000000);
+                if ((pfc < 1) || (abs(50000000 - pfc) > 2500000))
+                        pr_warn("DB1200: cant get I2C close to 50MHz\n");
+                else
+                        clk_set_rate(c, pfc);
+                clk_put(c);
+        }
+
         /* insert/eject pairs: one of both is always screaming.  To avoid
          * issues they must not be automatically enabled when initially
          * requested.
@@ -886,7 +877,7 @@ int __init db1200_dev_setup(void)
          * As a result, in SPI mode, OTG simply won't work (PSC0 uses
          * it as an input pin which is pulled high on the boards).
          */
-        pfc = __raw_readl((void __iomem *)SYS_PINFUNC) & ~SYS_PINFUNC_P0A;
+        pfc = alchemy_rdsys(AU1000_SYS_PINFUNC) & ~SYS_PINFUNC_P0A;
 
         /* switch off OTG VBUS supply */
         gpio_request(215, "otg-vbus");
@@ -912,8 +903,7 @@ int __init db1200_dev_setup(void)
                 printk(KERN_INFO " S6.8 ON : PSC0 mode SPI\n");
                 printk(KERN_INFO "   OTG port VBUS supply disabled\n");
         }
-        __raw_writel(pfc, (void __iomem *)SYS_PINFUNC);
-        wmb();
+        alchemy_wrsys(pfc, AU1000_SYS_PINFUNC);
 
         /* Audio: DIP7 selects I2S(0)/AC97(1), but need I2C for I2S!
          * so: DIP7=1 || DIP8=0 => AC97, DIP7=0 && DIP8=1 => I2S
@@ -932,6 +922,11 @@ int __init db1200_dev_setup(void)
         }
 
         /* Audio PSC clock is supplied externally. (FIXME: platdata!!) */
+        c = clk_get(NULL, "psc1_intclk");
+        if (!IS_ERR(c)) {
+                clk_prepare_enable(c);
+                clk_put(c);
+        }
         __raw_writel(PSC_SEL_CLK_SERCLK,
             (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);
         wmb();
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index 1aed6be4de10..ef93ee3f6a2c 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -4,6 +4,7 @@
  * (c) 2009 Manuel Lauss <manuel.lauss@googlemail.com>
  */
 
+#include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
@@ -169,7 +170,7 @@ static void au1300_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
 
 static int au1300_nand_device_ready(struct mtd_info *mtd)
 {
-        return __raw_readl((void __iomem *)MEM_STSTAT) & 1;
+        return alchemy_rdsmem(AU1000_MEM_STSTAT) & 1;
 }
 
 static struct mtd_partition db1300_nand_parts[] = {
@@ -731,6 +732,7 @@ static struct platform_device *db1300_dev[] __initdata = {
 int __init db1300_dev_setup(void)
 {
         int swapped, cpldirq;
+        struct clk *c;
 
         /* setup CPLD IRQ muxer */
         cpldirq = au1300_gpio_to_irq(AU1300_PIN_EXTCLK1);
@@ -761,6 +763,11 @@ int __init db1300_dev_setup(void)
             (void __iomem *)KSEG1ADDR(AU1300_PSC2_PHYS_ADDR) + PSC_SEL_OFFSET);
         wmb();
         /* I2C uses internal 48MHz EXTCLK1 */
+        c = clk_get(NULL, "psc3_intclk");
+        if (!IS_ERR(c)) {
+                clk_prepare_enable(c);
+                clk_put(c);
+        }
         __raw_writel(PSC_SEL_CLK_INTCLK,
             (void __iomem *)KSEG1ADDR(AU1300_PSC3_PHYS_ADDR) + PSC_SEL_OFFSET);
         wmb();
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index bbd8d9884702..7e89936f763e 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -4,6 +4,7 @@
  * (c) 2011 Manuel Lauss <manuel.lauss@googlemail.com>
  */
 
+#include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/gpio.h>
 #include <linux/i2c.h>
@@ -31,16 +32,16 @@
 static void __init db1550_hw_setup(void)
 {
         void __iomem *base;
+        unsigned long v;
 
         /* complete SPI setup: link psc0_intclk to a 48MHz source,
          * and assign GPIO16 to PSC0_SYNC1 (SPI cs# line) as well as PSC1_SYNC
          * for AC97 on PB1550.
          */
-        base = (void __iomem *)SYS_CLKSRC;
-        __raw_writel(__raw_readl(base) | 0x000001e0, base);
-        base = (void __iomem *)SYS_PINFUNC;
-        __raw_writel(__raw_readl(base) | 1 | SYS_PF_PSC1_S1, base);
-        wmb();
+        v = alchemy_rdsys(AU1000_SYS_CLKSRC);
+        alchemy_wrsys(v | 0x000001e0, AU1000_SYS_CLKSRC);
+        v = alchemy_rdsys(AU1000_SYS_PINFUNC);
+        alchemy_wrsys(v | 1 | SYS_PF_PSC1_S1, AU1000_SYS_PINFUNC);
 
         /* reset the AC97 codec now, the reset time in the psc-ac97 driver
          * is apparently too short although it's ridiculous as it is.
@@ -151,7 +152,7 @@ static void au1550_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
 
 static int au1550_nand_device_ready(struct mtd_info *mtd)
 {
-        return __raw_readl((void __iomem *)MEM_STSTAT) & 1;
+        return alchemy_rdsmem(AU1000_MEM_STSTAT) & 1;
 }
 
 static struct mtd_partition db1550_nand_parts[] = {
@@ -217,7 +218,7 @@ static struct platform_device pb1550_nand_dev = {
 
 static void __init pb1550_nand_setup(void)
 {
-        int boot_swapboot = (au_readl(MEM_STSTAT) & (0x7 << 1)) |
+        int boot_swapboot = (alchemy_rdsmem(AU1000_MEM_STSTAT) & (0x7 << 1)) |
                             ((bcsr_read(BCSR_STATUS) >> 6) & 0x1);
 
         gpio_direction_input(206);      /* de-assert NAND CS# */
@@ -574,6 +575,7 @@ static void __init pb1550_devices(void)
 int __init db1550_dev_setup(void)
 {
         int swapped, id;
+        struct clk *c;
 
         id = (BCSR_WHOAMI_BOARD(bcsr_read(BCSR_WHOAMI)) != BCSR_WHOAMI_DB1550);
 
@@ -582,6 +584,17 @@ int __init db1550_dev_setup(void)
         spi_register_board_info(db1550_spi_devs,
                                 ARRAY_SIZE(db1550_i2c_devs));
 
+        c = clk_get(NULL, "psc0_intclk");
+        if (!IS_ERR(c)) {
+                clk_prepare_enable(c);
+                clk_put(c);
+        }
+        c = clk_get(NULL, "psc2_intclk");
+        if (!IS_ERR(c)) {
+                clk_prepare_enable(c);
+                clk_put(c);
+        }
+
         /* Audio PSC clock is supplied by codecs (PSC1, 3) FIXME: platdata!! */
         __raw_writel(PSC_SEL_CLK_SERCLK,
             (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);
diff --git a/arch/mips/alchemy/devboards/pm.c b/arch/mips/alchemy/devboards/pm.c
index 61e90fe9eab1..bfeb8f3c0be6 100644
--- a/arch/mips/alchemy/devboards/pm.c
+++ b/arch/mips/alchemy/devboards/pm.c
@@ -45,23 +45,20 @@ static int db1x_pm_enter(suspend_state_t state)
         alchemy_gpio1_input_enable();
 
         /* clear and setup wake cause and source */
-        au_writel(0, SYS_WAKEMSK);
-        au_sync();
-        au_writel(0, SYS_WAKESRC);
-        au_sync();
+        alchemy_wrsys(0, AU1000_SYS_WAKEMSK);
+        alchemy_wrsys(0, AU1000_SYS_WAKESRC);
 
-        au_writel(db1x_pm_wakemsk, SYS_WAKEMSK);
-        au_sync();
+        alchemy_wrsys(db1x_pm_wakemsk, AU1000_SYS_WAKEMSK);
 
         /* setup 1Hz-timer-based wakeup: wait for reg access */
-        while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20)
+        while (alchemy_rdsys(AU1000_SYS_CNTRCTRL) & SYS_CNTRL_M20)
                 asm volatile ("nop");
 
-        au_writel(au_readl(SYS_TOYREAD) + db1x_pm_sleep_secs, SYS_TOYMATCH2);
-        au_sync();
+        alchemy_wrsys(alchemy_rdsys(AU1000_SYS_TOYREAD) + db1x_pm_sleep_secs,
+                      AU1000_SYS_TOYMATCH2);
 
         /* wait for value to really hit the register */
-        while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20)
+        while (alchemy_rdsys(AU1000_SYS_CNTRCTRL) & SYS_CNTRL_M20)
                 asm volatile ("nop");
 
         /* ...and now the sandman can come! */
@@ -102,12 +99,10 @@ static void db1x_pm_end(void)
         /* read and store wakeup source, the clear the register. To
          * be able to clear it, WAKEMSK must be cleared first.
          */
-        db1x_pm_last_wakesrc = au_readl(SYS_WAKESRC);
-
-        au_writel(0, SYS_WAKEMSK);
-        au_writel(0, SYS_WAKESRC);
-        au_sync();
+        db1x_pm_last_wakesrc = alchemy_rdsys(AU1000_SYS_WAKESRC);
 
+        alchemy_wrsys(0, AU1000_SYS_WAKEMSK);
+        alchemy_wrsys(0, AU1000_SYS_WAKESRC);
 }
 
 static const struct platform_suspend_ops db1x_pm_ops = {
@@ -242,17 +237,13 @@ static int __init pm_init(void)
          * for confirmation since there's plenty of time from here to
          * the next suspend cycle.
          */
-        if (au_readl(SYS_TOYTRIM) != 32767) {
-                au_writel(32767, SYS_TOYTRIM);
-                au_sync();
-        }
+        if (alchemy_rdsys(AU1000_SYS_TOYTRIM) != 32767)
+                alchemy_wrsys(32767, AU1000_SYS_TOYTRIM);
 
-        db1x_pm_last_wakesrc = au_readl(SYS_WAKESRC);
+        db1x_pm_last_wakesrc = alchemy_rdsys(AU1000_SYS_WAKESRC);
 
-        au_writel(0, SYS_WAKESRC);
-        au_sync();
-        au_writel(0, SYS_WAKEMSK);
-        au_sync();
+        alchemy_wrsys(0, AU1000_SYS_WAKESRC);
+        alchemy_wrsys(0, AU1000_SYS_WAKEMSK);
 
         suspend_set_ops(&db1x_pm_ops);
 
diff --git a/arch/mips/bcm47xx/Kconfig b/arch/mips/bcm47xx/Kconfig
index 09cb6f7aa3db..fc21d3659fa0 100644
--- a/arch/mips/bcm47xx/Kconfig
+++ b/arch/mips/bcm47xx/Kconfig
@@ -11,8 +11,6 @@ config BCM47XX_SSB
         select SSB_DRIVER_PCICORE if PCI
         select SSB_PCICORE_HOSTMODE if PCI
         select SSB_DRIVER_GPIO
-        select GPIOLIB
-        select LEDS_GPIO_REGISTER
         default y
         help
          Add support for old Broadcom BCM47xx boards with Sonics Silicon Backplane support.
@@ -22,6 +20,7 @@ config BCM47XX_SSB
 config BCM47XX_BCMA
         bool "BCMA Support for Broadcom BCM47XX"
         select SYS_HAS_CPU_MIPS32_R2
+        select SYS_SUPPORTS_HIGHMEM
         select CPU_MIPSR2_IRQ_VI
         select BCMA
         select BCMA_HOST_SOC
@@ -29,8 +28,6 @@ config BCM47XX_BCMA
         select BCMA_HOST_PCI if PCI
         select BCMA_DRIVER_PCI_HOSTMODE if PCI
         select BCMA_DRIVER_GPIO
-        select GPIOLIB
-        select LEDS_GPIO_REGISTER
         default y
         help
          Add support for new Broadcom BCM47xx boards with Broadcom specific Advanced Microcontroller Bus.
diff --git a/arch/mips/bcm47xx/bcm47xx_private.h b/arch/mips/bcm47xx/bcm47xx_private.h
index 0194c3b9a729..f1cc9d0495d8 100644
--- a/arch/mips/bcm47xx/bcm47xx_private.h
+++ b/arch/mips/bcm47xx/bcm47xx_private.h
@@ -3,6 +3,9 @@
 
 #include <linux/kernel.h>
 
+/* prom.c */
+void __init bcm47xx_prom_highmem_init(void);
+
 /* buttons.c */
 int __init bcm47xx_buttons_register(void);
 
diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
index 44ab1be68c3c..b3ae068ca4fa 100644
--- a/arch/mips/bcm47xx/board.c
+++ b/arch/mips/bcm47xx/board.c
@@ -58,6 +58,7 @@ struct bcm47xx_board_type_list1 bcm47xx_board_list_machine_name[] __initconst =
 static const
 struct bcm47xx_board_type_list1 bcm47xx_board_list_hardware_version[] __initconst = {
         {{BCM47XX_BOARD_ASUS_RTN10U, "Asus RT-N10U"}, "RTN10U"},
+        {{BCM47XX_BOARD_ASUS_RTN10D, "Asus RT-N10D"}, "RTN10D"},
         {{BCM47XX_BOARD_ASUS_RTN12, "Asus RT-N12"}, "RT-N12"},
         {{BCM47XX_BOARD_ASUS_RTN12B1, "Asus RT-N12B1"}, "RTN12B1"},
         {{BCM47XX_BOARD_ASUS_RTN12C1, "Asus RT-N12C1"}, "RTN12C1"},
@@ -80,6 +81,14 @@ struct bcm47xx_board_type_list1 bcm47xx_board_list_hardware_version[] __initcons
         { {0}, NULL},
 };
 
+/* hardware_version, boardnum */
+static const
+struct bcm47xx_board_type_list2 bcm47xx_board_list_hw_version_num[] __initconst = {
+        {{BCM47XX_BOARD_MICROSOFT_MN700, "Microsoft MN-700"}, "WL500-", "mn700"},
+        {{BCM47XX_BOARD_ASUS_WL500G, "Asus WL500G"}, "WL500-", "asusX"},
+        { {0}, NULL},
+};
+
 /* productid */
 static const
 struct bcm47xx_board_type_list1 bcm47xx_board_list_productid[] __initconst = {
@@ -98,7 +107,7 @@ struct bcm47xx_board_type_list1 bcm47xx_board_list_productid[] __initconst = {
 /* ModelId */
 static const
 struct bcm47xx_board_type_list1 bcm47xx_board_list_ModelId[] __initconst = {
-        {{BCM47XX_BOARD_DELL_TM2300, "Dell WX-5565"}, "WX-5565"},
+        {{BCM47XX_BOARD_DELL_TM2300, "Dell TrueMobile 2300"}, "WX-5565"},
         {{BCM47XX_BOARD_MOTOROLA_WE800G, "Motorola WE800G"}, "WE800G"},
         {{BCM47XX_BOARD_MOTOROLA_WR850GP, "Motorola WR850GP"}, "WR850GP"},
         {{BCM47XX_BOARD_MOTOROLA_WR850GV2V3, "Motorola WR850G"}, "WR850G"},
@@ -180,9 +189,9 @@ struct bcm47xx_board_type_list3 bcm47xx_board_list_board[] __initconst = {
         {{BCM47XX_BOARD_PHICOMM_M1, "Phicomm M1"}, "0x0590", "80", "0x1104"},
         {{BCM47XX_BOARD_ZTE_H218N, "ZTE H218N"}, "0x053d", "1234", "0x1305"},
         {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "0x04CF", "3500", "02"},
-        {{BCM47XX_BOARD_LINKSYS_WRT54G, "Linksys WRT54G/GS/GL"}, "0x0101", "42", "0x10"},
-        {{BCM47XX_BOARD_LINKSYS_WRT54G, "Linksys WRT54G/GS/GL"}, "0x0467", "42", "0x10"},
-        {{BCM47XX_BOARD_LINKSYS_WRT54G, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"},
+        {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101, "Linksys WRT54G/GS/GL"}, "0x0101", "42", "0x10"},
+        {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467, "Linksys WRT54G/GS/GL"}, "0x0467", "42", "0x10"},
+        {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"},
         { {0}, NULL},
 };
 
@@ -237,6 +246,15 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void)
                 }
         }
 
+        if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 &&
+            bcm47xx_nvram_getenv("boardtype", buf2, sizeof(buf2)) >= 0) {
+                for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) {
+                        if (!strstarts(buf1, e2->value1) &&
+                            !strcmp(buf2, e2->value2))
+                                return &e2->board;
+                }
+        }
+
         if (bcm47xx_nvram_getenv("productid", buf1, sizeof(buf1)) >= 0) {
                 for (e1 = bcm47xx_board_list_productid; e1->value1; e1++) {
                         if (!strcmp(buf1, e1->value1))
diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 49a1ce06844b..913182bcafb8 100644
--- a/arch/mips/bcm47xx/buttons.c
+++ b/arch/mips/bcm47xx/buttons.c
@@ -56,6 +56,11 @@ bcm47xx_buttons_asus_wl330ge[] __initconst = {
 };
 
 static const struct gpio_keys_button
+bcm47xx_buttons_asus_wl500g[] __initconst = {
+        BCM47XX_GPIO_KEY(6, KEY_RESTART),
+};
+
+static const struct gpio_keys_button
 bcm47xx_buttons_asus_wl500gd[] __initconst = {
         BCM47XX_GPIO_KEY(6, KEY_RESTART),
 };
@@ -265,7 +270,7 @@ bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
 };
 
 static const struct gpio_keys_button
-bcm47xx_buttons_linksys_wrt54gsv1[] __initconst = {
+bcm47xx_buttons_linksys_wrt54g_generic[] __initconst = {
         BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
         BCM47XX_GPIO_KEY(6, KEY_RESTART),
 };
@@ -288,6 +293,13 @@ bcm47xx_buttons_linksys_wrtsl54gs[] __initconst = {
         BCM47XX_GPIO_KEY(6, KEY_RESTART),
 };
 
+/* Microsoft */
+
+static const struct gpio_keys_button
+bcm47xx_buttons_microsoft_nm700[] __initconst = {
+        BCM47XX_GPIO_KEY(7, KEY_RESTART),
+};
+
 /* Motorola */
 
 static const struct gpio_keys_button
@@ -329,6 +341,12 @@ bcm47xx_buttons_netgear_wndr4500v1[] __initconst = {
 };
 
 static const struct gpio_keys_button
+bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
+        BCM47XX_GPIO_KEY(4, KEY_RESTART),
+        BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
+};
+
+static const struct gpio_keys_button
 bcm47xx_buttons_netgear_wnr834bv2[] __initconst = {
         BCM47XX_GPIO_KEY(6, KEY_RESTART),
 };
@@ -395,6 +413,9 @@ int __init bcm47xx_buttons_register(void)
         case BCM47XX_BOARD_ASUS_WL330GE:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_wl330ge);
                 break;
+        case BCM47XX_BOARD_ASUS_WL500G:
+                err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_wl500g);
+                break;
         case BCM47XX_BOARD_ASUS_WL500GD:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_wl500gd);
                 break;
@@ -501,12 +522,14 @@ int __init bcm47xx_buttons_register(void)
         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
                 break;
-        case BCM47XX_BOARD_LINKSYS_WRT54G:
-                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54gsv1);
-                break;
         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
                 break;
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101:
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
+                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g_generic);
+                break;
         case BCM47XX_BOARD_LINKSYS_WRT610NV1:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt610nv1);
                 break;
@@ -517,6 +540,10 @@ int __init bcm47xx_buttons_register(void)
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrtsl54gs);
                 break;
 
+        case BCM47XX_BOARD_MICROSOFT_MN700:
+                err = bcm47xx_copy_bdata(bcm47xx_buttons_microsoft_nm700);
+                break;
+
         case BCM47XX_BOARD_MOTOROLA_WE800G:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_we800g);
                 break;
@@ -536,6 +563,9 @@ int __init bcm47xx_buttons_register(void)
         case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
                 break;
+        case BCM47XX_BOARD_NETGEAR_WNR3500L:
+                err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
+                break;
         case BCM47XX_BOARD_NETGEAR_WNR834BV2:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr834bv2);
                 break;
diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c
index adcb547a91c3..903a656d4119 100644
--- a/arch/mips/bcm47xx/leds.c
+++ b/arch/mips/bcm47xx/leds.c
@@ -35,6 +35,15 @@ bcm47xx_leds_asus_rtn12[] __initconst = {
 };
 
 static const struct gpio_led
+bcm47xx_leds_asus_rtn15u[] __initconst = {
+        /* TODO: Add "wlan" LED */
+        BCM47XX_GPIO_LED(3, "blue", "wan", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(4, "blue", "lan", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(6, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
+        BCM47XX_GPIO_LED(9, "blue", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
+};
+
+static const struct gpio_led
 bcm47xx_leds_asus_rtn16[] __initconst = {
         BCM47XX_GPIO_LED(1, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
         BCM47XX_GPIO_LED(7, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
@@ -42,8 +51,8 @@ bcm47xx_leds_asus_rtn16[] __initconst = {
 
 static const struct gpio_led
 bcm47xx_leds_asus_rtn66u[] __initconst = {
-        BCM47XX_GPIO_LED(12, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
-        BCM47XX_GPIO_LED(15, "unk", "usb", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(12, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
+        BCM47XX_GPIO_LED(15, "blue", "usb", 1, LEDS_GPIO_DEFSTATE_OFF),
 };
 
 static const struct gpio_led
@@ -64,6 +73,11 @@ bcm47xx_leds_asus_wl330ge[] __initconst = {
 };
 
 static const struct gpio_led
+bcm47xx_leds_asus_wl500g[] __initconst = {
+        BCM47XX_GPIO_LED(0, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
+};
+
+static const struct gpio_led
 bcm47xx_leds_asus_wl500gd[] __initconst = {
         BCM47XX_GPIO_LED(0, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
 };
@@ -216,8 +230,8 @@ bcm47xx_leds_linksys_e1000v1[] __initconst = {
 
 static const struct gpio_led
 bcm47xx_leds_linksys_e1000v21[] __initconst = {
-        BCM47XX_GPIO_LED(5, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
-        BCM47XX_GPIO_LED(6, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
+        BCM47XX_GPIO_LED(5, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(6, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
         BCM47XX_GPIO_LED(7, "amber", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
         BCM47XX_GPIO_LED(8, "blue", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
 };
@@ -292,7 +306,7 @@ bcm47xx_leds_linksys_wrt310nv1[] __initconst = {
 };
 
 static const struct gpio_led
-bcm47xx_leds_linksys_wrt54gsv1[] __initconst = {
+bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
         BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
         BCM47XX_GPIO_LED(5, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
@@ -306,6 +320,24 @@ bcm47xx_leds_linksys_wrt54g3gv2[] __initconst = {
         BCM47XX_GPIO_LED(3, "blue", "3g", 0, LEDS_GPIO_DEFSTATE_OFF),
 };
 
+/* Verified on: WRT54GS V1.0 */
+static const struct gpio_led
+bcm47xx_leds_linksys_wrt54g_type_0101[] __initconst = {
+        BCM47XX_GPIO_LED(0, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
+        BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
+};
+
+/* Verified on: WRT54GL V1.1 */
+static const struct gpio_led
+bcm47xx_leds_linksys_wrt54g_type_0467[] __initconst = {
+        BCM47XX_GPIO_LED(0, "green", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
+        BCM47XX_GPIO_LED(2, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(3, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
+};
+
 static const struct gpio_led
 bcm47xx_leds_linksys_wrt610nv1[] __initconst = {
         BCM47XX_GPIO_LED(0, "unk", "usb",  1, LEDS_GPIO_DEFSTATE_OFF),
@@ -325,11 +357,17 @@ bcm47xx_leds_linksys_wrt610nv2[] __initconst = {
 
 static const struct gpio_led
 bcm47xx_leds_linksys_wrtsl54gs[] __initconst = {
-        BCM47XX_GPIO_LED(0, "unk", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
-        BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
-        BCM47XX_GPIO_LED(2, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-        BCM47XX_GPIO_LED(3, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-        BCM47XX_GPIO_LED(7, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(0, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
+        BCM47XX_GPIO_LED(5, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(7, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+};
+
+/* Microsoft */
+
+static const struct gpio_led
+bcm47xx_leds_microsoft_nm700[] __initconst = {
+        BCM47XX_GPIO_LED(6, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 };
 
 /* Motorola */
@@ -377,6 +415,15 @@ bcm47xx_leds_netgear_wndr4500v1[] __initconst = {
 };
 
 static const struct gpio_led
+bcm47xx_leds_netgear_wnr3500lv1[] __initconst = {
+        BCM47XX_GPIO_LED(0, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(1, "green", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(2, "green", "wan", 1, LEDS_GPIO_DEFSTATE_OFF),
+        BCM47XX_GPIO_LED(3, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
+        BCM47XX_GPIO_LED(7, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
+};
+
+static const struct gpio_led
 bcm47xx_leds_netgear_wnr834bv2[] __initconst = {
         BCM47XX_GPIO_LED(2, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
         BCM47XX_GPIO_LED(3, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
@@ -417,6 +464,9 @@ void __init bcm47xx_leds_register(void)
         case BCM47XX_BOARD_ASUS_RTN12:
                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
                 break;
+        case BCM47XX_BOARD_ASUS_RTN15U:
+                bcm47xx_set_pdata(bcm47xx_leds_asus_rtn15u);
+                break;
         case BCM47XX_BOARD_ASUS_RTN16:
                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn16);
                 break;
@@ -432,6 +482,9 @@ void __init bcm47xx_leds_register(void)
         case BCM47XX_BOARD_ASUS_WL330GE:
                 bcm47xx_set_pdata(bcm47xx_leds_asus_wl330ge);
                 break;
+        case BCM47XX_BOARD_ASUS_WL500G:
+                bcm47xx_set_pdata(bcm47xx_leds_asus_wl500g);
+                break;
         case BCM47XX_BOARD_ASUS_WL500GD:
                 bcm47xx_set_pdata(bcm47xx_leds_asus_wl500gd);
                 break;
@@ -538,12 +591,18 @@ void __init bcm47xx_leds_register(void)
         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
                 break;
-        case BCM47XX_BOARD_LINKSYS_WRT54G:
-                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54gsv1);
-                break;
         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
                 break;
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101:
+                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0101);
+                break;
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
+                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0467);
+                break;
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
+                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_generic);
+                break;
         case BCM47XX_BOARD_LINKSYS_WRT610NV1:
                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt610nv1);
                 break;
@@ -554,6 +613,10 @@ void __init bcm47xx_leds_register(void)
                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrtsl54gs);
                 break;
 
+        case BCM47XX_BOARD_MICROSOFT_MN700:
+                bcm47xx_set_pdata(bcm47xx_leds_microsoft_nm700);
+                break;
+
         case BCM47XX_BOARD_MOTOROLA_WE800G:
                 bcm47xx_set_pdata(bcm47xx_leds_motorola_we800g);
                 break;
@@ -570,6 +633,9 @@ void __init bcm47xx_leds_register(void)
         case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
                 bcm47xx_set_pdata(bcm47xx_leds_netgear_wndr4500v1);
                 break;
+        case BCM47XX_BOARD_NETGEAR_WNR3500L:
+                bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr3500lv1);
+                break;
         case BCM47XX_BOARD_NETGEAR_WNR834BV2:
                 bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr834bv2);
                 break;
diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
index 1a03a2f43496..1b170bf5f7f0 100644
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
@@ -51,6 +51,8 @@ __init void bcm47xx_set_system_type(u16 chip_id)
                  chip_id);
 }
 
+static unsigned long lowmem __initdata;
+
 static __init void prom_init_mem(void)
 {
         unsigned long mem;
@@ -87,6 +89,7 @@ static __init void prom_init_mem(void)
                 if (!memcmp(prom_init, prom_init + mem, 32))
                         break;
         }
+        lowmem = mem;
 
         /* Ignoring the last page when ddr size is 128M. Cached
          * accesses to last page is causing the processor to prefetch
@@ -95,7 +98,6 @@ static __init void prom_init_mem(void)
          */
         if (c->cputype == CPU_74K && (mem == (128  << 20)))
                 mem -= 0x1000;
-
         add_memory_region(0, mem, BOOT_MEM_RAM);
 }
 
@@ -114,3 +116,67 @@ void __init prom_init(void)
 void __init prom_free_prom_memory(void)
 {
 }
+
+#if defined(CONFIG_BCM47XX_BCMA) && defined(CONFIG_HIGHMEM)
+
+#define EXTVBASE        0xc0000000
+#define ENTRYLO(x)      ((pte_val(pfn_pte((x) >> _PFN_SHIFT, PAGE_KERNEL_UNCACHED)) >> 6) | 1)
+
+#include <asm/tlbflush.h>
+
+/* Stripped version of tlb_init, with the call to build_tlb_refill_handler
+ * dropped. Calling it at this stage causes a hang.
+ */
+void __cpuinit early_tlb_init(void)
+{
+        write_c0_pagemask(PM_DEFAULT_MASK);
+        write_c0_wired(0);
+        temp_tlb_entry = current_cpu_data.tlbsize - 1;
+        local_flush_tlb_all();
+}
+
+void __init bcm47xx_prom_highmem_init(void)
+{
+        unsigned long off = (unsigned long)prom_init;
+        unsigned long extmem = 0;
+        bool highmem_region = false;
+
+        if (WARN_ON(bcm47xx_bus_type != BCM47XX_BUS_TYPE_BCMA))
+                return;
+
+        if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
+                highmem_region = true;
+
+        if (lowmem != 128 << 20 || !highmem_region)
+                return;
+
+        early_tlb_init();
+
+        /* Add one temporary TLB entry to map SDRAM Region 2.
+         *      Physical        Virtual
+         *      0x80000000      0xc0000000      (1st: 256MB)
+         *      0x90000000      0xd0000000      (2nd: 256MB)
+         */
+        add_temporary_entry(ENTRYLO(0x80000000),
+                            ENTRYLO(0x80000000 + (256 << 20)),
+                            EXTVBASE, PM_256M);
+
+        off = EXTVBASE + __pa(off);
+        for (extmem = 128 << 20; extmem < 512 << 20; extmem <<= 1) {
+                if (!memcmp(prom_init, (void *)(off + extmem), 16))
+                        break;
+        }
+        extmem -= lowmem;
+
+        early_tlb_init();
+
+        if (!extmem)
+                return;
+
+        pr_warn("Found %lu MiB of extra memory, but highmem is unsupported yet!\n",
+                extmem >> 20);
+
+        /* TODO: Register extra memory */
+}
+
+#endif /* defined(CONFIG_BCM47XX_BCMA) && defined(CONFIG_HIGHMEM) */
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 63a4b0e915dc..2b63e7e7d3d3 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -59,12 +59,12 @@ static void bcm47xx_machine_restart(char *command)
         switch (bcm47xx_bus_type) {
 #ifdef CONFIG_BCM47XX_SSB
         case BCM47XX_BUS_TYPE_SSB:
-                ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1);
+                ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 3);
                 break;
 #endif
 #ifdef CONFIG_BCM47XX_BCMA
         case BCM47XX_BUS_TYPE_BCMA:
-                bcma_chipco_watchdog_timer_set(&bcm47xx_bus.bcma.bus.drv_cc, 1);
+                bcma_chipco_watchdog_timer_set(&bcm47xx_bus.bcma.bus.drv_cc, 3);
                 break;
 #endif
         }
@@ -218,6 +218,9 @@ void __init plat_mem_setup(void)
                 bcm47xx_bus_type = BCM47XX_BUS_TYPE_BCMA;
                 bcm47xx_register_bcma();
                 bcm47xx_set_system_type(bcm47xx_bus.bcma.bus.chipinfo.id);
+#ifdef CONFIG_HIGHMEM
+                bcm47xx_prom_highmem_init();
+#endif
 #endif
         } else {
                 printk(KERN_INFO "bcm47xx: using ssb bus\n");
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
index da4cdb16844e..41226b68de3d 100644
--- a/arch/mips/bcm47xx/sprom.c
+++ b/arch/mips/bcm47xx/sprom.c
@@ -28,6 +28,8 @@
 
 #include <bcm47xx.h>
 #include <bcm47xx_nvram.h>
+#include <linux/if_ether.h>
+#include <linux/etherdevice.h>
 
 static void create_key(const char *prefix, const char *postfix,
                        const char *name, char *buf, int len)
@@ -631,6 +633,33 @@ static void bcm47xx_fill_sprom_path_r45(struct ssb_sprom *sprom,
         }
 }
 
+static bool bcm47xx_is_valid_mac(u8 *mac)
+{
+        return mac && !(mac[0] == 0x00 && mac[1] == 0x90 && mac[2] == 0x4c);
+}
+
+static int bcm47xx_increase_mac_addr(u8 *mac, u8 num)
+{
+        u8 *oui = mac + ETH_ALEN/2 - 1;
+        u8 *p = mac + ETH_ALEN - 1;
+
+        do {
+                (*p) += num;
+                if (*p > num)
+                        break;
+                p--;
+                num = 1;
+        } while (p != oui);
+
+        if (p == oui) {
+                pr_err("unable to fetch mac address\n");
+                return -ENOENT;
+        }
+        return 0;
+}
+
+static int mac_addr_used = 2;
+
 static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
                                         const char *prefix, bool fallback)
 {
@@ -648,6 +677,25 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
 
         nvram_read_macaddr(prefix, "macaddr", sprom->il0mac, fallback);
         nvram_read_macaddr(prefix, "il0macaddr", sprom->il0mac, fallback);
+
+        /* The address prefix 00:90:4C is used by Broadcom in their initial
+           configuration. When a mac address with the prefix 00:90:4C is used
+           all devices from the same series are sharing the same mac address.
+           To prevent mac address collisions we replace them with a mac address
+           based on the base address. */
+        if (!bcm47xx_is_valid_mac(sprom->il0mac)) {
+                u8 mac[6];
+
+                nvram_read_macaddr(NULL, "et0macaddr", mac, false);
+                if (bcm47xx_is_valid_mac(mac)) {
+                        int err = bcm47xx_increase_mac_addr(mac, mac_addr_used);
+
+                        if (!err) {
+                                ether_addr_copy(sprom->il0mac, mac);
+                                mac_addr_used++;
+                        }
+                }
+        }
 }
 
 static void bcm47xx_fill_board_data(struct ssb_sprom *sprom, const char *prefix,
diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c
index fd4e76c00a42..536f64443031 100644
--- a/arch/mips/bcm63xx/cpu.c
+++ b/arch/mips/bcm63xx/cpu.c
@@ -24,7 +24,9 @@ EXPORT_SYMBOL(bcm63xx_regs_base);
 const int *bcm63xx_irqs;
 EXPORT_SYMBOL(bcm63xx_irqs);
 
-static u16 bcm63xx_cpu_id;
+u16 bcm63xx_cpu_id __read_mostly;
+EXPORT_SYMBOL(bcm63xx_cpu_id);
+
 static u8 bcm63xx_cpu_rev;
 static unsigned int bcm63xx_cpu_freq;
 static unsigned int bcm63xx_memory_size;
@@ -97,13 +99,6 @@ static const int bcm6368_irqs[] = {
 
 };
 
-u16 __bcm63xx_get_cpu_id(void)
-{
-        return bcm63xx_cpu_id;
-}
-
-EXPORT_SYMBOL(__bcm63xx_get_cpu_id);
-
 u8 bcm63xx_get_cpu_rev(void)
 {
         return bcm63xx_cpu_rev;
diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c
index 52bc01df9bfe..e8284771d620 100644
--- a/arch/mips/bcm63xx/dev-enet.c
+++ b/arch/mips/bcm63xx/dev-enet.c
@@ -14,7 +14,6 @@
 #include <bcm63xx_io.h>
 #include <bcm63xx_regs.h>
 
-#ifdef BCMCPU_RUNTIME_DETECT
 static const unsigned long bcm6348_regs_enetdmac[] = {
         [ENETDMAC_CHANCFG]      = ENETDMAC_CHANCFG_REG,
         [ENETDMAC_IR]           = ENETDMAC_IR_REG,
@@ -43,9 +42,6 @@ static __init void bcm63xx_enetdmac_regs_init(void)
         else
                 bcm63xx_regs_enetdmac = bcm6348_regs_enetdmac;
 }
-#else
-static __init void bcm63xx_enetdmac_regs_init(void) { }
-#endif
 
 static struct resource shared_res[] = {
         {
diff --git a/arch/mips/bcm63xx/dev-spi.c b/arch/mips/bcm63xx/dev-spi.c
index d12daed749bc..ad448e41e3bd 100644
--- a/arch/mips/bcm63xx/dev-spi.c
+++ b/arch/mips/bcm63xx/dev-spi.c
@@ -18,7 +18,6 @@
 #include <bcm63xx_dev_spi.h>
 #include <bcm63xx_regs.h>
 
-#ifdef BCMCPU_RUNTIME_DETECT
 /*
  * register offsets
  */
@@ -41,9 +40,6 @@ static __init void bcm63xx_spi_regs_init(void)
                 BCMCPU_IS_6362() || BCMCPU_IS_6368())
                 bcm63xx_regs_spi = bcm6358_regs_spi;
 }
-#else
-static __init void bcm63xx_spi_regs_init(void) { }
-#endif
 
 static struct resource spi_resources[] = {
         {
diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
index a6c2135dbf38..468bc7b99cd3 100644
--- a/arch/mips/bcm63xx/gpio.c
+++ b/arch/mips/bcm63xx/gpio.c
@@ -18,19 +18,6 @@
 #include <bcm63xx_io.h>
 #include <bcm63xx_regs.h>
 
-#ifndef BCMCPU_RUNTIME_DETECT
-#define gpio_out_low_reg        GPIO_DATA_LO_REG
-#ifdef CONFIG_BCM63XX_CPU_6345
-#ifdef gpio_out_low_reg
-#undef gpio_out_low_reg
-#define gpio_out_low_reg        GPIO_DATA_LO_REG_6345
-#endif /* gpio_out_low_reg */
-#endif /* CONFIG_BCM63XX_CPU_6345 */
-
-static inline void bcm63xx_gpio_out_low_reg_init(void)
-{
-}
-#else /* ! BCMCPU_RUNTIME_DETECT */
 static u32 gpio_out_low_reg;
 
 static void bcm63xx_gpio_out_low_reg_init(void)
@@ -44,7 +31,6 @@ static void bcm63xx_gpio_out_low_reg_init(void)
                 break;
         }
 }
-#endif /* ! BCMCPU_RUNTIME_DETECT */
 
 static DEFINE_SPINLOCK(bcm63xx_gpio_lock);
 static u32 gpio_out_low, gpio_out_high;
diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c
index 1525f8a3841b..37eb2d1fa69a 100644
--- a/arch/mips/bcm63xx/irq.c
+++ b/arch/mips/bcm63xx/irq.c
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/irq.h>
+#include <linux/spinlock.h>
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
 #include <bcm63xx_cpu.h>
@@ -19,222 +20,20 @@
 #include <bcm63xx_io.h>
 #include <bcm63xx_irq.h>
 
-static void __dispatch_internal(void) __maybe_unused;
-static void __dispatch_internal_64(void) __maybe_unused;
-static void __internal_irq_mask_32(unsigned int irq) __maybe_unused;
-static void __internal_irq_mask_64(unsigned int irq) __maybe_unused;
-static void __internal_irq_unmask_32(unsigned int irq) __maybe_unused;
-static void __internal_irq_unmask_64(unsigned int irq) __maybe_unused;
-
-#ifndef BCMCPU_RUNTIME_DETECT
-#ifdef CONFIG_BCM63XX_CPU_3368
-#define irq_stat_reg            PERF_IRQSTAT_3368_REG
-#define irq_mask_reg            PERF_IRQMASK_3368_REG
-#define irq_bits                32
-#define is_ext_irq_cascaded     0
-#define ext_irq_start           0
-#define ext_irq_end             0
-#define ext_irq_count           4
-#define ext_irq_cfg_reg1        PERF_EXTIRQ_CFG_REG_3368
-#define ext_irq_cfg_reg2        0
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6328
-#define irq_stat_reg            PERF_IRQSTAT_6328_REG
-#define irq_mask_reg            PERF_IRQMASK_6328_REG
-#define irq_bits                64
-#define is_ext_irq_cascaded     1
-#define ext_irq_start           (BCM_6328_EXT_IRQ0 - IRQ_INTERNAL_BASE)
-#define ext_irq_end             (BCM_6328_EXT_IRQ3 - IRQ_INTERNAL_BASE)
-#define ext_irq_count           4
-#define ext_irq_cfg_reg1        PERF_EXTIRQ_CFG_REG_6328
-#define ext_irq_cfg_reg2        0
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6338
-#define irq_stat_reg            PERF_IRQSTAT_6338_REG
-#define irq_mask_reg            PERF_IRQMASK_6338_REG
-#define irq_bits                32
-#define is_ext_irq_cascaded     0
-#define ext_irq_start           0
-#define ext_irq_end             0
-#define ext_irq_count           4
-#define ext_irq_cfg_reg1        PERF_EXTIRQ_CFG_REG_6338
-#define ext_irq_cfg_reg2        0
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6345
-#define irq_stat_reg            PERF_IRQSTAT_6345_REG
-#define irq_mask_reg            PERF_IRQMASK_6345_REG
-#define irq_bits                32
-#define is_ext_irq_cascaded     0
-#define ext_irq_start           0
-#define ext_irq_end             0
-#define ext_irq_count           4
-#define ext_irq_cfg_reg1        PERF_EXTIRQ_CFG_REG_6345
-#define ext_irq_cfg_reg2        0
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6348
-#define irq_stat_reg            PERF_IRQSTAT_6348_REG
-#define irq_mask_reg            PERF_IRQMASK_6348_REG
-#define irq_bits                32
-#define is_ext_irq_cascaded     0
-#define ext_irq_start           0
-#define ext_irq_end             0
-#define ext_irq_count           4
-#define ext_irq_cfg_reg1        PERF_EXTIRQ_CFG_REG_6348
-#define ext_irq_cfg_reg2        0
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6358
-#define irq_stat_reg            PERF_IRQSTAT_6358_REG
-#define irq_mask_reg            PERF_IRQMASK_6358_REG
-#define irq_bits                32
-#define is_ext_irq_cascaded     1
-#define ext_irq_start           (BCM_6358_EXT_IRQ0 - IRQ_INTERNAL_BASE)
-#define ext_irq_end             (BCM_6358_EXT_IRQ3 - IRQ_INTERNAL_BASE)
-#define ext_irq_count           4
-#define ext_irq_cfg_reg1        PERF_EXTIRQ_CFG_REG_6358
-#define ext_irq_cfg_reg2        0
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6362
-#define irq_stat_reg            PERF_IRQSTAT_6362_REG
-#define irq_mask_reg            PERF_IRQMASK_6362_REG
-#define irq_bits                64
-#define is_ext_irq_cascaded     1
-#define ext_irq_start           (BCM_6362_EXT_IRQ0 - IRQ_INTERNAL_BASE)
-#define ext_irq_end             (BCM_6362_EXT_IRQ3 - IRQ_INTERNAL_BASE)
-#define ext_irq_count           4
-#define ext_irq_cfg_reg1        PERF_EXTIRQ_CFG_REG_6362
-#define ext_irq_cfg_reg2        0
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6368
-#define irq_stat_reg            PERF_IRQSTAT_6368_REG
-#define irq_mask_reg            PERF_IRQMASK_6368_REG
-#define irq_bits                64
-#define is_ext_irq_cascaded     1
-#define ext_irq_start           (BCM_6368_EXT_IRQ0 - IRQ_INTERNAL_BASE)
-#define ext_irq_end             (BCM_6368_EXT_IRQ5 - IRQ_INTERNAL_BASE)
-#define ext_irq_count           6
-#define ext_irq_cfg_reg1        PERF_EXTIRQ_CFG_REG_6368
-#define ext_irq_cfg_reg2        PERF_EXTIRQ_CFG_REG2_6368
-#endif
-
-#if irq_bits == 32
-#define dispatch_internal                       __dispatch_internal
-#define internal_irq_mask                       __internal_irq_mask_32
-#define internal_irq_unmask                     __internal_irq_unmask_32
-#else
-#define dispatch_internal                       __dispatch_internal_64
-#define internal_irq_mask                       __internal_irq_mask_64
-#define internal_irq_unmask                     __internal_irq_unmask_64
-#endif
 
-#define irq_stat_addr   (bcm63xx_regset_address(RSET_PERF) + irq_stat_reg)
-#define irq_mask_addr   (bcm63xx_regset_address(RSET_PERF) + irq_mask_reg)
+static DEFINE_SPINLOCK(ipic_lock);
+static DEFINE_SPINLOCK(epic_lock);
 
-static inline void bcm63xx_init_irq(void)
-{
-}
-#else /* ! BCMCPU_RUNTIME_DETECT */
-
-static u32 irq_stat_addr, irq_mask_addr;
-static void (*dispatch_internal)(void);
+static u32 irq_stat_addr[2];
+static u32 irq_mask_addr[2];
+static void (*dispatch_internal)(int cpu);
 static int is_ext_irq_cascaded;
 static unsigned int ext_irq_count;
 static unsigned int ext_irq_start, ext_irq_end;
 static unsigned int ext_irq_cfg_reg1, ext_irq_cfg_reg2;
-static void (*internal_irq_mask)(unsigned int irq);
-static void (*internal_irq_unmask)(unsigned int irq);
+static void (*internal_irq_mask)(struct irq_data *d);
+static void (*internal_irq_unmask)(struct irq_data *d, const struct cpumask *m);
 
-static void bcm63xx_init_irq(void)
-{
-        int irq_bits;
-
-        irq_stat_addr = bcm63xx_regset_address(RSET_PERF);
-        irq_mask_addr = bcm63xx_regset_address(RSET_PERF);
-
-        switch (bcm63xx_get_cpu_id()) {
-        case BCM3368_CPU_ID:
-                irq_stat_addr += PERF_IRQSTAT_3368_REG;
-                irq_mask_addr += PERF_IRQMASK_3368_REG;
-                irq_bits = 32;
-                ext_irq_count = 4;
-                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_3368;
-                break;
-        case BCM6328_CPU_ID:
-                irq_stat_addr += PERF_IRQSTAT_6328_REG;
-                irq_mask_addr += PERF_IRQMASK_6328_REG;
-                irq_bits = 64;
-                ext_irq_count = 4;
-                is_ext_irq_cascaded = 1;
-                ext_irq_start = BCM_6328_EXT_IRQ0 - IRQ_INTERNAL_BASE;
-                ext_irq_end = BCM_6328_EXT_IRQ3 - IRQ_INTERNAL_BASE;
-                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6328;
-                break;
-        case BCM6338_CPU_ID:
-                irq_stat_addr += PERF_IRQSTAT_6338_REG;
-                irq_mask_addr += PERF_IRQMASK_6338_REG;
-                irq_bits = 32;
-                ext_irq_count = 4;
-                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338;
-                break;
-        case BCM6345_CPU_ID:
-                irq_stat_addr += PERF_IRQSTAT_6345_REG;
-                irq_mask_addr += PERF_IRQMASK_6345_REG;
-                irq_bits = 32;
-                ext_irq_count = 4;
-                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345;
-                break;
-        case BCM6348_CPU_ID:
-                irq_stat_addr += PERF_IRQSTAT_6348_REG;
-                irq_mask_addr += PERF_IRQMASK_6348_REG;
-                irq_bits = 32;
-                ext_irq_count = 4;
-                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6348;
-                break;
-        case BCM6358_CPU_ID:
-                irq_stat_addr += PERF_IRQSTAT_6358_REG;
-                irq_mask_addr += PERF_IRQMASK_6358_REG;
-                irq_bits = 32;
-                ext_irq_count = 4;
-                is_ext_irq_cascaded = 1;
-                ext_irq_start = BCM_6358_EXT_IRQ0 - IRQ_INTERNAL_BASE;
-                ext_irq_end = BCM_6358_EXT_IRQ3 - IRQ_INTERNAL_BASE;
-                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6358;
-                break;
-        case BCM6362_CPU_ID:
-                irq_stat_addr += PERF_IRQSTAT_6362_REG;
-                irq_mask_addr += PERF_IRQMASK_6362_REG;
-                irq_bits = 64;
-                ext_irq_count = 4;
-                is_ext_irq_cascaded = 1;
-                ext_irq_start = BCM_6362_EXT_IRQ0 - IRQ_INTERNAL_BASE;
-                ext_irq_end = BCM_6362_EXT_IRQ3 - IRQ_INTERNAL_BASE;
-                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6362;
-                break;
-        case BCM6368_CPU_ID:
-                irq_stat_addr += PERF_IRQSTAT_6368_REG;
-                irq_mask_addr += PERF_IRQMASK_6368_REG;
-                irq_bits = 64;
-                ext_irq_count = 6;
-                is_ext_irq_cascaded = 1;
-                ext_irq_start = BCM_6368_EXT_IRQ0 - IRQ_INTERNAL_BASE;
-                ext_irq_end = BCM_6368_EXT_IRQ5 - IRQ_INTERNAL_BASE;
-                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6368;
-                ext_irq_cfg_reg2 = PERF_EXTIRQ_CFG_REG2_6368;
-                break;
-        default:
-                BUG();
-        }
-
-        if (irq_bits == 32) {
-                dispatch_internal = __dispatch_internal;
-                internal_irq_mask = __internal_irq_mask_32;
-                internal_irq_unmask = __internal_irq_unmask_32;
-        } else {
-                dispatch_internal = __dispatch_internal_64;
-                internal_irq_mask = __internal_irq_mask_64;
-                internal_irq_unmask = __internal_irq_unmask_64;
-        }
-}
-#endif /* ! BCMCPU_RUNTIME_DETECT */
 
 static inline u32 get_ext_irq_perf_reg(int irq)
 {
@@ -252,53 +51,113 @@ static inline void handle_internal(int intbit)
                 do_IRQ(intbit + IRQ_INTERNAL_BASE);
 }
 
+static inline int enable_irq_for_cpu(int cpu, struct irq_data *d,
+                                     const struct cpumask *m)
+{
+        bool enable = cpu_online(cpu);
+
+#ifdef CONFIG_SMP
+        if (m)
+                enable &= cpu_isset(cpu, *m);
+        else if (irqd_affinity_was_set(d))
+                enable &= cpu_isset(cpu, *d->affinity);
+#endif
+        return enable;
+}
+
 /*
  * dispatch internal devices IRQ (uart, enet, watchdog, ...). do not
  * prioritize any interrupt relatively to another. the static counter
  * will resume the loop where it ended the last time we left this
  * function.
  */
-static void __dispatch_internal(void)
-{
-        u32 pending;
-        static int i;
-
-        pending = bcm_readl(irq_stat_addr) & bcm_readl(irq_mask_addr);
 
-        if (!pending)
-                return ;
-
-        while (1) {
-                int to_call = i;
-
-                i = (i + 1) & 0x1f;
-                if (pending & (1 << to_call)) {
-                        handle_internal(to_call);
-                        break;
-                }
-        }
+#define BUILD_IPIC_INTERNAL(width)                                      \
+void __dispatch_internal_##width(int cpu)                               \
+{                                                                       \
+        u32 pending[width / 32];                                        \
+        unsigned int src, tgt;                                          \
+        bool irqs_pending = false;                                      \
+        static unsigned int i[2];                                       \
+        unsigned int *next = &i[cpu];                                   \
+        unsigned long flags;                                            \
+                                                                        \
+        /* read registers in reverse order */                           \
+        spin_lock_irqsave(&ipic_lock, flags);                           \
+        for (src = 0, tgt = (width / 32); src < (width / 32); src++) {  \
+                u32 val;                                                \
+                                                                        \
+                val = bcm_readl(irq_stat_addr[cpu] + src * sizeof(u32)); \
+                val &= bcm_readl(irq_mask_addr[cpu] + src * sizeof(u32)); \
+                pending[--tgt] = val;                                   \
+                                                                        \
+                if (val)                                                \
+                        irqs_pending = true;                            \
+        }                                                               \
+        spin_unlock_irqrestore(&ipic_lock, flags);                      \
+                                                                        \
+        if (!irqs_pending)                                              \
+                return;                                                 \
+                                                                        \
+        while (1) {                                                     \
+                unsigned int to_call = *next;                           \
+                                                                        \
+                *next = (*next + 1) & (width - 1);                      \
+                if (pending[to_call / 32] & (1 << (to_call & 0x1f))) {  \
+                        handle_internal(to_call);                       \
+                        break;                                          \
+                }                                                       \
+        }                                                               \
+}                                                                       \
+                                                                        \
+static void __internal_irq_mask_##width(struct irq_data *d)             \
+{                                                                       \
+        u32 val;                                                        \
+        unsigned irq = d->irq - IRQ_INTERNAL_BASE;                      \
+        unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
+        unsigned bit = irq & 0x1f;                                      \
+        unsigned long flags;                                            \
+        int cpu;                                                        \
+                                                                        \
+        spin_lock_irqsave(&ipic_lock, flags);                           \
+        for_each_present_cpu(cpu) {                                     \
+                if (!irq_mask_addr[cpu])                                \
+                        break;                                          \
+                                                                        \
+                val = bcm_readl(irq_mask_addr[cpu] + reg * sizeof(u32));\
+                val &= ~(1 << bit);                                     \
+                bcm_writel(val, irq_mask_addr[cpu] + reg * sizeof(u32));\
+        }                                                               \
+        spin_unlock_irqrestore(&ipic_lock, flags);                      \
+}                                                                       \
+                                                                        \
+static void __internal_irq_unmask_##width(struct irq_data *d,           \
+                                          const struct cpumask *m)      \
+{                                                                       \
+        u32 val;                                                        \
+        unsigned irq = d->irq - IRQ_INTERNAL_BASE;                      \
+        unsigned reg = (irq / 32) ^ (width/32 - 1);                     \
+        unsigned bit = irq & 0x1f;                                      \
+        unsigned long flags;                                            \
+        int cpu;                                                        \
+                                                                        \
+        spin_lock_irqsave(&ipic_lock, flags);                           \
+        for_each_present_cpu(cpu) {                                     \
+                if (!irq_mask_addr[cpu])                                \
+                        break;                                          \
+                                                                        \
+                val = bcm_readl(irq_mask_addr[cpu] + reg * sizeof(u32));\
+                if (enable_irq_for_cpu(cpu, d, m))                      \
+                        val |= (1 << bit);                              \
+                else                                                    \
+                        val &= ~(1 << bit);                             \
+                bcm_writel(val, irq_mask_addr[cpu] + reg * sizeof(u32));\
+        }                                                               \
+        spin_unlock_irqrestore(&ipic_lock, flags);                      \
 }
 
-static void __dispatch_internal_64(void)
-{
-        u64 pending;
-        static int i;
-
-        pending = bcm_readq(irq_stat_addr) & bcm_readq(irq_mask_addr);
-
-        if (!pending)
-                return ;
-
-        while (1) {
-                int to_call = i;
-
-                i = (i + 1) & 0x3f;
-                if (pending & (1ull << to_call)) {
-                        handle_internal(to_call);
-                        break;
-                }
-        }
-}
+BUILD_IPIC_INTERNAL(32);
+BUILD_IPIC_INTERNAL(64);
 
 asmlinkage void plat_irq_dispatch(void)
 {
@@ -317,8 +176,11 @@ asmlinkage void plat_irq_dispatch(void)
                 if (cause & CAUSEF_IP1)
                         do_IRQ(1);
                 if (cause & CAUSEF_IP2)
-                        dispatch_internal();
-                if (!is_ext_irq_cascaded) {
+                        dispatch_internal(0);
+                if (is_ext_irq_cascaded) {
+                        if (cause & CAUSEF_IP3)
+                                dispatch_internal(1);
+                } else {
                         if (cause & CAUSEF_IP3)
                                 do_IRQ(IRQ_EXT_0);
                         if (cause & CAUSEF_IP4)
@@ -335,50 +197,14 @@ asmlinkage void plat_irq_dispatch(void)
  * internal IRQs operations: only mask/unmask on PERF irq mask
  * register.
  */
-static void __internal_irq_mask_32(unsigned int irq)
-{
-        u32 mask;
-
-        mask = bcm_readl(irq_mask_addr);
-        mask &= ~(1 << irq);
-        bcm_writel(mask, irq_mask_addr);
-}
-
-static void __internal_irq_mask_64(unsigned int irq)
-{
-        u64 mask;
-
-        mask = bcm_readq(irq_mask_addr);
-        mask &= ~(1ull << irq);
-        bcm_writeq(mask, irq_mask_addr);
-}
-
-static void __internal_irq_unmask_32(unsigned int irq)
-{
-        u32 mask;
-
-        mask = bcm_readl(irq_mask_addr);
-        mask |= (1 << irq);
-        bcm_writel(mask, irq_mask_addr);
-}
-
-static void __internal_irq_unmask_64(unsigned int irq)
-{
-        u64 mask;
-
-        mask = bcm_readq(irq_mask_addr);
-        mask |= (1ull << irq);
-        bcm_writeq(mask, irq_mask_addr);
-}
-
 static void bcm63xx_internal_irq_mask(struct irq_data *d)
 {
-        internal_irq_mask(d->irq - IRQ_INTERNAL_BASE);
+        internal_irq_mask(d);
 }
 
 static void bcm63xx_internal_irq_unmask(struct irq_data *d)
 {
-        internal_irq_unmask(d->irq - IRQ_INTERNAL_BASE);
+        internal_irq_unmask(d, NULL);
 }
 
 /*
@@ -389,8 +215,10 @@ static void bcm63xx_external_irq_mask(struct irq_data *d)
 {
         unsigned int irq = d->irq - IRQ_EXTERNAL_BASE;
         u32 reg, regaddr;
+        unsigned long flags;
 
         regaddr = get_ext_irq_perf_reg(irq);
+        spin_lock_irqsave(&epic_lock, flags);
         reg = bcm_perf_readl(regaddr);
 
         if (BCMCPU_IS_6348())
@@ -399,16 +227,20 @@ static void bcm63xx_external_irq_mask(struct irq_data *d)
                 reg &= ~EXTIRQ_CFG_MASK(irq % 4);
 
         bcm_perf_writel(reg, regaddr);
+        spin_unlock_irqrestore(&epic_lock, flags);
+
         if (is_ext_irq_cascaded)
-                internal_irq_mask(irq + ext_irq_start);
+                internal_irq_mask(irq_get_irq_data(irq + ext_irq_start));
 }
 
 static void bcm63xx_external_irq_unmask(struct irq_data *d)
 {
         unsigned int irq = d->irq - IRQ_EXTERNAL_BASE;
         u32 reg, regaddr;
+        unsigned long flags;
 
         regaddr = get_ext_irq_perf_reg(irq);
+        spin_lock_irqsave(&epic_lock, flags);
         reg = bcm_perf_readl(regaddr);
 
         if (BCMCPU_IS_6348())
@@ -417,17 +249,21 @@ static void bcm63xx_external_irq_unmask(struct irq_data *d)
                 reg |= EXTIRQ_CFG_MASK(irq % 4);
 
         bcm_perf_writel(reg, regaddr);
+        spin_unlock_irqrestore(&epic_lock, flags);
 
         if (is_ext_irq_cascaded)
-                internal_irq_unmask(irq + ext_irq_start);
+                internal_irq_unmask(irq_get_irq_data(irq + ext_irq_start),
+                                    NULL);
 }
 
 static void bcm63xx_external_irq_clear(struct irq_data *d)
 {
         unsigned int irq = d->irq - IRQ_EXTERNAL_BASE;
         u32 reg, regaddr;
+        unsigned long flags;
 
         regaddr = get_ext_irq_perf_reg(irq);
+        spin_lock_irqsave(&epic_lock, flags);
         reg = bcm_perf_readl(regaddr);
 
         if (BCMCPU_IS_6348())
@@ -436,6 +272,7 @@ static void bcm63xx_external_irq_clear(struct irq_data *d)
                 reg |= EXTIRQ_CFG_CLEAR(irq % 4);
 
         bcm_perf_writel(reg, regaddr);
+        spin_unlock_irqrestore(&epic_lock, flags);
 }
 
 static int bcm63xx_external_irq_set_type(struct irq_data *d,
@@ -444,6 +281,7 @@ static int bcm63xx_external_irq_set_type(struct irq_data *d,
         unsigned int irq = d->irq - IRQ_EXTERNAL_BASE;
         u32 reg, regaddr;
         int levelsense, sense, bothedge;
+        unsigned long flags;
 
         flow_type &= IRQ_TYPE_SENSE_MASK;
 
@@ -478,6 +316,7 @@ static int bcm63xx_external_irq_set_type(struct irq_data *d,
         }
 
         regaddr = get_ext_irq_perf_reg(irq);
+        spin_lock_irqsave(&epic_lock, flags);
         reg = bcm_perf_readl(regaddr);
         irq %= 4;
 
@@ -522,6 +361,7 @@ static int bcm63xx_external_irq_set_type(struct irq_data *d,
         }
 
         bcm_perf_writel(reg, regaddr);
+        spin_unlock_irqrestore(&epic_lock, flags);
 
         irqd_set_trigger_type(d, flow_type);
         if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
@@ -532,6 +372,18 @@ static int bcm63xx_external_irq_set_type(struct irq_data *d,
         return IRQ_SET_MASK_OK_NOCOPY;
 }
 
+#ifdef CONFIG_SMP
+static int bcm63xx_internal_set_affinity(struct irq_data *data,
+                                         const struct cpumask *dest,
+                                         bool force)
+{
+        if (!irqd_irq_disabled(data))
+                internal_irq_unmask(data, dest);
+
+        return 0;
+}
+#endif
+
 static struct irq_chip bcm63xx_internal_irq_chip = {
         .name           = "bcm63xx_ipic",
         .irq_mask       = bcm63xx_internal_irq_mask,
@@ -554,12 +406,130 @@ static struct irqaction cpu_ip2_cascade_action = {
         .flags          = IRQF_NO_THREAD,
 };
 
+#ifdef CONFIG_SMP
+static struct irqaction cpu_ip3_cascade_action = {
+        .handler        = no_action,
+        .name           = "cascade_ip3",
+        .flags          = IRQF_NO_THREAD,
+};
+#endif
+
 static struct irqaction cpu_ext_cascade_action = {
         .handler        = no_action,
         .name           = "cascade_extirq",
         .flags          = IRQF_NO_THREAD,
 };
 
+static void bcm63xx_init_irq(void)
+{
+        int irq_bits;
+
+        irq_stat_addr[0] = bcm63xx_regset_address(RSET_PERF);
+        irq_mask_addr[0] = bcm63xx_regset_address(RSET_PERF);
+        irq_stat_addr[1] = bcm63xx_regset_address(RSET_PERF);
+        irq_mask_addr[1] = bcm63xx_regset_address(RSET_PERF);
+
+        switch (bcm63xx_get_cpu_id()) {
+        case BCM3368_CPU_ID:
+                irq_stat_addr[0] += PERF_IRQSTAT_3368_REG;
+                irq_mask_addr[0] += PERF_IRQMASK_3368_REG;
+                irq_stat_addr[1] = 0;
+                irq_stat_addr[1] = 0;
+                irq_bits = 32;
+                ext_irq_count = 4;
+                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_3368;
+                break;
+        case BCM6328_CPU_ID:
+                irq_stat_addr[0] += PERF_IRQSTAT_6328_REG(0);
+                irq_mask_addr[0] += PERF_IRQMASK_6328_REG(0);
+                irq_stat_addr[1] += PERF_IRQSTAT_6328_REG(1);
+                irq_stat_addr[1] += PERF_IRQMASK_6328_REG(1);
+                irq_bits = 64;
+                ext_irq_count = 4;
+                is_ext_irq_cascaded = 1;
+                ext_irq_start = BCM_6328_EXT_IRQ0 - IRQ_INTERNAL_BASE;
+                ext_irq_end = BCM_6328_EXT_IRQ3 - IRQ_INTERNAL_BASE;
+                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6328;
+                break;
+        case BCM6338_CPU_ID:
+                irq_stat_addr[0] += PERF_IRQSTAT_6338_REG;
+                irq_mask_addr[0] += PERF_IRQMASK_6338_REG;
+                irq_stat_addr[1] = 0;
+                irq_mask_addr[1] = 0;
+                irq_bits = 32;
+                ext_irq_count = 4;
+                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6338;
+                break;
+        case BCM6345_CPU_ID:
+                irq_stat_addr[0] += PERF_IRQSTAT_6345_REG;
+                irq_mask_addr[0] += PERF_IRQMASK_6345_REG;
+                irq_stat_addr[1] = 0;
+                irq_mask_addr[1] = 0;
+                irq_bits = 32;
+                ext_irq_count = 4;
+                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6345;
+                break;
+        case BCM6348_CPU_ID:
+                irq_stat_addr[0] += PERF_IRQSTAT_6348_REG;
+                irq_mask_addr[0] += PERF_IRQMASK_6348_REG;
+                irq_stat_addr[1] = 0;
+                irq_mask_addr[1] = 0;
+                irq_bits = 32;
+                ext_irq_count = 4;
+                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6348;
+                break;
+        case BCM6358_CPU_ID:
+                irq_stat_addr[0] += PERF_IRQSTAT_6358_REG(0);
+                irq_mask_addr[0] += PERF_IRQMASK_6358_REG(0);
+                irq_stat_addr[1] += PERF_IRQSTAT_6358_REG(1);
+                irq_mask_addr[1] += PERF_IRQMASK_6358_REG(1);
+                irq_bits = 32;
+                ext_irq_count = 4;
+                is_ext_irq_cascaded = 1;
+                ext_irq_start = BCM_6358_EXT_IRQ0 - IRQ_INTERNAL_BASE;
+                ext_irq_end = BCM_6358_EXT_IRQ3 - IRQ_INTERNAL_BASE;
+                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6358;
+                break;
+        case BCM6362_CPU_ID:
+                irq_stat_addr[0] += PERF_IRQSTAT_6362_REG(0);
+                irq_mask_addr[0] += PERF_IRQMASK_6362_REG(0);
+                irq_stat_addr[1] += PERF_IRQSTAT_6362_REG(1);
+                irq_mask_addr[1] += PERF_IRQMASK_6362_REG(1);
+                irq_bits = 64;
+                ext_irq_count = 4;
+                is_ext_irq_cascaded = 1;
+                ext_irq_start = BCM_6362_EXT_IRQ0 - IRQ_INTERNAL_BASE;
+                ext_irq_end = BCM_6362_EXT_IRQ3 - IRQ_INTERNAL_BASE;
+                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6362;
+                break;
+        case BCM6368_CPU_ID:
+                irq_stat_addr[0] += PERF_IRQSTAT_6368_REG(0);
+                irq_mask_addr[0] += PERF_IRQMASK_6368_REG(0);
+                irq_stat_addr[1] += PERF_IRQSTAT_6368_REG(1);
+                irq_mask_addr[1] += PERF_IRQMASK_6368_REG(1);
+                irq_bits = 64;
+                ext_irq_count = 6;
+                is_ext_irq_cascaded = 1;
+                ext_irq_start = BCM_6368_EXT_IRQ0 - IRQ_INTERNAL_BASE;
+                ext_irq_end = BCM_6368_EXT_IRQ5 - IRQ_INTERNAL_BASE;
+                ext_irq_cfg_reg1 = PERF_EXTIRQ_CFG_REG_6368;
+                ext_irq_cfg_reg2 = PERF_EXTIRQ_CFG_REG2_6368;
+                break;
+        default:
+                BUG();
+        }
+
+        if (irq_bits == 32) {
+                dispatch_internal = __dispatch_internal_32;
+                internal_irq_mask = __internal_irq_mask_32;
+                internal_irq_unmask = __internal_irq_unmask_32;
+        } else {
+                dispatch_internal = __dispatch_internal_64;
+                internal_irq_mask = __internal_irq_mask_64;
+                internal_irq_unmask = __internal_irq_unmask_64;
+        }
+}
+
 void __init arch_init_irq(void)
 {
         int i;
@@ -580,4 +550,14 @@ void __init arch_init_irq(void)
         }
 
         setup_irq(MIPS_CPU_IRQ_BASE + 2, &cpu_ip2_cascade_action);
+#ifdef CONFIG_SMP
+        if (is_ext_irq_cascaded) {
+                setup_irq(MIPS_CPU_IRQ_BASE + 3, &cpu_ip3_cascade_action);
+                bcm63xx_internal_irq_chip.irq_set_affinity =
+                        bcm63xx_internal_set_affinity;
+
+                cpumask_clear(irq_default_affinity);
+                cpumask_set_cpu(smp_processor_id(), irq_default_affinity);
+        }
+#endif
 }
diff --git a/arch/mips/bcm63xx/reset.c b/arch/mips/bcm63xx/reset.c
index acbeb1fe7c57..d1fe51edf5e6 100644
--- a/arch/mips/bcm63xx/reset.c
+++ b/arch/mips/bcm63xx/reset.c
@@ -125,8 +125,6 @@
 #define BCM6368_RESET_PCIE      0
 #define BCM6368_RESET_PCIE_EXT  0
 
-#ifdef BCMCPU_RUNTIME_DETECT
-
 /*
  * core reset bits
  */
@@ -188,64 +186,6 @@ static int __init bcm63xx_reset_bits_init(void)
 
         return 0;
 }
-#else
-
-#ifdef CONFIG_BCM63XX_CPU_3368
-static const u32 bcm63xx_reset_bits[] = {
-        __GEN_RESET_BITS_TABLE(3368)
-};
-#define reset_reg PERF_SOFTRESET_6358_REG
-#endif
-
-#ifdef CONFIG_BCM63XX_CPU_6328
-static const u32 bcm63xx_reset_bits[] = {
-        __GEN_RESET_BITS_TABLE(6328)
-};
-#define reset_reg PERF_SOFTRESET_6328_REG
-#endif
-
-#ifdef CONFIG_BCM63XX_CPU_6338
-static const u32 bcm63xx_reset_bits[] = {
-        __GEN_RESET_BITS_TABLE(6338)
-};
-#define reset_reg PERF_SOFTRESET_REG
-#endif
-
-#ifdef CONFIG_BCM63XX_CPU_6345
-static const u32 bcm63xx_reset_bits[] = { };
-#define reset_reg 0
-#endif
-
-#ifdef CONFIG_BCM63XX_CPU_6348
-static const u32 bcm63xx_reset_bits[] = {
-        __GEN_RESET_BITS_TABLE(6348)
-};
-#define reset_reg PERF_SOFTRESET_REG
-#endif
-
-#ifdef CONFIG_BCM63XX_CPU_6358
-static const u32 bcm63xx_reset_bits[] = {
-        __GEN_RESET_BITS_TABLE(6358)
-};
-#define reset_reg PERF_SOFTRESET_6358_REG
-#endif
-
-#ifdef CONFIG_BCM63XX_CPU_6362
-static const u32 bcm63xx_reset_bits[] = {
-        __GEN_RESET_BITS_TABLE(6362)
-};
-#define reset_reg PERF_SOFTRESET_6362_REG
-#endif
-
-#ifdef CONFIG_BCM63XX_CPU_6368
-static const u32 bcm63xx_reset_bits[] = {
-        __GEN_RESET_BITS_TABLE(6368)
-};
-#define reset_reg PERF_SOFTRESET_6368_REG
-#endif
-
-static int __init bcm63xx_reset_bits_init(void) { return 0; }
-#endif
 
 static DEFINE_SPINLOCK(reset_mutex);
 
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c
index c00c4ddf4514..b49c7adbfa89 100644
--- a/arch/mips/boot/compressed/decompress.c
+++ b/arch/mips/boot/compressed/decompress.c
@@ -67,10 +67,24 @@ void error(char *x)
 #include "../../../../lib/decompress_unxz.c"
 #endif
 
+unsigned long __stack_chk_guard;
+
+void __stack_chk_guard_setup(void)
+{
+        __stack_chk_guard = 0x000a0dff;
+}
+
+void __stack_chk_fail(void)
+{
+        error("stack-protector: Kernel stack is corrupted\n");
+}
+
 void decompress_kernel(unsigned long boot_heap_start)
 {
         unsigned long zimage_start, zimage_size;
 
+        __stack_chk_guard_setup();
+
         zimage_start = (unsigned long)(&__image_begin);
         zimage_size = (unsigned long)(&__image_end) -
             (unsigned long)(&__image_begin);
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
index b764df64be40..5dfef84b9576 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
@@ -186,6 +186,15 @@ int cvmx_helper_board_get_mii_address(int ipd_port)
                         return 7 - ipd_port;
                 else
                         return -1;
+        case CVMX_BOARD_TYPE_CUST_DSR1000N:
+                /*
+                 * Port 2 connects to Broadcom PHY (B5081). Other ports (0-1)
+                 * connect to a switch (BCM53115).
+                 */
+                if (ipd_port == 2)
+                        return 8;
+                else
+                        return -1;
         }
 
         /* Some unknown board. Somebody forgot to update this function... */
@@ -274,6 +283,18 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port)
                         return result;
                 }
                 break;
+        case CVMX_BOARD_TYPE_CUST_DSR1000N:
+                if (ipd_port == 0 || ipd_port == 1) {
+                        /* Ports 0 and 1 connect to a switch (BCM53115). */
+                        result.s.link_up = 1;
+                        result.s.full_duplex = 1;
+                        result.s.speed = 1000;
+                        return result;
+                } else {
+                        /* Port 2 uses a Broadcom PHY (B5081). */
+                        is_broadcom_phy = 1;
+                }
+                break;
         }
 
         phy_addr = cvmx_helper_board_get_mii_address(ipd_port);
@@ -738,6 +759,7 @@ enum cvmx_helper_board_usb_clock_types __cvmx_helper_board_usb_get_clock_type(vo
         case CVMX_BOARD_TYPE_LANAI2_G:
         case CVMX_BOARD_TYPE_NIC10E_66:
         case CVMX_BOARD_TYPE_UBNT_E100:
+        case CVMX_BOARD_TYPE_CUST_DSR1000N:
                 return USB_CLOCK_TYPE_CRYSTAL_12;
         case CVMX_BOARD_TYPE_NIC10E:
                 return USB_CLOCK_TYPE_REF_12;
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c b/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
index 45f18cce31a9..6f9609e63a65 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
@@ -317,10 +317,14 @@ static int __cvmx_helper_sgmii_hardware_init(int interface, int num_ports)
         for (index = 0; index < num_ports; index++) {
                 int ipd_port = cvmx_helper_get_ipd_port(interface, index);
                 __cvmx_helper_sgmii_hardware_init_one_time(interface, index);
-                __cvmx_helper_sgmii_link_set(ipd_port,
-                                             __cvmx_helper_sgmii_link_get
-                                             (ipd_port));
-
+                /* Linux kernel driver will call ....link_set with the
+                 * proper link state. In the simulator there is no
+                 * link state polling and hence it is set from
+                 * here.
+                 */
+                if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_SIM)
+                        __cvmx_helper_sgmii_link_set(ipd_port,
+                                       __cvmx_helper_sgmii_link_get(ipd_port));
         }
 
         return 0;
diff --git a/arch/mips/cavium-octeon/oct_ilm.c b/arch/mips/cavium-octeon/oct_ilm.c
index 71b213dbb621..2d68a39f1443 100644
--- a/arch/mips/cavium-octeon/oct_ilm.c
+++ b/arch/mips/cavium-octeon/oct_ilm.c
@@ -194,8 +194,7 @@ err_irq:
 static __exit void oct_ilm_module_exit(void)
 {
         disable_timer(TIMER_NUM);
-        if (dir)
-                debugfs_remove_recursive(dir);
+        debugfs_remove_recursive(dir);
         free_irq(OCTEON_IRQ_TIMER0 + TIMER_NUM, 0);
 }
 
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index a7b3ae104d8c..ecd903dd1c45 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -84,9 +84,14 @@ static void octeon_smp_hotplug_setup(void)
 #ifdef CONFIG_HOTPLUG_CPU
         struct linux_app_boot_info *labi;
 
+        if (!setup_max_cpus)
+                return;
+
         labi = (struct linux_app_boot_info *)PHYS_TO_XKSEG_CACHED(LABI_ADDR_IN_BOOTLOADER);
-        if (labi->labi_signature != LABI_SIGNATURE)
-                panic("The bootloader version on this board is incorrect.");
+        if (labi->labi_signature != LABI_SIGNATURE) {
+                pr_info("The bootloader on this board does not support HOTPLUG_CPU.");
+                return;
+        }
 
         octeon_bootloader_entry_addr = labi->InitTLBStart_addr;
 #endif
@@ -129,7 +134,8 @@ static void octeon_smp_setup(void)
          * will assign CPU numbers for possible cores as well.  Cores
          * are always consecutively numberd from 0.
          */
-        for (id = 0; id < num_cores && id < NR_CPUS; id++) {
+        for (id = 0; setup_max_cpus && octeon_bootloader_entry_addr &&
+                     id < num_cores && id < NR_CPUS; id++) {
                 if (!(core_mask & (1 << id))) {
                         set_cpu_possible(cpus, true);
                         __cpu_number_map[id] = cpus;
@@ -192,14 +198,6 @@ static void octeon_init_secondary(void)
  */
 void octeon_prepare_cpus(unsigned int max_cpus)
 {
-#ifdef CONFIG_HOTPLUG_CPU
-        struct linux_app_boot_info *labi;
-
-        labi = (struct linux_app_boot_info *)PHYS_TO_XKSEG_CACHED(LABI_ADDR_IN_BOOTLOADER);
-
-        if (labi->labi_signature != LABI_SIGNATURE)
-                panic("The bootloader version on this board is incorrect.");
-#endif
         /*
          * Only the low order mailbox bits are used for IPIs, leave
          * the other bits alone.
@@ -237,6 +235,9 @@ static int octeon_cpu_disable(void)
         if (cpu == 0)
                 return -EBUSY;
 
+        if (!octeon_bootloader_entry_addr)
+                return -ENOTSUPP;
+
         set_cpu_online(cpu, false);
         cpu_clear(cpu, cpu_callin_map);
         local_irq_disable();
diff --git a/arch/mips/configs/cavium_octeon_defconfig b/arch/mips/configs/cavium_octeon_defconfig
index dace58268ce1..b2476a1c4aaa 100644
--- a/arch/mips/configs/cavium_octeon_defconfig
+++ b/arch/mips/configs/cavium_octeon_defconfig
@@ -124,7 +124,6 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_STAGING=y
 CONFIG_OCTEON_ETHERNET=y
-# CONFIG_NET_VENDOR_SILICOM is not set
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig
index a64b30b96a0d..46e8f7676a15 100644
--- a/arch/mips/configs/db1xxx_defconfig
+++ b/arch/mips/configs/db1xxx_defconfig
@@ -116,7 +116,6 @@ CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=y
-CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_MULTI_LUN=y
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 87d0340837aa..ebc011c51e5a 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -45,7 +45,6 @@ CONFIG_VLAN_8021Q=m
 CONFIG_CONNECTOR=m
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 936ec5a5ed8d..57ed466e00db 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -219,7 +219,6 @@ CONFIG_ATA_OVER_ETH=m
 # CONFIG_MISC_DEVICES is not set
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=y
 CONFIG_BLK_DEV_SR=y
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 0e36abcd39cc..cc0756021398 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -106,7 +106,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_ATA_OVER_ETH=m
 # CONFIG_MISC_DEVICES is not set
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=y
 CONFIG_BLK_DEV_SR=m
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index 7bbd52194fc3..70ffe9b55829 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -54,7 +54,6 @@ CONFIG_BLK_DEV_NBD=m
 CONFIG_SGI_IOC4=y
 CONFIG_RAID_ATTRS=y
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig
index 0315ee37a20b..2575302aa2be 100644
--- a/arch/mips/configs/jazz_defconfig
+++ b/arch/mips/configs/jazz_defconfig
@@ -208,7 +208,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_ATA_OVER_ETH=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig
index ea1761f0f917..4cb787ff273e 100644
--- a/arch/mips/configs/loongson3_defconfig
+++ b/arch/mips/configs/loongson3_defconfig
@@ -1,6 +1,6 @@
 CONFIG_MACH_LOONGSON=y
 CONFIG_SWIOTLB=y
-CONFIG_LEMOTE_MACH3A=y
+CONFIG_LOONGSON_MACH3X=y
 CONFIG_CPU_LOONGSON3=y
 CONFIG_64BIT=y
 CONFIG_PAGE_SIZE_16KB=y
@@ -120,7 +120,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_RAID_ATTRS=m
-CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_CHR_DEV_SG=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index b745b6a9f322..e18741ea1771 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -253,7 +253,6 @@ CONFIG_BLK_DEV_IT8213=m
 CONFIG_BLK_DEV_TC86C001=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig
index 4f7d952d8517..cf0e01f814e1 100644
--- a/arch/mips/configs/malta_kvm_defconfig
+++ b/arch/mips/configs/malta_kvm_defconfig
@@ -254,7 +254,6 @@ CONFIG_BLK_DEV_IT8213=m
 CONFIG_BLK_DEV_TC86C001=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/mips/configs/malta_kvm_guest_defconfig b/arch/mips/configs/malta_kvm_guest_defconfig
index e36681c24ddc..edd9ec9cb678 100644
--- a/arch/mips/configs/malta_kvm_guest_defconfig
+++ b/arch/mips/configs/malta_kvm_guest_defconfig
@@ -254,7 +254,6 @@ CONFIG_BLK_DEV_IT8213=m
 CONFIG_BLK_DEV_TC86C001=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
diff --git a/arch/mips/configs/markeins_defconfig b/arch/mips/configs/markeins_defconfig
index 4c2c0c4b9bb1..0f08e4623ee4 100644
--- a/arch/mips/configs/markeins_defconfig
+++ b/arch/mips/configs/markeins_defconfig
@@ -134,7 +134,6 @@ CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_SGI_IOC4=m
 CONFIG_SCSI=m
-CONFIG_SCSI_TGT=m
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=m
 CONFIG_CHR_DEV_SG=m
diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig
index 5468b1c7b2a5..2f660e9a0da6 100644
--- a/arch/mips/configs/nlm_xlp_defconfig
+++ b/arch/mips/configs/nlm_xlp_defconfig
@@ -334,7 +334,6 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_CDROM_PKTCDVD=y
 CONFIG_RAID_ATTRS=m
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
@@ -346,10 +345,8 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_TGT_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_ISCSI_TCP=m
 CONFIG_LIBFCOE=m
 CONFIG_SCSI_DEBUG=m
diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig
index 44b473420d51..c6f84655c98a 100644
--- a/arch/mips/configs/nlm_xlr_defconfig
+++ b/arch/mips/configs/nlm_xlr_defconfig
@@ -311,7 +311,6 @@ CONFIG_CDROM_PKTCDVD=y
 CONFIG_MISC_DEVICES=y
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
@@ -323,10 +322,8 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_TGT_ATTRS=y
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_ISCSI_TCP=m
 CONFIG_LIBFCOE=m
 CONFIG_SCSI_DEBUG=m
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 73e7bf49461c..29d79ae8a823 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -221,7 +221,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_SGI_IOC4=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=m
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index d99b1905a1ba..9327b3af32cd 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -39,7 +39,6 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_XIP=y
 # CONFIG_MISC_DEVICES is not set
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_SCAN_ASYNC=y
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index c415c4f0e5c2..a967289b7970 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -44,7 +44,6 @@ CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_XIP=y
 # CONFIG_MISC_DEVICES is not set
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_SCAN_ASYNC=y
 # CONFIG_SCSI_LOWLEVEL is not set
diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index 05439187891d..335e5290ec75 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -15,4 +15,5 @@ generic-y += segment.h
 generic-y += serial.h
 generic-y += trace_clock.h
 generic-y += ucontext.h
+generic-y += user.h
 generic-y += xor.h
diff --git a/arch/mips/include/asm/abi.h b/arch/mips/include/asm/abi.h
index 909bb6984866..7186bb51b89b 100644
--- a/arch/mips/include/asm/abi.h
+++ b/arch/mips/include/asm/abi.h
@@ -13,13 +13,11 @@
 #include <asm/siginfo.h>
 
 struct mips_abi {
-        int (* const setup_frame)(void *sig_return, struct k_sigaction *ka,
-                                  struct pt_regs *regs, int signr,
-                                  sigset_t *set);
+        int (* const setup_frame)(void *sig_return, struct ksignal *ksig,
+                                  struct pt_regs *regs, sigset_t *set);
         const unsigned long     signal_return_offset;
-        int (* const setup_rt_frame)(void *sig_return, struct k_sigaction *ka,
-                               struct pt_regs *regs, int signr,
-                               sigset_t *set, siginfo_t *info);
+        int (* const setup_rt_frame)(void *sig_return, struct ksignal *ksig,
+                                     struct pt_regs *regs, sigset_t *set);
         const unsigned long     rt_signal_return_offset;
         const unsigned long     restart;
 };
diff --git a/arch/mips/include/asm/addrspace.h b/arch/mips/include/asm/addrspace.h
index 3f745459fdb5..3b0e51d5a613 100644
--- a/arch/mips/include/asm/addrspace.h
+++ b/arch/mips/include/asm/addrspace.h
@@ -52,7 +52,7 @@
  */
 #define CPHYSADDR(a)            ((_ACAST32_(a)) & 0x1fffffff)
 #define XPHYSADDR(a)            ((_ACAST64_(a)) &                       \
-                                 _CONST64_(0x000000ffffffffff))
+                                 _CONST64_(0x0000ffffffffffff))
 
 #ifdef CONFIG_64BIT
 
diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
index 935543f14538..cd9a98bc8f60 100644
--- a/arch/mips/include/asm/asmmacro.h
+++ b/arch/mips/include/asm/asmmacro.h
@@ -10,6 +10,7 @@
 
 #include <asm/hazards.h>
 #include <asm/asm-offsets.h>
+#include <asm/msa.h>
 
 #ifdef CONFIG_32BIT
 #include <asm/asmmacro-32.h>
@@ -378,9 +379,19 @@
         st_d    29, THREAD_FPR29, \thread
         st_d    30, THREAD_FPR30, \thread
         st_d    31, THREAD_FPR31, \thread
+        .set    push
+        .set    noat
+        cfcmsa  $1, MSA_CSR
+        sw      $1, THREAD_MSA_CSR(\thread)
+        .set    pop
         .endm
 
         .macro  msa_restore_all thread
+        .set    push
+        .set    noat
+        lw      $1, THREAD_MSA_CSR(\thread)
+        ctcmsa  MSA_CSR, $1
+        .set    pop
         ld_d    0, THREAD_FPR0, \thread
         ld_d    1, THREAD_FPR1, \thread
         ld_d    2, THREAD_FPR2, \thread
@@ -415,4 +426,24 @@
         ld_d    31, THREAD_FPR31, \thread
         .endm
 
+        .macro  msa_init_upper wd
+#ifdef CONFIG_64BIT
+        insert_d \wd, 1
+#else
+        insert_w \wd, 2
+        insert_w \wd, 3
+#endif
+        .if     31-\wd
+        msa_init_upper  (\wd+1)
+        .endif
+        .endm
+
+        .macro  msa_init_all_upper
+        .set    push
+        .set    noat
+        not     $1, zero
+        msa_init_upper  0
+        .set    pop
+        .endm
+
 #endif /* _ASM_ASMMACRO_H */
diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h
index 7c8816f7b7c4..bae6b0fa8ab5 100644
--- a/arch/mips/include/asm/bitops.h
+++ b/arch/mips/include/asm/bitops.h
@@ -559,7 +559,13 @@ static inline int fls(int x)
         int r;
 
         if (__builtin_constant_p(cpu_has_clo_clz) && cpu_has_clo_clz) {
-                __asm__("clz %0, %1" : "=r" (x) : "r" (x));
+                __asm__(
+                "       .set    push                                    \n"
+                "       .set    mips32                                  \n"
+                "       clz     %0, %1                                  \n"
+                "       .set    pop                                     \n"
+                : "=r" (x)
+                : "r" (x));
 
                 return 32 - x;
         }
diff --git a/arch/mips/include/asm/cop2.h b/arch/mips/include/asm/cop2.h
index c1516cc0285f..d0352983b94d 100644
--- a/arch/mips/include/asm/cop2.h
+++ b/arch/mips/include/asm/cop2.h
@@ -32,6 +32,14 @@ extern void nlm_cop2_restore(struct nlm_cop2_state *);
 #define cop2_present            1
 #define cop2_lazy_restore       0
 
+#elif defined(CONFIG_CPU_LOONGSON3)
+
+#define cop2_save(r)
+#define cop2_restore(r)
+
+#define cop2_present            1
+#define cop2_lazy_restore       1
+
 #else
 
 #define cop2_present            0
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index c7d8c997d93e..e079598ae051 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -29,6 +29,15 @@
 #ifndef cpu_has_eva
 #define cpu_has_eva             (cpu_data[0].options & MIPS_CPU_EVA)
 #endif
+#ifndef cpu_has_htw
+#define cpu_has_htw             (cpu_data[0].options & MIPS_CPU_HTW)
+#endif
+#ifndef cpu_has_rixiex
+#define cpu_has_rixiex          (cpu_data[0].options & MIPS_CPU_RIXIEX)
+#endif
+#ifndef cpu_has_maar
+#define cpu_has_maar            (cpu_data[0].options & MIPS_CPU_MAAR)
+#endif
 
 /*
  * For the moment we don't consider R6000 and R8000 so we can assume that
diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h
index 47d5967ce7ef..d5f42c168001 100644
--- a/arch/mips/include/asm/cpu-info.h
+++ b/arch/mips/include/asm/cpu-info.h
@@ -44,8 +44,8 @@ struct cpuinfo_mips {
         /*
          * Capability and feature descriptor structure for MIPS CPU
          */
-        unsigned long           options;
         unsigned long           ases;
+        unsigned long long      options;
         unsigned int            udelay_val;
         unsigned int            processor_id;
         unsigned int            fpu_id;
@@ -61,6 +61,7 @@ struct cpuinfo_mips {
         struct cache_desc       scache; /* Secondary cache */
         struct cache_desc       tcache; /* Tertiary/split secondary cache */
         int                     srsets; /* Shadow register sets */
+        int                     package;/* physical package number */
         int                     core;   /* physical core number */
 #ifdef CONFIG_64BIT
         int                     vmbits; /* Virtual memory size in bits */
@@ -115,7 +116,7 @@ struct proc_cpuinfo_notifier_args {
 #ifdef CONFIG_MIPS_MT_SMP
 # define cpu_vpe_id(cpuinfo)    ((cpuinfo)->vpe_id)
 #else
-# define cpu_vpe_id(cpuinfo)    0
+# define cpu_vpe_id(cpuinfo)    ({ (void)cpuinfo; 0; })
 #endif
 
 #endif /* __ASM_CPU_INFO_H */
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 129d08701e91..dfdc77ed1839 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -233,6 +233,8 @@
 #define PRID_REV_LOONGSON2E     0x0002
 #define PRID_REV_LOONGSON2F     0x0003
 #define PRID_REV_LOONGSON3A     0x0005
+#define PRID_REV_LOONGSON3B_R1  0x0006
+#define PRID_REV_LOONGSON3B_R2  0x0007
 
 /*
  * Older processors used to encode processor version and revision in two
@@ -335,34 +337,37 @@ enum cpu_type_enum {
 /*
  * CPU Option encodings
  */
-#define MIPS_CPU_TLB            0x00000001 /* CPU has TLB */
-#define MIPS_CPU_4KEX           0x00000002 /* "R4K" exception model */
-#define MIPS_CPU_3K_CACHE       0x00000004 /* R3000-style caches */
-#define MIPS_CPU_4K_CACHE       0x00000008 /* R4000-style caches */
-#define MIPS_CPU_TX39_CACHE     0x00000010 /* TX3900-style caches */
-#define MIPS_CPU_FPU            0x00000020 /* CPU has FPU */
-#define MIPS_CPU_32FPR          0x00000040 /* 32 dbl. prec. FP registers */
-#define MIPS_CPU_COUNTER        0x00000080 /* Cycle count/compare */
-#define MIPS_CPU_WATCH          0x00000100 /* watchpoint registers */
-#define MIPS_CPU_DIVEC          0x00000200 /* dedicated interrupt vector */
-#define MIPS_CPU_VCE            0x00000400 /* virt. coherence conflict possible */
-#define MIPS_CPU_CACHE_CDEX_P   0x00000800 /* Create_Dirty_Exclusive CACHE op */
-#define MIPS_CPU_CACHE_CDEX_S   0x00001000 /* ... same for seconary cache ... */
-#define MIPS_CPU_MCHECK         0x00002000 /* Machine check exception */
-#define MIPS_CPU_EJTAG          0x00004000 /* EJTAG exception */
-#define MIPS_CPU_NOFPUEX        0x00008000 /* no FPU exception */
-#define MIPS_CPU_LLSC           0x00010000 /* CPU has ll/sc instructions */
-#define MIPS_CPU_INCLUSIVE_CACHES       0x00020000 /* P-cache subset enforced */
-#define MIPS_CPU_PREFETCH       0x00040000 /* CPU has usable prefetch */
-#define MIPS_CPU_VINT           0x00080000 /* CPU supports MIPSR2 vectored interrupts */
-#define MIPS_CPU_VEIC           0x00100000 /* CPU supports MIPSR2 external interrupt controller mode */
-#define MIPS_CPU_ULRI           0x00200000 /* CPU has ULRI feature */
-#define MIPS_CPU_PCI            0x00400000 /* CPU has Perf Ctr Int indicator */
-#define MIPS_CPU_RIXI           0x00800000 /* CPU has TLB Read/eXec Inhibit */
-#define MIPS_CPU_MICROMIPS      0x01000000 /* CPU has microMIPS capability */
-#define MIPS_CPU_TLBINV         0x02000000 /* CPU supports TLBINV/F */
-#define MIPS_CPU_SEGMENTS       0x04000000 /* CPU supports Segmentation Control registers */
-#define MIPS_CPU_EVA            0x80000000 /* CPU supports Enhanced Virtual Addressing */
+#define MIPS_CPU_TLB            0x00000001ull /* CPU has TLB */
+#define MIPS_CPU_4KEX           0x00000002ull /* "R4K" exception model */
+#define MIPS_CPU_3K_CACHE       0x00000004ull /* R3000-style caches */
+#define MIPS_CPU_4K_CACHE       0x00000008ull /* R4000-style caches */
+#define MIPS_CPU_TX39_CACHE     0x00000010ull /* TX3900-style caches */
+#define MIPS_CPU_FPU            0x00000020ull /* CPU has FPU */
+#define MIPS_CPU_32FPR          0x00000040ull /* 32 dbl. prec. FP registers */
+#define MIPS_CPU_COUNTER        0x00000080ull /* Cycle count/compare */
+#define MIPS_CPU_WATCH          0x00000100ull /* watchpoint registers */
+#define MIPS_CPU_DIVEC          0x00000200ull /* dedicated interrupt vector */
+#define MIPS_CPU_VCE            0x00000400ull /* virt. coherence conflict possible */
+#define MIPS_CPU_CACHE_CDEX_P   0x00000800ull /* Create_Dirty_Exclusive CACHE op */
+#define MIPS_CPU_CACHE_CDEX_S   0x00001000ull /* ... same for seconary cache ... */
+#define MIPS_CPU_MCHECK         0x00002000ull /* Machine check exception */
+#define MIPS_CPU_EJTAG          0x00004000ull /* EJTAG exception */
+#define MIPS_CPU_NOFPUEX        0x00008000ull /* no FPU exception */
+#define MIPS_CPU_LLSC           0x00010000ull /* CPU has ll/sc instructions */
+#define MIPS_CPU_INCLUSIVE_CACHES       0x00020000ull /* P-cache subset enforced */
+#define MIPS_CPU_PREFETCH       0x00040000ull /* CPU has usable prefetch */
+#define MIPS_CPU_VINT           0x00080000ull /* CPU supports MIPSR2 vectored interrupts */
+#define MIPS_CPU_VEIC           0x00100000ull /* CPU supports MIPSR2 external interrupt controller mode */
+#define MIPS_CPU_ULRI           0x00200000ull /* CPU has ULRI feature */
+#define MIPS_CPU_PCI            0x00400000ull /* CPU has Perf Ctr Int indicator */
+#define MIPS_CPU_RIXI           0x00800000ull /* CPU has TLB Read/eXec Inhibit */
+#define MIPS_CPU_MICROMIPS      0x01000000ull /* CPU has microMIPS capability */
+#define MIPS_CPU_TLBINV         0x02000000ull /* CPU supports TLBINV/F */
+#define MIPS_CPU_SEGMENTS       0x04000000ull /* CPU supports Segmentation Control registers */
+#define MIPS_CPU_EVA            0x80000000ull /* CPU supports Enhanced Virtual Addressing */
+#define MIPS_CPU_HTW            0x100000000ull /* CPU support Hardware Page Table Walker */
+#define MIPS_CPU_RIXIEX         0x200000000ull /* CPU has unique exception codes for {Read, Execute}-Inhibit exceptions */
+#define MIPS_CPU_MAAR           0x400000000ull /* MAAR(I) registers are present */
 
 /*
  * CPU ASE encodings
diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
index d4144056e928..1d38fe0edd2d 100644
--- a/arch/mips/include/asm/elf.h
+++ b/arch/mips/include/asm/elf.h
@@ -339,23 +339,6 @@ do {									\
 
 #endif /* CONFIG_64BIT */
 
-struct pt_regs;
-struct task_struct;
-
-extern void elf_dump_regs(elf_greg_t *, struct pt_regs *regs);
-extern int dump_task_regs(struct task_struct *, elf_gregset_t *);
-extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *);
-
-#ifndef ELF_CORE_COPY_REGS
-#define ELF_CORE_COPY_REGS(elf_regs, regs)                      \
-        elf_dump_regs((elf_greg_t *)&(elf_regs), regs);
-#endif
-#ifndef ELF_CORE_COPY_TASK_REGS
-#define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
-#endif
-#define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs)                   \
-        dump_task_fpu(tsk, elf_fpregs)
-
 #define CORE_DUMP_USE_REGSET
 #define ELF_EXEC_PAGESIZE       PAGE_SIZE
 
diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h
index a939574f8293..4d0aeda68397 100644
--- a/arch/mips/include/asm/fpu.h
+++ b/arch/mips/include/asm/fpu.h
@@ -21,6 +21,7 @@
 #include <asm/hazards.h>
 #include <asm/processor.h>
 #include <asm/current.h>
+#include <asm/msa.h>
 
 #ifdef CONFIG_MIPS_MT_FPAFF
 #include <asm/mips_mt.h>
@@ -141,13 +142,21 @@ static inline int own_fpu(int restore)
 static inline void lose_fpu(int save)
 {
         preempt_disable();
-        if (is_fpu_owner()) {
+        if (is_msa_enabled()) {
+                if (save) {
+                        save_msa(current);
+                        asm volatile("cfc1 %0, $31"
+                                : "=r"(current->thread.fpu.fcr31));
+                }
+                disable_msa();
+                clear_thread_flag(TIF_USEDMSA);
+        } else if (is_fpu_owner()) {
                 if (save)
                         _save_fp(current);
-                KSTK_STATUS(current) &= ~ST0_CU1;
-                clear_thread_flag(TIF_USEDFPU);
                 __disable_fpu();
         }
+        KSTK_STATUS(current) &= ~ST0_CU1;
+        clear_thread_flag(TIF_USEDFPU);
         preempt_enable();
 }
 
@@ -155,8 +164,6 @@ static inline int init_fpu(void)
 {
         int ret = 0;
 
-        preempt_disable();
-
         if (cpu_has_fpu) {
                 ret = __own_fpu();
                 if (!ret)
@@ -164,8 +171,6 @@ static inline int init_fpu(void)
         } else
                 fpu_emulator_init_fpu();
 
-        preempt_enable();
-
         return ret;
 }
 
diff --git a/arch/mips/include/asm/gic.h b/arch/mips/include/asm/gic.h
index 10f6a99f92c2..3f20b2111d56 100644
--- a/arch/mips/include/asm/gic.h
+++ b/arch/mips/include/asm/gic.h
@@ -14,6 +14,8 @@
 #include <linux/bitmap.h>
 #include <linux/threads.h>
 
+#include <irq.h>
+
 #undef  GICISBYTELITTLEENDIAN
 
 /* Constants */
@@ -22,8 +24,6 @@
 #define GIC_TRIG_EDGE                   1
 #define GIC_TRIG_LEVEL                  0
 
-#define GIC_NUM_INTRS                   (24 + NR_CPUS * 2)
-
 #define MSK(n) ((1 << (n)) - 1)
 #define REG32(addr)             (*(volatile unsigned int *) (addr))
 #define REG(base, offs)         REG32((unsigned long)(base) + offs##_##OFS)
@@ -43,18 +43,17 @@
 #ifdef GICISBYTELITTLEENDIAN
 #define GICREAD(reg, data)      ((data) = (reg), (data) = le32_to_cpu(data))
 #define GICWRITE(reg, data)     ((reg) = cpu_to_le32(data))
-#define GICBIS(reg, bits)                       \
-        ({unsigned int data;                    \
-                GICREAD(reg, data);             \
-                data |= bits;                   \
-                GICWRITE(reg, data);            \
-        })
-
 #else
 #define GICREAD(reg, data)      ((data) = (reg))
 #define GICWRITE(reg, data)     ((reg) = (data))
-#define GICBIS(reg, bits)       ((reg) |= (bits))
 #endif
+#define GICBIS(reg, mask, bits)                 \
+        do { u32 data;                          \
+                GICREAD((reg), data);           \
+                data &= ~(mask);                \
+                data |= ((bits) & (mask));      \
+                GICWRITE((reg), data);          \
+        } while (0)
 
 
 /* GIC Address Space */
@@ -170,13 +169,15 @@
 #define GIC_SH_SET_POLARITY_OFS         0x0100
 #define GIC_SET_POLARITY(intr, pol) \
         GICBIS(GIC_REG_ADDR(SHARED, GIC_SH_SET_POLARITY_OFS + \
-                GIC_INTR_OFS(intr)), (pol) << GIC_INTR_BIT(intr))
+                GIC_INTR_OFS(intr)), (1 << GIC_INTR_BIT(intr)), \
+                (pol) << GIC_INTR_BIT(intr))
 
 /* Triggering : Reset Value is always 0 */
 #define GIC_SH_SET_TRIGGER_OFS          0x0180
 #define GIC_SET_TRIGGER(intr, trig) \
         GICBIS(GIC_REG_ADDR(SHARED, GIC_SH_SET_TRIGGER_OFS + \
-                GIC_INTR_OFS(intr)), (trig) << GIC_INTR_BIT(intr))
+                GIC_INTR_OFS(intr)), (1 << GIC_INTR_BIT(intr)), \
+                (trig) << GIC_INTR_BIT(intr))
 
 /* Mask manipulation */
 #define GIC_SH_SMASK_OFS                0x0380
@@ -306,18 +307,6 @@
         GICWRITE(GIC_REG_ADDR(SHARED, GIC_SH_MAP_TO_VPE_REG_OFF(intr, vpe)), \
                  GIC_SH_MAP_TO_VPE_REG_BIT(vpe))
 
-struct gic_pcpu_mask {
-        DECLARE_BITMAP(pcpu_mask, GIC_NUM_INTRS);
-};
-
-struct gic_pending_regs {
-        DECLARE_BITMAP(pending, GIC_NUM_INTRS);
-};
-
-struct gic_intrmask_regs {
-        DECLARE_BITMAP(intrmask, GIC_NUM_INTRS);
-};
-
 /*
  * Interrupt Meta-data specification. The ipiflag helps
  * in building ipi_map.
@@ -329,8 +318,7 @@ struct gic_intr_map {
         unsigned int polarity;  /* Polarity : +/-       */
         unsigned int trigtype;  /* Trigger  : Edge/Levl */
         unsigned int flags;     /* Misc flags   */
-#define GIC_FLAG_IPI           0x01
-#define GIC_FLAG_TRANSPARENT   0x02
+#define GIC_FLAG_TRANSPARENT   0x01
 };
 
 /*
@@ -386,6 +374,7 @@ extern unsigned int plat_ipi_call_int_xlate(unsigned int);
 extern unsigned int plat_ipi_resched_int_xlate(unsigned int);
 extern void gic_bind_eic_interrupt(int irq, int set);
 extern unsigned int gic_get_timer_pending(void);
+extern void gic_get_int_mask(unsigned long *dst, const unsigned long *src);
 extern unsigned int gic_get_int(void);
 extern void gic_enable_interrupt(int irq_vec);
 extern void gic_disable_interrupt(int irq_vec);
diff --git a/arch/mips/include/asm/maar.h b/arch/mips/include/asm/maar.h
new file mode 100644
index 000000000000..6c62b0f899c0
--- /dev/null
+++ b/arch/mips/include/asm/maar.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2014 Imagination Technologies
+ * Author: Paul Burton <paul.burton@imgtec.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.
+ */
+
+#ifndef __MIPS_ASM_MIPS_MAAR_H__
+#define __MIPS_ASM_MIPS_MAAR_H__
+
+#include <asm/hazards.h>
+#include <asm/mipsregs.h>
+
+/**
+ * platform_maar_init() - perform platform-level MAAR configuration
+ * @num_pairs:  The number of MAAR pairs present in the system.
+ *
+ * Platforms should implement this function such that it configures as many
+ * MAAR pairs as required, from 0 up to the maximum of num_pairs-1, and returns
+ * the number that were used. Any further MAARs will be configured to be
+ * invalid. The default implementation of this function will simply indicate
+ * that it has configured 0 MAAR pairs.
+ *
+ * Return:      The number of MAAR pairs configured.
+ */
+unsigned __weak platform_maar_init(unsigned num_pairs);
+
+/**
+ * write_maar_pair() - write to a pair of MAARs
+ * @idx:        The index of the pair (ie. use MAARs idx*2 & (idx*2)+1).
+ * @lower:      The lowest address that the MAAR pair will affect. Must be
+ *              aligned to a 2^16 byte boundary.
+ * @upper:      The highest address that the MAAR pair will affect. Must be
+ *              aligned to one byte before a 2^16 byte boundary.
+ * @attrs:      The accessibility attributes to program, eg. MIPS_MAAR_S. The
+ *              MIPS_MAAR_V attribute will automatically be set.
+ *
+ * Program the pair of MAAR registers specified by idx to apply the attributes
+ * specified by attrs to the range of addresses from lower to higher.
+ */
+static inline void write_maar_pair(unsigned idx, phys_addr_t lower,
+                                   phys_addr_t upper, unsigned attrs)
+{
+        /* Addresses begin at bit 16, but are shifted right 4 bits */
+        BUG_ON(lower & (0xffff | ~(MIPS_MAAR_ADDR << 4)));
+        BUG_ON(((upper & 0xffff) != 0xffff)
+                || ((upper & ~0xffffull) & ~(MIPS_MAAR_ADDR << 4)));
+
+        /* Automatically set MIPS_MAAR_V */
+        attrs |= MIPS_MAAR_V;
+
+        /* Write the upper address & attributes (only MIPS_MAAR_V matters) */
+        write_c0_maari(idx << 1);
+        back_to_back_c0_hazard();
+        write_c0_maar(((upper >> 4) & MIPS_MAAR_ADDR) | attrs);
+        back_to_back_c0_hazard();
+
+        /* Write the lower address & attributes */
+        write_c0_maari((idx << 1) | 0x1);
+        back_to_back_c0_hazard();
+        write_c0_maar((lower >> 4) | attrs);
+        back_to_back_c0_hazard();
+}
+
+/**
+ * struct maar_config - MAAR configuration data
+ * @lower:      The lowest address that the MAAR pair will affect. Must be
+ *              aligned to a 2^16 byte boundary.
+ * @upper:      The highest address that the MAAR pair will affect. Must be
+ *              aligned to one byte before a 2^16 byte boundary.
+ * @attrs:      The accessibility attributes to program, eg. MIPS_MAAR_S. The
+ *              MIPS_MAAR_V attribute will automatically be set.
+ *
+ * Describes the configuration of a pair of Memory Accessibility Attribute
+ * Registers - applying attributes from attrs to the range of physical
+ * addresses from lower to upper inclusive.
+ */
+struct maar_config {
+        phys_addr_t lower;
+        phys_addr_t upper;
+        unsigned attrs;
+};
+
+/**
+ * maar_config() - configure MAARs according to provided data
+ * @cfg:        Pointer to an array of struct maar_config.
+ * @num_cfg:    The number of structs in the cfg array.
+ * @num_pairs:  The number of MAAR pairs present in the system.
+ *
+ * Configures as many MAARs as are present and specified in the cfg
+ * array with the values taken from the cfg array.
+ *
+ * Return:      The number of MAAR pairs configured.
+ */
+static inline unsigned maar_config(const struct maar_config *cfg,
+                                   unsigned num_cfg, unsigned num_pairs)
+{
+        unsigned i;
+
+        for (i = 0; i < min(num_cfg, num_pairs); i++)
+                write_maar_pair(i, cfg[i].lower, cfg[i].upper, cfg[i].attrs);
+
+        return i;
+}
+
+#endif /* __MIPS_ASM_MIPS_MAAR_H__ */
diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h
index b4c3ecb17d48..a7eec3364a64 100644
--- a/arch/mips/include/asm/mach-au1x00/au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/au1000.h
@@ -34,6 +34,558 @@
 #ifndef _AU1000_H_
 #define _AU1000_H_
 
+/* SOC Interrupt numbers */
+/* Au1000-style (IC0/1): 2 controllers with 32 sources each */
+#define AU1000_INTC0_INT_BASE   (MIPS_CPU_IRQ_BASE + 8)
+#define AU1000_INTC0_INT_LAST   (AU1000_INTC0_INT_BASE + 31)
+#define AU1000_INTC1_INT_BASE   (AU1000_INTC0_INT_LAST + 1)
+#define AU1000_INTC1_INT_LAST   (AU1000_INTC1_INT_BASE + 31)
+#define AU1000_MAX_INTR         AU1000_INTC1_INT_LAST
+
+/* Au1300-style (GPIC): 1 controller with up to 128 sources */
+#define ALCHEMY_GPIC_INT_BASE   (MIPS_CPU_IRQ_BASE + 8)
+#define ALCHEMY_GPIC_INT_NUM    128
+#define ALCHEMY_GPIC_INT_LAST   (ALCHEMY_GPIC_INT_BASE + ALCHEMY_GPIC_INT_NUM - 1)
+
+/* common clock names, shared among all variants. AUXPLL2 is Au1300 */
+#define ALCHEMY_ROOT_CLK                "root_clk"
+#define ALCHEMY_CPU_CLK                 "cpu_clk"
+#define ALCHEMY_AUXPLL_CLK              "auxpll_clk"
+#define ALCHEMY_AUXPLL2_CLK             "auxpll2_clk"
+#define ALCHEMY_SYSBUS_CLK              "sysbus_clk"
+#define ALCHEMY_PERIPH_CLK              "periph_clk"
+#define ALCHEMY_MEM_CLK                 "mem_clk"
+#define ALCHEMY_LR_CLK                  "lr_clk"
+#define ALCHEMY_FG0_CLK                 "fg0_clk"
+#define ALCHEMY_FG1_CLK                 "fg1_clk"
+#define ALCHEMY_FG2_CLK                 "fg2_clk"
+#define ALCHEMY_FG3_CLK                 "fg3_clk"
+#define ALCHEMY_FG4_CLK                 "fg4_clk"
+#define ALCHEMY_FG5_CLK                 "fg5_clk"
+
+/* Au1300 peripheral interrupt numbers */
+#define AU1300_FIRST_INT        (ALCHEMY_GPIC_INT_BASE)
+#define AU1300_UART1_INT        (AU1300_FIRST_INT + 17)
+#define AU1300_UART2_INT        (AU1300_FIRST_INT + 25)
+#define AU1300_UART3_INT        (AU1300_FIRST_INT + 27)
+#define AU1300_SD1_INT          (AU1300_FIRST_INT + 32)
+#define AU1300_SD2_INT          (AU1300_FIRST_INT + 38)
+#define AU1300_PSC0_INT         (AU1300_FIRST_INT + 48)
+#define AU1300_PSC1_INT         (AU1300_FIRST_INT + 52)
+#define AU1300_PSC2_INT         (AU1300_FIRST_INT + 56)
+#define AU1300_PSC3_INT         (AU1300_FIRST_INT + 60)
+#define AU1300_NAND_INT         (AU1300_FIRST_INT + 62)
+#define AU1300_DDMA_INT         (AU1300_FIRST_INT + 75)
+#define AU1300_MMU_INT          (AU1300_FIRST_INT + 76)
+#define AU1300_MPU_INT          (AU1300_FIRST_INT + 77)
+#define AU1300_GPU_INT          (AU1300_FIRST_INT + 78)
+#define AU1300_UDMA_INT         (AU1300_FIRST_INT + 79)
+#define AU1300_TOY_INT          (AU1300_FIRST_INT + 80)
+#define AU1300_TOY_MATCH0_INT   (AU1300_FIRST_INT + 81)
+#define AU1300_TOY_MATCH1_INT   (AU1300_FIRST_INT + 82)
+#define AU1300_TOY_MATCH2_INT   (AU1300_FIRST_INT + 83)
+#define AU1300_RTC_INT          (AU1300_FIRST_INT + 84)
+#define AU1300_RTC_MATCH0_INT   (AU1300_FIRST_INT + 85)
+#define AU1300_RTC_MATCH1_INT   (AU1300_FIRST_INT + 86)
+#define AU1300_RTC_MATCH2_INT   (AU1300_FIRST_INT + 87)
+#define AU1300_UART0_INT        (AU1300_FIRST_INT + 88)
+#define AU1300_SD0_INT          (AU1300_FIRST_INT + 89)
+#define AU1300_USB_INT          (AU1300_FIRST_INT + 90)
+#define AU1300_LCD_INT          (AU1300_FIRST_INT + 91)
+#define AU1300_BSA_INT          (AU1300_FIRST_INT + 92)
+#define AU1300_MPE_INT          (AU1300_FIRST_INT + 93)
+#define AU1300_ITE_INT          (AU1300_FIRST_INT + 94)
+#define AU1300_AES_INT          (AU1300_FIRST_INT + 95)
+#define AU1300_CIM_INT          (AU1300_FIRST_INT + 96)
+
+/**********************************************************************/
+
+/*
+ * Physical base addresses for integrated peripherals
+ * 0..au1000 1..au1500 2..au1100 3..au1550 4..au1200 5..au1300
+ */
+
+#define AU1000_AC97_PHYS_ADDR           0x10000000 /* 012 */
+#define AU1300_ROM_PHYS_ADDR            0x10000000 /* 5 */
+#define AU1300_OTP_PHYS_ADDR            0x10002000 /* 5 */
+#define AU1300_VSS_PHYS_ADDR            0x10003000 /* 5 */
+#define AU1300_UART0_PHYS_ADDR          0x10100000 /* 5 */
+#define AU1300_UART1_PHYS_ADDR          0x10101000 /* 5 */
+#define AU1300_UART2_PHYS_ADDR          0x10102000 /* 5 */
+#define AU1300_UART3_PHYS_ADDR          0x10103000 /* 5 */
+#define AU1000_USB_OHCI_PHYS_ADDR       0x10100000 /* 012 */
+#define AU1000_USB_UDC_PHYS_ADDR        0x10200000 /* 0123 */
+#define AU1300_GPIC_PHYS_ADDR           0x10200000 /* 5 */
+#define AU1000_IRDA_PHYS_ADDR           0x10300000 /* 02 */
+#define AU1200_AES_PHYS_ADDR            0x10300000 /* 45 */
+#define AU1000_IC0_PHYS_ADDR            0x10400000 /* 01234 */
+#define AU1300_GPU_PHYS_ADDR            0x10500000 /* 5 */
+#define AU1000_MAC0_PHYS_ADDR           0x10500000 /* 023 */
+#define AU1000_MAC1_PHYS_ADDR           0x10510000 /* 023 */
+#define AU1000_MACEN_PHYS_ADDR          0x10520000 /* 023 */
+#define AU1100_SD0_PHYS_ADDR            0x10600000 /* 245 */
+#define AU1300_SD1_PHYS_ADDR            0x10601000 /* 5 */
+#define AU1300_SD2_PHYS_ADDR            0x10602000 /* 5 */
+#define AU1100_SD1_PHYS_ADDR            0x10680000 /* 24 */
+#define AU1300_SYS_PHYS_ADDR            0x10900000 /* 5 */
+#define AU1550_PSC2_PHYS_ADDR           0x10A00000 /* 3 */
+#define AU1550_PSC3_PHYS_ADDR           0x10B00000 /* 3 */
+#define AU1300_PSC0_PHYS_ADDR           0x10A00000 /* 5 */
+#define AU1300_PSC1_PHYS_ADDR           0x10A01000 /* 5 */
+#define AU1300_PSC2_PHYS_ADDR           0x10A02000 /* 5 */
+#define AU1300_PSC3_PHYS_ADDR           0x10A03000 /* 5 */
+#define AU1000_I2S_PHYS_ADDR            0x11000000 /* 02 */
+#define AU1500_MAC0_PHYS_ADDR           0x11500000 /* 1 */
+#define AU1500_MAC1_PHYS_ADDR           0x11510000 /* 1 */
+#define AU1500_MACEN_PHYS_ADDR          0x11520000 /* 1 */
+#define AU1000_UART0_PHYS_ADDR          0x11100000 /* 01234 */
+#define AU1200_SWCNT_PHYS_ADDR          0x1110010C /* 4 */
+#define AU1000_UART1_PHYS_ADDR          0x11200000 /* 0234 */
+#define AU1000_UART2_PHYS_ADDR          0x11300000 /* 0 */
+#define AU1000_UART3_PHYS_ADDR          0x11400000 /* 0123 */
+#define AU1000_SSI0_PHYS_ADDR           0x11600000 /* 02 */
+#define AU1000_SSI1_PHYS_ADDR           0x11680000 /* 02 */
+#define AU1500_GPIO2_PHYS_ADDR          0x11700000 /* 1234 */
+#define AU1000_IC1_PHYS_ADDR            0x11800000 /* 01234 */
+#define AU1000_SYS_PHYS_ADDR            0x11900000 /* 012345 */
+#define AU1550_PSC0_PHYS_ADDR           0x11A00000 /* 34 */
+#define AU1550_PSC1_PHYS_ADDR           0x11B00000 /* 34 */
+#define AU1000_MEM_PHYS_ADDR            0x14000000 /* 01234 */
+#define AU1000_STATIC_MEM_PHYS_ADDR     0x14001000 /* 01234 */
+#define AU1300_UDMA_PHYS_ADDR           0x14001800 /* 5 */
+#define AU1000_DMA_PHYS_ADDR            0x14002000 /* 012 */
+#define AU1550_DBDMA_PHYS_ADDR          0x14002000 /* 345 */
+#define AU1550_DBDMA_CONF_PHYS_ADDR     0x14003000 /* 345 */
+#define AU1000_MACDMA0_PHYS_ADDR        0x14004000 /* 0123 */
+#define AU1000_MACDMA1_PHYS_ADDR        0x14004200 /* 0123 */
+#define AU1200_CIM_PHYS_ADDR            0x14004000 /* 45 */
+#define AU1500_PCI_PHYS_ADDR            0x14005000 /* 13 */
+#define AU1550_PE_PHYS_ADDR             0x14008000 /* 3 */
+#define AU1200_MAEBE_PHYS_ADDR          0x14010000 /* 4 */
+#define AU1200_MAEFE_PHYS_ADDR          0x14012000 /* 4 */
+#define AU1300_MAEITE_PHYS_ADDR         0x14010000 /* 5 */
+#define AU1300_MAEMPE_PHYS_ADDR         0x14014000 /* 5 */
+#define AU1550_USB_OHCI_PHYS_ADDR       0x14020000 /* 3 */
+#define AU1200_USB_CTL_PHYS_ADDR        0x14020000 /* 4 */
+#define AU1200_USB_OTG_PHYS_ADDR        0x14020020 /* 4 */
+#define AU1200_USB_OHCI_PHYS_ADDR       0x14020100 /* 4 */
+#define AU1200_USB_EHCI_PHYS_ADDR       0x14020200 /* 4 */
+#define AU1200_USB_UDC_PHYS_ADDR        0x14022000 /* 4 */
+#define AU1300_USB_EHCI_PHYS_ADDR       0x14020000 /* 5 */
+#define AU1300_USB_OHCI0_PHYS_ADDR      0x14020400 /* 5 */
+#define AU1300_USB_OHCI1_PHYS_ADDR      0x14020800 /* 5 */
+#define AU1300_USB_CTL_PHYS_ADDR        0x14021000 /* 5 */
+#define AU1300_USB_OTG_PHYS_ADDR        0x14022000 /* 5 */
+#define AU1300_MAEBSA_PHYS_ADDR         0x14030000 /* 5 */
+#define AU1100_LCD_PHYS_ADDR            0x15000000 /* 2 */
+#define AU1200_LCD_PHYS_ADDR            0x15000000 /* 45 */
+#define AU1500_PCI_MEM_PHYS_ADDR        0x400000000ULL /* 13 */
+#define AU1500_PCI_IO_PHYS_ADDR         0x500000000ULL /* 13 */
+#define AU1500_PCI_CONFIG0_PHYS_ADDR    0x600000000ULL /* 13 */
+#define AU1500_PCI_CONFIG1_PHYS_ADDR    0x680000000ULL /* 13 */
+#define AU1000_PCMCIA_IO_PHYS_ADDR      0xF00000000ULL /* 012345 */
+#define AU1000_PCMCIA_ATTR_PHYS_ADDR    0xF40000000ULL /* 012345 */
+#define AU1000_PCMCIA_MEM_PHYS_ADDR     0xF80000000ULL /* 012345 */
+
+/**********************************************************************/
+
+
+/*
+ * Au1300 GPIO+INT controller (GPIC) register offsets and bits
+ * Registers are 128bits (0x10 bytes), divided into 4 "banks".
+ */
+#define AU1300_GPIC_PINVAL      0x0000
+#define AU1300_GPIC_PINVALCLR   0x0010
+#define AU1300_GPIC_IPEND       0x0020
+#define AU1300_GPIC_PRIENC      0x0030
+#define AU1300_GPIC_IEN         0x0040  /* int_mask in manual */
+#define AU1300_GPIC_IDIS        0x0050  /* int_maskclr in manual */
+#define AU1300_GPIC_DMASEL      0x0060
+#define AU1300_GPIC_DEVSEL      0x0080
+#define AU1300_GPIC_DEVCLR      0x0090
+#define AU1300_GPIC_RSTVAL      0x00a0
+/* pin configuration space. one 32bit register for up to 128 IRQs */
+#define AU1300_GPIC_PINCFG      0x1000
+
+#define GPIC_GPIO_TO_BIT(gpio)  \
+        (1 << ((gpio) & 0x1f))
+
+#define GPIC_GPIO_BANKOFF(gpio) \
+        (((gpio) >> 5) * 4)
+
+/* Pin Control bits: who owns the pin, what does it do */
+#define GPIC_CFG_PC_GPIN                0
+#define GPIC_CFG_PC_DEV                 1
+#define GPIC_CFG_PC_GPOLOW              2
+#define GPIC_CFG_PC_GPOHIGH             3
+#define GPIC_CFG_PC_MASK                3
+
+/* assign pin to MIPS IRQ line */
+#define GPIC_CFG_IL_SET(x)      (((x) & 3) << 2)
+#define GPIC_CFG_IL_MASK        (3 << 2)
+
+/* pin interrupt type setup */
+#define GPIC_CFG_IC_OFF         (0 << 4)
+#define GPIC_CFG_IC_LEVEL_LOW   (1 << 4)
+#define GPIC_CFG_IC_LEVEL_HIGH  (2 << 4)
+#define GPIC_CFG_IC_EDGE_FALL   (5 << 4)
+#define GPIC_CFG_IC_EDGE_RISE   (6 << 4)
+#define GPIC_CFG_IC_EDGE_BOTH   (7 << 4)
+#define GPIC_CFG_IC_MASK        (7 << 4)
+
+/* allow interrupt to wake cpu from 'wait' */
+#define GPIC_CFG_IDLEWAKE       (1 << 7)
+
+/***********************************************************************/
+
+/* Au1000 SDRAM memory controller register offsets */
+#define AU1000_MEM_SDMODE0              0x0000
+#define AU1000_MEM_SDMODE1              0x0004
+#define AU1000_MEM_SDMODE2              0x0008
+#define AU1000_MEM_SDADDR0              0x000C
+#define AU1000_MEM_SDADDR1              0x0010
+#define AU1000_MEM_SDADDR2              0x0014
+#define AU1000_MEM_SDREFCFG             0x0018
+#define AU1000_MEM_SDPRECMD             0x001C
+#define AU1000_MEM_SDAUTOREF            0x0020
+#define AU1000_MEM_SDWRMD0              0x0024
+#define AU1000_MEM_SDWRMD1              0x0028
+#define AU1000_MEM_SDWRMD2              0x002C
+#define AU1000_MEM_SDSLEEP              0x0030
+#define AU1000_MEM_SDSMCKE              0x0034
+
+/* MEM_SDMODE register content definitions */
+#define MEM_SDMODE_F            (1 << 22)
+#define MEM_SDMODE_SR           (1 << 21)
+#define MEM_SDMODE_BS           (1 << 20)
+#define MEM_SDMODE_RS           (3 << 18)
+#define MEM_SDMODE_CS           (7 << 15)
+#define MEM_SDMODE_TRAS         (15 << 11)
+#define MEM_SDMODE_TMRD         (3 << 9)
+#define MEM_SDMODE_TWR          (3 << 7)
+#define MEM_SDMODE_TRP          (3 << 5)
+#define MEM_SDMODE_TRCD         (3 << 3)
+#define MEM_SDMODE_TCL          (7 << 0)
+
+#define MEM_SDMODE_BS_2Bank     (0 << 20)
+#define MEM_SDMODE_BS_4Bank     (1 << 20)
+#define MEM_SDMODE_RS_11Row     (0 << 18)
+#define MEM_SDMODE_RS_12Row     (1 << 18)
+#define MEM_SDMODE_RS_13Row     (2 << 18)
+#define MEM_SDMODE_RS_N(N)      ((N) << 18)
+#define MEM_SDMODE_CS_7Col      (0 << 15)
+#define MEM_SDMODE_CS_8Col      (1 << 15)
+#define MEM_SDMODE_CS_9Col      (2 << 15)
+#define MEM_SDMODE_CS_10Col     (3 << 15)
+#define MEM_SDMODE_CS_11Col     (4 << 15)
+#define MEM_SDMODE_CS_N(N)      ((N) << 15)
+#define MEM_SDMODE_TRAS_N(N)    ((N) << 11)
+#define MEM_SDMODE_TMRD_N(N)    ((N) << 9)
+#define MEM_SDMODE_TWR_N(N)     ((N) << 7)
+#define MEM_SDMODE_TRP_N(N)     ((N) << 5)
+#define MEM_SDMODE_TRCD_N(N)    ((N) << 3)
+#define MEM_SDMODE_TCL_N(N)     ((N) << 0)
+
+/* MEM_SDADDR register contents definitions */
+#define MEM_SDADDR_E            (1 << 20)
+#define MEM_SDADDR_CSBA         (0x03FF << 10)
+#define MEM_SDADDR_CSMASK       (0x03FF << 0)
+#define MEM_SDADDR_CSBA_N(N)    ((N) & (0x03FF << 22) >> 12)
+#define MEM_SDADDR_CSMASK_N(N)  ((N)&(0x03FF << 22) >> 22)
+
+/* MEM_SDREFCFG register content definitions */
+#define MEM_SDREFCFG_TRC        (15 << 28)
+#define MEM_SDREFCFG_TRPM       (3 << 26)
+#define MEM_SDREFCFG_E          (1 << 25)
+#define MEM_SDREFCFG_RE         (0x1ffffff << 0)
+#define MEM_SDREFCFG_TRC_N(N)   ((N) << MEM_SDREFCFG_TRC)
+#define MEM_SDREFCFG_TRPM_N(N)  ((N) << MEM_SDREFCFG_TRPM)
+#define MEM_SDREFCFG_REF_N(N)   (N)
+
+/* Au1550 SDRAM Register Offsets */
+#define AU1550_MEM_SDMODE0              0x0800
+#define AU1550_MEM_SDMODE1              0x0808
+#define AU1550_MEM_SDMODE2              0x0810
+#define AU1550_MEM_SDADDR0              0x0820
+#define AU1550_MEM_SDADDR1              0x0828
+#define AU1550_MEM_SDADDR2              0x0830
+#define AU1550_MEM_SDCONFIGA            0x0840
+#define AU1550_MEM_SDCONFIGB            0x0848
+#define AU1550_MEM_SDSTAT               0x0850
+#define AU1550_MEM_SDERRADDR            0x0858
+#define AU1550_MEM_SDSTRIDE0            0x0860
+#define AU1550_MEM_SDSTRIDE1            0x0868
+#define AU1550_MEM_SDSTRIDE2            0x0870
+#define AU1550_MEM_SDWRMD0              0x0880
+#define AU1550_MEM_SDWRMD1              0x0888
+#define AU1550_MEM_SDWRMD2              0x0890
+#define AU1550_MEM_SDPRECMD             0x08C0
+#define AU1550_MEM_SDAUTOREF            0x08C8
+#define AU1550_MEM_SDSREF               0x08D0
+#define AU1550_MEM_SDSLEEP              MEM_SDSREF
+
+/* Static Bus Controller register offsets */
+#define AU1000_MEM_STCFG0       0x000
+#define AU1000_MEM_STTIME0      0x004
+#define AU1000_MEM_STADDR0      0x008
+#define AU1000_MEM_STCFG1       0x010
+#define AU1000_MEM_STTIME1      0x014
+#define AU1000_MEM_STADDR1      0x018
+#define AU1000_MEM_STCFG2       0x020
+#define AU1000_MEM_STTIME2      0x024
+#define AU1000_MEM_STADDR2      0x028
+#define AU1000_MEM_STCFG3       0x030
+#define AU1000_MEM_STTIME3      0x034
+#define AU1000_MEM_STADDR3      0x038
+#define AU1000_MEM_STNDCTL      0x100
+#define AU1000_MEM_STSTAT       0x104
+
+#define MEM_STNAND_CMD          0x0
+#define MEM_STNAND_ADDR         0x4
+#define MEM_STNAND_DATA         0x20
+
+
+/* Programmable Counters 0 and 1 */
+#define AU1000_SYS_CNTRCTRL     0x14
+#  define SYS_CNTRL_E1S         (1 << 23)
+#  define SYS_CNTRL_T1S         (1 << 20)
+#  define SYS_CNTRL_M21         (1 << 19)
+#  define SYS_CNTRL_M11         (1 << 18)
+#  define SYS_CNTRL_M01         (1 << 17)
+#  define SYS_CNTRL_C1S         (1 << 16)
+#  define SYS_CNTRL_BP          (1 << 14)
+#  define SYS_CNTRL_EN1         (1 << 13)
+#  define SYS_CNTRL_BT1         (1 << 12)
+#  define SYS_CNTRL_EN0         (1 << 11)
+#  define SYS_CNTRL_BT0         (1 << 10)
+#  define SYS_CNTRL_E0          (1 << 8)
+#  define SYS_CNTRL_E0S         (1 << 7)
+#  define SYS_CNTRL_32S         (1 << 5)
+#  define SYS_CNTRL_T0S         (1 << 4)
+#  define SYS_CNTRL_M20         (1 << 3)
+#  define SYS_CNTRL_M10         (1 << 2)
+#  define SYS_CNTRL_M00         (1 << 1)
+#  define SYS_CNTRL_C0S         (1 << 0)
+
+/* Programmable Counter 0 Registers */
+#define AU1000_SYS_TOYTRIM      0x00
+#define AU1000_SYS_TOYWRITE     0x04
+#define AU1000_SYS_TOYMATCH0    0x08
+#define AU1000_SYS_TOYMATCH1    0x0c
+#define AU1000_SYS_TOYMATCH2    0x10
+#define AU1000_SYS_TOYREAD      0x40
+
+/* Programmable Counter 1 Registers */
+#define AU1000_SYS_RTCTRIM      0x44
+#define AU1000_SYS_RTCWRITE     0x48
+#define AU1000_SYS_RTCMATCH0    0x4c
+#define AU1000_SYS_RTCMATCH1    0x50
+#define AU1000_SYS_RTCMATCH2    0x54
+#define AU1000_SYS_RTCREAD      0x58
+
+
+/* GPIO */
+#define AU1000_SYS_PINFUNC      0x2C
+#  define SYS_PF_USB            (1 << 15)       /* 2nd USB device/host */
+#  define SYS_PF_U3             (1 << 14)       /* GPIO23/U3TXD */
+#  define SYS_PF_U2             (1 << 13)       /* GPIO22/U2TXD */
+#  define SYS_PF_U1             (1 << 12)       /* GPIO21/U1TXD */
+#  define SYS_PF_SRC            (1 << 11)       /* GPIO6/SROMCKE */
+#  define SYS_PF_CK5            (1 << 10)       /* GPIO3/CLK5 */
+#  define SYS_PF_CK4            (1 << 9)        /* GPIO2/CLK4 */
+#  define SYS_PF_IRF            (1 << 8)        /* GPIO15/IRFIRSEL */
+#  define SYS_PF_UR3            (1 << 7)        /* GPIO[14:9]/UART3 */
+#  define SYS_PF_I2D            (1 << 6)        /* GPIO8/I2SDI */
+#  define SYS_PF_I2S            (1 << 5)        /* I2S/GPIO[29:31] */
+#  define SYS_PF_NI2            (1 << 4)        /* NI2/GPIO[24:28] */
+#  define SYS_PF_U0             (1 << 3)        /* U0TXD/GPIO20 */
+#  define SYS_PF_RD             (1 << 2)        /* IRTXD/GPIO19 */
+#  define SYS_PF_A97            (1 << 1)        /* AC97/SSL1 */
+#  define SYS_PF_S0             (1 << 0)        /* SSI_0/GPIO[16:18] */
+
+/* Au1100 only */
+#  define SYS_PF_PC             (1 << 18)       /* PCMCIA/GPIO[207:204] */
+#  define SYS_PF_LCD            (1 << 17)       /* extern lcd/GPIO[203:200] */
+#  define SYS_PF_CS             (1 << 16)       /* EXTCLK0/32KHz to gpio2 */
+#  define SYS_PF_EX0            (1 << 9)        /* GPIO2/clock */
+
+/* Au1550 only.  Redefines lots of pins */
+#  define SYS_PF_PSC2_MASK      (7 << 17)
+#  define SYS_PF_PSC2_AC97      0
+#  define SYS_PF_PSC2_SPI       0
+#  define SYS_PF_PSC2_I2S       (1 << 17)
+#  define SYS_PF_PSC2_SMBUS     (3 << 17)
+#  define SYS_PF_PSC2_GPIO      (7 << 17)
+#  define SYS_PF_PSC3_MASK      (7 << 20)
+#  define SYS_PF_PSC3_AC97      0
+#  define SYS_PF_PSC3_SPI       0
+#  define SYS_PF_PSC3_I2S       (1 << 20)
+#  define SYS_PF_PSC3_SMBUS     (3 << 20)
+#  define SYS_PF_PSC3_GPIO      (7 << 20)
+#  define SYS_PF_PSC1_S1        (1 << 1)
+#  define SYS_PF_MUST_BE_SET    ((1 << 5) | (1 << 2))
+
+/* Au1200 only */
+#define SYS_PINFUNC_DMA         (1 << 31)
+#define SYS_PINFUNC_S0A         (1 << 30)
+#define SYS_PINFUNC_S1A         (1 << 29)
+#define SYS_PINFUNC_LP0         (1 << 28)
+#define SYS_PINFUNC_LP1         (1 << 27)
+#define SYS_PINFUNC_LD16        (1 << 26)
+#define SYS_PINFUNC_LD8         (1 << 25)
+#define SYS_PINFUNC_LD1         (1 << 24)
+#define SYS_PINFUNC_LD0         (1 << 23)
+#define SYS_PINFUNC_P1A         (3 << 21)
+#define SYS_PINFUNC_P1B         (1 << 20)
+#define SYS_PINFUNC_FS3         (1 << 19)
+#define SYS_PINFUNC_P0A         (3 << 17)
+#define SYS_PINFUNC_CS          (1 << 16)
+#define SYS_PINFUNC_CIM         (1 << 15)
+#define SYS_PINFUNC_P1C         (1 << 14)
+#define SYS_PINFUNC_U1T         (1 << 12)
+#define SYS_PINFUNC_U1R         (1 << 11)
+#define SYS_PINFUNC_EX1         (1 << 10)
+#define SYS_PINFUNC_EX0         (1 << 9)
+#define SYS_PINFUNC_U0R         (1 << 8)
+#define SYS_PINFUNC_MC          (1 << 7)
+#define SYS_PINFUNC_S0B         (1 << 6)
+#define SYS_PINFUNC_S0C         (1 << 5)
+#define SYS_PINFUNC_P0B         (1 << 4)
+#define SYS_PINFUNC_U0T         (1 << 3)
+#define SYS_PINFUNC_S1B         (1 << 2)
+
+/* Power Management */
+#define AU1000_SYS_SCRATCH0     0x18
+#define AU1000_SYS_SCRATCH1     0x1c
+#define AU1000_SYS_WAKEMSK      0x34
+#define AU1000_SYS_ENDIAN       0x38
+#define AU1000_SYS_POWERCTRL    0x3c
+#define AU1000_SYS_WAKESRC      0x5c
+#define AU1000_SYS_SLPPWR       0x78
+#define AU1000_SYS_SLEEP        0x7c
+
+#define SYS_WAKEMSK_D2          (1 << 9)
+#define SYS_WAKEMSK_M2          (1 << 8)
+#define SYS_WAKEMSK_GPIO(x)     (1 << (x))
+
+/* Clock Controller */
+#define AU1000_SYS_FREQCTRL0    0x20
+#define AU1000_SYS_FREQCTRL1    0x24
+#define AU1000_SYS_CLKSRC       0x28
+#define AU1000_SYS_CPUPLL       0x60
+#define AU1000_SYS_AUXPLL       0x64
+#define AU1300_SYS_AUXPLL2      0x68
+
+
+/**********************************************************************/
+
+
+/* The PCI chip selects are outside the 32bit space, and since we can't
+ * just program the 36bit addresses into BARs, we have to take a chunk
+ * out of the 32bit space and reserve it for PCI.  When these addresses
+ * are ioremap()ed, they'll be fixed up to the real 36bit address before
+ * being passed to the real ioremap function.
+ */
+#define ALCHEMY_PCI_MEMWIN_START        (AU1500_PCI_MEM_PHYS_ADDR >> 4)
+#define ALCHEMY_PCI_MEMWIN_END          (ALCHEMY_PCI_MEMWIN_START + 0x0FFFFFFF)
+
+/* for PCI IO it's simpler because we get to do the ioremap ourselves and then
+ * adjust the device's resources.
+ */
+#define ALCHEMY_PCI_IOWIN_START         0x00001000
+#define ALCHEMY_PCI_IOWIN_END           0x0000FFFF
+
+#ifdef CONFIG_PCI
+
+#define IOPORT_RESOURCE_START   0x00001000      /* skip legacy probing */
+#define IOPORT_RESOURCE_END     0xffffffff
+#define IOMEM_RESOURCE_START    0x10000000
+#define IOMEM_RESOURCE_END      0xfffffffffULL
+
+#else
+
+/* Don't allow any legacy ports probing */
+#define IOPORT_RESOURCE_START   0x10000000
+#define IOPORT_RESOURCE_END     0xffffffff
+#define IOMEM_RESOURCE_START    0x10000000
+#define IOMEM_RESOURCE_END      0xfffffffffULL
+
+#endif
+
+/* PCI controller block register offsets */
+#define PCI_REG_CMEM            0x0000
+#define PCI_REG_CONFIG          0x0004
+#define PCI_REG_B2BMASK_CCH     0x0008
+#define PCI_REG_B2BBASE0_VID    0x000C
+#define PCI_REG_B2BBASE1_SID    0x0010
+#define PCI_REG_MWMASK_DEV      0x0014
+#define PCI_REG_MWBASE_REV_CCL  0x0018
+#define PCI_REG_ERR_ADDR        0x001C
+#define PCI_REG_SPEC_INTACK     0x0020
+#define PCI_REG_ID              0x0100
+#define PCI_REG_STATCMD         0x0104
+#define PCI_REG_CLASSREV        0x0108
+#define PCI_REG_PARAM           0x010C
+#define PCI_REG_MBAR            0x0110
+#define PCI_REG_TIMEOUT         0x0140
+
+/* PCI controller block register bits */
+#define PCI_CMEM_E              (1 << 28)       /* enable cacheable memory */
+#define PCI_CMEM_CMBASE(x)      (((x) & 0x3fff) << 14)
+#define PCI_CMEM_CMMASK(x)      ((x) & 0x3fff)
+#define PCI_CONFIG_ERD          (1 << 27) /* pci error during R/W */
+#define PCI_CONFIG_ET           (1 << 26) /* error in target mode */
+#define PCI_CONFIG_EF           (1 << 25) /* fatal error */
+#define PCI_CONFIG_EP           (1 << 24) /* parity error */
+#define PCI_CONFIG_EM           (1 << 23) /* multiple errors */
+#define PCI_CONFIG_BM           (1 << 22) /* bad master error */
+#define PCI_CONFIG_PD           (1 << 20) /* PCI Disable */
+#define PCI_CONFIG_BME          (1 << 19) /* Byte Mask Enable for reads */
+#define PCI_CONFIG_NC           (1 << 16) /* mark mem access non-coherent */
+#define PCI_CONFIG_IA           (1 << 15) /* INTA# enabled (target mode) */
+#define PCI_CONFIG_IP           (1 << 13) /* int on PCI_PERR# */
+#define PCI_CONFIG_IS           (1 << 12) /* int on PCI_SERR# */
+#define PCI_CONFIG_IMM          (1 << 11) /* int on master abort */
+#define PCI_CONFIG_ITM          (1 << 10) /* int on target abort (as master) */
+#define PCI_CONFIG_ITT          (1 << 9)  /* int on target abort (as target) */
+#define PCI_CONFIG_IPB          (1 << 8)  /* int on PERR# in bus master acc */
+#define PCI_CONFIG_SIC_NO       (0 << 6)  /* no byte mask changes */
+#define PCI_CONFIG_SIC_BA_ADR   (1 << 6)  /* on byte/hw acc, invert adr bits */
+#define PCI_CONFIG_SIC_HWA_DAT  (2 << 6)  /* on halfword acc, swap data */
+#define PCI_CONFIG_SIC_ALL      (3 << 6)  /* swap data bytes on all accesses */
+#define PCI_CONFIG_ST           (1 << 5)  /* swap data by target transactions */
+#define PCI_CONFIG_SM           (1 << 4)  /* swap data from PCI ctl */
+#define PCI_CONFIG_AEN          (1 << 3)  /* enable internal arbiter */
+#define PCI_CONFIG_R2H          (1 << 2)  /* REQ2# to hi-prio arbiter */
+#define PCI_CONFIG_R1H          (1 << 1)  /* REQ1# to hi-prio arbiter */
+#define PCI_CONFIG_CH           (1 << 0)  /* PCI ctl to hi-prio arbiter */
+#define PCI_B2BMASK_B2BMASK(x)  (((x) & 0xffff) << 16)
+#define PCI_B2BMASK_CCH(x)      ((x) & 0xffff) /* 16 upper bits of class code */
+#define PCI_B2BBASE0_VID_B0(x)  (((x) & 0xffff) << 16)
+#define PCI_B2BBASE0_VID_SV(x)  ((x) & 0xffff)
+#define PCI_B2BBASE1_SID_B1(x)  (((x) & 0xffff) << 16)
+#define PCI_B2BBASE1_SID_SI(x)  ((x) & 0xffff)
+#define PCI_MWMASKDEV_MWMASK(x) (((x) & 0xffff) << 16)
+#define PCI_MWMASKDEV_DEVID(x)  ((x) & 0xffff)
+#define PCI_MWBASEREVCCL_BASE(x) (((x) & 0xffff) << 16)
+#define PCI_MWBASEREVCCL_REV(x)  (((x) & 0xff) << 8)
+#define PCI_MWBASEREVCCL_CCL(x)  ((x) & 0xff)
+#define PCI_ID_DID(x)           (((x) & 0xffff) << 16)
+#define PCI_ID_VID(x)           ((x) & 0xffff)
+#define PCI_STATCMD_STATUS(x)   (((x) & 0xffff) << 16)
+#define PCI_STATCMD_CMD(x)      ((x) & 0xffff)
+#define PCI_CLASSREV_CLASS(x)   (((x) & 0x00ffffff) << 8)
+#define PCI_CLASSREV_REV(x)     ((x) & 0xff)
+#define PCI_PARAM_BIST(x)       (((x) & 0xff) << 24)
+#define PCI_PARAM_HT(x)         (((x) & 0xff) << 16)
+#define PCI_PARAM_LT(x)         (((x) & 0xff) << 8)
+#define PCI_PARAM_CLS(x)        ((x) & 0xff)
+#define PCI_TIMEOUT_RETRIES(x)  (((x) & 0xff) << 8)     /* max retries */
+#define PCI_TIMEOUT_TO(x)       ((x) & 0xff)    /* target ready timeout */
+
+
+/**********************************************************************/
+
 
 #ifndef _LANGUAGE_ASSEMBLY
 
@@ -45,52 +597,36 @@
 
 #include <asm/cpu.h>
 
-/* cpu pipeline flush */
-void static inline au_sync(void)
+/* helpers to access the SYS_* registers */
+static inline unsigned long alchemy_rdsys(int regofs)
 {
-        __asm__ volatile ("sync");
-}
+        void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
 
-void static inline au_sync_udelay(int us)
-{
-        __asm__ volatile ("sync");
-        udelay(us);
+        return __raw_readl(b + regofs);
 }
 
-void static inline au_sync_delay(int ms)
+static inline void alchemy_wrsys(unsigned long v, int regofs)
 {
-        __asm__ volatile ("sync");
-        mdelay(ms);
-}
+        void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
 
-void static inline au_writeb(u8 val, unsigned long reg)
-{
-        *(volatile u8 *)reg = val;
+        __raw_writel(v, b + regofs);
+        wmb(); /* drain writebuffer */
 }
 
-void static inline au_writew(u16 val, unsigned long reg)
+/* helpers to access static memctrl registers */
+static inline unsigned long alchemy_rdsmem(int regofs)
 {
-        *(volatile u16 *)reg = val;
-}
+        void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_STATIC_MEM_PHYS_ADDR);
 
-void static inline au_writel(u32 val, unsigned long reg)
-{
-        *(volatile u32 *)reg = val;
+        return __raw_readl(b + regofs);
 }
 
-static inline u8 au_readb(unsigned long reg)
+static inline void alchemy_wrsmem(unsigned long v, int regofs)
 {
-        return *(volatile u8 *)reg;
-}
+        void __iomem *b = (void __iomem *)KSEG1ADDR(AU1000_STATIC_MEM_PHYS_ADDR);
 
-static inline u16 au_readw(unsigned long reg)
-{
-        return *(volatile u16 *)reg;
-}
-
-static inline u32 au_readl(unsigned long reg)
-{
-        return *(volatile u32 *)reg;
+        __raw_writel(v, b + regofs);
+        wmb(); /* drain writebuffer */
 }
 
 /* Early Au1000 have a write-only SYS_CPUPLL register. */
@@ -192,19 +728,20 @@ static inline void alchemy_uart_enable(u32 uart_phys)
         /* reset, enable clock, deassert reset */
         if ((__raw_readl(addr + 0x100) & 3) != 3) {
                 __raw_writel(0, addr + 0x100);
-                wmb();
+                wmb(); /* drain writebuffer */
                 __raw_writel(1, addr + 0x100);
-                wmb();
+                wmb(); /* drain writebuffer */
         }
         __raw_writel(3, addr + 0x100);
-        wmb();
+        wmb(); /* drain writebuffer */
 }
 
 static inline void alchemy_uart_disable(u32 uart_phys)
 {
         void __iomem *addr = (void __iomem *)KSEG1ADDR(uart_phys);
+
         __raw_writel(0, addr + 0x100);  /* UART_MOD_CNTRL */
-        wmb();
+        wmb(); /* drain writebuffer */
 }
 
 static inline void alchemy_uart_putchar(u32 uart_phys, u8 c)
@@ -223,7 +760,7 @@ static inline void alchemy_uart_putchar(u32 uart_phys, u8 c)
         } while (--timeout);
 
         __raw_writel(c, base + 0x04);   /* tx */
-        wmb();
+        wmb(); /* drain writebuffer */
 }
 
 /* return number of ethernet MACs on a given cputype */
@@ -240,20 +777,13 @@ static inline int alchemy_get_macs(int type)
         return 0;
 }
 
-/* arch/mips/au1000/common/clocks.c */
-extern void set_au1x00_speed(unsigned int new_freq);
-extern unsigned int get_au1x00_speed(void);
-extern void set_au1x00_uart_baud_base(unsigned long new_baud_base);
-extern unsigned long get_au1x00_uart_baud_base(void);
-extern unsigned long au1xxx_calc_clock(void);
-
 /* PM: arch/mips/alchemy/common/sleeper.S, power.c, irq.c */
 void alchemy_sleep_au1000(void);
 void alchemy_sleep_au1550(void);
 void alchemy_sleep_au1300(void);
 void au_sleep(void);
 
-/* USB: drivers/usb/host/alchemy-common.c */
+/* USB: arch/mips/alchemy/common/usb.c */
 enum alchemy_usb_block {
         ALCHEMY_USB_OHCI0,
         ALCHEMY_USB_UDC0,
@@ -272,6 +802,20 @@ struct alchemy_pci_platdata {
         unsigned long pci_cfg_clr;
 };
 
+/* The IrDA peripheral has an IRFIRSEL pin, but on the DB/PB boards it's
+ * not used to select FIR/SIR mode on the transceiver but as a GPIO.
+ * Instead a CPLD has to be told about the mode.  The driver calls the
+ * set_phy_mode() function in addition to driving the IRFIRSEL pin.
+ */
+#define AU1000_IRDA_PHY_MODE_OFF        0
+#define AU1000_IRDA_PHY_MODE_SIR        1
+#define AU1000_IRDA_PHY_MODE_FIR        2
+
+struct au1k_irda_platform_data {
+        void (*set_phy_mode)(int mode);
+};
+
+
 /* Multifunction pins: Each of these pins can either be assigned to the
  * GPIO controller or a on-chip peripheral.
  * Call "au1300_pinfunc_to_dev()" or "au1300_pinfunc_to_gpio()" to
@@ -344,20 +888,6 @@ enum au1300_vss_block {
 
 extern void au1300_vss_block_control(int block, int enable);
 
-
-/* SOC Interrupt numbers */
-/* Au1000-style (IC0/1): 2 controllers with 32 sources each */
-#define AU1000_INTC0_INT_BASE   (MIPS_CPU_IRQ_BASE + 8)
-#define AU1000_INTC0_INT_LAST   (AU1000_INTC0_INT_BASE + 31)
-#define AU1000_INTC1_INT_BASE   (AU1000_INTC0_INT_LAST + 1)
-#define AU1000_INTC1_INT_LAST   (AU1000_INTC1_INT_BASE + 31)
-#define AU1000_MAX_INTR         AU1000_INTC1_INT_LAST
-
-/* Au1300-style (GPIC): 1 controller with up to 128 sources */
-#define ALCHEMY_GPIC_INT_BASE   (MIPS_CPU_IRQ_BASE + 8)
-#define ALCHEMY_GPIC_INT_NUM    128
-#define ALCHEMY_GPIC_INT_LAST   (ALCHEMY_GPIC_INT_BASE + ALCHEMY_GPIC_INT_NUM - 1)
-
 enum soc_au1000_ints {
         AU1000_FIRST_INT        = AU1000_INTC0_INT_BASE,
         AU1000_UART0_INT        = AU1000_FIRST_INT,
@@ -678,885 +1208,4 @@ enum soc_au1200_ints {
 
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 
-/* Au1300 peripheral interrupt numbers */
-#define AU1300_FIRST_INT        (ALCHEMY_GPIC_INT_BASE)
-#define AU1300_UART1_INT        (AU1300_FIRST_INT + 17)
-#define AU1300_UART2_INT        (AU1300_FIRST_INT + 25)
-#define AU1300_UART3_INT        (AU1300_FIRST_INT + 27)
-#define AU1300_SD1_INT          (AU1300_FIRST_INT + 32)
-#define AU1300_SD2_INT          (AU1300_FIRST_INT + 38)
-#define AU1300_PSC0_INT         (AU1300_FIRST_INT + 48)
-#define AU1300_PSC1_INT         (AU1300_FIRST_INT + 52)
-#define AU1300_PSC2_INT         (AU1300_FIRST_INT + 56)
-#define AU1300_PSC3_INT         (AU1300_FIRST_INT + 60)
-#define AU1300_NAND_INT         (AU1300_FIRST_INT + 62)
-#define AU1300_DDMA_INT         (AU1300_FIRST_INT + 75)
-#define AU1300_MMU_INT          (AU1300_FIRST_INT + 76)
-#define AU1300_MPU_INT          (AU1300_FIRST_INT + 77)
-#define AU1300_GPU_INT          (AU1300_FIRST_INT + 78)
-#define AU1300_UDMA_INT         (AU1300_FIRST_INT + 79)
-#define AU1300_TOY_INT          (AU1300_FIRST_INT + 80)
-#define AU1300_TOY_MATCH0_INT   (AU1300_FIRST_INT + 81)
-#define AU1300_TOY_MATCH1_INT   (AU1300_FIRST_INT + 82)
-#define AU1300_TOY_MATCH2_INT   (AU1300_FIRST_INT + 83)
-#define AU1300_RTC_INT          (AU1300_FIRST_INT + 84)
-#define AU1300_RTC_MATCH0_INT   (AU1300_FIRST_INT + 85)
-#define AU1300_RTC_MATCH1_INT   (AU1300_FIRST_INT + 86)
-#define AU1300_RTC_MATCH2_INT   (AU1300_FIRST_INT + 87)
-#define AU1300_UART0_INT        (AU1300_FIRST_INT + 88)
-#define AU1300_SD0_INT          (AU1300_FIRST_INT + 89)
-#define AU1300_USB_INT          (AU1300_FIRST_INT + 90)
-#define AU1300_LCD_INT          (AU1300_FIRST_INT + 91)
-#define AU1300_BSA_INT          (AU1300_FIRST_INT + 92)
-#define AU1300_MPE_INT          (AU1300_FIRST_INT + 93)
-#define AU1300_ITE_INT          (AU1300_FIRST_INT + 94)
-#define AU1300_AES_INT          (AU1300_FIRST_INT + 95)
-#define AU1300_CIM_INT          (AU1300_FIRST_INT + 96)
-
-/**********************************************************************/
-
-/*
- * Physical base addresses for integrated peripherals
- * 0..au1000 1..au1500 2..au1100 3..au1550 4..au1200 5..au1300
- */
-
-#define AU1000_AC97_PHYS_ADDR           0x10000000 /* 012 */
-#define AU1300_ROM_PHYS_ADDR            0x10000000 /* 5 */
-#define AU1300_OTP_PHYS_ADDR            0x10002000 /* 5 */
-#define AU1300_VSS_PHYS_ADDR            0x10003000 /* 5 */
-#define AU1300_UART0_PHYS_ADDR          0x10100000 /* 5 */
-#define AU1300_UART1_PHYS_ADDR          0x10101000 /* 5 */
-#define AU1300_UART2_PHYS_ADDR          0x10102000 /* 5 */
-#define AU1300_UART3_PHYS_ADDR          0x10103000 /* 5 */
-#define AU1000_USB_OHCI_PHYS_ADDR       0x10100000 /* 012 */
-#define AU1000_USB_UDC_PHYS_ADDR        0x10200000 /* 0123 */
-#define AU1300_GPIC_PHYS_ADDR           0x10200000 /* 5 */
-#define AU1000_IRDA_PHYS_ADDR           0x10300000 /* 02 */
-#define AU1200_AES_PHYS_ADDR            0x10300000 /* 45 */
-#define AU1000_IC0_PHYS_ADDR            0x10400000 /* 01234 */
-#define AU1300_GPU_PHYS_ADDR            0x10500000 /* 5 */
-#define AU1000_MAC0_PHYS_ADDR           0x10500000 /* 023 */
-#define AU1000_MAC1_PHYS_ADDR           0x10510000 /* 023 */
-#define AU1000_MACEN_PHYS_ADDR          0x10520000 /* 023 */
-#define AU1100_SD0_PHYS_ADDR            0x10600000 /* 245 */
-#define AU1300_SD1_PHYS_ADDR            0x10601000 /* 5 */
-#define AU1300_SD2_PHYS_ADDR            0x10602000 /* 5 */
-#define AU1100_SD1_PHYS_ADDR            0x10680000 /* 24 */
-#define AU1300_SYS_PHYS_ADDR            0x10900000 /* 5 */
-#define AU1550_PSC2_PHYS_ADDR           0x10A00000 /* 3 */
-#define AU1550_PSC3_PHYS_ADDR           0x10B00000 /* 3 */
-#define AU1300_PSC0_PHYS_ADDR           0x10A00000 /* 5 */
-#define AU1300_PSC1_PHYS_ADDR           0x10A01000 /* 5 */
-#define AU1300_PSC2_PHYS_ADDR           0x10A02000 /* 5 */
-#define AU1300_PSC3_PHYS_ADDR           0x10A03000 /* 5 */
-#define AU1000_I2S_PHYS_ADDR            0x11000000 /* 02 */
-#define AU1500_MAC0_PHYS_ADDR           0x11500000 /* 1 */
-#define AU1500_MAC1_PHYS_ADDR           0x11510000 /* 1 */
-#define AU1500_MACEN_PHYS_ADDR          0x11520000 /* 1 */
-#define AU1000_UART0_PHYS_ADDR          0x11100000 /* 01234 */
-#define AU1200_SWCNT_PHYS_ADDR          0x1110010C /* 4 */
-#define AU1000_UART1_PHYS_ADDR          0x11200000 /* 0234 */
-#define AU1000_UART2_PHYS_ADDR          0x11300000 /* 0 */
-#define AU1000_UART3_PHYS_ADDR          0x11400000 /* 0123 */
-#define AU1000_SSI0_PHYS_ADDR           0x11600000 /* 02 */
-#define AU1000_SSI1_PHYS_ADDR           0x11680000 /* 02 */
-#define AU1500_GPIO2_PHYS_ADDR          0x11700000 /* 1234 */
-#define AU1000_IC1_PHYS_ADDR            0x11800000 /* 01234 */
-#define AU1000_SYS_PHYS_ADDR            0x11900000 /* 012345 */
-#define AU1550_PSC0_PHYS_ADDR           0x11A00000 /* 34 */
-#define AU1550_PSC1_PHYS_ADDR           0x11B00000 /* 34 */
-#define AU1000_MEM_PHYS_ADDR            0x14000000 /* 01234 */
-#define AU1000_STATIC_MEM_PHYS_ADDR     0x14001000 /* 01234 */
-#define AU1300_UDMA_PHYS_ADDR           0x14001800 /* 5 */
-#define AU1000_DMA_PHYS_ADDR            0x14002000 /* 012 */
-#define AU1550_DBDMA_PHYS_ADDR          0x14002000 /* 345 */
-#define AU1550_DBDMA_CONF_PHYS_ADDR     0x14003000 /* 345 */
-#define AU1000_MACDMA0_PHYS_ADDR        0x14004000 /* 0123 */
-#define AU1000_MACDMA1_PHYS_ADDR        0x14004200 /* 0123 */
-#define AU1200_CIM_PHYS_ADDR            0x14004000 /* 45 */
-#define AU1500_PCI_PHYS_ADDR            0x14005000 /* 13 */
-#define AU1550_PE_PHYS_ADDR             0x14008000 /* 3 */
-#define AU1200_MAEBE_PHYS_ADDR          0x14010000 /* 4 */
-#define AU1200_MAEFE_PHYS_ADDR          0x14012000 /* 4 */
-#define AU1300_MAEITE_PHYS_ADDR         0x14010000 /* 5 */
-#define AU1300_MAEMPE_PHYS_ADDR         0x14014000 /* 5 */
-#define AU1550_USB_OHCI_PHYS_ADDR       0x14020000 /* 3 */
-#define AU1200_USB_CTL_PHYS_ADDR        0x14020000 /* 4 */
-#define AU1200_USB_OTG_PHYS_ADDR        0x14020020 /* 4 */
-#define AU1200_USB_OHCI_PHYS_ADDR       0x14020100 /* 4 */
-#define AU1200_USB_EHCI_PHYS_ADDR       0x14020200 /* 4 */
-#define AU1200_USB_UDC_PHYS_ADDR        0x14022000 /* 4 */
-#define AU1300_USB_EHCI_PHYS_ADDR       0x14020000 /* 5 */
-#define AU1300_USB_OHCI0_PHYS_ADDR      0x14020400 /* 5 */
-#define AU1300_USB_OHCI1_PHYS_ADDR      0x14020800 /* 5 */
-#define AU1300_USB_CTL_PHYS_ADDR        0x14021000 /* 5 */
-#define AU1300_USB_OTG_PHYS_ADDR        0x14022000 /* 5 */
-#define AU1300_MAEBSA_PHYS_ADDR         0x14030000 /* 5 */
-#define AU1100_LCD_PHYS_ADDR            0x15000000 /* 2 */
-#define AU1200_LCD_PHYS_ADDR            0x15000000 /* 45 */
-#define AU1500_PCI_MEM_PHYS_ADDR        0x400000000ULL /* 13 */
-#define AU1500_PCI_IO_PHYS_ADDR         0x500000000ULL /* 13 */
-#define AU1500_PCI_CONFIG0_PHYS_ADDR    0x600000000ULL /* 13 */
-#define AU1500_PCI_CONFIG1_PHYS_ADDR    0x680000000ULL /* 13 */
-#define AU1000_PCMCIA_IO_PHYS_ADDR      0xF00000000ULL /* 012345 */
-#define AU1000_PCMCIA_ATTR_PHYS_ADDR    0xF40000000ULL /* 012345 */
-#define AU1000_PCMCIA_MEM_PHYS_ADDR     0xF80000000ULL /* 012345 */
-
-/**********************************************************************/
-
-
-/*
- * Au1300 GPIO+INT controller (GPIC) register offsets and bits
- * Registers are 128bits (0x10 bytes), divided into 4 "banks".
- */
-#define AU1300_GPIC_PINVAL      0x0000
-#define AU1300_GPIC_PINVALCLR   0x0010
-#define AU1300_GPIC_IPEND       0x0020
-#define AU1300_GPIC_PRIENC      0x0030
-#define AU1300_GPIC_IEN         0x0040  /* int_mask in manual */
-#define AU1300_GPIC_IDIS        0x0050  /* int_maskclr in manual */
-#define AU1300_GPIC_DMASEL      0x0060
-#define AU1300_GPIC_DEVSEL      0x0080
-#define AU1300_GPIC_DEVCLR      0x0090
-#define AU1300_GPIC_RSTVAL      0x00a0
-/* pin configuration space. one 32bit register for up to 128 IRQs */
-#define AU1300_GPIC_PINCFG      0x1000
-
-#define GPIC_GPIO_TO_BIT(gpio)  \
-        (1 << ((gpio) & 0x1f))
-
-#define GPIC_GPIO_BANKOFF(gpio) \
-        (((gpio) >> 5) * 4)
-
-/* Pin Control bits: who owns the pin, what does it do */
-#define GPIC_CFG_PC_GPIN                0
-#define GPIC_CFG_PC_DEV                 1
-#define GPIC_CFG_PC_GPOLOW              2
-#define GPIC_CFG_PC_GPOHIGH             3
-#define GPIC_CFG_PC_MASK                3
-
-/* assign pin to MIPS IRQ line */
-#define GPIC_CFG_IL_SET(x)      (((x) & 3) << 2)
-#define GPIC_CFG_IL_MASK        (3 << 2)
-
-/* pin interrupt type setup */
-#define GPIC_CFG_IC_OFF         (0 << 4)
-#define GPIC_CFG_IC_LEVEL_LOW   (1 << 4)
-#define GPIC_CFG_IC_LEVEL_HIGH  (2 << 4)
-#define GPIC_CFG_IC_EDGE_FALL   (5 << 4)
-#define GPIC_CFG_IC_EDGE_RISE   (6 << 4)
-#define GPIC_CFG_IC_EDGE_BOTH   (7 << 4)
-#define GPIC_CFG_IC_MASK        (7 << 4)
-
-/* allow interrupt to wake cpu from 'wait' */
-#define GPIC_CFG_IDLEWAKE       (1 << 7)
-
-/***********************************************************************/
-
-/* Au1000 SDRAM memory controller register offsets */
-#define AU1000_MEM_SDMODE0              0x0000
-#define AU1000_MEM_SDMODE1              0x0004
-#define AU1000_MEM_SDMODE2              0x0008
-#define AU1000_MEM_SDADDR0              0x000C
-#define AU1000_MEM_SDADDR1              0x0010
-#define AU1000_MEM_SDADDR2              0x0014
-#define AU1000_MEM_SDREFCFG             0x0018
-#define AU1000_MEM_SDPRECMD             0x001C
-#define AU1000_MEM_SDAUTOREF            0x0020
-#define AU1000_MEM_SDWRMD0              0x0024
-#define AU1000_MEM_SDWRMD1              0x0028
-#define AU1000_MEM_SDWRMD2              0x002C
-#define AU1000_MEM_SDSLEEP              0x0030
-#define AU1000_MEM_SDSMCKE              0x0034
-
-/* MEM_SDMODE register content definitions */
-#define MEM_SDMODE_F            (1 << 22)
-#define MEM_SDMODE_SR           (1 << 21)
-#define MEM_SDMODE_BS           (1 << 20)
-#define MEM_SDMODE_RS           (3 << 18)
-#define MEM_SDMODE_CS           (7 << 15)
-#define MEM_SDMODE_TRAS         (15 << 11)
-#define MEM_SDMODE_TMRD         (3 << 9)
-#define MEM_SDMODE_TWR          (3 << 7)
-#define MEM_SDMODE_TRP          (3 << 5)
-#define MEM_SDMODE_TRCD         (3 << 3)
-#define MEM_SDMODE_TCL          (7 << 0)
-
-#define MEM_SDMODE_BS_2Bank     (0 << 20)
-#define MEM_SDMODE_BS_4Bank     (1 << 20)
-#define MEM_SDMODE_RS_11Row     (0 << 18)
-#define MEM_SDMODE_RS_12Row     (1 << 18)
-#define MEM_SDMODE_RS_13Row     (2 << 18)
-#define MEM_SDMODE_RS_N(N)      ((N) << 18)
-#define MEM_SDMODE_CS_7Col      (0 << 15)
-#define MEM_SDMODE_CS_8Col      (1 << 15)
-#define MEM_SDMODE_CS_9Col      (2 << 15)
-#define MEM_SDMODE_CS_10Col     (3 << 15)
-#define MEM_SDMODE_CS_11Col     (4 << 15)
-#define MEM_SDMODE_CS_N(N)      ((N) << 15)
-#define MEM_SDMODE_TRAS_N(N)    ((N) << 11)
-#define MEM_SDMODE_TMRD_N(N)    ((N) << 9)
-#define MEM_SDMODE_TWR_N(N)     ((N) << 7)
-#define MEM_SDMODE_TRP_N(N)     ((N) << 5)
-#define MEM_SDMODE_TRCD_N(N)    ((N) << 3)
-#define MEM_SDMODE_TCL_N(N)     ((N) << 0)
-
-/* MEM_SDADDR register contents definitions */
-#define MEM_SDADDR_E            (1 << 20)
-#define MEM_SDADDR_CSBA         (0x03FF << 10)
-#define MEM_SDADDR_CSMASK       (0x03FF << 0)
-#define MEM_SDADDR_CSBA_N(N)    ((N) & (0x03FF << 22) >> 12)
-#define MEM_SDADDR_CSMASK_N(N)  ((N)&(0x03FF << 22) >> 22)
-
-/* MEM_SDREFCFG register content definitions */
-#define MEM_SDREFCFG_TRC        (15 << 28)
-#define MEM_SDREFCFG_TRPM       (3 << 26)
-#define MEM_SDREFCFG_E          (1 << 25)
-#define MEM_SDREFCFG_RE         (0x1ffffff << 0)
-#define MEM_SDREFCFG_TRC_N(N)   ((N) << MEM_SDREFCFG_TRC)
-#define MEM_SDREFCFG_TRPM_N(N)  ((N) << MEM_SDREFCFG_TRPM)
-#define MEM_SDREFCFG_REF_N(N)   (N)
-
-/* Au1550 SDRAM Register Offsets */
-#define AU1550_MEM_SDMODE0              0x0800
-#define AU1550_MEM_SDMODE1              0x0808
-#define AU1550_MEM_SDMODE2              0x0810
-#define AU1550_MEM_SDADDR0              0x0820
-#define AU1550_MEM_SDADDR1              0x0828
-#define AU1550_MEM_SDADDR2              0x0830
-#define AU1550_MEM_SDCONFIGA            0x0840
-#define AU1550_MEM_SDCONFIGB            0x0848
-#define AU1550_MEM_SDSTAT               0x0850
-#define AU1550_MEM_SDERRADDR            0x0858
-#define AU1550_MEM_SDSTRIDE0            0x0860
-#define AU1550_MEM_SDSTRIDE1            0x0868
-#define AU1550_MEM_SDSTRIDE2            0x0870
-#define AU1550_MEM_SDWRMD0              0x0880
-#define AU1550_MEM_SDWRMD1              0x0888
-#define AU1550_MEM_SDWRMD2              0x0890
-#define AU1550_MEM_SDPRECMD             0x08C0
-#define AU1550_MEM_SDAUTOREF            0x08C8
-#define AU1550_MEM_SDSREF               0x08D0
-#define AU1550_MEM_SDSLEEP              MEM_SDSREF
-
-/* Static Bus Controller */
-#define MEM_STCFG0              0xB4001000
-#define MEM_STTIME0             0xB4001004
-#define MEM_STADDR0             0xB4001008
-
-#define MEM_STCFG1              0xB4001010
-#define MEM_STTIME1             0xB4001014
-#define MEM_STADDR1             0xB4001018
-
-#define MEM_STCFG2              0xB4001020
-#define MEM_STTIME2             0xB4001024
-#define MEM_STADDR2             0xB4001028
-
-#define MEM_STCFG3              0xB4001030
-#define MEM_STTIME3             0xB4001034
-#define MEM_STADDR3             0xB4001038
-
-#define MEM_STNDCTL             0xB4001100
-#define MEM_STSTAT              0xB4001104
-
-#define MEM_STNAND_CMD          0x0
-#define MEM_STNAND_ADDR         0x4
-#define MEM_STNAND_DATA         0x20
-
-
-/* Programmable Counters 0 and 1 */
-#define SYS_BASE                0xB1900000
-#define SYS_COUNTER_CNTRL       (SYS_BASE + 0x14)
-#  define SYS_CNTRL_E1S         (1 << 23)
-#  define SYS_CNTRL_T1S         (1 << 20)
-#  define SYS_CNTRL_M21         (1 << 19)
-#  define SYS_CNTRL_M11         (1 << 18)
-#  define SYS_CNTRL_M01         (1 << 17)
-#  define SYS_CNTRL_C1S         (1 << 16)
-#  define SYS_CNTRL_BP          (1 << 14)
-#  define SYS_CNTRL_EN1         (1 << 13)
-#  define SYS_CNTRL_BT1         (1 << 12)
-#  define SYS_CNTRL_EN0         (1 << 11)
-#  define SYS_CNTRL_BT0         (1 << 10)
-#  define SYS_CNTRL_E0          (1 << 8)
-#  define SYS_CNTRL_E0S         (1 << 7)
-#  define SYS_CNTRL_32S         (1 << 5)
-#  define SYS_CNTRL_T0S         (1 << 4)
-#  define SYS_CNTRL_M20         (1 << 3)
-#  define SYS_CNTRL_M10         (1 << 2)
-#  define SYS_CNTRL_M00         (1 << 1)
-#  define SYS_CNTRL_C0S         (1 << 0)
-
-/* Programmable Counter 0 Registers */
-#define SYS_TOYTRIM             (SYS_BASE + 0)
-#define SYS_TOYWRITE            (SYS_BASE + 4)
-#define SYS_TOYMATCH0           (SYS_BASE + 8)
-#define SYS_TOYMATCH1           (SYS_BASE + 0xC)
-#define SYS_TOYMATCH2           (SYS_BASE + 0x10)
-#define SYS_TOYREAD             (SYS_BASE + 0x40)
-
-/* Programmable Counter 1 Registers */
-#define SYS_RTCTRIM             (SYS_BASE + 0x44)
-#define SYS_RTCWRITE            (SYS_BASE + 0x48)
-#define SYS_RTCMATCH0           (SYS_BASE + 0x4C)
-#define SYS_RTCMATCH1           (SYS_BASE + 0x50)
-#define SYS_RTCMATCH2           (SYS_BASE + 0x54)
-#define SYS_RTCREAD             (SYS_BASE + 0x58)
-
-/* I2S Controller */
-#define I2S_DATA                0xB1000000
-#  define I2S_DATA_MASK         0xffffff
-#define I2S_CONFIG              0xB1000004
-#  define I2S_CONFIG_XU         (1 << 25)
-#  define I2S_CONFIG_XO         (1 << 24)
-#  define I2S_CONFIG_RU         (1 << 23)
-#  define I2S_CONFIG_RO         (1 << 22)
-#  define I2S_CONFIG_TR         (1 << 21)
-#  define I2S_CONFIG_TE         (1 << 20)
-#  define I2S_CONFIG_TF         (1 << 19)
-#  define I2S_CONFIG_RR         (1 << 18)
-#  define I2S_CONFIG_RE         (1 << 17)
-#  define I2S_CONFIG_RF         (1 << 16)
-#  define I2S_CONFIG_PD         (1 << 11)
-#  define I2S_CONFIG_LB         (1 << 10)
-#  define I2S_CONFIG_IC         (1 << 9)
-#  define I2S_CONFIG_FM_BIT     7
-#  define I2S_CONFIG_FM_MASK    (0x3 << I2S_CONFIG_FM_BIT)
-#    define I2S_CONFIG_FM_I2S   (0x0 << I2S_CONFIG_FM_BIT)
-#    define I2S_CONFIG_FM_LJ    (0x1 << I2S_CONFIG_FM_BIT)
-#    define I2S_CONFIG_FM_RJ    (0x2 << I2S_CONFIG_FM_BIT)
-#  define I2S_CONFIG_TN         (1 << 6)
-#  define I2S_CONFIG_RN         (1 << 5)
-#  define I2S_CONFIG_SZ_BIT     0
-#  define I2S_CONFIG_SZ_MASK    (0x1F << I2S_CONFIG_SZ_BIT)
-
-#define I2S_CONTROL             0xB1000008
-#  define I2S_CONTROL_D         (1 << 1)
-#  define I2S_CONTROL_CE        (1 << 0)
-
-
-/* Ethernet Controllers  */
-
-/* 4 byte offsets from AU1000_ETH_BASE */
-#define MAC_CONTROL             0x0
-#  define MAC_RX_ENABLE         (1 << 2)
-#  define MAC_TX_ENABLE         (1 << 3)
-#  define MAC_DEF_CHECK         (1 << 5)
-#  define MAC_SET_BL(X)         (((X) & 0x3) << 6)
-#  define MAC_AUTO_PAD          (1 << 8)
-#  define MAC_DISABLE_RETRY     (1 << 10)
-#  define MAC_DISABLE_BCAST     (1 << 11)
-#  define MAC_LATE_COL          (1 << 12)
-#  define MAC_HASH_MODE         (1 << 13)
-#  define MAC_HASH_ONLY         (1 << 15)
-#  define MAC_PASS_ALL          (1 << 16)
-#  define MAC_INVERSE_FILTER    (1 << 17)
-#  define MAC_PROMISCUOUS       (1 << 18)
-#  define MAC_PASS_ALL_MULTI    (1 << 19)
-#  define MAC_FULL_DUPLEX       (1 << 20)
-#  define MAC_NORMAL_MODE       0
-#  define MAC_INT_LOOPBACK      (1 << 21)
-#  define MAC_EXT_LOOPBACK      (1 << 22)
-#  define MAC_DISABLE_RX_OWN    (1 << 23)
-#  define MAC_BIG_ENDIAN        (1 << 30)
-#  define MAC_RX_ALL            (1 << 31)
-#define MAC_ADDRESS_HIGH        0x4
-#define MAC_ADDRESS_LOW         0x8
-#define MAC_MCAST_HIGH          0xC
-#define MAC_MCAST_LOW           0x10
-#define MAC_MII_CNTRL           0x14
-#  define MAC_MII_BUSY          (1 << 0)
-#  define MAC_MII_READ          0
-#  define MAC_MII_WRITE         (1 << 1)
-#  define MAC_SET_MII_SELECT_REG(X) (((X) & 0x1f) << 6)
-#  define MAC_SET_MII_SELECT_PHY(X) (((X) & 0x1f) << 11)
-#define MAC_MII_DATA            0x18
-#define MAC_FLOW_CNTRL          0x1C
-#  define MAC_FLOW_CNTRL_BUSY   (1 << 0)
-#  define MAC_FLOW_CNTRL_ENABLE (1 << 1)
-#  define MAC_PASS_CONTROL      (1 << 2)
-#  define MAC_SET_PAUSE(X)      (((X) & 0xffff) << 16)
-#define MAC_VLAN1_TAG           0x20
-#define MAC_VLAN2_TAG           0x24
-
-/* Ethernet Controller Enable */
-
-#  define MAC_EN_CLOCK_ENABLE   (1 << 0)
-#  define MAC_EN_RESET0         (1 << 1)
-#  define MAC_EN_TOSS           (0 << 2)
-#  define MAC_EN_CACHEABLE      (1 << 3)
-#  define MAC_EN_RESET1         (1 << 4)
-#  define MAC_EN_RESET2         (1 << 5)
-#  define MAC_DMA_RESET         (1 << 6)
-
-/* Ethernet Controller DMA Channels */
-
-#define MAC0_TX_DMA_ADDR        0xB4004000
-#define MAC1_TX_DMA_ADDR        0xB4004200
-/* offsets from MAC_TX_RING_ADDR address */
-#define MAC_TX_BUFF0_STATUS     0x0
-#  define TX_FRAME_ABORTED      (1 << 0)
-#  define TX_JAB_TIMEOUT        (1 << 1)
-#  define TX_NO_CARRIER         (1 << 2)
-#  define TX_LOSS_CARRIER       (1 << 3)
-#  define TX_EXC_DEF            (1 << 4)
-#  define TX_LATE_COLL_ABORT    (1 << 5)
-#  define TX_EXC_COLL           (1 << 6)
-#  define TX_UNDERRUN           (1 << 7)
-#  define TX_DEFERRED           (1 << 8)
-#  define TX_LATE_COLL          (1 << 9)
-#  define TX_COLL_CNT_MASK      (0xF << 10)
-#  define TX_PKT_RETRY          (1 << 31)
-#define MAC_TX_BUFF0_ADDR       0x4
-#  define TX_DMA_ENABLE         (1 << 0)
-#  define TX_T_DONE             (1 << 1)
-#  define TX_GET_DMA_BUFFER(X)  (((X) >> 2) & 0x3)
-#define MAC_TX_BUFF0_LEN        0x8
-#define MAC_TX_BUFF1_STATUS     0x10
-#define MAC_TX_BUFF1_ADDR       0x14
-#define MAC_TX_BUFF1_LEN        0x18
-#define MAC_TX_BUFF2_STATUS     0x20
-#define MAC_TX_BUFF2_ADDR       0x24
-#define MAC_TX_BUFF2_LEN        0x28
-#define MAC_TX_BUFF3_STATUS     0x30
-#define MAC_TX_BUFF3_ADDR       0x34
-#define MAC_TX_BUFF3_LEN        0x38
-
-#define MAC0_RX_DMA_ADDR        0xB4004100
-#define MAC1_RX_DMA_ADDR        0xB4004300
-/* offsets from MAC_RX_RING_ADDR */
-#define MAC_RX_BUFF0_STATUS     0x0
-#  define RX_FRAME_LEN_MASK     0x3fff
-#  define RX_WDOG_TIMER         (1 << 14)
-#  define RX_RUNT               (1 << 15)
-#  define RX_OVERLEN            (1 << 16)
-#  define RX_COLL               (1 << 17)
-#  define RX_ETHER              (1 << 18)
-#  define RX_MII_ERROR          (1 << 19)
-#  define RX_DRIBBLING          (1 << 20)
-#  define RX_CRC_ERROR          (1 << 21)
-#  define RX_VLAN1              (1 << 22)
-#  define RX_VLAN2              (1 << 23)
-#  define RX_LEN_ERROR          (1 << 24)
-#  define RX_CNTRL_FRAME        (1 << 25)
-#  define RX_U_CNTRL_FRAME      (1 << 26)
-#  define RX_MCAST_FRAME        (1 << 27)
-#  define RX_BCAST_FRAME        (1 << 28)
-#  define RX_FILTER_FAIL        (1 << 29)
-#  define RX_PACKET_FILTER      (1 << 30)
-#  define RX_MISSED_FRAME       (1 << 31)
-
-#  define RX_ERROR (RX_WDOG_TIMER | RX_RUNT | RX_OVERLEN |  \
-                    RX_COLL | RX_MII_ERROR | RX_CRC_ERROR | \
-                    RX_LEN_ERROR | RX_U_CNTRL_FRAME | RX_MISSED_FRAME)
-#define MAC_RX_BUFF0_ADDR       0x4
-#  define RX_DMA_ENABLE         (1 << 0)
-#  define RX_T_DONE             (1 << 1)
-#  define RX_GET_DMA_BUFFER(X)  (((X) >> 2) & 0x3)
-#  define RX_SET_BUFF_ADDR(X)   ((X) & 0xffffffc0)
-#define MAC_RX_BUFF1_STATUS     0x10
-#define MAC_RX_BUFF1_ADDR       0x14
-#define MAC_RX_BUFF2_STATUS     0x20
-#define MAC_RX_BUFF2_ADDR       0x24
-#define MAC_RX_BUFF3_STATUS     0x30
-#define MAC_RX_BUFF3_ADDR       0x34
-
-/* SSIO */
-#define SSI0_STATUS             0xB1600000
-#  define SSI_STATUS_BF         (1 << 4)
-#  define SSI_STATUS_OF         (1 << 3)
-#  define SSI_STATUS_UF         (1 << 2)
-#  define SSI_STATUS_D          (1 << 1)
-#  define SSI_STATUS_B          (1 << 0)
-#define SSI0_INT                0xB1600004
-#  define SSI_INT_OI            (1 << 3)
-#  define SSI_INT_UI            (1 << 2)
-#  define SSI_INT_DI            (1 << 1)
-#define SSI0_INT_ENABLE         0xB1600008
-#  define SSI_INTE_OIE          (1 << 3)
-#  define SSI_INTE_UIE          (1 << 2)
-#  define SSI_INTE_DIE          (1 << 1)
-#define SSI0_CONFIG             0xB1600020
-#  define SSI_CONFIG_AO         (1 << 24)
-#  define SSI_CONFIG_DO         (1 << 23)
-#  define SSI_CONFIG_ALEN_BIT   20
-#  define SSI_CONFIG_ALEN_MASK  (0x7 << 20)
-#  define SSI_CONFIG_DLEN_BIT   16
-#  define SSI_CONFIG_DLEN_MASK  (0x7 << 16)
-#  define SSI_CONFIG_DD         (1 << 11)
-#  define SSI_CONFIG_AD         (1 << 10)
-#  define SSI_CONFIG_BM_BIT     8
-#  define SSI_CONFIG_BM_MASK    (0x3 << 8)
-#  define SSI_CONFIG_CE         (1 << 7)
-#  define SSI_CONFIG_DP         (1 << 6)
-#  define SSI_CONFIG_DL         (1 << 5)
-#  define SSI_CONFIG_EP         (1 << 4)
-#define SSI0_ADATA              0xB1600024
-#  define SSI_AD_D              (1 << 24)
-#  define SSI_AD_ADDR_BIT       16
-#  define SSI_AD_ADDR_MASK      (0xff << 16)
-#  define SSI_AD_DATA_BIT       0
-#  define SSI_AD_DATA_MASK      (0xfff << 0)
-#define SSI0_CLKDIV             0xB1600028
-#define SSI0_CONTROL            0xB1600100
-#  define SSI_CONTROL_CD        (1 << 1)
-#  define SSI_CONTROL_E         (1 << 0)
-
-/* SSI1 */
-#define SSI1_STATUS             0xB1680000
-#define SSI1_INT                0xB1680004
-#define SSI1_INT_ENABLE         0xB1680008
-#define SSI1_CONFIG             0xB1680020
-#define SSI1_ADATA              0xB1680024
-#define SSI1_CLKDIV             0xB1680028
-#define SSI1_ENABLE             0xB1680100
-
-/*
- * Register content definitions
- */
-#define SSI_STATUS_BF           (1 << 4)
-#define SSI_STATUS_OF           (1 << 3)
-#define SSI_STATUS_UF           (1 << 2)
-#define SSI_STATUS_D            (1 << 1)
-#define SSI_STATUS_B            (1 << 0)
-
-/* SSI_INT */
-#define SSI_INT_OI              (1 << 3)
-#define SSI_INT_UI              (1 << 2)
-#define SSI_INT_DI              (1 << 1)
-
-/* SSI_INTEN */
-#define SSI_INTEN_OIE           (1 << 3)
-#define SSI_INTEN_UIE           (1 << 2)
-#define SSI_INTEN_DIE           (1 << 1)
-
-#define SSI_CONFIG_AO           (1 << 24)
-#define SSI_CONFIG_DO           (1 << 23)
-#define SSI_CONFIG_ALEN         (7 << 20)
-#define SSI_CONFIG_DLEN         (15 << 16)
-#define SSI_CONFIG_DD           (1 << 11)
-#define SSI_CONFIG_AD           (1 << 10)
-#define SSI_CONFIG_BM           (3 << 8)
-#define SSI_CONFIG_CE           (1 << 7)
-#define SSI_CONFIG_DP           (1 << 6)
-#define SSI_CONFIG_DL           (1 << 5)
-#define SSI_CONFIG_EP           (1 << 4)
-#define SSI_CONFIG_ALEN_N(N)    ((N-1) << 20)
-#define SSI_CONFIG_DLEN_N(N)    ((N-1) << 16)
-#define SSI_CONFIG_BM_HI        (0 << 8)
-#define SSI_CONFIG_BM_LO        (1 << 8)
-#define SSI_CONFIG_BM_CY        (2 << 8)
-
-#define SSI_ADATA_D             (1 << 24)
-#define SSI_ADATA_ADDR          (0xFF << 16)
-#define SSI_ADATA_DATA          0x0FFF
-#define SSI_ADATA_ADDR_N(N)     (N << 16)
-
-#define SSI_ENABLE_CD           (1 << 1)
-#define SSI_ENABLE_E            (1 << 0)
-
-
-/*
- * The IrDA peripheral has an IRFIRSEL pin, but on the DB/PB boards it's not
- * used to select FIR/SIR mode on the transceiver but as a GPIO.  Instead a
- * CPLD has to be told about the mode.
- */
-#define AU1000_IRDA_PHY_MODE_OFF        0
-#define AU1000_IRDA_PHY_MODE_SIR        1
-#define AU1000_IRDA_PHY_MODE_FIR        2
-
-struct au1k_irda_platform_data {
-        void(*set_phy_mode)(int mode);
-};
-
-
-/* GPIO */
-#define SYS_PINFUNC             0xB190002C
-#  define SYS_PF_USB            (1 << 15)       /* 2nd USB device/host */
-#  define SYS_PF_U3             (1 << 14)       /* GPIO23/U3TXD */
-#  define SYS_PF_U2             (1 << 13)       /* GPIO22/U2TXD */
-#  define SYS_PF_U1             (1 << 12)       /* GPIO21/U1TXD */
-#  define SYS_PF_SRC            (1 << 11)       /* GPIO6/SROMCKE */
-#  define SYS_PF_CK5            (1 << 10)       /* GPIO3/CLK5 */
-#  define SYS_PF_CK4            (1 << 9)        /* GPIO2/CLK4 */
-#  define SYS_PF_IRF            (1 << 8)        /* GPIO15/IRFIRSEL */
-#  define SYS_PF_UR3            (1 << 7)        /* GPIO[14:9]/UART3 */
-#  define SYS_PF_I2D            (1 << 6)        /* GPIO8/I2SDI */
-#  define SYS_PF_I2S            (1 << 5)        /* I2S/GPIO[29:31] */
-#  define SYS_PF_NI2            (1 << 4)        /* NI2/GPIO[24:28] */
-#  define SYS_PF_U0             (1 << 3)        /* U0TXD/GPIO20 */
-#  define SYS_PF_RD             (1 << 2)        /* IRTXD/GPIO19 */
-#  define SYS_PF_A97            (1 << 1)        /* AC97/SSL1 */
-#  define SYS_PF_S0             (1 << 0)        /* SSI_0/GPIO[16:18] */
-
-/* Au1100 only */
-#  define SYS_PF_PC             (1 << 18)       /* PCMCIA/GPIO[207:204] */
-#  define SYS_PF_LCD            (1 << 17)       /* extern lcd/GPIO[203:200] */
-#  define SYS_PF_CS             (1 << 16)       /* EXTCLK0/32KHz to gpio2 */
-#  define SYS_PF_EX0            (1 << 9)        /* GPIO2/clock */
-
-/* Au1550 only.  Redefines lots of pins */
-#  define SYS_PF_PSC2_MASK      (7 << 17)
-#  define SYS_PF_PSC2_AC97      0
-#  define SYS_PF_PSC2_SPI       0
-#  define SYS_PF_PSC2_I2S       (1 << 17)
-#  define SYS_PF_PSC2_SMBUS     (3 << 17)
-#  define SYS_PF_PSC2_GPIO      (7 << 17)
-#  define SYS_PF_PSC3_MASK      (7 << 20)
-#  define SYS_PF_PSC3_AC97      0
-#  define SYS_PF_PSC3_SPI       0
-#  define SYS_PF_PSC3_I2S       (1 << 20)
-#  define SYS_PF_PSC3_SMBUS     (3 << 20)
-#  define SYS_PF_PSC3_GPIO      (7 << 20)
-#  define SYS_PF_PSC1_S1        (1 << 1)
-#  define SYS_PF_MUST_BE_SET    ((1 << 5) | (1 << 2))
-
-/* Au1200 only */
-#define SYS_PINFUNC_DMA         (1 << 31)
-#define SYS_PINFUNC_S0A         (1 << 30)
-#define SYS_PINFUNC_S1A         (1 << 29)
-#define SYS_PINFUNC_LP0         (1 << 28)
-#define SYS_PINFUNC_LP1         (1 << 27)
-#define SYS_PINFUNC_LD16        (1 << 26)
-#define SYS_PINFUNC_LD8         (1 << 25)
-#define SYS_PINFUNC_LD1         (1 << 24)
-#define SYS_PINFUNC_LD0         (1 << 23)
-#define SYS_PINFUNC_P1A         (3 << 21)
-#define SYS_PINFUNC_P1B         (1 << 20)
-#define SYS_PINFUNC_FS3         (1 << 19)
-#define SYS_PINFUNC_P0A         (3 << 17)
-#define SYS_PINFUNC_CS          (1 << 16)
-#define SYS_PINFUNC_CIM         (1 << 15)
-#define SYS_PINFUNC_P1C         (1 << 14)
-#define SYS_PINFUNC_U1T         (1 << 12)
-#define SYS_PINFUNC_U1R         (1 << 11)
-#define SYS_PINFUNC_EX1         (1 << 10)
-#define SYS_PINFUNC_EX0         (1 << 9)
-#define SYS_PINFUNC_U0R         (1 << 8)
-#define SYS_PINFUNC_MC          (1 << 7)
-#define SYS_PINFUNC_S0B         (1 << 6)
-#define SYS_PINFUNC_S0C         (1 << 5)
-#define SYS_PINFUNC_P0B         (1 << 4)
-#define SYS_PINFUNC_U0T         (1 << 3)
-#define SYS_PINFUNC_S1B         (1 << 2)
-
-/* Power Management */
-#define SYS_SCRATCH0            0xB1900018
-#define SYS_SCRATCH1            0xB190001C
-#define SYS_WAKEMSK             0xB1900034
-#define SYS_ENDIAN              0xB1900038
-#define SYS_POWERCTRL           0xB190003C
-#define SYS_WAKESRC             0xB190005C
-#define SYS_SLPPWR              0xB1900078
-#define SYS_SLEEP               0xB190007C
-
-#define SYS_WAKEMSK_D2          (1 << 9)
-#define SYS_WAKEMSK_M2          (1 << 8)
-#define SYS_WAKEMSK_GPIO(x)     (1 << (x))
-
-/* Clock Controller */
-#define SYS_FREQCTRL0           0xB1900020
-#  define SYS_FC_FRDIV2_BIT     22
-#  define SYS_FC_FRDIV2_MASK    (0xff << SYS_FC_FRDIV2_BIT)
-#  define SYS_FC_FE2            (1 << 21)
-#  define SYS_FC_FS2            (1 << 20)
-#  define SYS_FC_FRDIV1_BIT     12
-#  define SYS_FC_FRDIV1_MASK    (0xff << SYS_FC_FRDIV1_BIT)
-#  define SYS_FC_FE1            (1 << 11)
-#  define SYS_FC_FS1            (1 << 10)
-#  define SYS_FC_FRDIV0_BIT     2
-#  define SYS_FC_FRDIV0_MASK    (0xff << SYS_FC_FRDIV0_BIT)
-#  define SYS_FC_FE0            (1 << 1)
-#  define SYS_FC_FS0            (1 << 0)
-#define SYS_FREQCTRL1           0xB1900024
-#  define SYS_FC_FRDIV5_BIT     22
-#  define SYS_FC_FRDIV5_MASK    (0xff << SYS_FC_FRDIV5_BIT)
-#  define SYS_FC_FE5            (1 << 21)
-#  define SYS_FC_FS5            (1 << 20)
-#  define SYS_FC_FRDIV4_BIT     12
-#  define SYS_FC_FRDIV4_MASK    (0xff << SYS_FC_FRDIV4_BIT)
-#  define SYS_FC_FE4            (1 << 11)
-#  define SYS_FC_FS4            (1 << 10)
-#  define SYS_FC_FRDIV3_BIT     2
-#  define SYS_FC_FRDIV3_MASK    (0xff << SYS_FC_FRDIV3_BIT)
-#  define SYS_FC_FE3            (1 << 1)
-#  define SYS_FC_FS3            (1 << 0)
-#define SYS_CLKSRC              0xB1900028
-#  define SYS_CS_ME1_BIT        27
-#  define SYS_CS_ME1_MASK       (0x7 << SYS_CS_ME1_BIT)
-#  define SYS_CS_DE1            (1 << 26)
-#  define SYS_CS_CE1            (1 << 25)
-#  define SYS_CS_ME0_BIT        22
-#  define SYS_CS_ME0_MASK       (0x7 << SYS_CS_ME0_BIT)
-#  define SYS_CS_DE0            (1 << 21)
-#  define SYS_CS_CE0            (1 << 20)
-#  define SYS_CS_MI2_BIT        17
-#  define SYS_CS_MI2_MASK       (0x7 << SYS_CS_MI2_BIT)
-#  define SYS_CS_DI2            (1 << 16)
-#  define SYS_CS_CI2            (1 << 15)
-
-#  define SYS_CS_ML_BIT         7
-#  define SYS_CS_ML_MASK        (0x7 << SYS_CS_ML_BIT)
-#  define SYS_CS_DL             (1 << 6)
-#  define SYS_CS_CL             (1 << 5)
-
-#  define SYS_CS_MUH_BIT        12
-#  define SYS_CS_MUH_MASK       (0x7 << SYS_CS_MUH_BIT)
-#  define SYS_CS_DUH            (1 << 11)
-#  define SYS_CS_CUH            (1 << 10)
-#  define SYS_CS_MUD_BIT        7
-#  define SYS_CS_MUD_MASK       (0x7 << SYS_CS_MUD_BIT)
-#  define SYS_CS_DUD            (1 << 6)
-#  define SYS_CS_CUD            (1 << 5)
-
-#  define SYS_CS_MIR_BIT        2
-#  define SYS_CS_MIR_MASK       (0x7 << SYS_CS_MIR_BIT)
-#  define SYS_CS_DIR            (1 << 1)
-#  define SYS_CS_CIR            (1 << 0)
-
-#  define SYS_CS_MUX_AUX        0x1
-#  define SYS_CS_MUX_FQ0        0x2
-#  define SYS_CS_MUX_FQ1        0x3
-#  define SYS_CS_MUX_FQ2        0x4
-#  define SYS_CS_MUX_FQ3        0x5
-#  define SYS_CS_MUX_FQ4        0x6
-#  define SYS_CS_MUX_FQ5        0x7
-#define SYS_CPUPLL              0xB1900060
-#define SYS_AUXPLL              0xB1900064
-
-/* AC97 Controller */
-#define AC97C_CONFIG            0xB0000000
-#  define AC97C_RECV_SLOTS_BIT  13
-#  define AC97C_RECV_SLOTS_MASK (0x3ff << AC97C_RECV_SLOTS_BIT)
-#  define AC97C_XMIT_SLOTS_BIT  3
-#  define AC97C_XMIT_SLOTS_MASK (0x3ff << AC97C_XMIT_SLOTS_BIT)
-#  define AC97C_SG              (1 << 2)
-#  define AC97C_SYNC            (1 << 1)
-#  define AC97C_RESET           (1 << 0)
-#define AC97C_STATUS            0xB0000004
-#  define AC97C_XU              (1 << 11)
-#  define AC97C_XO              (1 << 10)
-#  define AC97C_RU              (1 << 9)
-#  define AC97C_RO              (1 << 8)
-#  define AC97C_READY           (1 << 7)
-#  define AC97C_CP              (1 << 6)
-#  define AC97C_TR              (1 << 5)
-#  define AC97C_TE              (1 << 4)
-#  define AC97C_TF              (1 << 3)
-#  define AC97C_RR              (1 << 2)
-#  define AC97C_RE              (1 << 1)
-#  define AC97C_RF              (1 << 0)
-#define AC97C_DATA              0xB0000008
-#define AC97C_CMD               0xB000000C
-#  define AC97C_WD_BIT          16
-#  define AC97C_READ            (1 << 7)
-#  define AC97C_INDEX_MASK      0x7f
-#define AC97C_CNTRL             0xB0000010
-#  define AC97C_RS              (1 << 1)
-#  define AC97C_CE              (1 << 0)
-
-
-/* The PCI chip selects are outside the 32bit space, and since we can't
- * just program the 36bit addresses into BARs, we have to take a chunk
- * out of the 32bit space and reserve it for PCI.  When these addresses
- * are ioremap()ed, they'll be fixed up to the real 36bit address before
- * being passed to the real ioremap function.
- */
-#define ALCHEMY_PCI_MEMWIN_START        (AU1500_PCI_MEM_PHYS_ADDR >> 4)
-#define ALCHEMY_PCI_MEMWIN_END          (ALCHEMY_PCI_MEMWIN_START + 0x0FFFFFFF)
-
-/* for PCI IO it's simpler because we get to do the ioremap ourselves and then
- * adjust the device's resources.
- */
-#define ALCHEMY_PCI_IOWIN_START         0x00001000
-#define ALCHEMY_PCI_IOWIN_END           0x0000FFFF
-
-#ifdef CONFIG_PCI
-
-#define IOPORT_RESOURCE_START   0x00001000      /* skip legacy probing */
-#define IOPORT_RESOURCE_END     0xffffffff
-#define IOMEM_RESOURCE_START    0x10000000
-#define IOMEM_RESOURCE_END      0xfffffffffULL
-
-#else
-
-/* Don't allow any legacy ports probing */
-#define IOPORT_RESOURCE_START   0x10000000
-#define IOPORT_RESOURCE_END     0xffffffff
-#define IOMEM_RESOURCE_START    0x10000000
-#define IOMEM_RESOURCE_END      0xfffffffffULL
-
-#endif
-
-/* PCI controller block register offsets */
-#define PCI_REG_CMEM            0x0000
-#define PCI_REG_CONFIG          0x0004
-#define PCI_REG_B2BMASK_CCH     0x0008
-#define PCI_REG_B2BBASE0_VID    0x000C
-#define PCI_REG_B2BBASE1_SID    0x0010
-#define PCI_REG_MWMASK_DEV      0x0014
-#define PCI_REG_MWBASE_REV_CCL  0x0018
-#define PCI_REG_ERR_ADDR        0x001C
-#define PCI_REG_SPEC_INTACK     0x0020
-#define PCI_REG_ID              0x0100
-#define PCI_REG_STATCMD         0x0104
-#define PCI_REG_CLASSREV        0x0108
-#define PCI_REG_PARAM           0x010C
-#define PCI_REG_MBAR            0x0110
-#define PCI_REG_TIMEOUT         0x0140
-
-/* PCI controller block register bits */
-#define PCI_CMEM_E              (1 << 28)       /* enable cacheable memory */
-#define PCI_CMEM_CMBASE(x)      (((x) & 0x3fff) << 14)
-#define PCI_CMEM_CMMASK(x)      ((x) & 0x3fff)
-#define PCI_CONFIG_ERD          (1 << 27) /* pci error during R/W */
-#define PCI_CONFIG_ET           (1 << 26) /* error in target mode */
-#define PCI_CONFIG_EF           (1 << 25) /* fatal error */
-#define PCI_CONFIG_EP           (1 << 24) /* parity error */
-#define PCI_CONFIG_EM           (1 << 23) /* multiple errors */
-#define PCI_CONFIG_BM           (1 << 22) /* bad master error */
-#define PCI_CONFIG_PD           (1 << 20) /* PCI Disable */
-#define PCI_CONFIG_BME          (1 << 19) /* Byte Mask Enable for reads */
-#define PCI_CONFIG_NC           (1 << 16) /* mark mem access non-coherent */
-#define PCI_CONFIG_IA           (1 << 15) /* INTA# enabled (target mode) */
-#define PCI_CONFIG_IP           (1 << 13) /* int on PCI_PERR# */
-#define PCI_CONFIG_IS           (1 << 12) /* int on PCI_SERR# */
-#define PCI_CONFIG_IMM          (1 << 11) /* int on master abort */
-#define PCI_CONFIG_ITM          (1 << 10) /* int on target abort (as master) */
-#define PCI_CONFIG_ITT          (1 << 9)  /* int on target abort (as target) */
-#define PCI_CONFIG_IPB          (1 << 8)  /* int on PERR# in bus master acc */
-#define PCI_CONFIG_SIC_NO       (0 << 6)  /* no byte mask changes */
-#define PCI_CONFIG_SIC_BA_ADR   (1 << 6)  /* on byte/hw acc, invert adr bits */
-#define PCI_CONFIG_SIC_HWA_DAT  (2 << 6)  /* on halfword acc, swap data */
-#define PCI_CONFIG_SIC_ALL      (3 << 6)  /* swap data bytes on all accesses */
-#define PCI_CONFIG_ST           (1 << 5)  /* swap data by target transactions */
-#define PCI_CONFIG_SM           (1 << 4)  /* swap data from PCI ctl */
-#define PCI_CONFIG_AEN          (1 << 3)  /* enable internal arbiter */
-#define PCI_CONFIG_R2H          (1 << 2)  /* REQ2# to hi-prio arbiter */
-#define PCI_CONFIG_R1H          (1 << 1)  /* REQ1# to hi-prio arbiter */
-#define PCI_CONFIG_CH           (1 << 0)  /* PCI ctl to hi-prio arbiter */
-#define PCI_B2BMASK_B2BMASK(x)  (((x) & 0xffff) << 16)
-#define PCI_B2BMASK_CCH(x)      ((x) & 0xffff) /* 16 upper bits of class code */
-#define PCI_B2BBASE0_VID_B0(x)  (((x) & 0xffff) << 16)
-#define PCI_B2BBASE0_VID_SV(x)  ((x) & 0xffff)
-#define PCI_B2BBASE1_SID_B1(x)  (((x) & 0xffff) << 16)
-#define PCI_B2BBASE1_SID_SI(x)  ((x) & 0xffff)
-#define PCI_MWMASKDEV_MWMASK(x) (((x) & 0xffff) << 16)
-#define PCI_MWMASKDEV_DEVID(x)  ((x) & 0xffff)
-#define PCI_MWBASEREVCCL_BASE(x) (((x) & 0xffff) << 16)
-#define PCI_MWBASEREVCCL_REV(x)  (((x) & 0xff) << 8)
-#define PCI_MWBASEREVCCL_CCL(x)  ((x) & 0xff)
-#define PCI_ID_DID(x)           (((x) & 0xffff) << 16)
-#define PCI_ID_VID(x)           ((x) & 0xffff)
-#define PCI_STATCMD_STATUS(x)   (((x) & 0xffff) << 16)
-#define PCI_STATCMD_CMD(x)      ((x) & 0xffff)
-#define PCI_CLASSREV_CLASS(x)   (((x) & 0x00ffffff) << 8)
-#define PCI_CLASSREV_REV(x)     ((x) & 0xff)
-#define PCI_PARAM_BIST(x)       (((x) & 0xff) << 24)
-#define PCI_PARAM_HT(x)         (((x) & 0xff) << 16)
-#define PCI_PARAM_LT(x)         (((x) & 0xff) << 8)
-#define PCI_PARAM_CLS(x)        ((x) & 0xff)
-#define PCI_TIMEOUT_RETRIES(x)  (((x) & 0xff) << 8)     /* max retries */
-#define PCI_TIMEOUT_TO(x)       ((x) & 0xff)    /* target ready timeout */
-
 #endif
diff --git a/arch/mips/include/asm/mach-au1x00/au1000_dma.h b/arch/mips/include/asm/mach-au1x00/au1000_dma.h
index 7cedca5a305c..0a0cd4270c6f 100644
--- a/arch/mips/include/asm/mach-au1x00/au1000_dma.h
+++ b/arch/mips/include/asm/mach-au1x00/au1000_dma.h
@@ -106,7 +106,7 @@ enum {
 struct dma_chan {
         int dev_id;             /* this channel is allocated if >= 0, */
                                 /* free otherwise */
-        unsigned int io;
+        void __iomem *io;
         const char *dev_str;
         int irq;
         void *irq_dev;
@@ -157,7 +157,7 @@ static inline void enable_dma_buffer0(unsigned int dmanr)
 
         if (!chan)
                 return;
-        au_writel(DMA_BE0, chan->io + DMA_MODE_SET);
+        __raw_writel(DMA_BE0, chan->io + DMA_MODE_SET);
 }
 
 static inline void enable_dma_buffer1(unsigned int dmanr)
@@ -166,7 +166,7 @@ static inline void enable_dma_buffer1(unsigned int dmanr)
 
         if (!chan)
                 return;
-        au_writel(DMA_BE1, chan->io + DMA_MODE_SET);
+        __raw_writel(DMA_BE1, chan->io + DMA_MODE_SET);
 }
 static inline void enable_dma_buffers(unsigned int dmanr)
 {
@@ -174,7 +174,7 @@ static inline void enable_dma_buffers(unsigned int dmanr)
 
         if (!chan)
                 return;
-        au_writel(DMA_BE0 | DMA_BE1, chan->io + DMA_MODE_SET);
+        __raw_writel(DMA_BE0 | DMA_BE1, chan->io + DMA_MODE_SET);
 }
 
 static inline void start_dma(unsigned int dmanr)
@@ -183,7 +183,7 @@ static inline void start_dma(unsigned int dmanr)
 
         if (!chan)
                 return;
-        au_writel(DMA_GO, chan->io + DMA_MODE_SET);
+        __raw_writel(DMA_GO, chan->io + DMA_MODE_SET);
 }
 
 #define DMA_HALT_POLL 0x5000
@@ -195,11 +195,11 @@ static inline void halt_dma(unsigned int dmanr)
 
         if (!chan)
                 return;
-        au_writel(DMA_GO, chan->io + DMA_MODE_CLEAR);
+        __raw_writel(DMA_GO, chan->io + DMA_MODE_CLEAR);
 
         /* Poll the halt bit */
         for (i = 0; i < DMA_HALT_POLL; i++)
-                if (au_readl(chan->io + DMA_MODE_READ) & DMA_HALT)
+                if (__raw_readl(chan->io + DMA_MODE_READ) & DMA_HALT)
                         break;
         if (i == DMA_HALT_POLL)
                 printk(KERN_INFO "halt_dma: HALT poll expired!\n");
@@ -215,7 +215,7 @@ static inline void disable_dma(unsigned int dmanr)
         halt_dma(dmanr);
 
         /* Now we can disable the buffers */
-        au_writel(~DMA_GO, chan->io + DMA_MODE_CLEAR);
+        __raw_writel(~DMA_GO, chan->io + DMA_MODE_CLEAR);
 }
 
 static inline int dma_halted(unsigned int dmanr)
@@ -224,7 +224,7 @@ static inline int dma_halted(unsigned int dmanr)
 
         if (!chan)
                 return 1;
-        return (au_readl(chan->io + DMA_MODE_READ) & DMA_HALT) ? 1 : 0;
+        return (__raw_readl(chan->io + DMA_MODE_READ) & DMA_HALT) ? 1 : 0;
 }
 
 /* Initialize a DMA channel. */
@@ -239,14 +239,14 @@ static inline void init_dma(unsigned int dmanr)
         disable_dma(dmanr);
 
         /* Set device FIFO address */
-        au_writel(CPHYSADDR(chan->fifo_addr), chan->io + DMA_PERIPHERAL_ADDR);
+        __raw_writel(CPHYSADDR(chan->fifo_addr), chan->io + DMA_PERIPHERAL_ADDR);
 
         mode = chan->mode | (chan->dev_id << DMA_DID_BIT);
         if (chan->irq)
                 mode |= DMA_IE;
 
-        au_writel(~mode, chan->io + DMA_MODE_CLEAR);
-        au_writel(mode,  chan->io + DMA_MODE_SET);
+        __raw_writel(~mode, chan->io + DMA_MODE_CLEAR);
+        __raw_writel(mode,       chan->io + DMA_MODE_SET);
 }
 
 /*
@@ -283,7 +283,7 @@ static inline int get_dma_active_buffer(unsigned int dmanr)
 
         if (!chan)
                 return -1;
-        return (au_readl(chan->io + DMA_MODE_READ) & DMA_AB) ? 1 : 0;
+        return (__raw_readl(chan->io + DMA_MODE_READ) & DMA_AB) ? 1 : 0;
 }
 
 /*
@@ -304,7 +304,7 @@ static inline void set_dma_fifo_addr(unsigned int dmanr, unsigned int a)
         if (chan->dev_id != DMA_ID_GP04 && chan->dev_id != DMA_ID_GP05)
                 return;
 
-        au_writel(CPHYSADDR(a), chan->io + DMA_PERIPHERAL_ADDR);
+        __raw_writel(CPHYSADDR(a), chan->io + DMA_PERIPHERAL_ADDR);
 }
 
 /*
@@ -316,7 +316,7 @@ static inline void clear_dma_done0(unsigned int dmanr)
 
         if (!chan)
                 return;
-        au_writel(DMA_D0, chan->io + DMA_MODE_CLEAR);
+        __raw_writel(DMA_D0, chan->io + DMA_MODE_CLEAR);
 }
 
 static inline void clear_dma_done1(unsigned int dmanr)
@@ -325,7 +325,7 @@ static inline void clear_dma_done1(unsigned int dmanr)
 
         if (!chan)
                 return;
-        au_writel(DMA_D1, chan->io + DMA_MODE_CLEAR);
+        __raw_writel(DMA_D1, chan->io + DMA_MODE_CLEAR);
 }
 
 /*
@@ -344,7 +344,7 @@ static inline void set_dma_addr0(unsigned int dmanr, unsigned int a)
 
         if (!chan)
                 return;
-        au_writel(a, chan->io + DMA_BUFFER0_START);
+        __raw_writel(a, chan->io + DMA_BUFFER0_START);
 }
 
 /*
@@ -356,7 +356,7 @@ static inline void set_dma_addr1(unsigned int dmanr, unsigned int a)
 
         if (!chan)
                 return;
-        au_writel(a, chan->io + DMA_BUFFER1_START);
+        __raw_writel(a, chan->io + DMA_BUFFER1_START);
 }
 
 
@@ -370,7 +370,7 @@ static inline void set_dma_count0(unsigned int dmanr, unsigned int count)
         if (!chan)
                 return;
         count &= DMA_COUNT_MASK;
-        au_writel(count, chan->io + DMA_BUFFER0_COUNT);
+        __raw_writel(count, chan->io + DMA_BUFFER0_COUNT);
 }
 
 /*
@@ -383,7 +383,7 @@ static inline void set_dma_count1(unsigned int dmanr, unsigned int count)
         if (!chan)
                 return;
         count &= DMA_COUNT_MASK;
-        au_writel(count, chan->io + DMA_BUFFER1_COUNT);
+        __raw_writel(count, chan->io + DMA_BUFFER1_COUNT);
 }
 
 /*
@@ -396,8 +396,8 @@ static inline void set_dma_count(unsigned int dmanr, unsigned int count)
         if (!chan)
                 return;
         count &= DMA_COUNT_MASK;
-        au_writel(count, chan->io + DMA_BUFFER0_COUNT);
-        au_writel(count, chan->io + DMA_BUFFER1_COUNT);
+        __raw_writel(count, chan->io + DMA_BUFFER0_COUNT);
+        __raw_writel(count, chan->io + DMA_BUFFER1_COUNT);
 }
 
 /*
@@ -410,7 +410,7 @@ static inline unsigned int get_dma_buffer_done(unsigned int dmanr)
 
         if (!chan)
                 return 0;
-        return au_readl(chan->io + DMA_MODE_READ) & (DMA_D0 | DMA_D1);
+        return __raw_readl(chan->io + DMA_MODE_READ) & (DMA_D0 | DMA_D1);
 }
 
 
@@ -437,10 +437,10 @@ static inline int get_dma_residue(unsigned int dmanr)
         if (!chan)
                 return 0;
 
-        curBufCntReg = (au_readl(chan->io + DMA_MODE_READ) & DMA_AB) ?
+        curBufCntReg = (__raw_readl(chan->io + DMA_MODE_READ) & DMA_AB) ?
             DMA_BUFFER1_COUNT : DMA_BUFFER0_COUNT;
 
-        count = au_readl(chan->io + curBufCntReg) & DMA_COUNT_MASK;
+        count = __raw_readl(chan->io + curBufCntReg) & DMA_COUNT_MASK;
 
         if ((chan->mode & DMA_DW_MASK) == DMA_DW16)
                 count <<= 1;
diff --git a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h b/arch/mips/include/asm/mach-au1x00/gpio-au1000.h
index 796afd051c35..9785e4ebb450 100644
--- a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/gpio-au1000.h
@@ -25,20 +25,20 @@
 #define MAKE_IRQ(intc, off)     (AU1000_INTC##intc##_INT_BASE + (off))
 
 /* GPIO1 registers within SYS_ area */
-#define SYS_TRIOUTRD            0x100
-#define SYS_TRIOUTCLR           0x100
-#define SYS_OUTPUTRD            0x108
-#define SYS_OUTPUTSET           0x108
-#define SYS_OUTPUTCLR           0x10C
-#define SYS_PINSTATERD          0x110
-#define SYS_PININPUTEN          0x110
+#define AU1000_SYS_TRIOUTRD     0x100
+#define AU1000_SYS_TRIOUTCLR    0x100
+#define AU1000_SYS_OUTPUTRD     0x108
+#define AU1000_SYS_OUTPUTSET    0x108
+#define AU1000_SYS_OUTPUTCLR    0x10C
+#define AU1000_SYS_PINSTATERD   0x110
+#define AU1000_SYS_PININPUTEN   0x110
 
 /* register offsets within GPIO2 block */
-#define GPIO2_DIR               0x00
-#define GPIO2_OUTPUT            0x08
-#define GPIO2_PINSTATE          0x0C
-#define GPIO2_INTENABLE         0x10
-#define GPIO2_ENABLE            0x14
+#define AU1000_GPIO2_DIR        0x00
+#define AU1000_GPIO2_OUTPUT     0x08
+#define AU1000_GPIO2_PINSTATE   0x0C
+#define AU1000_GPIO2_INTENABLE  0x10
+#define AU1000_GPIO2_ENABLE     0x14
 
 struct gpio;
 
@@ -217,26 +217,21 @@ static inline int au1200_irq_to_gpio(int irq)
  */
 static inline void alchemy_gpio1_set_value(int gpio, int v)
 {
-        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
         unsigned long mask = 1 << (gpio - ALCHEMY_GPIO1_BASE);
-        unsigned long r = v ? SYS_OUTPUTSET : SYS_OUTPUTCLR;
-        __raw_writel(mask, base + r);
-        wmb();
+        unsigned long r = v ? AU1000_SYS_OUTPUTSET : AU1000_SYS_OUTPUTCLR;
+        alchemy_wrsys(mask, r);
 }
 
 static inline int alchemy_gpio1_get_value(int gpio)
 {
-        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
         unsigned long mask = 1 << (gpio - ALCHEMY_GPIO1_BASE);
-        return __raw_readl(base + SYS_PINSTATERD) & mask;
+        return alchemy_rdsys(AU1000_SYS_PINSTATERD) & mask;
 }
 
 static inline int alchemy_gpio1_direction_input(int gpio)
 {
-        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
         unsigned long mask = 1 << (gpio - ALCHEMY_GPIO1_BASE);
-        __raw_writel(mask, base + SYS_TRIOUTCLR);
-        wmb();
+        alchemy_wrsys(mask, AU1000_SYS_TRIOUTCLR);
         return 0;
 }
 
@@ -279,13 +274,13 @@ static inline void __alchemy_gpio2_mod_dir(int gpio, int to_out)
 {
         void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
         unsigned long mask = 1 << (gpio - ALCHEMY_GPIO2_BASE);
-        unsigned long d = __raw_readl(base + GPIO2_DIR);
+        unsigned long d = __raw_readl(base + AU1000_GPIO2_DIR);
 
         if (to_out)
                 d |= mask;
         else
                 d &= ~mask;
-        __raw_writel(d, base + GPIO2_DIR);
+        __raw_writel(d, base + AU1000_GPIO2_DIR);
         wmb();
 }
 
@@ -294,14 +289,15 @@ static inline void alchemy_gpio2_set_value(int gpio, int v)
         void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
         unsigned long mask;
         mask = ((v) ? 0x00010001 : 0x00010000) << (gpio - ALCHEMY_GPIO2_BASE);
-        __raw_writel(mask, base + GPIO2_OUTPUT);
+        __raw_writel(mask, base + AU1000_GPIO2_OUTPUT);
         wmb();
 }
 
 static inline int alchemy_gpio2_get_value(int gpio)
 {
         void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
-        return __raw_readl(base + GPIO2_PINSTATE) & (1 << (gpio - ALCHEMY_GPIO2_BASE));
+        return __raw_readl(base + AU1000_GPIO2_PINSTATE) &
+                                (1 << (gpio - ALCHEMY_GPIO2_BASE));
 }
 
 static inline int alchemy_gpio2_direction_input(int gpio)
@@ -352,12 +348,12 @@ static inline int alchemy_gpio2_to_irq(int gpio)
 static inline void __alchemy_gpio2_mod_int(int gpio2, int en)
 {
         void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
-        unsigned long r = __raw_readl(base + GPIO2_INTENABLE);
+        unsigned long r = __raw_readl(base + AU1000_GPIO2_INTENABLE);
         if (en)
                 r |= 1 << gpio2;
         else
                 r &= ~(1 << gpio2);
-        __raw_writel(r, base + GPIO2_INTENABLE);
+        __raw_writel(r, base + AU1000_GPIO2_INTENABLE);
         wmb();
 }
 
@@ -434,9 +430,9 @@ static inline void alchemy_gpio2_disable_int(int gpio2)
 static inline void alchemy_gpio2_enable(void)
 {
         void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
-        __raw_writel(3, base + GPIO2_ENABLE);   /* reset, clock enabled */
+        __raw_writel(3, base + AU1000_GPIO2_ENABLE);    /* reset, clock enabled */
         wmb();
-        __raw_writel(1, base + GPIO2_ENABLE);   /* clock enabled */
+        __raw_writel(1, base + AU1000_GPIO2_ENABLE);    /* clock enabled */
         wmb();
 }
 
@@ -448,7 +444,7 @@ static inline void alchemy_gpio2_enable(void)
 static inline void alchemy_gpio2_disable(void)
 {
         void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
-        __raw_writel(2, base + GPIO2_ENABLE);   /* reset, clock disabled */
+        __raw_writel(2, base + AU1000_GPIO2_ENABLE);    /* reset, clock disabled */
         wmb();
 }
 
diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
index bba7399a49a3..1f5643b89a91 100644
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
@@ -18,6 +18,7 @@ enum bcm47xx_board {
         BCM47XX_BOARD_ASUS_WL300G,
         BCM47XX_BOARD_ASUS_WL320GE,
         BCM47XX_BOARD_ASUS_WL330GE,
+        BCM47XX_BOARD_ASUS_WL500G,
         BCM47XX_BOARD_ASUS_WL500GD,
         BCM47XX_BOARD_ASUS_WL500GPV1,
         BCM47XX_BOARD_ASUS_WL500GPV2,
@@ -70,11 +71,15 @@ enum bcm47xx_board {
         BCM47XX_BOARD_LINKSYS_WRT310NV1,
         BCM47XX_BOARD_LINKSYS_WRT310NV2,
         BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
-        BCM47XX_BOARD_LINKSYS_WRT54G,
+        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
+        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
+        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708,
         BCM47XX_BOARD_LINKSYS_WRT610NV1,
         BCM47XX_BOARD_LINKSYS_WRT610NV2,
         BCM47XX_BOARD_LINKSYS_WRTSL54GS,
 
+        BCM47XX_BOARD_MICROSOFT_MN700,
+
         BCM47XX_BOARD_MOTOROLA_WE800G,
         BCM47XX_BOARD_MOTOROLA_WR850GP,
         BCM47XX_BOARD_MOTOROLA_WR850GV2V3,
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
index 3112f08f0c72..56bb19219d48 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
@@ -19,118 +19,68 @@
 #define BCM6368_CPU_ID          0x6368
 
 void __init bcm63xx_cpu_init(void);
-u16 __bcm63xx_get_cpu_id(void);
 u8 bcm63xx_get_cpu_rev(void);
 unsigned int bcm63xx_get_cpu_freq(void);
 
+static inline u16 __pure __bcm63xx_get_cpu_id(const u16 cpu_id)
+{
+        switch (cpu_id) {
 #ifdef CONFIG_BCM63XX_CPU_3368
-# ifdef bcm63xx_get_cpu_id
-#  undef bcm63xx_get_cpu_id
-#  define bcm63xx_get_cpu_id()  __bcm63xx_get_cpu_id()
-#  define BCMCPU_RUNTIME_DETECT
-# else
-#  define bcm63xx_get_cpu_id()  BCM3368_CPU_ID
-# endif
-# define BCMCPU_IS_3368()       (bcm63xx_get_cpu_id() == BCM3368_CPU_ID)
-#else
-# define BCMCPU_IS_3368()       (0)
+                case BCM3368_CPU_ID:
 #endif
 
 #ifdef CONFIG_BCM63XX_CPU_6328
-# ifdef bcm63xx_get_cpu_id
-#  undef bcm63xx_get_cpu_id
-#  define bcm63xx_get_cpu_id()  __bcm63xx_get_cpu_id()
-#  define BCMCPU_RUNTIME_DETECT
-# else
-#  define bcm63xx_get_cpu_id()  BCM6328_CPU_ID
-# endif
-# define BCMCPU_IS_6328()       (bcm63xx_get_cpu_id() == BCM6328_CPU_ID)
-#else
-# define BCMCPU_IS_6328()       (0)
+                case BCM6328_CPU_ID:
 #endif
 
 #ifdef CONFIG_BCM63XX_CPU_6338
-# ifdef bcm63xx_get_cpu_id
-#  undef bcm63xx_get_cpu_id
-#  define bcm63xx_get_cpu_id()  __bcm63xx_get_cpu_id()
-#  define BCMCPU_RUNTIME_DETECT
-# else
-#  define bcm63xx_get_cpu_id()  BCM6338_CPU_ID
-# endif
-# define BCMCPU_IS_6338()       (bcm63xx_get_cpu_id() == BCM6338_CPU_ID)
-#else
-# define BCMCPU_IS_6338()       (0)
+                case BCM6338_CPU_ID:
 #endif
 
 #ifdef CONFIG_BCM63XX_CPU_6345
-# ifdef bcm63xx_get_cpu_id
-#  undef bcm63xx_get_cpu_id
-#  define bcm63xx_get_cpu_id()  __bcm63xx_get_cpu_id()
-#  define BCMCPU_RUNTIME_DETECT
-# else
-#  define bcm63xx_get_cpu_id()  BCM6345_CPU_ID
-# endif
-# define BCMCPU_IS_6345()       (bcm63xx_get_cpu_id() == BCM6345_CPU_ID)
-#else
-# define BCMCPU_IS_6345()       (0)
+                case BCM6345_CPU_ID:
 #endif
 
 #ifdef CONFIG_BCM63XX_CPU_6348
-# ifdef bcm63xx_get_cpu_id
-#  undef bcm63xx_get_cpu_id
-#  define bcm63xx_get_cpu_id()  __bcm63xx_get_cpu_id()
-#  define BCMCPU_RUNTIME_DETECT
-# else
-#  define bcm63xx_get_cpu_id()  BCM6348_CPU_ID
-# endif
-# define BCMCPU_IS_6348()       (bcm63xx_get_cpu_id() == BCM6348_CPU_ID)
-#else
-# define BCMCPU_IS_6348()       (0)
+                case BCM6348_CPU_ID:
 #endif
 
 #ifdef CONFIG_BCM63XX_CPU_6358
-# ifdef bcm63xx_get_cpu_id
-#  undef bcm63xx_get_cpu_id
-#  define bcm63xx_get_cpu_id()  __bcm63xx_get_cpu_id()
-#  define BCMCPU_RUNTIME_DETECT
-# else
-#  define bcm63xx_get_cpu_id()  BCM6358_CPU_ID
-# endif
-# define BCMCPU_IS_6358()       (bcm63xx_get_cpu_id() == BCM6358_CPU_ID)
-#else
-# define BCMCPU_IS_6358()       (0)
+                case BCM6358_CPU_ID:
 #endif
 
 #ifdef CONFIG_BCM63XX_CPU_6362
-# ifdef bcm63xx_get_cpu_id
-#  undef bcm63xx_get_cpu_id
-#  define bcm63xx_get_cpu_id()  __bcm63xx_get_cpu_id()
-#  define BCMCPU_RUNTIME_DETECT
-# else
-#  define bcm63xx_get_cpu_id()  BCM6362_CPU_ID
-# endif
-# define BCMCPU_IS_6362()       (bcm63xx_get_cpu_id() == BCM6362_CPU_ID)
-#else
-# define BCMCPU_IS_6362()       (0)
+                case BCM6362_CPU_ID:
 #endif
 
-
 #ifdef CONFIG_BCM63XX_CPU_6368
-# ifdef bcm63xx_get_cpu_id
-#  undef bcm63xx_get_cpu_id
-#  define bcm63xx_get_cpu_id()  __bcm63xx_get_cpu_id()
-#  define BCMCPU_RUNTIME_DETECT
-# else
-#  define bcm63xx_get_cpu_id()  BCM6368_CPU_ID
-# endif
-# define BCMCPU_IS_6368()       (bcm63xx_get_cpu_id() == BCM6368_CPU_ID)
-#else
-# define BCMCPU_IS_6368()       (0)
+                case BCM6368_CPU_ID:
 #endif
+                break;
+        default:
+                unreachable();
+        }
 
-#ifndef bcm63xx_get_cpu_id
-#error "No CPU support configured"
-#endif
+        return cpu_id;
+}
+
+extern u16 bcm63xx_cpu_id;
+
+static inline u16 __pure bcm63xx_get_cpu_id(void)
+{
+        const u16 cpu_id = bcm63xx_cpu_id;
+
+        return __bcm63xx_get_cpu_id(cpu_id);
+}
+
+#define BCMCPU_IS_3368()        (bcm63xx_get_cpu_id() == BCM3368_CPU_ID)
+#define BCMCPU_IS_6328()        (bcm63xx_get_cpu_id() == BCM6328_CPU_ID)
+#define BCMCPU_IS_6338()        (bcm63xx_get_cpu_id() == BCM6338_CPU_ID)
+#define BCMCPU_IS_6345()        (bcm63xx_get_cpu_id() == BCM6345_CPU_ID)
+#define BCMCPU_IS_6348()        (bcm63xx_get_cpu_id() == BCM6348_CPU_ID)
+#define BCMCPU_IS_6358()        (bcm63xx_get_cpu_id() == BCM6358_CPU_ID)
+#define BCMCPU_IS_6362()        (bcm63xx_get_cpu_id() == BCM6362_CPU_ID)
+#define BCMCPU_IS_6368()        (bcm63xx_get_cpu_id() == BCM6368_CPU_ID)
 
 /*
  * While registers sets are (mostly) the same across 63xx CPU, base
@@ -598,55 +548,6 @@ enum bcm63xx_regs_set {
 
 extern const unsigned long *bcm63xx_regs_base;
 
-#define __GEN_RSET_BASE(__cpu, __rset)                                  \
-        case RSET_## __rset :                                           \
-                return BCM_## __cpu ##_## __rset ##_BASE;
-
-#define __GEN_RSET(__cpu)                                               \
-        switch (set) {                                                  \
-        __GEN_RSET_BASE(__cpu, DSL_LMEM)                                \
-        __GEN_RSET_BASE(__cpu, PERF)                                    \
-        __GEN_RSET_BASE(__cpu, TIMER)                                   \
-        __GEN_RSET_BASE(__cpu, WDT)                                     \
-        __GEN_RSET_BASE(__cpu, UART0)                                   \
-        __GEN_RSET_BASE(__cpu, UART1)                                   \
-        __GEN_RSET_BASE(__cpu, GPIO)                                    \
-        __GEN_RSET_BASE(__cpu, SPI)                                     \
-        __GEN_RSET_BASE(__cpu, HSSPI)                                   \
-        __GEN_RSET_BASE(__cpu, UDC0)                                    \
-        __GEN_RSET_BASE(__cpu, OHCI0)                                   \
-        __GEN_RSET_BASE(__cpu, OHCI_PRIV)                               \
-        __GEN_RSET_BASE(__cpu, USBH_PRIV)                               \
-        __GEN_RSET_BASE(__cpu, USBD)                                    \
-        __GEN_RSET_BASE(__cpu, USBDMA)                                  \
-        __GEN_RSET_BASE(__cpu, MPI)                                     \
-        __GEN_RSET_BASE(__cpu, PCMCIA)                                  \
-        __GEN_RSET_BASE(__cpu, PCIE)                                    \
-        __GEN_RSET_BASE(__cpu, DSL)                                     \
-        __GEN_RSET_BASE(__cpu, ENET0)                                   \
-        __GEN_RSET_BASE(__cpu, ENET1)                                   \
-        __GEN_RSET_BASE(__cpu, ENETDMA)                                 \
-        __GEN_RSET_BASE(__cpu, ENETDMAC)                                \
-        __GEN_RSET_BASE(__cpu, ENETDMAS)                                \
-        __GEN_RSET_BASE(__cpu, ENETSW)                                  \
-        __GEN_RSET_BASE(__cpu, EHCI0)                                   \
-        __GEN_RSET_BASE(__cpu, SDRAM)                                   \
-        __GEN_RSET_BASE(__cpu, MEMC)                                    \
-        __GEN_RSET_BASE(__cpu, DDR)                                     \
-        __GEN_RSET_BASE(__cpu, M2M)                                     \
-        __GEN_RSET_BASE(__cpu, ATM)                                     \
-        __GEN_RSET_BASE(__cpu, XTM)                                     \
-        __GEN_RSET_BASE(__cpu, XTMDMA)                                  \
-        __GEN_RSET_BASE(__cpu, XTMDMAC)                                 \
-        __GEN_RSET_BASE(__cpu, XTMDMAS)                                 \
-        __GEN_RSET_BASE(__cpu, PCM)                                     \
-        __GEN_RSET_BASE(__cpu, PCMDMA)                                  \
-        __GEN_RSET_BASE(__cpu, PCMDMAC)                                 \
-        __GEN_RSET_BASE(__cpu, PCMDMAS)                                 \
-        __GEN_RSET_BASE(__cpu, RNG)                                     \
-        __GEN_RSET_BASE(__cpu, MISC)                                    \
-        }
-
 #define __GEN_CPU_REGS_TABLE(__cpu)                                     \
         [RSET_DSL_LMEM]         = BCM_## __cpu ##_DSL_LMEM_BASE,        \
         [RSET_PERF]             = BCM_## __cpu ##_PERF_BASE,            \
@@ -693,36 +594,7 @@ extern const unsigned long *bcm63xx_regs_base;
 
 static inline unsigned long bcm63xx_regset_address(enum bcm63xx_regs_set set)
 {
-#ifdef BCMCPU_RUNTIME_DETECT
         return bcm63xx_regs_base[set];
-#else
-#ifdef CONFIG_BCM63XX_CPU_3368
-        __GEN_RSET(3368)
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6328
-        __GEN_RSET(6328)
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6338
-        __GEN_RSET(6338)
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6345
-        __GEN_RSET(6345)
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6348
-        __GEN_RSET(6348)
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6358
-        __GEN_RSET(6358)
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6362
-        __GEN_RSET(6362)
-#endif
-#ifdef CONFIG_BCM63XX_CPU_6368
-        __GEN_RSET(6368)
-#endif
-#endif
-        /* unreached */
-        return 0;
 }
 
 /*
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
index 753953e86242..466fc85899f4 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
@@ -112,55 +112,9 @@ enum bcm63xx_regs_enetdmac {
 
 static inline unsigned long bcm63xx_enetdmacreg(enum bcm63xx_regs_enetdmac reg)
 {
-#ifdef BCMCPU_RUNTIME_DETECT
         extern const unsigned long *bcm63xx_regs_enetdmac;
 
         return bcm63xx_regs_enetdmac[reg];
-#else
-#ifdef CONFIG_BCM63XX_CPU_6345
-        switch (reg) {
-        case ENETDMAC_CHANCFG:
-                return ENETDMA_6345_CHANCFG_REG;
-        case ENETDMAC_IR:
-                return ENETDMA_6345_IR_REG;
-        case ENETDMAC_IRMASK:
-                return ENETDMA_6345_IRMASK_REG;
-        case ENETDMAC_MAXBURST:
-                return ENETDMA_6345_MAXBURST_REG;
-        case ENETDMAC_BUFALLOC:
-                return ENETDMA_6345_BUFALLOC_REG;
-        case ENETDMAC_RSTART:
-                return ENETDMA_6345_RSTART_REG;
-        case ENETDMAC_FC:
-                return ENETDMA_6345_FC_REG;
-        case ENETDMAC_LEN:
-                return ENETDMA_6345_LEN_REG;
-        }
-#endif
-#if defined(CONFIG_BCM63XX_CPU_6328) || \
-        defined(CONFIG_BCM63XX_CPU_6338) || \
-        defined(CONFIG_BCM63XX_CPU_6348) || \
-        defined(CONFIG_BCM63XX_CPU_6358) || \
-        defined(CONFIG_BCM63XX_CPU_6362) || \
-        defined(CONFIG_BCM63XX_CPU_6368)
-        switch (reg) {
-        case ENETDMAC_CHANCFG:
-                return ENETDMAC_CHANCFG_REG;
-        case ENETDMAC_IR:
-                return ENETDMAC_IR_REG;
-        case ENETDMAC_IRMASK:
-                return ENETDMAC_IRMASK_REG;
-        case ENETDMAC_MAXBURST:
-                return ENETDMAC_MAXBURST_REG;
-        case ENETDMAC_BUFALLOC:
-        case ENETDMAC_RSTART:
-        case ENETDMAC_FC:
-        case ENETDMAC_LEN:
-                return 0;
-        }
-#endif
-#endif
-        return 0;
 }
 
 
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
index c426cabc620a..25737655d141 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
@@ -30,26 +30,6 @@ enum bcm63xx_regs_spi {
         SPI_RX_DATA,
 };
 
-#define __GEN_SPI_RSET_BASE(__cpu, __rset)                              \
-        case SPI_## __rset:                                             \
-                return SPI_## __cpu ##_## __rset;
-
-#define __GEN_SPI_RSET(__cpu)                                           \
-        switch (reg) {                                                  \
-        __GEN_SPI_RSET_BASE(__cpu, CMD)                                 \
-        __GEN_SPI_RSET_BASE(__cpu, INT_STATUS)                          \
-        __GEN_SPI_RSET_BASE(__cpu, INT_MASK_ST)                         \
-        __GEN_SPI_RSET_BASE(__cpu, INT_MASK)                            \
-        __GEN_SPI_RSET_BASE(__cpu, ST)                                  \
-        __GEN_SPI_RSET_BASE(__cpu, CLK_CFG)                             \
-        __GEN_SPI_RSET_BASE(__cpu, FILL_BYTE)                           \
-        __GEN_SPI_RSET_BASE(__cpu, MSG_TAIL)                            \
-        __GEN_SPI_RSET_BASE(__cpu, RX_TAIL)                             \
-        __GEN_SPI_RSET_BASE(__cpu, MSG_CTL)                             \
-        __GEN_SPI_RSET_BASE(__cpu, MSG_DATA)                            \
-        __GEN_SPI_RSET_BASE(__cpu, RX_DATA)                             \
-        }
-
 #define __GEN_SPI_REGS_TABLE(__cpu)                                     \
         [SPI_CMD]               = SPI_## __cpu ##_CMD,                  \
         [SPI_INT_STATUS]        = SPI_## __cpu ##_INT_STATUS,           \
@@ -66,20 +46,9 @@ enum bcm63xx_regs_spi {
 
 static inline unsigned long bcm63xx_spireg(enum bcm63xx_regs_spi reg)
 {
-#ifdef BCMCPU_RUNTIME_DETECT
         extern const unsigned long *bcm63xx_regs_spi;
 
         return bcm63xx_regs_spi[reg];
-#else
-#if defined(CONFIG_BCM63XX_CPU_6338) || defined(CONFIG_BCM63XX_CPU_6348)
-        __GEN_SPI_RSET(6348)
-#endif
-#if defined(CONFIG_BCM63XX_CPU_6358) || defined(CONFIG_BCM63XX_CPU_6362) || \
-        defined(CONFIG_BCM63XX_CPU_6368)
-        __GEN_SPI_RSET(6358)
-#endif
-#endif
-        return 0;
 }
 
 #endif /* BCM63XX_DEV_SPI_H */
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
index ab427f8814e6..4794067cb5a7 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
@@ -215,23 +215,23 @@
 
 /* Interrupt Mask register */
 #define PERF_IRQMASK_3368_REG           0xc
-#define PERF_IRQMASK_6328_REG           0x20
+#define PERF_IRQMASK_6328_REG(x)        (0x20 + (x) * 0x10)
 #define PERF_IRQMASK_6338_REG           0xc
 #define PERF_IRQMASK_6345_REG           0xc
 #define PERF_IRQMASK_6348_REG           0xc
-#define PERF_IRQMASK_6358_REG           0xc
-#define PERF_IRQMASK_6362_REG           0x20
-#define PERF_IRQMASK_6368_REG           0x20
+#define PERF_IRQMASK_6358_REG(x)        (0xc + (x) * 0x2c)
+#define PERF_IRQMASK_6362_REG(x)        (0x20 + (x) * 0x10)
+#define PERF_IRQMASK_6368_REG(x)        (0x20 + (x) * 0x10)
 
 /* Interrupt Status register */
 #define PERF_IRQSTAT_3368_REG           0x10
-#define PERF_IRQSTAT_6328_REG           0x28
+#define PERF_IRQSTAT_6328_REG(x)        (0x28 + (x) * 0x10)
 #define PERF_IRQSTAT_6338_REG           0x10
 #define PERF_IRQSTAT_6345_REG           0x10
 #define PERF_IRQSTAT_6348_REG           0x10
-#define PERF_IRQSTAT_6358_REG           0x10
-#define PERF_IRQSTAT_6362_REG           0x28
-#define PERF_IRQSTAT_6368_REG           0x28
+#define PERF_IRQSTAT_6358_REG(x)        (0x10 + (x) * 0x2c)
+#define PERF_IRQSTAT_6362_REG(x)        (0x28 + (x) * 0x10)
+#define PERF_IRQSTAT_6368_REG(x)        (0x28 + (x) * 0x10)
 
 /* External Interrupt Configuration register */
 #define PERF_EXTIRQ_CFG_REG_3368        0x14
diff --git a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
index e9c408e8ff4c..bc1167dbd4e3 100644
--- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
@@ -24,7 +24,7 @@
 #define cpu_has_smartmips               0
 #define cpu_has_vtag_icache             0
 
-#if !defined(BCMCPU_RUNTIME_DETECT) && (defined(CONFIG_BCM63XX_CPU_6348) || defined(CONFIG_BCM63XX_CPU_6345) || defined(CONFIG_BCM63XX_CPU_6338))
+#if !defined(CONFIG_SYS_HAS_CPU_BMIPS4350)
 #define cpu_has_dc_aliases              0
 #endif
 
diff --git a/arch/mips/include/asm/mach-loongson/boot_param.h b/arch/mips/include/asm/mach-loongson/boot_param.h
index 829a7ec185fb..3388fc53599e 100644
--- a/arch/mips/include/asm/mach-loongson/boot_param.h
+++ b/arch/mips/include/asm/mach-loongson/boot_param.h
@@ -146,6 +146,9 @@ struct boot_params {
 
 struct loongson_system_configuration {
         u32 nr_cpus;
+        u32 nr_nodes;
+        int cores_per_node;
+        int cores_per_package;
         enum loongson_cpu_type cputype;
         u64 ht_control_base;
         u64 pci_mem_start_addr;
@@ -160,4 +163,5 @@ struct loongson_system_configuration {
 
 extern struct efi_memory_map_loongson *loongson_memmap;
 extern struct loongson_system_configuration loongson_sysconf;
+extern int cpuhotplug_workaround;
 #endif
diff --git a/arch/mips/include/asm/mach-loongson/kernel-entry-init.h b/arch/mips/include/asm/mach-loongson/kernel-entry-init.h
new file mode 100644
index 000000000000..df5fca8eeb80
--- /dev/null
+++ b/arch/mips/include/asm/mach-loongson/kernel-entry-init.h
@@ -0,0 +1,52 @@
+/*
+ * 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) 2005 Embedded Alley Solutions, Inc
+ * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 2009 Jiajie Chen (chenjiajie@cse.buaa.edu.cn)
+ * Copyright (C) 2012 Huacai Chen (chenhc@lemote.com)
+ */
+#ifndef __ASM_MACH_LOONGSON_KERNEL_ENTRY_H
+#define __ASM_MACH_LOONGSON_KERNEL_ENTRY_H
+
+/*
+ * Override macros used in arch/mips/kernel/head.S.
+ */
+        .macro  kernel_entry_setup
+#ifdef CONFIG_CPU_LOONGSON3
+        .set    push
+        .set    mips64
+        /* Set LPA on LOONGSON3 config3 */
+        mfc0    t0, $16, 3
+        or      t0, (0x1 << 7)
+        mtc0    t0, $16, 3
+        /* Set ELPA on LOONGSON3 pagegrain */
+        li      t0, (0x1 << 29)
+        mtc0    t0, $5, 1
+        _ehb
+        .set    pop
+#endif
+        .endm
+
+/*
+ * Do SMP slave processor setup.
+ */
+        .macro  smp_slave_setup
+#ifdef CONFIG_CPU_LOONGSON3
+        .set    push
+        .set    mips64
+        /* Set LPA on LOONGSON3 config3 */
+        mfc0    t0, $16, 3
+        or      t0, (0x1 << 7)
+        mtc0    t0, $16, 3
+        /* Set ELPA on LOONGSON3 pagegrain */
+        li      t0, (0x1 << 29)
+        mtc0    t0, $5, 1
+        _ehb
+        .set    pop
+#endif
+        .endm
+
+#endif /* __ASM_MACH_LOONGSON_KERNEL_ENTRY_H */
diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h
index f3fd1eb8e3dd..92bf76c21441 100644
--- a/arch/mips/include/asm/mach-loongson/loongson.h
+++ b/arch/mips/include/asm/mach-loongson/loongson.h
@@ -249,8 +249,15 @@ static inline void do_perfcnt_IRQ(void)
 #define LOONGSON_PXARB_CFG              LOONGSON_REG(LOONGSON_REGBASE + 0x68)
 #define LOONGSON_PXARB_STATUS           LOONGSON_REG(LOONGSON_REGBASE + 0x6c)
 
-/* Chip Config */
-#define LOONGSON_CHIPCFG0               LOONGSON_REG(LOONGSON_REGBASE + 0x80)
+#define MAX_PACKAGES 4
+
+/* Chip Config registor of each physical cpu package, PRid >= Loongson-2F */
+extern u64 loongson_chipcfg[MAX_PACKAGES];
+#define LOONGSON_CHIPCFG(id) (*(volatile u32 *)(loongson_chipcfg[id]))
+
+/* Freq Control register of each physical cpu package, PRid >= Loongson-3B */
+extern u64 loongson_freqctrl[MAX_PACKAGES];
+#define LOONGSON_FREQCTRL(id) (*(volatile u32 *)(loongson_freqctrl[id]))
 
 /* pcimap */
 
diff --git a/arch/mips/include/asm/mach-loongson/machine.h b/arch/mips/include/asm/mach-loongson/machine.h
index 1b1f592fa2be..228e37847a36 100644
--- a/arch/mips/include/asm/mach-loongson/machine.h
+++ b/arch/mips/include/asm/mach-loongson/machine.h
@@ -24,10 +24,10 @@
 
 #endif
 
-#ifdef CONFIG_LEMOTE_MACH3A
+#ifdef CONFIG_LOONGSON_MACH3X
 
 #define LOONGSON_MACHTYPE MACH_LEMOTE_A1101
 
-#endif /* CONFIG_LEMOTE_MACH3A */
+#endif /* CONFIG_LOONGSON_MACH3X */
 
 #endif /* __ASM_MACH_LOONGSON_MACHINE_H */
diff --git a/arch/mips/include/asm/mach-loongson/mmzone.h b/arch/mips/include/asm/mach-loongson/mmzone.h
new file mode 100644
index 000000000000..37c08a27b4f0
--- /dev/null
+++ b/arch/mips/include/asm/mach-loongson/mmzone.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2010 Loongson Inc. & Lemote Inc. &
+ *                    Insititute of Computing Technology
+ * Author:  Xiang Gao, gaoxiang@ict.ac.cn
+ *          Huacai Chen, chenhc@lemote.com
+ *          Xiaofu Meng, Shuangshuang Zhang
+ *
+ * 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.
+ */
+#ifndef _ASM_MACH_MMZONE_H
+#define _ASM_MACH_MMZONE_H
+
+#include <boot_param.h>
+#define NODE_ADDRSPACE_SHIFT 44
+#define NODE0_ADDRSPACE_OFFSET 0x000000000000UL
+#define NODE1_ADDRSPACE_OFFSET 0x100000000000UL
+#define NODE2_ADDRSPACE_OFFSET 0x200000000000UL
+#define NODE3_ADDRSPACE_OFFSET 0x300000000000UL
+
+#define pa_to_nid(addr)  (((addr) & 0xf00000000000) >> NODE_ADDRSPACE_SHIFT)
+
+#define LEVELS_PER_SLICE 128
+
+struct slice_data {
+        unsigned long irq_enable_mask[2];
+        int level_to_irq[LEVELS_PER_SLICE];
+};
+
+struct hub_data {
+        cpumask_t       h_cpus;
+        unsigned long slice_map;
+        unsigned long irq_alloc_mask[2];
+        struct slice_data slice[2];
+};
+
+struct node_data {
+        struct pglist_data pglist;
+        struct hub_data hub;
+        cpumask_t cpumask;
+};
+
+extern struct node_data *__node_data[];
+
+#define NODE_DATA(n)            (&__node_data[(n)]->pglist)
+#define hub_data(n)             (&__node_data[(n)]->hub)
+
+extern void setup_zero_pages(void);
+extern void __init prom_init_numa_memory(void);
+
+#endif /* _ASM_MACH_MMZONE_H */
diff --git a/arch/mips/include/asm/mach-loongson/topology.h b/arch/mips/include/asm/mach-loongson/topology.h
new file mode 100644
index 000000000000..5598ba77d2ef
--- /dev/null
+++ b/arch/mips/include/asm/mach-loongson/topology.h
@@ -0,0 +1,23 @@
+#ifndef _ASM_MACH_TOPOLOGY_H
+#define _ASM_MACH_TOPOLOGY_H
+
+#ifdef CONFIG_NUMA
+
+#define cpu_to_node(cpu)        ((cpu) >> 2)
+#define parent_node(node)       (node)
+#define cpumask_of_node(node)   (&__node_data[(node)]->cpumask)
+
+struct pci_bus;
+extern int pcibus_to_node(struct pci_bus *);
+
+#define cpumask_of_pcibus(bus)  (cpu_online_mask)
+
+extern unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES];
+
+#define node_distance(from, to) (__node_distances[(from)][(to)])
+
+#endif
+
+#include <asm-generic/topology.h>
+
+#endif /* _ASM_MACH_TOPOLOGY_H */
diff --git a/arch/mips/include/asm/mach-malta/irq.h b/arch/mips/include/asm/mach-malta/irq.h
index 47cfe64efbb0..f2c13d211abb 100644
--- a/arch/mips/include/asm/mach-malta/irq.h
+++ b/arch/mips/include/asm/mach-malta/irq.h
@@ -2,6 +2,7 @@
 #define __ASM_MACH_MIPS_IRQ_H
 
 
+#define GIC_NUM_INTRS (24 + NR_CPUS * 2)
 #define NR_IRQS 256
 
 #include_next <irq.h>
diff --git a/arch/mips/include/asm/mach-sead3/irq.h b/arch/mips/include/asm/mach-sead3/irq.h
index 5d154cfbcf4c..d8106f75b9af 100644
--- a/arch/mips/include/asm/mach-sead3/irq.h
+++ b/arch/mips/include/asm/mach-sead3/irq.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_MACH_MIPS_IRQ_H
 #define __ASM_MACH_MIPS_IRQ_H
 
+#define GIC_NUM_INTRS (24 + NR_CPUS * 2)
 #define NR_IRQS 256
 
 
diff --git a/arch/mips/include/asm/mips-boards/bonito64.h b/arch/mips/include/asm/mips-boards/bonito64.h
index b2048d1bcc1c..5368891d424b 100644
--- a/arch/mips/include/asm/mips-boards/bonito64.h
+++ b/arch/mips/include/asm/mips-boards/bonito64.h
@@ -414,7 +414,6 @@ extern unsigned long _pcictrl_bonito_pcicfg;
 
 
 #define BONITO_PCIMEMBASECFG_ADDRMASK(WIN, CFG)  ((((CFG) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK) >> BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT) << BONITO_PCIMEMBASECFG_ASHIFT)
-#define BONITO_PCIMEMBASECFG_ADDRMASK(WIN, CFG)  ((((CFG) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK) >> BONITO_PCIMEMBASECFG_MEMBASE##WIN##_MASK_SHIFT) << BONITO_PCIMEMBASECFG_ASHIFT)
 #define BONITO_PCIMEMBASECFG_ADDRTRANS(WIN, CFG) ((((CFG) & BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS) >> BONITO_PCIMEMBASECFG_MEMBASE##WIN##_TRANS_SHIFT) << BONITO_PCIMEMBASECFG_ASHIFT)
 
 #define BONITO_PCITOPHYS(WIN, ADDR, CFG)          ( \
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 98e9754a4b6b..cf3b580c3df6 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -265,6 +265,7 @@
 #define PG_XIE          (_ULCAST_(1) <<  30)
 #define PG_ELPA         (_ULCAST_(1) <<  29)
 #define PG_ESP          (_ULCAST_(1) <<  28)
+#define PG_IEC          (_ULCAST_(1) <<  27)
 
 /*
  * R4x00 interrupt enable / cause bits
@@ -630,7 +631,6 @@
 #define MIPS_CONF4_MMUSIZEEXT_SHIFT     (0)
 #define MIPS_CONF4_MMUSIZEEXT   (_ULCAST_(255) << 0)
 #define MIPS_CONF4_FTLBSETS_SHIFT       (0)
-#define MIPS_CONF4_FTLBSETS_SHIFT       (0)
 #define MIPS_CONF4_FTLBSETS     (_ULCAST_(15) << MIPS_CONF4_FTLBSETS_SHIFT)
 #define MIPS_CONF4_FTLBWAYS_SHIFT       (4)
 #define MIPS_CONF4_FTLBWAYS     (_ULCAST_(15) << MIPS_CONF4_FTLBWAYS_SHIFT)
@@ -652,6 +652,7 @@
 
 #define MIPS_CONF5_NF           (_ULCAST_(1) << 0)
 #define MIPS_CONF5_UFR          (_ULCAST_(1) << 2)
+#define MIPS_CONF5_MRP          (_ULCAST_(1) << 3)
 #define MIPS_CONF5_MSAEN        (_ULCAST_(1) << 27)
 #define MIPS_CONF5_EVA          (_ULCAST_(1) << 28)
 #define MIPS_CONF5_CV           (_ULCAST_(1) << 29)
@@ -668,6 +669,12 @@
 #define MIPS_CONF7_IAR          (_ULCAST_(1) << 10)
 #define MIPS_CONF7_AR           (_ULCAST_(1) << 16)
 
+/* MAAR bit definitions */
+#define MIPS_MAAR_ADDR          ((BIT_ULL(BITS_PER_LONG - 12) - 1) << 12)
+#define MIPS_MAAR_ADDR_SHIFT    12
+#define MIPS_MAAR_S             (_ULCAST_(1) << 1)
+#define MIPS_MAAR_V             (_ULCAST_(1) << 0)
+
 /*  EntryHI bit definition */
 #define MIPS_ENTRYHI_EHINV      (_ULCAST_(1) << 10)
 
@@ -706,6 +713,37 @@
 #define MIPS_SEGCFG_MK          _ULCAST_(1)
 #define MIPS_SEGCFG_UK          _ULCAST_(0)
 
+#define MIPS_PWFIELD_GDI_SHIFT  24
+#define MIPS_PWFIELD_GDI_MASK   0x3f000000
+#define MIPS_PWFIELD_UDI_SHIFT  18
+#define MIPS_PWFIELD_UDI_MASK   0x00fc0000
+#define MIPS_PWFIELD_MDI_SHIFT  12
+#define MIPS_PWFIELD_MDI_MASK   0x0003f000
+#define MIPS_PWFIELD_PTI_SHIFT  6
+#define MIPS_PWFIELD_PTI_MASK   0x00000fc0
+#define MIPS_PWFIELD_PTEI_SHIFT 0
+#define MIPS_PWFIELD_PTEI_MASK  0x0000003f
+
+#define MIPS_PWSIZE_GDW_SHIFT   24
+#define MIPS_PWSIZE_GDW_MASK    0x3f000000
+#define MIPS_PWSIZE_UDW_SHIFT   18
+#define MIPS_PWSIZE_UDW_MASK    0x00fc0000
+#define MIPS_PWSIZE_MDW_SHIFT   12
+#define MIPS_PWSIZE_MDW_MASK    0x0003f000
+#define MIPS_PWSIZE_PTW_SHIFT   6
+#define MIPS_PWSIZE_PTW_MASK    0x00000fc0
+#define MIPS_PWSIZE_PTEW_SHIFT  0
+#define MIPS_PWSIZE_PTEW_MASK   0x0000003f
+
+#define MIPS_PWCTL_PWEN_SHIFT   31
+#define MIPS_PWCTL_PWEN_MASK    0x80000000
+#define MIPS_PWCTL_DPH_SHIFT    7
+#define MIPS_PWCTL_DPH_MASK     0x00000080
+#define MIPS_PWCTL_HUGEPG_SHIFT 6
+#define MIPS_PWCTL_HUGEPG_MASK  0x00000060
+#define MIPS_PWCTL_PSN_SHIFT    0
+#define MIPS_PWCTL_PSN_MASK     0x0000003f
+
 #ifndef __ASSEMBLY__
 
 /*
@@ -1044,6 +1082,11 @@ do {									\
 #define write_c0_config6(val)   __write_32bit_c0_register($16, 6, val)
 #define write_c0_config7(val)   __write_32bit_c0_register($16, 7, val)
 
+#define read_c0_maar()          __read_ulong_c0_register($17, 1)
+#define write_c0_maar(val)      __write_ulong_c0_register($17, 1, val)
+#define read_c0_maari()         __read_32bit_c0_register($17, 2)
+#define write_c0_maari(val)     __write_32bit_c0_register($17, 2, val)
+
 /*
  * The WatchLo register.  There may be up to 8 of them.
  */
@@ -1201,6 +1244,19 @@ do {									\
 #define read_c0_segctl2()       __read_32bit_c0_register($5, 4)
 #define write_c0_segctl2(val)   __write_32bit_c0_register($5, 4, val)
 
+/* Hardware Page Table Walker */
+#define read_c0_pwbase()        __read_ulong_c0_register($5, 5)
+#define write_c0_pwbase(val)    __write_ulong_c0_register($5, 5, val)
+
+#define read_c0_pwfield()       __read_ulong_c0_register($5, 6)
+#define write_c0_pwfield(val)   __write_ulong_c0_register($5, 6, val)
+
+#define read_c0_pwsize()        __read_ulong_c0_register($5, 7)
+#define write_c0_pwsize(val)    __write_ulong_c0_register($5, 7, val)
+
+#define read_c0_pwctl()         __read_32bit_c0_register($6, 6)
+#define write_c0_pwctl(val)     __write_32bit_c0_register($6, 6, val)
+
 /* Cavium OCTEON (cnMIPS) */
 #define read_c0_cvmcount()      __read_ulong_c0_register($9, 6)
 #define write_c0_cvmcount(val)  __write_ulong_c0_register($9, 6, val)
diff --git a/arch/mips/include/asm/mmu_context.h b/arch/mips/include/asm/mmu_context.h
index 2e373da5f8e9..2f82568a3ee4 100644
--- a/arch/mips/include/asm/mmu_context.h
+++ b/arch/mips/include/asm/mmu_context.h
@@ -20,10 +20,20 @@
 #include <asm/tlbflush.h>
 #include <asm-generic/mm_hooks.h>
 
+#define htw_set_pwbase(pgd)                                             \
+do {                                                                    \
+        if (cpu_has_htw) {                                              \
+                write_c0_pwbase(pgd);                                   \
+                back_to_back_c0_hazard();                               \
+                htw_reset();                                            \
+        }                                                               \
+} while (0)
+
 #define TLBMISS_HANDLER_SETUP_PGD(pgd)                                  \
 do {                                                                    \
         extern void tlbmiss_handler_setup_pgd(unsigned long);           \
         tlbmiss_handler_setup_pgd((unsigned long)(pgd));                \
+        htw_set_pwbase((unsigned long)pgd);                             \
 } while (0)
 
 #ifdef CONFIG_MIPS_PGD_C0_CONTEXT
diff --git a/arch/mips/include/asm/msa.h b/arch/mips/include/asm/msa.h
index 538f6d482db8..af5638b12c75 100644
--- a/arch/mips/include/asm/msa.h
+++ b/arch/mips/include/asm/msa.h
@@ -12,8 +12,11 @@
 
 #include <asm/mipsregs.h>
 
+#ifndef __ASSEMBLY__
+
 extern void _save_msa(struct task_struct *);
 extern void _restore_msa(struct task_struct *);
+extern void _init_msa_upper(void);
 
 static inline void enable_msa(void)
 {
@@ -112,10 +115,10 @@ static inline unsigned int read_msa_##name(void)		\
         "       .set    push\n"                                 \
         "       .set    noat\n"                                 \
         "       .insn\n"                                        \
-        "       .word   #CFC_MSA_INSN | (" #cs " << 11)\n"      \
+        "       .word   %1 | (" #cs " << 11)\n"                 \
         "       move    %0, $1\n"                               \
         "       .set    pop\n"                                  \
-        : "=r"(reg));                                           \
+        : "=r"(reg) : "i"(CFC_MSA_INSN));                       \
         return reg;                                             \
 }                                                               \
                                                                 \
@@ -126,22 +129,13 @@ static inline void write_msa_##name(unsigned int val)		\
         "       .set    noat\n"                                 \
         "       move    $1, %0\n"                               \
         "       .insn\n"                                        \
-        "       .word   #CTC_MSA_INSN | (" #cs " << 6)\n"       \
+        "       .word   %1 | (" #cs " << 6)\n"                  \
         "       .set    pop\n"                                  \
-        : : "r"(val));                                          \
+        : : "r"(val), "i"(CTC_MSA_INSN));                       \
 }
 
 #endif /* !TOOLCHAIN_SUPPORTS_MSA */
 
-#define MSA_IR          0
-#define MSA_CSR         1
-#define MSA_ACCESS      2
-#define MSA_SAVE        3
-#define MSA_MODIFY      4
-#define MSA_REQUEST     5
-#define MSA_MAP         6
-#define MSA_UNMAP       7
-
 __BUILD_MSA_CTL_REG(ir, 0)
 __BUILD_MSA_CTL_REG(csr, 1)
 __BUILD_MSA_CTL_REG(access, 2)
@@ -151,6 +145,17 @@ __BUILD_MSA_CTL_REG(request, 5)
 __BUILD_MSA_CTL_REG(map, 6)
 __BUILD_MSA_CTL_REG(unmap, 7)
 
+#endif /* !__ASSEMBLY__ */
+
+#define MSA_IR          0
+#define MSA_CSR         1
+#define MSA_ACCESS      2
+#define MSA_SAVE        3
+#define MSA_MODIFY      4
+#define MSA_REQUEST     5
+#define MSA_MAP         6
+#define MSA_UNMAP       7
+
 /* MSA Implementation Register (MSAIR) */
 #define MSA_IR_REVB             0
 #define MSA_IR_REVF             (_ULCAST_(0xff) << MSA_IR_REVB)
diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
index 7b7818d1e4d5..2298199a287e 100644
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@ -228,6 +228,7 @@ enum cvmx_board_types_enum {
          */
         CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
         CVMX_BOARD_TYPE_UBNT_E100 = 20002,
+        CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
         CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
 
         /* The remaining range is reserved for future use. */
@@ -327,6 +328,7 @@ static inline const char *cvmx_board_type_to_string(enum
                     /* Customer private range */
                 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
                 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
+                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
                 ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
         }
         return "Unsupported Board";
diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h
index b4204c179b97..cd7d6064bcbe 100644
--- a/arch/mips/include/asm/pgtable-32.h
+++ b/arch/mips/include/asm/pgtable-32.h
@@ -18,6 +18,18 @@
 
 #include <asm-generic/pgtable-nopmd.h>
 
+extern int temp_tlb_entry __cpuinitdata;
+
+/*
+ * - add_temporary_entry() add a temporary TLB entry. We use TLB entries
+ *      starting at the top and working down. This is for populating the
+ *      TLB before trap_init() puts the TLB miss handler in place. It
+ *      should be used only for entries matching the actual page tables,
+ *      to prevent inconsistencies.
+ */
+extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
+                               unsigned long entryhi, unsigned long pagemask);
+
 /*
  * Basically we have the same two-level (which is the logical three level
  * Linux page table layout folded) page tables as the i386.  Some day
diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
index 539ddd148bbb..027c74db13f9 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -97,6 +97,31 @@ extern void paging_init(void);
 
 #define pmd_page_vaddr(pmd)     pmd_val(pmd)
 
+#define htw_stop()                                                      \
+do {                                                                    \
+        if (cpu_has_htw)                                                \
+                write_c0_pwctl(read_c0_pwctl() &                        \
+                               ~(1 << MIPS_PWCTL_PWEN_SHIFT));          \
+} while(0)
+
+#define htw_start()                                                     \
+do {                                                                    \
+        if (cpu_has_htw)                                                \
+                write_c0_pwctl(read_c0_pwctl() |                        \
+                               (1 << MIPS_PWCTL_PWEN_SHIFT));           \
+} while(0)
+
+
+#define htw_reset()                                                     \
+do {                                                                    \
+        if (cpu_has_htw) {                                              \
+                htw_stop();                                             \
+                back_to_back_c0_hazard();                               \
+                htw_start();                                            \
+                back_to_back_c0_hazard();                               \
+        }                                                               \
+} while(0)
+
 #if defined(CONFIG_64BIT_PHYS_ADDR) && defined(CONFIG_CPU_MIPS32)
 
 #define pte_none(pte)           (!(((pte).pte_low | (pte).pte_high) & ~_PAGE_GLOBAL))
@@ -131,6 +156,7 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt
                 null.pte_low = null.pte_high = _PAGE_GLOBAL;
 
         set_pte_at(mm, addr, ptep, null);
+        htw_reset();
 }
 #else
 
@@ -168,6 +194,7 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt
         else
 #endif
                 set_pte_at(mm, addr, ptep, __pte(0));
+        htw_reset();
 }
 #endif
 
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h
index d5098bc554f4..05f08438a7c4 100644
--- a/arch/mips/include/asm/processor.h
+++ b/arch/mips/include/asm/processor.h
@@ -238,7 +238,13 @@ typedef struct {
         unsigned long seg;
 } mm_segment_t;
 
-#define ARCH_MIN_TASKALIGN      8
+#ifdef CONFIG_CPU_HAS_MSA
+# define ARCH_MIN_TASKALIGN     16
+# define FPU_ALIGN              __aligned(16)
+#else
+# define ARCH_MIN_TASKALIGN     8
+# define FPU_ALIGN
+#endif
 
 struct mips_abi;
 
@@ -255,7 +261,7 @@ struct thread_struct {
         unsigned long cp0_status;
 
         /* Saved fpu/fpu emulator stuff. */
-        struct mips_fpu_struct fpu;
+        struct mips_fpu_struct fpu FPU_ALIGN;
 #ifdef CONFIG_MIPS_MT_FPAFF
         /* Emulated instruction count */
         unsigned long emulated_fp;
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h
index 7e6e682aece3..fc783f843bdc 100644
--- a/arch/mips/include/asm/ptrace.h
+++ b/arch/mips/include/asm/ptrace.h
@@ -23,7 +23,7 @@
 struct pt_regs {
 #ifdef CONFIG_32BIT
         /* Pad bytes for argument save space on the stack. */
-        unsigned long pad0[6];
+        unsigned long pad0[8];
 #endif
 
         /* Saved main processor registers. */
@@ -47,8 +47,10 @@ struct pt_regs {
 
 struct task_struct;
 
-extern int ptrace_getregs(struct task_struct *child, __s64 __user *data);
-extern int ptrace_setregs(struct task_struct *child, __s64 __user *data);
+extern int ptrace_getregs(struct task_struct *child,
+        struct user_pt_regs __user *data);
+extern int ptrace_setregs(struct task_struct *child,
+        struct user_pt_regs __user *data);
 
 extern int ptrace_getfpregs(struct task_struct *child, __u32 __user *data);
 extern int ptrace_setfpregs(struct task_struct *child, __u32 __user *data);
diff --git a/arch/mips/include/asm/reg.h b/arch/mips/include/asm/reg.h
index 910e71a12466..84dc7e2e27a8 100644
--- a/arch/mips/include/asm/reg.h
+++ b/arch/mips/include/asm/reg.h
@@ -1,128 +1 @@
-/*
- * Various register offset definitions for debuggers, core file
- * examiners and whatnot.
- *
- * 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) 1995, 1999 Ralf Baechle
- * Copyright (C) 1995, 1999 Silicon Graphics
- */
-#ifndef __ASM_MIPS_REG_H
-#define __ASM_MIPS_REG_H
-
-
-#if defined(CONFIG_32BIT) || defined(WANT_COMPAT_REG_H)
-
-#define EF_R0                   6
-#define EF_R1                   7
-#define EF_R2                   8
-#define EF_R3                   9
-#define EF_R4                   10
-#define EF_R5                   11
-#define EF_R6                   12
-#define EF_R7                   13
-#define EF_R8                   14
-#define EF_R9                   15
-#define EF_R10                  16
-#define EF_R11                  17
-#define EF_R12                  18
-#define EF_R13                  19
-#define EF_R14                  20
-#define EF_R15                  21
-#define EF_R16                  22
-#define EF_R17                  23
-#define EF_R18                  24
-#define EF_R19                  25
-#define EF_R20                  26
-#define EF_R21                  27
-#define EF_R22                  28
-#define EF_R23                  29
-#define EF_R24                  30
-#define EF_R25                  31
-
-/*
- * k0/k1 unsaved
- */
-#define EF_R26                  32
-#define EF_R27                  33
-
-#define EF_R28                  34
-#define EF_R29                  35
-#define EF_R30                  36
-#define EF_R31                  37
-
-/*
- * Saved special registers
- */
-#define EF_LO                   38
-#define EF_HI                   39
-
-#define EF_CP0_EPC              40
-#define EF_CP0_BADVADDR         41
-#define EF_CP0_STATUS           42
-#define EF_CP0_CAUSE            43
-#define EF_UNUSED0              44
-
-#define EF_SIZE                 180
-
-#endif
-
-#if defined(CONFIG_64BIT) && !defined(WANT_COMPAT_REG_H)
-
-#define EF_R0                    0
-#define EF_R1                    1
-#define EF_R2                    2
-#define EF_R3                    3
-#define EF_R4                    4
-#define EF_R5                    5
-#define EF_R6                    6
-#define EF_R7                    7
-#define EF_R8                    8
-#define EF_R9                    9
-#define EF_R10                  10
-#define EF_R11                  11
-#define EF_R12                  12
-#define EF_R13                  13
-#define EF_R14                  14
-#define EF_R15                  15
-#define EF_R16                  16
-#define EF_R17                  17
-#define EF_R18                  18
-#define EF_R19                  19
-#define EF_R20                  20
-#define EF_R21                  21
-#define EF_R22                  22
-#define EF_R23                  23
-#define EF_R24                  24
-#define EF_R25                  25
-
-/*
- * k0/k1 unsaved
- */
-#define EF_R26                  26
-#define EF_R27                  27
-
-
-#define EF_R28                  28
-#define EF_R29                  29
-#define EF_R30                  30
-#define EF_R31                  31
-
-/*
- * Saved special registers
- */
-#define EF_LO                   32
-#define EF_HI                   33
-
-#define EF_CP0_EPC              34
-#define EF_CP0_BADVADDR         35
-#define EF_CP0_STATUS           36
-#define EF_CP0_CAUSE            37
-
-#define EF_SIZE                 304     /* size in bytes */
-
-#endif /* CONFIG_64BIT */
-
-#endif /* __ASM_MIPS_REG_H */
+#include <uapi/asm/reg.h>
diff --git a/arch/mips/include/asm/smp-cps.h b/arch/mips/include/asm/smp-cps.h
index a06a08a9afc6..326c16ebd589 100644
--- a/arch/mips/include/asm/smp-cps.h
+++ b/arch/mips/include/asm/smp-cps.h
@@ -31,11 +31,19 @@ extern void mips_cps_core_init(void);
 
 extern struct vpe_boot_config *mips_cps_boot_vpes(void);
 
-extern bool mips_cps_smp_in_use(void);
-
 extern void mips_cps_pm_save(void);
 extern void mips_cps_pm_restore(void);
 
+#ifdef CONFIG_MIPS_CPS
+
+extern bool mips_cps_smp_in_use(void);
+
+#else /* !CONFIG_MIPS_CPS */
+
+static inline bool mips_cps_smp_in_use(void) { return false; }
+
+#endif /* !CONFIG_MIPS_CPS */
+
 #else /* __ASSEMBLY__ */
 
 .extern mips_cps_bootcfg;
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h
index b037334fca22..1e0f20a9cdda 100644
--- a/arch/mips/include/asm/smp.h
+++ b/arch/mips/include/asm/smp.h
@@ -22,6 +22,7 @@
 
 extern int smp_num_siblings;
 extern cpumask_t cpu_sibling_map[];
+extern cpumask_t cpu_core_map[];
 
 #define raw_smp_processor_id() (current_thread_info()->cpu)
 
@@ -36,6 +37,11 @@ extern int __cpu_logical_map[NR_CPUS];
 
 #define NO_PROC_ID      (-1)
 
+#define topology_physical_package_id(cpu)       (cpu_data[cpu].package)
+#define topology_core_id(cpu)                   (cpu_data[cpu].core)
+#define topology_core_cpumask(cpu)              (&cpu_core_map[cpu])
+#define topology_thread_cpumask(cpu)            (&cpu_sibling_map[cpu])
+
 #define SMP_RESCHEDULE_YOURSELF 0x1     /* XXX braindead */
 #define SMP_CALL_FUNCTION       0x2
 /* Octeon - Tell another core to flush its icache */
diff --git a/arch/mips/include/asm/sparsemem.h b/arch/mips/include/asm/sparsemem.h
index d2da53c2c2f8..b1071c1e54f5 100644
--- a/arch/mips/include/asm/sparsemem.h
+++ b/arch/mips/include/asm/sparsemem.h
@@ -11,7 +11,7 @@
 #else
 # define SECTION_SIZE_BITS      28
 #endif
-#define MAX_PHYSMEM_BITS        35
+#define MAX_PHYSMEM_BITS        48
 
 #endif /* CONFIG_SPARSEMEM */
 #endif /* _MIPS_SPARSEMEM_H */
diff --git a/arch/mips/include/asm/user.h b/arch/mips/include/asm/user.h
deleted file mode 100644
index 6bad61b0a53a..000000000000
--- a/arch/mips/include/asm/user.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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) 1994, 1995, 1996, 1999 by Ralf Baechle
- */
-#ifndef _ASM_USER_H
-#define _ASM_USER_H
-
-#include <asm/page.h>
-#include <asm/reg.h>
-
-/*
- * Core file format: The core file is written in such a way that gdb
- * can understand it and provide useful information to the user (under
- * linux we use the `trad-core' bfd, NOT the irix-core).  The file
- * contents are as follows:
- *
- *  upage: 1 page consisting of a user struct that tells gdb
- *      what is present in the file.  Directly after this is a
- *      copy of the task_struct, which is currently not used by gdb,
- *      but it may come in handy at some point.  All of the registers
- *      are stored as part of the upage.  The upage should always be
- *      only one page long.
- *  data: The data segment follows next.  We use current->end_text to
- *      current->brk to pick up all of the user variables, plus any memory
- *      that may have been sbrk'ed.  No attempt is made to determine if a
- *      page is demand-zero or if a page is totally unused, we just cover
- *      the entire range.  All of the addresses are rounded in such a way
- *      that an integral number of pages is written.
- *  stack: We need the stack information in order to get a meaningful
- *      backtrace.  We need to write the data from usp to
- *      current->start_stack, so we round each of these in order to be able
- *      to write an integer number of pages.
- */
-struct user {
-        unsigned long   regs[EF_SIZE /          /* integer and fp regs */
-                        sizeof(unsigned long) + 64];
-        size_t          u_tsize;                /* text size (pages) */
-        size_t          u_dsize;                /* data size (pages) */
-        size_t          u_ssize;                /* stack size (pages) */
-        unsigned long   start_code;             /* text starting address */
-        unsigned long   start_data;             /* data starting address */
-        unsigned long   start_stack;            /* stack starting address */
-        long int        signal;                 /* signal causing core dump */
-        unsigned long   u_ar0;                  /* help gdb find registers */
-        unsigned long   magic;                  /* identifies a core file */
-        char            u_comm[32];             /* user command name */
-};
-
-#define NBPG                    PAGE_SIZE
-#define UPAGES                  1
-#define HOST_TEXT_START_ADDR    (u.start_code)
-#define HOST_DATA_START_ADDR    (u.start_data)
-#define HOST_STACK_END_ADDR     (u.start_stack + u.u_ssize * NBPG)
-
-#endif /* _ASM_USER_H */
diff --git a/arch/mips/include/uapi/asm/ptrace.h b/arch/mips/include/uapi/asm/ptrace.h
index b26f7e317279..bbcfb8ba8106 100644
--- a/arch/mips/include/uapi/asm/ptrace.h
+++ b/arch/mips/include/uapi/asm/ptrace.h
@@ -22,24 +22,27 @@
 #define DSP_CONTROL     77
 #define ACX             78
 
-#ifndef __KERNEL__
 /*
- * This struct defines the way the registers are stored on the stack during a
- * system call/exception. As usual the registers k0/k1 aren't being saved.
+ * This struct defines the registers as used by PTRACE_{GET,SET}REGS. The
+ * format is the same for both 32- and 64-bit processes. Registers for 32-bit
+ * processes are sign extended.
  */
+#ifdef __KERNEL__
+struct user_pt_regs {
+#else
 struct pt_regs {
+#endif
         /* Saved main processor registers. */
-        unsigned long regs[32];
+        __u64 regs[32];
 
         /* Saved special registers. */
-        unsigned long cp0_status;
-        unsigned long hi;
-        unsigned long lo;
-        unsigned long cp0_badvaddr;
-        unsigned long cp0_cause;
-        unsigned long cp0_epc;
+        __u64 lo;
+        __u64 hi;
+        __u64 cp0_epc;
+        __u64 cp0_badvaddr;
+        __u64 cp0_status;
+        __u64 cp0_cause;
 } __attribute__ ((aligned (8)));
-#endif /* __KERNEL__ */
 
 /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
 #define PTRACE_GETREGS          12
diff --git a/arch/mips/include/uapi/asm/reg.h b/arch/mips/include/uapi/asm/reg.h
new file mode 100644
index 000000000000..081e377f4f02
--- /dev/null
+++ b/arch/mips/include/uapi/asm/reg.h
@@ -0,0 +1,206 @@
+/*
+ * Various register offset definitions for debuggers, core file
+ * examiners and whatnot.
+ *
+ * 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) 1995, 1999 Ralf Baechle
+ * Copyright (C) 1995, 1999 Silicon Graphics
+ */
+#ifndef __UAPI_ASM_MIPS_REG_H
+#define __UAPI_ASM_MIPS_REG_H
+
+#define MIPS32_EF_R0            6
+#define MIPS32_EF_R1            7
+#define MIPS32_EF_R2            8
+#define MIPS32_EF_R3            9
+#define MIPS32_EF_R4            10
+#define MIPS32_EF_R5            11
+#define MIPS32_EF_R6            12
+#define MIPS32_EF_R7            13
+#define MIPS32_EF_R8            14
+#define MIPS32_EF_R9            15
+#define MIPS32_EF_R10           16
+#define MIPS32_EF_R11           17
+#define MIPS32_EF_R12           18
+#define MIPS32_EF_R13           19
+#define MIPS32_EF_R14           20
+#define MIPS32_EF_R15           21
+#define MIPS32_EF_R16           22
+#define MIPS32_EF_R17           23
+#define MIPS32_EF_R18           24
+#define MIPS32_EF_R19           25
+#define MIPS32_EF_R20           26
+#define MIPS32_EF_R21           27
+#define MIPS32_EF_R22           28
+#define MIPS32_EF_R23           29
+#define MIPS32_EF_R24           30
+#define MIPS32_EF_R25           31
+
+/*
+ * k0/k1 unsaved
+ */
+#define MIPS32_EF_R26           32
+#define MIPS32_EF_R27           33
+
+#define MIPS32_EF_R28           34
+#define MIPS32_EF_R29           35
+#define MIPS32_EF_R30           36
+#define MIPS32_EF_R31           37
+
+/*
+ * Saved special registers
+ */
+#define MIPS32_EF_LO            38
+#define MIPS32_EF_HI            39
+
+#define MIPS32_EF_CP0_EPC       40
+#define MIPS32_EF_CP0_BADVADDR  41
+#define MIPS32_EF_CP0_STATUS    42
+#define MIPS32_EF_CP0_CAUSE     43
+#define MIPS32_EF_UNUSED0       44
+
+#define MIPS32_EF_SIZE          180
+
+#define MIPS64_EF_R0            0
+#define MIPS64_EF_R1            1
+#define MIPS64_EF_R2            2
+#define MIPS64_EF_R3            3
+#define MIPS64_EF_R4            4
+#define MIPS64_EF_R5            5
+#define MIPS64_EF_R6            6
+#define MIPS64_EF_R7            7
+#define MIPS64_EF_R8            8
+#define MIPS64_EF_R9            9
+#define MIPS64_EF_R10           10
+#define MIPS64_EF_R11           11
+#define MIPS64_EF_R12           12
+#define MIPS64_EF_R13           13
+#define MIPS64_EF_R14           14
+#define MIPS64_EF_R15           15
+#define MIPS64_EF_R16           16
+#define MIPS64_EF_R17           17
+#define MIPS64_EF_R18           18
+#define MIPS64_EF_R19           19
+#define MIPS64_EF_R20           20
+#define MIPS64_EF_R21           21
+#define MIPS64_EF_R22           22
+#define MIPS64_EF_R23           23
+#define MIPS64_EF_R24           24
+#define MIPS64_EF_R25           25
+
+/*
+ * k0/k1 unsaved
+ */
+#define MIPS64_EF_R26           26
+#define MIPS64_EF_R27           27
+
+
+#define MIPS64_EF_R28           28
+#define MIPS64_EF_R29           29
+#define MIPS64_EF_R30           30
+#define MIPS64_EF_R31           31
+
+/*
+ * Saved special registers
+ */
+#define MIPS64_EF_LO            32
+#define MIPS64_EF_HI            33
+
+#define MIPS64_EF_CP0_EPC       34
+#define MIPS64_EF_CP0_BADVADDR  35
+#define MIPS64_EF_CP0_STATUS    36
+#define MIPS64_EF_CP0_CAUSE     37
+
+#define MIPS64_EF_SIZE          304     /* size in bytes */
+
+#if _MIPS_SIM == _MIPS_SIM_ABI32
+
+#define EF_R0                   MIPS32_EF_R0
+#define EF_R1                   MIPS32_EF_R1
+#define EF_R2                   MIPS32_EF_R2
+#define EF_R3                   MIPS32_EF_R3
+#define EF_R4                   MIPS32_EF_R4
+#define EF_R5                   MIPS32_EF_R5
+#define EF_R6                   MIPS32_EF_R6
+#define EF_R7                   MIPS32_EF_R7
+#define EF_R8                   MIPS32_EF_R8
+#define EF_R9                   MIPS32_EF_R9
+#define EF_R10                  MIPS32_EF_R10
+#define EF_R11                  MIPS32_EF_R11
+#define EF_R12                  MIPS32_EF_R12
+#define EF_R13                  MIPS32_EF_R13
+#define EF_R14                  MIPS32_EF_R14
+#define EF_R15                  MIPS32_EF_R15
+#define EF_R16                  MIPS32_EF_R16
+#define EF_R17                  MIPS32_EF_R17
+#define EF_R18                  MIPS32_EF_R18
+#define EF_R19                  MIPS32_EF_R19
+#define EF_R20                  MIPS32_EF_R20
+#define EF_R21                  MIPS32_EF_R21
+#define EF_R22                  MIPS32_EF_R22
+#define EF_R23                  MIPS32_EF_R23
+#define EF_R24                  MIPS32_EF_R24
+#define EF_R25                  MIPS32_EF_R25
+#define EF_R26                  MIPS32_EF_R26
+#define EF_R27                  MIPS32_EF_R27
+#define EF_R28                  MIPS32_EF_R28
+#define EF_R29                  MIPS32_EF_R29
+#define EF_R30                  MIPS32_EF_R30
+#define EF_R31                  MIPS32_EF_R31
+#define EF_LO                   MIPS32_EF_LO
+#define EF_HI                   MIPS32_EF_HI
+#define EF_CP0_EPC              MIPS32_EF_CP0_EPC
+#define EF_CP0_BADVADDR         MIPS32_EF_CP0_BADVADDR
+#define EF_CP0_STATUS           MIPS32_EF_CP0_STATUS
+#define EF_CP0_CAUSE            MIPS32_EF_CP0_CAUSE
+#define EF_UNUSED0              MIPS32_EF_UNUSED0
+#define EF_SIZE                 MIPS32_EF_SIZE
+
+#elif _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
+
+#define EF_R0                   MIPS64_EF_R0
+#define EF_R1                   MIPS64_EF_R1
+#define EF_R2                   MIPS64_EF_R2
+#define EF_R3                   MIPS64_EF_R3
+#define EF_R4                   MIPS64_EF_R4
+#define EF_R5                   MIPS64_EF_R5
+#define EF_R6                   MIPS64_EF_R6
+#define EF_R7                   MIPS64_EF_R7
+#define EF_R8                   MIPS64_EF_R8
+#define EF_R9                   MIPS64_EF_R9
+#define EF_R10                  MIPS64_EF_R10
+#define EF_R11                  MIPS64_EF_R11
+#define EF_R12                  MIPS64_EF_R12
+#define EF_R13                  MIPS64_EF_R13
+#define EF_R14                  MIPS64_EF_R14
+#define EF_R15                  MIPS64_EF_R15
+#define EF_R16                  MIPS64_EF_R16
+#define EF_R17                  MIPS64_EF_R17
+#define EF_R18                  MIPS64_EF_R18
+#define EF_R19                  MIPS64_EF_R19
+#define EF_R20                  MIPS64_EF_R20
+#define EF_R21                  MIPS64_EF_R21
+#define EF_R22                  MIPS64_EF_R22
+#define EF_R23                  MIPS64_EF_R23
+#define EF_R24                  MIPS64_EF_R24
+#define EF_R25                  MIPS64_EF_R25
+#define EF_R26                  MIPS64_EF_R26
+#define EF_R27                  MIPS64_EF_R27
+#define EF_R28                  MIPS64_EF_R28
+#define EF_R29                  MIPS64_EF_R29
+#define EF_R30                  MIPS64_EF_R30
+#define EF_R31                  MIPS64_EF_R31
+#define EF_LO                   MIPS64_EF_LO
+#define EF_HI                   MIPS64_EF_HI
+#define EF_CP0_EPC              MIPS64_EF_CP0_EPC
+#define EF_CP0_BADVADDR         MIPS64_EF_CP0_BADVADDR
+#define EF_CP0_STATUS           MIPS64_EF_CP0_STATUS
+#define EF_CP0_CAUSE            MIPS64_EF_CP0_CAUSE
+#define EF_SIZE                 MIPS64_EF_SIZE
+
+#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
+
+#endif /* __UAPI_ASM_MIPS_REG_H */
diff --git a/arch/mips/include/uapi/asm/unistd.h b/arch/mips/include/uapi/asm/unistd.h
index 5805414777e0..9bc13eaf9d67 100644
--- a/arch/mips/include/uapi/asm/unistd.h
+++ b/arch/mips/include/uapi/asm/unistd.h
@@ -372,16 +372,17 @@
 #define __NR_sched_setattr              (__NR_Linux + 349)
 #define __NR_sched_getattr              (__NR_Linux + 350)
 #define __NR_renameat2                  (__NR_Linux + 351)
+#define __NR_seccomp                    (__NR_Linux + 352)
 
 /*
  * Offset of the last Linux o32 flavoured syscall
  */
-#define __NR_Linux_syscalls             351
+#define __NR_Linux_syscalls             352
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         351
+#define __NR_O32_Linux_syscalls         352
 
 #if _MIPS_SIM == _MIPS_SIM_ABI64
 
@@ -701,16 +702,17 @@
 #define __NR_sched_setattr              (__NR_Linux + 309)
 #define __NR_sched_getattr              (__NR_Linux + 310)
 #define __NR_renameat2                  (__NR_Linux + 311)
+#define __NR_seccomp                    (__NR_Linux + 312)
 
 /*
  * Offset of the last Linux 64-bit flavoured syscall
  */
-#define __NR_Linux_syscalls             311
+#define __NR_Linux_syscalls             312
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          311
+#define __NR_64_Linux_syscalls          312
 
 #if _MIPS_SIM == _MIPS_SIM_NABI32
 
@@ -1034,15 +1036,16 @@
 #define __NR_sched_setattr              (__NR_Linux + 313)
 #define __NR_sched_getattr              (__NR_Linux + 314)
 #define __NR_renameat2                  (__NR_Linux + 315)
+#define __NR_seccomp                    (__NR_Linux + 316)
 
 /*
  * Offset of the last N32 flavoured syscall
  */
-#define __NR_Linux_syscalls             315
+#define __NR_Linux_syscalls             316
 
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         315
+#define __NR_N32_Linux_syscalls         316
 
 #endif /* _UAPI_ASM_UNISTD_H */
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index 088e92a79ae6..c454525e7695 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
+#include <linux/gpio/machine.h>
 
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
diff --git a/arch/mips/jz4740/clock-debugfs.c b/arch/mips/jz4740/clock-debugfs.c
index a8acdeff267e..325422d0d453 100644
--- a/arch/mips/jz4740/clock-debugfs.c
+++ b/arch/mips/jz4740/clock-debugfs.c
@@ -87,8 +87,7 @@ void jz4740_clock_debugfs_add_clk(struct clk *clk)
 /* TODO: Locking */
 void jz4740_clock_debugfs_update_parent(struct clk *clk)
 {
-        if (clk->debugfs_parent_entry)
-                debugfs_remove(clk->debugfs_parent_entry);
+        debugfs_remove(clk->debugfs_parent_entry);
 
         if (clk->parent) {
                 char parent_path[100];
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index a447101cf9f1..0b12f273cb2e 100644
--- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c
@@ -59,7 +59,7 @@ struct platform_device jz4740_usb_ohci_device = {
 
 /* USB Device Controller */
 struct platform_device jz4740_udc_xceiv_device = {
-        .name = "usb_phy_gen_xceiv",
+        .name = "usb_phy_generic",
         .id   = 0,
 };
 
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 4bb5107511e2..b1d84bd4efb3 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -234,6 +234,7 @@ void output_thread_fpu_defines(void)
                thread.fpu.fpr[31].val64[FPR_IDX(64, 0)]);
 
         OFFSET(THREAD_FCR31, task_struct, thread.fpu.fcr31);
+        OFFSET(THREAD_MSA_CSR, task_struct, thread.fpu.msacsr);
         BLANK();
 }
 
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
index 7faf5f2bee25..928767858b86 100644
--- a/arch/mips/kernel/binfmt_elfo32.c
+++ b/arch/mips/kernel/binfmt_elfo32.c
@@ -72,22 +72,6 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 
 #include <asm/processor.h>
 
-/*
- * When this file is selected, we are definitely running a 64bit kernel.
- * So using the right regs define in asm/reg.h
- */
-#define WANT_COMPAT_REG_H
-
-/* These MUST be defined before elf.h gets included */
-extern void elf32_core_copy_regs(elf_gregset_t grp, struct pt_regs *regs);
-#define ELF_CORE_COPY_REGS(_dest, _regs) elf32_core_copy_regs(_dest, _regs);
-#define ELF_CORE_COPY_TASK_REGS(_tsk, _dest)                            \
-({                                                                      \
-        int __res = 1;                                                  \
-        elf32_core_copy_regs(*(_dest), task_pt_regs(_tsk));             \
-        __res;                                                          \
-})
-
 #include <linux/module.h>
 #include <linux/elfcore.h>
 #include <linux/compat.h>
@@ -145,28 +129,6 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
         value->tv_usec = rem / NSEC_PER_USEC;
 }
 
-void elf32_core_copy_regs(elf_gregset_t grp, struct pt_regs *regs)
-{
-        int i;
-
-        for (i = 0; i < EF_R0; i++)
-                grp[i] = 0;
-        grp[EF_R0] = 0;
-        for (i = 1; i <= 31; i++)
-                grp[EF_R0 + i] = (elf_greg_t) regs->regs[i];
-        grp[EF_R26] = 0;
-        grp[EF_R27] = 0;
-        grp[EF_LO] = (elf_greg_t) regs->lo;
-        grp[EF_HI] = (elf_greg_t) regs->hi;
-        grp[EF_CP0_EPC] = (elf_greg_t) regs->cp0_epc;
-        grp[EF_CP0_BADVADDR] = (elf_greg_t) regs->cp0_badvaddr;
-        grp[EF_CP0_STATUS] = (elf_greg_t) regs->cp0_status;
-        grp[EF_CP0_CAUSE] = (elf_greg_t) regs->cp0_cause;
-#ifdef EF_UNUSED0
-        grp[EF_UNUSED0] = 0;
-#endif
-}
-
 MODULE_DESCRIPTION("Binary format loader for compatibility with o32 Linux/MIPS binaries");
 MODULE_AUTHOR("Ralf Baechle (ralf@linux-mips.org)");
 
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index d74f957c561e..e34b10be782e 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -54,6 +54,20 @@ static int __init dsp_disable(char *s)
 
 __setup("nodsp", dsp_disable);
 
+static int mips_htw_disabled;
+
+static int __init htw_disable(char *s)
+{
+        mips_htw_disabled = 1;
+        cpu_data[0].options &= ~MIPS_CPU_HTW;
+        write_c0_pwctl(read_c0_pwctl() &
+                       ~(1 << MIPS_PWCTL_PWEN_SHIFT));
+
+        return 1;
+}
+
+__setup("nohtw", htw_disable);
+
 static inline void check_errata(void)
 {
         struct cpuinfo_mips *c = &current_cpu_data;
@@ -130,14 +144,13 @@ static inline int __cpu_has_fpu(void)
 
 static inline unsigned long cpu_get_msa_id(void)
 {
-        unsigned long status, conf5, msa_id;
+        unsigned long status, msa_id;
 
         status = read_c0_status();
         __enable_fpu(FPU_64BIT);
-        conf5 = read_c0_config5();
         enable_msa();
         msa_id = read_msa_ir();
-        write_c0_config5(conf5);
+        disable_msa();
         write_c0_status(status);
         return msa_id;
 }
@@ -321,6 +334,9 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
                 c->options |= MIPS_CPU_SEGMENTS;
         if (config3 & MIPS_CONF3_MSA)
                 c->ases |= MIPS_ASE_MSA;
+        /* Only tested on 32-bit cores */
+        if ((config3 & MIPS_CONF3_PW) && config_enabled(CONFIG_32BIT))
+                c->options |= MIPS_CPU_HTW;
 
         return config3 & MIPS_CONF_M;
 }
@@ -389,6 +405,8 @@ static inline unsigned int decode_config5(struct cpuinfo_mips *c)
 
         if (config5 & MIPS_CONF5_EVA)
                 c->options |= MIPS_CPU_EVA;
+        if (config5 & MIPS_CONF5_MRP)
+                c->options |= MIPS_CPU_MAAR;
 
         return config5 & MIPS_CONF_M;
 }
@@ -421,6 +439,15 @@ static void decode_configs(struct cpuinfo_mips *c)
 
         mips_probe_watch_registers(c);
 
+        if (cpu_has_rixi) {
+                /* Enable the RIXI exceptions */
+                write_c0_pagegrain(read_c0_pagegrain() | PG_IEC);
+                back_to_back_c0_hazard();
+                /* Verify the IEC bit is set */
+                if (read_c0_pagegrain() & PG_IEC)
+                        c->options |= MIPS_CPU_RIXIEX;
+        }
+
 #ifndef CONFIG_MIPS_CPS
         if (cpu_has_mips_r2) {
                 c->core = get_ebase_cpunum();
@@ -740,6 +767,12 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                         __cpu_name[cpu] = "ICT Loongson-3";
                         set_elf_platform(cpu, "loongson3a");
                         break;
+                case PRID_REV_LOONGSON3B_R1:
+                case PRID_REV_LOONGSON3B_R2:
+                        c->cputype = CPU_LOONGSON3;
+                        __cpu_name[cpu] = "ICT Loongson-3";
+                        set_elf_platform(cpu, "loongson3b");
+                        break;
                 }
 
                 set_isa(c, MIPS_CPU_ISA_III);
@@ -1187,6 +1220,12 @@ void cpu_probe(void)
         if (mips_dsp_disabled)
                 c->ases &= ~(MIPS_ASE_DSP | MIPS_ASE_DSP2P);
 
+        if (mips_htw_disabled) {
+                c->options &= ~MIPS_CPU_HTW;
+                write_c0_pwctl(read_c0_pwctl() &
+                               ~(1 << MIPS_PWCTL_PWEN_SHIFT));
+        }
+
         if (c->options & MIPS_CPU_FPU) {
                 c->fpu_id = cpu_get_fpu_id();
 
diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c
index 8b6538750fe1..937c54bc8ccc 100644
--- a/arch/mips/kernel/ftrace.c
+++ b/arch/mips/kernel/ftrace.c
@@ -63,7 +63,7 @@ static inline int in_kernel_space(unsigned long ip)
         ((unsigned int)(JAL | (((addr) >> 2) & ADDR_MASK)))
 
 static unsigned int insn_jal_ftrace_caller __read_mostly;
-static unsigned int insn_lui_v1_hi16_mcount __read_mostly;
+static unsigned int insn_la_mcount[2] __read_mostly;
 static unsigned int insn_j_ftrace_graph_caller __maybe_unused __read_mostly;
 
 static inline void ftrace_dyn_arch_init_insns(void)
@@ -71,10 +71,10 @@ static inline void ftrace_dyn_arch_init_insns(void)
         u32 *buf;
         unsigned int v1;
 
-        /* lui v1, hi16_mcount */
+        /* la v1, _mcount */
         v1 = 3;
-        buf = (u32 *)&insn_lui_v1_hi16_mcount;
-        UASM_i_LA_mostly(&buf, v1, MCOUNT_ADDR);
+        buf = (u32 *)&insn_la_mcount[0];
+        UASM_i_LA(&buf, v1, MCOUNT_ADDR);
 
         /* jal (ftrace_caller + 8), jump over the first two instruction */
         buf = (u32 *)&insn_jal_ftrace_caller;
@@ -111,14 +111,47 @@ static int ftrace_modify_code_2(unsigned long ip, unsigned int new_code1,
                                 unsigned int new_code2)
 {
         int faulted;
+        mm_segment_t old_fs;
 
         safe_store_code(new_code1, ip, faulted);
         if (unlikely(faulted))
                 return -EFAULT;
-        safe_store_code(new_code2, ip + 4, faulted);
+
+        ip += 4;
+        safe_store_code(new_code2, ip, faulted);
         if (unlikely(faulted))
                 return -EFAULT;
+
+        ip -= 4;
+        old_fs = get_fs();
+        set_fs(get_ds());
         flush_icache_range(ip, ip + 8);
+        set_fs(old_fs);
+
+        return 0;
+}
+
+static int ftrace_modify_code_2r(unsigned long ip, unsigned int new_code1,
+                                 unsigned int new_code2)
+{
+        int faulted;
+        mm_segment_t old_fs;
+
+        ip += 4;
+        safe_store_code(new_code2, ip, faulted);
+        if (unlikely(faulted))
+                return -EFAULT;
+
+        ip -= 4;
+        safe_store_code(new_code1, ip, faulted);
+        if (unlikely(faulted))
+                return -EFAULT;
+
+        old_fs = get_fs();
+        set_fs(get_ds());
+        flush_icache_range(ip, ip + 8);
+        set_fs(old_fs);
+
         return 0;
 }
 #endif
@@ -130,13 +163,14 @@ static int ftrace_modify_code_2(unsigned long ip, unsigned int new_code1,
  *
  * move at, ra
  * jal _mcount          --> nop
+ *  sub sp, sp, 8       --> nop  (CONFIG_32BIT)
  *
  * 2. For modules:
  *
  * 2.1 For KBUILD_MCOUNT_RA_ADDRESS and CONFIG_32BIT
  *
  * lui v1, hi_16bit_of_mcount        --> b 1f (0x10000005)
- * addiu v1, v1, low_16bit_of_mcount
+ * addiu v1, v1, low_16bit_of_mcount --> nop  (CONFIG_32BIT)
  * move at, ra
  * move $12, ra_address
  * jalr v1
@@ -145,7 +179,7 @@ static int ftrace_modify_code_2(unsigned long ip, unsigned int new_code1,
  * 2.2 For the Other situations
  *
  * lui v1, hi_16bit_of_mcount        --> b 1f (0x10000004)
- * addiu v1, v1, low_16bit_of_mcount
+ * addiu v1, v1, low_16bit_of_mcount --> nop  (CONFIG_32BIT)
  * move at, ra
  * jalr v1
  *  nop | move $12, ra_address | sub sp, sp, 8
@@ -184,10 +218,14 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
         unsigned int new;
         unsigned long ip = rec->ip;
 
-        new = in_kernel_space(ip) ? insn_jal_ftrace_caller :
-                insn_lui_v1_hi16_mcount;
+        new = in_kernel_space(ip) ? insn_jal_ftrace_caller : insn_la_mcount[0];
 
+#ifdef CONFIG_64BIT
         return ftrace_modify_code(ip, new);
+#else
+        return ftrace_modify_code_2r(ip, new, in_kernel_space(ip) ?
+                                                INSN_NOP : insn_la_mcount[1]);
+#endif
 }
 
 #define FTRACE_CALL_IP ((unsigned long)(&ftrace_call))
diff --git a/arch/mips/kernel/irq-gic.c b/arch/mips/kernel/irq-gic.c
index 88e4c323382c..9e9d8b9a5b97 100644
--- a/arch/mips/kernel/irq-gic.c
+++ b/arch/mips/kernel/irq-gic.c
@@ -28,6 +28,18 @@ unsigned int gic_irq_flags[GIC_NUM_INTRS];
 /* The index into this array is the vector # of the interrupt. */
 struct gic_shared_intr_map gic_shared_intr_map[GIC_NUM_INTRS];
 
+struct gic_pcpu_mask {
+        DECLARE_BITMAP(pcpu_mask, GIC_NUM_INTRS);
+};
+
+struct gic_pending_regs {
+        DECLARE_BITMAP(pending, GIC_NUM_INTRS);
+};
+
+struct gic_intrmask_regs {
+        DECLARE_BITMAP(intrmask, GIC_NUM_INTRS);
+};
+
 static struct gic_pcpu_mask pcpu_masks[NR_CPUS];
 static struct gic_pending_regs pending_regs[NR_CPUS];
 static struct gic_intrmask_regs intrmask_regs[NR_CPUS];
@@ -177,7 +189,7 @@ unsigned int gic_compare_int(void)
                 return 0;
 }
 
-unsigned int gic_get_int(void)
+void gic_get_int_mask(unsigned long *dst, const unsigned long *src)
 {
         unsigned int i;
         unsigned long *pending, *intrmask, *pcpu_mask;
@@ -202,8 +214,17 @@ unsigned int gic_get_int(void)
 
         bitmap_and(pending, pending, intrmask, GIC_NUM_INTRS);
         bitmap_and(pending, pending, pcpu_mask, GIC_NUM_INTRS);
+        bitmap_and(dst, src, pending, GIC_NUM_INTRS);
+}
 
-        return find_first_bit(pending, GIC_NUM_INTRS);
+unsigned int gic_get_int(void)
+{
+        DECLARE_BITMAP(interrupts, GIC_NUM_INTRS);
+
+        bitmap_fill(interrupts, GIC_NUM_INTRS);
+        gic_get_int_mask(interrupts, interrupts);
+
+        return find_first_bit(interrupts, GIC_NUM_INTRS);
 }
 
 static void gic_mask_irq(struct irq_data *d)
@@ -269,11 +290,13 @@ static void __init gic_setup_intr(unsigned int intr, unsigned int cpu,
 
         /* Setup Intr to Pin mapping */
         if (pin & GIC_MAP_TO_NMI_MSK) {
+                int i;
+
                 GICWRITE(GIC_REG_ADDR(SHARED, GIC_SH_MAP_TO_PIN(intr)), pin);
                 /* FIXME: hack to route NMI to all cpu's */
-                for (cpu = 0; cpu < NR_CPUS; cpu += 32) {
+                for (i = 0; i < NR_CPUS; i += 32) {
                         GICWRITE(GIC_REG_ADDR(SHARED,
-                                          GIC_SH_MAP_TO_VPE_REG_OFF(intr, cpu)),
+                                          GIC_SH_MAP_TO_VPE_REG_OFF(intr, i)),
                                  0xffffffff);
                 }
         } else {
@@ -299,9 +322,10 @@ static void __init gic_setup_intr(unsigned int intr, unsigned int cpu,
 
         /* Init Intr Masks */
         GIC_CLR_INTR_MASK(intr);
+
         /* Initialise per-cpu Interrupt software masks */
-        if (flags & GIC_FLAG_IPI)
-                set_bit(intr, pcpu_masks[cpu].pcpu_mask);
+        set_bit(intr, pcpu_masks[cpu].pcpu_mask);
+
         if ((flags & GIC_FLAG_TRANSPARENT) && (cpu_has_veic == 0))
                 GIC_SET_INTR_MASK(intr);
         if (trigtype == GIC_TRIG_EDGE)
@@ -340,8 +364,6 @@ static void __init gic_basic_init(int numintrs, int numvpes,
                 cpu = intrmap[i].cpunum;
                 if (cpu == GIC_UNUSED)
                         continue;
-                if (cpu == 0 && i != 0 && intrmap[i].flags == 0)
-                        continue;
                 gic_setup_intr(i,
                         intrmap[i].cpunum,
                         intrmap[i].pin + pin_offset,
diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S
index 00940d1d5c4f..5d25462de8a6 100644
--- a/arch/mips/kernel/mcount.S
+++ b/arch/mips/kernel/mcount.S
@@ -80,6 +80,19 @@ _mcount:
 #endif
 
         PTR_SUBU a0, ra, 8      /* arg1: self address */
+        PTR_LA   t1, _stext
+        sltu     t2, a0, t1     /* t2 = (a0 < _stext) */
+        PTR_LA   t1, _etext
+        sltu     t3, t1, a0     /* t3 = (a0 > _etext) */
+        or       t1, t2, t3
+        beqz     t1, ftrace_call
+         nop
+#if defined(KBUILD_MCOUNT_RA_ADDRESS) && defined(CONFIG_32BIT)
+        PTR_SUBU a0, a0, 16     /* arg1: adjust to module's recorded callsite */
+#else
+        PTR_SUBU a0, a0, 12
+#endif
+
         .globl ftrace_call
 ftrace_call:
         nop     /* a placeholder for the call to a real tracing function */
diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
index 4f2d9dece7ab..14bf74b0f51c 100644
--- a/arch/mips/kernel/perf_event_mipsxx.c
+++ b/arch/mips/kernel/perf_event_mipsxx.c
@@ -1386,6 +1386,9 @@ static irqreturn_t mipsxx_pmu_handle_irq(int irq, void *dev)
 /* proAptiv */
 #define IS_BOTH_COUNTERS_PROAPTIV_EVENT(b)                              \
         ((b) == 0 || (b) == 1)
+/* P5600 */
+#define IS_BOTH_COUNTERS_P5600_EVENT(b)                                 \
+        ((b) == 0 || (b) == 1)
 
 /* 1004K */
 #define IS_BOTH_COUNTERS_1004K_EVENT(b)                                 \
@@ -1420,20 +1423,23 @@ static irqreturn_t mipsxx_pmu_handle_irq(int irq, void *dev)
 
 
 /*
- * User can use 0-255 raw events, where 0-127 for the events of even
- * counters, and 128-255 for odd counters. Note that bit 7 is used to
- * indicate the parity. So, for example, when user wants to take the
- * Event Num of 15 for odd counters (by referring to the user manual),
- * then 128 needs to be added to 15 as the input for the event config,
- * i.e., 143 (0x8F) to be used.
+ * For most cores the user can use 0-255 raw events, where 0-127 for the events
+ * of even counters, and 128-255 for odd counters. Note that bit 7 is used to
+ * indicate the even/odd bank selector. So, for example, when user wants to take
+ * the Event Num of 15 for odd counters (by referring to the user manual), then
+ * 128 needs to be added to 15 as the input for the event config, i.e., 143 (0x8F)
+ * to be used.
+ *
+ * Some newer cores have even more events, in which case the user can use raw
+ * events 0-511, where 0-255 are for the events of even counters, and 256-511
+ * are for odd counters, so bit 8 is used to indicate the even/odd bank selector.
  */
 static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
 {
+        /* currently most cores have 7-bit event numbers */
         unsigned int raw_id = config & 0xff;
         unsigned int base_id = raw_id & 0x7f;
 
-        raw_event.event_id = base_id;
-
         switch (current_cpu_type()) {
         case CPU_24K:
                 if (IS_BOTH_COUNTERS_24K_EVENT(base_id))
@@ -1485,6 +1491,19 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
                 raw_event.range = P;
 #endif
                 break;
+        case CPU_P5600:
+                /* 8-bit event numbers */
+                raw_id = config & 0x1ff;
+                base_id = raw_id & 0xff;
+                if (IS_BOTH_COUNTERS_P5600_EVENT(base_id))
+                        raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;
+                else
+                        raw_event.cntr_mask =
+                                raw_id > 255 ? CNTR_ODD : CNTR_EVEN;
+#ifdef CONFIG_MIPS_MT_SMP
+                raw_event.range = P;
+#endif
+                break;
         case CPU_1004K:
                 if (IS_BOTH_COUNTERS_1004K_EVENT(base_id))
                         raw_event.cntr_mask = CNTR_EVEN | CNTR_ODD;
@@ -1523,6 +1542,8 @@ static const struct mips_perf_event *mipsxx_pmu_map_raw_event(u64 config)
                                 raw_id > 127 ? CNTR_ODD : CNTR_EVEN;
         }
 
+        raw_event.event_id = base_id;
+
         return &raw_event;
 }
 
@@ -1633,6 +1654,11 @@ init_hw_perf_events(void)
                 mipspmu.general_event_map = &mipsxxcore_event_map2;
                 mipspmu.cache_event_map = &mipsxxcore_cache_map2;
                 break;
+        case CPU_P5600:
+                mipspmu.name = "mips/P5600";
+                mipspmu.general_event_map = &mipsxxcore_event_map2;
+                mipspmu.cache_event_map = &mipsxxcore_cache_map2;
+                break;
         case CPU_1004K:
                 mipspmu.name = "mips/1004K";
                 mipspmu.general_event_map = &mipsxxcore_event_map;
diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
index c4c2069d3a20..06147179a175 100644
--- a/arch/mips/kernel/pm-cps.c
+++ b/arch/mips/kernel/pm-cps.c
@@ -149,8 +149,12 @@ int cps_pm_enter_state(enum cps_pm_state state)
 
         /* Setup the VPE to run mips_cps_pm_restore when started again */
         if (config_enabled(CONFIG_CPU_PM) && state == CPS_PM_POWER_GATED) {
+                /* Power gating relies upon CPS SMP */
+                if (!mips_cps_smp_in_use())
+                        return -EINVAL;
+
                 core_cfg = &mips_cps_core_bootcfg[core];
-                vpe_cfg = &core_cfg->vpe_config[current_cpu_data.vpe_id];
+                vpe_cfg = &core_cfg->vpe_config[cpu_vpe_id(&current_cpu_data)];
                 vpe_cfg->pc = (unsigned long)mips_cps_pm_restore;
                 vpe_cfg->gp = (unsigned long)current_thread_info();
                 vpe_cfg->sp = 0;
@@ -376,6 +380,10 @@ static void * __init cps_gen_entry_code(unsigned cpu, enum cps_pm_state state)
         memset(relocs, 0, sizeof(relocs));
 
         if (config_enabled(CONFIG_CPU_PM) && state == CPS_PM_POWER_GATED) {
+                /* Power gating relies upon CPS SMP */
+                if (!mips_cps_smp_in_use())
+                        goto out_err;
+
                 /*
                  * Save CPU state. Note the non-standard calling convention
                  * with the return address placed in v0 to avoid clobbering
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 037a44d962f3..097fc8d14e42 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -113,6 +113,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         if (cpu_has_vz)         seq_printf(m, "%s", " vz");
         if (cpu_has_msa)        seq_printf(m, "%s", " msa");
         if (cpu_has_eva)        seq_printf(m, "%s", " eva");
+        if (cpu_has_htw)        seq_printf(m, "%s", " htw");
         seq_printf(m, "\n");
 
         if (cpu_has_mmips) {
@@ -123,6 +124,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                       cpu_data[n].srsets);
         seq_printf(m, "kscratch registers\t: %d\n",
                       hweight8(cpu_data[n].kscratch_mask));
+        seq_printf(m, "package\t\t\t: %d\n", cpu_data[n].package);
         seq_printf(m, "core\t\t\t: %d\n", cpu_data[n].core);
 
         sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 0a1ec0f3beff..636b0745d7c7 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -21,7 +21,6 @@
 #include <linux/mman.h>
 #include <linux/personality.h>
 #include <linux/sys.h>
-#include <linux/user.h>
 #include <linux/init.h>
 #include <linux/completion.h>
 #include <linux/kallsyms.h>
@@ -36,6 +35,7 @@
 #include <asm/pgtable.h>
 #include <asm/mipsregs.h>
 #include <asm/processor.h>
+#include <asm/reg.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/elf.h>
@@ -66,6 +66,7 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
         clear_used_math();
         clear_fpu_owner();
         init_dsp();
+        clear_thread_flag(TIF_USEDMSA);
         clear_thread_flag(TIF_MSA_CTX_LIVE);
         disable_msa();
         regs->cp0_epc = pc;
@@ -141,6 +142,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
         childregs->cp0_status &= ~(ST0_CU2|ST0_CU1);
 
         clear_tsk_thread_flag(p, TIF_USEDFPU);
+        clear_tsk_thread_flag(p, TIF_USEDMSA);
+        clear_tsk_thread_flag(p, TIF_MSA_CTX_LIVE);
 
 #ifdef CONFIG_MIPS_MT_FPAFF
         clear_tsk_thread_flag(p, TIF_FPUBOUND);
@@ -152,61 +155,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
         return 0;
 }
 
-/* Fill in the fpu structure for a core dump.. */
-int dump_fpu(struct pt_regs *regs, elf_fpregset_t *r)
-{
-        int i;
-
-        for (i = 0; i < NUM_FPU_REGS; i++)
-                memcpy(&r[i], &current->thread.fpu.fpr[i], sizeof(*r));
-
-        memcpy(&r[NUM_FPU_REGS], &current->thread.fpu.fcr31,
-               sizeof(current->thread.fpu.fcr31));
-
-        return 1;
-}
-
-void elf_dump_regs(elf_greg_t *gp, struct pt_regs *regs)
-{
-        int i;
-
-        for (i = 0; i < EF_R0; i++)
-                gp[i] = 0;
-        gp[EF_R0] = 0;
-        for (i = 1; i <= 31; i++)
-                gp[EF_R0 + i] = regs->regs[i];
-        gp[EF_R26] = 0;
-        gp[EF_R27] = 0;
-        gp[EF_LO] = regs->lo;
-        gp[EF_HI] = regs->hi;
-        gp[EF_CP0_EPC] = regs->cp0_epc;
-        gp[EF_CP0_BADVADDR] = regs->cp0_badvaddr;
-        gp[EF_CP0_STATUS] = regs->cp0_status;
-        gp[EF_CP0_CAUSE] = regs->cp0_cause;
-#ifdef EF_UNUSED0
-        gp[EF_UNUSED0] = 0;
-#endif
-}
-
-int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
-{
-        elf_dump_regs(*regs, task_pt_regs(tsk));
-        return 1;
-}
-
-int dump_task_fpu(struct task_struct *t, elf_fpregset_t *fpr)
-{
-        int i;
-
-        for (i = 0; i < NUM_FPU_REGS; i++)
-                memcpy(&fpr[i], &t->thread.fpu.fpr[i], sizeof(*fpr));
-
-        memcpy(&fpr[NUM_FPU_REGS], &t->thread.fpu.fcr31,
-               sizeof(t->thread.fpu.fcr31));
-
-        return 1;
-}
-
 #ifdef CONFIG_CC_STACKPROTECTOR
 #include <linux/stackprotector.h>
 unsigned long __stack_chk_guard __read_mostly;
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index f639ccd5060c..645b3c4fcfba 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -24,7 +24,6 @@
 #include <linux/ptrace.h>
 #include <linux/regset.h>
 #include <linux/smp.h>
-#include <linux/user.h>
 #include <linux/security.h>
 #include <linux/tracehook.h>
 #include <linux/audit.h>
@@ -63,7 +62,7 @@ void ptrace_disable(struct task_struct *child)
  * for 32-bit kernels and for 32-bit processes on a 64-bit kernel.
  * Registers are sign extended to fill the available space.
  */
-int ptrace_getregs(struct task_struct *child, __s64 __user *data)
+int ptrace_getregs(struct task_struct *child, struct user_pt_regs __user *data)
 {
         struct pt_regs *regs;
         int i;
@@ -74,13 +73,13 @@ int ptrace_getregs(struct task_struct *child, __s64 __user *data)
         regs = task_pt_regs(child);
 
         for (i = 0; i < 32; i++)
-                __put_user((long)regs->regs[i], data + i);
-        __put_user((long)regs->lo, data + EF_LO - EF_R0);
-        __put_user((long)regs->hi, data + EF_HI - EF_R0);
-        __put_user((long)regs->cp0_epc, data + EF_CP0_EPC - EF_R0);
-        __put_user((long)regs->cp0_badvaddr, data + EF_CP0_BADVADDR - EF_R0);
-        __put_user((long)regs->cp0_status, data + EF_CP0_STATUS - EF_R0);
-        __put_user((long)regs->cp0_cause, data + EF_CP0_CAUSE - EF_R0);
+                __put_user((long)regs->regs[i], (__s64 __user *)&data->regs[i]);
+        __put_user((long)regs->lo, (__s64 __user *)&data->lo);
+        __put_user((long)regs->hi, (__s64 __user *)&data->hi);
+        __put_user((long)regs->cp0_epc, (__s64 __user *)&data->cp0_epc);
+        __put_user((long)regs->cp0_badvaddr, (__s64 __user *)&data->cp0_badvaddr);
+        __put_user((long)regs->cp0_status, (__s64 __user *)&data->cp0_status);
+        __put_user((long)regs->cp0_cause, (__s64 __user *)&data->cp0_cause);
 
         return 0;
 }
@@ -90,7 +89,7 @@ int ptrace_getregs(struct task_struct *child, __s64 __user *data)
  * the 64-bit format.  On a 32-bit kernel only the lower order half
  * (according to endianness) will be used.
  */
-int ptrace_setregs(struct task_struct *child, __s64 __user *data)
+int ptrace_setregs(struct task_struct *child, struct user_pt_regs __user *data)
 {
         struct pt_regs *regs;
         int i;
@@ -101,10 +100,10 @@ int ptrace_setregs(struct task_struct *child, __s64 __user *data)
         regs = task_pt_regs(child);
 
         for (i = 0; i < 32; i++)
-                __get_user(regs->regs[i], data + i);
-        __get_user(regs->lo, data + EF_LO - EF_R0);
-        __get_user(regs->hi, data + EF_HI - EF_R0);
-        __get_user(regs->cp0_epc, data + EF_CP0_EPC - EF_R0);
+                __get_user(regs->regs[i], (__s64 __user *)&data->regs[i]);
+        __get_user(regs->lo, (__s64 __user *)&data->lo);
+        __get_user(regs->hi, (__s64 __user *)&data->hi);
+        __get_user(regs->cp0_epc, (__s64 __user *)&data->cp0_epc);
 
         /* badvaddr, status, and cause may not be written.  */
 
@@ -129,7 +128,7 @@ int ptrace_getfpregs(struct task_struct *child, __u32 __user *data)
         }
 
         __put_user(child->thread.fpu.fcr31, data + 64);
-        __put_user(current_cpu_data.fpu_id, data + 65);
+        __put_user(boot_cpu_data.fpu_id, data + 65);
 
         return 0;
 }
@@ -151,6 +150,7 @@ int ptrace_setfpregs(struct task_struct *child, __u32 __user *data)
         }
 
         __get_user(child->thread.fpu.fcr31, data + 64);
+        child->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
 
         /* FIR may not be written.  */
 
@@ -246,36 +246,160 @@ int ptrace_set_watch_regs(struct task_struct *child,
 
 /* regset get/set implementations */
 
-static int gpr_get(struct task_struct *target,
-                   const struct user_regset *regset,
-                   unsigned int pos, unsigned int count,
-                   void *kbuf, void __user *ubuf)
+#if defined(CONFIG_32BIT) || defined(CONFIG_MIPS32_O32)
+
+static int gpr32_get(struct task_struct *target,
+                     const struct user_regset *regset,
+                     unsigned int pos, unsigned int count,
+                     void *kbuf, void __user *ubuf)
 {
         struct pt_regs *regs = task_pt_regs(target);
+        u32 uregs[ELF_NGREG] = {};
+        unsigned i;
+
+        for (i = MIPS32_EF_R1; i <= MIPS32_EF_R31; i++) {
+                /* k0/k1 are copied as zero. */
+                if (i == MIPS32_EF_R26 || i == MIPS32_EF_R27)
+                        continue;
+
+                uregs[i] = regs->regs[i - MIPS32_EF_R0];
+        }
 
-        return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
-                                   regs, 0, sizeof(*regs));
+        uregs[MIPS32_EF_LO] = regs->lo;
+        uregs[MIPS32_EF_HI] = regs->hi;
+        uregs[MIPS32_EF_CP0_EPC] = regs->cp0_epc;
+        uregs[MIPS32_EF_CP0_BADVADDR] = regs->cp0_badvaddr;
+        uregs[MIPS32_EF_CP0_STATUS] = regs->cp0_status;
+        uregs[MIPS32_EF_CP0_CAUSE] = regs->cp0_cause;
+
+        return user_regset_copyout(&pos, &count, &kbuf, &ubuf, uregs, 0,
+                                   sizeof(uregs));
 }
 
-static int gpr_set(struct task_struct *target,
-                   const struct user_regset *regset,
-                   unsigned int pos, unsigned int count,
-                   const void *kbuf, const void __user *ubuf)
+static int gpr32_set(struct task_struct *target,
+                     const struct user_regset *regset,
+                     unsigned int pos, unsigned int count,
+                     const void *kbuf, const void __user *ubuf)
 {
-        struct pt_regs newregs;
-        int ret;
+        struct pt_regs *regs = task_pt_regs(target);
+        u32 uregs[ELF_NGREG];
+        unsigned start, num_regs, i;
+        int err;
+
+        start = pos / sizeof(u32);
+        num_regs = count / sizeof(u32);
+
+        if (start + num_regs > ELF_NGREG)
+                return -EIO;
+
+        err = user_regset_copyin(&pos, &count, &kbuf, &ubuf, uregs, 0,
+                                 sizeof(uregs));
+        if (err)
+                return err;
+
+        for (i = start; i < num_regs; i++) {
+                /*
+                 * Cast all values to signed here so that if this is a 64-bit
+                 * kernel, the supplied 32-bit values will be sign extended.
+                 */
+                switch (i) {
+                case MIPS32_EF_R1 ... MIPS32_EF_R25:
+                        /* k0/k1 are ignored. */
+                case MIPS32_EF_R28 ... MIPS32_EF_R31:
+                        regs->regs[i - MIPS32_EF_R0] = (s32)uregs[i];
+                        break;
+                case MIPS32_EF_LO:
+                        regs->lo = (s32)uregs[i];
+                        break;
+                case MIPS32_EF_HI:
+                        regs->hi = (s32)uregs[i];
+                        break;
+                case MIPS32_EF_CP0_EPC:
+                        regs->cp0_epc = (s32)uregs[i];
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+#endif /* CONFIG_32BIT || CONFIG_MIPS32_O32 */
+
+#ifdef CONFIG_64BIT
+
+static int gpr64_get(struct task_struct *target,
+                     const struct user_regset *regset,
+                     unsigned int pos, unsigned int count,
+                     void *kbuf, void __user *ubuf)
+{
+        struct pt_regs *regs = task_pt_regs(target);
+        u64 uregs[ELF_NGREG] = {};
+        unsigned i;
+
+        for (i = MIPS64_EF_R1; i <= MIPS64_EF_R31; i++) {
+                /* k0/k1 are copied as zero. */
+                if (i == MIPS64_EF_R26 || i == MIPS64_EF_R27)
+                        continue;
+
+                uregs[i] = regs->regs[i - MIPS64_EF_R0];
+        }
+
+        uregs[MIPS64_EF_LO] = regs->lo;
+        uregs[MIPS64_EF_HI] = regs->hi;
+        uregs[MIPS64_EF_CP0_EPC] = regs->cp0_epc;
+        uregs[MIPS64_EF_CP0_BADVADDR] = regs->cp0_badvaddr;
+        uregs[MIPS64_EF_CP0_STATUS] = regs->cp0_status;
+        uregs[MIPS64_EF_CP0_CAUSE] = regs->cp0_cause;
+
+        return user_regset_copyout(&pos, &count, &kbuf, &ubuf, uregs, 0,
+                                   sizeof(uregs));
+}
 
-        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
-                                 &newregs,
-                                 0, sizeof(newregs));
-        if (ret)
-                return ret;
+static int gpr64_set(struct task_struct *target,
+                     const struct user_regset *regset,
+                     unsigned int pos, unsigned int count,
+                     const void *kbuf, const void __user *ubuf)
+{
+        struct pt_regs *regs = task_pt_regs(target);
+        u64 uregs[ELF_NGREG];
+        unsigned start, num_regs, i;
+        int err;
+
+        start = pos / sizeof(u64);
+        num_regs = count / sizeof(u64);
 
-        *task_pt_regs(target) = newregs;
+        if (start + num_regs > ELF_NGREG)
+                return -EIO;
+
+        err = user_regset_copyin(&pos, &count, &kbuf, &ubuf, uregs, 0,
+                                 sizeof(uregs));
+        if (err)
+                return err;
+
+        for (i = start; i < num_regs; i++) {
+                switch (i) {
+                case MIPS64_EF_R1 ... MIPS64_EF_R25:
+                        /* k0/k1 are ignored. */
+                case MIPS64_EF_R28 ... MIPS64_EF_R31:
+                        regs->regs[i - MIPS64_EF_R0] = uregs[i];
+                        break;
+                case MIPS64_EF_LO:
+                        regs->lo = uregs[i];
+                        break;
+                case MIPS64_EF_HI:
+                        regs->hi = uregs[i];
+                        break;
+                case MIPS64_EF_CP0_EPC:
+                        regs->cp0_epc = uregs[i];
+                        break;
+                }
+        }
 
         return 0;
 }
 
+#endif /* CONFIG_64BIT */
+
 static int fpr_get(struct task_struct *target,
                    const struct user_regset *regset,
                    unsigned int pos, unsigned int count,
@@ -337,14 +461,16 @@ enum mips_regset {
         REGSET_FPR,
 };
 
+#if defined(CONFIG_32BIT) || defined(CONFIG_MIPS32_O32)
+
 static const struct user_regset mips_regsets[] = {
         [REGSET_GPR] = {
                 .core_note_type = NT_PRSTATUS,
                 .n              = ELF_NGREG,
                 .size           = sizeof(unsigned int),
                 .align          = sizeof(unsigned int),
-                .get            = gpr_get,
-                .set            = gpr_set,
+                .get            = gpr32_get,
+                .set            = gpr32_set,
         },
         [REGSET_FPR] = {
                 .core_note_type = NT_PRFPREG,
@@ -364,14 +490,18 @@ static const struct user_regset_view user_mips_view = {
         .n              = ARRAY_SIZE(mips_regsets),
 };
 
+#endif /* CONFIG_32BIT || CONFIG_MIPS32_O32 */
+
+#ifdef CONFIG_64BIT
+
 static const struct user_regset mips64_regsets[] = {
         [REGSET_GPR] = {
                 .core_note_type = NT_PRSTATUS,
                 .n              = ELF_NGREG,
                 .size           = sizeof(unsigned long),
                 .align          = sizeof(unsigned long),
-                .get            = gpr_get,
-                .set            = gpr_set,
+                .get            = gpr64_get,
+                .set            = gpr64_set,
         },
         [REGSET_FPR] = {
                 .core_note_type = NT_PRFPREG,
@@ -384,25 +514,26 @@ static const struct user_regset mips64_regsets[] = {
 };
 
 static const struct user_regset_view user_mips64_view = {
-        .name           = "mips",
+        .name           = "mips64",
         .e_machine      = ELF_ARCH,
         .ei_osabi       = ELF_OSABI,
         .regsets        = mips64_regsets,
-        .n              = ARRAY_SIZE(mips_regsets),
+        .n              = ARRAY_SIZE(mips64_regsets),
 };
 
+#endif /* CONFIG_64BIT */
+
 const struct user_regset_view *task_user_regset_view(struct task_struct *task)
 {
 #ifdef CONFIG_32BIT
         return &user_mips_view;
-#endif
-
+#else
 #ifdef CONFIG_MIPS32_O32
-                if (test_thread_flag(TIF_32BIT_REGS))
-                        return &user_mips_view;
+        if (test_tsk_thread_flag(task, TIF_32BIT_REGS))
+                return &user_mips_view;
 #endif
-
         return &user_mips64_view;
+#endif
 }
 
 long arch_ptrace(struct task_struct *child, long request,
@@ -480,7 +611,7 @@ long arch_ptrace(struct task_struct *child, long request,
                         break;
                 case FPC_EIR:
                         /* implementation / version register */
-                        tmp = current_cpu_data.fpu_id;
+                        tmp = boot_cpu_data.fpu_id;
                         break;
                 case DSP_BASE ... DSP_BASE + 5: {
                         dspreg_t *dregs;
@@ -565,7 +696,7 @@ long arch_ptrace(struct task_struct *child, long request,
                         break;
 #endif
                 case FPC_CSR:
-                        child->thread.fpu.fcr31 = data;
+                        child->thread.fpu.fcr31 = data & ~FPU_CSR_ALL_X;
                         break;
                 case DSP_BASE ... DSP_BASE + 5: {
                         dspreg_t *dregs;
diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c
index b40c3ca60ee5..283b5a1967d1 100644
--- a/arch/mips/kernel/ptrace32.c
+++ b/arch/mips/kernel/ptrace32.c
@@ -22,7 +22,6 @@
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/smp.h>
-#include <linux/user.h>
 #include <linux/security.h>
 
 #include <asm/cpu.h>
@@ -32,6 +31,7 @@
 #include <asm/mipsmtregs.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
+#include <asm/reg.h>
 #include <asm/uaccess.h>
 #include <asm/bootinfo.h>
 
@@ -129,7 +129,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                         break;
                 case FPC_EIR:
                         /* implementation / version register */
-                        tmp = current_cpu_data.fpu_id;
+                        tmp = boot_cpu_data.fpu_id;
                         break;
                 case DSP_BASE ... DSP_BASE + 5: {
                         dspreg_t *dregs;
@@ -256,11 +256,13 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                 }
 
         case PTRACE_GETREGS:
-                ret = ptrace_getregs(child, (__s64 __user *) (__u64) data);
+                ret = ptrace_getregs(child,
+                                (struct user_pt_regs __user *) (__u64) data);
                 break;
 
         case PTRACE_SETREGS:
-                ret = ptrace_setregs(child, (__s64 __user *) (__u64) data);
+                ret = ptrace_setregs(child,
+                                (struct user_pt_regs __user *) (__u64) data);
                 break;
 
         case PTRACE_GETFPREGS:
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index 81ca3f70fe29..4c4ec1812420 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -64,8 +64,10 @@
         /* Check whether we're saving scalar or vector context. */
         bgtz    a3, 1f
 
-        /* Save 128b MSA vector context. */
+        /* Save 128b MSA vector context + scalar FP control & status. */
+        cfc1    t1, fcr31
         msa_save_all    a0
+        sw      t1, THREAD_FCR31(a0)
         b       2f
 
 1:      /* Save 32b/64b scalar FP context. */
@@ -142,6 +144,11 @@ LEAF(_restore_msa)
         jr      ra
         END(_restore_msa)
 
+LEAF(_init_msa_upper)
+        msa_init_all_upper
+        jr      ra
+        END(_init_msa_upper)
+
 #endif
 
 /*
diff --git a/arch/mips/kernel/rtlx-cmp.c b/arch/mips/kernel/rtlx-cmp.c
index 758fb3cd2326..d26dcc4b46e7 100644
--- a/arch/mips/kernel/rtlx-cmp.c
+++ b/arch/mips/kernel/rtlx-cmp.c
@@ -77,6 +77,9 @@ int __init rtlx_module_init(void)
                 dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,
                                     "%s%d", RTLX_MODULE_NAME, i);
                 if (IS_ERR(dev)) {
+                        while (i--)
+                                device_destroy(mt_class, MKDEV(major, i));
+
                         err = PTR_ERR(dev);
                         goto out_chrdev;
                 }
diff --git a/arch/mips/kernel/rtlx-mt.c b/arch/mips/kernel/rtlx-mt.c
index 5a66b975989e..cb95470e2e69 100644
--- a/arch/mips/kernel/rtlx-mt.c
+++ b/arch/mips/kernel/rtlx-mt.c
@@ -103,6 +103,9 @@ int __init rtlx_module_init(void)
                 dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,
                                     "%s%d", RTLX_MODULE_NAME, i);
                 if (IS_ERR(dev)) {
+                        while (i--)
+                                device_destroy(mt_class, MKDEV(major, i));
+
                         err = PTR_ERR(dev);
                         goto out_chrdev;
                 }
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 3245474f19d5..f93b4cbec739 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -67,8 +67,6 @@ NESTED(handle_sys, PT_SIZE, sp)
 
         /*
          * Ok, copy the args from the luser stack to the kernel stack.
-         * t3 is the precomputed number of instruction bytes needed to
-         * load or store arguments 6-8.
          */
 
         .set    push
@@ -495,8 +493,8 @@ EXPORT(sys_call_table)
         PTR     sys_tgkill
         PTR     sys_utimes
         PTR     sys_mbind
-        PTR     sys_ni_syscall                  /* sys_get_mempolicy */
-        PTR     sys_ni_syscall                  /* 4270 sys_set_mempolicy */
+        PTR     sys_get_mempolicy
+        PTR     sys_set_mempolicy               /* 4270 */
         PTR     sys_mq_open
         PTR     sys_mq_unlink
         PTR     sys_mq_timedsend
@@ -578,3 +576,4 @@ EXPORT(sys_call_table)
         PTR     sys_sched_setattr
         PTR     sys_sched_getattr               /* 4350 */
         PTR     sys_renameat2
+        PTR     sys_seccomp
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index be2fedd4ae33..03ebd9979ad2 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -347,8 +347,8 @@ EXPORT(sys_call_table)
         PTR     sys_tgkill                      /* 5225 */
         PTR     sys_utimes
         PTR     sys_mbind
-        PTR     sys_ni_syscall                  /* sys_get_mempolicy */
-        PTR     sys_ni_syscall                  /* sys_set_mempolicy */
+        PTR     sys_get_mempolicy
+        PTR     sys_set_mempolicy
         PTR     sys_mq_open                     /* 5230 */
         PTR     sys_mq_unlink
         PTR     sys_mq_timedsend
@@ -431,4 +431,5 @@ EXPORT(sys_call_table)
         PTR     sys_sched_setattr
         PTR     sys_sched_getattr               /* 5310 */
         PTR     sys_renameat2
+        PTR     sys_seccomp
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index c1dbcda4b816..ebc9228e2e15 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -162,7 +162,7 @@ EXPORT(sysn32_call_table)
         PTR     sys_getpeername
         PTR     sys_socketpair
         PTR     compat_sys_setsockopt
-        PTR     sys_getsockopt
+        PTR     compat_sys_getsockopt
         PTR     __sys_clone                     /* 6055 */
         PTR     __sys_fork
         PTR     compat_sys_execve
@@ -339,9 +339,9 @@ EXPORT(sysn32_call_table)
         PTR     compat_sys_clock_nanosleep
         PTR     sys_tgkill
         PTR     compat_sys_utimes               /* 6230 */
-        PTR     sys_ni_syscall                  /* sys_mbind */
-        PTR     sys_ni_syscall                  /* sys_get_mempolicy */
-        PTR     sys_ni_syscall                  /* sys_set_mempolicy */
+        PTR     compat_sys_mbind
+        PTR     compat_sys_get_mempolicy
+        PTR     compat_sys_set_mempolicy
         PTR     compat_sys_mq_open
         PTR     sys_mq_unlink                   /* 6235 */
         PTR     compat_sys_mq_timedsend
@@ -358,7 +358,7 @@ EXPORT(sysn32_call_table)
         PTR     sys_inotify_init
         PTR     sys_inotify_add_watch
         PTR     sys_inotify_rm_watch
-        PTR     sys_migrate_pages               /* 6250 */
+        PTR     compat_sys_migrate_pages        /* 6250 */
         PTR     sys_openat
         PTR     sys_mkdirat
         PTR     sys_mknodat
@@ -379,7 +379,7 @@ EXPORT(sysn32_call_table)
         PTR     sys_sync_file_range
         PTR     sys_tee
         PTR     compat_sys_vmsplice             /* 6270 */
-        PTR     sys_move_pages
+        PTR     compat_sys_move_pages
         PTR     compat_sys_set_robust_list
         PTR     compat_sys_get_robust_list
         PTR     compat_sys_kexec_load
@@ -424,4 +424,5 @@ EXPORT(sysn32_call_table)
         PTR     sys_sched_setattr
         PTR     sys_sched_getattr
         PTR     sys_renameat2                   /* 6315 */
+        PTR     sys_seccomp
         .size   sysn32_call_table,.-sysn32_call_table
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index f1343ccd7ed7..13b964fddc4a 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -473,9 +473,9 @@ EXPORT(sys32_call_table)
         PTR     compat_sys_clock_nanosleep      /* 4265 */
         PTR     sys_tgkill
         PTR     compat_sys_utimes
-        PTR     sys_ni_syscall                  /* sys_mbind */
-        PTR     sys_ni_syscall                  /* sys_get_mempolicy */
-        PTR     sys_ni_syscall                  /* 4270 sys_set_mempolicy */
+        PTR     compat_sys_mbind
+        PTR     compat_sys_get_mempolicy
+        PTR     compat_sys_set_mempolicy        /* 4270 */
         PTR     compat_sys_mq_open
         PTR     sys_mq_unlink
         PTR     compat_sys_mq_timedsend
@@ -492,7 +492,7 @@ EXPORT(sys32_call_table)
         PTR     sys_inotify_init
         PTR     sys_inotify_add_watch           /* 4285 */
         PTR     sys_inotify_rm_watch
-        PTR     sys_migrate_pages
+        PTR     compat_sys_migrate_pages
         PTR     compat_sys_openat
         PTR     sys_mkdirat
         PTR     sys_mknodat                     /* 4290 */
@@ -557,4 +557,5 @@ EXPORT(sys32_call_table)
         PTR     sys_sched_setattr
         PTR     sys_sched_getattr               /* 4350 */
         PTR     sys_renameat2
+        PTR     sys_seccomp
         .size   sys32_call_table,.-sys32_call_table
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index a842154d57dc..7c1fe2b42d40 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -282,7 +282,7 @@ static unsigned long __init init_initrd(void)
  * Initialize the bootmem allocator. It also setup initrd related data
  * if needed.
  */
-#ifdef CONFIG_SGI_IP27
+#if defined(CONFIG_SGI_IP27) || (defined(CONFIG_CPU_LOONGSON3) && defined(CONFIG_NUMA))
 
 static void __init bootmem_init(void)
 {
@@ -729,6 +729,25 @@ static void __init resource_init(void)
         }
 }
 
+#ifdef CONFIG_SMP
+static void __init prefill_possible_map(void)
+{
+        int i, possible = num_possible_cpus();
+
+        if (possible > nr_cpu_ids)
+                possible = nr_cpu_ids;
+
+        for (i = 0; i < possible; i++)
+                set_cpu_possible(i, true);
+        for (; i < NR_CPUS; i++)
+                set_cpu_possible(i, false);
+
+        nr_cpu_ids = possible;
+}
+#else
+static inline void prefill_possible_map(void) {}
+#endif
+
 void __init setup_arch(char **cmdline_p)
 {
         cpu_probe();
@@ -752,6 +771,7 @@ void __init setup_arch(char **cmdline_p)
 
         resource_init();
         plat_smp_setup();
+        prefill_possible_map();
 
         cpu_cache_init();
 }
diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h
index 9c60d09e62a7..06805e09bcd3 100644
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
@@ -22,7 +22,7 @@
 /*
  * Determine which stack to use..
  */
-extern void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+extern void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
                                  size_t frame_size);
 /* Check and clear pending FPU exceptions in saved CSR */
 extern int fpcsr_pending(unsigned int __user *fpcsr);
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 9e60d117e41e..1d57605e4615 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -280,7 +280,7 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
         return err;
 }
 
-void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
                           size_t frame_size)
 {
         unsigned long sp;
@@ -295,9 +295,7 @@ void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
          */
         sp -= 32;
 
-        /* This is the X/Open sanctioned signal stack switching.  */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0))
-                sp = current->sas_ss_sp + current->sas_ss_size;
+        sp = sigsp(sp, ksig);
 
         return (void __user *)((sp - frame_size) & (ICACHE_REFILLS_WORKAROUND_WAR ? ~(cpu_icache_line_size()-1) : ALMASK));
 }
@@ -428,20 +426,20 @@ badframe:
 }
 
 #ifdef CONFIG_TRAD_SIGNALS
-static int setup_frame(void *sig_return, struct k_sigaction *ka,
-                       struct pt_regs *regs, int signr, sigset_t *set)
+static int setup_frame(void *sig_return, struct ksignal *ksig,
+                       struct pt_regs *regs, sigset_t *set)
 {
         struct sigframe __user *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
         if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         err |= setup_sigcontext(regs, &frame->sf_sc);
         err |= __copy_to_user(&frame->sf_mask, set, sizeof(*set));
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Arguments to signal handler:
@@ -453,37 +451,32 @@ static int setup_frame(void *sig_return, struct k_sigaction *ka,
          * $25 and c0_epc point to the signal handler, $29 points to the
          * struct sigframe.
          */
-        regs->regs[ 4] = signr;
+        regs->regs[ 4] = ksig->sig;
         regs->regs[ 5] = 0;
         regs->regs[ 6] = (unsigned long) &frame->sf_sc;
         regs->regs[29] = (unsigned long) frame;
         regs->regs[31] = (unsigned long) sig_return;
-        regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler;
+        regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
 
         DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
                current->comm, current->pid,
                frame, regs->cp0_epc, regs->regs[31]);
         return 0;
-
-give_sigsegv:
-        force_sigsegv(signr, current);
-        return -EFAULT;
 }
 #endif
 
-static int setup_rt_frame(void *sig_return, struct k_sigaction *ka,
-                          struct pt_regs *regs, int signr, sigset_t *set,
-                          siginfo_t *info)
+static int setup_rt_frame(void *sig_return, struct ksignal *ksig,
+                          struct pt_regs *regs, sigset_t *set)
 {
         struct rt_sigframe __user *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
         if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Create siginfo.  */
-        err |= copy_siginfo_to_user(&frame->rs_info, info);
+        err |= copy_siginfo_to_user(&frame->rs_info, &ksig->info);
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->rs_uc.uc_flags);
@@ -493,7 +486,7 @@ static int setup_rt_frame(void *sig_return, struct k_sigaction *ka,
         err |= __copy_to_user(&frame->rs_uc.uc_sigmask, set, sizeof(*set));
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Arguments to signal handler:
@@ -505,22 +498,18 @@ static int setup_rt_frame(void *sig_return, struct k_sigaction *ka,
          * $25 and c0_epc point to the signal handler, $29 points to
          * the struct rt_sigframe.
          */
-        regs->regs[ 4] = signr;
+        regs->regs[ 4] = ksig->sig;
         regs->regs[ 5] = (unsigned long) &frame->rs_info;
         regs->regs[ 6] = (unsigned long) &frame->rs_uc;
         regs->regs[29] = (unsigned long) frame;
         regs->regs[31] = (unsigned long) sig_return;
-        regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler;
+        regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
 
         DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
                current->comm, current->pid,
                frame, regs->cp0_epc, regs->regs[31]);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(signr, current);
-        return -EFAULT;
 }
 
 struct mips_abi mips_abi = {
@@ -534,8 +523,7 @@ struct mips_abi mips_abi = {
         .restart        = __NR_restart_syscall
 };
 
-static void handle_signal(unsigned long sig, siginfo_t *info,
-        struct k_sigaction *ka, struct pt_regs *regs)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
@@ -557,7 +545,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
                         regs->regs[2] = EINTR;
                         break;
                 case ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 regs->regs[2] = EINTR;
                                 break;
                         }
@@ -571,29 +559,23 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
                 regs->regs[0] = 0;              /* Don't deal with this again.  */
         }
 
-        if (sig_uses_siginfo(ka))
+        if (sig_uses_siginfo(&ksig->ka))
                 ret = abi->setup_rt_frame(vdso + abi->rt_signal_return_offset,
-                                          ka, regs, sig, oldset, info);
+                                          ksig, regs, oldset);
         else
-                ret = abi->setup_frame(vdso + abi->signal_return_offset,
-                                       ka, regs, sig, oldset);
-
-        if (ret)
-                return;
+                ret = abi->setup_frame(vdso + abi->signal_return_offset, ksig,
+                                       regs, oldset);
 
-        signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 static void do_signal(struct pt_regs *regs)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
+        struct ksignal ksig;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(signr, &info, &ka, regs);
+                handle_signal(&ksig, regs);
                 return;
         }
 
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index bae2e6ee2109..d69179c0d49d 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -490,21 +490,21 @@ badframe:
         force_sig(SIGSEGV, current);
 }
 
-static int setup_frame_32(void *sig_return, struct k_sigaction *ka,
-                          struct pt_regs *regs, int signr, sigset_t *set)
+static int setup_frame_32(void *sig_return, struct ksignal *ksig,
+                          struct pt_regs *regs, sigset_t *set)
 {
         struct sigframe32 __user *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
         if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         err |= setup_sigcontext32(regs, &frame->sf_sc);
         err |= __copy_conv_sigset_to_user(&frame->sf_mask, set);
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Arguments to signal handler:
@@ -516,37 +516,32 @@ static int setup_frame_32(void *sig_return, struct k_sigaction *ka,
          * $25 and c0_epc point to the signal handler, $29 points to the
          * struct sigframe.
          */
-        regs->regs[ 4] = signr;
+        regs->regs[ 4] = ksig->sig;
         regs->regs[ 5] = 0;
         regs->regs[ 6] = (unsigned long) &frame->sf_sc;
         regs->regs[29] = (unsigned long) frame;
         regs->regs[31] = (unsigned long) sig_return;
-        regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler;
+        regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
 
         DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
                current->comm, current->pid,
                frame, regs->cp0_epc, regs->regs[31]);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(signr, current);
-        return -EFAULT;
 }
 
-static int setup_rt_frame_32(void *sig_return, struct k_sigaction *ka,
-                             struct pt_regs *regs, int signr, sigset_t *set,
-                             siginfo_t *info)
+static int setup_rt_frame_32(void *sig_return, struct ksignal *ksig,
+                             struct pt_regs *regs, sigset_t *set)
 {
         struct rt_sigframe32 __user *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
         if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Convert (siginfo_t -> compat_siginfo_t) and copy to user. */
-        err |= copy_siginfo_to_user32(&frame->rs_info, info);
+        err |= copy_siginfo_to_user32(&frame->rs_info, &ksig->info);
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->rs_uc.uc_flags);
@@ -556,7 +551,7 @@ static int setup_rt_frame_32(void *sig_return, struct k_sigaction *ka,
         err |= __copy_conv_sigset_to_user(&frame->rs_uc.uc_sigmask, set);
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Arguments to signal handler:
@@ -568,22 +563,18 @@ static int setup_rt_frame_32(void *sig_return, struct k_sigaction *ka,
          * $25 and c0_epc point to the signal handler, $29 points to
          * the struct rt_sigframe32.
          */
-        regs->regs[ 4] = signr;
+        regs->regs[ 4] = ksig->sig;
         regs->regs[ 5] = (unsigned long) &frame->rs_info;
         regs->regs[ 6] = (unsigned long) &frame->rs_uc;
         regs->regs[29] = (unsigned long) frame;
         regs->regs[31] = (unsigned long) sig_return;
-        regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler;
+        regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
 
         DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
                current->comm, current->pid,
                frame, regs->cp0_epc, regs->regs[31]);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(signr, current);
-        return -EFAULT;
 }
 
 /*
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index b2241bb9cac1..f1d4751eead0 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -102,18 +102,18 @@ badframe:
         force_sig(SIGSEGV, current);
 }
 
-static int setup_rt_frame_n32(void *sig_return, struct k_sigaction *ka,
-        struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info)
+static int setup_rt_frame_n32(void *sig_return, struct ksignal *ksig,
+                              struct pt_regs *regs, sigset_t *set)
 {
         struct rt_sigframe_n32 __user *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
         if (!access_ok(VERIFY_WRITE, frame, sizeof (*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Create siginfo.  */
-        err |= copy_siginfo_to_user32(&frame->rs_info, info);
+        err |= copy_siginfo_to_user32(&frame->rs_info, &ksig->info);
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->rs_uc.uc_flags);
@@ -123,7 +123,7 @@ static int setup_rt_frame_n32(void *sig_return, struct k_sigaction *ka,
         err |= __copy_conv_sigset_to_user(&frame->rs_uc.uc_sigmask, set);
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Arguments to signal handler:
@@ -135,22 +135,18 @@ static int setup_rt_frame_n32(void *sig_return, struct k_sigaction *ka,
          * $25 and c0_epc point to the signal handler, $29 points to
          * the struct rt_sigframe.
          */
-        regs->regs[ 4] = signr;
+        regs->regs[ 4] = ksig->sig;
         regs->regs[ 5] = (unsigned long) &frame->rs_info;
         regs->regs[ 6] = (unsigned long) &frame->rs_uc;
         regs->regs[29] = (unsigned long) frame;
         regs->regs[31] = (unsigned long) sig_return;
-        regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler;
+        regs->cp0_epc = regs->regs[25] = (unsigned long) ksig->ka.sa.sa_handler;
 
         DEBUGP("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%lx\n",
                current->comm, current->pid,
                frame, regs->cp0_epc, regs->regs[31]);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(signr, current);
-        return -EFAULT;
 }
 
 struct mips_abi mips_abi_n32 = {
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index 949f2c6827a0..e6e16a1d4add 100644
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -14,13 +14,14 @@
 #include <linux/smp.h>
 #include <linux/types.h>
 
-#include <asm/cacheflush.h>
+#include <asm/bcache.h>
 #include <asm/gic.h>
 #include <asm/mips-cm.h>
 #include <asm/mips-cpc.h>
 #include <asm/mips_mt.h>
 #include <asm/mipsregs.h>
 #include <asm/pm-cps.h>
+#include <asm/r4kcache.h>
 #include <asm/smp-cps.h>
 #include <asm/time.h>
 #include <asm/uasm.h>
@@ -132,8 +133,11 @@ static void __init cps_prepare_cpus(unsigned int max_cpus)
         entry_code = (u32 *)&mips_cps_core_entry;
         UASM_i_LA(&entry_code, 3, (long)mips_cm_base);
         uasm_i_addiu(&entry_code, 16, 0, cca);
-        dma_cache_wback_inv((unsigned long)&mips_cps_core_entry,
-                            (void *)entry_code - (void *)&mips_cps_core_entry);
+        blast_dcache_range((unsigned long)&mips_cps_core_entry,
+                           (unsigned long)entry_code);
+        bc_wback_inv((unsigned long)&mips_cps_core_entry,
+                     (void *)entry_code - (void *)&mips_cps_core_entry);
+        __sync();
 
         /* Allocate core boot configuration structs */
         mips_cps_core_bootcfg = kcalloc(ncores, sizeof(*mips_cps_core_bootcfg),
@@ -360,7 +364,7 @@ void play_dead(void)
 static void wait_for_sibling_halt(void *ptr_cpu)
 {
         unsigned cpu = (unsigned)ptr_cpu;
-        unsigned vpe_id = cpu_data[cpu].vpe_id;
+        unsigned vpe_id = cpu_vpe_id(&cpu_data[cpu]);
         unsigned halted;
         unsigned long flags;
 
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 3babf6e4f894..21f23add04f4 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -288,6 +288,7 @@ struct plat_smp_ops vsmp_smp_ops = {
         .prepare_cpus           = vsmp_prepare_cpus,
 };
 
+#ifdef CONFIG_PROC_FS
 static int proc_cpuinfo_chain_call(struct notifier_block *nfb,
         unsigned long action_unused, void *data)
 {
@@ -309,3 +310,4 @@ static int __init proc_cpuinfo_notifier_init(void)
 }
 
 subsys_initcall(proc_cpuinfo_notifier_init);
+#endif
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 9bad52ede903..c94c4e92e17d 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -59,9 +59,16 @@ EXPORT_SYMBOL(smp_num_siblings);
 cpumask_t cpu_sibling_map[NR_CPUS] __read_mostly;
 EXPORT_SYMBOL(cpu_sibling_map);
 
+/* representing the core map of multi-core chips of each logical CPU */
+cpumask_t cpu_core_map[NR_CPUS] __read_mostly;
+EXPORT_SYMBOL(cpu_core_map);
+
 /* representing cpus for which sibling maps can be computed */
 static cpumask_t cpu_sibling_setup_map;
 
+/* representing cpus for which core maps can be computed */
+static cpumask_t cpu_core_setup_map;
+
 cpumask_t cpu_coherent_mask;
 
 static inline void set_cpu_sibling_map(int cpu)
@@ -72,7 +79,8 @@ static inline void set_cpu_sibling_map(int cpu)
 
         if (smp_num_siblings > 1) {
                 for_each_cpu_mask(i, cpu_sibling_setup_map) {
-                        if (cpu_data[cpu].core == cpu_data[i].core) {
+                        if (cpu_data[cpu].package == cpu_data[i].package &&
+                                    cpu_data[cpu].core == cpu_data[i].core) {
                                 cpu_set(i, cpu_sibling_map[cpu]);
                                 cpu_set(cpu, cpu_sibling_map[i]);
                         }
@@ -81,6 +89,20 @@ static inline void set_cpu_sibling_map(int cpu)
                 cpu_set(cpu, cpu_sibling_map[cpu]);
 }
 
+static inline void set_cpu_core_map(int cpu)
+{
+        int i;
+
+        cpu_set(cpu, cpu_core_setup_map);
+
+        for_each_cpu_mask(i, cpu_core_setup_map) {
+                if (cpu_data[cpu].package == cpu_data[i].package) {
+                        cpu_set(i, cpu_core_map[cpu]);
+                        cpu_set(cpu, cpu_core_map[i]);
+                }
+        }
+}
+
 struct plat_smp_ops *mp_ops;
 EXPORT_SYMBOL(mp_ops);
 
@@ -122,6 +144,7 @@ asmlinkage void start_secondary(void)
         set_cpu_online(cpu, true);
 
         set_cpu_sibling_map(cpu);
+        set_cpu_core_map(cpu);
 
         cpu_set(cpu, cpu_callin_map);
 
@@ -175,6 +198,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         current_thread_info()->cpu = 0;
         mp_ops->prepare_cpus(max_cpus);
         set_cpu_sibling_map(0);
+        set_cpu_core_map(0);
 #ifndef CONFIG_HOTPLUG_CPU
         init_cpu_present(cpu_possible_mask);
 #endif
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 51706d6dd5b0..22b19c275044 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -90,6 +90,7 @@ extern asmlinkage void handle_mt(void);
 extern asmlinkage void handle_dsp(void);
 extern asmlinkage void handle_mcheck(void);
 extern asmlinkage void handle_reserved(void);
+extern void tlb_do_page_fault_0(void);
 
 void (*board_be_init)(void);
 int (*board_be_handler)(struct pt_regs *regs, int is_fixup);
@@ -1088,13 +1089,19 @@ static int default_cu2_call(struct notifier_block *nfb, unsigned long action,
 
 static int enable_restore_fp_context(int msa)
 {
-        int err, was_fpu_owner;
+        int err, was_fpu_owner, prior_msa;
 
         if (!used_math()) {
                 /* First time FP context user. */
+                preempt_disable();
                 err = init_fpu();
-                if (msa && !err)
+                if (msa && !err) {
                         enable_msa();
+                        _init_msa_upper();
+                        set_thread_flag(TIF_USEDMSA);
+                        set_thread_flag(TIF_MSA_CTX_LIVE);
+                }
+                preempt_enable();
                 if (!err)
                         set_used_math();
                 return err;
@@ -1134,10 +1141,11 @@ static int enable_restore_fp_context(int msa)
          * This task is using or has previously used MSA. Thus we require
          * that Status.FR == 1.
          */
+        preempt_disable();
         was_fpu_owner = is_fpu_owner();
-        err = own_fpu(0);
+        err = own_fpu_inatomic(0);
         if (err)
-                return err;
+                goto out;
 
         enable_msa();
         write_msa_csr(current->thread.fpu.msacsr);
@@ -1146,13 +1154,42 @@ static int enable_restore_fp_context(int msa)
         /*
          * If this is the first time that the task is using MSA and it has
          * previously used scalar FP in this time slice then we already nave
-         * FP context which we shouldn't clobber.
+         * FP context which we shouldn't clobber. We do however need to clear
+         * the upper 64b of each vector register so that this task has no
+         * opportunity to see data left behind by another.
          */
-        if (!test_and_set_thread_flag(TIF_MSA_CTX_LIVE) && was_fpu_owner)
-                return 0;
+        prior_msa = test_and_set_thread_flag(TIF_MSA_CTX_LIVE);
+        if (!prior_msa && was_fpu_owner) {
+                _init_msa_upper();
+
+                goto out;
+        }
+
+        if (!prior_msa) {
+                /*
+                 * Restore the least significant 64b of each vector register
+                 * from the existing scalar FP context.
+                 */
+                _restore_fp(current);
+
+                /*
+                 * The task has not formerly used MSA, so clear the upper 64b
+                 * of each vector register such that it cannot see data left
+                 * behind by another task.
+                 */
+                _init_msa_upper();
+        } else {
+                /* We need to restore the vector context. */
+                restore_msa(current);
+
+                /* Restore the scalar FP control & status register */
+                if (!was_fpu_owner)
+                        asm volatile("ctc1 %0, $31" : : "r"(current->thread.fpu.fcr31));
+        }
+
+out:
+        preempt_enable();
 
-        /* We need to restore the vector context. */
-        restore_msa(current);
         return 0;
 }
 
@@ -2114,6 +2151,12 @@ void __init trap_init(void)
                 set_except_vector(15, handle_fpe);
 
         set_except_vector(16, handle_ftlb);
+
+        if (cpu_has_rixiex) {
+                set_except_vector(19, tlb_do_page_fault_0);
+                set_except_vector(20, tlb_do_page_fault_0);
+        }
+
         set_except_vector(21, handle_msa);
         set_except_vector(22, handle_mdmx);
 
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 2b3517214d6d..e11906dff885 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -690,7 +690,6 @@ static void emulate_load_store_insn(struct pt_regs *regs,
         case sdc1_op:
                 die_if_kernel("Unaligned FP access in kernel code", regs);
                 BUG_ON(!used_math());
-                BUG_ON(!is_fpu_owner());
 
                 lose_fpu(1);    /* Save FPU state for the emulator. */
                 res = fpu_emulator_cop1Handler(regs, &current->thread.fpu, 1,
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index 4fda672cb58e..cd7114147ae7 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -886,7 +886,7 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
         return VM_FAULT_SIGBUS;
 }
 
-int kvm_dev_ioctl_check_extension(long ext)
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 {
         int r;
 
diff --git a/arch/mips/loongson/Kconfig b/arch/mips/loongson/Kconfig
index e6a86ccc4421..1b91fc6a921b 100644
--- a/arch/mips/loongson/Kconfig
+++ b/arch/mips/loongson/Kconfig
@@ -60,8 +60,8 @@ config LEMOTE_MACH2F
           These family machines include fuloong2f mini PC, yeeloong2f notebook,
           LingLoong allinone PC and so forth.
 
-config LEMOTE_MACH3A
-        bool "Lemote Loongson 3A family machines"
+config LOONGSON_MACH3X
+        bool "Generic Loongson 3 family machines"
         select ARCH_SPARSEMEM_ENABLE
         select GENERIC_ISA_DMA_SUPPORT_BROKEN
         select BOOT_ELF32
@@ -79,6 +79,7 @@ config LEMOTE_MACH3A
         select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_SMP
         select SYS_SUPPORTS_HOTPLUG_CPU
+        select SYS_SUPPORTS_NUMA
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -86,8 +87,8 @@ config LEMOTE_MACH3A
         select ZONE_DMA32
         select LEFI_FIRMWARE_INTERFACE
         help
-                Lemote Loongson 3A family machines utilize the 3A revision of
-                Loongson processor and RS780/SBX00 chipset.
+                Generic Loongson 3 family machines utilize the 3A/3B revision
+                of Loongson processor and RS780/SBX00 chipset.
 endchoice
 
 config CS5536
diff --git a/arch/mips/loongson/Platform b/arch/mips/loongson/Platform
index 6205372b6c2d..0ac20eb84ecc 100644
--- a/arch/mips/loongson/Platform
+++ b/arch/mips/loongson/Platform
@@ -30,4 +30,4 @@ platform-$(CONFIG_MACH_LOONGSON) += loongson/
 cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson -mno-branch-likely
 load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000
 load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000
-load-$(CONFIG_CPU_LOONGSON3) += 0xffffffff80200000
+load-$(CONFIG_LOONGSON_MACH3X) += 0xffffffff80200000
diff --git a/arch/mips/loongson/common/env.c b/arch/mips/loongson/common/env.c
index 0c543eae49bf..f15228550a22 100644
--- a/arch/mips/loongson/common/env.c
+++ b/arch/mips/loongson/common/env.c
@@ -27,6 +27,12 @@ EXPORT_SYMBOL(cpu_clock_freq);
 struct efi_memory_map_loongson *loongson_memmap;
 struct loongson_system_configuration loongson_sysconf;
 
+u64 loongson_chipcfg[MAX_PACKAGES] = {0xffffffffbfc00180};
+u64 loongson_freqctrl[MAX_PACKAGES];
+
+unsigned long long smp_group[4];
+int cpuhotplug_workaround = 0;
+
 #define parse_even_earlier(res, option, p)                              \
 do {                                                                    \
         unsigned int tmp __maybe_unused;                                \
@@ -77,9 +83,47 @@ void __init prom_init_env(void)
 
         cpu_clock_freq = ecpu->cpu_clock_freq;
         loongson_sysconf.cputype = ecpu->cputype;
+        if (ecpu->cputype == Loongson_3A) {
+                loongson_sysconf.cores_per_node = 4;
+                loongson_sysconf.cores_per_package = 4;
+                smp_group[0] = 0x900000003ff01000;
+                smp_group[1] = 0x900010003ff01000;
+                smp_group[2] = 0x900020003ff01000;
+                smp_group[3] = 0x900030003ff01000;
+                loongson_chipcfg[0] = 0x900000001fe00180;
+                loongson_chipcfg[1] = 0x900010001fe00180;
+                loongson_chipcfg[2] = 0x900020001fe00180;
+                loongson_chipcfg[3] = 0x900030001fe00180;
+                loongson_sysconf.ht_control_base = 0x90000EFDFB000000;
+        } else if (ecpu->cputype == Loongson_3B) {
+                loongson_sysconf.cores_per_node = 4; /* One chip has 2 nodes */
+                loongson_sysconf.cores_per_package = 8;
+                smp_group[0] = 0x900000003ff01000;
+                smp_group[1] = 0x900010003ff05000;
+                smp_group[2] = 0x900020003ff09000;
+                smp_group[3] = 0x900030003ff0d000;
+                loongson_chipcfg[0] = 0x900000001fe00180;
+                loongson_chipcfg[1] = 0x900020001fe00180;
+                loongson_chipcfg[2] = 0x900040001fe00180;
+                loongson_chipcfg[3] = 0x900060001fe00180;
+                loongson_freqctrl[0] = 0x900000001fe001d0;
+                loongson_freqctrl[1] = 0x900020001fe001d0;
+                loongson_freqctrl[2] = 0x900040001fe001d0;
+                loongson_freqctrl[3] = 0x900060001fe001d0;
+                loongson_sysconf.ht_control_base = 0x90001EFDFB000000;
+                cpuhotplug_workaround = 1;
+        } else {
+                loongson_sysconf.cores_per_node = 1;
+                loongson_sysconf.cores_per_package = 1;
+                loongson_chipcfg[0] = 0x900000001fe00180;
+        }
+
         loongson_sysconf.nr_cpus = ecpu->nr_cpus;
         if (ecpu->nr_cpus > NR_CPUS || ecpu->nr_cpus == 0)
                 loongson_sysconf.nr_cpus = NR_CPUS;
+        loongson_sysconf.nr_nodes = (loongson_sysconf.nr_cpus +
+                loongson_sysconf.cores_per_node - 1) /
+                loongson_sysconf.cores_per_node;
 
         loongson_sysconf.pci_mem_start_addr = eirq_source->pci_mem_start_addr;
         loongson_sysconf.pci_mem_end_addr = eirq_source->pci_mem_end_addr;
@@ -93,7 +137,6 @@ void __init prom_init_env(void)
         loongson_sysconf.poweroff_addr = boot_p->reset_system.Shutdown;
         loongson_sysconf.suspend_addr = boot_p->reset_system.DoSuspend;
 
-        loongson_sysconf.ht_control_base = 0x90000EFDFB000000;
         loongson_sysconf.vgabios_addr = boot_p->efi.smbios.vga_bios;
         pr_debug("Shutdown Addr: %llx, Restart Addr: %llx, VBIOS Addr: %llx\n",
                 loongson_sysconf.poweroff_addr, loongson_sysconf.restart_addr,
@@ -111,6 +154,10 @@ void __init prom_init_env(void)
                 case PRID_REV_LOONGSON3A:
                         cpu_clock_freq = 900000000;
                         break;
+                case PRID_REV_LOONGSON3B_R1:
+                case PRID_REV_LOONGSON3B_R2:
+                        cpu_clock_freq = 1000000000;
+                        break;
                 default:
                         cpu_clock_freq = 100000000;
                         break;
diff --git a/arch/mips/loongson/common/init.c b/arch/mips/loongson/common/init.c
index f37fe5413b73..f6af3aba4c86 100644
--- a/arch/mips/loongson/common/init.c
+++ b/arch/mips/loongson/common/init.c
@@ -30,7 +30,11 @@ void __init prom_init(void)
         set_io_port_base((unsigned long)
                 ioremap(LOONGSON_PCIIO_BASE, LOONGSON_PCIIO_SIZE));
 
+#ifdef CONFIG_NUMA
+        prom_init_numa_memory();
+#else
         prom_init_memory();
+#endif
 
         /*init the uart base address */
         prom_init_uart_base();
diff --git a/arch/mips/loongson/common/pm.c b/arch/mips/loongson/common/pm.c
index f55e07aee071..a6b67ccfc811 100644
--- a/arch/mips/loongson/common/pm.c
+++ b/arch/mips/loongson/common/pm.c
@@ -79,7 +79,7 @@ int __weak wakeup_loongson(void)
 static void wait_for_wakeup_events(void)
 {
         while (!wakeup_loongson())
-                LOONGSON_CHIPCFG0 &= ~0x7;
+                LOONGSON_CHIPCFG(0) &= ~0x7;
 }
 
 /*
@@ -102,15 +102,15 @@ static void loongson_suspend_enter(void)
 
         stop_perf_counters();
 
-        cached_cpu_freq = LOONGSON_CHIPCFG0;
+        cached_cpu_freq = LOONGSON_CHIPCFG(0);
 
         /* Put CPU into wait mode */
-        LOONGSON_CHIPCFG0 &= ~0x7;
+        LOONGSON_CHIPCFG(0) &= ~0x7;
 
         /* wait for the given events to wakeup cpu from wait mode */
         wait_for_wakeup_events();
 
-        LOONGSON_CHIPCFG0 = cached_cpu_freq;
+        LOONGSON_CHIPCFG(0) = cached_cpu_freq;
         mmiowb();
 }
 
diff --git a/arch/mips/loongson/lemote-2f/clock.c b/arch/mips/loongson/lemote-2f/clock.c
index 1eed38e28b1e..a217061beee3 100644
--- a/arch/mips/loongson/lemote-2f/clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@ -114,9 +114,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
 
         clk->rate = rate;
 
-        regval = LOONGSON_CHIPCFG0;
+        regval = LOONGSON_CHIPCFG(0);
         regval = (regval & ~0x7) | (pos->driver_data - 1);
-        LOONGSON_CHIPCFG0 = regval;
+        LOONGSON_CHIPCFG(0) = regval;
 
         return ret;
 }
diff --git a/arch/mips/loongson/lemote-2f/reset.c b/arch/mips/loongson/lemote-2f/reset.c
index 90962a3a1731..79ac694fe744 100644
--- a/arch/mips/loongson/lemote-2f/reset.c
+++ b/arch/mips/loongson/lemote-2f/reset.c
@@ -28,7 +28,7 @@ static void reset_cpu(void)
          * reset cpu to full speed, this is needed when enabling cpu frequency
          * scalling
          */
-        LOONGSON_CHIPCFG0 |= 0x7;
+        LOONGSON_CHIPCFG(0) |= 0x7;
 }
 
 /* reset support for fuloong2f */
diff --git a/arch/mips/loongson/loongson-3/Makefile b/arch/mips/loongson/loongson-3/Makefile
index 70152b252ddc..b4df775b9f30 100644
--- a/arch/mips/loongson/loongson-3/Makefile
+++ b/arch/mips/loongson/loongson-3/Makefile
@@ -1,6 +1,8 @@
 #
 # Makefile for Loongson-3 family machines
 #
-obj-y                   += irq.o
+obj-y                   += irq.o cop2-ex.o
 
 obj-$(CONFIG_SMP)       += smp.o
+
+obj-$(CONFIG_NUMA)      += numa.o
diff --git a/arch/mips/loongson/loongson-3/cop2-ex.c b/arch/mips/loongson/loongson-3/cop2-ex.c
new file mode 100644
index 000000000000..9182e8d2967c
--- /dev/null
+++ b/arch/mips/loongson/loongson-3/cop2-ex.c
@@ -0,0 +1,63 @@
+/*
+ * 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) 2014 Lemote Corporation.
+ *   written by Huacai Chen <chenhc@lemote.com>
+ *
+ * based on arch/mips/cavium-octeon/cpu.c
+ * Copyright (C) 2009 Wind River Systems,
+ *   written by Ralf Baechle <ralf@linux-mips.org>
+ */
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/notifier.h>
+
+#include <asm/fpu.h>
+#include <asm/cop2.h>
+#include <asm/current.h>
+#include <asm/mipsregs.h>
+
+static int loongson_cu2_call(struct notifier_block *nfb, unsigned long action,
+        void *data)
+{
+        int fpu_enabled;
+        int fr = !test_thread_flag(TIF_32BIT_FPREGS);
+
+        switch (action) {
+        case CU2_EXCEPTION:
+                preempt_disable();
+                fpu_enabled = read_c0_status() & ST0_CU1;
+                if (!fr)
+                        set_c0_status(ST0_CU1 | ST0_CU2);
+                else
+                        set_c0_status(ST0_CU1 | ST0_CU2 | ST0_FR);
+                enable_fpu_hazard();
+                KSTK_STATUS(current) |= (ST0_CU1 | ST0_CU2);
+                if (fr)
+                        KSTK_STATUS(current) |= ST0_FR;
+                else
+                        KSTK_STATUS(current) &= ~ST0_FR;
+                /* If FPU is enabled, we needn't init or restore fp */
+                if(!fpu_enabled) {
+                        set_thread_flag(TIF_USEDFPU);
+                        if (!used_math()) {
+                                _init_fpu();
+                                set_used_math();
+                        } else
+                                _restore_fp(current);
+                }
+                preempt_enable();
+
+                return NOTIFY_STOP;     /* Don't call default notifier */
+        }
+
+        return NOTIFY_OK;               /* Let default notifier send signals */
+}
+
+static int __init loongson_cu2_setup(void)
+{
+        return cu2_notifier(loongson_cu2_call, 0);
+}
+early_initcall(loongson_cu2_setup);
diff --git a/arch/mips/loongson/loongson-3/irq.c b/arch/mips/loongson/loongson-3/irq.c
index f240828181ff..ca1c62af5188 100644
--- a/arch/mips/loongson/loongson-3/irq.c
+++ b/arch/mips/loongson/loongson-3/irq.c
@@ -7,6 +7,8 @@
 #include <asm/i8259.h>
 #include <asm/mipsregs.h>
 
+#include "smp.h"
+
 unsigned int ht_irq[] = {1, 3, 4, 5, 6, 7, 8, 12, 14, 15};
 
 static void ht_irqdispatch(void)
@@ -53,9 +55,15 @@ static inline void mask_loongson_irq(struct irq_data *d)
         /* Workaround: UART IRQ may deliver to any core */
         if (d->irq == LOONGSON_UART_IRQ) {
                 int cpu = smp_processor_id();
-
-                LOONGSON_INT_ROUTER_INTENCLR = 1 << 10;
-                LOONGSON_INT_ROUTER_LPC = 0x10 + (1<<cpu);
+                int node_id = cpu / loongson_sysconf.cores_per_node;
+                int core_id = cpu % loongson_sysconf.cores_per_node;
+                u64 intenclr_addr = smp_group[node_id] |
+                        (u64)(&LOONGSON_INT_ROUTER_INTENCLR);
+                u64 introuter_lpc_addr = smp_group[node_id] |
+                        (u64)(&LOONGSON_INT_ROUTER_LPC);
+
+                *(volatile u32 *)intenclr_addr = 1 << 10;
+                *(volatile u8 *)introuter_lpc_addr = 0x10 + (1<<core_id);
         }
 }
 
@@ -64,9 +72,15 @@ static inline void unmask_loongson_irq(struct irq_data *d)
         /* Workaround: UART IRQ may deliver to any core */
         if (d->irq == LOONGSON_UART_IRQ) {
                 int cpu = smp_processor_id();
-
-                LOONGSON_INT_ROUTER_INTENSET = 1 << 10;
-                LOONGSON_INT_ROUTER_LPC = 0x10 + (1<<cpu);
+                int node_id = cpu / loongson_sysconf.cores_per_node;
+                int core_id = cpu % loongson_sysconf.cores_per_node;
+                u64 intenset_addr = smp_group[node_id] |
+                        (u64)(&LOONGSON_INT_ROUTER_INTENSET);
+                u64 introuter_lpc_addr = smp_group[node_id] |
+                        (u64)(&LOONGSON_INT_ROUTER_LPC);
+
+                *(volatile u32 *)intenset_addr = 1 << 10;
+                *(volatile u8 *)introuter_lpc_addr = 0x10 + (1<<core_id);
         }
 
         set_c0_status(0x100 << (d->irq - MIPS_CPU_IRQ_BASE));
diff --git a/arch/mips/loongson/loongson-3/numa.c b/arch/mips/loongson/loongson-3/numa.c
new file mode 100644
index 000000000000..ca025a6ba559
--- /dev/null
+++ b/arch/mips/loongson/loongson-3/numa.c
@@ -0,0 +1,291 @@
+/*
+ * Copyright (C) 2010 Loongson Inc. & Lemote Inc. &
+ *                    Insititute of Computing Technology
+ * Author:  Xiang Gao, gaoxiang@ict.ac.cn
+ *          Huacai Chen, chenhc@lemote.com
+ *          Xiaofu Meng, Shuangshuang Zhang
+ *
+ * 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/init.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/mmzone.h>
+#include <linux/module.h>
+#include <linux/nodemask.h>
+#include <linux/swap.h>
+#include <linux/memblock.h>
+#include <linux/bootmem.h>
+#include <linux/pfn.h>
+#include <linux/highmem.h>
+#include <asm/page.h>
+#include <asm/pgalloc.h>
+#include <asm/sections.h>
+#include <linux/bootmem.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <asm/bootinfo.h>
+#include <asm/mc146818-time.h>
+#include <asm/time.h>
+#include <asm/wbflush.h>
+#include <boot_param.h>
+
+static struct node_data prealloc__node_data[MAX_NUMNODES];
+unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES];
+struct node_data *__node_data[MAX_NUMNODES];
+EXPORT_SYMBOL(__node_data);
+
+static void enable_lpa(void)
+{
+        unsigned long value;
+
+        value = __read_32bit_c0_register($16, 3);
+        value |= 0x00000080;
+        __write_32bit_c0_register($16, 3, value);
+        value = __read_32bit_c0_register($16, 3);
+        pr_info("CP0_Config3: CP0 16.3 (0x%lx)\n", value);
+
+        value = __read_32bit_c0_register($5, 1);
+        value |= 0x20000000;
+        __write_32bit_c0_register($5, 1, value);
+        value = __read_32bit_c0_register($5, 1);
+        pr_info("CP0_PageGrain: CP0 5.1 (0x%lx)\n", value);
+}
+
+static void cpu_node_probe(void)
+{
+        int i;
+
+        nodes_clear(node_possible_map);
+        nodes_clear(node_online_map);
+        for (i = 0; i < loongson_sysconf.nr_nodes; i++) {
+                node_set_state(num_online_nodes(), N_POSSIBLE);
+                node_set_online(num_online_nodes());
+        }
+
+        pr_info("NUMA: Discovered %d cpus on %d nodes\n",
+                loongson_sysconf.nr_cpus, num_online_nodes());
+}
+
+static int __init compute_node_distance(int row, int col)
+{
+        int package_row = row * loongson_sysconf.cores_per_node /
+                                loongson_sysconf.cores_per_package;
+        int package_col = col * loongson_sysconf.cores_per_node /
+                                loongson_sysconf.cores_per_package;
+
+        if (col == row)
+                return 0;
+        else if (package_row == package_col)
+                return 40;
+        else
+                return 100;
+}
+
+static void __init init_topology_matrix(void)
+{
+        int row, col;
+
+        for (row = 0; row < MAX_NUMNODES; row++)
+                for (col = 0; col < MAX_NUMNODES; col++)
+                        __node_distances[row][col] = -1;
+
+        for_each_online_node(row) {
+                for_each_online_node(col) {
+                        __node_distances[row][col] =
+                                compute_node_distance(row, col);
+                }
+        }
+}
+
+static unsigned long nid_to_addroffset(unsigned int nid)
+{
+        unsigned long result;
+        switch (nid) {
+        case 0:
+        default:
+                result = NODE0_ADDRSPACE_OFFSET;
+                break;
+        case 1:
+                result = NODE1_ADDRSPACE_OFFSET;
+                break;
+        case 2:
+                result = NODE2_ADDRSPACE_OFFSET;
+                break;
+        case 3:
+                result = NODE3_ADDRSPACE_OFFSET;
+                break;
+        }
+        return result;
+}
+
+static void __init szmem(unsigned int node)
+{
+        u32 i, mem_type;
+        static unsigned long num_physpages = 0;
+        u64 node_id, node_psize, start_pfn, end_pfn, mem_start, mem_size;
+
+        /* Parse memory information and activate */
+        for (i = 0; i < loongson_memmap->nr_map; i++) {
+                node_id = loongson_memmap->map[i].node_id;
+                if (node_id != node)
+                        continue;
+
+                mem_type = loongson_memmap->map[i].mem_type;
+                mem_size = loongson_memmap->map[i].mem_size;
+                mem_start = loongson_memmap->map[i].mem_start;
+
+                switch (mem_type) {
+                case SYSTEM_RAM_LOW:
+                        start_pfn = ((node_id << 44) + mem_start) >> PAGE_SHIFT;
+                        node_psize = (mem_size << 20) >> PAGE_SHIFT;
+                        end_pfn  = start_pfn + node_psize;
+                        num_physpages += node_psize;
+                        pr_info("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n",
+                                (u32)node_id, mem_type, mem_start, mem_size);
+                        pr_info("       start_pfn:0x%llx, end_pfn:0x%llx, num_physpages:0x%lx\n",
+                                start_pfn, end_pfn, num_physpages);
+                        add_memory_region((node_id << 44) + mem_start,
+                                (u64)mem_size << 20, BOOT_MEM_RAM);
+                        memblock_add_node(PFN_PHYS(start_pfn),
+                                PFN_PHYS(end_pfn - start_pfn), node);
+                        break;
+                case SYSTEM_RAM_HIGH:
+                        start_pfn = ((node_id << 44) + mem_start) >> PAGE_SHIFT;
+                        node_psize = (mem_size << 20) >> PAGE_SHIFT;
+                        end_pfn  = start_pfn + node_psize;
+                        num_physpages += node_psize;
+                        pr_info("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n",
+                                (u32)node_id, mem_type, mem_start, mem_size);
+                        pr_info("       start_pfn:0x%llx, end_pfn:0x%llx, num_physpages:0x%lx\n",
+                                start_pfn, end_pfn, num_physpages);
+                        add_memory_region((node_id << 44) + mem_start,
+                                (u64)mem_size << 20, BOOT_MEM_RAM);
+                        memblock_add_node(PFN_PHYS(start_pfn),
+                                PFN_PHYS(end_pfn - start_pfn), node);
+                        break;
+                case MEM_RESERVED:
+                        pr_info("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n",
+                                (u32)node_id, mem_type, mem_start, mem_size);
+                        add_memory_region((node_id << 44) + mem_start,
+                                (u64)mem_size << 20, BOOT_MEM_RESERVED);
+                        memblock_reserve(((node_id << 44) + mem_start),
+                                mem_size << 20);
+                        break;
+                }
+        }
+}
+
+static void __init node_mem_init(unsigned int node)
+{
+        unsigned long bootmap_size;
+        unsigned long node_addrspace_offset;
+        unsigned long start_pfn, end_pfn, freepfn;
+
+        node_addrspace_offset = nid_to_addroffset(node);
+        pr_info("Node%d's addrspace_offset is 0x%lx\n",
+                        node, node_addrspace_offset);
+
+        get_pfn_range_for_nid(node, &start_pfn, &end_pfn);
+        freepfn = start_pfn;
+        if (node == 0)
+                freepfn = PFN_UP(__pa_symbol(&_end)); /* kernel end address */
+        pr_info("Node%d: start_pfn=0x%lx, end_pfn=0x%lx, freepfn=0x%lx\n",
+                node, start_pfn, end_pfn, freepfn);
+
+        __node_data[node] = prealloc__node_data + node;
+
+        NODE_DATA(node)->bdata = &bootmem_node_data[node];
+        NODE_DATA(node)->node_start_pfn = start_pfn;
+        NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn;
+
+        bootmap_size = init_bootmem_node(NODE_DATA(node), freepfn,
+                                        start_pfn, end_pfn);
+        free_bootmem_with_active_regions(node, end_pfn);
+        if (node == 0) /* used by finalize_initrd() */
+                max_low_pfn = end_pfn;
+
+        /* This is reserved for the kernel and bdata->node_bootmem_map */
+        reserve_bootmem_node(NODE_DATA(node), start_pfn << PAGE_SHIFT,
+                ((freepfn - start_pfn) << PAGE_SHIFT) + bootmap_size,
+                BOOTMEM_DEFAULT);
+
+        if (node == 0 && node_end_pfn(0) >= (0xffffffff >> PAGE_SHIFT)) {
+                /* Reserve 0xff800000~0xffffffff for RS780E integrated GPU */
+                reserve_bootmem_node(NODE_DATA(node),
+                                (node_addrspace_offset | 0xff800000),
+                                8 << 20, BOOTMEM_DEFAULT);
+        }
+
+        sparse_memory_present_with_active_regions(node);
+}
+
+static __init void prom_meminit(void)
+{
+        unsigned int node, cpu;
+
+        cpu_node_probe();
+        init_topology_matrix();
+
+        for (node = 0; node < loongson_sysconf.nr_nodes; node++) {
+                if (node_online(node)) {
+                        szmem(node);
+                        node_mem_init(node);
+                        cpus_clear(__node_data[(node)]->cpumask);
+                }
+        }
+        for (cpu = 0; cpu < loongson_sysconf.nr_cpus; cpu++) {
+                node = cpu / loongson_sysconf.cores_per_node;
+                if (node >= num_online_nodes())
+                        node = 0;
+                pr_info("NUMA: set cpumask cpu %d on node %d\n", cpu, node);
+                cpu_set(cpu, __node_data[(node)]->cpumask);
+        }
+}
+
+void __init paging_init(void)
+{
+        unsigned node;
+        unsigned long zones_size[MAX_NR_ZONES] = {0, };
+
+        pagetable_init();
+
+        for_each_online_node(node) {
+                unsigned long  start_pfn, end_pfn;
+
+                get_pfn_range_for_nid(node, &start_pfn, &end_pfn);
+
+                if (end_pfn > max_low_pfn)
+                        max_low_pfn = end_pfn;
+        }
+#ifdef CONFIG_ZONE_DMA32
+        zones_size[ZONE_DMA32] = MAX_DMA32_PFN;
+#endif
+        zones_size[ZONE_NORMAL] = max_low_pfn;
+        free_area_init_nodes(zones_size);
+}
+
+void __init mem_init(void)
+{
+        high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
+        free_all_bootmem();
+        setup_zero_pages();     /* This comes from node 0 */
+        mem_init_print_info(NULL);
+}
+
+/* All PCI device belongs to logical Node-0 */
+int pcibus_to_node(struct pci_bus *bus)
+{
+        return 0;
+}
+EXPORT_SYMBOL(pcibus_to_node);
+
+void __init prom_init_numa_memory(void)
+{
+        enable_lpa();
+        prom_meminit();
+}
+EXPORT_SYMBOL(prom_init_numa_memory);
diff --git a/arch/mips/loongson/loongson-3/smp.c b/arch/mips/loongson/loongson-3/smp.c
index 1e8894020ea5..74e827b4ec8f 100644
--- a/arch/mips/loongson/loongson-3/smp.c
+++ b/arch/mips/loongson/loongson-3/smp.c
@@ -31,6 +31,12 @@
 DEFINE_PER_CPU(int, cpu_state);
 DEFINE_PER_CPU(uint32_t, core0_c0count);
 
+static void *ipi_set0_regs[16];
+static void *ipi_clear0_regs[16];
+static void *ipi_status0_regs[16];
+static void *ipi_en0_regs[16];
+static void *ipi_mailbox_buf[16];
+
 /* read a 32bit value from ipi register */
 #define loongson3_ipi_read32(addr) readl(addr)
 /* read a 64bit value from ipi register */
@@ -48,100 +54,185 @@ DEFINE_PER_CPU(uint32_t, core0_c0count);
                 __wbflush();                    \
         } while (0)
 
-static void *ipi_set0_regs[] = {
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + SET0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + SET0),
-};
+static void ipi_set0_regs_init(void)
+{
+        ipi_set0_regs[0] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + SET0);
+        ipi_set0_regs[1] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + SET0);
+        ipi_set0_regs[2] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + SET0);
+        ipi_set0_regs[3] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + SET0);
+        ipi_set0_regs[4] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + SET0);
+        ipi_set0_regs[5] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + SET0);
+        ipi_set0_regs[6] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + SET0);
+        ipi_set0_regs[7] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + SET0);
+        ipi_set0_regs[8] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + SET0);
+        ipi_set0_regs[9] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + SET0);
+        ipi_set0_regs[10] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + SET0);
+        ipi_set0_regs[11] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + SET0);
+        ipi_set0_regs[12] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + SET0);
+        ipi_set0_regs[13] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + SET0);
+        ipi_set0_regs[14] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + SET0);
+        ipi_set0_regs[15] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + SET0);
+}
 
-static void *ipi_clear0_regs[] = {
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + CLEAR0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + CLEAR0),
-};
+static void ipi_clear0_regs_init(void)
+{
+        ipi_clear0_regs[0] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + CLEAR0);
+        ipi_clear0_regs[1] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + CLEAR0);
+        ipi_clear0_regs[2] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + CLEAR0);
+        ipi_clear0_regs[3] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + CLEAR0);
+        ipi_clear0_regs[4] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + CLEAR0);
+        ipi_clear0_regs[5] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + CLEAR0);
+        ipi_clear0_regs[6] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + CLEAR0);
+        ipi_clear0_regs[7] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + CLEAR0);
+        ipi_clear0_regs[8] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + CLEAR0);
+        ipi_clear0_regs[9] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + CLEAR0);
+        ipi_clear0_regs[10] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + CLEAR0);
+        ipi_clear0_regs[11] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + CLEAR0);
+        ipi_clear0_regs[12] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + CLEAR0);
+        ipi_clear0_regs[13] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + CLEAR0);
+        ipi_clear0_regs[14] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + CLEAR0);
+        ipi_clear0_regs[15] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + CLEAR0);
+}
 
-static void *ipi_status0_regs[] = {
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + STATUS0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + STATUS0),
-};
+static void ipi_status0_regs_init(void)
+{
+        ipi_status0_regs[0] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + STATUS0);
+        ipi_status0_regs[1] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + STATUS0);
+        ipi_status0_regs[2] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + STATUS0);
+        ipi_status0_regs[3] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + STATUS0);
+        ipi_status0_regs[4] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + STATUS0);
+        ipi_status0_regs[5] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + STATUS0);
+        ipi_status0_regs[6] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + STATUS0);
+        ipi_status0_regs[7] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + STATUS0);
+        ipi_status0_regs[8] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + STATUS0);
+        ipi_status0_regs[9] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + STATUS0);
+        ipi_status0_regs[10] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + STATUS0);
+        ipi_status0_regs[11] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + STATUS0);
+        ipi_status0_regs[12] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + STATUS0);
+        ipi_status0_regs[13] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + STATUS0);
+        ipi_status0_regs[14] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + STATUS0);
+        ipi_status0_regs[15] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + STATUS0);
+}
 
-static void *ipi_en0_regs[] = {
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + EN0),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + EN0),
-};
+static void ipi_en0_regs_init(void)
+{
+        ipi_en0_regs[0] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + EN0);
+        ipi_en0_regs[1] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + EN0);
+        ipi_en0_regs[2] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + EN0);
+        ipi_en0_regs[3] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + EN0);
+        ipi_en0_regs[4] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + EN0);
+        ipi_en0_regs[5] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + EN0);
+        ipi_en0_regs[6] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + EN0);
+        ipi_en0_regs[7] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + EN0);
+        ipi_en0_regs[8] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + EN0);
+        ipi_en0_regs[9] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + EN0);
+        ipi_en0_regs[10] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + EN0);
+        ipi_en0_regs[11] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + EN0);
+        ipi_en0_regs[12] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + EN0);
+        ipi_en0_regs[13] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + EN0);
+        ipi_en0_regs[14] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + EN0);
+        ipi_en0_regs[15] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + EN0);
+}
 
-static void *ipi_mailbox_buf[] = {
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + BUF),
-        (void *)(SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + BUF),
-};
+static void ipi_mailbox_buf_init(void)
+{
+        ipi_mailbox_buf[0] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE0_OFFSET + BUF);
+        ipi_mailbox_buf[1] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE1_OFFSET + BUF);
+        ipi_mailbox_buf[2] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE2_OFFSET + BUF);
+        ipi_mailbox_buf[3] = (void *)
+                (SMP_CORE_GROUP0_BASE + SMP_CORE3_OFFSET + BUF);
+        ipi_mailbox_buf[4] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE0_OFFSET + BUF);
+        ipi_mailbox_buf[5] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE1_OFFSET + BUF);
+        ipi_mailbox_buf[6] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE2_OFFSET + BUF);
+        ipi_mailbox_buf[7] = (void *)
+                (SMP_CORE_GROUP1_BASE + SMP_CORE3_OFFSET + BUF);
+        ipi_mailbox_buf[8] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE0_OFFSET + BUF);
+        ipi_mailbox_buf[9] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE1_OFFSET + BUF);
+        ipi_mailbox_buf[10] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE2_OFFSET + BUF);
+        ipi_mailbox_buf[11] = (void *)
+                (SMP_CORE_GROUP2_BASE + SMP_CORE3_OFFSET + BUF);
+        ipi_mailbox_buf[12] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE0_OFFSET + BUF);
+        ipi_mailbox_buf[13] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE1_OFFSET + BUF);
+        ipi_mailbox_buf[14] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE2_OFFSET + BUF);
+        ipi_mailbox_buf[15] = (void *)
+                (SMP_CORE_GROUP3_BASE + SMP_CORE3_OFFSET + BUF);
+}
 
 /*
  * Simple enough, just poke the appropriate ipi register
@@ -203,6 +294,8 @@ static void loongson3_init_secondary(void)
         for (i = 0; i < loongson_sysconf.nr_cpus; i++)
                 loongson3_ipi_write32(0xffffffff, ipi_en0_regs[i]);
 
+        cpu_data[cpu].package = cpu / loongson_sysconf.cores_per_package;
+        cpu_data[cpu].core = cpu % loongson_sysconf.cores_per_package;
         per_cpu(cpu_state, cpu) = CPU_ONLINE;
 
         i = 0;
@@ -246,6 +339,11 @@ static void __init loongson3_smp_setup(void)
                 __cpu_number_map[i] = ++num;
                 __cpu_logical_map[num] = i;
         }
+        ipi_set0_regs_init();
+        ipi_clear0_regs_init();
+        ipi_status0_regs_init();
+        ipi_en0_regs_init();
+        ipi_mailbox_buf_init();
         pr_info("Detected %i available secondary CPU(s)\n", num);
 }
 
@@ -313,7 +411,7 @@ static void loongson3_cpu_die(unsigned int cpu)
  * flush all L1 entries at first. Then, another core (usually Core 0) can
  * safely disable the clock of the target core. loongson3_play_dead() is
  * called via CKSEG1 (uncached and unmmaped) */
-static void loongson3_play_dead(int *state_addr)
+static void loongson3a_play_dead(int *state_addr)
 {
         register int val;
         register long cpuid, core, node, count;
@@ -375,6 +473,70 @@ static void loongson3_play_dead(int *state_addr)
                 : "a1");
 }
 
+static void loongson3b_play_dead(int *state_addr)
+{
+        register int val;
+        register long cpuid, core, node, count;
+        register void *addr, *base, *initfunc;
+
+        __asm__ __volatile__(
+                "   .set push                     \n"
+                "   .set noreorder                \n"
+                "   li %[addr], 0x80000000        \n" /* KSEG0 */
+                "1: cache 0, 0(%[addr])           \n" /* flush L1 ICache */
+                "   cache 0, 1(%[addr])           \n"
+                "   cache 0, 2(%[addr])           \n"
+                "   cache 0, 3(%[addr])           \n"
+                "   cache 1, 0(%[addr])           \n" /* flush L1 DCache */
+                "   cache 1, 1(%[addr])           \n"
+                "   cache 1, 2(%[addr])           \n"
+                "   cache 1, 3(%[addr])           \n"
+                "   addiu %[sets], %[sets], -1    \n"
+                "   bnez  %[sets], 1b             \n"
+                "   addiu %[addr], %[addr], 0x20  \n"
+                "   li    %[val], 0x7             \n" /* *state_addr = CPU_DEAD; */
+                "   sw    %[val], (%[state_addr]) \n"
+                "   sync                          \n"
+                "   cache 21, (%[state_addr])     \n" /* flush entry of *state_addr */
+                "   .set pop                      \n"
+                : [addr] "=&r" (addr), [val] "=&r" (val)
+                : [state_addr] "r" (state_addr),
+                  [sets] "r" (cpu_data[smp_processor_id()].dcache.sets));
+
+        __asm__ __volatile__(
+                "   .set push                         \n"
+                "   .set noreorder                    \n"
+                "   .set mips64                       \n"
+                "   mfc0  %[cpuid], $15, 1            \n"
+                "   andi  %[cpuid], 0x3ff             \n"
+                "   dli   %[base], 0x900000003ff01000 \n"
+                "   andi  %[core], %[cpuid], 0x3      \n"
+                "   sll   %[core], 8                  \n" /* get core id */
+                "   or    %[base], %[base], %[core]   \n"
+                "   andi  %[node], %[cpuid], 0xc      \n"
+                "   dsll  %[node], 42                 \n" /* get node id */
+                "   or    %[base], %[base], %[node]   \n"
+                "   dsrl  %[node], 30                 \n" /* 15:14 */
+                "   or    %[base], %[base], %[node]   \n"
+                "1: li    %[count], 0x100             \n" /* wait for init loop */
+                "2: bnez  %[count], 2b                \n" /* limit mailbox access */
+                "   addiu %[count], -1                \n"
+                "   ld    %[initfunc], 0x20(%[base])  \n" /* get PC via mailbox */
+                "   beqz  %[initfunc], 1b             \n"
+                "   nop                               \n"
+                "   ld    $sp, 0x28(%[base])          \n" /* get SP via mailbox */
+                "   ld    $gp, 0x30(%[base])          \n" /* get GP via mailbox */
+                "   ld    $a1, 0x38(%[base])          \n"
+                "   jr    %[initfunc]                 \n" /* jump to initial PC */
+                "   nop                               \n"
+                "   .set pop                          \n"
+                : [core] "=&r" (core), [node] "=&r" (node),
+                  [base] "=&r" (base), [cpuid] "=&r" (cpuid),
+                  [count] "=&r" (count), [initfunc] "=&r" (initfunc)
+                : /* No Input */
+                : "a1");
+}
+
 void play_dead(void)
 {
         int *state_addr;
@@ -382,13 +544,48 @@ void play_dead(void)
         void (*play_dead_at_ckseg1)(int *);
 
         idle_task_exit();
-        play_dead_at_ckseg1 =
-                (void *)CKSEG1ADDR((unsigned long)loongson3_play_dead);
+        switch (loongson_sysconf.cputype) {
+        case Loongson_3A:
+        default:
+                play_dead_at_ckseg1 =
+                        (void *)CKSEG1ADDR((unsigned long)loongson3a_play_dead);
+                break;
+        case Loongson_3B:
+                play_dead_at_ckseg1 =
+                        (void *)CKSEG1ADDR((unsigned long)loongson3b_play_dead);
+                break;
+        }
         state_addr = &per_cpu(cpu_state, cpu);
         mb();
         play_dead_at_ckseg1(state_addr);
 }
 
+void loongson3_disable_clock(int cpu)
+{
+        uint64_t core_id = cpu_data[cpu].core;
+        uint64_t package_id = cpu_data[cpu].package;
+
+        if (loongson_sysconf.cputype == Loongson_3A) {
+                LOONGSON_CHIPCFG(package_id) &= ~(1 << (12 + core_id));
+        } else if (loongson_sysconf.cputype == Loongson_3B) {
+                if (!cpuhotplug_workaround)
+                        LOONGSON_FREQCTRL(package_id) &= ~(1 << (core_id * 4 + 3));
+        }
+}
+
+void loongson3_enable_clock(int cpu)
+{
+        uint64_t core_id = cpu_data[cpu].core;
+        uint64_t package_id = cpu_data[cpu].package;
+
+        if (loongson_sysconf.cputype == Loongson_3A) {
+                LOONGSON_CHIPCFG(package_id) |= 1 << (12 + core_id);
+        } else if (loongson_sysconf.cputype == Loongson_3B) {
+                if (!cpuhotplug_workaround)
+                        LOONGSON_FREQCTRL(package_id) |= 1 << (core_id * 4 + 3);
+        }
+}
+
 #define CPU_POST_DEAD_FROZEN    (CPU_POST_DEAD | CPU_TASKS_FROZEN)
 static int loongson3_cpu_callback(struct notifier_block *nfb,
         unsigned long action, void *hcpu)
@@ -399,12 +596,12 @@ static int loongson3_cpu_callback(struct notifier_block *nfb,
         case CPU_POST_DEAD:
         case CPU_POST_DEAD_FROZEN:
                 pr_info("Disable clock for CPU#%d\n", cpu);
-                LOONGSON_CHIPCFG0 &= ~(1 << (12 + cpu));
+                loongson3_disable_clock(cpu);
                 break;
         case CPU_UP_PREPARE:
         case CPU_UP_PREPARE_FROZEN:
                 pr_info("Enable clock for CPU#%d\n", cpu);
-                LOONGSON_CHIPCFG0 |= 1 << (12 + cpu);
+                loongson3_enable_clock(cpu);
                 break;
         }
 
diff --git a/arch/mips/loongson/loongson-3/smp.h b/arch/mips/loongson/loongson-3/smp.h
index 3453e8c4f2f0..d98ff654b7d7 100644
--- a/arch/mips/loongson/loongson-3/smp.h
+++ b/arch/mips/loongson/loongson-3/smp.h
@@ -1,29 +1,30 @@
 #ifndef __LOONGSON_SMP_H_
 #define __LOONGSON_SMP_H_
 
-/* for Loongson-3A smp support */
+/* for Loongson-3 smp support */
+extern unsigned long long smp_group[4];
 
 /* 4 groups(nodes) in maximum in numa case */
-#define  SMP_CORE_GROUP0_BASE    0x900000003ff01000
-#define  SMP_CORE_GROUP1_BASE    0x900010003ff01000
-#define  SMP_CORE_GROUP2_BASE    0x900020003ff01000
-#define  SMP_CORE_GROUP3_BASE    0x900030003ff01000
+#define SMP_CORE_GROUP0_BASE    (smp_group[0])
+#define SMP_CORE_GROUP1_BASE    (smp_group[1])
+#define SMP_CORE_GROUP2_BASE    (smp_group[2])
+#define SMP_CORE_GROUP3_BASE    (smp_group[3])
 
 /* 4 cores in each group(node) */
-#define  SMP_CORE0_OFFSET  0x000
-#define  SMP_CORE1_OFFSET  0x100
-#define  SMP_CORE2_OFFSET  0x200
-#define  SMP_CORE3_OFFSET  0x300
+#define SMP_CORE0_OFFSET  0x000
+#define SMP_CORE1_OFFSET  0x100
+#define SMP_CORE2_OFFSET  0x200
+#define SMP_CORE3_OFFSET  0x300
 
 /* ipi registers offsets */
-#define  STATUS0  0x00
-#define  EN0      0x04
-#define  SET0     0x08
-#define  CLEAR0   0x0c
-#define  STATUS1  0x10
-#define  MASK1    0x14
-#define  SET1     0x18
-#define  CLEAR1   0x1c
-#define  BUF      0x20
+#define STATUS0  0x00
+#define EN0      0x04
+#define SET0     0x08
+#define CLEAR0   0x0c
+#define STATUS1  0x10
+#define MASK1    0x14
+#define SET1     0x18
+#define CLEAR1   0x1c
+#define BUF      0x20
 
 #endif
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index 736c17a226e9..bf0fc6b16ad9 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -1827,7 +1827,7 @@ dcopuop:
         case -1:
 
                 if (cpu_has_mips_4_5_r)
-                        cbit = fpucondbit[MIPSInst_RT(ir) >> 2];
+                        cbit = fpucondbit[MIPSInst_FD(ir) >> 2];
                 else
                         cbit = FPU_CSR_COND;
                 if (rv.w)
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index f2e8302fa70f..fbcd8674ff1d 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1230,19 +1230,19 @@ static void probe_pcache(void)
         case CPU_R14000:
                 break;
 
+        case CPU_74K:
+        case CPU_1074K:
+                alias_74k_erratum(c);
+                /* Fall through. */
         case CPU_M14KC:
         case CPU_M14KEC:
         case CPU_24K:
         case CPU_34K:
-        case CPU_74K:
         case CPU_1004K:
-        case CPU_1074K:
         case CPU_INTERAPTIV:
         case CPU_P5600:
         case CPU_PROAPTIV:
         case CPU_M5150:
-                if ((c->cputype == CPU_74K) || (c->cputype == CPU_1074K))
-                        alias_74k_erratum(c);
                 if (!(read_c0_config7() & MIPS_CONF7_IAR) &&
                     (c->icache.waysize > PAGE_SIZE))
                         c->icache.flags |= MIPS_CACHE_ALIASES;
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 6e4413330e36..571aab064936 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -325,6 +325,38 @@ static inline void mem_init_free_highmem(void)
 #endif
 }
 
+unsigned __weak platform_maar_init(unsigned num_maars)
+{
+        return 0;
+}
+
+static void maar_init(void)
+{
+        unsigned num_maars, used, i;
+
+        if (!cpu_has_maar)
+                return;
+
+        /* Detect the number of MAARs */
+        write_c0_maari(~0);
+        back_to_back_c0_hazard();
+        num_maars = read_c0_maari() + 1;
+
+        /* MAARs should be in pairs */
+        WARN_ON(num_maars % 2);
+
+        /* Configure the required MAARs */
+        used = platform_maar_init(num_maars / 2);
+
+        /* Disable any further MAARs */
+        for (i = (used * 2); i < num_maars; i++) {
+                write_c0_maari(i);
+                back_to_back_c0_hazard();
+                write_c0_maar(0);
+                back_to_back_c0_hazard();
+        }
+}
+
 void __init mem_init(void)
 {
 #ifdef CONFIG_HIGHMEM
@@ -337,6 +369,7 @@ void __init mem_init(void)
 #endif
         high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
 
+        maar_init();
         free_all_bootmem();
         setup_zero_pages();     /* Setup zeroed pages.  */
         mem_init_free_highmem();
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c
index d657493ef561..4094bbd42adf 100644
--- a/arch/mips/mm/tlb-r3k.c
+++ b/arch/mips/mm/tlb-r3k.c
@@ -158,7 +158,7 @@ void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 {
         int cpu = smp_processor_id();
 
-        if (!vma || cpu_context(cpu, vma->vm_mm) != 0) {
+        if (cpu_context(cpu, vma->vm_mm) != 0) {
                 unsigned long flags;
                 int oldpid, newpid, idx;
 
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index 3914e27456f2..fa6ebd4bc9e9 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -57,6 +57,7 @@ void local_flush_tlb_all(void)
         local_irq_save(flags);
         /* Save old context and create impossible VPN2 value */
         old_ctx = read_c0_entryhi();
+        htw_stop();
         write_c0_entrylo0(0);
         write_c0_entrylo1(0);
 
@@ -90,6 +91,7 @@ void local_flush_tlb_all(void)
         }
         tlbw_use_hazard();
         write_c0_entryhi(old_ctx);
+        htw_start();
         flush_itlb();
         local_irq_restore(flags);
 }
@@ -131,6 +133,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
                         int oldpid = read_c0_entryhi();
                         int newpid = cpu_asid(cpu, mm);
 
+                        htw_stop();
                         while (start < end) {
                                 int idx;
 
@@ -151,6 +154,7 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
                         }
                         tlbw_use_hazard();
                         write_c0_entryhi(oldpid);
+                        htw_start();
                 } else {
                         drop_mmu_context(mm, cpu);
                 }
@@ -174,6 +178,7 @@ void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
                 start &= (PAGE_MASK << 1);
                 end += ((PAGE_SIZE << 1) - 1);
                 end &= (PAGE_MASK << 1);
+                htw_stop();
 
                 while (start < end) {
                         int idx;
@@ -195,6 +200,7 @@ void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
                 }
                 tlbw_use_hazard();
                 write_c0_entryhi(pid);
+                htw_start();
         } else {
                 local_flush_tlb_all();
         }
@@ -214,6 +220,7 @@ void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
                 page &= (PAGE_MASK << 1);
                 local_irq_save(flags);
                 oldpid = read_c0_entryhi();
+                htw_stop();
                 write_c0_entryhi(page | newpid);
                 mtc0_tlbw_hazard();
                 tlb_probe();
@@ -231,6 +238,7 @@ void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 
         finish:
                 write_c0_entryhi(oldpid);
+                htw_start();
                 flush_itlb_vm(vma);
                 local_irq_restore(flags);
         }
@@ -247,6 +255,7 @@ void local_flush_tlb_one(unsigned long page)
 
         local_irq_save(flags);
         oldpid = read_c0_entryhi();
+        htw_stop();
         page &= (PAGE_MASK << 1);
         write_c0_entryhi(page);
         mtc0_tlbw_hazard();
@@ -263,6 +272,7 @@ void local_flush_tlb_one(unsigned long page)
                 tlbw_use_hazard();
         }
         write_c0_entryhi(oldpid);
+        htw_start();
         flush_itlb();
         local_irq_restore(flags);
 }
@@ -351,6 +361,7 @@ void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
         local_irq_save(flags);
         /* Save old context and create impossible VPN2 value */
         old_ctx = read_c0_entryhi();
+        htw_stop();
         old_pagemask = read_c0_pagemask();
         wired = read_c0_wired();
         write_c0_wired(wired + 1);
@@ -366,6 +377,7 @@ void add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,
 
         write_c0_entryhi(old_ctx);
         tlbw_use_hazard();      /* What is the hazard here? */
+        htw_start();
         write_c0_pagemask(old_pagemask);
         local_flush_tlb_all();
         local_irq_restore(flags);
@@ -391,6 +403,51 @@ int __init has_transparent_hugepage(void)
 
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE  */
 
+/*
+ * Used for loading TLB entries before trap_init() has started, when we
+ * don't actually want to add a wired entry which remains throughout the
+ * lifetime of the system
+ */
+
+int temp_tlb_entry __cpuinitdata;
+
+__init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
+                               unsigned long entryhi, unsigned long pagemask)
+{
+        int ret = 0;
+        unsigned long flags;
+        unsigned long wired;
+        unsigned long old_pagemask;
+        unsigned long old_ctx;
+
+        local_irq_save(flags);
+        /* Save old context and create impossible VPN2 value */
+        old_ctx = read_c0_entryhi();
+        old_pagemask = read_c0_pagemask();
+        wired = read_c0_wired();
+        if (--temp_tlb_entry < wired) {
+                printk(KERN_WARNING
+                       "No TLB space left for add_temporary_entry\n");
+                ret = -ENOSPC;
+                goto out;
+        }
+
+        write_c0_index(temp_tlb_entry);
+        write_c0_pagemask(pagemask);
+        write_c0_entryhi(entryhi);
+        write_c0_entrylo0(entrylo0);
+        write_c0_entrylo1(entrylo1);
+        mtc0_tlbw_hazard();
+        tlb_write_indexed();
+        tlbw_use_hazard();
+
+        write_c0_entryhi(old_ctx);
+        write_c0_pagemask(old_pagemask);
+out:
+        local_irq_restore(flags);
+        return ret;
+}
+
 static int ntlb;
 static int __init set_ntlb(char *str)
 {
@@ -431,6 +488,8 @@ static void r4k_tlb_configure(void)
                 write_c0_pagegrain(pg);
         }
 
+        temp_tlb_entry = current_cpu_data.tlbsize - 1;
+
         /* From this point on the ARC firmware is dead.  */
         local_flush_tlb_all();
 
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index e80e10bafc83..a08dd53a1cc5 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -429,6 +429,7 @@ static void build_r3000_tlb_refill_handler(void)
                  (unsigned int)(p - tlb_handler));
 
         memcpy((void *)ebase, tlb_handler, 0x80);
+        local_flush_icache_range(ebase, ebase + 0x80);
 
         dump_handler("r3000_tlb_refill", (u32 *)ebase, 32);
 }
@@ -1299,6 +1300,7 @@ static void build_r4000_tlb_refill_handler(void)
         }
 #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
         uasm_l_tlb_huge_update(&l, p);
+        UASM_i_LW(&p, K0, 0, K1);
         build_huge_update_entries(&p, htlb_info.huge_pte, K1);
         build_huge_tlb_write_entry(&p, &l, &r, K0, tlb_random,
                                    htlb_info.restore_scratch);
@@ -1415,6 +1417,7 @@ static void build_r4000_tlb_refill_handler(void)
                  final_len);
 
         memcpy((void *)ebase, final_handler, 0x100);
+        local_flush_icache_range(ebase, ebase + 0x100);
 
         dump_handler("r4000_tlb_refill", (u32 *)ebase, 64);
 }
@@ -1919,7 +1922,7 @@ static void build_r4000_tlb_load_handler(void)
         if (m4kc_tlbp_war())
                 build_tlb_probe_entry(&p);
 
-        if (cpu_has_rixi) {
+        if (cpu_has_rixi && !cpu_has_rixiex) {
                 /*
                  * If the page is not _PAGE_VALID, RI or XI could not
                  * have triggered it.  Skip the expensive test..
@@ -1986,7 +1989,7 @@ static void build_r4000_tlb_load_handler(void)
         build_pte_present(&p, &r, wr.r1, wr.r2, wr.r3, label_nopage_tlbl);
         build_tlb_probe_entry(&p);
 
-        if (cpu_has_rixi) {
+        if (cpu_has_rixi && !cpu_has_rixiex) {
                 /*
                  * If the page is not _PAGE_VALID, RI or XI could not
                  * have triggered it.  Skip the expensive test..
@@ -2194,6 +2197,94 @@ static void flush_tlb_handlers(void)
                            (unsigned long)tlbmiss_handler_setup_pgd_end);
 }
 
+static void print_htw_config(void)
+{
+        unsigned long config;
+        unsigned int pwctl;
+        const int field = 2 * sizeof(unsigned long);
+
+        config = read_c0_pwfield();
+        pr_debug("PWField (0x%0*lx): GDI: 0x%02lx  UDI: 0x%02lx  MDI: 0x%02lx  PTI: 0x%02lx  PTEI: 0x%02lx\n",
+                field, config,
+                (config & MIPS_PWFIELD_GDI_MASK) >> MIPS_PWFIELD_GDI_SHIFT,
+                (config & MIPS_PWFIELD_UDI_MASK) >> MIPS_PWFIELD_UDI_SHIFT,
+                (config & MIPS_PWFIELD_MDI_MASK) >> MIPS_PWFIELD_MDI_SHIFT,
+                (config & MIPS_PWFIELD_PTI_MASK) >> MIPS_PWFIELD_PTI_SHIFT,
+                (config & MIPS_PWFIELD_PTEI_MASK) >> MIPS_PWFIELD_PTEI_SHIFT);
+
+        config = read_c0_pwsize();
+        pr_debug("PWSize  (0x%0*lx): GDW: 0x%02lx  UDW: 0x%02lx  MDW: 0x%02lx  PTW: 0x%02lx  PTEW: 0x%02lx\n",
+                field, config,
+                (config & MIPS_PWSIZE_GDW_MASK) >> MIPS_PWSIZE_GDW_SHIFT,
+                (config & MIPS_PWSIZE_UDW_MASK) >> MIPS_PWSIZE_UDW_SHIFT,
+                (config & MIPS_PWSIZE_MDW_MASK) >> MIPS_PWSIZE_MDW_SHIFT,
+                (config & MIPS_PWSIZE_PTW_MASK) >> MIPS_PWSIZE_PTW_SHIFT,
+                (config & MIPS_PWSIZE_PTEW_MASK) >> MIPS_PWSIZE_PTEW_SHIFT);
+
+        pwctl = read_c0_pwctl();
+        pr_debug("PWCtl   (0x%x): PWEn: 0x%x  DPH: 0x%x  HugePg: 0x%x  Psn: 0x%x\n",
+                pwctl,
+                (pwctl & MIPS_PWCTL_PWEN_MASK) >> MIPS_PWCTL_PWEN_SHIFT,
+                (pwctl & MIPS_PWCTL_DPH_MASK) >> MIPS_PWCTL_DPH_SHIFT,
+                (pwctl & MIPS_PWCTL_HUGEPG_MASK) >> MIPS_PWCTL_HUGEPG_SHIFT,
+                (pwctl & MIPS_PWCTL_PSN_MASK) >> MIPS_PWCTL_PSN_SHIFT);
+}
+
+static void config_htw_params(void)
+{
+        unsigned long pwfield, pwsize, ptei;
+        unsigned int config;
+
+        /*
+         * We are using 2-level page tables, so we only need to
+         * setup GDW and PTW appropriately. UDW and MDW will remain 0.
+         * The default value of GDI/UDI/MDI/PTI is 0xc. It is illegal to
+         * write values less than 0xc in these fields because the entire
+         * write will be dropped. As a result of which, we must preserve
+         * the original reset values and overwrite only what we really want.
+         */
+
+        pwfield = read_c0_pwfield();
+        /* re-initialize the GDI field */
+        pwfield &= ~MIPS_PWFIELD_GDI_MASK;
+        pwfield |= PGDIR_SHIFT << MIPS_PWFIELD_GDI_SHIFT;
+        /* re-initialize the PTI field including the even/odd bit */
+        pwfield &= ~MIPS_PWFIELD_PTI_MASK;
+        pwfield |= PAGE_SHIFT << MIPS_PWFIELD_PTI_SHIFT;
+        /* Set the PTEI right shift */
+        ptei = _PAGE_GLOBAL_SHIFT << MIPS_PWFIELD_PTEI_SHIFT;
+        pwfield |= ptei;
+        write_c0_pwfield(pwfield);
+        /* Check whether the PTEI value is supported */
+        back_to_back_c0_hazard();
+        pwfield = read_c0_pwfield();
+        if (((pwfield & MIPS_PWFIELD_PTEI_MASK) << MIPS_PWFIELD_PTEI_SHIFT)
+                != ptei) {
+                pr_warn("Unsupported PTEI field value: 0x%lx. HTW will not be enabled",
+                        ptei);
+                /*
+                 * Drop option to avoid HTW being enabled via another path
+                 * (eg htw_reset())
+                 */
+                current_cpu_data.options &= ~MIPS_CPU_HTW;
+                return;
+        }
+
+        pwsize = ilog2(PTRS_PER_PGD) << MIPS_PWSIZE_GDW_SHIFT;
+        pwsize |= ilog2(PTRS_PER_PTE) << MIPS_PWSIZE_PTW_SHIFT;
+        write_c0_pwsize(pwsize);
+
+        /* Make sure everything is set before we enable the HTW */
+        back_to_back_c0_hazard();
+
+        /* Enable HTW and disable the rest of the pwctl fields */
+        config = 1 << MIPS_PWCTL_PWEN_SHIFT;
+        write_c0_pwctl(config);
+        pr_info("Hardware Page Table Walker enabled\n");
+
+        print_htw_config();
+}
+
 void build_tlb_refill_handler(void)
 {
         /*
@@ -2258,5 +2349,8 @@ void build_tlb_refill_handler(void)
                 }
                 if (cpu_has_local_ebase)
                         build_r4000_tlb_refill_handler();
+                if (cpu_has_htw)
+                        config_htw_params();
+
         }
 }
diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c
index ecc2785f7858..e4f43baa8f67 100644
--- a/arch/mips/mti-malta/malta-int.c
+++ b/arch/mips/mti-malta/malta-int.c
@@ -42,6 +42,10 @@ static unsigned int ipi_map[NR_CPUS];
 
 static DEFINE_RAW_SPINLOCK(mips_irq_lock);
 
+#ifdef CONFIG_MIPS_GIC_IPI
+DECLARE_BITMAP(ipi_ints, GIC_NUM_INTRS);
+#endif
+
 static inline int mips_pcibios_iack(void)
 {
         int irq;
@@ -125,16 +129,22 @@ static void malta_hw0_irqdispatch(void)
 
 static void malta_ipi_irqdispatch(void)
 {
-        int irq;
+#ifdef CONFIG_MIPS_GIC_IPI
+        unsigned long irq;
+        DECLARE_BITMAP(pending, GIC_NUM_INTRS);
 
-        if (gic_compare_int())
-                do_IRQ(MIPS_GIC_IRQ_BASE);
+        gic_get_int_mask(pending, ipi_ints);
+
+        irq = find_first_bit(pending, GIC_NUM_INTRS);
 
-        irq = gic_get_int();
-        if (irq < 0)
-                return;  /* interrupt has already been cleared */
+        while (irq < GIC_NUM_INTRS) {
+                do_IRQ(MIPS_GIC_IRQ_BASE + irq);
 
-        do_IRQ(MIPS_GIC_IRQ_BASE + irq);
+                irq = find_next_bit(pending, GIC_NUM_INTRS, irq + 1);
+        }
+#endif
+        if (gic_compare_int())
+                do_IRQ(MIPS_GIC_IRQ_BASE);
 }
 
 static void corehi_irqdispatch(void)
@@ -427,8 +437,9 @@ static void __init fill_ipi_map1(int baseintr, int cpu, int cpupin)
         gic_intr_map[intr].pin = cpupin;
         gic_intr_map[intr].polarity = GIC_POL_POS;
         gic_intr_map[intr].trigtype = GIC_TRIG_EDGE;
-        gic_intr_map[intr].flags = GIC_FLAG_IPI;
+        gic_intr_map[intr].flags = 0;
         ipi_map[cpu] |= (1 << (cpupin + 2));
+        bitmap_set(ipi_ints, intr, 1);
 }
 
 static void __init fill_ipi_map(void)
diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c
index 6d9773096750..0c35dee0a215 100644
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 
 #include <asm/bootinfo.h>
+#include <asm/maar.h>
 #include <asm/sections.h>
 #include <asm/fw/fw.h>
 
@@ -164,3 +165,28 @@ void __init prom_free_prom_memory(void)
                                 addr, addr + boot_mem_map.map[i].size);
         }
 }
+
+unsigned platform_maar_init(unsigned num_pairs)
+{
+        phys_addr_t mem_end = (physical_memsize & ~0xffffull) - 1;
+        struct maar_config cfg[] = {
+                /* DRAM preceding I/O */
+                { 0x00000000, 0x0fffffff, MIPS_MAAR_S },
+
+                /* DRAM following I/O */
+                { 0x20000000, mem_end, MIPS_MAAR_S },
+
+                /* DRAM alias in upper half of physical */
+                { 0x80000000, 0x80000000 + mem_end, MIPS_MAAR_S },
+        };
+        unsigned i, num_cfg = ARRAY_SIZE(cfg);
+
+        /* If DRAM fits before I/O, drop the region following it */
+        if (physical_memsize <= 0x10000000) {
+                num_cfg--;
+                for (i = 1; i < num_cfg; i++)
+                        cfg[i] = cfg[i + 1];
+        }
+
+        return maar_config(cfg, num_cfg, num_pairs);
+}
diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index b87390a56a2f..05a56619ece2 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -131,7 +131,7 @@
  * @target:             Memory location for the compiled filter
  */
 struct jit_ctx {
-        const struct sk_filter *skf;
+        const struct bpf_prog *skf;
         unsigned int prologue_bytes;
         u32 idx;
         u32 flags;
@@ -789,7 +789,7 @@ static int pkt_type_offset(void)
 static int build_body(struct jit_ctx *ctx)
 {
         void *load_func[] = {jit_get_skb_b, jit_get_skb_h, jit_get_skb_w};
-        const struct sk_filter *prog = ctx->skf;
+        const struct bpf_prog *prog = ctx->skf;
         const struct sock_filter *inst;
         unsigned int i, off, load_order, condt;
         u32 k, b_off __maybe_unused;
@@ -1369,7 +1369,7 @@ jmp_cmp:
 
 int bpf_jit_enable __read_mostly;
 
-void bpf_jit_compile(struct sk_filter *fp)
+void bpf_jit_compile(struct bpf_prog *fp)
 {
         struct jit_ctx ctx;
         unsigned int alloc_size, tmp_idx;
@@ -1423,7 +1423,7 @@ out:
         kfree(ctx.offsets);
 }
 
-void bpf_jit_free(struct sk_filter *fp)
+void bpf_jit_free(struct bpf_prog *fp)
 {
         if (fp->jited)
                 module_free(NULL, fp->bpf_func);
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index ff8a5539b363..6523d558ff5a 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_LASAT)		+= pci-lasat.o
 obj-$(CONFIG_MIPS_COBALT)       += fixup-cobalt.o
 obj-$(CONFIG_LEMOTE_FULOONG2E)  += fixup-fuloong2e.o ops-loongson2.o
 obj-$(CONFIG_LEMOTE_MACH2F)     += fixup-lemote2f.o ops-loongson2.o
-obj-$(CONFIG_LEMOTE_MACH3A)     += fixup-loongson3.o ops-loongson3.o
+obj-$(CONFIG_LOONGSON_MACH3X)   += fixup-loongson3.o ops-loongson3.o
 obj-$(CONFIG_MIPS_MALTA)        += fixup-malta.o pci-malta.o
 obj-$(CONFIG_PMC_MSP7120_GW)    += fixup-pmcmsp.o ops-pmcmsp.o
 obj-$(CONFIG_PMC_MSP7120_EVAL)  += fixup-pmcmsp.o ops-pmcmsp.o
diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c
index 0e046d82e4e3..d54ea93651ac 100644
--- a/arch/mips/pci/ops-tx4927.c
+++ b/arch/mips/pci/ops-tx4927.c
@@ -199,8 +199,6 @@ static struct {
 
 char *tx4927_pcibios_setup(char *str)
 {
-        unsigned long val;
-
         if (!strncmp(str, "trdyto=", 7)) {
                 u8 val = 0;
                 if (kstrtou8(str + 7, 0, &val) == 0)
diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c
index 563d1f61d6ee..c19600a03460 100644
--- a/arch/mips/pci/pci-alchemy.c
+++ b/arch/mips/pci/pci-alchemy.c
@@ -7,6 +7,7 @@
  * Support for all devices (greater than 16) added by David Gathright.
  */
 
+#include <linux/clk.h>
 #include <linux/export.h>
 #include <linux/types.h>
 #include <linux/pci.h>
@@ -364,6 +365,7 @@ static int alchemy_pci_probe(struct platform_device *pdev)
         void __iomem *virt_io;
         unsigned long val;
         struct resource *r;
+        struct clk *c;
         int ret;
 
         /* need at least PCI IRQ mapping table */
@@ -393,11 +395,24 @@ static int alchemy_pci_probe(struct platform_device *pdev)
                 goto out1;
         }
 
+        c = clk_get(&pdev->dev, "pci_clko");
+        if (IS_ERR(c)) {
+                dev_err(&pdev->dev, "unable to find PCI clock\n");
+                ret = PTR_ERR(c);
+                goto out2;
+        }
+
+        ret = clk_prepare_enable(c);
+        if (ret) {
+                dev_err(&pdev->dev, "cannot enable PCI clock\n");
+                goto out6;
+        }
+
         ctx->regs = ioremap_nocache(r->start, resource_size(r));
         if (!ctx->regs) {
                 dev_err(&pdev->dev, "cannot map pci regs\n");
                 ret = -ENODEV;
-                goto out2;
+                goto out5;
         }
 
         /* map parts of the PCI IO area */
@@ -465,12 +480,19 @@ static int alchemy_pci_probe(struct platform_device *pdev)
         register_syscore_ops(&alchemy_pci_pmops);
         register_pci_controller(&ctx->alchemy_pci_ctrl);
 
+        dev_info(&pdev->dev, "PCI controller at %ld MHz\n",
+                 clk_get_rate(c) / 1000000);
+
         return 0;
 
 out4:
         iounmap(virt_io);
 out3:
         iounmap(ctx->regs);
+out5:
+        clk_disable_unprepare(c);
+out6:
+        clk_put(c);
 out2:
         release_mem_region(r->start, resource_size(r));
 out1:
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index 251395210e23..7c4598cb6de8 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -81,7 +81,7 @@ static int __init plat_of_setup(void)
                 panic("device tree not present");
 
         strlcpy(of_ids[0].compatible, soc_info.compatible, len);
-        strncpy(of_ids[1].compatible, "palmbus", len);
+        strlcpy(of_ids[1].compatible, "palmbus", len);
 
         if (of_platform_populate(NULL, of_ids, NULL, NULL))
                 panic("failed to populate DT");
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 3af00b2a26ee..e31e8cdcb296 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -223,6 +223,7 @@ static struct platform_device rb532_wdt = {
 
 static struct plat_serial8250_port rb532_uart_res[] = {
         {
+                .type           = PORT_16550A,
                 .membase        = (char *)KSEG1ADDR(REGBASE + UART0BASE),
                 .irq            = UART0_IRQ,
                 .regshift       = 2,
@@ -250,28 +251,6 @@ static struct platform_device *rb532_devs[] = {
         &rb532_wdt
 };
 
-static void __init parse_mac_addr(char *macstr)
-{
-        int i, h, l;
-
-        for (i = 0; i < 6; i++) {
-                if (i != 5 && *(macstr + 2) != ':')
-                        return;
-
-                h = hex_to_bin(*macstr++);
-                if (h == -1)
-                        return;
-
-                l = hex_to_bin(*macstr++);
-                if (l == -1)
-                        return;
-
-                macstr++;
-                korina_dev0_data.mac[i] = (h << 4) + l;
-        }
-}
-
-
 /* NAND definitions */
 #define NAND_CHIP_DELAY 25
 
@@ -333,7 +312,10 @@ static int __init plat_setup_devices(void)
 static int __init setup_kmac(char *s)
 {
         printk(KERN_INFO "korina mac = %s\n", s);
-        parse_mac_addr(s);
+        if (!mac_pton(s, korina_dev0_data.mac)) {
+                printk(KERN_ERR "Invalid mac\n");
+                return -EINVAL;
+        }
         return 0;
 }
 
diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c
index 8e52446286ca..8f1b86d4da84 100644
--- a/arch/mips/sgi-ip22/ip22-gio.c
+++ b/arch/mips/sgi-ip22/ip22-gio.c
@@ -27,8 +27,14 @@ static struct {
         { .name = "SGI GR2/GR3", .id = 0x7f },
 };
 
+static void gio_bus_release(struct device *dev)
+{
+        kfree(dev);
+}
+
 static struct device gio_bus = {
         .init_name = "gio",
+        .release = &gio_bus_release,
 };
 
 /**
@@ -413,8 +419,10 @@ int __init ip22_gio_init(void)
         int ret;
 
         ret = device_register(&gio_bus);
-        if (ret)
+        if (ret) {
+                put_device(&gio_bus);
                 return ret;
+        }
 
         ret = bus_register(&gio_bus_type);
         if (!ret) {
diff --git a/arch/mips/txx9/generic/7segled.c b/arch/mips/txx9/generic/7segled.c
index 4642f56e70e5..566c58bd44d0 100644
--- a/arch/mips/txx9/generic/7segled.c
+++ b/arch/mips/txx9/generic/7segled.c
@@ -83,6 +83,11 @@ static struct bus_type tx_7segled_subsys = {
         .dev_name       = "7segled",
 };
 
+static void tx_7segled_release(struct device *dev)
+{
+        kfree(dev);
+}
+
 static int __init tx_7segled_init_sysfs(void)
 {
         int error, i;
@@ -103,11 +108,14 @@ static int __init tx_7segled_init_sysfs(void)
                 }
                 dev->id = i;
                 dev->bus = &tx_7segled_subsys;
+                dev->release = &tx_7segled_release;
                 error = device_register(dev);
-                if (!error) {
-                        device_create_file(dev, &dev_attr_ascii);
-                        device_create_file(dev, &dev_attr_raw);
+                if (error) {
+                        put_device(dev);
+                        return error;
                 }
+                device_create_file(dev, &dev_attr_ascii);
+                device_create_file(dev, &dev_attr_raw);
         }
         return error;
 }
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
index 28713274e0cc..a77698ff2b6f 100644
--- a/arch/mips/txx9/generic/pci.c
+++ b/arch/mips/txx9/generic/pci.c
@@ -268,7 +268,7 @@ static int txx9_i8259_irq_setup(int irq)
         return err;
 }
 
-static void quirk_slc90e66_bridge(struct pci_dev *dev)
+static void __init_refok quirk_slc90e66_bridge(struct pci_dev *dev)
 {
         int irq;        /* PCI/ISA Bridge interrupt */
         u8 reg_64;
@@ -331,7 +331,7 @@ static void quirk_slc90e66_ide(struct pci_dev *dev)
          * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!!
          */
         dat |= 0x01;
-        pci_write_config_byte(dev, regs[i], dat);
+        pci_write_config_byte(dev, 0x5c, dat);
         pci_read_config_byte(dev, 0x5c, &dat);
         printk(KERN_CONT " REG5C %02x", dat);
         printk(KERN_CONT "\n");
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index dd2cf25b5ae5..9ff200ae1c9a 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -937,6 +937,14 @@ static ssize_t txx9_sram_write(struct file *filp, struct kobject *kobj,
         return size;
 }
 
+static void txx9_device_release(struct device *dev)
+{
+        struct txx9_sramc_dev *tdev;
+
+        tdev = container_of(dev, struct txx9_sramc_dev, dev);
+        kfree(tdev);
+}
+
 void __init txx9_sramc_init(struct resource *r)
 {
         struct txx9_sramc_dev *dev;
@@ -951,8 +959,11 @@ void __init txx9_sramc_init(struct resource *r)
                 return;
         size = resource_size(r);
         dev->base = ioremap(r->start, size);
-        if (!dev->base)
-                goto exit;
+        if (!dev->base) {
+                kfree(dev);
+                return;
+        }
+        dev->dev.release = &txx9_device_release;
         dev->dev.bus = &txx9_sramc_subsys;
         sysfs_bin_attr_init(&dev->bindata_attr);
         dev->bindata_attr.attr.name = "bindata";
@@ -963,17 +974,15 @@ void __init txx9_sramc_init(struct resource *r)
         dev->bindata_attr.private = dev;
         err = device_register(&dev->dev);
         if (err)
-                goto exit;
+                goto exit_put;
         err = sysfs_create_bin_file(&dev->dev.kobj, &dev->bindata_attr);
         if (err) {
                 device_unregister(&dev->dev);
-                goto exit;
-        }
-        return;
-exit:
-        if (dev) {
-                if (dev->base)
-                        iounmap(dev->base);
+                iounmap(dev->base);
                 kfree(dev);
         }
+        return;
+exit_put:
+        put_device(&dev->dev);
+        return;
 }
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild
index 654d5ba6e310..ecbd6676bd33 100644
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@ -6,4 +6,5 @@ generic-y += exec.h
 generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
diff --git a/arch/mn10300/include/asm/scatterlist.h b/arch/mn10300/include/asm/scatterlist.h
deleted file mode 100644
index 7baa4006008a..000000000000
--- a/arch/mn10300/include/asm/scatterlist.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* MN10300 Scatterlist definitions
- *
- * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SCATTERLIST_H
-#define _ASM_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* _ASM_SCATTERLIST_H */
diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c
index 9dfac5cd16e6..a6c0858592c3 100644
--- a/arch/mn10300/kernel/signal.c
+++ b/arch/mn10300/kernel/signal.c
@@ -186,20 +186,11 @@ static int setup_sigcontext(struct sigcontext __user *sc,
 /*
  * determine which stack to use..
  */
-static inline void __user *get_sigframe(struct k_sigaction *ka,
+static inline void __user *get_sigframe(struct ksignal *ksig,
                                         struct pt_regs *regs,
                                         size_t frame_size)
 {
-        unsigned long sp;
-
-        /* default to using normal stack */
-        sp = regs->sp;
-
-        /* this is the X/Open sanctioned signal stack switching.  */
-        if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (sas_ss_flags(sp) == 0)
-                        sp = current->sas_ss_sp + current->sas_ss_size;
-        }
+        unsigned long sp = sigsp(regs->sp, ksig);
 
         return (void __user *) ((sp - frame_size) & ~7UL);
 }
@@ -207,16 +198,16 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
 /*
  * set up a normal signal frame
  */
-static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
+static int setup_frame(struct ksignal *ksig, sigset_t *set,
                        struct pt_regs *regs)
 {
         struct sigframe __user *frame;
-        int rsig;
+        int rsig, sig = ksig->sig;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         rsig = sig;
         if (sig < 32 &&
@@ -226,40 +217,40 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
 
         if (__put_user(rsig, &frame->sig) < 0 ||
             __put_user(&frame->sc, &frame->psc) < 0)
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (setup_sigcontext(&frame->sc, &frame->fpuctx, regs, set->sig[0]))
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (_NSIG_WORDS > 1) {
                 if (__copy_to_user(frame->extramask, &set->sig[1],
                                    sizeof(frame->extramask)))
-                        goto give_sigsegv;
+                        return -EFAULT;
         }
 
         /* set up to return from userspace.  If provided, use a stub already in
          * userspace */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                if (__put_user(ka->sa.sa_restorer, &frame->pretcode))
-                        goto give_sigsegv;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                if (__put_user(ksig->ka.sa.sa_restorer, &frame->pretcode))
+                        return -EFAULT;
         } else {
                 if (__put_user((void (*)(void))frame->retcode,
                                &frame->pretcode))
-                        goto give_sigsegv;
+                        return -EFAULT;
                 /* this is mov $,d0; syscall 0 */
                 if (__put_user(0x2c, (char *)(frame->retcode + 0)) ||
                     __put_user(__NR_sigreturn, (char *)(frame->retcode + 1)) ||
                     __put_user(0x00, (char *)(frame->retcode + 2)) ||
                     __put_user(0xf0, (char *)(frame->retcode + 3)) ||
                     __put_user(0xe0, (char *)(frame->retcode + 4)))
-                        goto give_sigsegv;
+                        return -EFAULT;
                 flush_icache_range((unsigned long) frame->retcode,
                                    (unsigned long) frame->retcode + 5);
         }
 
         /* set up registers for signal handler */
         regs->sp = (unsigned long) frame;
-        regs->pc = (unsigned long) ka->sa.sa_handler;
+        regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
         regs->d0 = sig;
         regs->d1 = (unsigned long) &frame->sc;
 
@@ -270,25 +261,21 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
 #endif
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 /*
  * set up a realtime signal frame
  */
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
-        int rsig;
+        int rsig, sig = ksig->sig;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         rsig = sig;
         if (sig < 32 &&
@@ -299,8 +286,8 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         if (__put_user(rsig, &frame->sig) ||
             __put_user(&frame->info, &frame->pinfo) ||
             __put_user(&frame->uc, &frame->puc) ||
-            copy_siginfo_to_user(&frame->info, info))
-                goto give_sigsegv;
+            copy_siginfo_to_user(&frame->info, &ksig->info))
+                return -EFAULT;
 
         /* create the ucontext.  */
         if (__put_user(0, &frame->uc.uc_flags) ||
@@ -309,13 +296,14 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
             setup_sigcontext(&frame->uc.uc_mcontext,
                              &frame->fpuctx, regs, set->sig[0]) ||
             __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* set up to return from userspace.  If provided, use a stub already in
          * userspace */
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                if (__put_user(ka->sa.sa_restorer, &frame->pretcode))
-                        goto give_sigsegv;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                if (__put_user(ksig->ka.sa.sa_restorer, &frame->pretcode))
+                        return -EFAULT;
+
         } else {
                 if (__put_user((void(*)(void))frame->retcode,
                                &frame->pretcode) ||
@@ -326,7 +314,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                     __put_user(0x00, (char *)(frame->retcode + 2)) ||
                     __put_user(0xf0, (char *)(frame->retcode + 3)) ||
                     __put_user(0xe0, (char *)(frame->retcode + 4)))
-                        goto give_sigsegv;
+                        return -EFAULT;
 
                 flush_icache_range((u_long) frame->retcode,
                                    (u_long) frame->retcode + 5);
@@ -334,7 +322,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
         /* Set up registers for signal handler */
         regs->sp = (unsigned long) frame;
-        regs->pc = (unsigned long) ka->sa.sa_handler;
+        regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
         regs->d0 = sig;
         regs->d1 = (long) &frame->info;
 
@@ -345,10 +333,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 #endif
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 static inline void stepback(struct pt_regs *regs)
@@ -360,9 +344,7 @@ static inline void stepback(struct pt_regs *regs)
 /*
  * handle the actual delivery of a signal to userspace
  */
-static int handle_signal(int sig,
-                         siginfo_t *info, struct k_sigaction *ka,
-                         struct pt_regs *regs)
+static int handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
@@ -377,7 +359,7 @@ static int handle_signal(int sig,
                         break;
 
                 case -ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 regs->d0 = -EINTR;
                                 break;
                         }
@@ -390,15 +372,12 @@ static int handle_signal(int sig,
         }
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame(ksig, oldset, regs);
         else
-                ret = setup_frame(sig, ka, oldset, regs);
-        if (ret)
-                return ret;
+                ret = setup_frame(ksig, oldset, regs);
 
-        signal_delivered(sig, info, ka, regs,
-                         test_thread_flag(TIF_SINGLESTEP));
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
         return 0;
 }
 
@@ -407,15 +386,10 @@ static int handle_signal(int sig,
  */
 static void do_signal(struct pt_regs *regs)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
-
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
-                if (handle_signal(signr, &info, &ka, regs) == 0) {
-                }
+        struct ksignal ksig;
 
+        if (get_signal(&ksig)) {
+                handle_signal(&ksig, regs);
                 return;
         }
 
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index e71d712afb79..88e83368bbf5 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -22,6 +22,7 @@ config OPENRISC
         select GENERIC_STRNLEN_USER
         select MODULES_USE_ELF_RELA
         select HAVE_DEBUG_STACKOVERFLOW
+        select OR1K_PIC
 
 config MMU
         def_bool y
diff --git a/arch/openrisc/include/asm/irq.h b/arch/openrisc/include/asm/irq.h
index eb612b1865d2..b84634cc95eb 100644
--- a/arch/openrisc/include/asm/irq.h
+++ b/arch/openrisc/include/asm/irq.h
@@ -24,4 +24,7 @@
 
 #define NO_IRQ          (-1)
 
+void handle_IRQ(unsigned int, struct pt_regs *);
+extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
+
 #endif /* __ASM_OPENRISC_IRQ_H__ */
diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c
index 8ec77bc9f1e7..967eb1430203 100644
--- a/arch/openrisc/kernel/irq.c
+++ b/arch/openrisc/kernel/irq.c
@@ -16,11 +16,10 @@
 
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/of.h>
 #include <linux/ftrace.h>
 #include <linux/irq.h>
+#include <linux/irqchip.h>
 #include <linux/export.h>
-#include <linux/irqdomain.h>
 #include <linux/irqflags.h>
 
 /* read interrupt enabled status */
@@ -37,150 +36,31 @@ void arch_local_irq_restore(unsigned long flags)
 }
 EXPORT_SYMBOL(arch_local_irq_restore);
 
-
-/* OR1K PIC implementation */
-
-/* We're a couple of cycles faster than the generic implementations with
- * these 'fast' versions.
- */
-
-static void or1k_pic_mask(struct irq_data *data)
-{
-        mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->hwirq));
-}
-
-static void or1k_pic_unmask(struct irq_data *data)
-{
-        mtspr(SPR_PICMR, mfspr(SPR_PICMR) | (1UL << data->hwirq));
-}
-
-static void or1k_pic_ack(struct irq_data *data)
-{
-        /* EDGE-triggered interrupts need to be ack'ed in order to clear
-         * the latch.
-         * LEVEL-triggered interrupts do not need to be ack'ed; however,
-         * ack'ing the interrupt has no ill-effect and is quicker than
-         * trying to figure out what type it is...
-         */
-
-        /* The OpenRISC 1000 spec says to write a 1 to the bit to ack the
-         * interrupt, but the OR1200 does this backwards and requires a 0
-         * to be written...
-         */
-
-#ifdef CONFIG_OR1K_1200
-        /* There are two oddities with the OR1200 PIC implementation:
-         * i)  LEVEL-triggered interrupts are latched and need to be cleared
-         * ii) the interrupt latch is cleared by writing a 0 to the bit,
-         *     as opposed to a 1 as mandated by the spec
-         */
-
-        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq));
-#else
-        WARN(1, "Interrupt handling possibly broken\n");
-        mtspr(SPR_PICSR, (1UL << data->hwirq));
-#endif
-}
-
-static void or1k_pic_mask_ack(struct irq_data *data)
-{
-        /* Comments for pic_ack apply here, too */
-
-#ifdef CONFIG_OR1K_1200
-        mtspr(SPR_PICMR, mfspr(SPR_PICMR) & ~(1UL << data->hwirq));
-        mtspr(SPR_PICSR, mfspr(SPR_PICSR) & ~(1UL << data->hwirq));
-#else
-        WARN(1, "Interrupt handling possibly broken\n");
-        mtspr(SPR_PICMR, (1UL << data->hwirq));
-        mtspr(SPR_PICSR, (1UL << data->hwirq));
-#endif
-}
-
-#if 0
-static int or1k_pic_set_type(struct irq_data *data, unsigned int flow_type)
-{
-        /* There's nothing to do in the PIC configuration when changing
-         * flow type.  Level and edge-triggered interrupts are both
-         * supported, but it's PIC-implementation specific which type
-         * is handled. */
-
-        return irq_setup_alt_chip(data, flow_type);
-}
-#endif
-
-static struct irq_chip or1k_dev = {
-        .name = "or1k-PIC",
-        .irq_unmask = or1k_pic_unmask,
-        .irq_mask = or1k_pic_mask,
-        .irq_ack = or1k_pic_ack,
-        .irq_mask_ack = or1k_pic_mask_ack,
-};
-
-static struct irq_domain *root_domain;
-
-static inline int pic_get_irq(int first)
-{
-        int hwirq;
-
-        hwirq = ffs(mfspr(SPR_PICSR) >> first);
-        if (!hwirq)
-                return NO_IRQ;
-        else
-                hwirq = hwirq + first -1;
-
-        return irq_find_mapping(root_domain, hwirq);
-}
-
-
-static int or1k_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
+void __init init_IRQ(void)
 {
-        irq_set_chip_and_handler_name(irq, &or1k_dev,
-                                      handle_level_irq, "level");
-        irq_set_status_flags(irq, IRQ_LEVEL | IRQ_NOPROBE);
-
-        return 0;
+        irqchip_init();
 }
 
-static const struct irq_domain_ops or1k_irq_domain_ops = {
-        .xlate = irq_domain_xlate_onecell,
-        .map = or1k_map,
-};
-
-/*
- * This sets up the IRQ domain for the PIC built in to the OpenRISC
- * 1000 CPU.  This is the "root" domain as these are the interrupts
- * that directly trigger an exception in the CPU.
- */
-static void __init or1k_irq_init(void)
-{
-        struct device_node *intc = NULL;
-
-        /* The interrupt controller device node is mandatory */
-        intc = of_find_compatible_node(NULL, NULL, "opencores,or1k-pic");
-        BUG_ON(!intc);
-
-        /* Disable all interrupts until explicitly requested */
-        mtspr(SPR_PICMR, (0UL));
-
-        root_domain = irq_domain_add_linear(intc, 32,
-                                            &or1k_irq_domain_ops, NULL);
-}
+static void (*handle_arch_irq)(struct pt_regs *);
 
-void __init init_IRQ(void)
+void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
 {
-        or1k_irq_init();
+        handle_arch_irq = handle_irq;
 }
 
-void __irq_entry do_IRQ(struct pt_regs *regs)
+void handle_IRQ(unsigned int irq, struct pt_regs *regs)
 {
-        int irq = -1;
         struct pt_regs *old_regs = set_irq_regs(regs);
 
         irq_enter();
 
-        while ((irq = pic_get_irq(irq + 1)) != NO_IRQ)
-                generic_handle_irq(irq);
+        generic_handle_irq(irq);
 
         irq_exit();
         set_irq_regs(old_regs);
 }
+
+void __irq_entry do_IRQ(struct pt_regs *regs)
+{
+        handle_arch_irq(regs);
+}
diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c
index 66775bc07a8e..7d1b8235bf90 100644
--- a/arch/openrisc/kernel/signal.c
+++ b/arch/openrisc/kernel/signal.c
@@ -132,30 +132,16 @@ static inline unsigned long align_sigframe(unsigned long sp)
  * or the alternate stack.
  */
 
-static inline void __user *get_sigframe(struct k_sigaction *ka,
+static inline void __user *get_sigframe(struct ksignal *ksig,
                                         struct pt_regs *regs, size_t frame_size)
 {
         unsigned long sp = regs->sp;
-        int onsigstack = on_sig_stack(sp);
 
         /* redzone */
         sp -= STACK_FRAME_OVERHEAD;
-
-        /* This is the X/Open sanctioned signal stack switching.  */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && !onsigstack) {
-                if (current->sas_ss_size)
-                        sp = current->sas_ss_sp + current->sas_ss_size;
-        }
-
+        sp = sigsp(sp, ksig);
         sp = align_sigframe(sp - frame_size);
 
-        /*
-         * If we are on the alternate signal stack and would overflow it, don't.
-         * Return an always-bogus address instead so we will die with SIGSEGV.
-         */
-        if (onsigstack && !likely(on_sig_stack(sp)))
-                return (void __user *)-1L;
-
         return (void __user *)sp;
 }
 
@@ -173,7 +159,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
         unsigned long return_ip;
         int err = 0;
 
-        frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
+        frame = get_sigframe(ksig, regs, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 return -EFAULT;
diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig
index dc0d7ce71ea7..e945c08892fa 100644
--- a/arch/parisc/configs/generic-64bit_defconfig
+++ b/arch/parisc/configs/generic-64bit_defconfig
@@ -241,7 +241,6 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_STAGING=y
-# CONFIG_NET_VENDOR_SILICOM is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_SECURITY=y
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 1cba8f29bb49..012d4fa63d97 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -227,8 +227,8 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, int in_sysc
 }
 
 static long
-setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-               sigset_t *set, struct pt_regs *regs, int in_syscall)
+setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs,
+               int in_syscall)
 {
         struct rt_sigframe __user *frame;
         unsigned long rp, usp;
@@ -241,10 +241,10 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         
         usp = (regs->gr[30] & ~(0x01UL));
         /*FIXME: frame_size parameter is unused, remove it. */
-        frame = get_sigframe(ka, usp, sizeof(*frame));
+        frame = get_sigframe(&ksig->ka, usp, sizeof(*frame));
 
         DBG(1,"SETUP_RT_FRAME: START\n");
-        DBG(1,"setup_rt_frame: frame %p info %p\n", frame, info);
+        DBG(1,"setup_rt_frame: frame %p info %p\n", frame, ksig->info);
 
         
 #ifdef CONFIG_64BIT
@@ -253,7 +253,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         
         if (is_compat_task()) {
                 DBG(1,"setup_rt_frame: frame->info = 0x%p\n", &compat_frame->info);
-                err |= copy_siginfo_to_user32(&compat_frame->info, info);
+                err |= copy_siginfo_to_user32(&compat_frame->info, &ksig->info);
                 err |= __compat_save_altstack( &compat_frame->uc.uc_stack, regs->gr[30]);
                 DBG(1,"setup_rt_frame: frame->uc = 0x%p\n", &compat_frame->uc);
                 DBG(1,"setup_rt_frame: frame->uc.uc_mcontext = 0x%p\n", &compat_frame->uc.uc_mcontext);
@@ -265,7 +265,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 #endif
         {       
                 DBG(1,"setup_rt_frame: frame->info = 0x%p\n", &frame->info);
-                err |= copy_siginfo_to_user(&frame->info, info);
+                err |= copy_siginfo_to_user(&frame->info, &ksig->info);
                 err |= __save_altstack(&frame->uc.uc_stack, regs->gr[30]);
                 DBG(1,"setup_rt_frame: frame->uc = 0x%p\n", &frame->uc);
                 DBG(1,"setup_rt_frame: frame->uc.uc_mcontext = 0x%p\n", &frame->uc.uc_mcontext);
@@ -275,7 +275,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         }
         
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace. The first words of tramp are used to
@@ -312,9 +312,9 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         rp = (unsigned long) &frame->tramp[SIGRESTARTBLOCK_TRAMP];
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
-        haddr = A(ka->sa.sa_handler);
+        haddr = A(ksig->ka.sa.sa_handler);
         /* The sa_handler may be a pointer to a function descriptor */
 #ifdef CONFIG_64BIT
         if (is_compat_task()) {
@@ -326,7 +326,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                         err = __copy_from_user(&fdesc, ufdesc, sizeof(fdesc));
 
                         if (err)
-                                goto give_sigsegv;
+                                return -EFAULT;
 
                         haddr = fdesc.addr;
                         regs->gr[19] = fdesc.gp;
@@ -339,7 +339,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 err = __copy_from_user(&fdesc, ufdesc, sizeof(fdesc));
                 
                 if (err)
-                        goto give_sigsegv;
+                        return -EFAULT;
                 
                 haddr = fdesc.addr;
                 regs->gr[19] = fdesc.gp;
@@ -386,7 +386,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         }
 
         regs->gr[2]  = rp;                /* userland return pointer */
-        regs->gr[26] = sig;               /* signal number */
+        regs->gr[26] = ksig->sig;               /* signal number */
         
 #ifdef CONFIG_64BIT
         if (is_compat_task()) {
@@ -410,11 +410,6 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                current->comm, current->pid, frame, regs->gr[30],
                regs->iaoq[0], regs->iaoq[1], rp);
 
-        return 1;
-
-give_sigsegv:
-        DBG(1,"setup_rt_frame: sending SIGSEGV\n");
-        force_sigsegv(sig, current);
         return 0;
 }
 
@@ -423,20 +418,19 @@ give_sigsegv:
  */     
 
 static void
-handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
-                struct pt_regs *regs, int in_syscall)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs, int in_syscall)
 {
+        int ret;
         sigset_t *oldset = sigmask_to_save();
+
         DBG(1,"handle_signal: sig=%ld, ka=%p, info=%p, oldset=%p, regs=%p\n",
-               sig, ka, info, oldset, regs);
+               ksig->sig, ksig->ka, ksig->info, oldset, regs);
         
         /* Set up the stack frame */
-        if (!setup_rt_frame(sig, ka, info, oldset, regs, in_syscall))
-                return;
+        ret = setup_rt_frame(ksig, oldset, regs, in_syscall);
 
-        signal_delivered(sig, info, ka, regs, 
-                test_thread_flag(TIF_SINGLESTEP) ||
-                test_thread_flag(TIF_BLOCKSTEP));
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP) ||
+                          test_thread_flag(TIF_BLOCKSTEP));
 
         DBG(1,KERN_DEBUG "do_signal: Exit (success), regs->gr[28] = %ld\n",
                 regs->gr[28]);
@@ -544,22 +538,18 @@ insert_restart_trampoline(struct pt_regs *regs)
 asmlinkage void
 do_signal(struct pt_regs *regs, long in_syscall)
 {
-        siginfo_t info;
-        struct k_sigaction ka;
-        int signr;
+        struct ksignal ksig;
 
         DBG(1,"\ndo_signal: regs=0x%p, sr7 %#lx, in_syscall=%d\n",
                regs, regs->sr[7], in_syscall);
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        DBG(3,"do_signal: signr = %d, regs->gr[28] = %ld\n", signr, regs->gr[28]); 
-        
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
+                DBG(3,"do_signal: signr = %d, regs->gr[28] = %ld\n", signr, regs->gr[28]);
                 /* Restart a system call if necessary. */
                 if (in_syscall)
-                        syscall_restart(regs, &ka);
+                        syscall_restart(regs, &ksig.ka);
 
-                handle_signal(signr, &info, &ka, regs, in_syscall);
+                handle_signal(&ksig, regs, in_syscall);
                 return;
         }
 
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 80b94b0add1f..a577609f8ed6 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -111,6 +111,7 @@ config PPC
         select HAVE_DMA_API_DEBUG
         select HAVE_OPROFILE
         select HAVE_DEBUG_KMEMLEAK
+        select ARCH_HAS_SG_CHAIN
         select GENERIC_ATOMIC64 if PPC32
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select HAVE_PERF_EVENTS
@@ -398,6 +399,8 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
 config KEXEC
         bool "kexec system call"
         depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
+        select CRYPTO
+        select CRYPTO_SHA256
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 35d16bd2760b..ec2e40f2cc11 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -202,9 +202,7 @@ config PPC_EARLY_DEBUG_BEAT
 
 config PPC_EARLY_DEBUG_44x
         bool "Early serial debugging for IBM/AMCC 44x CPUs"
-        # PPC_EARLY_DEBUG on 440 leaves AS=1 mappings above the TLB high water
-        # mark, which doesn't work with current 440 KVM.
-        depends on 44x && !KVM
+        depends on 44x
         help
           Select this to enable early debugging for IBM 44x chips via the
           inbuilt serial port.  If you enable this, ensure you set
diff --git a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
index 5290df83ff30..69ce1026c948 100644
--- a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
@@ -359,6 +359,7 @@
                         compatible = "fsl,qoriq-core-mux-1.0";
                         clocks = <&pll0 0>, <&pll0 1>, <&pll1 0>, <&pll1 1>;
                         clock-names = "pll0", "pll0-div2", "pll1", "pll1-div2";
+                        clock-output-names = "cmux2";
                 };
 
                 mux3: mux3@60 {
diff --git a/arch/powerpc/boot/dts/fsl/t2080si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2080si-post.dtsi
new file mode 100644
index 000000000000..082ec2044060
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/t2080si-post.dtsi
@@ -0,0 +1,69 @@
+/*
+ * T2080 Silicon/SoC Device Tree Source (post include)
+ *
+ * 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/ "t2081si-post.dtsi"
+
+&soc {
+/include/ "qoriq-sata2-0.dtsi"
+        sata@220000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x550>; /* SATA1LIODNR */
+        };
+
+/include/ "qoriq-sata2-1.dtsi"
+        sata@221000 {
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x554>; /* SATA2LIODNR */
+        };
+};
+
+&rio {
+        compatible = "fsl,srio";
+        interrupts = <16 2 1 11>;
+        #address-cells = <2>;
+        #size-cells = <2>;
+        ranges;
+
+        port1 {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                cell-index = <1>;
+        };
+
+        port2 {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                cell-index = <2>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
new file mode 100644
index 000000000000..97479f0ce630
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
@@ -0,0 +1,435 @@
+/*
+ * T2081 Silicon/SoC Device Tree Source (post include)
+ *
+ * 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.
+ */
+
+&ifc {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        compatible = "fsl,ifc", "simple-bus";
+        interrupts = <25 2 0 0>;
+};
+
+/* controller at 0x240000 */
+&pci0 {
+        compatible = "fsl,t2080-pcie", "fsl,qoriq-pcie-v3.0", "fsl,qoriq-pcie";
+        device_type = "pci";
+        #size-cells = <2>;
+        #address-cells = <3>;
+        bus-range = <0x0 0xff>;
+        interrupts = <20 2 0 0>;
+        fsl,iommu-parent = <&pamu0>;
+        pcie@0 {
+                reg = <0 0 0 0 0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                interrupts = <20 2 0 0>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 40 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
+                >;
+        };
+};
+
+/* controller at 0x250000 */
+&pci1 {
+        compatible = "fsl,t2080-pcie", "fsl,qoriq-pcie-v3.0", "fsl,qoriq-pcie";
+        device_type = "pci";
+        #size-cells = <2>;
+        #address-cells = <3>;
+        bus-range = <0 0xff>;
+        interrupts = <21 2 0 0>;
+        fsl,iommu-parent = <&pamu0>;
+        pcie@0 {
+                reg = <0 0 0 0 0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                interrupts = <21 2 0 0>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 41 1 0 0
+                        0000 0 0 2 &mpic 5 1 0 0
+                        0000 0 0 3 &mpic 6 1 0 0
+                        0000 0 0 4 &mpic 7 1 0 0
+                >;
+        };
+};
+
+/* controller at 0x260000 */
+&pci2 {
+        compatible = "fsl,t2080-pcie", "fsl,qoriq-pcie-v3.0", "fsl,qoriq-pcie";
+        device_type = "pci";
+        #size-cells = <2>;
+        #address-cells = <3>;
+        bus-range = <0x0 0xff>;
+        interrupts = <22 2 0 0>;
+        fsl,iommu-parent = <&pamu0>;
+        pcie@0 {
+                reg = <0 0 0 0 0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                interrupts = <22 2 0 0>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 42 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 1 0 0
+                >;
+        };
+};
+
+/* controller at 0x270000 */
+&pci3 {
+        compatible = "fsl,t2080-pcie", "fsl,qoriq-pcie-v3.0", "fsl,qoriq-pcie";
+        device_type = "pci";
+        #size-cells = <2>;
+        #address-cells = <3>;
+        bus-range = <0x0 0xff>;
+        interrupts = <23 2 0 0>;
+        fsl,iommu-parent = <&pamu0>;
+        pcie@0 {
+                reg = <0 0 0 0 0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                interrupts = <23 2 0 0>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 43 1 0 0
+                        0000 0 0 2 &mpic 0 1 0 0
+                        0000 0 0 3 &mpic 4 1 0 0
+                        0000 0 0 4 &mpic 8 1 0 0
+                >;
+        };
+};
+
+&dcsr {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "fsl,dcsr", "simple-bus";
+
+        dcsr-epu@0 {
+                compatible = "fsl,t2080-dcsr-epu", "fsl,dcsr-epu";
+                interrupts = <52 2 0 0
+                              84 2 0 0
+                              85 2 0 0
+                              94 2 0 0
+                              95 2 0 0>;
+                reg = <0x0 0x1000>;
+        };
+        dcsr-npc {
+                compatible = "fsl,t2080-dcsr-cnpc", "fsl,dcsr-cnpc";
+                reg = <0x1000 0x1000 0x1002000 0x10000>;
+        };
+        dcsr-nxc@2000 {
+                compatible = "fsl,dcsr-nxc";
+                reg = <0x2000 0x1000>;
+        };
+        dcsr-corenet {
+                compatible = "fsl,dcsr-corenet";
+                reg = <0x8000 0x1000 0x1A000 0x1000>;
+        };
+        dcsr-ocn@11000 {
+                compatible = "fsl,t2080-dcsr-ocn", "fsl,dcsr-ocn";
+                reg = <0x11000 0x1000>;
+        };
+        dcsr-ddr@12000 {
+                compatible = "fsl,dcsr-ddr";
+                dev-handle = <&ddr1>;
+                reg = <0x12000 0x1000>;
+        };
+        dcsr-nal@18000 {
+                compatible = "fsl,t2080-dcsr-nal", "fsl,dcsr-nal";
+                reg = <0x18000 0x1000>;
+        };
+        dcsr-rcpm@22000 {
+                compatible = "fsl,t2080-dcsr-rcpm", "fsl,dcsr-rcpm";
+                reg = <0x22000 0x1000>;
+        };
+        dcsr-snpc@30000 {
+                compatible = "fsl,t2080-dcsr-snpc", "fsl,dcsr-snpc";
+                reg = <0x30000 0x1000 0x1022000 0x10000>;
+        };
+        dcsr-snpc@31000 {
+                compatible = "fsl,t2080-dcsr-snpc", "fsl,dcsr-snpc";
+                reg = <0x31000 0x1000 0x1042000 0x10000>;
+        };
+        dcsr-snpc@32000 {
+                compatible = "fsl,t2080-dcsr-snpc", "fsl,dcsr-snpc";
+                reg = <0x32000 0x1000 0x1062000 0x10000>;
+        };
+        dcsr-cpu-sb-proxy@100000 {
+                compatible = "fsl,dcsr-e6500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";
+                cpu-handle = <&cpu0>;
+                reg = <0x100000 0x1000 0x101000 0x1000>;
+        };
+        dcsr-cpu-sb-proxy@108000 {
+                compatible = "fsl,dcsr-e6500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";
+                cpu-handle = <&cpu1>;
+                reg = <0x108000 0x1000 0x109000 0x1000>;
+        };
+        dcsr-cpu-sb-proxy@110000 {
+                compatible = "fsl,dcsr-e6500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";
+                cpu-handle = <&cpu2>;
+                reg = <0x110000 0x1000 0x111000 0x1000>;
+        };
+        dcsr-cpu-sb-proxy@118000 {
+                compatible = "fsl,dcsr-e6500-sb-proxy", "fsl,dcsr-cpu-sb-proxy";
+                cpu-handle = <&cpu3>;
+                reg = <0x118000 0x1000 0x119000 0x1000>;
+        };
+};
+
+&soc {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        device_type = "soc";
+        compatible = "simple-bus";
+
+        soc-sram-error {
+                compatible = "fsl,soc-sram-error";
+                interrupts = <16 2 1 29>;
+        };
+
+        corenet-law@0 {
+                compatible = "fsl,corenet-law";
+                reg = <0x0 0x1000>;
+                fsl,num-laws = <32>;
+        };
+
+        ddr1: memory-controller@8000 {
+                compatible = "fsl,qoriq-memory-controller-v4.7",
+                                "fsl,qoriq-memory-controller";
+                reg = <0x8000 0x1000>;
+                interrupts = <16 2 1 23>;
+        };
+
+        cpc: l3-cache-controller@10000 {
+                compatible = "fsl,t2080-l3-cache-controller", "cache";
+                reg = <0x10000 0x1000
+                       0x11000 0x1000
+                       0x12000 0x1000>;
+                interrupts = <16 2 1 27
+                              16 2 1 26
+                              16 2 1 25>;
+        };
+
+        corenet-cf@18000 {
+                compatible = "fsl,corenet2-cf", "fsl,corenet-cf";
+                reg = <0x18000 0x1000>;
+                interrupts = <16 2 1 31>;
+                fsl,ccf-num-csdids = <32>;
+                fsl,ccf-num-snoopids = <32>;
+        };
+
+        iommu@20000 {
+                compatible = "fsl,pamu-v1.0", "fsl,pamu";
+                reg = <0x20000 0x3000>;
+                fsl,portid-mapping = <0x8000>;
+                ranges = <0 0x20000 0x3000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                interrupts = <
+                        24 2 0 0
+                        16 2 1 30>;
+
+                pamu0: pamu@0 {
+                        reg = <0 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu1: pamu@1000 {
+                        reg = <0x1000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+
+                pamu2: pamu@2000 {
+                        reg = <0x2000 0x1000>;
+                        fsl,primary-cache-geometry = <32 1>;
+                        fsl,secondary-cache-geometry = <128 2>;
+                };
+        };
+
+/include/ "qoriq-mpic4.3.dtsi"
+
+        guts: global-utilities@e0000 {
+                compatible = "fsl,t2080-device-config", "fsl,qoriq-device-config-2.0";
+                reg = <0xe0000 0xe00>;
+                fsl,has-rstcr;
+                fsl,liodn-bits = <12>;
+        };
+
+        clockgen: global-utilities@e1000 {
+                compatible = "fsl,t2080-clockgen", "fsl,qoriq-clockgen-2.0";
+                ranges = <0x0 0xe1000 0x1000>;
+                reg = <0xe1000 0x1000>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                sysclk: sysclk {
+                        #clock-cells = <0>;
+                        compatible = "fsl,qoriq-sysclk-2.0";
+                        clock-output-names = "sysclk", "fixed-clock";
+                };
+
+                pll0: pll0@800 {
+                        #clock-cells = <1>;
+                        reg = <0x800 4>;
+                        compatible = "fsl,qoriq-core-pll-2.0";
+                        clocks = <&sysclk>;
+                        clock-output-names = "pll0", "pll0-div2", "pll0-div4";
+                };
+
+                pll1: pll1@820 {
+                        #clock-cells = <1>;
+                        reg = <0x820 4>;
+                        compatible = "fsl,qoriq-core-pll-2.0";
+                        clocks = <&sysclk>;
+                        clock-output-names = "pll1", "pll1-div2", "pll1-div4";
+                };
+
+                mux0: mux0@0 {
+                        #clock-cells = <0>;
+                        reg = <0x0 4>;
+                        compatible = "fsl,qoriq-core-mux-2.0";
+                        clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
+                                 <&pll1 0>, <&pll1 1>, <&pll1 2>;
+                        clock-names = "pll0", "pll0-div2", "pll1-div4",
+                                "pll1", "pll1-div2", "pll1-div4";
+                        clock-output-names = "cmux0";
+                };
+
+                mux1: mux1@20 {
+                        #clock-cells = <0>;
+                        reg = <0x20 4>;
+                        compatible = "fsl,qoriq-core-mux-2.0";
+                        clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
+                                 <&pll1 0>, <&pll1 1>, <&pll1 2>;
+                        clock-names = "pll0", "pll0-div2", "pll1-div4",
+                                "pll1", "pll1-div2", "pll1-div4";
+                        clock-output-names = "cmux1";
+                };
+        };
+
+        rcpm: global-utilities@e2000 {
+                compatible = "fsl,t2080-rcpm", "fsl,qoriq-rcpm-2.0";
+                reg = <0xe2000 0x1000>;
+        };
+
+        sfp: sfp@e8000 {
+                compatible = "fsl,t2080-sfp";
+                reg = <0xe8000 0x1000>;
+        };
+
+        serdes: serdes@ea000 {
+                compatible = "fsl,t2080-serdes";
+                reg = <0xea000 0x4000>;
+        };
+
+/include/ "elo3-dma-0.dtsi"
+        dma@100300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x580>; /* DMA1LIODNR */
+        };
+/include/ "elo3-dma-1.dtsi"
+        dma@101300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */
+        };
+/include/ "elo3-dma-2.dtsi"
+        dma@102300 {
+                fsl,iommu-parent = <&pamu0>;
+                fsl,liodn-reg = <&guts 0x588>; /* DMA3LIODNR */
+        };
+
+/include/ "qoriq-espi-0.dtsi"
+        spi@110000 {
+                fsl,espi-num-chipselects = <4>;
+        };
+
+/include/ "qoriq-esdhc-0.dtsi"
+        sdhc@114000 {
+                compatible = "fsl,t2080-esdhc", "fsl,esdhc";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x530>; /* SDMMCLIODNR */
+                sdhci,auto-cmd12;
+        };
+/include/ "qoriq-i2c-0.dtsi"
+/include/ "qoriq-i2c-1.dtsi"
+/include/ "qoriq-duart-0.dtsi"
+/include/ "qoriq-duart-1.dtsi"
+/include/ "qoriq-gpio-0.dtsi"
+/include/ "qoriq-gpio-1.dtsi"
+/include/ "qoriq-gpio-2.dtsi"
+/include/ "qoriq-gpio-3.dtsi"
+/include/ "qoriq-usb2-mph-0.dtsi"
+        usb0: usb@210000 {
+                compatible = "fsl-usb2-mph-v2.4", "fsl-usb2-mph";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x520>; /* USB1LIODNR */
+                phy_type = "utmi";
+                port0;
+        };
+/include/ "qoriq-usb2-dr-0.dtsi"
+        usb1: usb@211000 {
+                compatible = "fsl-usb2-dr-v2.4", "fsl-usb2-dr";
+                fsl,iommu-parent = <&pamu1>;
+                fsl,liodn-reg = <&guts 0x524>; /* USB1LIODNR */
+                dr_mode = "host";
+                phy_type = "utmi";
+        };
+/include/ "qoriq-sec5.2-0.dtsi"
+
+        L2_1: l2-cache-controller@c20000 {
+                /* Cluster 0 L2 cache */
+                compatible = "fsl,t2080-l2-cache-controller";
+                reg = <0xc20000 0x40000>;
+                next-level-cache = <&cpc>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi b/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi
new file mode 100644
index 000000000000..e71ceb0e1100
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi
@@ -0,0 +1,99 @@
+/*
+ * T2080/T2081 Silicon/SoC Device Tree Source (pre include)
+ *
+ * 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.
+ */
+
+/dts-v1/;
+
+/include/ "e6500_power_isa.dtsi"
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+
+        aliases {
+                ccsr = &soc;
+                dcsr = &dcsr;
+
+                serial0 = &serial0;
+                serial1 = &serial1;
+                serial2 = &serial2;
+                serial3 = &serial3;
+
+                crypto = &crypto;
+                pci0 = &pci0;
+                pci1 = &pci1;
+                pci2 = &pci2;
+                pci3 = &pci3;
+                usb0 = &usb0;
+                usb1 = &usb1;
+                dma0 = &dma0;
+                dma1 = &dma1;
+                dma2 = &dma2;
+                sdhc = &sdhc;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu0: PowerPC,e6500@0 {
+                        device_type = "cpu";
+                        reg = <0 1>;
+                        clocks = <&mux0>;
+                        next-level-cache = <&L2_1>;
+                        fsl,portid-mapping = <0x80000000>;
+                };
+                cpu1: PowerPC,e6500@2 {
+                        device_type = "cpu";
+                        reg = <2 3>;
+                        clocks = <&mux0>;
+                        next-level-cache = <&L2_1>;
+                        fsl,portid-mapping = <0x80000000>;
+                };
+                cpu2: PowerPC,e6500@4 {
+                        device_type = "cpu";
+                        reg = <4 5>;
+                        clocks = <&mux0>;
+                        next-level-cache = <&L2_1>;
+                        fsl,portid-mapping = <0x80000000>;
+                };
+                cpu3: PowerPC,e6500@6 {
+                        device_type = "cpu";
+                        reg = <6 7>;
+                        clocks = <&mux0>;
+                        next-level-cache = <&L2_1>;
+                        fsl,portid-mapping = <0x80000000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
index 793669baa13e..a3d582e0361a 100644
--- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
@@ -476,6 +476,7 @@
 
 /include/ "elo3-dma-0.dtsi"
 /include/ "elo3-dma-1.dtsi"
+/include/ "elo3-dma-2.dtsi"
 
 /include/ "qoriq-espi-0.dtsi"
         spi@110000 {
diff --git a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
index d2f157edbe81..261a3abb1a55 100644
--- a/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
@@ -57,6 +57,7 @@
                 pci3 = &pci3;
                 dma0 = &dma0;
                 dma1 = &dma1;
+                dma2 = &dma2;
                 sdhc = &sdhc;
         };
 
diff --git a/arch/powerpc/boot/dts/mpc5121.dtsi b/arch/powerpc/boot/dts/mpc5121.dtsi
index 2c0e1552d20b..7f9d14f5c4da 100644
--- a/arch/powerpc/boot/dts/mpc5121.dtsi
+++ b/arch/powerpc/boot/dts/mpc5121.dtsi
@@ -498,6 +498,7 @@
                         compatible = "fsl,mpc5121-dma";
                         reg = <0x14000 0x1800>;
                         interrupts = <65 0x8>;
+                        #dma-cells = <1>;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/t2080qds.dts b/arch/powerpc/boot/dts/t2080qds.dts
new file mode 100644
index 000000000000..aa1d6d8c169b
--- /dev/null
+++ b/arch/powerpc/boot/dts/t2080qds.dts
@@ -0,0 +1,57 @@
+/*
+ * T2080QDS 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/t208xsi-pre.dtsi"
+/include/ "t208xqds.dtsi"
+
+/ {
+        model = "fsl,T2080QDS";
+        compatible = "fsl,T2080QDS";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+
+        rio: rapidio@ffe0c0000 {
+                reg = <0xf 0xfe0c0000 0 0x11000>;
+
+                port1 {
+                        ranges = <0 0 0xc 0x20000000 0 0x10000000>;
+                };
+                port2 {
+                        ranges = <0 0 0xc 0x30000000 0 0x10000000>;
+                };
+        };
+};
+
+/include/ "fsl/t2080si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/t2080rdb.dts b/arch/powerpc/boot/dts/t2080rdb.dts
new file mode 100644
index 000000000000..e8891047600c
--- /dev/null
+++ b/arch/powerpc/boot/dts/t2080rdb.dts
@@ -0,0 +1,57 @@
+/*
+ * T2080PCIe-RDB Board Device Tree Source
+ *
+ * Copyright 2014 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/t208xsi-pre.dtsi"
+/include/ "t208xrdb.dtsi"
+
+/ {
+        model = "fsl,T2080RDB";
+        compatible = "fsl,T2080RDB";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+
+        rio: rapidio@ffe0c0000 {
+                reg = <0xf 0xfe0c0000 0 0x11000>;
+
+                port1 {
+                        ranges = <0 0 0xc 0x20000000 0 0x10000000>;
+                };
+                port2 {
+                        ranges = <0 0 0xc 0x30000000 0 0x10000000>;
+                };
+        };
+};
+
+/include/ "fsl/t2080si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/t2081qds.dts b/arch/powerpc/boot/dts/t2081qds.dts
new file mode 100644
index 000000000000..8ec80a71e102
--- /dev/null
+++ b/arch/powerpc/boot/dts/t2081qds.dts
@@ -0,0 +1,46 @@
+/*
+ * T2081QDS 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/t208xsi-pre.dtsi"
+/include/ "t208xqds.dtsi"
+
+/ {
+        model = "fsl,T2081QDS";
+        compatible = "fsl,T2081QDS";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+};
+
+/include/ "fsl/t2081si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/t208xqds.dtsi b/arch/powerpc/boot/dts/t208xqds.dtsi
new file mode 100644
index 000000000000..555dc6e03d89
--- /dev/null
+++ b/arch/powerpc/boot/dts/t208xqds.dtsi
@@ -0,0 +1,239 @@
+/*
+ * T2080/T2081 QDS 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.
+ */
+
+/ {
+        model = "fsl,T2080QDS";
+        compatible = "fsl,T2080QDS";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+
+        ifc: localbus@ffe124000 {
+                reg = <0xf 0xfe124000 0 0x2000>;
+                ranges = <0 0 0xf 0xe8000000 0x08000000
+                          2 0 0xf 0xff800000 0x00010000
+                          3 0 0xf 0xffdf0000 0x00008000>;
+
+                nor@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x8000000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                nand@2,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,ifc-nand";
+                        reg = <0x2 0x0 0x10000>;
+                };
+
+                boardctrl: board-control@3,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,fpga-qixis";
+                        reg = <3 0 0x300>;
+                        ranges = <0 3 0 0x300>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+        };
+
+        dcsr: dcsr@f00000000 {
+                ranges = <0x00000000 0xf 0x00000000 0x01072000>;
+        };
+
+        soc: soc@ffe000000 {
+                ranges = <0x00000000 0xf 0xfe000000 0x1000000>;
+                reg = <0xf 0xfe000000 0 0x00001000>;
+                spi@110000 {
+                        flash@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "micron,n25q128a11"; /* 16MB */
+                                reg = <0>;
+                                spi-max-frequency = <40000000>; /* input clock */
+                        };
+
+                        flash@1 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "sst,sst25wf040";
+                                reg = <1>;
+                                spi-max-frequency = <35000000>;
+                        };
+
+                        flash@2 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "eon,en25s64";
+                                reg = <2>;
+                                spi-max-frequency = <35000000>;
+                        };
+                };
+
+                i2c@118000 {
+                        pca9547@77 {
+                                compatible = "nxp,pca9547";
+                                reg = <0x77>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                i2c@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0x0>;
+
+                                        eeprom@50 {
+                                                compatible = "at24,24c512";
+                                                reg = <0x50>;
+                                        };
+
+                                        eeprom@51 {
+                                                compatible = "at24,24c02";
+                                                reg = <0x51>;
+                                        };
+
+                                        eeprom@57 {
+                                                compatible = "at24,24c02";
+                                                reg = <0x57>;
+                                        };
+
+                                        rtc@68 {
+                                                compatible = "dallas,ds3232";
+                                                reg = <0x68>;
+                                                interrupts = <0x1 0x1 0 0>;
+                                        };
+                                };
+
+                                i2c@1 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0x1>;
+
+                                        eeprom@55 {
+                                                compatible = "at24,24c02";
+                                                reg = <0x55>;
+                                        };
+                                };
+
+                                i2c@2 {
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        reg = <0x2>;
+
+                                        ina220@40 {
+                                                compatible = "ti,ina220";
+                                                reg = <0x40>;
+                                                shunt-resistor = <1000>;
+                                        };
+
+                                        ina220@41 {
+                                                compatible = "ti,ina220";
+                                                reg = <0x41>;
+                                                shunt-resistor = <1000>;
+                                        };
+                                };
+                        };
+                };
+
+                sdhc@114000 {
+                        voltage-ranges = <1800 1800 3300 3300>;
+                };
+        };
+
+        pci0: pcie@ffe240000 {
+                reg = <0xf 0xfe240000 0 0x10000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000
+                          0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci1: pcie@ffe250000 {
+                reg = <0xf 0xfe250000 0 0x10000>;
+                ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci2: pcie@ffe260000 {
+                reg = <0xf 0xfe260000 0 0x1000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x30000000 0 0x10000000
+                          0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci3: pcie@ffe270000 {
+                reg = <0xf 0xfe270000 0 0x10000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x10000000
+                          0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/t208xrdb.dtsi b/arch/powerpc/boot/dts/t208xrdb.dtsi
new file mode 100644
index 000000000000..1481e192e783
--- /dev/null
+++ b/arch/powerpc/boot/dts/t208xrdb.dtsi
@@ -0,0 +1,184 @@
+/*
+ * T2080PCIe-RDB Board Device Tree Source
+ *
+ * Copyright 2014 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.
+ */
+
+/ {
+        model = "fsl,T2080RDB";
+        compatible = "fsl,T2080RDB";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+
+        ifc: localbus@ffe124000 {
+                reg = <0xf 0xfe124000 0 0x2000>;
+                ranges = <0 0 0xf 0xe8000000 0x08000000
+                          2 0 0xf 0xff800000 0x00010000
+                          3 0 0xf 0xffdf0000 0x00008000>;
+
+                nor@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x8000000>;
+
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                nand@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,ifc-nand";
+                        reg = <0x2 0x0 0x10000>;
+                };
+
+                boardctrl: board-control@2,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,t2080-cpld";
+                        reg = <3 0 0x300>;
+                        ranges = <0 3 0 0x300>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+        };
+
+        dcsr: dcsr@f00000000 {
+                ranges = <0x00000000 0xf 0x00000000 0x01072000>;
+        };
+
+        soc: soc@ffe000000 {
+                ranges = <0x00000000 0xf 0xfe000000 0x1000000>;
+                reg = <0xf 0xfe000000 0 0x00001000>;
+                spi@110000 {
+                        flash@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "micron,n25q512a";
+                                reg = <0>;
+                                spi-max-frequency = <10000000>; /* input clock */
+                        };
+                };
+
+                i2c@118000 {
+                        adt7481@4c {
+                                compatible = "adi,adt7481";
+                                reg = <0x4c>;
+                        };
+
+                        rtc@68 {
+                                compatible = "dallas,ds1339";
+                                reg = <0x68>;
+                                interrupts = <0x1 0x1 0 0>;
+                        };
+
+                        eeprom@50 {
+                                compatible = "atmel,24c256";
+                                reg = <0x50>;
+                        };
+                };
+
+                i2c@118100 {
+                        pca9546@77 {
+                                compatible = "nxp,pca9546";
+                                reg = <0x77>;
+                        };
+                };
+
+                sdhc@114000 {
+                        voltage-ranges = <1800 1800 3300 3300>;
+                };
+        };
+
+        pci0: pcie@ffe240000 {
+                reg = <0xf 0xfe240000 0 0x10000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000
+                          0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci1: pcie@ffe250000 {
+                reg = <0xf 0xfe250000 0 0x10000>;
+                ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci2: pcie@ffe260000 {
+                reg = <0xf 0xfe260000 0 0x1000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x30000000 0 0x10000000
+                          0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci3: pcie@ffe270000 {
+                reg = <0xf 0xfe270000 0 0x10000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x10000000
+                          0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/t4240rdb.dts b/arch/powerpc/boot/dts/t4240rdb.dts
new file mode 100644
index 000000000000..53761d4e8c51
--- /dev/null
+++ b/arch/powerpc/boot/dts/t4240rdb.dts
@@ -0,0 +1,186 @@
+/*
+ * T4240RDB Device Tree Source
+ *
+ * Copyright 2014 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/t4240si-pre.dtsi"
+
+/ {
+        model = "fsl,T4240RDB";
+        compatible = "fsl,T4240RDB";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+
+        ifc: localbus@ffe124000 {
+                reg = <0xf 0xfe124000 0 0x2000>;
+                ranges = <0 0 0xf 0xe8000000 0x08000000
+                          2 0 0xf 0xff800000 0x00010000
+                          3 0 0xf 0xffdf0000 0x00008000>;
+
+                nor@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x8000000>;
+
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                nand@2,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,ifc-nand";
+                        reg = <0x2 0x0 0x10000>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+        };
+
+        dcsr: dcsr@f00000000 {
+                ranges = <0x00000000 0xf 0x00000000 0x01072000>;
+        };
+
+        soc: soc@ffe000000 {
+                ranges = <0x00000000 0xf 0xfe000000 0x1000000>;
+                reg = <0xf 0xfe000000 0 0x00001000>;
+                spi@110000 {
+                        flash@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "sst,sst25wf040";
+                                reg = <0>;
+                                spi-max-frequency = <40000000>; /* input clock */
+                        };
+                };
+
+                i2c@118000 {
+                        eeprom@52 {
+                                compatible = "at24,24c256";
+                                reg = <0x52>;
+                        };
+                        eeprom@54 {
+                                compatible = "at24,24c256";
+                                reg = <0x54>;
+                        };
+                        eeprom@56 {
+                                compatible = "at24,24c256";
+                                reg = <0x56>;
+                        };
+                        rtc@68 {
+                                compatible = "dallas,ds1374";
+                                reg = <0x68>;
+                                interrupts = <0x1 0x1 0 0>;
+                        };
+                };
+
+                sdhc@114000 {
+                        voltage-ranges = <1800 1800 3300 3300>;
+                };
+        };
+
+        pci0: pcie@ffe240000 {
+                reg = <0xf 0xfe240000 0 0x10000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000
+                          0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci1: pcie@ffe250000 {
+                reg = <0xf 0xfe250000 0 0x10000>;
+                ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000
+                          0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci2: pcie@ffe260000 {
+                reg = <0xf 0xfe260000 0 0x1000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000
+                          0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci3: pcie@ffe270000 {
+                reg = <0xf 0xfe270000 0 0x10000>;
+                ranges = <0x02000000 0 0xe0000000 0xc 0x60000000 0 0x20000000
+                          0x01000000 0 0x00000000 0xf 0xf8030000 0 0x00010000>;
+                pcie@0 {
+                        ranges = <0x02000000 0 0xe0000000
+                                  0x02000000 0 0xe0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        rio: rapidio@ffe0c0000 {
+                reg = <0xf 0xfe0c0000 0 0x11000>;
+
+                port1 {
+                        ranges = <0 0 0xc 0x20000000 0 0x10000000>;
+                };
+                port2 {
+                        ranges = <0 0 0xc 0x30000000 0 0x10000000>;
+                };
+        };
+};
+
+/include/ "fsl/t4240si-post.dtsi"
diff --git a/arch/powerpc/boot/gunzip_util.c b/arch/powerpc/boot/gunzip_util.c
index ef2aed0f63ca..9dc52501de83 100644
--- a/arch/powerpc/boot/gunzip_util.c
+++ b/arch/powerpc/boot/gunzip_util.c
@@ -112,10 +112,10 @@ int gunzip_partial(struct gunzip_state *state, void *dst, int dstlen)
                 r = zlib_inflate(&state->s, Z_FULL_FLUSH);
                 if (r != Z_OK && r != Z_STREAM_END)
                         fatal("inflate returned %d msg: %s\n\r", r, state->s.msg);
-                len = state->s.next_out - (unsigned char *)dst;
+                len = state->s.next_out - (Byte *)dst;
         } else {
                 /* uncompressed image */
-                len = min(state->s.avail_in, (unsigned)dstlen);
+                len = min(state->s.avail_in, (uLong)dstlen);
                 memcpy(dst, state->s.next_in, len);
                 state->s.next_in += len;
                 state->s.avail_in -= len;
diff --git a/arch/powerpc/boot/io.h b/arch/powerpc/boot/io.h
index 7c09f4861fe1..394da5500466 100644
--- a/arch/powerpc/boot/io.h
+++ b/arch/powerpc/boot/io.h
@@ -1,5 +1,5 @@
 #ifndef _IO_H
-#define __IO_H
+#define _IO_H
 
 #include "types.h"
 
diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig
index c05310a913be..c936fab9ec4a 100644
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
@@ -43,7 +43,6 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_MISC_DEVICES=y
 CONFIG_EEPROM_LEGACY=y
-CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_ATA=y
diff --git a/arch/powerpc/configs/85xx/kmp204x_defconfig b/arch/powerpc/configs/85xx/kmp204x_defconfig
index e9a81e5ba273..e362d588dfbf 100644
--- a/arch/powerpc/configs/85xx/kmp204x_defconfig
+++ b/arch/powerpc/configs/85xx/kmp204x_defconfig
@@ -192,7 +192,6 @@ CONFIG_RTC_DRV_DS3232=y
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_UIO=y
 CONFIG_STAGING=y
-# CONFIG_NET_VENDOR_SILICOM is not set
 CONFIG_CLK_PPC_CORENET=y
 CONFIG_EXT2_FS=y
 CONFIG_NTFS_FS=y
diff --git a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index bcbe74716689..9b192bb6bd3d 100644
--- a/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
@@ -54,7 +54,6 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_IDE=y
-CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_ATA=y
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index c19ff057d0f9..6a3c58adf253 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -139,8 +139,9 @@ CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_EDAC_MPC85XX=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_DS1374=y
 CONFIG_RTC_DRV_DS3232=y
-CONFIG_RTC_DRV_CMOS=y
 CONFIG_UIO=y
 CONFIG_STAGING=y
 CONFIG_VIRT_DRIVERS=y
@@ -179,3 +180,4 @@ CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM=y
+CONFIG_FSL_CORENET_CF=y
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index 5c7fa19ae4ef..4b07bade1ba9 100644
--- a/arch/powerpc/configs/corenet64_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
@@ -123,6 +123,10 @@ CONFIG_USB_EHCI_FSL=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_DS1374=y
+CONFIG_RTC_DRV_DS3232=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_DMADEVICES=y
@@ -175,3 +179,4 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM=y
+CONFIG_FSL_CORENET_CF=y
diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig
index 530601e8ccfe..69fd8adf9f5e 100644
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
@@ -47,7 +47,6 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_EEPROM_AT24=y
-CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_ATA=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 55765c8cb08f..fa1bfd37f1ec 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -209,6 +209,9 @@ CONFIG_MMC_SDHCI_OF_ESDHC=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_DS1374=y
+CONFIG_RTC_DRV_DS3232=y
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_DMADEVICES=y
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index 5c6ecdc0f70e..0b452ebd8b3d 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -210,6 +210,9 @@ CONFIG_MMC_SDHCI_OF_ESDHC=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_DS1374=y
+CONFIG_RTC_DRV_DS3232=y
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_DMADEVICES=y
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index ccf66b9060a6..924e10df1844 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -127,4 +127,3 @@ CONFIG_CRYPTO_PCBC=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
 CONFIG_VIRTUALIZATION=y
-CONFIG_KVM_440=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index c91066944842..fec5870f1818 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -425,10 +425,8 @@ CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_SCSI_MESH=m
 CONFIG_SCSI_MAC53C94=m
-CONFIG_SCSI_SRP=m
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_SCSI_DH=y
 CONFIG_SCSI_DH_RDAC=m
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild
index 3fb1bc432f4f..7f23f162ce9c 100644
--- a/arch/powerpc/include/asm/Kbuild
+++ b/arch/powerpc/include/asm/Kbuild
@@ -4,5 +4,6 @@ generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
 generic-y += rwsem.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
 generic-y += vtime.h
diff --git a/arch/powerpc/include/asm/asm-compat.h b/arch/powerpc/include/asm/asm-compat.h
index 4b237aa35660..21be8ae8f809 100644
--- a/arch/powerpc/include/asm/asm-compat.h
+++ b/arch/powerpc/include/asm/asm-compat.h
@@ -34,10 +34,14 @@
 #define PPC_MIN_STKFRM  112
 
 #ifdef __BIG_ENDIAN__
+#define LWZX_BE stringify_in_c(lwzx)
 #define LDX_BE  stringify_in_c(ldx)
+#define STWX_BE stringify_in_c(stwx)
 #define STDX_BE stringify_in_c(stdx)
 #else
+#define LWZX_BE stringify_in_c(lwbrx)
 #define LDX_BE  stringify_in_c(ldbrx)
+#define STWX_BE stringify_in_c(stwbrx)
 #define STDX_BE stringify_in_c(stdbrx)
 #endif
 
diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
index ed0afc1e44a4..34a05a1a990b 100644
--- a/arch/powerpc/include/asm/cache.h
+++ b/arch/powerpc/include/asm/cache.h
@@ -3,6 +3,7 @@
 
 #ifdef __KERNEL__
 
+#include <asm/reg.h>
 
 /* bytes per L1 cache line */
 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
@@ -39,6 +40,12 @@ struct ppc64_caches {
 };
 
 extern struct ppc64_caches ppc64_caches;
+
+static inline void logmpp(u64 x)
+{
+        asm volatile(PPC_LOGMPP(R1) : : "r" (x));
+}
+
 #endif /* __powerpc64__ && ! __ASSEMBLY__ */
 
 #if defined(__ASSEMBLY__)
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 0fdd7eece6d9..daa5af91163c 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -195,8 +195,7 @@ extern const char *powerpc_base_platform;
 
 #define CPU_FTR_PPCAS_ARCH_V2   (CPU_FTR_NOEXECUTE | CPU_FTR_NODSISRALIGN)
 
-#define MMU_FTR_PPCAS_ARCH_V2   (MMU_FTR_SLB | MMU_FTR_TLBIEL | \
-                                 MMU_FTR_16M_PAGE)
+#define MMU_FTR_PPCAS_ARCH_V2   (MMU_FTR_TLBIEL | MMU_FTR_16M_PAGE)
 
 /* We only set the altivec features if the kernel was compiled with altivec
  * support
@@ -268,10 +267,6 @@ extern const char *powerpc_base_platform;
 #define CPU_FTR_MAYBE_CAN_NAP   0
 #endif
 
-#define CLASSIC_PPC (!defined(CONFIG_8xx) && !defined(CONFIG_4xx) && \
-                     !defined(CONFIG_POWER3) && !defined(CONFIG_POWER4) && \
-                     !defined(CONFIG_BOOKE))
-
 #define CPU_FTRS_PPC601 (CPU_FTR_COMMON | CPU_FTR_601 | \
         CPU_FTR_COHERENT_ICACHE | CPU_FTR_UNIFIED_ID_CACHE)
 #define CPU_FTRS_603    (CPU_FTR_COMMON | \
@@ -396,15 +391,10 @@ extern const char *powerpc_base_platform;
             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_CELL_TB_BUG)
+            CPU_FTR_CELL_TB_BUG | CPU_FTR_SMT)
 #define CPU_FTRS_GENERIC_32     (CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN)
 
 /* 64-bit CPUs */
-#define CPU_FTRS_POWER3 (CPU_FTR_USE_TB | \
-            CPU_FTR_IABR | CPU_FTR_PPC_LE)
-#define CPU_FTRS_RS64   (CPU_FTR_USE_TB | \
-            CPU_FTR_IABR | \
-            CPU_FTR_MMCRA | CPU_FTR_CTRL)
 #define CPU_FTRS_POWER4 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
             CPU_FTR_MMCRA | CPU_FTR_CP_USE_DCBTZ | \
@@ -467,15 +457,15 @@ extern const char *powerpc_base_platform;
 #define CPU_FTRS_POSSIBLE       (CPU_FTRS_E6500 | CPU_FTRS_E5500 | CPU_FTRS_A2)
 #else
 #define CPU_FTRS_POSSIBLE       \
-            (CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 |        \
-            CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_POWER6 |       \
-            CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | CPU_FTRS_POWER8 |      \
-            CPU_FTRS_CELL | CPU_FTRS_PA6T | CPU_FTR_VSX)
+            (CPU_FTRS_POWER4 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \
+             CPU_FTRS_POWER6 | CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | \
+             CPU_FTRS_POWER8 | CPU_FTRS_POWER8_DD1 | CPU_FTRS_CELL | \
+             CPU_FTRS_PA6T | CPU_FTR_VSX)
 #endif
 #else
 enum {
         CPU_FTRS_POSSIBLE =
-#if CLASSIC_PPC
+#ifdef CONFIG_PPC_BOOK3S_32
             CPU_FTRS_PPC601 | CPU_FTRS_603 | CPU_FTRS_604 | CPU_FTRS_740_NOTAU |
             CPU_FTRS_740 | CPU_FTRS_750 | CPU_FTRS_750FX1 |
             CPU_FTRS_750FX2 | CPU_FTRS_750FX | CPU_FTRS_750GX |
@@ -518,14 +508,15 @@ enum {
 #define CPU_FTRS_ALWAYS         (CPU_FTRS_E6500 & CPU_FTRS_E5500 & CPU_FTRS_A2)
 #else
 #define CPU_FTRS_ALWAYS         \
-            (CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 &        \
-            CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & CPU_FTRS_POWER6 &       \
-            CPU_FTRS_POWER7 & CPU_FTRS_CELL & CPU_FTRS_PA6T & CPU_FTRS_POSSIBLE)
+            (CPU_FTRS_POWER4 & CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \
+             CPU_FTRS_POWER6 & CPU_FTRS_POWER7 & CPU_FTRS_CELL & \
+             CPU_FTRS_PA6T & CPU_FTRS_POWER8 & CPU_FTRS_POWER8E & \
+             CPU_FTRS_POWER8_DD1 & CPU_FTRS_POSSIBLE)
 #endif
 #else
 enum {
         CPU_FTRS_ALWAYS =
-#if CLASSIC_PPC
+#ifdef CONFIG_PPC_BOOK3S_32
             CPU_FTRS_PPC601 & CPU_FTRS_603 & CPU_FTRS_604 & CPU_FTRS_740_NOTAU &
             CPU_FTRS_740 & CPU_FTRS_750 & CPU_FTRS_750FX1 &
             CPU_FTRS_750FX2 & CPU_FTRS_750FX & CPU_FTRS_750GX &
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index fab7743c2640..9983c3d26bca 100644
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -25,6 +25,7 @@
 #include <linux/list.h>
 #include <linux/string.h>
 #include <linux/time.h>
+#include <linux/atomic.h>
 
 struct pci_dev;
 struct pci_bus;
@@ -33,10 +34,11 @@ struct device_node;
 #ifdef CONFIG_EEH
 
 /* EEH subsystem flags */
-#define EEH_ENABLED             0x1     /* EEH enabled          */
-#define EEH_FORCE_DISABLED      0x2     /* EEH disabled         */
-#define EEH_PROBE_MODE_DEV      0x4     /* From PCI device      */
-#define EEH_PROBE_MODE_DEVTREE  0x8     /* From device tree     */
+#define EEH_ENABLED             0x01    /* EEH enabled          */
+#define EEH_FORCE_DISABLED      0x02    /* EEH disabled         */
+#define EEH_PROBE_MODE_DEV      0x04    /* From PCI device      */
+#define EEH_PROBE_MODE_DEVTREE  0x08    /* From device tree     */
+#define EEH_ENABLE_IO_FOR_LOG   0x10    /* Enable IO for log    */
 
 /*
  * Delay for PE reset, all in ms
@@ -84,7 +86,9 @@ struct eeh_pe {
         int freeze_count;               /* Times of froze up            */
         struct timeval tstamp;          /* Time on first-time freeze    */
         int false_positives;            /* Times of reported #ff's      */
+        atomic_t pass_dev_cnt;          /* Count of passed through devs */
         struct eeh_pe *parent;          /* Parent PE                    */
+        void *data;                     /* PE auxillary data            */
         struct list_head child_list;    /* Link PE to the child list    */
         struct list_head edevs;         /* Link list of EEH devices     */
         struct list_head child;         /* Child PEs                    */
@@ -93,6 +97,11 @@ struct eeh_pe {
 #define eeh_pe_for_each_dev(pe, edev, tmp) \
                 list_for_each_entry_safe(edev, tmp, &pe->edevs, list)
 
+static inline bool eeh_pe_passed(struct eeh_pe *pe)
+{
+        return pe ? !!atomic_read(&pe->pass_dev_cnt) : false;
+}
+
 /*
  * The struct is used to trace EEH state for the associated
  * PCI device node or PCI device. In future, it might
@@ -165,6 +174,11 @@ enum {
 #define EEH_STATE_DMA_ACTIVE    (1 << 4)        /* Active DMA           */
 #define EEH_STATE_MMIO_ENABLED  (1 << 5)        /* MMIO enabled         */
 #define EEH_STATE_DMA_ENABLED   (1 << 6)        /* DMA enabled          */
+#define EEH_PE_STATE_NORMAL             0       /* Normal state         */
+#define EEH_PE_STATE_RESET              1       /* PE reset asserted    */
+#define EEH_PE_STATE_STOPPED_IO_DMA     2       /* Frozen PE            */
+#define EEH_PE_STATE_STOPPED_DMA        4       /* Stopped DMA, Enabled IO */
+#define EEH_PE_STATE_UNAVAIL            5       /* Unavailable          */
 #define EEH_RESET_DEACTIVATE    0       /* Deactivate the PE reset      */
 #define EEH_RESET_HOT           1       /* Hot reset                    */
 #define EEH_RESET_FUNDAMENTAL   3       /* Fundamental reset            */
@@ -194,36 +208,28 @@ extern int eeh_subsystem_flags;
 extern struct eeh_ops *eeh_ops;
 extern raw_spinlock_t confirm_error_lock;
 
-static inline bool eeh_enabled(void)
+static inline void eeh_add_flag(int flag)
 {
-        if ((eeh_subsystem_flags & EEH_FORCE_DISABLED) ||
-            !(eeh_subsystem_flags & EEH_ENABLED))
-                return false;
-
-        return true;
+        eeh_subsystem_flags |= flag;
 }
 
-static inline void eeh_set_enable(bool mode)
+static inline void eeh_clear_flag(int flag)
 {
-        if (mode)
-                eeh_subsystem_flags |= EEH_ENABLED;
-        else
-                eeh_subsystem_flags &= ~EEH_ENABLED;
+        eeh_subsystem_flags &= ~flag;
 }
 
-static inline void eeh_probe_mode_set(int flag)
+static inline bool eeh_has_flag(int flag)
 {
-        eeh_subsystem_flags |= flag;
+        return !!(eeh_subsystem_flags & flag);
 }
 
-static inline int eeh_probe_mode_devtree(void)
+static inline bool eeh_enabled(void)
 {
-        return (eeh_subsystem_flags & EEH_PROBE_MODE_DEVTREE);
-}
+        if (eeh_has_flag(EEH_FORCE_DISABLED) ||
+            !eeh_has_flag(EEH_ENABLED))
+                return false;
 
-static inline int eeh_probe_mode_dev(void)
-{
-        return (eeh_subsystem_flags & EEH_PROBE_MODE_DEV);
+        return true;
 }
 
 static inline void eeh_serialize_lock(unsigned long *flags)
@@ -243,6 +249,7 @@ static inline void eeh_serialize_unlock(unsigned long flags)
 #define EEH_MAX_ALLOWED_FREEZES 5
 
 typedef void *(*eeh_traverse_func)(void *data, void *flag);
+void eeh_set_pe_aux_size(int size);
 int eeh_phb_pe_create(struct pci_controller *phb);
 struct eeh_pe *eeh_phb_pe_get(struct pci_controller *phb);
 struct eeh_pe *eeh_pe_get(struct eeh_dev *edev);
@@ -272,6 +279,13 @@ void eeh_add_device_late(struct pci_dev *);
 void eeh_add_device_tree_late(struct pci_bus *);
 void eeh_add_sysfs_files(struct pci_bus *);
 void eeh_remove_device(struct pci_dev *);
+int eeh_dev_open(struct pci_dev *pdev);
+void eeh_dev_release(struct pci_dev *pdev);
+struct eeh_pe *eeh_iommu_group_to_pe(struct iommu_group *group);
+int eeh_pe_set_option(struct eeh_pe *pe, int option);
+int eeh_pe_get_state(struct eeh_pe *pe);
+int eeh_pe_reset(struct eeh_pe *pe, int option);
+int eeh_pe_configure(struct eeh_pe *pe);
 
 /**
  * EEH_POSSIBLE_ERROR() -- test for possible MMIO failure.
@@ -295,8 +309,6 @@ static inline bool eeh_enabled(void)
         return false;
 }
 
-static inline void eeh_set_enable(bool mode) { }
-
 static inline int eeh_init(void)
 {
         return 0;
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 8f35cd7d59cc..77f52b26dad6 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -425,6 +425,8 @@ label##_relon_hv:						\
 #define SOFTEN_VALUE_0xa00      PACA_IRQ_DBELL
 #define SOFTEN_VALUE_0xe80      PACA_IRQ_DBELL
 #define SOFTEN_VALUE_0xe82      PACA_IRQ_DBELL
+#define SOFTEN_VALUE_0xe60      PACA_IRQ_HMI
+#define SOFTEN_VALUE_0xe62      PACA_IRQ_HMI
 
 #define __SOFTEN_TEST(h, vec)                                           \
         lbz     r10,PACASOFTIRQEN(r13);                                 \
@@ -513,8 +515,11 @@ label##_relon_hv:							\
  * runlatch, etc...
  */
 
-/* Exception addition: Hard disable interrupts */
-#define DISABLE_INTS    RECONCILE_IRQ_STATE(r10,r11)
+/*
+ * This addition reconciles our actual IRQ state with the various software
+ * flags that track it. This may call C code.
+ */
+#define ADD_RECONCILE   RECONCILE_IRQ_STATE(r10,r11)
 
 #define ADD_NVGPRS                              \
         bl      save_nvgprs
@@ -532,6 +537,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_CTRL)
         .globl label##_common;                                  \
 label##_common:                                                 \
         EXCEPTION_PROLOG_COMMON(trap, PACA_EXGEN);              \
+        /* Volatile regs are potentially clobbered here */      \
         additions;                                              \
         addi    r3,r1,STACK_FRAME_OVERHEAD;                     \
         bl      hdlr;                                           \
@@ -539,7 +545,7 @@ label##_common:							\
 
 #define STD_EXCEPTION_COMMON(trap, label, hdlr)                 \
         EXCEPTION_COMMON(trap, label, hdlr, ret_from_except,    \
-                         ADD_NVGPRS;DISABLE_INTS)
+                         ADD_NVGPRS;ADD_RECONCILE)
 
 /*
  * Like STD_EXCEPTION_COMMON, but for exceptions that can occur
@@ -548,7 +554,7 @@ label##_common:							\
  */
 #define STD_EXCEPTION_COMMON_ASYNC(trap, label, hdlr)             \
         EXCEPTION_COMMON(trap, label, hdlr, ret_from_except_lite, \
-                         FINISH_NAP;DISABLE_INTS;RUNLATCH_ON)
+                         FINISH_NAP;ADD_RECONCILE;RUNLATCH_ON)
 
 /*
  * When the idle code in power4_idle puts the CPU into NAP mode,
diff --git a/arch/powerpc/include/asm/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h
index 9361cd5342cc..f79d6c74eb2a 100644
--- a/arch/powerpc/include/asm/fs_pd.h
+++ b/arch/powerpc/include/asm/fs_pd.h
@@ -28,7 +28,6 @@
 
 #ifdef CONFIG_8xx
 #include <asm/8xx_immap.h>
-#include <asm/mpc8xx.h>
 
 extern immap_t __iomem *mpc8xx_immr;
 
diff --git a/arch/powerpc/include/asm/hardirq.h b/arch/powerpc/include/asm/hardirq.h
index 418fb654370d..1bbb3013d6aa 100644
--- a/arch/powerpc/include/asm/hardirq.h
+++ b/arch/powerpc/include/asm/hardirq.h
@@ -11,6 +11,7 @@ typedef struct {
         unsigned int pmu_irqs;
         unsigned int mce_exceptions;
         unsigned int spurious_irqs;
+        unsigned int hmi_exceptions;
 #ifdef CONFIG_PPC_DOORBELL
         unsigned int doorbell_irqs;
 #endif
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index 5dbbb29f5c3e..85bc8c0d257b 100644
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -279,6 +279,12 @@
 #define H_GET_24X7_DATA         0xF07C
 #define H_GET_PERF_COUNTER_INFO 0xF080
 
+/* Values for 2nd argument to H_SET_MODE */
+#define H_SET_MODE_RESOURCE_SET_CIABR           1
+#define H_SET_MODE_RESOURCE_SET_DAWR            2
+#define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE     3
+#define H_SET_MODE_RESOURCE_LE                  4
+
 #ifndef __ASSEMBLY__
 
 /**
diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 10be1dd01c6b..b59ac27a6b7d 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -25,6 +25,7 @@
 #define PACA_IRQ_EE             0x04
 #define PACA_IRQ_DEC            0x08 /* Or FIT */
 #define PACA_IRQ_EE_EDGE        0x10 /* BookE only */
+#define PACA_IRQ_HMI            0x20
 
 #endif /* CONFIG_PPC64 */
 
diff --git a/arch/powerpc/include/asm/irqflags.h b/arch/powerpc/include/asm/irqflags.h
index e20eb95429a8..f2149066fe5d 100644
--- a/arch/powerpc/include/asm/irqflags.h
+++ b/arch/powerpc/include/asm/irqflags.h
@@ -32,9 +32,8 @@
 #endif
 
 /*
- * Most of the CPU's IRQ-state tracing is done from assembly code; we
- * have to call a C function so call a wrapper that saves all the
- * C-clobbered registers.
+ * These are calls to C code, so the caller must be prepared for volatiles to
+ * be clobbered.
  */
 #define TRACE_ENABLE_INTS       TRACE_WITH_FRAME_BUFFER(trace_hardirqs_on)
 #define TRACE_DISABLE_INTS      TRACE_WITH_FRAME_BUFFER(trace_hardirqs_off)
@@ -42,6 +41,9 @@
 /*
  * This is used by assembly code to soft-disable interrupts first and
  * reconcile irq state.
+ *
+ * NB: This may call C code, so the caller must be prepared for volatiles to
+ * be clobbered.
  */
 #define RECONCILE_IRQ_STATE(__rA, __rB)         \
         lbz     __rA,PACASOFTIRQEN(r13);        \
diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h
index f016bb699b5f..efbf9a322a23 100644
--- a/arch/powerpc/include/asm/jump_label.h
+++ b/arch/powerpc/include/asm/jump_label.h
@@ -10,6 +10,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#ifndef __ASSEMBLY__
 #include <linux/types.h>
 
 #include <asm/feature-fixups.h>
@@ -42,4 +43,12 @@ struct jump_entry {
         jump_label_t key;
 };
 
+#else
+#define ARCH_STATIC_BRANCH(LABEL, KEY)          \
+1098:   nop;                                    \
+        .pushsection __jump_table, "aw";        \
+        FTR_ENTRY_LONG 1098b, LABEL, KEY;       \
+        .popsection
+#endif
+
 #endif /* _ASM_POWERPC_JUMP_LABEL_H */
diff --git a/arch/powerpc/include/asm/kvm_44x.h b/arch/powerpc/include/asm/kvm_44x.h
deleted file mode 100644
index a0e57618ff33..000000000000
--- a/arch/powerpc/include/asm/kvm_44x.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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 IBM Corp. 2008
- *
- * Authors: Hollis Blanchard <hollisb@us.ibm.com>
- */
-
-#ifndef __ASM_44X_H__
-#define __ASM_44X_H__
-
-#include <linux/kvm_host.h>
-
-#define PPC44x_TLB_SIZE 64
-
-/* If the guest is expecting it, this can be as large as we like; we'd just
- * need to find some way of advertising it. */
-#define KVM44x_GUEST_TLB_SIZE 64
-
-struct kvmppc_44x_tlbe {
-        u32 tid; /* Only the low 8 bits are used. */
-        u32 word0;
-        u32 word1;
-        u32 word2;
-};
-
-struct kvmppc_44x_shadow_ref {
-        struct page *page;
-        u16 gtlb_index;
-        u8 writeable;
-        u8 tid;
-};
-
-struct kvmppc_vcpu_44x {
-        /* Unmodified copy of the guest's TLB. */
-        struct kvmppc_44x_tlbe guest_tlb[KVM44x_GUEST_TLB_SIZE];
-
-        /* References to guest pages in the hardware TLB. */
-        struct kvmppc_44x_shadow_ref shadow_refs[PPC44x_TLB_SIZE];
-
-        /* State of the shadow TLB at guest context switch time. */
-        struct kvmppc_44x_tlbe shadow_tlb[PPC44x_TLB_SIZE];
-        u8 shadow_tlb_mod[PPC44x_TLB_SIZE];
-
-        struct kvm_vcpu vcpu;
-};
-
-static inline struct kvmppc_vcpu_44x *to_44x(struct kvm_vcpu *vcpu)
-{
-        return container_of(vcpu, struct kvmppc_vcpu_44x, vcpu);
-}
-
-void kvmppc_44x_tlb_put(struct kvm_vcpu *vcpu);
-void kvmppc_44x_tlb_load(struct kvm_vcpu *vcpu);
-
-#endif /* __ASM_44X_H__ */
diff --git a/arch/powerpc/include/asm/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h
index 9601741080e5..465dfcb82c92 100644
--- a/arch/powerpc/include/asm/kvm_asm.h
+++ b/arch/powerpc/include/asm/kvm_asm.h
@@ -33,7 +33,6 @@
 /* IVPR must be 64KiB-aligned. */
 #define VCPU_SIZE_ORDER 4
 #define VCPU_SIZE_LOG   (VCPU_SIZE_ORDER + 12)
-#define VCPU_TLB_PGSZ   PPC44x_TLB_64K
 #define VCPU_SIZE_BYTES (1<<VCPU_SIZE_LOG)
 
 #define BOOKE_INTERRUPT_CRITICAL 0
@@ -98,6 +97,7 @@
 #define BOOK3S_INTERRUPT_H_DATA_STORAGE 0xe00
 #define BOOK3S_INTERRUPT_H_INST_STORAGE 0xe20
 #define BOOK3S_INTERRUPT_H_EMUL_ASSIST  0xe40
+#define BOOK3S_INTERRUPT_HMI            0xe60
 #define BOOK3S_INTERRUPT_H_DOORBELL     0xe80
 #define BOOK3S_INTERRUPT_PERFMON        0xf00
 #define BOOK3S_INTERRUPT_ALTIVEC        0xf20
@@ -131,6 +131,7 @@
 #define BOOK3S_HFLAG_NATIVE_PS                  0x8
 #define BOOK3S_HFLAG_MULTI_PGSIZE               0x10
 #define BOOK3S_HFLAG_NEW_TLBIE                  0x20
+#define BOOK3S_HFLAG_SPLIT_HACK                 0x40
 
 #define RESUME_FLAG_NV          (1<<0)  /* Reload guest nonvolatile state? */
 #define RESUME_FLAG_HOST        (1<<1)  /* Resume host? */
diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index f52f65694527..6acf0c2a0f99 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -83,8 +83,6 @@ struct kvmppc_vcpu_book3s {
         u64 sdr1;
         u64 hior;
         u64 msr_mask;
-        u64 purr_offset;
-        u64 spurr_offset;
 #ifdef CONFIG_PPC_BOOK3S_32
         u32 vsid_pool[VSID_POOL_SIZE];
         u32 vsid_next;
@@ -148,9 +146,10 @@ extern void kvmppc_mmu_invalidate_pte(struct kvm_vcpu *vcpu, struct hpte_cache *
 extern int kvmppc_mmu_hpte_sysinit(void);
 extern void kvmppc_mmu_hpte_sysexit(void);
 extern int kvmppc_mmu_hv_init(void);
+extern int kvmppc_book3s_hcall_implemented(struct kvm *kvm, unsigned long hc);
 
+/* XXX remove this export when load_last_inst() is generic */
 extern int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr, bool data);
-extern int kvmppc_st(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr, bool data);
 extern void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec);
 extern void kvmppc_book3s_dequeue_irqprio(struct kvm_vcpu *vcpu,
                                           unsigned int vec);
@@ -159,13 +158,13 @@ extern void kvmppc_set_bat(struct kvm_vcpu *vcpu, struct kvmppc_bat *bat,
                            bool upper, u32 val);
 extern void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr);
 extern int kvmppc_emulate_paired_single(struct kvm_run *run, struct kvm_vcpu *vcpu);
-extern pfn_t kvmppc_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, bool writing,
+extern pfn_t kvmppc_gpa_to_pfn(struct kvm_vcpu *vcpu, gpa_t gpa, bool writing,
                         bool *writable);
 extern void kvmppc_add_revmap_chain(struct kvm *kvm, struct revmap_entry *rev,
                         unsigned long *rmap, long pte_index, int realmode);
-extern void kvmppc_invalidate_hpte(struct kvm *kvm, unsigned long *hptep,
+extern void kvmppc_invalidate_hpte(struct kvm *kvm, __be64 *hptep,
                         unsigned long pte_index);
-void kvmppc_clear_ref_hpte(struct kvm *kvm, unsigned long *hptep,
+void kvmppc_clear_ref_hpte(struct kvm *kvm, __be64 *hptep,
                         unsigned long pte_index);
 extern void *kvmppc_pin_guest_page(struct kvm *kvm, unsigned long addr,
                         unsigned long *nb_ret);
@@ -183,12 +182,16 @@ extern long kvmppc_hv_get_dirty_log(struct kvm *kvm,
                         struct kvm_memory_slot *memslot, unsigned long *map);
 extern void kvmppc_update_lpcr(struct kvm *kvm, unsigned long lpcr,
                         unsigned long mask);
+extern void kvmppc_set_fscr(struct kvm_vcpu *vcpu, u64 fscr);
 
 extern void kvmppc_entry_trampoline(void);
 extern void kvmppc_hv_entry_trampoline(void);
 extern u32 kvmppc_alignment_dsisr(struct kvm_vcpu *vcpu, unsigned int inst);
 extern ulong kvmppc_alignment_dar(struct kvm_vcpu *vcpu, unsigned int inst);
 extern int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd);
+extern void kvmppc_pr_init_default_hcalls(struct kvm *kvm);
+extern int kvmppc_hcall_impl_pr(unsigned long cmd);
+extern int kvmppc_hcall_impl_hv_realmode(unsigned long cmd);
 extern void kvmppc_copy_to_svcpu(struct kvmppc_book3s_shadow_vcpu *svcpu,
                                  struct kvm_vcpu *vcpu);
 extern void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu,
@@ -274,32 +277,6 @@ static inline bool kvmppc_need_byteswap(struct kvm_vcpu *vcpu)
         return (kvmppc_get_msr(vcpu) & MSR_LE) != (MSR_KERNEL & MSR_LE);
 }
 
-static inline u32 kvmppc_get_last_inst_internal(struct kvm_vcpu *vcpu, ulong pc)
-{
-        /* 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 kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :
-                vcpu->arch.last_inst;
-}
-
-static inline u32 kvmppc_get_last_inst(struct kvm_vcpu *vcpu)
-{
-        return kvmppc_get_last_inst_internal(vcpu, kvmppc_get_pc(vcpu));
-}
-
-/*
- * 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)
-{
-        return kvmppc_get_last_inst_internal(vcpu, kvmppc_get_pc(vcpu) - 4);
-}
-
 static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu)
 {
         return vcpu->arch.fault_dar;
@@ -310,6 +287,13 @@ static inline bool is_kvmppc_resume_guest(int r)
         return (r == RESUME_GUEST || r == RESUME_GUEST_NV);
 }
 
+static inline bool is_kvmppc_hv_enabled(struct kvm *kvm);
+static inline bool kvmppc_supports_magic_page(struct kvm_vcpu *vcpu)
+{
+        /* Only PR KVM supports the magic page */
+        return !is_kvmppc_hv_enabled(vcpu->kvm);
+}
+
 /* Magic register values loaded into r3 and r4 before the 'sc' assembly
  * instruction for the OSI hypercalls */
 #define OSI_SC_MAGIC_R3                 0x113724FA
@@ -322,4 +306,7 @@ static inline bool is_kvmppc_resume_guest(int r)
 /* LPIDs we support with this build -- runtime limit may be lower */
 #define KVMPPC_NR_LPIDS                 (LPID_RSVD + 1)
 
+#define SPLIT_HACK_MASK                 0xff000000
+#define SPLIT_HACK_OFFS                 0xfb000000
+
 #endif /* __ASM_KVM_BOOK3S_H__ */
diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h
index d645428a65a4..0aa817933e6a 100644
--- a/arch/powerpc/include/asm/kvm_book3s_64.h
+++ b/arch/powerpc/include/asm/kvm_book3s_64.h
@@ -59,20 +59,29 @@ extern unsigned long kvm_rma_pages;
 /* These bits are reserved in the guest view of the HPTE */
 #define HPTE_GR_RESERVED        HPTE_GR_MODIFIED
 
-static inline long try_lock_hpte(unsigned long *hpte, unsigned long bits)
+static inline long try_lock_hpte(__be64 *hpte, unsigned long bits)
 {
         unsigned long tmp, old;
+        __be64 be_lockbit, be_bits;
+
+        /*
+         * We load/store in native endian, but the HTAB is in big endian. If
+         * we byte swap all data we apply on the PTE we're implicitly correct
+         * again.
+         */
+        be_lockbit = cpu_to_be64(HPTE_V_HVLOCK);
+        be_bits = cpu_to_be64(bits);
 
         asm volatile("  ldarx   %0,0,%2\n"
                      "  and.    %1,%0,%3\n"
                      "  bne     2f\n"
-                     "  ori     %0,%0,%4\n"
+                     "  or      %0,%0,%4\n"
                      "  stdcx.  %0,0,%2\n"
                      "  beq+    2f\n"
                      "  mr      %1,%3\n"
                      "2:        isync"
                      : "=&r" (tmp), "=&r" (old)
-                     : "r" (hpte), "r" (bits), "i" (HPTE_V_HVLOCK)
+                     : "r" (hpte), "r" (be_bits), "r" (be_lockbit)
                      : "cc", "memory");
         return old == 0;
 }
@@ -110,16 +119,12 @@ static inline int __hpte_actual_psize(unsigned int lp, int psize)
 static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r,
                                              unsigned long pte_index)
 {
-        int b_psize, a_psize;
+        int b_psize = MMU_PAGE_4K, a_psize = MMU_PAGE_4K;
         unsigned int penc;
         unsigned long rb = 0, va_low, sllp;
         unsigned int lp = (r >> LP_SHIFT) & ((1 << LP_BITS) - 1);
 
-        if (!(v & HPTE_V_LARGE)) {
-                /* both base and actual psize is 4k */
-                b_psize = MMU_PAGE_4K;
-                a_psize = MMU_PAGE_4K;
-        } else {
+        if (v & HPTE_V_LARGE) {
                 for (b_psize = 0; b_psize < MMU_PAGE_COUNT; b_psize++) {
 
                         /* valid entries have a shift value */
@@ -142,6 +147,8 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r,
          */
         /* This covers 14..54 bits of va*/
         rb = (v & ~0x7fUL) << 16;               /* AVA field */
+
+        rb |= v >> (62 - 8);                    /*  B field */
         /*
          * AVA in v had cleared lower 23 bits. We need to derive
          * that from pteg index
@@ -172,10 +179,10 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r,
         {
                 int aval_shift;
                 /*
-                 * remaining 7bits of AVA/LP fields
+                 * remaining bits of AVA/LP fields
                  * Also contain the rr bits of LP
                  */
-                rb |= (va_low & 0x7f) << 16;
+                rb |= (va_low << mmu_psize_defs[b_psize].shift) & 0x7ff000;
                 /*
                  * Now clear not needed LP bits based on actual psize
                  */
diff --git a/arch/powerpc/include/asm/kvm_booke.h b/arch/powerpc/include/asm/kvm_booke.h
index c7aed6105ff9..f7aa5cc395c4 100644
--- a/arch/powerpc/include/asm/kvm_booke.h
+++ b/arch/powerpc/include/asm/kvm_booke.h
@@ -69,11 +69,6 @@ static inline bool kvmppc_need_byteswap(struct kvm_vcpu *vcpu)
         return false;
 }
 
-static inline u32 kvmppc_get_last_inst(struct kvm_vcpu *vcpu)
-{
-        return vcpu->arch.last_inst;
-}
-
 static inline void kvmppc_set_ctr(struct kvm_vcpu *vcpu, ulong val)
 {
         vcpu->arch.ctr = val;
@@ -108,4 +103,14 @@ static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu)
 {
         return vcpu->arch.fault_dear;
 }
+
+static inline bool kvmppc_supports_magic_page(struct kvm_vcpu *vcpu)
+{
+        /* Magic page is only supported on e500v2 */
+#ifdef CONFIG_KVM_E500V2
+        return true;
+#else
+        return false;
+#endif
+}
 #endif /* __ASM_KVM_BOOKE_H__ */
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index bb66d8b8efdf..98d9dd50d063 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -34,6 +34,7 @@
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/cacheflush.h>
+#include <asm/hvcall.h>
 
 #define KVM_MAX_VCPUS           NR_CPUS
 #define KVM_MAX_VCORES          NR_CPUS
@@ -48,7 +49,6 @@
 #define KVM_NR_IRQCHIPS          1
 #define KVM_IRQCHIP_NUM_PINS     256
 
-#if !defined(CONFIG_KVM_440)
 #include <linux/mmu_notifier.h>
 
 #define KVM_ARCH_WANT_MMU_NOTIFIER
@@ -61,8 +61,6 @@ extern int kvm_age_hva(struct kvm *kvm, unsigned long hva);
 extern int kvm_test_age_hva(struct kvm *kvm, unsigned long hva);
 extern void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte);
 
-#endif
-
 #define HPTEG_CACHE_NUM                 (1 << 15)
 #define HPTEG_HASH_BITS_PTE             13
 #define HPTEG_HASH_BITS_PTE_LONG        12
@@ -96,7 +94,6 @@ struct kvm_vm_stat {
 struct kvm_vcpu_stat {
         u32 sum_exits;
         u32 mmio_exits;
-        u32 dcr_exits;
         u32 signal_exits;
         u32 light_exits;
         /* Account for special types of light exits: */
@@ -113,22 +110,21 @@ struct kvm_vcpu_stat {
         u32 halt_wakeup;
         u32 dbell_exits;
         u32 gdbell_exits;
+        u32 ld;
+        u32 st;
 #ifdef CONFIG_PPC_BOOK3S
         u32 pf_storage;
         u32 pf_instruc;
         u32 sp_storage;
         u32 sp_instruc;
         u32 queue_intr;
-        u32 ld;
         u32 ld_slow;
-        u32 st;
         u32 st_slow;
 #endif
 };
 
 enum kvm_exit_types {
         MMIO_EXITS,
-        DCR_EXITS,
         SIGNAL_EXITS,
         ITLB_REAL_MISS_EXITS,
         ITLB_VIRT_MISS_EXITS,
@@ -254,7 +250,6 @@ struct kvm_arch {
         atomic_t hpte_mod_interest;
         spinlock_t slot_phys_lock;
         cpumask_t need_tlb_flush;
-        struct kvmppc_vcore *vcores[KVM_MAX_VCORES];
         int hpt_cma_alloc;
 #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */
 #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@ -263,6 +258,7 @@ struct kvm_arch {
 #ifdef CONFIG_PPC_BOOK3S_64
         struct list_head spapr_tce_tables;
         struct list_head rtas_tokens;
+        DECLARE_BITMAP(enabled_hcalls, MAX_HCALL_OPCODE/4 + 1);
 #endif
 #ifdef CONFIG_KVM_MPIC
         struct openpic *mpic;
@@ -271,6 +267,10 @@ struct kvm_arch {
         struct kvmppc_xics *xics;
 #endif
         struct kvmppc_ops *kvm_ops;
+#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
+        /* This array can grow quite large, keep it at the end */
+        struct kvmppc_vcore *vcores[KVM_MAX_VCORES];
+#endif
 };
 
 /*
@@ -305,6 +305,8 @@ struct kvmppc_vcore {
         u32 arch_compat;
         ulong pcr;
         ulong dpdes;            /* doorbell state (POWER8) */
+        void *mpp_buffer; /* Micro Partition Prefetch buffer */
+        bool mpp_buffer_is_valid;
 };
 
 #define VCORE_ENTRY_COUNT(vc)   ((vc)->entry_exit_count & 0xff)
@@ -503,8 +505,10 @@ struct kvm_vcpu_arch {
 #ifdef CONFIG_BOOKE
         u32 decar;
 #endif
-        u32 tbl;
-        u32 tbu;
+        /* Time base value when we entered the guest */
+        u64 entry_tb;
+        u64 entry_vtb;
+        u64 entry_ic;
         u32 tcr;
         ulong tsr; /* we need to perform set/clr_bits() which requires ulong */
         u32 ivor[64];
@@ -580,6 +584,8 @@ struct kvm_vcpu_arch {
         u32 mmucfg;
         u32 eptcfg;
         u32 epr;
+        u64 sprg9;
+        u32 pwrmgtcr0;
         u32 crit_save;
         /* guest debug registers*/
         struct debug_reg dbg_reg;
@@ -593,8 +599,6 @@ struct kvm_vcpu_arch {
         u8 io_gpr; /* GPR used as IO source/target */
         u8 mmio_is_bigendian;
         u8 mmio_sign_extend;
-        u8 dcr_needed;
-        u8 dcr_is_write;
         u8 osi_needed;
         u8 osi_enabled;
         u8 papr_enabled;
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index 9c89cdd067a6..fb86a2299d8a 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -41,12 +41,26 @@
 enum emulation_result {
         EMULATE_DONE,         /* no further processing */
         EMULATE_DO_MMIO,      /* kvm_run filled with MMIO request */
-        EMULATE_DO_DCR,       /* kvm_run filled with DCR request */
         EMULATE_FAIL,         /* can't emulate this instruction */
         EMULATE_AGAIN,        /* something went wrong. go again */
         EMULATE_EXIT_USER,    /* emulation requires exit to user-space */
 };
 
+enum instruction_type {
+        INST_GENERIC,
+        INST_SC,                /* system call */
+};
+
+enum xlate_instdata {
+        XLATE_INST,             /* translate instruction address */
+        XLATE_DATA              /* translate data address */
+};
+
+enum xlate_readwrite {
+        XLATE_READ,             /* check for read permissions */
+        XLATE_WRITE             /* check for write permissions */
+};
+
 extern int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu);
 extern int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu);
 extern void kvmppc_handler_highmem(void);
@@ -62,8 +76,16 @@ extern int kvmppc_handle_store(struct kvm_run *run, struct kvm_vcpu *vcpu,
                                u64 val, unsigned int bytes,
                                int is_default_endian);
 
+extern int kvmppc_load_last_inst(struct kvm_vcpu *vcpu,
+                                 enum instruction_type type, u32 *inst);
+
+extern int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr,
+                     bool data);
+extern int kvmppc_st(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr,
+                     bool data);
 extern int kvmppc_emulate_instruction(struct kvm_run *run,
                                       struct kvm_vcpu *vcpu);
+extern int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu);
 extern int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu);
 extern void kvmppc_emulate_dec(struct kvm_vcpu *vcpu);
 extern u32 kvmppc_get_dec(struct kvm_vcpu *vcpu, u64 tb);
@@ -86,6 +108,9 @@ extern gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index,
                               gva_t eaddr);
 extern void kvmppc_mmu_dtlb_miss(struct kvm_vcpu *vcpu);
 extern void kvmppc_mmu_itlb_miss(struct kvm_vcpu *vcpu);
+extern int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr,
+                        enum xlate_instdata xlid, enum xlate_readwrite xlrw,
+                        struct kvmppc_pte *pte);
 
 extern struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm,
                                                 unsigned int id);
@@ -106,6 +131,14 @@ extern void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu);
 extern void kvmppc_core_queue_external(struct kvm_vcpu *vcpu,
                                        struct kvm_interrupt *irq);
 extern void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu);
+extern void kvmppc_core_queue_dtlb_miss(struct kvm_vcpu *vcpu, ulong dear_flags,
+                                        ulong esr_flags);
+extern void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu,
+                                           ulong dear_flags,
+                                           ulong esr_flags);
+extern void kvmppc_core_queue_itlb_miss(struct kvm_vcpu *vcpu);
+extern void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu,
+                                           ulong esr_flags);
 extern void kvmppc_core_flush_tlb(struct kvm_vcpu *vcpu);
 extern int kvmppc_core_check_requests(struct kvm_vcpu *vcpu);
 
@@ -228,12 +261,35 @@ struct kvmppc_ops {
         void (*fast_vcpu_kick)(struct kvm_vcpu *vcpu);
         long (*arch_vm_ioctl)(struct file *filp, unsigned int ioctl,
                               unsigned long arg);
-
+        int (*hcall_implemented)(unsigned long hcall);
 };
 
 extern struct kvmppc_ops *kvmppc_hv_ops;
 extern struct kvmppc_ops *kvmppc_pr_ops;
 
+static inline int kvmppc_get_last_inst(struct kvm_vcpu *vcpu,
+                                        enum instruction_type type, u32 *inst)
+{
+        int ret = EMULATE_DONE;
+        u32 fetched_inst;
+
+        /* Load the instruction manually if it failed to do so in the
+         * exit path */
+        if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)
+                ret = kvmppc_load_last_inst(vcpu, type, &vcpu->arch.last_inst);
+
+        /*  Write fetch_failed unswapped if the fetch failed */
+        if (ret == EMULATE_DONE)
+                fetched_inst = kvmppc_need_byteswap(vcpu) ?
+                                swab32(vcpu->arch.last_inst) :
+                                vcpu->arch.last_inst;
+        else
+                fetched_inst = vcpu->arch.last_inst;
+
+        *inst = fetched_inst;
+        return ret;
+}
+
 static inline bool is_kvmppc_hv_enabled(struct kvm *kvm)
 {
         return kvm->arch.kvm_ops == kvmppc_hv_ops;
@@ -392,6 +448,17 @@ static inline int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd)
         { return 0; }
 #endif
 
+static inline unsigned long kvmppc_get_epr(struct kvm_vcpu *vcpu)
+{
+#ifdef CONFIG_KVM_BOOKE_HV
+        return mfspr(SPRN_GEPR);
+#elif defined(CONFIG_BOOKE)
+        return vcpu->arch.epr;
+#else
+        return 0;
+#endif
+}
+
 static inline void kvmppc_set_epr(struct kvm_vcpu *vcpu, u32 epr)
 {
 #ifdef CONFIG_KVM_BOOKE_HV
@@ -472,8 +539,20 @@ static inline bool kvmppc_shared_big_endian(struct kvm_vcpu *vcpu)
 #endif
 }
 
+#define SPRNG_WRAPPER_GET(reg, bookehv_spr)                             \
+static inline ulong kvmppc_get_##reg(struct kvm_vcpu *vcpu)             \
+{                                                                       \
+        return mfspr(bookehv_spr);                                      \
+}                                                                       \
+
+#define SPRNG_WRAPPER_SET(reg, bookehv_spr)                             \
+static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, ulong val)   \
+{                                                                       \
+        mtspr(bookehv_spr, val);                                                \
+}                                                                       \
+
 #define SHARED_WRAPPER_GET(reg, size)                                   \
-static inline u##size kvmppc_get_##reg(struct kvm_vcpu *vcpu)   \
+static inline u##size kvmppc_get_##reg(struct kvm_vcpu *vcpu)           \
 {                                                                       \
         if (kvmppc_shared_big_endian(vcpu))                             \
                return be##size##_to_cpu(vcpu->arch.shared->reg);        \
@@ -494,14 +573,31 @@ static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val)	\
         SHARED_WRAPPER_GET(reg, size)                                   \
         SHARED_WRAPPER_SET(reg, size)                                   \
 
+#define SPRNG_WRAPPER(reg, bookehv_spr)                                 \
+        SPRNG_WRAPPER_GET(reg, bookehv_spr)                             \
+        SPRNG_WRAPPER_SET(reg, bookehv_spr)                             \
+
+#ifdef CONFIG_KVM_BOOKE_HV
+
+#define SHARED_SPRNG_WRAPPER(reg, size, bookehv_spr)                    \
+        SPRNG_WRAPPER(reg, bookehv_spr)                                 \
+
+#else
+
+#define SHARED_SPRNG_WRAPPER(reg, size, bookehv_spr)                    \
+        SHARED_WRAPPER(reg, size)                                       \
+
+#endif
+
 SHARED_WRAPPER(critical, 64)
-SHARED_WRAPPER(sprg0, 64)
-SHARED_WRAPPER(sprg1, 64)
-SHARED_WRAPPER(sprg2, 64)
-SHARED_WRAPPER(sprg3, 64)
-SHARED_WRAPPER(srr0, 64)
-SHARED_WRAPPER(srr1, 64)
-SHARED_WRAPPER(dar, 64)
+SHARED_SPRNG_WRAPPER(sprg0, 64, SPRN_GSPRG0)
+SHARED_SPRNG_WRAPPER(sprg1, 64, SPRN_GSPRG1)
+SHARED_SPRNG_WRAPPER(sprg2, 64, SPRN_GSPRG2)
+SHARED_SPRNG_WRAPPER(sprg3, 64, SPRN_GSPRG3)
+SHARED_SPRNG_WRAPPER(srr0, 64, SPRN_GSRR0)
+SHARED_SPRNG_WRAPPER(srr1, 64, SPRN_GSRR1)
+SHARED_SPRNG_WRAPPER(dar, 64, SPRN_GDEAR)
+SHARED_SPRNG_WRAPPER(esr, 64, SPRN_GESR)
 SHARED_WRAPPER_GET(msr, 64)
 static inline void kvmppc_set_msr_fast(struct kvm_vcpu *vcpu, u64 val)
 {
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index f92b0b54e921..b125ceab149c 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -57,10 +57,10 @@ struct machdep_calls {
         void            (*hpte_removebolted)(unsigned long ea,
                                              int psize, int ssize);
         void            (*flush_hash_range)(unsigned long number, int local);
-        void            (*hugepage_invalidate)(struct mm_struct *mm,
+        void            (*hugepage_invalidate)(unsigned long vsid,
+                                               unsigned long addr,
                                                unsigned char *hpte_slot_array,
-                                               unsigned long addr, int psize);
-
+                                               int psize, int ssize);
         /* special for kexec, to be called in real mode, linear mapping is
          * destroyed as well */
         void            (*hpte_clear_all)(void);
@@ -174,6 +174,10 @@ struct machdep_calls {
         /* Exception handlers */
         int             (*system_reset_exception)(struct pt_regs *regs);
         int             (*machine_check_exception)(struct pt_regs *regs);
+        int             (*handle_hmi_exception)(struct pt_regs *regs);
+
+        /* Early exception handlers called in realmode */
+        int             (*hmi_exception_early)(struct pt_regs *regs);
 
         /* Called during machine check exception to retrive fixup address. */
         bool            (*mce_check_early_recovery)(struct pt_regs *regs);
@@ -366,6 +370,7 @@ static inline void log_error(char *buf, unsigned int err_type, int fatal)
         } \
         __define_initcall(__machine_initcall_##mach##_##fn, id);
 
+#define machine_early_initcall(mach, fn)        __define_machine_initcall(mach, fn, early)
 #define machine_core_initcall(mach, fn)         __define_machine_initcall(mach, fn, 1)
 #define machine_core_initcall_sync(mach, fn)    __define_machine_initcall(mach, fn, 1s)
 #define machine_postcore_initcall(mach, fn)     __define_machine_initcall(mach, fn, 2)
diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h
index d0918e09557f..cd4f04a74802 100644
--- a/arch/powerpc/include/asm/mmu-book3e.h
+++ b/arch/powerpc/include/asm/mmu-book3e.h
@@ -40,7 +40,11 @@
 
 /* MAS registers bit definitions */
 
-#define MAS0_TLBSEL(x)          (((x) << 28) & 0x30000000)
+#define MAS0_TLBSEL_MASK        0x30000000
+#define MAS0_TLBSEL_SHIFT       28
+#define MAS0_TLBSEL(x)          (((x) << MAS0_TLBSEL_SHIFT) & MAS0_TLBSEL_MASK)
+#define MAS0_GET_TLBSEL(mas0)   (((mas0) & MAS0_TLBSEL_MASK) >> \
+                        MAS0_TLBSEL_SHIFT)
 #define MAS0_ESEL_MASK          0x0FFF0000
 #define MAS0_ESEL_SHIFT         16
 #define MAS0_ESEL(x)            (((x) << MAS0_ESEL_SHIFT) & MAS0_ESEL_MASK)
@@ -58,6 +62,7 @@
 #define MAS1_TSIZE_MASK         0x00000f80
 #define MAS1_TSIZE_SHIFT        7
 #define MAS1_TSIZE(x)           (((x) << MAS1_TSIZE_SHIFT) & MAS1_TSIZE_MASK)
+#define MAS1_GET_TSIZE(mas1)    (((mas1) & MAS1_TSIZE_MASK) >> MAS1_TSIZE_SHIFT)
 
 #define MAS2_EPN                (~0xFFFUL)
 #define MAS2_X0                 0x00000040
@@ -86,6 +91,7 @@
 #define MAS3_SPSIZE             0x0000003e
 #define MAS3_SPSIZE_SHIFT       1
 
+#define MAS4_TLBSEL_MASK        MAS0_TLBSEL_MASK
 #define MAS4_TLBSELD(x)         MAS0_TLBSEL(x)
 #define MAS4_INDD               0x00008000      /* Default IND */
 #define MAS4_TSIZED(x)          MAS1_TSIZE(x)
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h
index c2b4dcf23d03..d76514487d6f 100644
--- a/arch/powerpc/include/asm/mmu-hash64.h
+++ b/arch/powerpc/include/asm/mmu-hash64.h
@@ -25,26 +25,6 @@
 #include <asm/processor.h>
 
 /*
- * Segment table
- */
-
-#define STE_ESID_V      0x80
-#define STE_ESID_KS     0x20
-#define STE_ESID_KP     0x10
-#define STE_ESID_N      0x08
-
-#define STE_VSID_SHIFT  12
-
-/* Location of cpu0's segment table */
-#define STAB0_PAGE      0x8
-#define STAB0_OFFSET    (STAB0_PAGE << 12)
-#define STAB0_PHYS_ADDR (STAB0_OFFSET + PHYSICAL_START)
-
-#ifndef __ASSEMBLY__
-extern char initial_stab[];
-#endif /* ! __ASSEMBLY */
-
-/*
  * SLB
  */
 
@@ -370,10 +350,8 @@ extern void hpte_init_lpar(void);
 extern void hpte_init_beat(void);
 extern void hpte_init_beat_v3(void);
 
-extern void stabs_alloc(void);
 extern void slb_initialize(void);
 extern void slb_flush_and_rebolt(void);
-extern void stab_initialize(unsigned long stab);
 
 extern void slb_vmalloc_update(void);
 extern void slb_set_size(u16 size);
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index e61f24ed4e65..3d5abfe6ba67 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -64,9 +64,9 @@
  */
 #define MMU_FTR_USE_PAIRED_MAS          ASM_CONST(0x01000000)
 
-/* MMU is SLB-based
+/* Doesn't support the B bit (1T segment) in SLBIE
  */
-#define MMU_FTR_SLB                     ASM_CONST(0x02000000)
+#define MMU_FTR_NO_SLBIE_B              ASM_CONST(0x02000000)
 
 /* Support 16M large pages
  */
@@ -88,10 +88,6 @@
  */
 #define MMU_FTR_1T_SEGMENT              ASM_CONST(0x40000000)
 
-/* Doesn't support the B bit (1T segment) in SLBIE
- */
-#define MMU_FTR_NO_SLBIE_B              ASM_CONST(0x80000000)
-
 /* MMU feature bit sets for various CPUs */
 #define MMU_FTRS_DEFAULT_HPTE_ARCH_V2   \
         MMU_FTR_HPTE_TABLE | MMU_FTR_PPCAS_ARCH_V2
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
index b467530e2485..73382eba02dc 100644
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@ -18,7 +18,6 @@ extern int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
 extern void destroy_context(struct mm_struct *mm);
 
 extern void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next);
-extern void switch_stab(struct task_struct *tsk, struct mm_struct *mm);
 extern void switch_slb(struct task_struct *tsk, struct mm_struct *mm);
 extern void set_context(unsigned long id, pgd_t *pgd);
 
@@ -77,10 +76,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
          * sub architectures.
          */
 #ifdef CONFIG_PPC_STD_MMU_64
-        if (mmu_has_feature(MMU_FTR_SLB))
-                switch_slb(tsk, next);
-        else
-                switch_stab(tsk, next);
+        switch_slb(tsk, next);
 #else
         /* Out of line for now */
         switch_mmu_context(prev, next);
diff --git a/arch/powerpc/include/asm/mpc85xx.h b/arch/powerpc/include/asm/mpc85xx.h
index 736d4acc05a8..3bef74a9914b 100644
--- a/arch/powerpc/include/asm/mpc85xx.h
+++ b/arch/powerpc/include/asm/mpc85xx.h
@@ -77,6 +77,8 @@
 #define SVR_T1020       0x852100
 #define SVR_T1021       0x852101
 #define SVR_T1022       0x852102
+#define SVR_T2080       0x853000
+#define SVR_T2081       0x853100
 
 #define SVR_8610        0x80A000
 #define SVR_8641        0x809000
diff --git a/arch/powerpc/include/asm/mpc8xx.h b/arch/powerpc/include/asm/mpc8xx.h
deleted file mode 100644
index 98f3c4f17328..000000000000
--- a/arch/powerpc/include/asm/mpc8xx.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* This is the single file included by all MPC8xx build options.
- * Since there are many different boards and no standard configuration,
- * we have a unique include file for each.  Rather than change every
- * file that has to include MPC8xx configuration, they all include
- * this one and the configuration switching is done here.
- */
-#ifndef __CONFIG_8xx_DEFS
-#define __CONFIG_8xx_DEFS
-
-extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
-
-#endif /* __CONFIG_8xx_DEFS */
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index 0da1dbd42e02..86055e598269 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -147,6 +147,10 @@ struct opal_sg_list {
 #define OPAL_SET_PARAM                          90
 #define OPAL_DUMP_RESEND                        91
 #define OPAL_DUMP_INFO2                         94
+#define OPAL_PCI_EEH_FREEZE_SET                 97
+#define OPAL_HANDLE_HMI                         98
+#define OPAL_REGISTER_DUMP_REGION               101
+#define OPAL_UNREGISTER_DUMP_REGION             102
 
 #ifndef __ASSEMBLY__
 
@@ -170,7 +174,11 @@ enum OpalFreezeState {
 enum OpalEehFreezeActionToken {
         OPAL_EEH_ACTION_CLEAR_FREEZE_MMIO = 1,
         OPAL_EEH_ACTION_CLEAR_FREEZE_DMA = 2,
-        OPAL_EEH_ACTION_CLEAR_FREEZE_ALL = 3
+        OPAL_EEH_ACTION_CLEAR_FREEZE_ALL = 3,
+
+        OPAL_EEH_ACTION_SET_FREEZE_MMIO = 1,
+        OPAL_EEH_ACTION_SET_FREEZE_DMA  = 2,
+        OPAL_EEH_ACTION_SET_FREEZE_ALL  = 3
 };
 
 enum OpalPciStatusToken {
@@ -240,6 +248,7 @@ enum OpalMessageType {
         OPAL_MSG_MEM_ERR,
         OPAL_MSG_EPOW,
         OPAL_MSG_SHUTDOWN,
+        OPAL_MSG_HMI_EVT,
         OPAL_MSG_TYPE_MAX,
 };
 
@@ -340,6 +349,12 @@ enum OpalMveEnableAction {
         OPAL_ENABLE_MVE = 1
 };
 
+enum OpalM64EnableAction {
+        OPAL_DISABLE_M64 = 0,
+        OPAL_ENABLE_M64_SPLIT = 1,
+        OPAL_ENABLE_M64_NON_SPLIT = 2
+};
+
 enum OpalPciResetScope {
         OPAL_PHB_COMPLETE = 1, OPAL_PCI_LINK = 2, OPAL_PHB_ERROR = 3,
         OPAL_PCI_HOT_RESET = 4, OPAL_PCI_FUNDAMENTAL_RESET = 5,
@@ -502,6 +517,50 @@ struct OpalMemoryErrorData {
         } u;
 };
 
+/* HMI interrupt event */
+enum OpalHMI_Version {
+        OpalHMIEvt_V1 = 1,
+};
+
+enum OpalHMI_Severity {
+        OpalHMI_SEV_NO_ERROR = 0,
+        OpalHMI_SEV_WARNING = 1,
+        OpalHMI_SEV_ERROR_SYNC = 2,
+        OpalHMI_SEV_FATAL = 3,
+};
+
+enum OpalHMI_Disposition {
+        OpalHMI_DISPOSITION_RECOVERED = 0,
+        OpalHMI_DISPOSITION_NOT_RECOVERED = 1,
+};
+
+enum OpalHMI_ErrType {
+        OpalHMI_ERROR_MALFUNC_ALERT     = 0,
+        OpalHMI_ERROR_PROC_RECOV_DONE,
+        OpalHMI_ERROR_PROC_RECOV_DONE_AGAIN,
+        OpalHMI_ERROR_PROC_RECOV_MASKED,
+        OpalHMI_ERROR_TFAC,
+        OpalHMI_ERROR_TFMR_PARITY,
+        OpalHMI_ERROR_HA_OVERFLOW_WARN,
+        OpalHMI_ERROR_XSCOM_FAIL,
+        OpalHMI_ERROR_XSCOM_DONE,
+        OpalHMI_ERROR_SCOM_FIR,
+        OpalHMI_ERROR_DEBUG_TRIG_FIR,
+        OpalHMI_ERROR_HYP_RESOURCE,
+};
+
+struct OpalHMIEvent {
+        uint8_t         version;        /* 0x00 */
+        uint8_t         severity;       /* 0x01 */
+        uint8_t         type;           /* 0x02 */
+        uint8_t         disposition;    /* 0x03 */
+        uint8_t         reserved_1[4];  /* 0x04 */
+
+        __be64          hmer;
+        /* TFMR register. Valid only for TFAC and TFMR_PARITY error type. */
+        __be64          tfmr;
+};
+
 enum {
         OPAL_P7IOC_DIAG_TYPE_NONE       = 0,
         OPAL_P7IOC_DIAG_TYPE_RGC        = 1,
@@ -513,40 +572,40 @@ enum {
 };
 
 struct OpalIoP7IOCErrorData {
-        uint16_t type;
+        __be16 type;
 
         /* GEM */
-        uint64_t gemXfir;
-        uint64_t gemRfir;
-        uint64_t gemRirqfir;
-        uint64_t gemMask;
-        uint64_t gemRwof;
+        __be64 gemXfir;
+        __be64 gemRfir;
+        __be64 gemRirqfir;
+        __be64 gemMask;
+        __be64 gemRwof;
 
         /* LEM */
-        uint64_t lemFir;
-        uint64_t lemErrMask;
-        uint64_t lemAction0;
-        uint64_t lemAction1;
-        uint64_t lemWof;
+        __be64 lemFir;
+        __be64 lemErrMask;
+        __be64 lemAction0;
+        __be64 lemAction1;
+        __be64 lemWof;
 
         union {
                 struct OpalIoP7IOCRgcErrorData {
-                        uint64_t rgcStatus;             /* 3E1C10 */
-                        uint64_t rgcLdcp;               /* 3E1C18 */
+                        __be64 rgcStatus;       /* 3E1C10 */
+                        __be64 rgcLdcp;         /* 3E1C18 */
                 }rgc;
                 struct OpalIoP7IOCBiErrorData {
-                        uint64_t biLdcp0;               /* 3C0100, 3C0118 */
-                        uint64_t biLdcp1;               /* 3C0108, 3C0120 */
-                        uint64_t biLdcp2;               /* 3C0110, 3C0128 */
-                        uint64_t biFenceStatus;         /* 3C0130, 3C0130 */
+                        __be64 biLdcp0;         /* 3C0100, 3C0118 */
+                        __be64 biLdcp1;         /* 3C0108, 3C0120 */
+                        __be64 biLdcp2;         /* 3C0110, 3C0128 */
+                        __be64 biFenceStatus;   /* 3C0130, 3C0130 */
 
-                        uint8_t  biDownbound;           /* BI Downbound or Upbound */
+                            u8 biDownbound;     /* BI Downbound or Upbound */
                 }bi;
                 struct OpalIoP7IOCCiErrorData {
-                        uint64_t ciPortStatus;          /* 3Dn008 */
-                        uint64_t ciPortLdcp;            /* 3Dn010 */
+                        __be64 ciPortStatus;    /* 3Dn008 */
+                        __be64 ciPortLdcp;      /* 3Dn010 */
 
-                        uint8_t  ciPort;                /* Index of CI port: 0/1 */
+                            u8 ciPort;          /* Index of CI port: 0/1 */
                 }ci;
         };
 };
@@ -578,60 +637,60 @@ struct OpalIoPhbErrorCommon {
 struct OpalIoP7IOCPhbErrorData {
         struct OpalIoPhbErrorCommon common;
 
-        uint32_t brdgCtl;
+        __be32 brdgCtl;
 
         // P7IOC utl regs
-        uint32_t portStatusReg;
-        uint32_t rootCmplxStatus;
-        uint32_t busAgentStatus;
+        __be32 portStatusReg;
+        __be32 rootCmplxStatus;
+        __be32 busAgentStatus;
 
         // P7IOC cfg regs
-        uint32_t deviceStatus;
-        uint32_t slotStatus;
-        uint32_t linkStatus;
-        uint32_t devCmdStatus;
-        uint32_t devSecStatus;
+        __be32 deviceStatus;
+        __be32 slotStatus;
+        __be32 linkStatus;
+        __be32 devCmdStatus;
+        __be32 devSecStatus;
 
         // cfg AER regs
-        uint32_t rootErrorStatus;
-        uint32_t uncorrErrorStatus;
-        uint32_t corrErrorStatus;
-        uint32_t tlpHdr1;
-        uint32_t tlpHdr2;
-        uint32_t tlpHdr3;
-        uint32_t tlpHdr4;
-        uint32_t sourceId;
+        __be32 rootErrorStatus;
+        __be32 uncorrErrorStatus;
+        __be32 corrErrorStatus;
+        __be32 tlpHdr1;
+        __be32 tlpHdr2;
+        __be32 tlpHdr3;
+        __be32 tlpHdr4;
+        __be32 sourceId;
 
-        uint32_t rsv3;
+        __be32 rsv3;
 
         // Record data about the call to allocate a buffer.
-        uint64_t errorClass;
-        uint64_t correlator;
+        __be64 errorClass;
+        __be64 correlator;
 
         //P7IOC MMIO Error Regs
-        uint64_t p7iocPlssr;                // n120
-        uint64_t p7iocCsr;                  // n110
-        uint64_t lemFir;                    // nC00
-        uint64_t lemErrorMask;              // nC18
-        uint64_t lemWOF;                    // nC40
-        uint64_t phbErrorStatus;            // nC80
-        uint64_t phbFirstErrorStatus;       // nC88
-        uint64_t phbErrorLog0;              // nCC0
-        uint64_t phbErrorLog1;              // nCC8
-        uint64_t mmioErrorStatus;           // nD00
-        uint64_t mmioFirstErrorStatus;      // nD08
-        uint64_t mmioErrorLog0;             // nD40
-        uint64_t mmioErrorLog1;             // nD48
-        uint64_t dma0ErrorStatus;           // nD80
-        uint64_t dma0FirstErrorStatus;      // nD88
-        uint64_t dma0ErrorLog0;             // nDC0
-        uint64_t dma0ErrorLog1;             // nDC8
-        uint64_t dma1ErrorStatus;           // nE00
-        uint64_t dma1FirstErrorStatus;      // nE08
-        uint64_t dma1ErrorLog0;             // nE40
-        uint64_t dma1ErrorLog1;             // nE48
-        uint64_t pestA[OPAL_P7IOC_NUM_PEST_REGS];
-        uint64_t pestB[OPAL_P7IOC_NUM_PEST_REGS];
+        __be64 p7iocPlssr;                // n120
+        __be64 p7iocCsr;                  // n110
+        __be64 lemFir;                    // nC00
+        __be64 lemErrorMask;              // nC18
+        __be64 lemWOF;                    // nC40
+        __be64 phbErrorStatus;            // nC80
+        __be64 phbFirstErrorStatus;       // nC88
+        __be64 phbErrorLog0;              // nCC0
+        __be64 phbErrorLog1;              // nCC8
+        __be64 mmioErrorStatus;           // nD00
+        __be64 mmioFirstErrorStatus;      // nD08
+        __be64 mmioErrorLog0;             // nD40
+        __be64 mmioErrorLog1;             // nD48
+        __be64 dma0ErrorStatus;           // nD80
+        __be64 dma0FirstErrorStatus;      // nD88
+        __be64 dma0ErrorLog0;             // nDC0
+        __be64 dma0ErrorLog1;             // nDC8
+        __be64 dma1ErrorStatus;           // nE00
+        __be64 dma1FirstErrorStatus;      // nE08
+        __be64 dma1ErrorLog0;             // nE40
+        __be64 dma1ErrorLog1;             // nE48
+        __be64 pestA[OPAL_P7IOC_NUM_PEST_REGS];
+        __be64 pestB[OPAL_P7IOC_NUM_PEST_REGS];
 };
 
 struct OpalIoPhb3ErrorData {
@@ -758,6 +817,8 @@ int64_t opal_pci_eeh_freeze_status(uint64_t phb_id, uint64_t pe_number,
                                    __be64 *phb_status);
 int64_t opal_pci_eeh_freeze_clear(uint64_t phb_id, uint64_t pe_number,
                                   uint64_t eeh_action_token);
+int64_t opal_pci_eeh_freeze_set(uint64_t phb_id, uint64_t pe_number,
+                                uint64_t eeh_action_token);
 int64_t opal_pci_shpc(uint64_t phb_id, uint64_t shpc_action, uint8_t *state);
 
 
@@ -768,7 +829,7 @@ int64_t opal_pci_set_phb_mem_window(uint64_t phb_id, uint16_t window_type,
                                     uint16_t window_num,
                                     uint64_t starting_real_address,
                                     uint64_t starting_pci_address,
-                                    uint16_t segment_size);
+                                    uint64_t size);
 int64_t opal_pci_map_pe_mmio_window(uint64_t phb_id, uint16_t pe_number,
                                     uint16_t window_type, uint16_t window_num,
                                     uint16_t segment_num);
@@ -860,6 +921,9 @@ int64_t opal_get_param(uint64_t token, uint32_t param_id, uint64_t buffer,
 int64_t opal_set_param(uint64_t token, uint32_t param_id, uint64_t buffer,
                 uint64_t length);
 int64_t opal_sensor_read(uint32_t sensor_hndl, int token, __be32 *sensor_data);
+int64_t opal_handle_hmi(void);
+int64_t opal_register_dump_region(uint32_t id, uint64_t start, uint64_t end);
+int64_t opal_unregister_dump_region(uint32_t id);
 
 /* Internal functions */
 extern int early_init_dt_scan_opal(unsigned long node, const char *uname,
@@ -902,6 +966,8 @@ extern void opal_msglog_init(void);
 
 extern int opal_machine_check(struct pt_regs *regs);
 extern bool opal_mce_check_early_recovery(struct pt_regs *regs);
+extern int opal_hmi_exception_early(struct pt_regs *regs);
+extern int opal_handle_hmi_exception(struct pt_regs *regs);
 
 extern void opal_shutdown(void);
 extern int opal_resync_timebase(void);
@@ -912,6 +978,13 @@ struct opal_sg_list *opal_vmalloc_to_sg_list(void *vmalloc_addr,
                                              unsigned long vmalloc_size);
 void opal_free_sg_list(struct opal_sg_list *sg);
 
+/*
+ * Dump region ID range usable by the OS
+ */
+#define OPAL_DUMP_REGION_HOST_START             0x80
+#define OPAL_DUMP_REGION_LOG_BUF                0x80
+#define OPAL_DUMP_REGION_HOST_END               0xFF
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __OPAL_H */
diff --git a/arch/powerpc/include/asm/oprofile_impl.h b/arch/powerpc/include/asm/oprofile_impl.h
index d697b08994c9..61fe5d6f18e1 100644
--- a/arch/powerpc/include/asm/oprofile_impl.h
+++ b/arch/powerpc/include/asm/oprofile_impl.h
@@ -61,7 +61,6 @@ struct op_powerpc_model {
 };
 
 extern struct op_powerpc_model op_model_fsl_emb;
-extern struct op_powerpc_model op_model_rs64;
 extern struct op_powerpc_model op_model_power4;
 extern struct op_powerpc_model op_model_7450;
 extern struct op_powerpc_model op_model_cell;
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index bb0bd25f20d0..a5139ea6910b 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -78,10 +78,6 @@ struct paca_struct {
         u64 kernel_toc;                 /* Kernel TOC address */
         u64 kernelbase;                 /* Base address of kernel */
         u64 kernel_msr;                 /* MSR while running in kernel */
-#ifdef CONFIG_PPC_STD_MMU_64
-        u64 stab_real;                  /* Absolute address of segment table */
-        u64 stab_addr;                  /* Virtual address of segment table */
-#endif /* CONFIG_PPC_STD_MMU_64 */
         void *emergency_sp;             /* pointer to emergency stack */
         u64 data_offset;                /* per cpu data offset */
         s16 hw_cpu_id;                  /* Physical processor number */
@@ -171,6 +167,7 @@ struct paca_struct {
          * and already using emergency stack.
          */
         u16 in_mce;
+        u8 hmi_event_available;          /* HMI event is available */
 #endif
 
         /* Stuff for accurate time accounting */
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
index 32e4e212b9c1..26fe1ae15212 100644
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
@@ -48,9 +48,6 @@ extern unsigned int HPAGE_SHIFT;
 #define HUGE_MAX_HSTATE         (MMU_PAGE_COUNT-1)
 #endif
 
-/* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
-#define __HAVE_ARCH_GATE_AREA           1
-
 /*
  * Subtle: (1 << PAGE_SHIFT) is an int, not an unsigned long. So if we
  * assign PAGE_MASK to a larger type it gets extended the way we want
diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h
index b3e936027b26..814622146d5a 100644
--- a/arch/powerpc/include/asm/perf_event_server.h
+++ b/arch/powerpc/include/asm/perf_event_server.h
@@ -19,6 +19,8 @@
 #define MAX_EVENT_ALTERNATIVES  8
 #define MAX_LIMITED_HWCOUNTERS  2
 
+struct perf_event;
+
 /*
  * This struct provides the constants and functions needed to
  * describe the PMU on a particular POWER-family CPU.
@@ -30,7 +32,8 @@ struct power_pmu {
         unsigned long   add_fields;
         unsigned long   test_adder;
         int             (*compute_mmcr)(u64 events[], int n_ev,
-                                unsigned int hwc[], unsigned long mmcr[]);
+                                unsigned int hwc[], unsigned long mmcr[],
+                                struct perf_event *pevents[]);
         int             (*get_constraint)(u64 event_id, unsigned long *mskp,
                                 unsigned long *valp);
         int             (*get_alternatives)(u64 event_id, unsigned int flags,
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
index eb9261024f51..7b3d54fae46f 100644
--- a/arch/powerpc/include/asm/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64.h
@@ -413,7 +413,7 @@ static inline char *get_hpte_slot_array(pmd_t *pmdp)
 }
 
 extern void hpte_do_hugepage_flush(struct mm_struct *mm, unsigned long addr,
-                                   pmd_t *pmdp);
+                                   pmd_t *pmdp, unsigned long old_pmd);
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 extern pmd_t pfn_pmd(unsigned long pfn, pgprot_t pgprot);
 extern pmd_t mk_pmd(struct page *page, pgprot_t pgprot);
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index 3132bb9365f3..6f8536208049 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -139,6 +139,7 @@
 #define PPC_INST_ISEL                   0x7c00001e
 #define PPC_INST_ISEL_MASK              0xfc00003e
 #define PPC_INST_LDARX                  0x7c0000a8
+#define PPC_INST_LOGMPP                 0x7c0007e4
 #define PPC_INST_LSWI                   0x7c0004aa
 #define PPC_INST_LSWX                   0x7c00042a
 #define PPC_INST_LWARX                  0x7c000028
@@ -150,8 +151,10 @@
 #define PPC_INST_MCRXR_MASK             0xfc0007fe
 #define PPC_INST_MFSPR_PVR              0x7c1f42a6
 #define PPC_INST_MFSPR_PVR_MASK         0xfc1fffff
+#define PPC_INST_MFTMR                  0x7c0002dc
 #define PPC_INST_MSGSND                 0x7c00019c
 #define PPC_INST_MSGSNDP                0x7c00011c
+#define PPC_INST_MTTMR                  0x7c0003dc
 #define PPC_INST_NOP                    0x60000000
 #define PPC_INST_POPCNTB                0x7c0000f4
 #define PPC_INST_POPCNTB_MASK           0xfc0007fe
@@ -275,6 +278,20 @@
 #define __PPC_EH(eh)    0
 #endif
 
+/* POWER8 Micro Partition Prefetch (MPP) parameters */
+/* Address mask is common for LOGMPP instruction and MPPR SPR */
+#define PPC_MPPE_ADDRESS_MASK 0xffffffffc000
+
+/* Bits 60 and 61 of MPP SPR should be set to one of the following */
+/* Aborting the fetch is indeed setting 00 in the table size bits */
+#define PPC_MPPR_FETCH_ABORT (0x0ULL << 60)
+#define PPC_MPPR_FETCH_WHOLE_TABLE (0x2ULL << 60)
+
+/* Bits 54 and 55 of register for LOGMPP instruction should be set to: */
+#define PPC_LOGMPP_LOG_L2 (0x02ULL << 54)
+#define PPC_LOGMPP_LOG_L2L3 (0x01ULL << 54)
+#define PPC_LOGMPP_LOG_ABORT (0x03ULL << 54)
+
 /* Deal with instructions that older assemblers aren't aware of */
 #define PPC_DCBAL(a, b)         stringify_in_c(.long PPC_INST_DCBAL | \
                                         __PPC_RA(a) | __PPC_RB(b))
@@ -283,6 +300,8 @@
 #define PPC_LDARX(t, a, b, eh)  stringify_in_c(.long PPC_INST_LDARX | \
                                         ___PPC_RT(t) | ___PPC_RA(a) | \
                                         ___PPC_RB(b) | __PPC_EH(eh))
+#define PPC_LOGMPP(b)           stringify_in_c(.long PPC_INST_LOGMPP | \
+                                        __PPC_RB(b))
 #define PPC_LWARX(t, a, b, eh)  stringify_in_c(.long PPC_INST_LWARX | \
                                         ___PPC_RT(t) | ___PPC_RA(a) | \
                                         ___PPC_RB(b) | __PPC_EH(eh))
@@ -369,4 +388,11 @@
 #define TABORT(r)               stringify_in_c(.long PPC_INST_TABORT \
                                                | __PPC_RA(r))
 
+/* book3e thread control instructions */
+#define TMRN(x)                 ((((x) & 0x1f) << 16) | (((x) & 0x3e0) << 6))
+#define MTTMR(tmr, r)           stringify_in_c(.long PPC_INST_MTTMR | \
+                                               TMRN(tmr) | ___PPC_RS(r))
+#define MFTMR(tmr, r)           stringify_in_c(.long PPC_INST_MFTMR | \
+                                               TMRN(tmr) | ___PPC_RT(r))
+
 #endif /* _ASM_POWERPC_PPC_OPCODE_H */
diff --git a/arch/powerpc/include/asm/pte-fsl-booke.h b/arch/powerpc/include/asm/pte-fsl-booke.h
index 2c12be5f677a..e84dd7ed505e 100644
--- a/arch/powerpc/include/asm/pte-fsl-booke.h
+++ b/arch/powerpc/include/asm/pte-fsl-booke.h
@@ -37,5 +37,7 @@
 #define _PMD_PRESENT_MASK (PAGE_MASK)
 #define _PMD_BAD        (~PAGE_MASK)
 
+#define PTE_WIMGE_SHIFT (6)
+
 #endif /* __KERNEL__ */
 #endif /*  _ASM_POWERPC_PTE_FSL_BOOKE_H */
diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h b/arch/powerpc/include/asm/pte-hash64-64k.h
index d836d945068d..4f4ec2ab45c9 100644
--- a/arch/powerpc/include/asm/pte-hash64-64k.h
+++ b/arch/powerpc/include/asm/pte-hash64-64k.h
@@ -46,11 +46,31 @@
  * in order to deal with 64K made of 4K HW pages. Thus we override the
  * generic accessors and iterators here
  */
-#define __real_pte(e,p)         ((real_pte_t) { \
-                        (e), (pte_val(e) & _PAGE_COMBO) ? \
-                                (pte_val(*((p) + PTRS_PER_PTE))) : 0 })
-#define __rpte_to_hidx(r,index) ((pte_val((r).pte) & _PAGE_COMBO) ? \
-        (((r).hidx >> ((index)<<2)) & 0xf) : ((pte_val((r).pte) >> 12) & 0xf))
+#define __real_pte __real_pte
+static inline real_pte_t __real_pte(pte_t pte, pte_t *ptep)
+{
+        real_pte_t rpte;
+
+        rpte.pte = pte;
+        rpte.hidx = 0;
+        if (pte_val(pte) & _PAGE_COMBO) {
+                /*
+                 * Make sure we order the hidx load against the _PAGE_COMBO
+                 * check. The store side ordering is done in __hash_page_4K
+                 */
+                smp_rmb();
+                rpte.hidx = pte_val(*((ptep) + PTRS_PER_PTE));
+        }
+        return rpte;
+}
+
+static inline unsigned long __rpte_to_hidx(real_pte_t rpte, unsigned long index)
+{
+        if ((pte_val(rpte.pte) & _PAGE_COMBO))
+                return (rpte.hidx >> (index<<2)) & 0xf;
+        return (pte_val(rpte.pte) >> 12) & 0xf;
+}
+
 #define __rpte_to_pte(r)        ((r).pte)
 #define __rpte_sub_valid(rpte, index) \
         (pte_val(rpte.pte) & (_PAGE_HPTE_SUB0 >> (index)))
@@ -75,7 +95,8 @@
         (((pte) & _PAGE_COMBO)? MMU_PAGE_4K: MMU_PAGE_64K)
 
 #define remap_4k_pfn(vma, addr, pfn, prot)                              \
-        remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE,                \
-                        __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN))
+        (WARN_ON(((pfn) >= (1UL << (64 - PTE_RPN_SHIFT)))) ? -EINVAL :  \
+                remap_pfn_range((vma), (addr), (pfn), PAGE_SIZE,        \
+                        __pgprot(pgprot_val((prot)) | _PAGE_4K_PFN)))
 
 #endif  /* __ASSEMBLY__ */
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index bffd89d27301..0c0505956a29 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -213,9 +213,8 @@
 #define SPRN_ACOP       0x1F    /* Available Coprocessor Register */
 #define SPRN_TFIAR      0x81    /* Transaction Failure Inst Addr   */
 #define SPRN_TEXASR     0x82    /* Transaction EXception & Summary */
-#define   TEXASR_FS     __MASK(63-36)   /* Transaction Failure Summary */
 #define SPRN_TEXASRU    0x83    /* ''      ''      ''    Upper 32  */
-#define   TEXASR_FS     __MASK(63-36) /* TEXASR Failure Summary */
+#define   TEXASR_FS     __MASK(63-36) /* TEXASR Failure Summary */
 #define SPRN_TFHAR      0x80    /* Transaction Failure Handler Addr */
 #define SPRN_CTRLF      0x088
 #define SPRN_CTRLT      0x098
@@ -225,6 +224,7 @@
 #define   CTRL_TE       0x00c00000      /* thread enable */
 #define   CTRL_RUNLATCH 0x1
 #define SPRN_DAWR       0xB4
+#define SPRN_MPPR       0xB8    /* Micro Partition Prefetch Register */
 #define SPRN_RPR        0xBA    /* Relative Priority Register */
 #define SPRN_CIABR      0xBB
 #define   CIABR_PRIV            0x3
@@ -254,7 +254,7 @@
 #define   DSISR_PROTFAULT       0x08000000      /* protection fault */
 #define   DSISR_ISSTORE         0x02000000      /* access was a store */
 #define   DSISR_DABRMATCH       0x00400000      /* hit data breakpoint */
-#define   DSISR_NOSEGMENT       0x00200000      /* STAB/SLB miss */
+#define   DSISR_NOSEGMENT       0x00200000      /* SLB miss */
 #define   DSISR_KEYFAULT        0x00200000      /* Key fault */
 #define SPRN_TBRL       0x10C   /* Time Base Read Lower Register (user, R/O) */
 #define SPRN_TBRU       0x10D   /* Time Base Read Upper Register (user, R/O) */
@@ -944,9 +944,6 @@
  *      readable variant for reads, which can avoid a fault
  *      with KVM type virtualization.
  *
- *      (*) Under KVM, the host SPRG1 is used to point to
- *      the current VCPU data structure
- *
  * 32-bit 8xx:
  *      - SPRG0 scratch for exception vectors
  *      - SPRG1 scratch for exception vectors
@@ -1203,6 +1200,15 @@
                                      : "r" ((unsigned long)(v)) \
                                      : "memory")
 
+static inline unsigned long mfvtb (void)
+{
+#ifdef CONFIG_PPC_BOOK3S_64
+        if (cpu_has_feature(CPU_FTR_ARCH_207S))
+                return mfspr(SPRN_VTB);
+#endif
+        return 0;
+}
+
 #ifdef __powerpc64__
 #if defined(CONFIG_PPC_CELL) || defined(CONFIG_PPC_FSL_BOOK3E)
 #define mftb()          ({unsigned long rval;                           \
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index 464f1089b532..1d653308a33c 100644
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -15,16 +15,28 @@
 #ifndef __ASM_POWERPC_REG_BOOKE_H__
 #define __ASM_POWERPC_REG_BOOKE_H__
 
+#include <asm/ppc-opcode.h>
+
 /* Machine State Register (MSR) Fields */
-#define MSR_GS          (1<<28) /* Guest state */
-#define MSR_UCLE        (1<<26) /* User-mode cache lock enable */
-#define MSR_SPE         (1<<25) /* Enable SPE */
-#define MSR_DWE         (1<<10) /* Debug Wait Enable */
-#define MSR_UBLE        (1<<10) /* BTB lock enable (e500) */
-#define MSR_IS          MSR_IR  /* Instruction Space */
-#define MSR_DS          MSR_DR  /* Data Space */
-#define MSR_PMM         (1<<2)  /* Performance monitor mark bit */
-#define MSR_CM          (1<<31) /* Computation Mode (0=32-bit, 1=64-bit) */
+#define MSR_GS_LG       28      /* Guest state */
+#define MSR_UCLE_LG     26      /* User-mode cache lock enable */
+#define MSR_SPE_LG      25      /* Enable SPE */
+#define MSR_DWE_LG      10      /* Debug Wait Enable */
+#define MSR_UBLE_LG     10      /* BTB lock enable (e500) */
+#define MSR_IS_LG       MSR_IR_LG /* Instruction Space */
+#define MSR_DS_LG       MSR_DR_LG /* Data Space */
+#define MSR_PMM_LG      2       /* Performance monitor mark bit */
+#define MSR_CM_LG       31      /* Computation Mode (0=32-bit, 1=64-bit) */
+
+#define MSR_GS          __MASK(MSR_GS_LG)
+#define MSR_UCLE        __MASK(MSR_UCLE_LG)
+#define MSR_SPE         __MASK(MSR_SPE_LG)
+#define MSR_DWE         __MASK(MSR_DWE_LG)
+#define MSR_UBLE        __MASK(MSR_UBLE_LG)
+#define MSR_IS          __MASK(MSR_IS_LG)
+#define MSR_DS          __MASK(MSR_DS_LG)
+#define MSR_PMM         __MASK(MSR_PMM_LG)
+#define MSR_CM          __MASK(MSR_CM_LG)
 
 #if defined(CONFIG_PPC_BOOK3E_64)
 #define MSR_64BIT       MSR_CM
@@ -260,7 +272,7 @@
 
 /* e500mc */
 #define MCSR_DCPERR_MC  0x20000000UL /* D-Cache Parity Error */
-#define MCSR_L2MMU_MHIT 0x04000000UL /* Hit on multiple TLB entries */
+#define MCSR_L2MMU_MHIT 0x08000000UL /* Hit on multiple TLB entries */
 #define MCSR_NMI        0x00100000UL /* Non-Maskable Interrupt */
 #define MCSR_MAV        0x00080000UL /* MCAR address valid */
 #define MCSR_MEA        0x00040000UL /* MCAR is effective address */
@@ -598,6 +610,13 @@
 /* Bit definitions for L1CSR2. */
 #define L1CSR2_DCWS     0x40000000      /* Data Cache write shadow */
 
+/* Bit definitions for BUCSR. */
+#define BUCSR_STAC_EN   0x01000000      /* Segment Target Address Cache */
+#define BUCSR_LS_EN     0x00400000      /* Link Stack */
+#define BUCSR_BBFI      0x00000200      /* Branch Buffer flash invalidate */
+#define BUCSR_BPEN      0x00000001      /* Branch prediction enable */
+#define BUCSR_INIT      (BUCSR_STAC_EN | BUCSR_LS_EN | BUCSR_BBFI | BUCSR_BPEN)
+
 /* Bit definitions for L2CSR0. */
 #define L2CSR0_L2E      0x80000000      /* L2 Cache Enable */
 #define L2CSR0_L2PE     0x40000000      /* L2 Cache Parity/ECC Enable */
@@ -721,5 +740,23 @@
 #define MMUBE1_VBE4             0x00000002
 #define MMUBE1_VBE5             0x00000001
 
+#define TMRN_IMSR0      0x120   /* Initial MSR Register 0 (e6500) */
+#define TMRN_IMSR1      0x121   /* Initial MSR Register 1 (e6500) */
+#define TMRN_INIA0      0x140   /* Next Instruction Address Register 0 */
+#define TMRN_INIA1      0x141   /* Next Instruction Address Register 1 */
+#define SPRN_TENSR      0x1b5   /* Thread Enable Status Register */
+#define SPRN_TENS       0x1b6   /* Thread Enable Set Register */
+#define SPRN_TENC       0x1b7   /* Thread Enable Clear Register */
+
+#define TEN_THREAD(x)   (1 << (x))
+
+#ifndef __ASSEMBLY__
+#define mftmr(rn)       ({unsigned long rval; \
+                        asm volatile(MFTMR(rn, %0) : "=r" (rval)); rval;})
+#define mttmr(rn, v)    asm volatile(MTTMR(rn, %0) : \
+                                     : "r" ((unsigned long)(v)) \
+                                     : "memory")
+#endif /* !__ASSEMBLY__ */
+
 #endif /* __ASM_POWERPC_REG_BOOKE_H__ */
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/scatterlist.h b/arch/powerpc/include/asm/scatterlist.h
deleted file mode 100644
index de1f620bd5c9..000000000000
--- a/arch/powerpc/include/asm/scatterlist.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _ASM_POWERPC_SCATTERLIST_H
-#define _ASM_POWERPC_SCATTERLIST_H
-/*
- * Copyright (C) 2001 PPC64 Team, 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 <asm/dma.h>
-#include <asm-generic/scatterlist.h>
-
-#define ARCH_HAS_SG_CHAIN
-
-#endif /* _ASM_POWERPC_SCATTERLIST_H */
diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
index 35aa339410bd..4dbe072eecbe 100644
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
@@ -61,6 +61,7 @@ static __always_inline int arch_spin_value_unlocked(arch_spinlock_t lock)
 
 static inline int arch_spin_is_locked(arch_spinlock_t *lock)
 {
+        smp_mb();
         return !arch_spin_value_unlocked(*lock);
 }
 
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
index babbeca6850f..542bc0f0673f 100644
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@ -77,10 +77,10 @@ SYSCALL_SPU(setreuid)
 SYSCALL_SPU(setregid)
 #define compat_sys_sigsuspend sys_sigsuspend
 SYS32ONLY(sigsuspend)
-COMPAT_SYS(sigpending)
+SYSX(sys_ni_syscall,compat_sys_sigpending,sys_sigpending)
 SYSCALL_SPU(sethostname)
 COMPAT_SYS_SPU(setrlimit)
-COMPAT_SYS(old_getrlimit)
+SYSX(sys_ni_syscall,compat_sys_old_getrlimit,sys_old_getrlimit)
 COMPAT_SYS_SPU(getrusage)
 COMPAT_SYS_SPU(gettimeofday)
 COMPAT_SYS_SPU(settimeofday)
diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h
index 1d428e6007ca..03cbada59d3a 100644
--- a/arch/powerpc/include/asm/time.h
+++ b/arch/powerpc/include/asm/time.h
@@ -102,6 +102,15 @@ static inline u64 get_rtc(void)
         return (u64)hi * 1000000000 + lo;
 }
 
+static inline u64 get_vtb(void)
+{
+#ifdef CONFIG_PPC_BOOK3S_64
+        if (cpu_has_feature(CPU_FTR_ARCH_207S))
+                return mfvtb();
+#endif
+        return 0;
+}
+
 #ifdef CONFIG_PPC64
 static inline u64 get_tb(void)
 {
diff --git a/arch/powerpc/include/asm/trace.h b/arch/powerpc/include/asm/trace.h
index 5712f06905a9..c15da6073cb8 100644
--- a/arch/powerpc/include/asm/trace.h
+++ b/arch/powerpc/include/asm/trace.h
@@ -99,6 +99,51 @@ TRACE_EVENT_FN(hcall_exit,
 );
 #endif
 
+#ifdef CONFIG_PPC_POWERNV
+extern void opal_tracepoint_regfunc(void);
+extern void opal_tracepoint_unregfunc(void);
+
+TRACE_EVENT_FN(opal_entry,
+
+        TP_PROTO(unsigned long opcode, unsigned long *args),
+
+        TP_ARGS(opcode, args),
+
+        TP_STRUCT__entry(
+                __field(unsigned long, opcode)
+        ),
+
+        TP_fast_assign(
+                __entry->opcode = opcode;
+        ),
+
+        TP_printk("opcode=%lu", __entry->opcode),
+
+        opal_tracepoint_regfunc, opal_tracepoint_unregfunc
+);
+
+TRACE_EVENT_FN(opal_exit,
+
+        TP_PROTO(unsigned long opcode, unsigned long retval),
+
+        TP_ARGS(opcode, retval),
+
+        TP_STRUCT__entry(
+                __field(unsigned long, opcode)
+                __field(unsigned long, retval)
+        ),
+
+        TP_fast_assign(
+                __entry->opcode = opcode;
+                __entry->retval = retval;
+        ),
+
+        TP_printk("opcode=%lu retval=%lu", __entry->opcode, __entry->retval),
+
+        opal_tracepoint_regfunc, opal_tracepoint_unregfunc
+);
+#endif
+
 #endif /* _TRACE_POWERPC_H */
 
 #undef TRACE_INCLUDE_PATH
diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h
index 2bc4a9409a93..e0e49dbb145d 100644
--- a/arch/powerpc/include/uapi/asm/kvm.h
+++ b/arch/powerpc/include/uapi/asm/kvm.h
@@ -548,6 +548,7 @@ struct kvm_get_htab_header {
 
 #define KVM_REG_PPC_VRSAVE      (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0xb4)
 #define KVM_REG_PPC_LPCR        (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0xb5)
+#define KVM_REG_PPC_LPCR_64     (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xb5)
 #define KVM_REG_PPC_PPR         (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xb6)
 
 /* Architecture compatibility level */
@@ -555,6 +556,7 @@ struct kvm_get_htab_header {
 
 #define KVM_REG_PPC_DABRX       (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0xb8)
 #define KVM_REG_PPC_WORT        (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xb9)
+#define KVM_REG_PPC_SPRG9       (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xba)
 
 /* Transactional Memory checkpointed state:
  * This is all GPRs, all VSX regs and a subset of SPRs
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index f5995a912213..9d7dede2847c 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -216,8 +216,6 @@ int main(void)
 #endif /* CONFIG_PPC_BOOK3E */
 
 #ifdef CONFIG_PPC_STD_MMU_64
-        DEFINE(PACASTABREAL, offsetof(struct paca_struct, stab_real));
-        DEFINE(PACASTABVIRT, offsetof(struct paca_struct, stab_addr));
         DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
         DEFINE(PACASLBCACHEPTR, offsetof(struct paca_struct, slb_cache_ptr));
         DEFINE(PACAVMALLOCSLLP, offsetof(struct paca_struct, vmalloc_sllp));
@@ -493,6 +491,7 @@ int main(void)
         DEFINE(KVM_HOST_SDR1, offsetof(struct kvm, arch.host_sdr1));
         DEFINE(KVM_TLBIE_LOCK, offsetof(struct kvm, arch.tlbie_lock));
         DEFINE(KVM_NEED_FLUSH, offsetof(struct kvm, arch.need_tlb_flush.bits));
+        DEFINE(KVM_ENABLED_HCALLS, offsetof(struct kvm, arch.enabled_hcalls));
         DEFINE(KVM_LPCR, offsetof(struct kvm, arch.lpcr));
         DEFINE(KVM_RMOR, offsetof(struct kvm, arch.rmor));
         DEFINE(KVM_VRMA_SLB_V, offsetof(struct kvm, arch.vrma_slb_v));
@@ -667,6 +666,7 @@ int main(void)
         DEFINE(VCPU_LR, offsetof(struct kvm_vcpu, arch.lr));
         DEFINE(VCPU_CTR, offsetof(struct kvm_vcpu, arch.ctr));
         DEFINE(VCPU_PC, offsetof(struct kvm_vcpu, arch.pc));
+        DEFINE(VCPU_SPRG9, offsetof(struct kvm_vcpu, arch.sprg9));
         DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst));
         DEFINE(VCPU_FAULT_DEAR, offsetof(struct kvm_vcpu, arch.fault_dear));
         DEFINE(VCPU_FAULT_ESR, offsetof(struct kvm_vcpu, arch.fault_esr));
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 0c157642c2a1..9b6dcaaec1a3 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -123,96 +123,6 @@ extern void __restore_cpu_e6500(void);
 
 static struct cpu_spec __initdata cpu_specs[] = {
 #ifdef CONFIG_PPC_BOOK3S_64
-        {       /* Power3 */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00400000,
-                .cpu_name               = "POWER3 (630)",
-                .cpu_features           = CPU_FTRS_POWER3,
-                .cpu_user_features      = COMMON_USER_PPC64|PPC_FEATURE_PPC_LE,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/power3",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "power3",
-        },
-        {       /* Power3+ */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00410000,
-                .cpu_name               = "POWER3 (630+)",
-                .cpu_features           = CPU_FTRS_POWER3,
-                .cpu_user_features      = COMMON_USER_PPC64|PPC_FEATURE_PPC_LE,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/power3",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "power3",
-        },
-        {       /* Northstar */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00330000,
-                .cpu_name               = "RS64-II (northstar)",
-                .cpu_features           = CPU_FTRS_RS64,
-                .cpu_user_features      = COMMON_USER_PPC64,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "rs64",
-        },
-        {       /* Pulsar */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00340000,
-                .cpu_name               = "RS64-III (pulsar)",
-                .cpu_features           = CPU_FTRS_RS64,
-                .cpu_user_features      = COMMON_USER_PPC64,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "rs64",
-        },
-        {       /* I-star */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00360000,
-                .cpu_name               = "RS64-III (icestar)",
-                .cpu_features           = CPU_FTRS_RS64,
-                .cpu_user_features      = COMMON_USER_PPC64,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "rs64",
-        },
-        {       /* S-star */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x00370000,
-                .cpu_name               = "RS64-IV (sstar)",
-                .cpu_features           = CPU_FTRS_RS64,
-                .cpu_user_features      = COMMON_USER_PPC64,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 8,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/rs64",
-                .oprofile_type          = PPC_OPROFILE_RS64,
-                .platform               = "rs64",
-        },
         {       /* Power4 */
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x00350000,
@@ -617,7 +527,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
 #endif  /* CONFIG_PPC_BOOK3S_64 */
 
 #ifdef CONFIG_PPC32
-#if CLASSIC_PPC
+#ifdef CONFIG_PPC_BOOK3S_32
         {       /* 601 */
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x00010000,
@@ -1257,7 +1167,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc603",
         },
-#endif /* CLASSIC_PPC */
+#endif /* CONFIG_PPC_BOOK3S_32 */
 #ifdef CONFIG_8xx
         {       /* 8xx */
                 .pvr_mask               = 0xffff0000,
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 86e25702aaca..59a64f8dc85f 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -27,6 +27,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/pci.h>
+#include <linux/iommu.h>
 #include <linux/proc_fs.h>
 #include <linux/rbtree.h>
 #include <linux/reboot.h>
@@ -40,6 +41,7 @@
 #include <asm/eeh.h>
 #include <asm/eeh_event.h>
 #include <asm/io.h>
+#include <asm/iommu.h>
 #include <asm/machdep.h>
 #include <asm/ppc-pci.h>
 #include <asm/rtas.h>
@@ -108,6 +110,9 @@ struct eeh_ops *eeh_ops = NULL;
 /* Lock to avoid races due to multiple reports of an error */
 DEFINE_RAW_SPINLOCK(confirm_error_lock);
 
+/* Lock to protect passed flags */
+static DEFINE_MUTEX(eeh_dev_mutex);
+
 /* Buffer for reporting pci register dumps. Its here in BSS, and
  * not dynamically alloced, so that it ends up in RMO where RTAS
  * can access it.
@@ -137,7 +142,7 @@ static struct eeh_stats eeh_stats;
 static int __init eeh_setup(char *str)
 {
         if (!strcmp(str, "off"))
-                eeh_subsystem_flags |= EEH_FORCE_DISABLED;
+                eeh_add_flag(EEH_FORCE_DISABLED);
 
         return 1;
 }
@@ -152,12 +157,13 @@ __setup("eeh=", eeh_setup);
  * This routine captures assorted PCI configuration space data,
  * and puts them into a buffer for RTAS error logging.
  */
-static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len)
+static size_t eeh_gather_pci_data(struct eeh_dev *edev, char *buf, size_t len)
 {
         struct device_node *dn = eeh_dev_to_of_node(edev);
         u32 cfg;
         int cap, i;
-        int n = 0;
+        int n = 0, l = 0;
+        char buffer[128];
 
         n += scnprintf(buf+n, len-n, "%s\n", dn->full_name);
         pr_warn("EEH: of node=%s\n", dn->full_name);
@@ -202,8 +208,22 @@ static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len)
                 for (i=0; i<=8; i++) {
                         eeh_ops->read_config(dn, cap+4*i, 4, &cfg);
                         n += scnprintf(buf+n, len-n, "%02x:%x\n", 4*i, cfg);
-                        pr_warn("EEH: PCI-E %02x: %08x\n", i, cfg);
+
+                        if ((i % 4) == 0) {
+                                if (i != 0)
+                                        pr_warn("%s\n", buffer);
+
+                                l = scnprintf(buffer, sizeof(buffer),
+                                              "EEH: PCI-E %02x: %08x ",
+                                              4*i, cfg);
+                        } else {
+                                l += scnprintf(buffer+l, sizeof(buffer)-l,
+                                               "%08x ", cfg);
+                        }
+
                 }
+
+                pr_warn("%s\n", buffer);
         }
 
         /* If AER capable, dump it */
@@ -212,11 +232,24 @@ static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len)
                 n += scnprintf(buf+n, len-n, "pci-e AER:\n");
                 pr_warn("EEH: PCI-E AER capability register set follows:\n");
 
-                for (i=0; i<14; i++) {
+                for (i=0; i<=13; i++) {
                         eeh_ops->read_config(dn, cap+4*i, 4, &cfg);
                         n += scnprintf(buf+n, len-n, "%02x:%x\n", 4*i, cfg);
-                        pr_warn("EEH: PCI-E AER %02x: %08x\n", i, cfg);
+
+                        if ((i % 4) == 0) {
+                                if (i != 0)
+                                        pr_warn("%s\n", buffer);
+
+                                l = scnprintf(buffer, sizeof(buffer),
+                                              "EEH: PCI-E AER %02x: %08x ",
+                                              4*i, cfg);
+                        } else {
+                                l += scnprintf(buffer+l, sizeof(buffer)-l,
+                                               "%08x ", cfg);
+                        }
                 }
+
+                pr_warn("%s\n", buffer);
         }
 
         return n;
@@ -247,7 +280,7 @@ void eeh_slot_error_detail(struct eeh_pe *pe, int severity)
          * 0xFF's is always returned from PCI config space.
          */
         if (!(pe->type & EEH_PE_PHB)) {
-                if (eeh_probe_mode_devtree())
+                if (eeh_has_flag(EEH_ENABLE_IO_FOR_LOG))
                         eeh_pci_enable(pe, EEH_OPT_THAW_MMIO);
                 eeh_ops->configure_bridge(pe);
                 eeh_pe_restore_bars(pe);
@@ -298,14 +331,14 @@ static int eeh_phb_check_failure(struct eeh_pe *pe)
         unsigned long flags;
         int ret;
 
-        if (!eeh_probe_mode_dev())
+        if (!eeh_has_flag(EEH_PROBE_MODE_DEV))
                 return -EPERM;
 
         /* Find the PHB PE */
         phb_pe = eeh_phb_pe_get(pe->phb);
         if (!phb_pe) {
-                pr_warning("%s Can't find PE for PHB#%d\n",
-                           __func__, pe->phb->global_number);
+                pr_warn("%s Can't find PE for PHB#%d\n",
+                        __func__, pe->phb->global_number);
                 return -EEXIST;
         }
 
@@ -400,6 +433,14 @@ int eeh_dev_check_failure(struct eeh_dev *edev)
         if (ret > 0)
                 return ret;
 
+        /*
+         * If the PE isn't owned by us, we shouldn't check the
+         * state. Instead, let the owner handle it if the PE has
+         * been frozen.
+         */
+        if (eeh_pe_passed(pe))
+                return 0;
+
         /* If we already have a pending isolation event for this
          * slot, we know it's bad already, we don't need to check.
          * Do this checking under a lock; as multiple PCI devices
@@ -746,13 +787,13 @@ void eeh_save_bars(struct eeh_dev *edev)
 int __init eeh_ops_register(struct eeh_ops *ops)
 {
         if (!ops->name) {
-                pr_warning("%s: Invalid EEH ops name for %p\n",
+                pr_warn("%s: Invalid EEH ops name for %p\n",
                         __func__, ops);
                 return -EINVAL;
         }
 
         if (eeh_ops && eeh_ops != ops) {
-                pr_warning("%s: EEH ops of platform %s already existing (%s)\n",
+                pr_warn("%s: EEH ops of platform %s already existing (%s)\n",
                         __func__, eeh_ops->name, ops->name);
                 return -EEXIST;
         }
@@ -772,7 +813,7 @@ int __init eeh_ops_register(struct eeh_ops *ops)
 int __exit eeh_ops_unregister(const char *name)
 {
         if (!name || !strlen(name)) {
-                pr_warning("%s: Invalid EEH ops name\n",
+                pr_warn("%s: Invalid EEH ops name\n",
                         __func__);
                 return -EINVAL;
         }
@@ -788,7 +829,7 @@ int __exit eeh_ops_unregister(const char *name)
 static int eeh_reboot_notifier(struct notifier_block *nb,
                                unsigned long action, void *unused)
 {
-        eeh_set_enable(false);
+        eeh_clear_flag(EEH_ENABLED);
         return NOTIFY_DONE;
 }
 
@@ -837,11 +878,11 @@ int eeh_init(void)
 
         /* call platform initialization function */
         if (!eeh_ops) {
-                pr_warning("%s: Platform EEH operation not found\n",
+                pr_warn("%s: Platform EEH operation not found\n",
                         __func__);
                 return -EEXIST;
         } else if ((ret = eeh_ops->init())) {
-                pr_warning("%s: Failed to call platform init function (%d)\n",
+                pr_warn("%s: Failed to call platform init function (%d)\n",
                         __func__, ret);
                 return ret;
         }
@@ -852,13 +893,13 @@ int eeh_init(void)
                 return ret;
 
         /* Enable EEH for all adapters */
-        if (eeh_probe_mode_devtree()) {
+        if (eeh_has_flag(EEH_PROBE_MODE_DEVTREE)) {
                 list_for_each_entry_safe(hose, tmp,
                         &hose_list, list_node) {
                         phb = hose->dn;
                         traverse_pci_devices(phb, eeh_ops->of_probe, NULL);
                 }
-        } else if (eeh_probe_mode_dev()) {
+        } else if (eeh_has_flag(EEH_PROBE_MODE_DEV)) {
                 list_for_each_entry_safe(hose, tmp,
                         &hose_list, list_node)
                         pci_walk_bus(hose->bus, eeh_ops->dev_probe, NULL);
@@ -882,7 +923,7 @@ int eeh_init(void)
         if (eeh_enabled())
                 pr_info("EEH: PCI Enhanced I/O Error Handling Enabled\n");
         else
-                pr_warning("EEH: No capable adapters found\n");
+                pr_warn("EEH: No capable adapters found\n");
 
         return ret;
 }
@@ -910,7 +951,7 @@ void eeh_add_device_early(struct device_node *dn)
          * would delay the probe until late stage because
          * the PCI device isn't available this moment.
          */
-        if (!eeh_probe_mode_devtree())
+        if (!eeh_has_flag(EEH_PROBE_MODE_DEVTREE))
                 return;
 
         if (!of_node_to_eeh_dev(dn))
@@ -996,7 +1037,7 @@ void eeh_add_device_late(struct pci_dev *dev)
          * We have to do the EEH probe here because the PCI device
          * hasn't been created yet in the early stage.
          */
-        if (eeh_probe_mode_dev())
+        if (eeh_has_flag(EEH_PROBE_MODE_DEV))
                 eeh_ops->dev_probe(dev, NULL);
 
         eeh_addr_cache_insert_dev(dev);
@@ -1100,6 +1141,285 @@ void eeh_remove_device(struct pci_dev *dev)
         edev->mode &= ~EEH_DEV_SYSFS;
 }
 
+/**
+ * eeh_dev_open - Increase count of pass through devices for PE
+ * @pdev: PCI device
+ *
+ * Increase count of passed through devices for the indicated
+ * PE. In the result, the EEH errors detected on the PE won't be
+ * reported. The PE owner will be responsible for detection
+ * and recovery.
+ */
+int eeh_dev_open(struct pci_dev *pdev)
+{
+        struct eeh_dev *edev;
+
+        mutex_lock(&eeh_dev_mutex);
+
+        /* No PCI device ? */
+        if (!pdev)
+                goto out;
+
+        /* No EEH device or PE ? */
+        edev = pci_dev_to_eeh_dev(pdev);
+        if (!edev || !edev->pe)
+                goto out;
+
+        /* Increase PE's pass through count */
+        atomic_inc(&edev->pe->pass_dev_cnt);
+        mutex_unlock(&eeh_dev_mutex);
+
+        return 0;
+out:
+        mutex_unlock(&eeh_dev_mutex);
+        return -ENODEV;
+}
+EXPORT_SYMBOL_GPL(eeh_dev_open);
+
+/**
+ * eeh_dev_release - Decrease count of pass through devices for PE
+ * @pdev: PCI device
+ *
+ * Decrease count of pass through devices for the indicated PE. If
+ * there is no passed through device in PE, the EEH errors detected
+ * on the PE will be reported and handled as usual.
+ */
+void eeh_dev_release(struct pci_dev *pdev)
+{
+        struct eeh_dev *edev;
+
+        mutex_lock(&eeh_dev_mutex);
+
+        /* No PCI device ? */
+        if (!pdev)
+                goto out;
+
+        /* No EEH device ? */
+        edev = pci_dev_to_eeh_dev(pdev);
+        if (!edev || !edev->pe || !eeh_pe_passed(edev->pe))
+                goto out;
+
+        /* Decrease PE's pass through count */
+        atomic_dec(&edev->pe->pass_dev_cnt);
+        WARN_ON(atomic_read(&edev->pe->pass_dev_cnt) < 0);
+out:
+        mutex_unlock(&eeh_dev_mutex);
+}
+EXPORT_SYMBOL(eeh_dev_release);
+
+#ifdef CONFIG_IOMMU_API
+
+static int dev_has_iommu_table(struct device *dev, void *data)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct pci_dev **ppdev = data;
+        struct iommu_table *tbl;
+
+        if (!dev)
+                return 0;
+
+        tbl = get_iommu_table_base(dev);
+        if (tbl && tbl->it_group) {
+                *ppdev = pdev;
+                return 1;
+        }
+
+        return 0;
+}
+
+/**
+ * eeh_iommu_group_to_pe - Convert IOMMU group to EEH PE
+ * @group: IOMMU group
+ *
+ * The routine is called to convert IOMMU group to EEH PE.
+ */
+struct eeh_pe *eeh_iommu_group_to_pe(struct iommu_group *group)
+{
+        struct pci_dev *pdev = NULL;
+        struct eeh_dev *edev;
+        int ret;
+
+        /* No IOMMU group ? */
+        if (!group)
+                return NULL;
+
+        ret = iommu_group_for_each_dev(group, &pdev, dev_has_iommu_table);
+        if (!ret || !pdev)
+                return NULL;
+
+        /* No EEH device or PE ? */
+        edev = pci_dev_to_eeh_dev(pdev);
+        if (!edev || !edev->pe)
+                return NULL;
+
+        return edev->pe;
+}
+EXPORT_SYMBOL_GPL(eeh_iommu_group_to_pe);
+
+#endif /* CONFIG_IOMMU_API */
+
+/**
+ * eeh_pe_set_option - Set options for the indicated PE
+ * @pe: EEH PE
+ * @option: requested option
+ *
+ * The routine is called to enable or disable EEH functionality
+ * on the indicated PE, to enable IO or DMA for the frozen PE.
+ */
+int eeh_pe_set_option(struct eeh_pe *pe, int option)
+{
+        int ret = 0;
+
+        /* Invalid PE ? */
+        if (!pe)
+                return -ENODEV;
+
+        /*
+         * EEH functionality could possibly be disabled, just
+         * return error for the case. And the EEH functinality
+         * isn't expected to be disabled on one specific PE.
+         */
+        switch (option) {
+        case EEH_OPT_ENABLE:
+                if (eeh_enabled())
+                        break;
+                ret = -EIO;
+                break;
+        case EEH_OPT_DISABLE:
+                break;
+        case EEH_OPT_THAW_MMIO:
+        case EEH_OPT_THAW_DMA:
+                if (!eeh_ops || !eeh_ops->set_option) {
+                        ret = -ENOENT;
+                        break;
+                }
+
+                ret = eeh_ops->set_option(pe, option);
+                break;
+        default:
+                pr_debug("%s: Option %d out of range (%d, %d)\n",
+                        __func__, option, EEH_OPT_DISABLE, EEH_OPT_THAW_DMA);
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(eeh_pe_set_option);
+
+/**
+ * eeh_pe_get_state - Retrieve PE's state
+ * @pe: EEH PE
+ *
+ * Retrieve the PE's state, which includes 3 aspects: enabled
+ * DMA, enabled IO and asserted reset.
+ */
+int eeh_pe_get_state(struct eeh_pe *pe)
+{
+        int result, ret = 0;
+        bool rst_active, dma_en, mmio_en;
+
+        /* Existing PE ? */
+        if (!pe)
+                return -ENODEV;
+
+        if (!eeh_ops || !eeh_ops->get_state)
+                return -ENOENT;
+
+        result = eeh_ops->get_state(pe, NULL);
+        rst_active = !!(result & EEH_STATE_RESET_ACTIVE);
+        dma_en = !!(result & EEH_STATE_DMA_ENABLED);
+        mmio_en = !!(result & EEH_STATE_MMIO_ENABLED);
+
+        if (rst_active)
+                ret = EEH_PE_STATE_RESET;
+        else if (dma_en && mmio_en)
+                ret = EEH_PE_STATE_NORMAL;
+        else if (!dma_en && !mmio_en)
+                ret = EEH_PE_STATE_STOPPED_IO_DMA;
+        else if (!dma_en && mmio_en)
+                ret = EEH_PE_STATE_STOPPED_DMA;
+        else
+                ret = EEH_PE_STATE_UNAVAIL;
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(eeh_pe_get_state);
+
+/**
+ * eeh_pe_reset - Issue PE reset according to specified type
+ * @pe: EEH PE
+ * @option: reset type
+ *
+ * The routine is called to reset the specified PE with the
+ * indicated type, either fundamental reset or hot reset.
+ * PE reset is the most important part for error recovery.
+ */
+int eeh_pe_reset(struct eeh_pe *pe, int option)
+{
+        int ret = 0;
+
+        /* Invalid PE ? */
+        if (!pe)
+                return -ENODEV;
+
+        if (!eeh_ops || !eeh_ops->set_option || !eeh_ops->reset)
+                return -ENOENT;
+
+        switch (option) {
+        case EEH_RESET_DEACTIVATE:
+                ret = eeh_ops->reset(pe, option);
+                if (ret)
+                        break;
+
+                /*
+                 * The PE is still in frozen state and we need to clear
+                 * that. It's good to clear frozen state after deassert
+                 * to avoid messy IO access during reset, which might
+                 * cause recursive frozen PE.
+                 */
+                ret = eeh_ops->set_option(pe, EEH_OPT_THAW_MMIO);
+                if (!ret)
+                        ret = eeh_ops->set_option(pe, EEH_OPT_THAW_DMA);
+                if (!ret)
+                        eeh_pe_state_clear(pe, EEH_PE_ISOLATED);
+                break;
+        case EEH_RESET_HOT:
+        case EEH_RESET_FUNDAMENTAL:
+                ret = eeh_ops->reset(pe, option);
+                break;
+        default:
+                pr_debug("%s: Unsupported option %d\n",
+                        __func__, option);
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(eeh_pe_reset);
+
+/**
+ * eeh_pe_configure - Configure PCI bridges after PE reset
+ * @pe: EEH PE
+ *
+ * The routine is called to restore the PCI config space for
+ * those PCI devices, especially PCI bridges affected by PE
+ * reset issued previously.
+ */
+int eeh_pe_configure(struct eeh_pe *pe)
+{
+        int ret = 0;
+
+        /* Invalid PE ? */
+        if (!pe)
+                return -ENODEV;
+
+        /* Restore config space for the affected devices */
+        eeh_pe_restore_bars(pe);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(eeh_pe_configure);
+
 static int proc_eeh_show(struct seq_file *m, void *v)
 {
         if (!eeh_enabled()) {
@@ -1143,9 +1463,9 @@ static const struct file_operations proc_eeh_operations = {
 static int eeh_enable_dbgfs_set(void *data, u64 val)
 {
         if (val)
-                eeh_subsystem_flags &= ~EEH_FORCE_DISABLED;
+                eeh_clear_flag(EEH_FORCE_DISABLED);
         else
-                eeh_subsystem_flags |= EEH_FORCE_DISABLED;
+                eeh_add_flag(EEH_FORCE_DISABLED);
 
         /* Notify the backend */
         if (eeh_ops->post_init)
diff --git a/arch/powerpc/kernel/eeh_cache.c b/arch/powerpc/kernel/eeh_cache.c
index e8c9fd546a5c..07d8a2423a61 100644
--- a/arch/powerpc/kernel/eeh_cache.c
+++ b/arch/powerpc/kernel/eeh_cache.c
@@ -143,7 +143,7 @@ eeh_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
                 } else {
                         if (dev != piar->pcidev ||
                             alo != piar->addr_lo || ahi != piar->addr_hi) {
-                                pr_warning("PIAR: overlapping address range\n");
+                                pr_warn("PIAR: overlapping address range\n");
                         }
                         return piar;
                 }
@@ -177,19 +177,20 @@ static void __eeh_addr_cache_insert_dev(struct pci_dev *dev)
 
         dn = pci_device_to_OF_node(dev);
         if (!dn) {
-                pr_warning("PCI: no pci dn found for dev=%s\n", pci_name(dev));
+                pr_warn("PCI: no pci dn found for dev=%s\n",
+                        pci_name(dev));
                 return;
         }
 
         edev = of_node_to_eeh_dev(dn);
         if (!edev) {
-                pr_warning("PCI: no EEH dev found for dn=%s\n",
+                pr_warn("PCI: no EEH dev found for dn=%s\n",
                         dn->full_name);
                 return;
         }
 
         /* Skip any devices for which EEH is not enabled. */
-        if (!eeh_probe_mode_dev() && !edev->pe) {
+        if (!edev->pe) {
 #ifdef DEBUG
                 pr_info("PCI: skip building address cache for=%s - %s\n",
                         pci_name(dev), dn->full_name);
diff --git a/arch/powerpc/kernel/eeh_dev.c b/arch/powerpc/kernel/eeh_dev.c
index 1efa28f5fc54..e5274ee9a75f 100644
--- a/arch/powerpc/kernel/eeh_dev.c
+++ b/arch/powerpc/kernel/eeh_dev.c
@@ -57,7 +57,8 @@ void *eeh_dev_init(struct device_node *dn, void *data)
         /* Allocate EEH device */
         edev = kzalloc(sizeof(*edev), GFP_KERNEL);
         if (!edev) {
-                pr_warning("%s: out of memory\n", __func__);
+                pr_warn("%s: out of memory\n",
+                        __func__);
                 return NULL;
         }
 
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 420da61d4ce0..6a0dcee8e931 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -599,7 +599,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
         pe->freeze_count++;
         if (pe->freeze_count > EEH_MAX_ALLOWED_FREEZES)
                 goto excess_failures;
-        pr_warning("EEH: This PCI device has failed %d times in the last hour\n",
+        pr_warn("EEH: This PCI device has failed %d times in the last hour\n",
                 pe->freeze_count);
 
         /* Walk the various device drivers attached to this slot through
@@ -616,7 +616,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
          */
         rc = eeh_ops->wait_state(pe, MAX_WAIT_FOR_RECOVERY*1000);
         if (rc < 0 || rc == EEH_STATE_NOT_SUPPORT) {
-                pr_warning("EEH: Permanent failure\n");
+                pr_warn("EEH: Permanent failure\n");
                 goto hard_fail;
         }
 
@@ -635,8 +635,8 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
                 pr_info("EEH: Reset with hotplug activity\n");
                 rc = eeh_reset_device(pe, frozen_bus);
                 if (rc) {
-                        pr_warning("%s: Unable to reset, err=%d\n",
-                                   __func__, rc);
+                        pr_warn("%s: Unable to reset, err=%d\n",
+                                __func__, rc);
                         goto hard_fail;
                 }
         }
@@ -678,7 +678,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
 
         /* If any device has a hard failure, then shut off everything. */
         if (result == PCI_ERS_RESULT_DISCONNECT) {
-                pr_warning("EEH: Device driver gave up\n");
+                pr_warn("EEH: Device driver gave up\n");
                 goto hard_fail;
         }
 
@@ -687,8 +687,8 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
                 pr_info("EEH: Reset without hotplug activity\n");
                 rc = eeh_reset_device(pe, NULL);
                 if (rc) {
-                        pr_warning("%s: Cannot reset, err=%d\n",
-                                   __func__, rc);
+                        pr_warn("%s: Cannot reset, err=%d\n",
+                                __func__, rc);
                         goto hard_fail;
                 }
 
@@ -701,7 +701,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe)
         /* All devices should claim they have recovered by now. */
         if ((result != PCI_ERS_RESULT_RECOVERED) &&
             (result != PCI_ERS_RESULT_NONE)) {
-                pr_warning("EEH: Not recovered\n");
+                pr_warn("EEH: Not recovered\n");
                 goto hard_fail;
         }
 
diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c
index fbd01eba4473..00e3844525a6 100644
--- a/arch/powerpc/kernel/eeh_pe.c
+++ b/arch/powerpc/kernel/eeh_pe.c
@@ -32,9 +32,24 @@
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
 
+static int eeh_pe_aux_size = 0;
 static LIST_HEAD(eeh_phb_pe);
 
 /**
+ * eeh_set_pe_aux_size - Set PE auxillary data size
+ * @size: PE auxillary data size
+ *
+ * Set PE auxillary data size
+ */
+void eeh_set_pe_aux_size(int size)
+{
+        if (size < 0)
+                return;
+
+        eeh_pe_aux_size = size;
+}
+
+/**
  * eeh_pe_alloc - Allocate PE
  * @phb: PCI controller
  * @type: PE type
@@ -44,9 +59,16 @@ static LIST_HEAD(eeh_phb_pe);
 static struct eeh_pe *eeh_pe_alloc(struct pci_controller *phb, int type)
 {
         struct eeh_pe *pe;
+        size_t alloc_size;
+
+        alloc_size = sizeof(struct eeh_pe);
+        if (eeh_pe_aux_size) {
+                alloc_size = ALIGN(alloc_size, cache_line_size());
+                alloc_size += eeh_pe_aux_size;
+        }
 
         /* Allocate PHB PE */
-        pe = kzalloc(sizeof(struct eeh_pe), GFP_KERNEL);
+        pe = kzalloc(alloc_size, GFP_KERNEL);
         if (!pe) return NULL;
 
         /* Initialize PHB PE */
@@ -56,6 +78,8 @@ static struct eeh_pe *eeh_pe_alloc(struct pci_controller *phb, int type)
         INIT_LIST_HEAD(&pe->child);
         INIT_LIST_HEAD(&pe->edevs);
 
+        pe->data = (void *)pe + ALIGN(sizeof(struct eeh_pe),
+                                      cache_line_size());
         return pe;
 }
 
@@ -179,7 +203,8 @@ void *eeh_pe_dev_traverse(struct eeh_pe *root,
         void *ret;
 
         if (!root) {
-                pr_warning("%s: Invalid PE %p\n", __func__, root);
+                pr_warn("%s: Invalid PE %p\n",
+                        __func__, root);
                 return NULL;
         }
 
@@ -351,17 +376,6 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)
         pe->config_addr = edev->config_addr;
 
         /*
-         * While doing PE reset, we probably hot-reset the
-         * upstream bridge. However, the PCI devices including
-         * the associated EEH devices might be removed when EEH
-         * core is doing recovery. So that won't safe to retrieve
-         * the bridge through downstream EEH device. We have to
-         * trace the parent PCI bus, then the upstream bridge.
-         */
-        if (eeh_probe_mode_dev())
-                pe->bus = eeh_dev_to_pci_dev(edev)->bus;
-
-        /*
          * Put the new EEH PE into hierarchy tree. If the parent
          * can't be found, the newly created PE will be attached
          * to PHB directly. Otherwise, we have to associate the
@@ -802,53 +816,33 @@ void eeh_pe_restore_bars(struct eeh_pe *pe)
  */
 const char *eeh_pe_loc_get(struct eeh_pe *pe)
 {
-        struct pci_controller *hose;
         struct pci_bus *bus = eeh_pe_bus_get(pe);
-        struct pci_dev *pdev;
-        struct device_node *dn;
-        const char *loc;
+        struct device_node *dn = pci_bus_to_OF_node(bus);
+        const char *loc = NULL;
 
-        if (!bus)
-                return "N/A";
+        if (!dn)
+                goto out;
 
         /* PHB PE or root PE ? */
         if (pci_is_root_bus(bus)) {
-                hose = pci_bus_to_host(bus);
-                loc = of_get_property(hose->dn,
-                                "ibm,loc-code", NULL);
+                loc = of_get_property(dn, "ibm,loc-code", NULL);
+                if (!loc)
+                        loc = of_get_property(dn, "ibm,io-base-loc-code", NULL);
                 if (loc)
-                        return loc;
-                loc = of_get_property(hose->dn,
-                                "ibm,io-base-loc-code", NULL);
-                if (loc)
-                        return loc;
-
-                pdev = pci_get_slot(bus, 0x0);
-        } else {
-                pdev = bus->self;
-        }
-
-        if (!pdev) {
-                loc = "N/A";
-                goto out;
-        }
+                        goto out;
 
-        dn = pci_device_to_OF_node(pdev);
-        if (!dn) {
-                loc = "N/A";
-                goto out;
+                /* Check the root port */
+                dn = dn->child;
+                if (!dn)
+                        goto out;
         }
 
         loc = of_get_property(dn, "ibm,loc-code", NULL);
         if (!loc)
                 loc = of_get_property(dn, "ibm,slot-location-code", NULL);
-        if (!loc)
-                loc = "N/A";
 
 out:
-        if (pci_is_root_bus(bus) && pdev)
-                pci_dev_put(pdev);
-        return loc;
+        return loc ? loc : "N/A";
 }
 
 /**
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 6528c5e2cc44..5bbd1bc8c3b0 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -482,16 +482,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_STCX_CHECKS_ADDRESS)
         ld      r8,KSP(r4)      /* new stack pointer */
 #ifdef CONFIG_PPC_BOOK3S
 BEGIN_FTR_SECTION
-  BEGIN_FTR_SECTION_NESTED(95)
         clrrdi  r6,r8,28        /* get its ESID */
         clrrdi  r9,r1,28        /* get current sp ESID */
-  FTR_SECTION_ELSE_NESTED(95)
+FTR_SECTION_ELSE
         clrrdi  r6,r8,40        /* get its 1T ESID */
         clrrdi  r9,r1,40        /* get current sp 1T ESID */
-  ALT_MMU_FTR_SECTION_END_NESTED_IFCLR(MMU_FTR_1T_SEGMENT, 95)
-FTR_SECTION_ELSE
-        b       2f
-ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_SLB)
+ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_1T_SEGMENT)
         clrldi. r0,r6,2         /* is new ESID c00000000? */
         cmpd    cr1,r6,r9       /* or is new ESID the same as current ESID? */
         cror    eq,4*cr1+eq,eq
@@ -919,6 +915,11 @@ restore_check_irq_replay:
         addi    r3,r1,STACK_FRAME_OVERHEAD;
         bl      do_IRQ
         b       ret_from_except
+1:      cmpwi   cr0,r3,0xe60
+        bne     1f
+        addi    r3,r1,STACK_FRAME_OVERHEAD;
+        bl      handle_hmi_exception
+        b       ret_from_except
 1:      cmpwi   cr0,r3,0x900
         bne     1f
         addi    r3,r1,STACK_FRAME_OVERHEAD;
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index a7d36b19221d..050f79a4a168 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -188,10 +188,6 @@ ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)
 data_access_pSeries:
         HMT_MEDIUM_PPR_DISCARD
         SET_SCRATCH0(r13)
-BEGIN_FTR_SECTION
-        b       data_access_check_stab
-data_access_not_stab:
-END_MMU_FTR_SECTION_IFCLR(MMU_FTR_SLB)
         EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, data_access_common, EXC_STD,
                                  KVMTEST, 0x300)
 
@@ -339,7 +335,7 @@ emulation_assist_trampoline:
 hv_exception_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
-        b       hmi_exception_hv
+        b       hmi_exception_early
 
         . = 0xe80
 hv_doorbell_trampoline:
@@ -514,34 +510,6 @@ machine_check_pSeries_0:
         EXCEPTION_PROLOG_1(PACA_EXMC, KVMTEST, 0x200)
         EXCEPTION_PROLOG_PSERIES_1(machine_check_common, EXC_STD)
         KVM_HANDLER_SKIP(PACA_EXMC, EXC_STD, 0x200)
-
-        /* moved from 0x300 */
-data_access_check_stab:
-        GET_PACA(r13)
-        std     r9,PACA_EXSLB+EX_R9(r13)
-        std     r10,PACA_EXSLB+EX_R10(r13)
-        mfspr   r10,SPRN_DAR
-        mfspr   r9,SPRN_DSISR
-        srdi    r10,r10,60
-        rlwimi  r10,r9,16,0x20
-#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
-        lbz     r9,HSTATE_IN_GUEST(r13)
-        rlwimi  r10,r9,8,0x300
-#endif
-        mfcr    r9
-        cmpwi   r10,0x2c
-        beq     do_stab_bolted_pSeries
-        mtcrf   0x80,r9
-        ld      r9,PACA_EXSLB+EX_R9(r13)
-        ld      r10,PACA_EXSLB+EX_R10(r13)
-        b       data_access_not_stab
-do_stab_bolted_pSeries:
-        std     r11,PACA_EXSLB+EX_R11(r13)
-        std     r12,PACA_EXSLB+EX_R12(r13)
-        GET_SCRATCH0(r10)
-        std     r10,PACA_EXSLB+EX_R13(r13)
-        EXCEPTION_PROLOG_PSERIES_1(do_stab_bolted, EXC_STD)
-
         KVM_HANDLER_SKIP(PACA_EXGEN, EXC_STD, 0x300)
         KVM_HANDLER_SKIP(PACA_EXSLB, EXC_STD, 0x380)
         KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0x400)
@@ -621,8 +589,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
         KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe22)
         STD_EXCEPTION_HV_OOL(0xe42, emulation_assist)
         KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe42)
-        STD_EXCEPTION_HV_OOL(0xe62, hmi_exception) /* need to flush cache ? */
+        MASKABLE_EXCEPTION_HV_OOL(0xe62, hmi_exception)
         KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe62)
+
         MASKABLE_EXCEPTION_HV_OOL(0xe82, h_doorbell)
         KVM_HANDLER(PACA_EXGEN, EXC_HV, 0xe82)
 
@@ -643,6 +612,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
  * - If it was a decrementer interrupt, we bump the dec to max and and return.
  * - If it was a doorbell we return immediately since doorbells are edge
  *   triggered and won't automatically refire.
+ * - If it was a HMI we return immediately since we handled it in realmode
+ *   and it won't refire.
  * - else we hard disable and return.
  * This is called with r10 containing the value to OR to the paca field.
  */
@@ -660,6 +631,8 @@ masked_##_H##interrupt:					\
         b       2f;                                     \
 1:      cmpwi   r10,PACA_IRQ_DBELL;                     \
         beq     2f;                                     \
+        cmpwi   r10,PACA_IRQ_HMI;                       \
+        beq     2f;                                     \
         mfspr   r10,SPRN_##_H##SRR1;                    \
         rldicl  r10,r10,48,1; /* clear MSR_EE */        \
         rotldi  r10,r10,16;                             \
@@ -799,7 +772,7 @@ kvmppc_skip_Hinterrupt:
         STD_EXCEPTION_COMMON(0xd00, single_step, single_step_exception)
         STD_EXCEPTION_COMMON(0xe00, trap_0e, unknown_exception)
         STD_EXCEPTION_COMMON(0xe40, emulation_assist, emulation_assist_interrupt)
-        STD_EXCEPTION_COMMON(0xe60, hmi_exception, unknown_exception)
+        STD_EXCEPTION_COMMON_ASYNC(0xe60, hmi_exception, handle_hmi_exception)
 #ifdef CONFIG_PPC_DOORBELL
         STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, doorbell_exception)
 #else
@@ -985,66 +958,6 @@ ppc64_runlatch_on_trampoline:
         b       __ppc64_runlatch_on
 
 /*
- * Here we have detected that the kernel stack pointer is bad.
- * R9 contains the saved CR, r13 points to the paca,
- * r10 contains the (bad) kernel stack pointer,
- * r11 and r12 contain the saved SRR0 and SRR1.
- * We switch to using an emergency stack, save the registers there,
- * and call kernel_bad_stack(), which panics.
- */
-bad_stack:
-        ld      r1,PACAEMERGSP(r13)
-        subi    r1,r1,64+INT_FRAME_SIZE
-        std     r9,_CCR(r1)
-        std     r10,GPR1(r1)
-        std     r11,_NIP(r1)
-        std     r12,_MSR(r1)
-        mfspr   r11,SPRN_DAR
-        mfspr   r12,SPRN_DSISR
-        std     r11,_DAR(r1)
-        std     r12,_DSISR(r1)
-        mflr    r10
-        mfctr   r11
-        mfxer   r12
-        std     r10,_LINK(r1)
-        std     r11,_CTR(r1)
-        std     r12,_XER(r1)
-        SAVE_GPR(0,r1)
-        SAVE_GPR(2,r1)
-        ld      r10,EX_R3(r3)
-        std     r10,GPR3(r1)
-        SAVE_GPR(4,r1)
-        SAVE_4GPRS(5,r1)
-        ld      r9,EX_R9(r3)
-        ld      r10,EX_R10(r3)
-        SAVE_2GPRS(9,r1)
-        ld      r9,EX_R11(r3)
-        ld      r10,EX_R12(r3)
-        ld      r11,EX_R13(r3)
-        std     r9,GPR11(r1)
-        std     r10,GPR12(r1)
-        std     r11,GPR13(r1)
-BEGIN_FTR_SECTION
-        ld      r10,EX_CFAR(r3)
-        std     r10,ORIG_GPR3(r1)
-END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
-        SAVE_8GPRS(14,r1)
-        SAVE_10GPRS(22,r1)
-        lhz     r12,PACA_TRAP_SAVE(r13)
-        std     r12,_TRAP(r1)
-        addi    r11,r1,INT_FRAME_SIZE
-        std     r11,0(r1)
-        li      r12,0
-        std     r12,0(r11)
-        ld      r2,PACATOC(r13)
-        ld      r11,exception_marker@toc(r2)
-        std     r12,RESULT(r1)
-        std     r11,STACK_FRAME_OVERHEAD-16(r1)
-1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      kernel_bad_stack
-        b       1b
-
-/*
  * Here r13 points to the paca, r9 contains the saved CR,
  * SRR0 and SRR1 are saved in r11 and r12,
  * r9 - r13 are saved in paca->exgen.
@@ -1057,7 +970,7 @@ data_access_common:
         mfspr   r10,SPRN_DSISR
         stw     r10,PACA_EXGEN+EX_DSISR(r13)
         EXCEPTION_PROLOG_COMMON(0x300, PACA_EXGEN)
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         ld      r12,_MSR(r1)
         ld      r3,PACA_EXGEN+EX_DAR(r13)
         lwz     r4,PACA_EXGEN+EX_DSISR(r13)
@@ -1073,7 +986,7 @@ h_data_storage_common:
         stw     r10,PACA_EXGEN+EX_DSISR(r13)
         EXCEPTION_PROLOG_COMMON(0xe00, PACA_EXGEN)
         bl      save_nvgprs
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      unknown_exception
         b       ret_from_except
@@ -1082,7 +995,7 @@ h_data_storage_common:
         .globl instruction_access_common
 instruction_access_common:
         EXCEPTION_PROLOG_COMMON(0x400, PACA_EXGEN)
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         ld      r12,_MSR(r1)
         ld      r3,_NIP(r1)
         andis.  r4,r12,0x5820
@@ -1146,7 +1059,7 @@ slb_miss_fault:
 
 unrecov_user_slb:
         EXCEPTION_PROLOG_COMMON(0x4200, PACA_EXGEN)
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         bl      save_nvgprs
 1:      addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      unrecoverable_exception
@@ -1169,7 +1082,7 @@ machine_check_common:
         stw     r10,PACA_EXGEN+EX_DSISR(r13)
         EXCEPTION_PROLOG_COMMON(0x200, PACA_EXMC)
         FINISH_NAP
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         ld      r3,PACA_EXGEN+EX_DAR(r13)
         lwz     r4,PACA_EXGEN+EX_DSISR(r13)
         std     r3,_DAR(r1)
@@ -1192,7 +1105,7 @@ alignment_common:
         std     r3,_DAR(r1)
         std     r4,_DSISR(r1)
         bl      save_nvgprs
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      alignment_exception
         b       ret_from_except
@@ -1202,7 +1115,7 @@ alignment_common:
 program_check_common:
         EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN)
         bl      save_nvgprs
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      program_check_exception
         b       ret_from_except
@@ -1213,7 +1126,7 @@ fp_unavailable_common:
         EXCEPTION_PROLOG_COMMON(0x800, PACA_EXGEN)
         bne     1f                      /* if from user, just load it up */
         bl      save_nvgprs
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      kernel_fp_unavailable_exception
         BUG_OPCODE
@@ -1232,7 +1145,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_TM)
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
 2:      /* User process was in a transaction */
         bl      save_nvgprs
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      fp_unavailable_tm
         b       ret_from_except
@@ -1258,7 +1171,7 @@ BEGIN_FTR_SECTION
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
 2:      /* User process was in a transaction */
         bl      save_nvgprs
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      altivec_unavailable_tm
         b       ret_from_except
@@ -1267,7 +1180,7 @@ BEGIN_FTR_SECTION
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif
         bl      save_nvgprs
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      altivec_unavailable_exception
         b       ret_from_except
@@ -1292,7 +1205,7 @@ BEGIN_FTR_SECTION
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
 2:      /* User process was in a transaction */
         bl      save_nvgprs
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      vsx_unavailable_tm
         b       ret_from_except
@@ -1301,7 +1214,7 @@ BEGIN_FTR_SECTION
 END_FTR_SECTION_IFSET(CPU_FTR_VSX)
 #endif
         bl      save_nvgprs
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      vsx_unavailable_exception
         b       ret_from_except
@@ -1338,11 +1251,60 @@ fwnmi_data_area:
         . = 0x8000
 #endif /* defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV) */
 
-/* Space for CPU0's segment table */
-        .balign 4096
-        .globl initial_stab
-initial_stab:
-        .space  4096
+        .globl hmi_exception_early
+hmi_exception_early:
+        EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, 0xe60)
+        mr      r10,r1                  /* Save r1                      */
+        ld      r1,PACAEMERGSP(r13)     /* Use emergency stack          */
+        subi    r1,r1,INT_FRAME_SIZE    /* alloc stack frame            */
+        std     r9,_CCR(r1)             /* save CR in stackframe        */
+        mfspr   r11,SPRN_HSRR0          /* Save HSRR0 */
+        std     r11,_NIP(r1)            /* save HSRR0 in stackframe     */
+        mfspr   r12,SPRN_HSRR1          /* Save SRR1 */
+        std     r12,_MSR(r1)            /* save SRR1 in stackframe      */
+        std     r10,0(r1)               /* make stack chain pointer     */
+        std     r0,GPR0(r1)             /* save r0 in stackframe        */
+        std     r10,GPR1(r1)            /* save r1 in stackframe        */
+        EXCEPTION_PROLOG_COMMON_2(PACA_EXGEN)
+        EXCEPTION_PROLOG_COMMON_3(0xe60)
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      hmi_exception_realmode
+        /* Windup the stack. */
+        /* Clear MSR_RI before setting SRR0 and SRR1. */
+        li      r0,MSR_RI
+        mfmsr   r9                      /* get MSR value */
+        andc    r9,r9,r0
+        mtmsrd  r9,1                    /* Clear MSR_RI */
+        /* Move original HSRR0 and HSRR1 into the respective regs */
+        ld      r9,_MSR(r1)
+        mtspr   SPRN_HSRR1,r9
+        ld      r3,_NIP(r1)
+        mtspr   SPRN_HSRR0,r3
+        ld      r9,_CTR(r1)
+        mtctr   r9
+        ld      r9,_XER(r1)
+        mtxer   r9
+        ld      r9,_LINK(r1)
+        mtlr    r9
+        REST_GPR(0, r1)
+        REST_8GPRS(2, r1)
+        REST_GPR(10, r1)
+        ld      r11,_CCR(r1)
+        mtcr    r11
+        REST_GPR(11, r1)
+        REST_2GPRS(12, r1)
+        /* restore original r1. */
+        ld      r1,GPR1(r1)
+
+        /*
+         * Go to virtual mode and pull the HMI event information from
+         * firmware.
+         */
+        .globl hmi_exception_after_realmode
+hmi_exception_after_realmode:
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_0(PACA_EXGEN)
+        b       hmi_exception_hv
 
 #ifdef CONFIG_PPC_POWERNV
 _GLOBAL(opal_mc_secondary_handler)
@@ -1566,7 +1528,7 @@ slb_miss_realmode:
 
 unrecov_slb:
         EXCEPTION_PROLOG_COMMON(0x4100, PACA_EXSLB)
-        DISABLE_INTS
+        RECONCILE_IRQ_STATE(r10, r11)
         bl      save_nvgprs
 1:      addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      unrecoverable_exception
@@ -1594,12 +1556,6 @@ do_hash_page:
         bne-    handle_page_fault       /* if not, try to insert a HPTE */
         andis.  r0,r4,DSISR_DABRMATCH@h
         bne-    handle_dabr_fault
-
-BEGIN_FTR_SECTION
-        andis.  r0,r4,0x0020            /* Is it a segment table fault? */
-        bne-    do_ste_alloc            /* If so handle it */
-END_MMU_FTR_SECTION_IFCLR(MMU_FTR_SLB)
-
         CURRENT_THREAD_INFO(r11, r1)
         lwz     r0,TI_PREEMPT(r11)      /* If we're in an "NMI" */
         andis.  r0,r0,NMI_MASK@h        /* (i.e. an irq when soft-disabled) */
@@ -1681,113 +1637,62 @@ handle_dabr_fault:
         bl      bad_page_fault
         b       ret_from_except
 
-        /* here we have a segment miss */
-do_ste_alloc:
-        bl      ste_allocate            /* try to insert stab entry */
-        cmpdi   r3,0
-        bne-    handle_page_fault
-        b       fast_exception_return
-
 /*
- * r13 points to the PACA, r9 contains the saved CR,
+ * Here we have detected that the kernel stack pointer is bad.
+ * R9 contains the saved CR, r13 points to the paca,
+ * r10 contains the (bad) kernel stack pointer,
  * r11 and r12 contain the saved SRR0 and SRR1.
- * r9 - r13 are saved in paca->exslb.
- * We assume we aren't going to take any exceptions during this procedure.
- * We assume (DAR >> 60) == 0xc.
+ * We switch to using an emergency stack, save the registers there,
+ * and call kernel_bad_stack(), which panics.
  */
-        .align  7
-do_stab_bolted:
-        stw     r9,PACA_EXSLB+EX_CCR(r13)       /* save CR in exc. frame */
-        std     r11,PACA_EXSLB+EX_SRR0(r13)     /* save SRR0 in exc. frame */
-        mfspr   r11,SPRN_DAR                    /* ea */
-
-        /*
-         * check for bad kernel/user address
-         * (ea & ~REGION_MASK) >= PGTABLE_RANGE
-         */
-        rldicr. r9,r11,4,(63 - 46 - 4)
-        li      r9,0    /* VSID = 0 for bad address */
-        bne-    0f
-
-        /*
-         * Calculate VSID:
-         * This is the kernel vsid, we take the top for context from
-         * the range. context = (MAX_USER_CONTEXT) + ((ea >> 60) - 0xc) + 1
-         * Here we know that (ea >> 60) == 0xc
-         */
-        lis     r9,(MAX_USER_CONTEXT + 1)@ha
-        addi    r9,r9,(MAX_USER_CONTEXT + 1)@l
-
-        srdi    r10,r11,SID_SHIFT
-        rldimi  r10,r9,ESID_BITS,0 /* proto vsid */
-        ASM_VSID_SCRAMBLE(r10, r9, 256M)
-        rldic   r9,r10,12,16    /* r9 = vsid << 12 */
-
-0:
-        /* Hash to the primary group */
-        ld      r10,PACASTABVIRT(r13)
-        srdi    r11,r11,SID_SHIFT
-        rldimi  r10,r11,7,52    /* r10 = first ste of the group */
-
-        /* Search the primary group for a free entry */
-1:      ld      r11,0(r10)      /* Test valid bit of the current ste    */
-        andi.   r11,r11,0x80
-        beq     2f
-        addi    r10,r10,16
-        andi.   r11,r10,0x70
-        bne     1b
-
-        /* Stick for only searching the primary group for now.          */
-        /* At least for now, we use a very simple random castout scheme */
-        /* Use the TB as a random number ;  OR in 1 to avoid entry 0    */
-        mftb    r11
-        rldic   r11,r11,4,57    /* r11 = (r11 << 4) & 0x70 */
-        ori     r11,r11,0x10
-
-        /* r10 currently points to an ste one past the group of interest */
-        /* make it point to the randomly selected entry                 */
-        subi    r10,r10,128
-        or      r10,r10,r11     /* r10 is the entry to invalidate       */
-
-        isync                   /* mark the entry invalid               */
-        ld      r11,0(r10)
-        rldicl  r11,r11,56,1    /* clear the valid bit */
-        rotldi  r11,r11,8
-        std     r11,0(r10)
-        sync
-
-        clrrdi  r11,r11,28      /* Get the esid part of the ste         */
-        slbie   r11
-
-2:      std     r9,8(r10)       /* Store the vsid part of the ste       */
-        eieio
-
-        mfspr   r11,SPRN_DAR            /* Get the new esid                     */
-        clrrdi  r11,r11,28      /* Permits a full 32b of ESID           */
-        ori     r11,r11,0x90    /* Turn on valid and kp                 */
-        std     r11,0(r10)      /* Put new entry back into the stab     */
-
-        sync
-
-        /* All done -- return from exception. */
-        lwz     r9,PACA_EXSLB+EX_CCR(r13)       /* get saved CR */
-        ld      r11,PACA_EXSLB+EX_SRR0(r13)     /* get saved SRR0 */
-
-        andi.   r10,r12,MSR_RI
-        beq-    unrecov_slb
-
-        mtcrf   0x80,r9                 /* restore CR */
-
-        mfmsr   r10
-        clrrdi  r10,r10,2
-        mtmsrd  r10,1
-
-        mtspr   SPRN_SRR0,r11
-        mtspr   SPRN_SRR1,r12
-        ld      r9,PACA_EXSLB+EX_R9(r13)
-        ld      r10,PACA_EXSLB+EX_R10(r13)
-        ld      r11,PACA_EXSLB+EX_R11(r13)
-        ld      r12,PACA_EXSLB+EX_R12(r13)
-        ld      r13,PACA_EXSLB+EX_R13(r13)
-        rfid
-        b       .       /* prevent speculative execution */
+bad_stack:
+        ld      r1,PACAEMERGSP(r13)
+        subi    r1,r1,64+INT_FRAME_SIZE
+        std     r9,_CCR(r1)
+        std     r10,GPR1(r1)
+        std     r11,_NIP(r1)
+        std     r12,_MSR(r1)
+        mfspr   r11,SPRN_DAR
+        mfspr   r12,SPRN_DSISR
+        std     r11,_DAR(r1)
+        std     r12,_DSISR(r1)
+        mflr    r10
+        mfctr   r11
+        mfxer   r12
+        std     r10,_LINK(r1)
+        std     r11,_CTR(r1)
+        std     r12,_XER(r1)
+        SAVE_GPR(0,r1)
+        SAVE_GPR(2,r1)
+        ld      r10,EX_R3(r3)
+        std     r10,GPR3(r1)
+        SAVE_GPR(4,r1)
+        SAVE_4GPRS(5,r1)
+        ld      r9,EX_R9(r3)
+        ld      r10,EX_R10(r3)
+        SAVE_2GPRS(9,r1)
+        ld      r9,EX_R11(r3)
+        ld      r10,EX_R12(r3)
+        ld      r11,EX_R13(r3)
+        std     r9,GPR11(r1)
+        std     r10,GPR12(r1)
+        std     r11,GPR13(r1)
+BEGIN_FTR_SECTION
+        ld      r10,EX_CFAR(r3)
+        std     r10,ORIG_GPR3(r1)
+END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
+        SAVE_8GPRS(14,r1)
+        SAVE_10GPRS(22,r1)
+        lhz     r12,PACA_TRAP_SAVE(r13)
+        std     r12,_TRAP(r1)
+        addi    r11,r1,INT_FRAME_SIZE
+        std     r11,0(r1)
+        li      r12,0
+        std     r12,0(r11)
+        ld      r2,PACATOC(r13)
+        ld      r11,exception_marker@toc(r2)
+        std     r12,RESULT(r1)
+        std     r11,STACK_FRAME_OVERHEAD-16(r1)
+1:      addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      kernel_bad_stack
+        b       1b
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index c334f53453f7..b5061abbd2e0 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -1210,10 +1210,12 @@ clear_utlb_entry:
 
         /* We configure icbi to invalidate 128 bytes at a time since the
          * current 32-bit kernel code isn't too happy with icache != dcache
-         * block size
+         * block size. We also disable the BTAC as this can cause errors
+         * in some circumstances (see IBM Erratum 47).
          */
         mfspr   r3,SPRN_CCR0
         oris    r3,r3,0x0020
+        ori     r3,r3,0x0040
         mtspr   SPRN_CCR0,r3
         isync
 
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index a95145d7f61b..d48125d0c048 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -180,6 +180,28 @@ exception_marker:
 #include "exceptions-64s.S"
 #endif
 
+#ifdef CONFIG_PPC_BOOK3E
+_GLOBAL(fsl_secondary_thread_init)
+        /* Enable branch prediction */
+        lis     r3,BUCSR_INIT@h
+        ori     r3,r3,BUCSR_INIT@l
+        mtspr   SPRN_BUCSR,r3
+        isync
+
+        /*
+         * Fix PIR to match the linear numbering in the device tree.
+         *
+         * On e6500, the reset value of PIR uses the low three bits for
+         * the thread within a core, and the upper bits for the core
+         * number.  There are two threads per core, so shift everything
+         * but the low bit right by two bits so that the cpu numbering is
+         * continuous.
+         */
+        mfspr   r3, SPRN_PIR
+        rlwimi  r3, r3, 30, 2, 30
+        mtspr   SPRN_PIR, r3
+#endif
+
 _GLOBAL(generic_secondary_thread_init)
         mr      r24,r3
 
@@ -618,7 +640,7 @@ __secondary_start:
         addi    r14,r14,THREAD_SIZE-STACK_FRAME_OVERHEAD
         std     r14,PACAKSAVE(r13)
 
-        /* Do early setup for that CPU (stab, slb, hash table pointer) */
+        /* Do early setup for that CPU (SLB and hash table pointer) */
         bl      early_setup_secondary
 
         /*
@@ -771,8 +793,10 @@ start_here_multiplatform:
         li      r0,0
         stdu    r0,-STACK_FRAME_OVERHEAD(r1)
 
-        /* Do very early kernel initializations, including initial hash table,
-         * stab and slb setup before we turn on relocation.     */
+        /*
+         * Do very early kernel initializations, including initial hash table
+         * and SLB setup before we turn on relocation.
+         */
 
         /* Restore parameters passed from prom_init/kexec */
         mr      r3,r31
diff --git a/arch/powerpc/kernel/idle_power7.S b/arch/powerpc/kernel/idle_power7.S
index 5cf3d367190d..be05841396cf 100644
--- a/arch/powerpc/kernel/idle_power7.S
+++ b/arch/powerpc/kernel/idle_power7.S
@@ -135,17 +135,68 @@ _GLOBAL(power7_sleep)
         b       power7_powersave_common
         /* No return */
 
+/*
+ * Make opal call in realmode. This is a generic function to be called
+ * from realmode from reset vector. It handles endianess.
+ *
+ * r13 - paca pointer
+ * r1  - stack pointer
+ * r3  - opal token
+ */
+opal_call_realmode:
+        mflr    r12
+        std     r12,_LINK(r1)
+        ld      r2,PACATOC(r13)
+        /* Set opal return address */
+        LOAD_REG_ADDR(r0,return_from_opal_call)
+        mtlr    r0
+        /* Handle endian-ness */
+        li      r0,MSR_LE
+        mfmsr   r12
+        andc    r12,r12,r0
+        mtspr   SPRN_HSRR1,r12
+        mr      r0,r3                   /* Move opal token to r0 */
+        LOAD_REG_ADDR(r11,opal)
+        ld      r12,8(r11)
+        ld      r2,0(r11)
+        mtspr   SPRN_HSRR0,r12
+        hrfid
+
+return_from_opal_call:
+        FIXUP_ENDIAN
+        ld      r0,_LINK(r1)
+        mtlr    r0
+        blr
+
+#define CHECK_HMI_INTERRUPT                                             \
+        mfspr   r0,SPRN_SRR1;                                           \
+BEGIN_FTR_SECTION_NESTED(66);                                           \
+        rlwinm  r0,r0,45-31,0xf;  /* extract wake reason field (P8) */  \
+FTR_SECTION_ELSE_NESTED(66);                                            \
+        rlwinm  r0,r0,45-31,0xe;  /* P7 wake reason field is 3 bits */  \
+ALT_FTR_SECTION_END_NESTED_IFSET(CPU_FTR_ARCH_207S, 66);                \
+        cmpwi   r0,0xa;                 /* Hypervisor maintenance ? */  \
+        bne     20f;                                                    \
+        /* Invoke opal call to handle hmi */                            \
+        ld      r2,PACATOC(r13);                                        \
+        ld      r1,PACAR1(r13);                                         \
+        std     r3,ORIG_GPR3(r1);       /* Save original r3 */          \
+        li      r3,OPAL_HANDLE_HMI;     /* Pass opal token argument*/   \
+        bl      opal_call_realmode;                                     \
+        ld      r3,ORIG_GPR3(r1);       /* Restore original r3 */       \
+20:     nop;
+
+
 _GLOBAL(power7_wakeup_tb_loss)
         ld      r2,PACATOC(r13);
         ld      r1,PACAR1(r13)
 
+BEGIN_FTR_SECTION
+        CHECK_HMI_INTERRUPT
+END_FTR_SECTION_IFSET(CPU_FTR_HVMODE)
         /* Time base re-sync */
-        li      r0,OPAL_RESYNC_TIMEBASE
-        LOAD_REG_ADDR(r11,opal);
-        ld      r12,8(r11);
-        ld      r2,0(r11);
-        mtctr   r12
-        bctrl
+        li      r3,OPAL_RESYNC_TIMEBASE
+        bl      opal_call_realmode;
 
         /* TODO: Check r3 for failure */
 
@@ -163,6 +214,9 @@ _GLOBAL(power7_wakeup_tb_loss)
 
 _GLOBAL(power7_wakeup_loss)
         ld      r1,PACAR1(r13)
+BEGIN_FTR_SECTION
+        CHECK_HMI_INTERRUPT
+END_FTR_SECTION_IFSET(CPU_FTR_HVMODE)
         REST_NVGPRS(r1)
         REST_GPR(2, r1)
         ld      r3,_CCR(r1)
@@ -178,6 +232,9 @@ _GLOBAL(power7_wakeup_noloss)
         lbz     r0,PACA_NAPSTATELOST(r13)
         cmpwi   r0,0
         bne     power7_wakeup_loss
+BEGIN_FTR_SECTION
+        CHECK_HMI_INTERRUPT
+END_FTR_SECTION_IFSET(CPU_FTR_HVMODE)
         ld      r1,PACAR1(r13)
         ld      r4,_MSR(r1)
         ld      r5,_NIP(r1)
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 88e3ec6e1d96..a10642a0d861 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -1037,7 +1037,7 @@ int iommu_tce_build(struct iommu_table *tbl, unsigned long entry,
 
         /* if (unlikely(ret))
                 pr_err("iommu_tce: %s failed on hwaddr=%lx ioba=%lx kva=%lx ret=%d\n",
-                        __func__, hwaddr, entry << IOMMU_PAGE_SHIFT(tbl),
+                        __func__, hwaddr, entry << tbl->it_page_shift,
                                 hwaddr, ret); */
 
         return ret;
@@ -1056,7 +1056,7 @@ int iommu_put_tce_user_mode(struct iommu_table *tbl, unsigned long entry,
                         direction != DMA_TO_DEVICE, &page);
         if (unlikely(ret != 1)) {
                 /* pr_err("iommu_tce: get_user_pages_fast failed tce=%lx ioba=%lx ret=%d\n",
-                                tce, entry << IOMMU_PAGE_SHIFT(tbl), ret); */
+                                tce, entry << tbl->it_page_shift, ret); */
                 return -EFAULT;
         }
         hwaddr = (unsigned long) page_address(page) + offset;
@@ -1120,37 +1120,41 @@ EXPORT_SYMBOL_GPL(iommu_release_ownership);
 int iommu_add_device(struct device *dev)
 {
         struct iommu_table *tbl;
-        int ret = 0;
 
-        if (WARN_ON(dev->iommu_group)) {
-                pr_warn("iommu_tce: device %s is already in iommu group %d, skipping\n",
-                                dev_name(dev),
-                                iommu_group_id(dev->iommu_group));
+        /*
+         * The sysfs entries should be populated before
+         * binding IOMMU group. If sysfs entries isn't
+         * ready, we simply bail.
+         */
+        if (!device_is_registered(dev))
+                return -ENOENT;
+
+        if (dev->iommu_group) {
+                pr_debug("%s: Skipping device %s with iommu group %d\n",
+                         __func__, dev_name(dev),
+                         iommu_group_id(dev->iommu_group));
                 return -EBUSY;
         }
 
         tbl = get_iommu_table_base(dev);
         if (!tbl || !tbl->it_group) {
-                pr_debug("iommu_tce: skipping device %s with no tbl\n",
-                                dev_name(dev));
+                pr_debug("%s: Skipping device %s with no tbl\n",
+                         __func__, dev_name(dev));
                 return 0;
         }
 
-        pr_debug("iommu_tce: adding %s to iommu group %d\n",
-                        dev_name(dev), iommu_group_id(tbl->it_group));
+        pr_debug("%s: Adding %s to iommu group %d\n",
+                 __func__, dev_name(dev),
+                 iommu_group_id(tbl->it_group));
 
         if (PAGE_SIZE < IOMMU_PAGE_SIZE(tbl)) {
-                pr_err("iommu_tce: unsupported iommu page size.");
-                pr_err("%s has not been added\n", dev_name(dev));
+                pr_err("%s: Invalid IOMMU page size %lx (%lx) on %s\n",
+                       __func__, IOMMU_PAGE_SIZE(tbl),
+                       PAGE_SIZE, dev_name(dev));
                 return -EINVAL;
         }
 
-        ret = iommu_group_add_device(tbl->it_group, dev);
-        if (ret < 0)
-                pr_err("iommu_tce: %s has not been added, ret=%d\n",
-                                dev_name(dev), ret);
-
-        return ret;
+        return iommu_group_add_device(tbl->it_group, dev);
 }
 EXPORT_SYMBOL_GPL(iommu_add_device);
 
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 248ee7e5bebd..4c5891de162e 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -189,6 +189,11 @@ notrace unsigned int __check_irq_replay(void)
         }
 #endif /* CONFIG_PPC_BOOK3E */
 
+        /* Check if an hypervisor Maintenance interrupt happened */
+        local_paca->irq_happened &= ~PACA_IRQ_HMI;
+        if (happened & PACA_IRQ_HMI)
+                return 0xe60;
+
         /* There should be nothing left ! */
         BUG_ON(local_paca->irq_happened != 0);
 
@@ -377,6 +382,14 @@ int arch_show_interrupts(struct seq_file *p, int prec)
                 seq_printf(p, "%10u ", per_cpu(irq_stat, j).mce_exceptions);
         seq_printf(p, "  Machine check exceptions\n");
 
+        if (cpu_has_feature(CPU_FTR_HVMODE)) {
+                seq_printf(p, "%*s: ", prec, "HMI");
+                for_each_online_cpu(j)
+                        seq_printf(p, "%10u ",
+                                        per_cpu(irq_stat, j).hmi_exceptions);
+                seq_printf(p, "  Hypervisor Maintenance Interrupts\n");
+        }
+
 #ifdef CONFIG_PPC_DOORBELL
         if (cpu_has_feature(CPU_FTR_DBELL)) {
                 seq_printf(p, "%*s: ", prec, "DBL");
@@ -400,6 +413,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
         sum += per_cpu(irq_stat, cpu).mce_exceptions;
         sum += per_cpu(irq_stat, cpu).spurious_irqs;
         sum += per_cpu(irq_stat, cpu).timer_irqs_others;
+        sum += per_cpu(irq_stat, cpu).hmi_exceptions;
 #ifdef CONFIG_PPC_DOORBELL
         sum += per_cpu(irq_stat, cpu).doorbell_irqs;
 #endif
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index be99774d3f44..bf44ae962ab8 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1095,6 +1095,23 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
         return 0;
 }
 
+static void setup_ksp_vsid(struct task_struct *p, unsigned long sp)
+{
+#ifdef CONFIG_PPC_STD_MMU_64
+        unsigned long sp_vsid;
+        unsigned long llp = mmu_psize_defs[mmu_linear_psize].sllp;
+
+        if (mmu_has_feature(MMU_FTR_1T_SEGMENT))
+                sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_1T)
+                        << SLB_VSID_SHIFT_1T;
+        else
+                sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_256M)
+                        << SLB_VSID_SHIFT;
+        sp_vsid |= SLB_VSID_KERNEL | llp;
+        p->thread.ksp_vsid = sp_vsid;
+#endif
+}
+
 /*
  * Copy a thread..
  */
@@ -1174,21 +1191,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
         p->thread.vr_save_area = NULL;
 #endif
 
-#ifdef CONFIG_PPC_STD_MMU_64
-        if (mmu_has_feature(MMU_FTR_SLB)) {
-                unsigned long sp_vsid;
-                unsigned long llp = mmu_psize_defs[mmu_linear_psize].sllp;
+        setup_ksp_vsid(p, sp);
 
-                if (mmu_has_feature(MMU_FTR_1T_SEGMENT))
-                        sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_1T)
-                                << SLB_VSID_SHIFT_1T;
-                else
-                        sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_256M)
-                                << SLB_VSID_SHIFT;
-                sp_vsid |= SLB_VSID_KERNEL | llp;
-                p->thread.ksp_vsid = sp_vsid;
-        }
-#endif /* CONFIG_PPC_STD_MMU_64 */
 #ifdef CONFIG_PPC64 
         if (cpu_has_feature(CPU_FTR_DSCR)) {
                 p->thread.dscr_inherit = current->thread.dscr_inherit;
@@ -1577,7 +1581,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
                         struct pt_regs *regs = (struct pt_regs *)
                                 (sp + STACK_FRAME_OVERHEAD);
                         lr = regs->link;
-                        printk("--- Exception: %lx at %pS\n    LR = %pS\n",
+                        printk("--- interrupt: %lx at %pS\n    LR = %pS\n",
                                regs->trap, (void *)regs->nip, (void *)lr);
                         firstframe = 1;
                 }
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index b694b0730971..4e139f8a69ef 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -155,7 +155,6 @@ static struct ibm_pa_feature {
 } ibm_pa_features[] __initdata = {
         {0, 0, PPC_FEATURE_HAS_MMU,     0, 0, 0},
         {0, 0, PPC_FEATURE_HAS_FPU,     0, 1, 0},
-        {0, MMU_FTR_SLB, 0,             0, 2, 0},
         {CPU_FTR_CTRL, 0, 0,            0, 3, 0},
         {CPU_FTR_NOEXECUTE, 0, 0,       0, 6, 0},
         {CPU_FTR_NODSISRALIGN, 0, 0,    1, 1, 1},
@@ -309,12 +308,10 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
 
         /* Get physical cpuid */
         intserv = of_get_flat_dt_prop(node, "ibm,ppc-interrupt-server#s", &len);
-        if (intserv) {
-                nthreads = len / sizeof(int);
-        } else {
-                intserv = of_get_flat_dt_prop(node, "reg", NULL);
-                nthreads = 1;
-        }
+        if (!intserv)
+                intserv = of_get_flat_dt_prop(node, "reg", &len);
+
+        nthreads = len / sizeof(int);
 
         /*
          * Now see if any of these threads match our boot cpu.
@@ -821,76 +818,6 @@ int cpu_to_chip_id(int cpu)
 }
 EXPORT_SYMBOL(cpu_to_chip_id);
 
-#ifdef CONFIG_PPC_PSERIES
-/*
- * Fix up the uninitialized fields in a new device node:
- * name, type and pci-specific fields
- */
-
-static int of_finish_dynamic_node(struct device_node *node)
-{
-        struct device_node *parent = of_get_parent(node);
-        int err = 0;
-        const phandle *ibm_phandle;
-
-        node->name = of_get_property(node, "name", NULL);
-        node->type = of_get_property(node, "device_type", NULL);
-
-        if (!node->name)
-                node->name = "<NULL>";
-        if (!node->type)
-                node->type = "<NULL>";
-
-        if (!parent) {
-                err = -ENODEV;
-                goto out;
-        }
-
-        /* We don't support that function on PowerMac, at least
-         * not yet
-         */
-        if (machine_is(powermac))
-                return -ENODEV;
-
-        /* fix up new node's phandle field */
-        if ((ibm_phandle = of_get_property(node, "ibm,phandle", NULL)))
-                node->phandle = *ibm_phandle;
-
-out:
-        of_node_put(parent);
-        return err;
-}
-
-static int prom_reconfig_notifier(struct notifier_block *nb,
-                                  unsigned long action, void *node)
-{
-        int err;
-
-        switch (action) {
-        case OF_RECONFIG_ATTACH_NODE:
-                err = of_finish_dynamic_node(node);
-                if (err < 0)
-                        printk(KERN_ERR "finish_node returned %d\n", err);
-                break;
-        default:
-                err = 0;
-                break;
-        }
-        return notifier_from_errno(err);
-}
-
-static struct notifier_block prom_reconfig_nb = {
-        .notifier_call = prom_reconfig_notifier,
-        .priority = 10, /* This one needs to run first */
-};
-
-static int __init prom_reconfig_setup(void)
-{
-        return of_reconfig_notifier_register(&prom_reconfig_nb);
-}
-__initcall(prom_reconfig_setup);
-#endif
-
 bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
 {
         return (int)phys_id == get_hard_smp_processor_id(cpu);
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index e5b022c55ccd..1b0e26013a62 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -456,18 +456,20 @@ void __init smp_setup_cpu_maps(void)
                 intserv = of_get_property(dn, "ibm,ppc-interrupt-server#s",
                                 &len);
                 if (intserv) {
-                        nthreads = len / sizeof(int);
                         DBG("    ibm,ppc-interrupt-server#s -> %d threads\n",
                             nthreads);
                 } else {
                         DBG("    no ibm,ppc-interrupt-server#s -> 1 thread\n");
-                        intserv = of_get_property(dn, "reg", NULL);
+                        intserv = of_get_property(dn, "reg", &len);
                         if (!intserv) {
                                 cpu_be = cpu_to_be32(cpu);
                                 intserv = &cpu_be;      /* assume logical == phys */
+                                len = 4;
                         }
                 }
 
+                nthreads = len / sizeof(int);
+
                 for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) {
                         bool avail;
 
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index ee082d771178..75d62d63fe68 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -149,13 +149,13 @@ static void check_smt_enabled(void)
                 else if (!strcmp(smt_enabled_cmdline, "off"))
                         smt_enabled_at_boot = 0;
                 else {
-                        long smt;
+                        int smt;
                         int rc;
 
-                        rc = strict_strtol(smt_enabled_cmdline, 10, &smt);
+                        rc = kstrtoint(smt_enabled_cmdline, 10, &smt);
                         if (!rc)
                                 smt_enabled_at_boot =
-                                        min(threads_per_core, (int)smt);
+                                        min(threads_per_core, smt);
                 }
         } else {
                 dn = of_find_node_by_path("/options");
@@ -201,7 +201,11 @@ static void cpu_ready_for_interrupts(void)
         /* Set IR and DR in PACA MSR */
         get_paca()->kernel_msr = MSR_KERNEL;
 
-        /* Enable AIL if supported */
+        /*
+         * Enable AIL if supported, and we are in hypervisor mode. If we are
+         * not in hypervisor mode, we enable relocation-on interrupts later
+         * in pSeries_setup_arch() using the H_SET_MODE hcall.
+         */
         if (cpu_has_feature(CPU_FTR_HVMODE) &&
             cpu_has_feature(CPU_FTR_ARCH_207S)) {
                 unsigned long lpcr = mfspr(SPRN_LPCR);
@@ -507,7 +511,11 @@ void __init setup_system(void)
         check_smt_enabled();
         setup_tlb_core_data();
 
-#ifdef CONFIG_SMP
+        /*
+         * Freescale Book3e parts spin in a loop provided by firmware,
+         * so smp_release_cpus() does nothing for them
+         */
+#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_FSL_BOOK3E)
         /* Release secondary cpus out of their spinloops at 0x60 now that
          * we can map physical -> logical CPU ids
          */
@@ -673,9 +681,6 @@ void __init setup_arch(char **cmdline_p)
         exc_lvl_early_init();
         emergency_stack_init();
 
-#ifdef CONFIG_PPC_STD_MMU_64
-        stabs_alloc();
-#endif
         /* set up the bootmem stuff with available memory */
         do_init_bootmem();
         sparse_init();
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 1c794cef2883..cf8c7e4e0b21 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -31,20 +31,14 @@ int show_unhandled_signals = 1;
 /*
  * Allocate space for the signal frame
  */
-void __user * get_sigframe(struct k_sigaction *ka, unsigned long sp,
+void __user *get_sigframe(struct ksignal *ksig, unsigned long sp,
                            size_t frame_size, int is_32)
 {
         unsigned long oldsp, newsp;
 
         /* Default to using normal stack */
         oldsp = get_clean_sp(sp, is_32);
-
-        /* Check for alt stack */
-        if ((ka->sa.sa_flags & SA_ONSTACK) &&
-            current->sas_ss_size && !on_sig_stack(oldsp))
-                oldsp = (current->sas_ss_sp + current->sas_ss_size);
-
-        /* Get aligned frame */
+        oldsp = sigsp(oldsp, ksig);
         newsp = (oldsp - frame_size) & ~0xFUL;
 
         /* Check access */
@@ -105,25 +99,23 @@ static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,
         }
 }
 
-static int do_signal(struct pt_regs *regs)
+static void do_signal(struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
         int ret;
         int is32 = is_32bit_task();
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+        get_signal(&ksig);
 
         /* Is there any syscall restart business here ? */
-        check_syscall_restart(regs, &ka, signr > 0);
+        check_syscall_restart(regs, &ksig.ka, ksig.sig > 0);
 
-        if (signr <= 0) {
+        if (ksig.sig <= 0) {
                 /* No signal to deliver -- put the saved sigmask back */
                 restore_saved_sigmask();
                 regs->trap = 0;
-                return 0;               /* no signals delivered */
+                return;               /* no signals delivered */
         }
 
 #ifndef CONFIG_PPC_ADV_DEBUG_REGS
@@ -140,23 +132,16 @@ static int do_signal(struct pt_regs *regs)
         thread_change_pc(current, regs);
 
         if (is32) {
-                if (ka.sa.sa_flags & SA_SIGINFO)
-                        ret = handle_rt_signal32(signr, &ka, &info, oldset,
-                                        regs);
+                if (ksig.ka.sa.sa_flags & SA_SIGINFO)
+                        ret = handle_rt_signal32(&ksig, oldset, regs);
                 else
-                        ret = handle_signal32(signr, &ka, &info, oldset,
-                                        regs);
+                        ret = handle_signal32(&ksig, oldset, regs);
         } else {
-                ret = handle_rt_signal64(signr, &ka, &info, oldset, regs);
+                ret = handle_rt_signal64(&ksig, oldset, regs);
         }
 
         regs->trap = 0;
-        if (ret) {
-                signal_delivered(signr, &info, &ka, regs,
-                                         test_thread_flag(TIF_SINGLESTEP));
-        }
-
-        return ret;
+        signal_setup_done(ret, &ksig, test_thread_flag(TIF_SINGLESTEP));
 }
 
 void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h
index c69b9aeb9f23..51b274199dd9 100644
--- a/arch/powerpc/kernel/signal.h
+++ b/arch/powerpc/kernel/signal.h
@@ -12,15 +12,13 @@
 
 extern void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags);
 
-extern void __user * get_sigframe(struct k_sigaction *ka, unsigned long sp,
+extern void __user *get_sigframe(struct ksignal *ksig, unsigned long sp,
                                   size_t frame_size, int is_32);
 
-extern int handle_signal32(unsigned long sig, struct k_sigaction *ka,
-                           siginfo_t *info, sigset_t *oldset,
+extern int handle_signal32(struct ksignal *ksig, sigset_t *oldset,
                            struct pt_regs *regs);
 
-extern int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
-                              siginfo_t *info, sigset_t *oldset,
+extern int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
                               struct pt_regs *regs);
 
 extern unsigned long copy_fpr_to_user(void __user *to,
@@ -44,14 +42,12 @@ extern unsigned long copy_transact_vsx_from_user(struct task_struct *task,
 
 #ifdef CONFIG_PPC64
 
-extern int handle_rt_signal64(int signr, struct k_sigaction *ka,
-                              siginfo_t *info, sigset_t *set,
+extern int handle_rt_signal64(struct ksignal *ksig, sigset_t *set,
                               struct pt_regs *regs);
 
 #else /* CONFIG_PPC64 */
 
-static inline int handle_rt_signal64(int signr, struct k_sigaction *ka,
-                                     siginfo_t *info, sigset_t *set,
+static inline int handle_rt_signal64(struct ksignal *ksig, sigset_t *set,
                                      struct pt_regs *regs)
 {
         return -EFAULT;
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 1bc5a1755ed4..b171001698ff 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -981,9 +981,8 @@ int copy_siginfo_from_user32(siginfo_t *to, struct compat_siginfo __user *from)
  * Set up a signal frame for a "real-time" signal handler
  * (one which gets siginfo).
  */
-int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
-                siginfo_t *info, sigset_t *oldset,
-                struct pt_regs *regs)
+int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
+                       struct pt_regs *regs)
 {
         struct rt_sigframe __user *rt_sf;
         struct mcontext __user *frame;
@@ -995,13 +994,13 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
 
         /* Set up Signal Frame */
         /* Put a Real Time Context onto stack */
-        rt_sf = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*rt_sf), 1);
+        rt_sf = get_sigframe(ksig, get_tm_stackpointer(regs), sizeof(*rt_sf), 1);
         addr = rt_sf;
         if (unlikely(rt_sf == NULL))
                 goto badframe;
 
         /* Put the siginfo & fill in most of the ucontext */
-        if (copy_siginfo_to_user(&rt_sf->info, info)
+        if (copy_siginfo_to_user(&rt_sf->info, &ksig->info)
             || __put_user(0, &rt_sf->uc.uc_flags)
             || __save_altstack(&rt_sf->uc.uc_stack, regs->gpr[1])
             || __put_user(to_user_ptr(&rt_sf->uc.uc_mcontext),
@@ -1051,15 +1050,15 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
 
         /* Fill registers for signal handler */
         regs->gpr[1] = newsp;
-        regs->gpr[3] = sig;
+        regs->gpr[3] = ksig->sig;
         regs->gpr[4] = (unsigned long) &rt_sf->info;
         regs->gpr[5] = (unsigned long) &rt_sf->uc;
         regs->gpr[6] = (unsigned long) rt_sf;
-        regs->nip = (unsigned long) ka->sa.sa_handler;
+        regs->nip = (unsigned long) ksig->ka.sa.sa_handler;
         /* enter the signal handler in native-endian mode */
         regs->msr &= ~MSR_LE;
         regs->msr |= (MSR_KERNEL & MSR_LE);
-        return 1;
+        return 0;
 
 badframe:
         if (show_unhandled_signals)
@@ -1069,8 +1068,7 @@ badframe:
                                    current->comm, current->pid,
                                    addr, regs->nip, regs->link);
 
-        force_sigsegv(sig, current);
-        return 0;
+        return 1;
 }
 
 static int do_setcontext(struct ucontext __user *ucp, struct pt_regs *regs, int sig)
@@ -1409,8 +1407,7 @@ int sys_debug_setcontext(struct ucontext __user *ctx,
 /*
  * OK, we're invoking a handler
  */
-int handle_signal32(unsigned long sig, struct k_sigaction *ka,
-                    siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
+int handle_signal32(struct ksignal *ksig, sigset_t *oldset, struct pt_regs *regs)
 {
         struct sigcontext __user *sc;
         struct sigframe __user *frame;
@@ -1420,7 +1417,7 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
         unsigned long tramp;
 
         /* Set up Signal Frame */
-        frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 1);
+        frame = get_sigframe(ksig, get_tm_stackpointer(regs), sizeof(*frame), 1);
         if (unlikely(frame == NULL))
                 goto badframe;
         sc = (struct sigcontext __user *) &frame->sctx;
@@ -1428,7 +1425,7 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
 #if _NSIG != 64
 #error "Please adjust handle_signal()"
 #endif
-        if (__put_user(to_user_ptr(ka->sa.sa_handler), &sc->handler)
+        if (__put_user(to_user_ptr(ksig->ka.sa.sa_handler), &sc->handler)
             || __put_user(oldset->sig[0], &sc->oldmask)
 #ifdef CONFIG_PPC64
             || __put_user((oldset->sig[0] >> 32), &sc->_unused[3])
@@ -1436,7 +1433,7 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
             || __put_user(oldset->sig[1], &sc->_unused[3])
 #endif
             || __put_user(to_user_ptr(&frame->mctx), &sc->regs)
-            || __put_user(sig, &sc->signal))
+            || __put_user(ksig->sig, &sc->signal))
                 goto badframe;
 
         if (vdso32_sigtramp && current->mm->context.vdso_base) {
@@ -1471,12 +1468,12 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka,
                 goto badframe;
 
         regs->gpr[1] = newsp;
-        regs->gpr[3] = sig;
+        regs->gpr[3] = ksig->sig;
         regs->gpr[4] = (unsigned long) sc;
-        regs->nip = (unsigned long) ka->sa.sa_handler;
+        regs->nip = (unsigned long) (unsigned long)ksig->ka.sa.sa_handler;
         /* enter the signal handler in big-endian mode */
         regs->msr &= ~MSR_LE;
-        return 1;
+        return 0;
 
 badframe:
         if (show_unhandled_signals)
@@ -1486,8 +1483,7 @@ badframe:
                                    current->comm, current->pid,
                                    frame, regs->nip, regs->link);
 
-        force_sigsegv(sig, current);
-        return 0;
+        return 1;
 }
 
 /*
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 97c1e4b683fc..2cb0c94cafa5 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -708,20 +708,19 @@ badframe:
         return 0;
 }
 
-int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
-                sigset_t *set, struct pt_regs *regs)
+int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
         unsigned long newsp = 0;
         long err = 0;
 
-        frame = get_sigframe(ka, get_tm_stackpointer(regs), sizeof(*frame), 0);
+        frame = get_sigframe(ksig, get_tm_stackpointer(regs), sizeof(*frame), 0);
         if (unlikely(frame == NULL))
                 goto badframe;
 
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
         if (err)
                 goto badframe;
 
@@ -736,15 +735,15 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
                 err |= __put_user(&frame->uc_transact, &frame->uc.uc_link);
                 err |= setup_tm_sigcontexts(&frame->uc.uc_mcontext,
                                             &frame->uc_transact.uc_mcontext,
-                                            regs, signr,
+                                            regs, ksig->sig,
                                             NULL,
-                                            (unsigned long)ka->sa.sa_handler);
+                                            (unsigned long)ksig->ka.sa.sa_handler);
         } else
 #endif
         {
                 err |= __put_user(0, &frame->uc.uc_link);
-                err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, signr,
-                                        NULL, (unsigned long)ka->sa.sa_handler,
+                err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, ksig->sig,
+                                        NULL, (unsigned long)ksig->ka.sa.sa_handler,
                                         1);
         }
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
@@ -770,7 +769,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
 
         /* Set up "regs" so we "return" to the signal handler. */
         if (is_elf2_task()) {
-                regs->nip = (unsigned long) ka->sa.sa_handler;
+                regs->nip = (unsigned long) ksig->ka.sa.sa_handler;
                 regs->gpr[12] = regs->nip;
         } else {
                 /* Handler is *really* a pointer to the function descriptor for
@@ -779,7 +778,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
                  * entry is the TOC value we need to use.
                  */
                 func_descr_t __user *funct_desc_ptr =
-                        (func_descr_t __user *) ka->sa.sa_handler;
+                        (func_descr_t __user *) ksig->ka.sa.sa_handler;
 
                 err |= get_user(regs->nip, &funct_desc_ptr->entry);
                 err |= get_user(regs->gpr[2], &funct_desc_ptr->toc);
@@ -789,9 +788,9 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
         regs->msr &= ~MSR_LE;
         regs->msr |= (MSR_KERNEL & MSR_LE);
         regs->gpr[1] = newsp;
-        regs->gpr[3] = signr;
+        regs->gpr[3] = ksig->sig;
         regs->result = 0;
-        if (ka->sa.sa_flags & SA_SIGINFO) {
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
                 err |= get_user(regs->gpr[4], (unsigned long __user *)&frame->pinfo);
                 err |= get_user(regs->gpr[5], (unsigned long __user *)&frame->puc);
                 regs->gpr[6] = (unsigned long) frame;
@@ -801,7 +800,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
         if (err)
                 goto badframe;
 
-        return 1;
+        return 0;
 
 badframe:
         if (show_unhandled_signals)
@@ -809,6 +808,5 @@ badframe:
                                    current->comm, current->pid, "setup_rt_frame",
                                    (long)frame, regs->nip, regs->link);
 
-        force_sigsegv(signr, current);
-        return 0;
+        return 1;
 }
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 1007fb802e6b..a0738af4aba6 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -376,6 +376,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
                                         GFP_KERNEL, cpu_to_node(cpu));
                 zalloc_cpumask_var_node(&per_cpu(cpu_core_map, cpu),
                                         GFP_KERNEL, cpu_to_node(cpu));
+                /*
+                 * numa_node_id() works after this.
+                 */
+                set_cpu_numa_node(cpu, numa_cpu_lookup_table[cpu]);
+                set_cpu_numa_mem(cpu, local_memory_node(numa_cpu_lookup_table[cpu]));
         }
 
         cpumask_set_cpu(boot_cpuid, cpu_sibling_mask(boot_cpuid));
@@ -723,12 +728,6 @@ void start_secondary(void *unused)
         }
         traverse_core_siblings(cpu, true);
 
-        /*
-         * numa_node_id() works after this.
-         */
-        set_numa_node(numa_cpu_lookup_table[cpu]);
-        set_numa_mem(local_memory_node(numa_cpu_lookup_table[cpu]));
-
         smp_wmb();
         notify_cpu_starting(cpu);
         set_cpu_online(cpu, true);
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S
index 895c50ca943c..7ab5d434e2ee 100644
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@ -39,9 +39,6 @@
 .section .rodata,"a"
 
 #ifdef CONFIG_PPC64
-#define sys_sigpending  sys_ni_syscall
-#define sys_old_getrlimit sys_ni_syscall
-
         .p2align        3
 #endif
 
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 9fff9cdcc519..368ab374d33c 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -741,7 +741,7 @@ static cycle_t timebase_read(struct clocksource *cs)
 }
 
 void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
-                        struct clocksource *clock, u32 mult)
+                         struct clocksource *clock, u32 mult, cycle_t cycle_last)
 {
         u64 new_tb_to_xs, new_stamp_xsec;
         u32 frac_sec;
@@ -774,7 +774,7 @@ void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm,
          * We expect the caller to have done the first increment of
          * vdso_data->tb_update_count already.
          */
-        vdso_data->tb_orig_stamp = clock->cycle_last;
+        vdso_data->tb_orig_stamp = cycle_last;
         vdso_data->stamp_xsec = new_stamp_xsec;
         vdso_data->tb_to_xs = new_tb_to_xs;
         vdso_data->wtom_clock_sec = wtm->tv_sec;
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 239f1cde3fff..0dc43f9932cf 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -302,6 +302,16 @@ long machine_check_early(struct pt_regs *regs)
         return handled;
 }
 
+long hmi_exception_realmode(struct pt_regs *regs)
+{
+        __get_cpu_var(irq_stat).hmi_exceptions++;
+
+        if (ppc_md.hmi_exception_early)
+                ppc_md.hmi_exception_early(regs);
+
+        return 0;
+}
+
 #endif
 
 /*
@@ -609,7 +619,7 @@ int machine_check_e500(struct pt_regs *regs)
         if (reason & MCSR_BUS_RBERR)
                 printk("Bus - Read Data Bus Error\n");
         if (reason & MCSR_BUS_WBERR)
-                printk("Bus - Read Data Bus Error\n");
+                printk("Bus - Write Data Bus Error\n");
         if (reason & MCSR_BUS_IPERR)
                 printk("Bus - Instruction Parity Error\n");
         if (reason & MCSR_BUS_RPERR)
@@ -738,6 +748,20 @@ void SMIException(struct pt_regs *regs)
         die("System Management Interrupt", regs, SIGABRT);
 }
 
+void handle_hmi_exception(struct pt_regs *regs)
+{
+        struct pt_regs *old_regs;
+
+        old_regs = set_irq_regs(regs);
+        irq_enter();
+
+        if (ppc_md.handle_hmi_exception)
+                ppc_md.handle_hmi_exception(regs);
+
+        irq_exit();
+        set_irq_regs(old_regs);
+}
+
 void unknown_exception(struct pt_regs *regs)
 {
         enum ctx_state prev_state = exception_enter();
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index ce74c335a6a4..f174351842cf 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -840,19 +840,3 @@ static int __init vdso_init(void)
         return 0;
 }
 arch_initcall(vdso_init);
-
-int in_gate_area_no_mm(unsigned long addr)
-{
-        return 0;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long addr)
-{
-        return 0;
-}
-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-        return NULL;
-}
-
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 904c66128fae..5bfdab9047be 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -977,7 +977,7 @@ static ssize_t viodev_cmo_desired_set(struct device *dev,
         size_t new_desired;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &new_desired);
+        ret = kstrtoul(buf, 10, &new_desired);
         if (ret)
                 return ret;
 
diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
deleted file mode 100644
index 9cb4b0a36031..000000000000
--- a/arch/powerpc/kvm/44x.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * 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 IBM Corp. 2008
- *
- * Authors: Hollis Blanchard <hollisb@us.ibm.com>
- */
-
-#include <linux/kvm_host.h>
-#include <linux/slab.h>
-#include <linux/err.h>
-#include <linux/export.h>
-#include <linux/module.h>
-#include <linux/miscdevice.h>
-
-#include <asm/reg.h>
-#include <asm/cputable.h>
-#include <asm/tlbflush.h>
-#include <asm/kvm_44x.h>
-#include <asm/kvm_ppc.h>
-
-#include "44x_tlb.h"
-#include "booke.h"
-
-static void kvmppc_core_vcpu_load_44x(struct kvm_vcpu *vcpu, int cpu)
-{
-        kvmppc_booke_vcpu_load(vcpu, cpu);
-        kvmppc_44x_tlb_load(vcpu);
-}
-
-static void kvmppc_core_vcpu_put_44x(struct kvm_vcpu *vcpu)
-{
-        kvmppc_44x_tlb_put(vcpu);
-        kvmppc_booke_vcpu_put(vcpu);
-}
-
-int kvmppc_core_check_processor_compat(void)
-{
-        int r;
-
-        if (strncmp(cur_cpu_spec->platform, "ppc440", 6) == 0)
-                r = 0;
-        else
-                r = -ENOTSUPP;
-
-        return r;
-}
-
-int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        struct kvmppc_44x_tlbe *tlbe = &vcpu_44x->guest_tlb[0];
-        int i;
-
-        tlbe->tid = 0;
-        tlbe->word0 = PPC44x_TLB_16M | PPC44x_TLB_VALID;
-        tlbe->word1 = 0;
-        tlbe->word2 = PPC44x_TLB_SX | PPC44x_TLB_SW | PPC44x_TLB_SR;
-
-        tlbe++;
-        tlbe->tid = 0;
-        tlbe->word0 = 0xef600000 | PPC44x_TLB_4K | PPC44x_TLB_VALID;
-        tlbe->word1 = 0xef600000;
-        tlbe->word2 = PPC44x_TLB_SX | PPC44x_TLB_SW | PPC44x_TLB_SR
-                      | PPC44x_TLB_I | PPC44x_TLB_G;
-
-        /* Since the guest can directly access the timebase, it must know the
-         * real timebase frequency. Accordingly, it must see the state of
-         * CCR1[TCS]. */
-        /* XXX CCR1 doesn't exist on all 440 SoCs. */
-        vcpu->arch.ccr1 = mfspr(SPRN_CCR1);
-
-        for (i = 0; i < ARRAY_SIZE(vcpu_44x->shadow_refs); i++)
-                vcpu_44x->shadow_refs[i].gtlb_index = -1;
-
-        vcpu->arch.cpu_type = KVM_CPU_440;
-        vcpu->arch.pvr = mfspr(SPRN_PVR);
-
-        return 0;
-}
-
-/* 'linear_address' is actually an encoding of AS|PID|EADDR . */
-int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu,
-                               struct kvm_translation *tr)
-{
-        int index;
-        gva_t eaddr;
-        u8 pid;
-        u8 as;
-
-        eaddr = tr->linear_address;
-        pid = (tr->linear_address >> 32) & 0xff;
-        as = (tr->linear_address >> 40) & 0x1;
-
-        index = kvmppc_44x_tlb_index(vcpu, eaddr, pid, as);
-        if (index == -1) {
-                tr->valid = 0;
-                return 0;
-        }
-
-        tr->physical_address = kvmppc_mmu_xlate(vcpu, index, eaddr);
-        /* XXX what does "writeable" and "usermode" even mean? */
-        tr->valid = 1;
-
-        return 0;
-}
-
-static int kvmppc_core_get_sregs_44x(struct kvm_vcpu *vcpu,
-                                      struct kvm_sregs *sregs)
-{
-        return kvmppc_get_sregs_ivor(vcpu, sregs);
-}
-
-static int kvmppc_core_set_sregs_44x(struct kvm_vcpu *vcpu,
-                                     struct kvm_sregs *sregs)
-{
-        return kvmppc_set_sregs_ivor(vcpu, sregs);
-}
-
-static int kvmppc_get_one_reg_44x(struct kvm_vcpu *vcpu, u64 id,
-                                  union kvmppc_one_reg *val)
-{
-        return -EINVAL;
-}
-
-static int kvmppc_set_one_reg_44x(struct kvm_vcpu *vcpu, u64 id,
-                                  union kvmppc_one_reg *val)
-{
-        return -EINVAL;
-}
-
-static struct kvm_vcpu *kvmppc_core_vcpu_create_44x(struct kvm *kvm,
-                                                    unsigned int id)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x;
-        struct kvm_vcpu *vcpu;
-        int err;
-
-        vcpu_44x = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);
-        if (!vcpu_44x) {
-                err = -ENOMEM;
-                goto out;
-        }
-
-        vcpu = &vcpu_44x->vcpu;
-        err = kvm_vcpu_init(vcpu, kvm, id);
-        if (err)
-                goto free_vcpu;
-
-        vcpu->arch.shared = (void*)__get_free_page(GFP_KERNEL|__GFP_ZERO);
-        if (!vcpu->arch.shared)
-                goto uninit_vcpu;
-
-        return vcpu;
-
-uninit_vcpu:
-        kvm_vcpu_uninit(vcpu);
-free_vcpu:
-        kmem_cache_free(kvm_vcpu_cache, vcpu_44x);
-out:
-        return ERR_PTR(err);
-}
-
-static void kvmppc_core_vcpu_free_44x(struct kvm_vcpu *vcpu)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-
-        free_page((unsigned long)vcpu->arch.shared);
-        kvm_vcpu_uninit(vcpu);
-        kmem_cache_free(kvm_vcpu_cache, vcpu_44x);
-}
-
-static int kvmppc_core_init_vm_44x(struct kvm *kvm)
-{
-        return 0;
-}
-
-static void kvmppc_core_destroy_vm_44x(struct kvm *kvm)
-{
-}
-
-static struct kvmppc_ops kvm_ops_44x = {
-        .get_sregs = kvmppc_core_get_sregs_44x,
-        .set_sregs = kvmppc_core_set_sregs_44x,
-        .get_one_reg = kvmppc_get_one_reg_44x,
-        .set_one_reg = kvmppc_set_one_reg_44x,
-        .vcpu_load   = kvmppc_core_vcpu_load_44x,
-        .vcpu_put    = kvmppc_core_vcpu_put_44x,
-        .vcpu_create = kvmppc_core_vcpu_create_44x,
-        .vcpu_free   = kvmppc_core_vcpu_free_44x,
-        .mmu_destroy  = kvmppc_mmu_destroy_44x,
-        .init_vm = kvmppc_core_init_vm_44x,
-        .destroy_vm = kvmppc_core_destroy_vm_44x,
-        .emulate_op = kvmppc_core_emulate_op_44x,
-        .emulate_mtspr = kvmppc_core_emulate_mtspr_44x,
-        .emulate_mfspr = kvmppc_core_emulate_mfspr_44x,
-};
-
-static int __init kvmppc_44x_init(void)
-{
-        int r;
-
-        r = kvmppc_booke_init();
-        if (r)
-                goto err_out;
-
-        r = kvm_init(NULL, sizeof(struct kvmppc_vcpu_44x), 0, THIS_MODULE);
-        if (r)
-                goto err_out;
-        kvm_ops_44x.owner = THIS_MODULE;
-        kvmppc_pr_ops = &kvm_ops_44x;
-
-err_out:
-        return r;
-}
-
-static void __exit kvmppc_44x_exit(void)
-{
-        kvmppc_pr_ops = NULL;
-        kvmppc_booke_exit();
-}
-
-module_init(kvmppc_44x_init);
-module_exit(kvmppc_44x_exit);
-MODULE_ALIAS_MISCDEV(KVM_MINOR);
-MODULE_ALIAS("devname:kvm");
diff --git a/arch/powerpc/kvm/44x_emulate.c b/arch/powerpc/kvm/44x_emulate.c
deleted file mode 100644
index 92c9ab4bcfec..000000000000
--- a/arch/powerpc/kvm/44x_emulate.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * 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 IBM Corp. 2008
- *
- * Authors: Hollis Blanchard <hollisb@us.ibm.com>
- */
-
-#include <asm/kvm_ppc.h>
-#include <asm/dcr.h>
-#include <asm/dcr-regs.h>
-#include <asm/disassemble.h>
-#include <asm/kvm_44x.h>
-#include "timing.h"
-
-#include "booke.h"
-#include "44x_tlb.h"
-
-#define XOP_MFDCRX  259
-#define XOP_MFDCR   323
-#define XOP_MTDCRX  387
-#define XOP_MTDCR   451
-#define XOP_TLBSX   914
-#define XOP_ICCCI   966
-#define XOP_TLBWE   978
-
-static int emulate_mtdcr(struct kvm_vcpu *vcpu, int rs, int dcrn)
-{
-        /* emulate some access in kernel */
-        switch (dcrn) {
-        case DCRN_CPR0_CONFIG_ADDR:
-                vcpu->arch.cpr0_cfgaddr = kvmppc_get_gpr(vcpu, rs);
-                return EMULATE_DONE;
-        default:
-                vcpu->run->dcr.dcrn = dcrn;
-                vcpu->run->dcr.data = kvmppc_get_gpr(vcpu, rs);
-                vcpu->run->dcr.is_write = 1;
-                vcpu->arch.dcr_is_write = 1;
-                vcpu->arch.dcr_needed = 1;
-                kvmppc_account_exit(vcpu, DCR_EXITS);
-                return EMULATE_DO_DCR;
-        }
-}
-
-static int emulate_mfdcr(struct kvm_vcpu *vcpu, int rt, int dcrn)
-{
-        /* The guest may access CPR0 registers to determine the timebase
-         * frequency, and it must know the real host frequency because it
-         * can directly access the timebase registers.
-         *
-         * It would be possible to emulate those accesses in userspace,
-         * but userspace can really only figure out the end frequency.
-         * We could decompose that into the factors that compute it, but
-         * that's tricky math, and it's easier to just report the real
-         * CPR0 values.
-         */
-        switch (dcrn) {
-        case DCRN_CPR0_CONFIG_ADDR:
-                kvmppc_set_gpr(vcpu, rt, vcpu->arch.cpr0_cfgaddr);
-                break;
-        case DCRN_CPR0_CONFIG_DATA:
-                local_irq_disable();
-                mtdcr(DCRN_CPR0_CONFIG_ADDR,
-                          vcpu->arch.cpr0_cfgaddr);
-                kvmppc_set_gpr(vcpu, rt,
-                               mfdcr(DCRN_CPR0_CONFIG_DATA));
-                local_irq_enable();
-                break;
-        default:
-                vcpu->run->dcr.dcrn = dcrn;
-                vcpu->run->dcr.data =  0;
-                vcpu->run->dcr.is_write = 0;
-                vcpu->arch.dcr_is_write = 0;
-                vcpu->arch.io_gpr = rt;
-                vcpu->arch.dcr_needed = 1;
-                kvmppc_account_exit(vcpu, DCR_EXITS);
-                return EMULATE_DO_DCR;
-        }
-
-        return EMULATE_DONE;
-}
-
-int kvmppc_core_emulate_op_44x(struct kvm_run *run, struct kvm_vcpu *vcpu,
-                               unsigned int inst, int *advance)
-{
-        int emulated = EMULATE_DONE;
-        int dcrn = get_dcrn(inst);
-        int ra = get_ra(inst);
-        int rb = get_rb(inst);
-        int rc = get_rc(inst);
-        int rs = get_rs(inst);
-        int rt = get_rt(inst);
-        int ws = get_ws(inst);
-
-        switch (get_op(inst)) {
-        case 31:
-                switch (get_xop(inst)) {
-
-                case XOP_MFDCR:
-                        emulated = emulate_mfdcr(vcpu, rt, dcrn);
-                        break;
-
-                case XOP_MFDCRX:
-                        emulated = emulate_mfdcr(vcpu, rt,
-                                        kvmppc_get_gpr(vcpu, ra));
-                        break;
-
-                case XOP_MTDCR:
-                        emulated = emulate_mtdcr(vcpu, rs, dcrn);
-                        break;
-
-                case XOP_MTDCRX:
-                        emulated = emulate_mtdcr(vcpu, rs,
-                                        kvmppc_get_gpr(vcpu, ra));
-                        break;
-
-                case XOP_TLBWE:
-                        emulated = kvmppc_44x_emul_tlbwe(vcpu, ra, rs, ws);
-                        break;
-
-                case XOP_TLBSX:
-                        emulated = kvmppc_44x_emul_tlbsx(vcpu, rt, ra, rb, rc);
-                        break;
-
-                case XOP_ICCCI:
-                        break;
-
-                default:
-                        emulated = EMULATE_FAIL;
-                }
-
-                break;
-
-        default:
-                emulated = EMULATE_FAIL;
-        }
-
-        if (emulated == EMULATE_FAIL)
-                emulated = kvmppc_booke_emulate_op(run, vcpu, inst, advance);
-
-        return emulated;
-}
-
-int kvmppc_core_emulate_mtspr_44x(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)
-{
-        int emulated = EMULATE_DONE;
-
-        switch (sprn) {
-        case SPRN_PID:
-                kvmppc_set_pid(vcpu, spr_val); break;
-        case SPRN_MMUCR:
-                vcpu->arch.mmucr = spr_val; break;
-        case SPRN_CCR0:
-                vcpu->arch.ccr0 = spr_val; break;
-        case SPRN_CCR1:
-                vcpu->arch.ccr1 = spr_val; break;
-        default:
-                emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, spr_val);
-        }
-
-        return emulated;
-}
-
-int kvmppc_core_emulate_mfspr_44x(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val)
-{
-        int emulated = EMULATE_DONE;
-
-        switch (sprn) {
-        case SPRN_PID:
-                *spr_val = vcpu->arch.pid; break;
-        case SPRN_MMUCR:
-                *spr_val = vcpu->arch.mmucr; break;
-        case SPRN_CCR0:
-                *spr_val = vcpu->arch.ccr0; break;
-        case SPRN_CCR1:
-                *spr_val = vcpu->arch.ccr1; break;
-        default:
-                emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, spr_val);
-        }
-
-        return emulated;
-}
-
diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
deleted file mode 100644
index 0deef1082e02..000000000000
--- a/arch/powerpc/kvm/44x_tlb.c
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * 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 IBM Corp. 2007
- *
- * Authors: Hollis Blanchard <hollisb@us.ibm.com>
- */
-
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/kvm.h>
-#include <linux/kvm_host.h>
-#include <linux/highmem.h>
-
-#include <asm/tlbflush.h>
-#include <asm/mmu-44x.h>
-#include <asm/kvm_ppc.h>
-#include <asm/kvm_44x.h>
-#include "timing.h"
-
-#include "44x_tlb.h"
-#include "trace.h"
-
-#ifndef PPC44x_TLBE_SIZE
-#define PPC44x_TLBE_SIZE        PPC44x_TLB_4K
-#endif
-
-#define PAGE_SIZE_4K (1<<12)
-#define PAGE_MASK_4K (~(PAGE_SIZE_4K - 1))
-
-#define PPC44x_TLB_UATTR_MASK \
-        (PPC44x_TLB_U0|PPC44x_TLB_U1|PPC44x_TLB_U2|PPC44x_TLB_U3)
-#define PPC44x_TLB_USER_PERM_MASK (PPC44x_TLB_UX|PPC44x_TLB_UR|PPC44x_TLB_UW)
-#define PPC44x_TLB_SUPER_PERM_MASK (PPC44x_TLB_SX|PPC44x_TLB_SR|PPC44x_TLB_SW)
-
-#ifdef DEBUG
-void kvmppc_dump_tlbs(struct kvm_vcpu *vcpu)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        struct kvmppc_44x_tlbe *tlbe;
-        int i;
-
-        printk("vcpu %d TLB dump:\n", vcpu->vcpu_id);
-        printk("| %2s | %3s | %8s | %8s | %8s |\n",
-                        "nr", "tid", "word0", "word1", "word2");
-
-        for (i = 0; i < ARRAY_SIZE(vcpu_44x->guest_tlb); i++) {
-                tlbe = &vcpu_44x->guest_tlb[i];
-                if (tlbe->word0 & PPC44x_TLB_VALID)
-                        printk(" G%2d |  %02X | %08X | %08X | %08X |\n",
-                               i, tlbe->tid, tlbe->word0, tlbe->word1,
-                               tlbe->word2);
-        }
-}
-#endif
-
-static inline void kvmppc_44x_tlbie(unsigned int index)
-{
-        /* 0 <= index < 64, so the V bit is clear and we can use the index as
-         * word0. */
-        asm volatile(
-                "tlbwe %[index], %[index], 0\n"
-        :
-        : [index] "r"(index)
-        );
-}
-
-static inline void kvmppc_44x_tlbre(unsigned int index,
-                                    struct kvmppc_44x_tlbe *tlbe)
-{
-        asm volatile(
-                "tlbre %[word0], %[index], 0\n"
-                "mfspr %[tid], %[sprn_mmucr]\n"
-                "andi. %[tid], %[tid], 0xff\n"
-                "tlbre %[word1], %[index], 1\n"
-                "tlbre %[word2], %[index], 2\n"
-                : [word0] "=r"(tlbe->word0),
-                  [word1] "=r"(tlbe->word1),
-                  [word2] "=r"(tlbe->word2),
-                  [tid]   "=r"(tlbe->tid)
-                : [index] "r"(index),
-                  [sprn_mmucr] "i"(SPRN_MMUCR)
-                : "cc"
-        );
-}
-
-static inline void kvmppc_44x_tlbwe(unsigned int index,
-                                    struct kvmppc_44x_tlbe *stlbe)
-{
-        unsigned long tmp;
-
-        asm volatile(
-                "mfspr %[tmp], %[sprn_mmucr]\n"
-                "rlwimi %[tmp], %[tid], 0, 0xff\n"
-                "mtspr %[sprn_mmucr], %[tmp]\n"
-                "tlbwe %[word0], %[index], 0\n"
-                "tlbwe %[word1], %[index], 1\n"
-                "tlbwe %[word2], %[index], 2\n"
-                : [tmp]   "=&r"(tmp)
-                : [word0] "r"(stlbe->word0),
-                  [word1] "r"(stlbe->word1),
-                  [word2] "r"(stlbe->word2),
-                  [tid]   "r"(stlbe->tid),
-                  [index] "r"(index),
-                  [sprn_mmucr] "i"(SPRN_MMUCR)
-        );
-}
-
-static u32 kvmppc_44x_tlb_shadow_attrib(u32 attrib, int usermode)
-{
-        /* We only care about the guest's permission and user bits. */
-        attrib &= PPC44x_TLB_PERM_MASK|PPC44x_TLB_UATTR_MASK;
-
-        if (!usermode) {
-                /* Guest is in supervisor mode, so we need to translate guest
-                 * supervisor permissions into user permissions. */
-                attrib &= ~PPC44x_TLB_USER_PERM_MASK;
-                attrib |= (attrib & PPC44x_TLB_SUPER_PERM_MASK) << 3;
-        }
-
-        /* Make sure host can always access this memory. */
-        attrib |= PPC44x_TLB_SX|PPC44x_TLB_SR|PPC44x_TLB_SW;
-
-        /* WIMGE = 0b00100 */
-        attrib |= PPC44x_TLB_M;
-
-        return attrib;
-}
-
-/* Load shadow TLB back into hardware. */
-void kvmppc_44x_tlb_load(struct kvm_vcpu *vcpu)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        int i;
-
-        for (i = 0; i <= tlb_44x_hwater; i++) {
-                struct kvmppc_44x_tlbe *stlbe = &vcpu_44x->shadow_tlb[i];
-
-                if (get_tlb_v(stlbe) && get_tlb_ts(stlbe))
-                        kvmppc_44x_tlbwe(i, stlbe);
-        }
-}
-
-static void kvmppc_44x_tlbe_set_modified(struct kvmppc_vcpu_44x *vcpu_44x,
-                                         unsigned int i)
-{
-        vcpu_44x->shadow_tlb_mod[i] = 1;
-}
-
-/* Save hardware TLB to the vcpu, and invalidate all guest mappings. */
-void kvmppc_44x_tlb_put(struct kvm_vcpu *vcpu)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        int i;
-
-        for (i = 0; i <= tlb_44x_hwater; i++) {
-                struct kvmppc_44x_tlbe *stlbe = &vcpu_44x->shadow_tlb[i];
-
-                if (vcpu_44x->shadow_tlb_mod[i])
-                        kvmppc_44x_tlbre(i, stlbe);
-
-                if (get_tlb_v(stlbe) && get_tlb_ts(stlbe))
-                        kvmppc_44x_tlbie(i);
-        }
-}
-
-
-/* Search the guest TLB for a matching entry. */
-int kvmppc_44x_tlb_index(struct kvm_vcpu *vcpu, gva_t eaddr, unsigned int pid,
-                         unsigned int as)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        int i;
-
-        /* XXX Replace loop with fancy data structures. */
-        for (i = 0; i < ARRAY_SIZE(vcpu_44x->guest_tlb); i++) {
-                struct kvmppc_44x_tlbe *tlbe = &vcpu_44x->guest_tlb[i];
-                unsigned int tid;
-
-                if (eaddr < get_tlb_eaddr(tlbe))
-                        continue;
-
-                if (eaddr > get_tlb_end(tlbe))
-                        continue;
-
-                tid = get_tlb_tid(tlbe);
-                if (tid && (tid != pid))
-                        continue;
-
-                if (!get_tlb_v(tlbe))
-                        continue;
-
-                if (get_tlb_ts(tlbe) != as)
-                        continue;
-
-                return i;
-        }
-
-        return -1;
-}
-
-gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index,
-                       gva_t eaddr)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        struct kvmppc_44x_tlbe *gtlbe = &vcpu_44x->guest_tlb[gtlb_index];
-        unsigned int pgmask = get_tlb_bytes(gtlbe) - 1;
-
-        return get_tlb_raddr(gtlbe) | (eaddr & pgmask);
-}
-
-int kvmppc_mmu_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr)
-{
-        unsigned int as = !!(vcpu->arch.shared->msr & MSR_IS);
-
-        return kvmppc_44x_tlb_index(vcpu, eaddr, vcpu->arch.pid, as);
-}
-
-int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr)
-{
-        unsigned int as = !!(vcpu->arch.shared->msr & MSR_DS);
-
-        return kvmppc_44x_tlb_index(vcpu, eaddr, vcpu->arch.pid, as);
-}
-
-void kvmppc_mmu_itlb_miss(struct kvm_vcpu *vcpu)
-{
-}
-
-void kvmppc_mmu_dtlb_miss(struct kvm_vcpu *vcpu)
-{
-}
-
-static void kvmppc_44x_shadow_release(struct kvmppc_vcpu_44x *vcpu_44x,
-                                      unsigned int stlb_index)
-{
-        struct kvmppc_44x_shadow_ref *ref = &vcpu_44x->shadow_refs[stlb_index];
-
-        if (!ref->page)
-                return;
-
-        /* Discard from the TLB. */
-        /* Note: we could actually invalidate a host mapping, if the host overwrote
-         * this TLB entry since we inserted a guest mapping. */
-        kvmppc_44x_tlbie(stlb_index);
-
-        /* Now release the page. */
-        if (ref->writeable)
-                kvm_release_page_dirty(ref->page);
-        else
-                kvm_release_page_clean(ref->page);
-
-        ref->page = NULL;
-
-        /* XXX set tlb_44x_index to stlb_index? */
-
-        trace_kvm_stlb_inval(stlb_index);
-}
-
-void kvmppc_mmu_destroy_44x(struct kvm_vcpu *vcpu)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        int i;
-
-        for (i = 0; i <= tlb_44x_hwater; i++)
-                kvmppc_44x_shadow_release(vcpu_44x, i);
-}
-
-/**
- * kvmppc_mmu_map -- create a host mapping for guest memory
- *
- * If the guest wanted a larger page than the host supports, only the first
- * host page is mapped here and the rest are demand faulted.
- *
- * If the guest wanted a smaller page than the host page size, we map only the
- * guest-size page (i.e. not a full host page mapping).
- *
- * Caller must ensure that the specified guest TLB entry is safe to insert into
- * the shadow TLB.
- */
-void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr,
-                    unsigned int gtlb_index)
-{
-        struct kvmppc_44x_tlbe stlbe;
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        struct kvmppc_44x_tlbe *gtlbe = &vcpu_44x->guest_tlb[gtlb_index];
-        struct kvmppc_44x_shadow_ref *ref;
-        struct page *new_page;
-        hpa_t hpaddr;
-        gfn_t gfn;
-        u32 asid = gtlbe->tid;
-        u32 flags = gtlbe->word2;
-        u32 max_bytes = get_tlb_bytes(gtlbe);
-        unsigned int victim;
-
-        /* Select TLB entry to clobber. Indirectly guard against races with the TLB
-         * miss handler by disabling interrupts. */
-        local_irq_disable();
-        victim = ++tlb_44x_index;
-        if (victim > tlb_44x_hwater)
-                victim = 0;
-        tlb_44x_index = victim;
-        local_irq_enable();
-
-        /* Get reference to new page. */
-        gfn = gpaddr >> PAGE_SHIFT;
-        new_page = gfn_to_page(vcpu->kvm, gfn);
-        if (is_error_page(new_page)) {
-                printk(KERN_ERR "Couldn't get guest page for gfn %llx!\n",
-                        (unsigned long long)gfn);
-                return;
-        }
-        hpaddr = page_to_phys(new_page);
-
-        /* Invalidate any previous shadow mappings. */
-        kvmppc_44x_shadow_release(vcpu_44x, victim);
-
-        /* XXX Make sure (va, size) doesn't overlap any other
-         * entries. 440x6 user manual says the result would be
-         * "undefined." */
-
-        /* XXX what about AS? */
-
-        /* Force TS=1 for all guest mappings. */
-        stlbe.word0 = PPC44x_TLB_VALID | PPC44x_TLB_TS;
-
-        if (max_bytes >= PAGE_SIZE) {
-                /* Guest mapping is larger than or equal to host page size. We can use
-                 * a "native" host mapping. */
-                stlbe.word0 |= (gvaddr & PAGE_MASK) | PPC44x_TLBE_SIZE;
-        } else {
-                /* Guest mapping is smaller than host page size. We must restrict the
-                 * size of the mapping to be at most the smaller of the two, but for
-                 * simplicity we fall back to a 4K mapping (this is probably what the
-                 * guest is using anyways). */
-                stlbe.word0 |= (gvaddr & PAGE_MASK_4K) | PPC44x_TLB_4K;
-
-                /* 'hpaddr' is a host page, which is larger than the mapping we're
-                 * inserting here. To compensate, we must add the in-page offset to the
-                 * sub-page. */
-                hpaddr |= gpaddr & (PAGE_MASK ^ PAGE_MASK_4K);
-        }
-
-        stlbe.word1 = (hpaddr & 0xfffffc00) | ((hpaddr >> 32) & 0xf);
-        stlbe.word2 = kvmppc_44x_tlb_shadow_attrib(flags,
-                                                    vcpu->arch.shared->msr & MSR_PR);
-        stlbe.tid = !(asid & 0xff);
-
-        /* Keep track of the reference so we can properly release it later. */
-        ref = &vcpu_44x->shadow_refs[victim];
-        ref->page = new_page;
-        ref->gtlb_index = gtlb_index;
-        ref->writeable = !!(stlbe.word2 & PPC44x_TLB_UW);
-        ref->tid = stlbe.tid;
-
-        /* Insert shadow mapping into hardware TLB. */
-        kvmppc_44x_tlbe_set_modified(vcpu_44x, victim);
-        kvmppc_44x_tlbwe(victim, &stlbe);
-        trace_kvm_stlb_write(victim, stlbe.tid, stlbe.word0, stlbe.word1,
-                             stlbe.word2);
-}
-
-/* For a particular guest TLB entry, invalidate the corresponding host TLB
- * mappings and release the host pages. */
-static void kvmppc_44x_invalidate(struct kvm_vcpu *vcpu,
-                                  unsigned int gtlb_index)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(vcpu_44x->shadow_refs); i++) {
-                struct kvmppc_44x_shadow_ref *ref = &vcpu_44x->shadow_refs[i];
-                if (ref->gtlb_index == gtlb_index)
-                        kvmppc_44x_shadow_release(vcpu_44x, i);
-        }
-}
-
-void kvmppc_mmu_msr_notify(struct kvm_vcpu *vcpu, u32 old_msr)
-{
-        int usermode = vcpu->arch.shared->msr & MSR_PR;
-
-        vcpu->arch.shadow_pid = !usermode;
-}
-
-void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 new_pid)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        int i;
-
-        if (unlikely(vcpu->arch.pid == new_pid))
-                return;
-
-        vcpu->arch.pid = new_pid;
-
-        /* Guest userspace runs with TID=0 mappings and PID=0, to make sure it
-         * can't access guest kernel mappings (TID=1). When we switch to a new
-         * guest PID, which will also use host PID=0, we must discard the old guest
-         * userspace mappings. */
-        for (i = 0; i < ARRAY_SIZE(vcpu_44x->shadow_refs); i++) {
-                struct kvmppc_44x_shadow_ref *ref = &vcpu_44x->shadow_refs[i];
-
-                if (ref->tid == 0)
-                        kvmppc_44x_shadow_release(vcpu_44x, i);
-        }
-}
-
-static int tlbe_is_host_safe(const struct kvm_vcpu *vcpu,
-                             const struct kvmppc_44x_tlbe *tlbe)
-{
-        gpa_t gpa;
-
-        if (!get_tlb_v(tlbe))
-                return 0;
-
-        /* Does it match current guest AS? */
-        /* XXX what about IS != DS? */
-        if (get_tlb_ts(tlbe) != !!(vcpu->arch.shared->msr & MSR_IS))
-                return 0;
-
-        gpa = get_tlb_raddr(tlbe);
-        if (!gfn_to_memslot(vcpu->kvm, gpa >> PAGE_SHIFT))
-                /* Mapping is not for RAM. */
-                return 0;
-
-        return 1;
-}
-
-int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws)
-{
-        struct kvmppc_vcpu_44x *vcpu_44x = to_44x(vcpu);
-        struct kvmppc_44x_tlbe *tlbe;
-        unsigned int gtlb_index;
-        int idx;
-
-        gtlb_index = kvmppc_get_gpr(vcpu, ra);
-        if (gtlb_index >= KVM44x_GUEST_TLB_SIZE) {
-                printk("%s: index %d\n", __func__, gtlb_index);
-                kvmppc_dump_vcpu(vcpu);
-                return EMULATE_FAIL;
-        }
-
-        tlbe = &vcpu_44x->guest_tlb[gtlb_index];
-
-        /* Invalidate shadow mappings for the about-to-be-clobbered TLB entry. */
-        if (tlbe->word0 & PPC44x_TLB_VALID)
-                kvmppc_44x_invalidate(vcpu, gtlb_index);
-
-        switch (ws) {
-        case PPC44x_TLB_PAGEID:
-                tlbe->tid = get_mmucr_stid(vcpu);
-                tlbe->word0 = kvmppc_get_gpr(vcpu, rs);
-                break;
-
-        case PPC44x_TLB_XLAT:
-                tlbe->word1 = kvmppc_get_gpr(vcpu, rs);
-                break;
-
-        case PPC44x_TLB_ATTRIB:
-                tlbe->word2 = kvmppc_get_gpr(vcpu, rs);
-                break;
-
-        default:
-                return EMULATE_FAIL;
-        }
-
-        idx = srcu_read_lock(&vcpu->kvm->srcu);
-
-        if (tlbe_is_host_safe(vcpu, tlbe)) {
-                gva_t eaddr;
-                gpa_t gpaddr;
-                u32 bytes;
-
-                eaddr = get_tlb_eaddr(tlbe);
-                gpaddr = get_tlb_raddr(tlbe);
-
-                /* Use the advertised page size to mask effective and real addrs. */
-                bytes = get_tlb_bytes(tlbe);
-                eaddr &= ~(bytes - 1);
-                gpaddr &= ~(bytes - 1);
-
-                kvmppc_mmu_map(vcpu, eaddr, gpaddr, gtlb_index);
-        }
-
-        srcu_read_unlock(&vcpu->kvm->srcu, idx);
-
-        trace_kvm_gtlb_write(gtlb_index, tlbe->tid, tlbe->word0, tlbe->word1,
-                             tlbe->word2);
-
-        kvmppc_set_exit_type(vcpu, EMULATED_TLBWE_EXITS);
-        return EMULATE_DONE;
-}
-
-int kvmppc_44x_emul_tlbsx(struct kvm_vcpu *vcpu, u8 rt, u8 ra, u8 rb, u8 rc)
-{
-        u32 ea;
-        int gtlb_index;
-        unsigned int as = get_mmucr_sts(vcpu);
-        unsigned int pid = get_mmucr_stid(vcpu);
-
-        ea = kvmppc_get_gpr(vcpu, rb);
-        if (ra)
-                ea += kvmppc_get_gpr(vcpu, ra);
-
-        gtlb_index = kvmppc_44x_tlb_index(vcpu, ea, pid, as);
-        if (rc) {
-                u32 cr = kvmppc_get_cr(vcpu);
-
-                if (gtlb_index < 0)
-                        kvmppc_set_cr(vcpu, cr & ~0x20000000);
-                else
-                        kvmppc_set_cr(vcpu, cr | 0x20000000);
-        }
-        kvmppc_set_gpr(vcpu, rt, gtlb_index);
-
-        kvmppc_set_exit_type(vcpu, EMULATED_TLBSX_EXITS);
-        return EMULATE_DONE;
-}
diff --git a/arch/powerpc/kvm/44x_tlb.h b/arch/powerpc/kvm/44x_tlb.h
deleted file mode 100644
index a9ff80e51526..000000000000
--- a/arch/powerpc/kvm/44x_tlb.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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 IBM Corp. 2007
- *
- * Authors: Hollis Blanchard <hollisb@us.ibm.com>
- */
-
-#ifndef __KVM_POWERPC_TLB_H__
-#define __KVM_POWERPC_TLB_H__
-
-#include <linux/kvm_host.h>
-#include <asm/mmu-44x.h>
-
-extern int kvmppc_44x_tlb_index(struct kvm_vcpu *vcpu, gva_t eaddr,
-                                unsigned int pid, unsigned int as);
-
-extern int kvmppc_44x_emul_tlbsx(struct kvm_vcpu *vcpu, u8 rt, u8 ra, u8 rb,
-                                 u8 rc);
-extern int kvmppc_44x_emul_tlbwe(struct kvm_vcpu *vcpu, u8 ra, u8 rs, u8 ws);
-
-/* TLB helper functions */
-static inline unsigned int get_tlb_size(const struct kvmppc_44x_tlbe *tlbe)
-{
-        return (tlbe->word0 >> 4) & 0xf;
-}
-
-static inline gva_t get_tlb_eaddr(const struct kvmppc_44x_tlbe *tlbe)
-{
-        return tlbe->word0 & 0xfffffc00;
-}
-
-static inline gva_t get_tlb_bytes(const struct kvmppc_44x_tlbe *tlbe)
-{
-        unsigned int pgsize = get_tlb_size(tlbe);
-        return 1 << 10 << (pgsize << 1);
-}
-
-static inline gva_t get_tlb_end(const struct kvmppc_44x_tlbe *tlbe)
-{
-        return get_tlb_eaddr(tlbe) + get_tlb_bytes(tlbe) - 1;
-}
-
-static inline u64 get_tlb_raddr(const struct kvmppc_44x_tlbe *tlbe)
-{
-        u64 word1 = tlbe->word1;
-        return ((word1 & 0xf) << 32) | (word1 & 0xfffffc00);
-}
-
-static inline unsigned int get_tlb_tid(const struct kvmppc_44x_tlbe *tlbe)
-{
-        return tlbe->tid & 0xff;
-}
-
-static inline unsigned int get_tlb_ts(const struct kvmppc_44x_tlbe *tlbe)
-{
-        return (tlbe->word0 >> 8) & 0x1;
-}
-
-static inline unsigned int get_tlb_v(const struct kvmppc_44x_tlbe *tlbe)
-{
-        return (tlbe->word0 >> 9) & 0x1;
-}
-
-static inline unsigned int get_mmucr_stid(const struct kvm_vcpu *vcpu)
-{
-        return vcpu->arch.mmucr & 0xff;
-}
-
-static inline unsigned int get_mmucr_sts(const struct kvm_vcpu *vcpu)
-{
-        return (vcpu->arch.mmucr >> 16) & 0x1;
-}
-
-#endif /* __KVM_POWERPC_TLB_H__ */
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index d6a53b95de94..602eb51d20bc 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -75,7 +75,6 @@ config KVM_BOOK3S_64
 config KVM_BOOK3S_64_HV
         tristate "KVM support for POWER7 and PPC970 using hypervisor mode in host"
         depends on KVM_BOOK3S_64
-        depends on !CPU_LITTLE_ENDIAN
         select KVM_BOOK3S_HV_POSSIBLE
         select MMU_NOTIFIER
         select CMA
@@ -113,23 +112,9 @@ config KVM_BOOK3S_64_PR
 config KVM_BOOKE_HV
         bool
 
-config KVM_440
-        bool "KVM support for PowerPC 440 processors"
-        depends on 44x
-        select KVM
-        select KVM_MMIO
-        ---help---
-          Support running unmodified 440 guest kernels in virtual machines on
-          440 host processors.
-
-          This module provides access to the hardware capabilities through
-          a character device node named /dev/kvm.
-
-          If unsure, say N.
-
 config KVM_EXIT_TIMING
         bool "Detailed exit timing"
-        depends on KVM_440 || KVM_E500V2 || KVM_E500MC
+        depends on KVM_E500V2 || KVM_E500MC
         ---help---
           Calculate elapsed time for every exit/enter cycle. A per-vcpu
           report is available in debugfs kvm/vm#_vcpu#_timing.
@@ -173,6 +158,7 @@ config KVM_MPIC
         bool "KVM in-kernel MPIC emulation"
         depends on KVM && E500
         select HAVE_KVM_IRQCHIP
+        select HAVE_KVM_IRQFD
         select HAVE_KVM_IRQ_ROUTING
         select HAVE_KVM_MSI
         help
@@ -184,6 +170,8 @@ config KVM_MPIC
 config KVM_XICS
         bool "KVM in-kernel XICS emulation"
         depends on KVM_BOOK3S_64 && !KVM_MPIC
+        select HAVE_KVM_IRQCHIP
+        select HAVE_KVM_IRQFD
         ---help---
           Include support for the XICS (eXternal Interrupt Controller
           Specification) interrupt controller architecture used on
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index ce569b6bf4d8..0570eef83fba 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -10,27 +10,17 @@ KVM := ../../../virt/kvm
 common-objs-y = $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o \
                 $(KVM)/eventfd.o
 
-CFLAGS_44x_tlb.o  := -I.
 CFLAGS_e500_mmu.o := -I.
 CFLAGS_e500_mmu_host.o := -I.
 CFLAGS_emulate.o  := -I.
+CFLAGS_emulate_loadstore.o  := -I.
 
-common-objs-y += powerpc.o emulate.o
+common-objs-y += powerpc.o emulate.o emulate_loadstore.o
 obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o
 obj-$(CONFIG_KVM_BOOK3S_HANDLER) += book3s_exports.o
 
 AFLAGS_booke_interrupts.o := -I$(obj)
 
-kvm-440-objs := \
-        $(common-objs-y) \
-        booke.o \
-        booke_emulate.o \
-        booke_interrupts.o \
-        44x.o \
-        44x_tlb.o \
-        44x_emulate.o
-kvm-objs-$(CONFIG_KVM_440) := $(kvm-440-objs)
-
 kvm-e500-objs := \
         $(common-objs-y) \
         booke.o \
@@ -58,6 +48,7 @@ kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) := \
 
 kvm-pr-y := \
         fpu.o \
+        emulate.o \
         book3s_paired_singles.o \
         book3s_pr.o \
         book3s_pr_papr.o \
@@ -90,7 +81,6 @@ kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \
         book3s_hv_rm_mmu.o \
         book3s_hv_ras.o \
         book3s_hv_builtin.o \
-        book3s_hv_cma.o \
         $(kvm-book3s_64-builtin-xics-objs-y)
 endif
 
@@ -101,7 +91,7 @@ kvm-book3s_64-module-objs += \
         $(KVM)/kvm_main.o \
         $(KVM)/eventfd.o \
         powerpc.o \
-        emulate.o \
+        emulate_loadstore.o \
         book3s.o \
         book3s_64_vio.o \
         book3s_rtas.o \
@@ -127,7 +117,6 @@ kvm-objs-$(CONFIG_HAVE_KVM_IRQ_ROUTING) += $(KVM)/irqchip.o
 
 kvm-objs := $(kvm-objs-m) $(kvm-objs-y)
 
-obj-$(CONFIG_KVM_440) += kvm.o
 obj-$(CONFIG_KVM_E500V2) += kvm.o
 obj-$(CONFIG_KVM_E500MC) += kvm.o
 obj-$(CONFIG_KVM_BOOK3S_64) += kvm.o
diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index c254c27f240e..dd03f6b299ba 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -72,6 +72,17 @@ void kvmppc_core_load_guest_debugstate(struct kvm_vcpu *vcpu)
 {
 }
 
+void kvmppc_unfixup_split_real(struct kvm_vcpu *vcpu)
+{
+        if (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) {
+                ulong pc = kvmppc_get_pc(vcpu);
+                if ((pc & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS)
+                        kvmppc_set_pc(vcpu, pc & ~SPLIT_HACK_MASK);
+                vcpu->arch.hflags &= ~BOOK3S_HFLAG_SPLIT_HACK;
+        }
+}
+EXPORT_SYMBOL_GPL(kvmppc_unfixup_split_real);
+
 static inline unsigned long kvmppc_interrupt_offset(struct kvm_vcpu *vcpu)
 {
         if (!is_kvmppc_hv_enabled(vcpu->kvm))
@@ -118,6 +129,7 @@ static inline bool kvmppc_critical_section(struct kvm_vcpu *vcpu)
 
 void kvmppc_inject_interrupt(struct kvm_vcpu *vcpu, int vec, u64 flags)
 {
+        kvmppc_unfixup_split_real(vcpu);
         kvmppc_set_srr0(vcpu, kvmppc_get_pc(vcpu));
         kvmppc_set_srr1(vcpu, kvmppc_get_msr(vcpu) | flags);
         kvmppc_set_pc(vcpu, kvmppc_interrupt_offset(vcpu) + vec);
@@ -218,6 +230,23 @@ void kvmppc_core_dequeue_external(struct kvm_vcpu *vcpu)
         kvmppc_book3s_dequeue_irqprio(vcpu, BOOK3S_INTERRUPT_EXTERNAL_LEVEL);
 }
 
+void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu, ulong dar,
+                                    ulong flags)
+{
+        kvmppc_set_dar(vcpu, dar);
+        kvmppc_set_dsisr(vcpu, flags);
+        kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_DATA_STORAGE);
+}
+
+void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu, ulong flags)
+{
+        u64 msr = kvmppc_get_msr(vcpu);
+        msr &= ~(SRR1_ISI_NOPT | SRR1_ISI_N_OR_G | SRR1_ISI_PROT);
+        msr |= flags & (SRR1_ISI_NOPT | SRR1_ISI_N_OR_G | SRR1_ISI_PROT);
+        kvmppc_set_msr_fast(vcpu, msr);
+        kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_INST_STORAGE);
+}
+
 int kvmppc_book3s_irqprio_deliver(struct kvm_vcpu *vcpu, unsigned int priority)
 {
         int deliver = 1;
@@ -342,18 +371,18 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu)
 }
 EXPORT_SYMBOL_GPL(kvmppc_core_prepare_to_enter);
 
-pfn_t kvmppc_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, bool writing,
+pfn_t kvmppc_gpa_to_pfn(struct kvm_vcpu *vcpu, gpa_t gpa, bool writing,
                         bool *writable)
 {
-        ulong mp_pa = vcpu->arch.magic_page_pa;
+        ulong mp_pa = vcpu->arch.magic_page_pa & KVM_PAM;
+        gfn_t gfn = gpa >> PAGE_SHIFT;
 
         if (!(kvmppc_get_msr(vcpu) & MSR_SF))
                 mp_pa = (uint32_t)mp_pa;
 
         /* Magic page override */
-        if (unlikely(mp_pa) &&
-            unlikely(((gfn << PAGE_SHIFT) & KVM_PAM) ==
-                     ((mp_pa & PAGE_MASK) & KVM_PAM))) {
+        gpa &= ~0xFFFULL;
+        if (unlikely(mp_pa) && unlikely((gpa & KVM_PAM) == mp_pa)) {
                 ulong shared_page = ((ulong)vcpu->arch.shared) & PAGE_MASK;
                 pfn_t pfn;
 
@@ -366,11 +395,13 @@ pfn_t kvmppc_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, bool writing,
 
         return gfn_to_pfn_prot(vcpu->kvm, gfn, writing, writable);
 }
-EXPORT_SYMBOL_GPL(kvmppc_gfn_to_pfn);
+EXPORT_SYMBOL_GPL(kvmppc_gpa_to_pfn);
 
-static int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr, bool data,
-                        bool iswrite, struct kvmppc_pte *pte)
+int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr, enum xlate_instdata xlid,
+                 enum xlate_readwrite xlrw, struct kvmppc_pte *pte)
 {
+        bool data = (xlid == XLATE_DATA);
+        bool iswrite = (xlrw == XLATE_WRITE);
         int relocated = (kvmppc_get_msr(vcpu) & (data ? MSR_DR : MSR_IR));
         int r;
 
@@ -384,88 +415,34 @@ static int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr, bool data,
                 pte->may_write = true;
                 pte->may_execute = true;
                 r = 0;
+
+                if ((kvmppc_get_msr(vcpu) & (MSR_IR | MSR_DR)) == MSR_DR &&
+                    !data) {
+                        if ((vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) &&
+                            ((eaddr & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS))
+                        pte->raddr &= ~SPLIT_HACK_MASK;
+                }
         }
 
         return r;
 }
 
-static hva_t kvmppc_bad_hva(void)
-{
-        return PAGE_OFFSET;
-}
-
-static hva_t kvmppc_pte_to_hva(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte,
-                               bool read)
-{
-        hva_t hpage;
-
-        if (read && !pte->may_read)
-                goto err;
-
-        if (!read && !pte->may_write)
-                goto err;
-
-        hpage = gfn_to_hva(vcpu->kvm, pte->raddr >> PAGE_SHIFT);
-        if (kvm_is_error_hva(hpage))
-                goto err;
-
-        return hpage | (pte->raddr & ~PAGE_MASK);
-err:
-        return kvmppc_bad_hva();
-}
-
-int kvmppc_st(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr,
-              bool data)
-{
-        struct kvmppc_pte pte;
-
-        vcpu->stat.st++;
-
-        if (kvmppc_xlate(vcpu, *eaddr, data, true, &pte))
-                return -ENOENT;
-
-        *eaddr = pte.raddr;
-
-        if (!pte.may_write)
-                return -EPERM;
-
-        if (kvm_write_guest(vcpu->kvm, pte.raddr, ptr, size))
-                return EMULATE_DO_MMIO;
-
-        return EMULATE_DONE;
-}
-EXPORT_SYMBOL_GPL(kvmppc_st);
-
-int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr,
-                      bool data)
+int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
+                                         u32 *inst)
 {
-        struct kvmppc_pte pte;
-        hva_t hva = *eaddr;
-
-        vcpu->stat.ld++;
-
-        if (kvmppc_xlate(vcpu, *eaddr, data, false, &pte))
-                goto nopte;
-
-        *eaddr = pte.raddr;
-
-        hva = kvmppc_pte_to_hva(vcpu, &pte, true);
-        if (kvm_is_error_hva(hva))
-                goto mmio;
-
-        if (copy_from_user(ptr, (void __user *)hva, size)) {
-                printk(KERN_INFO "kvmppc_ld at 0x%lx failed\n", hva);
-                goto mmio;
-        }
+        ulong pc = kvmppc_get_pc(vcpu);
+        int r;
 
-        return EMULATE_DONE;
+        if (type == INST_SC)
+                pc -= 4;
 
-nopte:
-        return -ENOENT;
-mmio:
-        return EMULATE_DO_MMIO;
+        r = kvmppc_ld(vcpu, &pc, sizeof(u32), inst, false);
+        if (r == EMULATE_DONE)
+                return r;
+        else
+                return EMULATE_AGAIN;
 }
-EXPORT_SYMBOL_GPL(kvmppc_ld);
+EXPORT_SYMBOL_GPL(kvmppc_load_last_inst);
 
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 {
@@ -646,6 +623,12 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg)
                 case KVM_REG_PPC_BESCR:
                         val = get_reg_val(reg->id, vcpu->arch.bescr);
                         break;
+                case KVM_REG_PPC_VTB:
+                        val = get_reg_val(reg->id, vcpu->arch.vtb);
+                        break;
+                case KVM_REG_PPC_IC:
+                        val = get_reg_val(reg->id, vcpu->arch.ic);
+                        break;
                 default:
                         r = -EINVAL;
                         break;
@@ -750,6 +733,12 @@ int kvm_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg)
                 case KVM_REG_PPC_BESCR:
                         vcpu->arch.bescr = set_reg_val(reg->id, val);
                         break;
+                case KVM_REG_PPC_VTB:
+                        vcpu->arch.vtb = set_reg_val(reg->id, val);
+                        break;
+                case KVM_REG_PPC_IC:
+                        vcpu->arch.ic = set_reg_val(reg->id, val);
+                        break;
                 default:
                         r = -EINVAL;
                         break;
@@ -913,6 +902,11 @@ int kvmppc_core_check_processor_compat(void)
         return 0;
 }
 
+int kvmppc_book3s_hcall_implemented(struct kvm *kvm, unsigned long hcall)
+{
+        return kvm->arch.kvm_ops->hcall_implemented(hcall);
+}
+
 static int kvmppc_book3s_init(void)
 {
         int r;
diff --git a/arch/powerpc/kvm/book3s_32_mmu.c b/arch/powerpc/kvm/book3s_32_mmu.c
index 93503bbdae43..cd0b0730e29e 100644
--- a/arch/powerpc/kvm/book3s_32_mmu.c
+++ b/arch/powerpc/kvm/book3s_32_mmu.c
@@ -335,7 +335,7 @@ static int kvmppc_mmu_book3s_32_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
         if (r < 0)
                 r = kvmppc_mmu_book3s_32_xlate_pte(vcpu, eaddr, pte,
                                                    data, iswrite, true);
-        if (r < 0)
+        if (r == -ENOENT)
                 r = kvmppc_mmu_book3s_32_xlate_pte(vcpu, eaddr, pte,
                                                    data, iswrite, false);
 
diff --git a/arch/powerpc/kvm/book3s_32_mmu_host.c b/arch/powerpc/kvm/book3s_32_mmu_host.c
index 678e75370495..2035d16a9262 100644
--- a/arch/powerpc/kvm/book3s_32_mmu_host.c
+++ b/arch/powerpc/kvm/book3s_32_mmu_host.c
@@ -156,11 +156,10 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte,
         bool writable;
 
         /* Get host physical address for gpa */
-        hpaddr = kvmppc_gfn_to_pfn(vcpu, orig_pte->raddr >> PAGE_SHIFT,
-                                   iswrite, &writable);
+        hpaddr = kvmppc_gpa_to_pfn(vcpu, orig_pte->raddr, iswrite, &writable);
         if (is_error_noslot_pfn(hpaddr)) {
-                printk(KERN_INFO "Couldn't get guest page for gfn %lx!\n",
-                                 orig_pte->eaddr);
+                printk(KERN_INFO "Couldn't get guest page for gpa %lx!\n",
+                                 orig_pte->raddr);
                 r = -EINVAL;
                 goto out;
         }
diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c
index 0ac98392f363..b982d925c710 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_host.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_host.c
@@ -104,9 +104,10 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte,
         smp_rmb();
 
         /* Get host physical address for gpa */
-        pfn = kvmppc_gfn_to_pfn(vcpu, gfn, iswrite, &writable);
+        pfn = kvmppc_gpa_to_pfn(vcpu, orig_pte->raddr, iswrite, &writable);
         if (is_error_noslot_pfn(pfn)) {
-                printk(KERN_INFO "Couldn't get guest page for gfn %lx!\n", gfn);
+                printk(KERN_INFO "Couldn't get guest page for gpa %lx!\n",
+                       orig_pte->raddr);
                 r = -EINVAL;
                 goto out;
         }
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 68468d695f12..72c20bb16d26 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -37,8 +37,6 @@
 #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
 
@@ -64,10 +62,10 @@ long kvmppc_alloc_hpt(struct kvm *kvm, u32 *htab_orderp)
         }
 
         kvm->arch.hpt_cma_alloc = 0;
-        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));
+                memset((void *)hpt, 0, (1 << order));
                 kvm->arch.hpt_cma_alloc = 1;
         }
 
@@ -450,7 +448,7 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
         unsigned long slb_v;
         unsigned long pp, key;
         unsigned long v, gr;
-        unsigned long *hptep;
+        __be64 *hptep;
         int index;
         int virtmode = vcpu->arch.shregs.msr & (data ? MSR_DR : MSR_IR);
 
@@ -473,13 +471,13 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
                 preempt_enable();
                 return -ENOENT;
         }
-        hptep = (unsigned long *)(kvm->arch.hpt_virt + (index << 4));
-        v = hptep[0] & ~HPTE_V_HVLOCK;
+        hptep = (__be64 *)(kvm->arch.hpt_virt + (index << 4));
+        v = be64_to_cpu(hptep[0]) & ~HPTE_V_HVLOCK;
         gr = kvm->arch.revmap[index].guest_rpte;
 
         /* Unlock the HPTE */
         asm volatile("lwsync" : : : "memory");
-        hptep[0] = v;
+        hptep[0] = cpu_to_be64(v);
         preempt_enable();
 
         gpte->eaddr = eaddr;
@@ -530,21 +528,14 @@ static int instruction_is_store(unsigned int instr)
 static int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu,
                                   unsigned long gpa, gva_t ea, int is_store)
 {
-        int ret;
         u32 last_inst;
-        unsigned long srr0 = kvmppc_get_pc(vcpu);
 
-        /* We try to load the last instruction.  We don't let
-         * emulate_instruction do it as it doesn't check what
-         * kvmppc_ld returns.
+        /*
          * If we fail, we just return to the guest and try executing it again.
          */
-        if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) {
-                ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);
-                if (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED)
-                        return RESUME_GUEST;
-                vcpu->arch.last_inst = last_inst;
-        }
+        if (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !=
+                EMULATE_DONE)
+                return RESUME_GUEST;
 
         /*
          * WARNING: We do not know for sure whether the instruction we just
@@ -558,7 +549,7 @@ static int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu,
          * we just return and retry the instruction.
          */
 
-        if (instruction_is_store(kvmppc_get_last_inst(vcpu)) != !!is_store)
+        if (instruction_is_store(last_inst) != !!is_store)
                 return RESUME_GUEST;
 
         /*
@@ -583,7 +574,8 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
                                 unsigned long ea, unsigned long dsisr)
 {
         struct kvm *kvm = vcpu->kvm;
-        unsigned long *hptep, hpte[3], r;
+        unsigned long hpte[3], r;
+        __be64 *hptep;
         unsigned long mmu_seq, psize, pte_size;
         unsigned long gpa_base, gfn_base;
         unsigned long gpa, gfn, hva, pfn;
@@ -606,16 +598,16 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
         if (ea != vcpu->arch.pgfault_addr)
                 return RESUME_GUEST;
         index = vcpu->arch.pgfault_index;
-        hptep = (unsigned long *)(kvm->arch.hpt_virt + (index << 4));
+        hptep = (__be64 *)(kvm->arch.hpt_virt + (index << 4));
         rev = &kvm->arch.revmap[index];
         preempt_disable();
         while (!try_lock_hpte(hptep, HPTE_V_HVLOCK))
                 cpu_relax();
-        hpte[0] = hptep[0] & ~HPTE_V_HVLOCK;
-        hpte[1] = hptep[1];
+        hpte[0] = be64_to_cpu(hptep[0]) & ~HPTE_V_HVLOCK;
+        hpte[1] = be64_to_cpu(hptep[1]);
         hpte[2] = r = rev->guest_rpte;
         asm volatile("lwsync" : : : "memory");
-        hptep[0] = hpte[0];
+        hptep[0] = cpu_to_be64(hpte[0]);
         preempt_enable();
 
         if (hpte[0] != vcpu->arch.pgfault_hpte[0] ||
@@ -731,8 +723,9 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
         preempt_disable();
         while (!try_lock_hpte(hptep, HPTE_V_HVLOCK))
                 cpu_relax();
-        if ((hptep[0] & ~HPTE_V_HVLOCK) != hpte[0] || hptep[1] != hpte[1] ||
-            rev->guest_rpte != hpte[2])
+        if ((be64_to_cpu(hptep[0]) & ~HPTE_V_HVLOCK) != hpte[0] ||
+                be64_to_cpu(hptep[1]) != hpte[1] ||
+                rev->guest_rpte != hpte[2])
                 /* HPTE has been changed under us; let the guest retry */
                 goto out_unlock;
         hpte[0] = (hpte[0] & ~HPTE_V_ABSENT) | HPTE_V_VALID;
@@ -752,20 +745,20 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
         rcbits = *rmap >> KVMPPC_RMAP_RC_SHIFT;
         r &= rcbits | ~(HPTE_R_R | HPTE_R_C);
 
-        if (hptep[0] & HPTE_V_VALID) {
+        if (be64_to_cpu(hptep[0]) & HPTE_V_VALID) {
                 /* HPTE was previously valid, so we need to invalidate it */
                 unlock_rmap(rmap);
-                hptep[0] |= HPTE_V_ABSENT;
+                hptep[0] |= cpu_to_be64(HPTE_V_ABSENT);
                 kvmppc_invalidate_hpte(kvm, hptep, index);
                 /* don't lose previous R and C bits */
-                r |= hptep[1] & (HPTE_R_R | HPTE_R_C);
+                r |= be64_to_cpu(hptep[1]) & (HPTE_R_R | HPTE_R_C);
         } else {
                 kvmppc_add_revmap_chain(kvm, rev, rmap, index, 0);
         }
 
-        hptep[1] = r;
+        hptep[1] = cpu_to_be64(r);
         eieio();
-        hptep[0] = hpte[0];
+        hptep[0] = cpu_to_be64(hpte[0]);
         asm volatile("ptesync" : : : "memory");
         preempt_enable();
         if (page && hpte_is_writable(r))
@@ -784,7 +777,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
         return ret;
 
  out_unlock:
-        hptep[0] &= ~HPTE_V_HVLOCK;
+        hptep[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);
         preempt_enable();
         goto out_put;
 }
@@ -860,7 +853,7 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,
 {
         struct revmap_entry *rev = kvm->arch.revmap;
         unsigned long h, i, j;
-        unsigned long *hptep;
+        __be64 *hptep;
         unsigned long ptel, psize, rcbits;
 
         for (;;) {
@@ -876,11 +869,11 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,
                  * rmap chain lock.
                  */
                 i = *rmapp & KVMPPC_RMAP_INDEX;
-                hptep = (unsigned long *) (kvm->arch.hpt_virt + (i << 4));
+                hptep = (__be64 *) (kvm->arch.hpt_virt + (i << 4));
                 if (!try_lock_hpte(hptep, HPTE_V_HVLOCK)) {
                         /* unlock rmap before spinning on the HPTE lock */
                         unlock_rmap(rmapp);
-                        while (hptep[0] & HPTE_V_HVLOCK)
+                        while (be64_to_cpu(hptep[0]) & HPTE_V_HVLOCK)
                                 cpu_relax();
                         continue;
                 }
@@ -899,14 +892,14 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,
 
                 /* Now check and modify the HPTE */
                 ptel = rev[i].guest_rpte;
-                psize = hpte_page_size(hptep[0], ptel);
-                if ((hptep[0] & HPTE_V_VALID) &&
+                psize = hpte_page_size(be64_to_cpu(hptep[0]), ptel);
+                if ((be64_to_cpu(hptep[0]) & HPTE_V_VALID) &&
                     hpte_rpn(ptel, psize) == gfn) {
                         if (kvm->arch.using_mmu_notifiers)
-                                hptep[0] |= HPTE_V_ABSENT;
+                                hptep[0] |= cpu_to_be64(HPTE_V_ABSENT);
                         kvmppc_invalidate_hpte(kvm, hptep, i);
                         /* Harvest R and C */
-                        rcbits = hptep[1] & (HPTE_R_R | HPTE_R_C);
+                        rcbits = be64_to_cpu(hptep[1]) & (HPTE_R_R | HPTE_R_C);
                         *rmapp |= rcbits << KVMPPC_RMAP_RC_SHIFT;
                         if (rcbits & ~rev[i].guest_rpte) {
                                 rev[i].guest_rpte = ptel | rcbits;
@@ -914,7 +907,7 @@ static int kvm_unmap_rmapp(struct kvm *kvm, unsigned long *rmapp,
                         }
                 }
                 unlock_rmap(rmapp);
-                hptep[0] &= ~HPTE_V_HVLOCK;
+                hptep[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);
         }
         return 0;
 }
@@ -961,7 +954,7 @@ static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp,
 {
         struct revmap_entry *rev = kvm->arch.revmap;
         unsigned long head, i, j;
-        unsigned long *hptep;
+        __be64 *hptep;
         int ret = 0;
 
  retry:
@@ -977,23 +970,24 @@ static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp,
 
         i = head = *rmapp & KVMPPC_RMAP_INDEX;
         do {
-                hptep = (unsigned long *) (kvm->arch.hpt_virt + (i << 4));
+                hptep = (__be64 *) (kvm->arch.hpt_virt + (i << 4));
                 j = rev[i].forw;
 
                 /* If this HPTE isn't referenced, ignore it */
-                if (!(hptep[1] & HPTE_R_R))
+                if (!(be64_to_cpu(hptep[1]) & HPTE_R_R))
                         continue;
 
                 if (!try_lock_hpte(hptep, HPTE_V_HVLOCK)) {
                         /* unlock rmap before spinning on the HPTE lock */
                         unlock_rmap(rmapp);
-                        while (hptep[0] & HPTE_V_HVLOCK)
+                        while (be64_to_cpu(hptep[0]) & HPTE_V_HVLOCK)
                                 cpu_relax();
                         goto retry;
                 }
 
                 /* Now check and modify the HPTE */
-                if ((hptep[0] & HPTE_V_VALID) && (hptep[1] & HPTE_R_R)) {
+                if ((be64_to_cpu(hptep[0]) & HPTE_V_VALID) &&
+                    (be64_to_cpu(hptep[1]) & HPTE_R_R)) {
                         kvmppc_clear_ref_hpte(kvm, hptep, i);
                         if (!(rev[i].guest_rpte & HPTE_R_R)) {
                                 rev[i].guest_rpte |= HPTE_R_R;
@@ -1001,7 +995,7 @@ static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp,
                         }
                         ret = 1;
                 }
-                hptep[0] &= ~HPTE_V_HVLOCK;
+                hptep[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);
         } while ((i = j) != head);
 
         unlock_rmap(rmapp);
@@ -1035,7 +1029,7 @@ static int kvm_test_age_rmapp(struct kvm *kvm, unsigned long *rmapp,
                 do {
                         hp = (unsigned long *)(kvm->arch.hpt_virt + (i << 4));
                         j = rev[i].forw;
-                        if (hp[1] & HPTE_R_R)
+                        if (be64_to_cpu(hp[1]) & HPTE_R_R)
                                 goto out;
                 } while ((i = j) != head);
         }
@@ -1075,7 +1069,7 @@ static int kvm_test_clear_dirty_npages(struct kvm *kvm, unsigned long *rmapp)
         unsigned long head, i, j;
         unsigned long n;
         unsigned long v, r;
-        unsigned long *hptep;
+        __be64 *hptep;
         int npages_dirty = 0;
 
  retry:
@@ -1091,7 +1085,8 @@ static int kvm_test_clear_dirty_npages(struct kvm *kvm, unsigned long *rmapp)
 
         i = head = *rmapp & KVMPPC_RMAP_INDEX;
         do {
-                hptep = (unsigned long *) (kvm->arch.hpt_virt + (i << 4));
+                unsigned long hptep1;
+                hptep = (__be64 *) (kvm->arch.hpt_virt + (i << 4));
                 j = rev[i].forw;
 
                 /*
@@ -1108,29 +1103,30 @@ static int kvm_test_clear_dirty_npages(struct kvm *kvm, unsigned long *rmapp)
                  * Otherwise we need to do the tlbie even if C==0 in
                  * order to pick up any delayed writeback of C.
                  */
-                if (!(hptep[1] & HPTE_R_C) &&
-                    (!hpte_is_writable(hptep[1]) || vcpus_running(kvm)))
+                hptep1 = be64_to_cpu(hptep[1]);
+                if (!(hptep1 & HPTE_R_C) &&
+                    (!hpte_is_writable(hptep1) || vcpus_running(kvm)))
                         continue;
 
                 if (!try_lock_hpte(hptep, HPTE_V_HVLOCK)) {
                         /* unlock rmap before spinning on the HPTE lock */
                         unlock_rmap(rmapp);
-                        while (hptep[0] & HPTE_V_HVLOCK)
+                        while (hptep[0] & cpu_to_be64(HPTE_V_HVLOCK))
                                 cpu_relax();
                         goto retry;
                 }
 
                 /* Now check and modify the HPTE */
-                if (!(hptep[0] & HPTE_V_VALID))
+                if (!(hptep[0] & cpu_to_be64(HPTE_V_VALID)))
                         continue;
 
                 /* need to make it temporarily absent so C is stable */
-                hptep[0] |= HPTE_V_ABSENT;
+                hptep[0] |= cpu_to_be64(HPTE_V_ABSENT);
                 kvmppc_invalidate_hpte(kvm, hptep, i);
-                v = hptep[0];
-                r = hptep[1];
+                v = be64_to_cpu(hptep[0]);
+                r = be64_to_cpu(hptep[1]);
                 if (r & HPTE_R_C) {
-                        hptep[1] = r & ~HPTE_R_C;
+                        hptep[1] = cpu_to_be64(r & ~HPTE_R_C);
                         if (!(rev[i].guest_rpte & HPTE_R_C)) {
                                 rev[i].guest_rpte |= HPTE_R_C;
                                 note_hpte_modification(kvm, &rev[i]);
@@ -1143,7 +1139,7 @@ static int kvm_test_clear_dirty_npages(struct kvm *kvm, unsigned long *rmapp)
                 }
                 v &= ~(HPTE_V_ABSENT | HPTE_V_HVLOCK);
                 v |= HPTE_V_VALID;
-                hptep[0] = v;
+                hptep[0] = cpu_to_be64(v);
         } while ((i = j) != head);
 
         unlock_rmap(rmapp);
@@ -1307,7 +1303,7 @@ struct kvm_htab_ctx {
  * Returns 1 if this HPT entry has been modified or has pending
  * R/C bit changes.
  */
-static int hpte_dirty(struct revmap_entry *revp, unsigned long *hptp)
+static int hpte_dirty(struct revmap_entry *revp, __be64 *hptp)
 {
         unsigned long rcbits_unset;
 
@@ -1316,13 +1312,14 @@ static int hpte_dirty(struct revmap_entry *revp, unsigned long *hptp)
 
         /* Also need to consider changes in reference and changed bits */
         rcbits_unset = ~revp->guest_rpte & (HPTE_R_R | HPTE_R_C);
-        if ((hptp[0] & HPTE_V_VALID) && (hptp[1] & rcbits_unset))
+        if ((be64_to_cpu(hptp[0]) & HPTE_V_VALID) &&
+            (be64_to_cpu(hptp[1]) & rcbits_unset))
                 return 1;
 
         return 0;
 }
 
-static long record_hpte(unsigned long flags, unsigned long *hptp,
+static long record_hpte(unsigned long flags, __be64 *hptp,
                         unsigned long *hpte, struct revmap_entry *revp,
                         int want_valid, int first_pass)
 {
@@ -1337,10 +1334,10 @@ static long record_hpte(unsigned long flags, unsigned long *hptp,
                 return 0;
 
         valid = 0;
-        if (hptp[0] & (HPTE_V_VALID | HPTE_V_ABSENT)) {
+        if (be64_to_cpu(hptp[0]) & (HPTE_V_VALID | HPTE_V_ABSENT)) {
                 valid = 1;
                 if ((flags & KVM_GET_HTAB_BOLTED_ONLY) &&
-                    !(hptp[0] & HPTE_V_BOLTED))
+                    !(be64_to_cpu(hptp[0]) & HPTE_V_BOLTED))
                         valid = 0;
         }
         if (valid != want_valid)
@@ -1352,7 +1349,7 @@ static long record_hpte(unsigned long flags, unsigned long *hptp,
                 preempt_disable();
                 while (!try_lock_hpte(hptp, HPTE_V_HVLOCK))
                         cpu_relax();
-                v = hptp[0];
+                v = be64_to_cpu(hptp[0]);
 
                 /* re-evaluate valid and dirty from synchronized HPTE value */
                 valid = !!(v & HPTE_V_VALID);
@@ -1360,9 +1357,9 @@ static long record_hpte(unsigned long flags, unsigned long *hptp,
 
                 /* Harvest R and C into guest view if necessary */
                 rcbits_unset = ~revp->guest_rpte & (HPTE_R_R | HPTE_R_C);
-                if (valid && (rcbits_unset & hptp[1])) {
-                        revp->guest_rpte |= (hptp[1] & (HPTE_R_R | HPTE_R_C)) |
-                                HPTE_GR_MODIFIED;
+                if (valid && (rcbits_unset & be64_to_cpu(hptp[1]))) {
+                        revp->guest_rpte |= (be64_to_cpu(hptp[1]) &
+                                (HPTE_R_R | HPTE_R_C)) | HPTE_GR_MODIFIED;
                         dirty = 1;
                 }
 
@@ -1381,13 +1378,13 @@ static long record_hpte(unsigned long flags, unsigned long *hptp,
                         revp->guest_rpte = r;
                 }
                 asm volatile(PPC_RELEASE_BARRIER "" : : : "memory");
-                hptp[0] &= ~HPTE_V_HVLOCK;
+                hptp[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);
                 preempt_enable();
                 if (!(valid == want_valid && (first_pass || dirty)))
                         ok = 0;
         }
-        hpte[0] = v;
-        hpte[1] = r;
+        hpte[0] = cpu_to_be64(v);
+        hpte[1] = cpu_to_be64(r);
         return ok;
 }
 
@@ -1397,7 +1394,7 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,
         struct kvm_htab_ctx *ctx = file->private_data;
         struct kvm *kvm = ctx->kvm;
         struct kvm_get_htab_header hdr;
-        unsigned long *hptp;
+        __be64 *hptp;
         struct revmap_entry *revp;
         unsigned long i, nb, nw;
         unsigned long __user *lbuf;
@@ -1413,7 +1410,7 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf,
         flags = ctx->flags;
 
         i = ctx->index;
-        hptp = (unsigned long *)(kvm->arch.hpt_virt + (i * HPTE_SIZE));
+        hptp = (__be64 *)(kvm->arch.hpt_virt + (i * HPTE_SIZE));
         revp = kvm->arch.revmap + i;
         lbuf = (unsigned long __user *)buf;
 
@@ -1497,7 +1494,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,
         unsigned long i, j;
         unsigned long v, r;
         unsigned long __user *lbuf;
-        unsigned long *hptp;
+        __be64 *hptp;
         unsigned long tmp[2];
         ssize_t nb;
         long int err, ret;
@@ -1539,7 +1536,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,
                     i + hdr.n_valid + hdr.n_invalid > kvm->arch.hpt_npte)
                         break;
 
-                hptp = (unsigned long *)(kvm->arch.hpt_virt + (i * HPTE_SIZE));
+                hptp = (__be64 *)(kvm->arch.hpt_virt + (i * HPTE_SIZE));
                 lbuf = (unsigned long __user *)buf;
                 for (j = 0; j < hdr.n_valid; ++j) {
                         err = -EFAULT;
@@ -1551,7 +1548,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,
                         lbuf += 2;
                         nb += HPTE_SIZE;
 
-                        if (hptp[0] & (HPTE_V_VALID | HPTE_V_ABSENT))
+                        if (be64_to_cpu(hptp[0]) & (HPTE_V_VALID | HPTE_V_ABSENT))
                                 kvmppc_do_h_remove(kvm, 0, i, 0, tmp);
                         err = -EIO;
                         ret = kvmppc_virtmode_do_h_enter(kvm, H_EXACT, i, v, r,
@@ -1577,7 +1574,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf,
                 }
 
                 for (j = 0; j < hdr.n_invalid; ++j) {
-                        if (hptp[0] & (HPTE_V_VALID | HPTE_V_ABSENT))
+                        if (be64_to_cpu(hptp[0]) & (HPTE_V_VALID | HPTE_V_ABSENT))
                                 kvmppc_do_h_remove(kvm, 0, i, 0, tmp);
                         ++i;
                         hptp += 2;
diff --git a/arch/powerpc/kvm/book3s_emulate.c b/arch/powerpc/kvm/book3s_emulate.c
index 3f295269af37..5a2bc4b0dfe5 100644
--- a/arch/powerpc/kvm/book3s_emulate.c
+++ b/arch/powerpc/kvm/book3s_emulate.c
@@ -439,12 +439,6 @@ int kvmppc_core_emulate_mtspr_pr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)
                     (mfmsr() & MSR_HV))
                         vcpu->arch.hflags |= BOOK3S_HFLAG_DCBZ32;
                 break;
-        case SPRN_PURR:
-                to_book3s(vcpu)->purr_offset = spr_val - get_tb();
-                break;
-        case SPRN_SPURR:
-                to_book3s(vcpu)->spurr_offset = spr_val - get_tb();
-                break;
         case SPRN_GQR0:
         case SPRN_GQR1:
         case SPRN_GQR2:
@@ -455,10 +449,10 @@ int kvmppc_core_emulate_mtspr_pr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)
         case SPRN_GQR7:
                 to_book3s(vcpu)->gqr[sprn - SPRN_GQR0] = spr_val;
                 break;
+#ifdef CONFIG_PPC_BOOK3S_64
         case SPRN_FSCR:
-                vcpu->arch.fscr = spr_val;
+                kvmppc_set_fscr(vcpu, spr_val);
                 break;
-#ifdef CONFIG_PPC_BOOK3S_64
         case SPRN_BESCR:
                 vcpu->arch.bescr = spr_val;
                 break;
@@ -572,10 +566,22 @@ int kvmppc_core_emulate_mfspr_pr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val
                 *spr_val = 0;
                 break;
         case SPRN_PURR:
-                *spr_val = get_tb() + to_book3s(vcpu)->purr_offset;
+                /*
+                 * On exit we would have updated purr
+                 */
+                *spr_val = vcpu->arch.purr;
                 break;
         case SPRN_SPURR:
-                *spr_val = get_tb() + to_book3s(vcpu)->purr_offset;
+                /*
+                 * On exit we would have updated spurr
+                 */
+                *spr_val = vcpu->arch.spurr;
+                break;
+        case SPRN_VTB:
+                *spr_val = vcpu->arch.vtb;
+                break;
+        case SPRN_IC:
+                *spr_val = vcpu->arch.ic;
                 break;
         case SPRN_GQR0:
         case SPRN_GQR1:
@@ -587,10 +593,10 @@ int kvmppc_core_emulate_mfspr_pr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val
         case SPRN_GQR7:
                 *spr_val = to_book3s(vcpu)->gqr[sprn - SPRN_GQR0];
                 break;
+#ifdef CONFIG_PPC_BOOK3S_64
         case SPRN_FSCR:
                 *spr_val = vcpu->arch.fscr;
                 break;
-#ifdef CONFIG_PPC_BOOK3S_64
         case SPRN_BESCR:
                 *spr_val = vcpu->arch.bescr;
                 break;
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 7a12edbb61e7..27cced9c7249 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -35,6 +35,7 @@
 
 #include <asm/reg.h>
 #include <asm/cputable.h>
+#include <asm/cache.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>
@@ -67,6 +68,15 @@
 /* Used as a "null" value for timebase values */
 #define TB_NIL  (~(u64)0)
 
+static DECLARE_BITMAP(default_enabled_hcalls, MAX_HCALL_OPCODE/4 + 1);
+
+#if defined(CONFIG_PPC_64K_PAGES)
+#define MPP_BUFFER_ORDER        0
+#elif defined(CONFIG_PPC_4K_PAGES)
+#define MPP_BUFFER_ORDER        3
+#endif
+
+
 static void kvmppc_end_cede(struct kvm_vcpu *vcpu);
 static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu);
 
@@ -270,7 +280,7 @@ struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id)
 static void init_vpa(struct kvm_vcpu *vcpu, struct lppaca *vpa)
 {
         vpa->__old_status |= LPPACA_OLD_SHARED_PROC;
-        vpa->yield_count = 1;
+        vpa->yield_count = cpu_to_be32(1);
 }
 
 static int set_vpa(struct kvm_vcpu *vcpu, struct kvmppc_vpa *v,
@@ -293,8 +303,8 @@ static int set_vpa(struct kvm_vcpu *vcpu, struct kvmppc_vpa *v,
 struct reg_vpa {
         u32 dummy;
         union {
-                u16 hword;
-                u32 word;
+                __be16 hword;
+                __be32 word;
         } length;
 };
 
@@ -333,9 +343,9 @@ static unsigned long do_h_register_vpa(struct kvm_vcpu *vcpu,
                 if (va == NULL)
                         return H_PARAMETER;
                 if (subfunc == H_VPA_REG_VPA)
-                        len = ((struct reg_vpa *)va)->length.hword;
+                        len = be16_to_cpu(((struct reg_vpa *)va)->length.hword);
                 else
-                        len = ((struct reg_vpa *)va)->length.word;
+                        len = be32_to_cpu(((struct reg_vpa *)va)->length.word);
                 kvmppc_unpin_guest_page(kvm, va, vpa, false);
 
                 /* Check length */
@@ -540,21 +550,63 @@ static void kvmppc_create_dtl_entry(struct kvm_vcpu *vcpu,
                 return;
         memset(dt, 0, sizeof(struct dtl_entry));
         dt->dispatch_reason = 7;
-        dt->processor_id = vc->pcpu + vcpu->arch.ptid;
-        dt->timebase = now + vc->tb_offset;
-        dt->enqueue_to_dispatch_time = stolen;
-        dt->srr0 = kvmppc_get_pc(vcpu);
-        dt->srr1 = vcpu->arch.shregs.msr;
+        dt->processor_id = cpu_to_be16(vc->pcpu + vcpu->arch.ptid);
+        dt->timebase = cpu_to_be64(now + vc->tb_offset);
+        dt->enqueue_to_dispatch_time = cpu_to_be32(stolen);
+        dt->srr0 = cpu_to_be64(kvmppc_get_pc(vcpu));
+        dt->srr1 = cpu_to_be64(vcpu->arch.shregs.msr);
         ++dt;
         if (dt == vcpu->arch.dtl.pinned_end)
                 dt = vcpu->arch.dtl.pinned_addr;
         vcpu->arch.dtl_ptr = dt;
         /* order writing *dt vs. writing vpa->dtl_idx */
         smp_wmb();
-        vpa->dtl_idx = ++vcpu->arch.dtl_index;
+        vpa->dtl_idx = cpu_to_be64(++vcpu->arch.dtl_index);
         vcpu->arch.dtl.dirty = true;
 }
 
+static bool kvmppc_power8_compatible(struct kvm_vcpu *vcpu)
+{
+        if (vcpu->arch.vcore->arch_compat >= PVR_ARCH_207)
+                return true;
+        if ((!vcpu->arch.vcore->arch_compat) &&
+            cpu_has_feature(CPU_FTR_ARCH_207S))
+                return true;
+        return false;
+}
+
+static int kvmppc_h_set_mode(struct kvm_vcpu *vcpu, unsigned long mflags,
+                             unsigned long resource, unsigned long value1,
+                             unsigned long value2)
+{
+        switch (resource) {
+        case H_SET_MODE_RESOURCE_SET_CIABR:
+                if (!kvmppc_power8_compatible(vcpu))
+                        return H_P2;
+                if (value2)
+                        return H_P4;
+                if (mflags)
+                        return H_UNSUPPORTED_FLAG_START;
+                /* Guests can't breakpoint the hypervisor */
+                if ((value1 & CIABR_PRIV) == CIABR_PRIV_HYPER)
+                        return H_P3;
+                vcpu->arch.ciabr  = value1;
+                return H_SUCCESS;
+        case H_SET_MODE_RESOURCE_SET_DAWR:
+                if (!kvmppc_power8_compatible(vcpu))
+                        return H_P2;
+                if (mflags)
+                        return H_UNSUPPORTED_FLAG_START;
+                if (value2 & DABRX_HYP)
+                        return H_P4;
+                vcpu->arch.dawr  = value1;
+                vcpu->arch.dawrx = value2;
+                return H_SUCCESS;
+        default:
+                return H_TOO_HARD;
+        }
+}
+
 int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)
 {
         unsigned long req = kvmppc_get_gpr(vcpu, 3);
@@ -562,6 +614,10 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)
         struct kvm_vcpu *tvcpu;
         int idx, rc;
 
+        if (req <= MAX_HCALL_OPCODE &&
+            !test_bit(req/4, vcpu->kvm->arch.enabled_hcalls))
+                return RESUME_HOST;
+
         switch (req) {
         case H_ENTER:
                 idx = srcu_read_lock(&vcpu->kvm->srcu);
@@ -620,7 +676,14 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)
 
                 /* Send the error out to userspace via KVM_RUN */
                 return rc;
-
+        case H_SET_MODE:
+                ret = kvmppc_h_set_mode(vcpu, kvmppc_get_gpr(vcpu, 4),
+                                        kvmppc_get_gpr(vcpu, 5),
+                                        kvmppc_get_gpr(vcpu, 6),
+                                        kvmppc_get_gpr(vcpu, 7));
+                if (ret == H_TOO_HARD)
+                        return RESUME_HOST;
+                break;
         case H_XIRR:
         case H_CPPR:
         case H_EOI:
@@ -639,6 +702,29 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu)
         return RESUME_GUEST;
 }
 
+static int kvmppc_hcall_impl_hv(unsigned long cmd)
+{
+        switch (cmd) {
+        case H_CEDE:
+        case H_PROD:
+        case H_CONFER:
+        case H_REGISTER_VPA:
+        case H_SET_MODE:
+#ifdef CONFIG_KVM_XICS
+        case H_XIRR:
+        case H_CPPR:
+        case H_EOI:
+        case H_IPI:
+        case H_IPOLL:
+        case H_XIRR_X:
+#endif
+                return 1;
+        }
+
+        /* See if it's in the real-mode table */
+        return kvmppc_hcall_impl_hv_realmode(cmd);
+}
+
 static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu,
                                  struct task_struct *tsk)
 {
@@ -785,7 +871,8 @@ static int kvm_arch_vcpu_ioctl_set_sregs_hv(struct kvm_vcpu *vcpu,
         return 0;
 }
 
-static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr)
+static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr,
+                bool preserve_top32)
 {
         struct kvmppc_vcore *vc = vcpu->arch.vcore;
         u64 mask;
@@ -820,6 +907,10 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr)
         mask = LPCR_DPFD | LPCR_ILE | LPCR_TC;
         if (cpu_has_feature(CPU_FTR_ARCH_207S))
                 mask |= LPCR_AIL;
+
+        /* Broken 32-bit version of LPCR must not clear top bits */
+        if (preserve_top32)
+                mask &= 0xFFFFFFFF;
         vc->lpcr = (vc->lpcr & ~mask) | (new_lpcr & mask);
         spin_unlock(&vc->lock);
 }
@@ -894,12 +985,6 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
         case KVM_REG_PPC_CIABR:
                 *val = get_reg_val(id, vcpu->arch.ciabr);
                 break;
-        case KVM_REG_PPC_IC:
-                *val = get_reg_val(id, vcpu->arch.ic);
-                break;
-        case KVM_REG_PPC_VTB:
-                *val = get_reg_val(id, vcpu->arch.vtb);
-                break;
         case KVM_REG_PPC_CSIGR:
                 *val = get_reg_val(id, vcpu->arch.csigr);
                 break;
@@ -939,6 +1024,7 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
                 *val = get_reg_val(id, vcpu->arch.vcore->tb_offset);
                 break;
         case KVM_REG_PPC_LPCR:
+        case KVM_REG_PPC_LPCR_64:
                 *val = get_reg_val(id, vcpu->arch.vcore->lpcr);
                 break;
         case KVM_REG_PPC_PPR:
@@ -1094,12 +1180,6 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
                 if ((vcpu->arch.ciabr & CIABR_PRIV) == CIABR_PRIV_HYPER)
                         vcpu->arch.ciabr &= ~CIABR_PRIV;        /* disable */
                 break;
-        case KVM_REG_PPC_IC:
-                vcpu->arch.ic = set_reg_val(id, *val);
-                break;
-        case KVM_REG_PPC_VTB:
-                vcpu->arch.vtb = set_reg_val(id, *val);
-                break;
         case KVM_REG_PPC_CSIGR:
                 vcpu->arch.csigr = set_reg_val(id, *val);
                 break;
@@ -1150,7 +1230,10 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
                         ALIGN(set_reg_val(id, *val), 1UL << 24);
                 break;
         case KVM_REG_PPC_LPCR:
-                kvmppc_set_lpcr(vcpu, set_reg_val(id, *val));
+                kvmppc_set_lpcr(vcpu, set_reg_val(id, *val), true);
+                break;
+        case KVM_REG_PPC_LPCR_64:
+                kvmppc_set_lpcr(vcpu, set_reg_val(id, *val), false);
                 break;
         case KVM_REG_PPC_PPR:
                 vcpu->arch.ppr = set_reg_val(id, *val);
@@ -1228,6 +1311,33 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
         return r;
 }
 
+static struct kvmppc_vcore *kvmppc_vcore_create(struct kvm *kvm, int core)
+{
+        struct kvmppc_vcore *vcore;
+
+        vcore = kzalloc(sizeof(struct kvmppc_vcore), GFP_KERNEL);
+
+        if (vcore == NULL)
+                return NULL;
+
+        INIT_LIST_HEAD(&vcore->runnable_threads);
+        spin_lock_init(&vcore->lock);
+        init_waitqueue_head(&vcore->wq);
+        vcore->preempt_tb = TB_NIL;
+        vcore->lpcr = kvm->arch.lpcr;
+        vcore->first_vcpuid = core * threads_per_subcore;
+        vcore->kvm = kvm;
+
+        vcore->mpp_buffer_is_valid = false;
+
+        if (cpu_has_feature(CPU_FTR_ARCH_207S))
+                vcore->mpp_buffer = (void *)__get_free_pages(
+                        GFP_KERNEL|__GFP_ZERO,
+                        MPP_BUFFER_ORDER);
+
+        return vcore;
+}
+
 static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,
                                                    unsigned int id)
 {
@@ -1279,16 +1389,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,
         mutex_lock(&kvm->lock);
         vcore = kvm->arch.vcores[core];
         if (!vcore) {
-                vcore = kzalloc(sizeof(struct kvmppc_vcore), GFP_KERNEL);
-                if (vcore) {
-                        INIT_LIST_HEAD(&vcore->runnable_threads);
-                        spin_lock_init(&vcore->lock);
-                        init_waitqueue_head(&vcore->wq);
-                        vcore->preempt_tb = TB_NIL;
-                        vcore->lpcr = kvm->arch.lpcr;
-                        vcore->first_vcpuid = core * threads_per_subcore;
-                        vcore->kvm = kvm;
-                }
+                vcore = kvmppc_vcore_create(kvm, core);
                 kvm->arch.vcores[core] = vcore;
                 kvm->arch.online_vcores++;
         }
@@ -1500,6 +1601,33 @@ static int on_primary_thread(void)
         return 1;
 }
 
+static void kvmppc_start_saving_l2_cache(struct kvmppc_vcore *vc)
+{
+        phys_addr_t phy_addr, mpp_addr;
+
+        phy_addr = (phys_addr_t)virt_to_phys(vc->mpp_buffer);
+        mpp_addr = phy_addr & PPC_MPPE_ADDRESS_MASK;
+
+        mtspr(SPRN_MPPR, mpp_addr | PPC_MPPR_FETCH_ABORT);
+        logmpp(mpp_addr | PPC_LOGMPP_LOG_L2);
+
+        vc->mpp_buffer_is_valid = true;
+}
+
+static void kvmppc_start_restoring_l2_cache(const struct kvmppc_vcore *vc)
+{
+        phys_addr_t phy_addr, mpp_addr;
+
+        phy_addr = virt_to_phys(vc->mpp_buffer);
+        mpp_addr = phy_addr & PPC_MPPE_ADDRESS_MASK;
+
+        /* We must abort any in-progress save operations to ensure
+         * the table is valid so that prefetch engine knows when to
+         * stop prefetching. */
+        logmpp(mpp_addr | PPC_LOGMPP_LOG_ABORT);
+        mtspr(SPRN_MPPR, mpp_addr | PPC_MPPR_FETCH_WHOLE_TABLE);
+}
+
 /*
  * Run a set of guest threads on a physical core.
  * Called with vc->lock held.
@@ -1577,9 +1705,16 @@ static void kvmppc_run_core(struct kvmppc_vcore *vc)
 
         srcu_idx = srcu_read_lock(&vc->kvm->srcu);
 
+        if (vc->mpp_buffer_is_valid)
+                kvmppc_start_restoring_l2_cache(vc);
+
         __kvmppc_vcore_entry();
 
         spin_lock(&vc->lock);
+
+        if (vc->mpp_buffer)
+                kvmppc_start_saving_l2_cache(vc);
+
         /* disable sending of IPIs on virtual external irqs */
         list_for_each_entry(vcpu, &vc->runnable_threads, arch.run_list)
                 vcpu->cpu = -1;
@@ -1929,12 +2064,6 @@ static void kvmppc_add_seg_page_size(struct kvm_ppc_one_seg_page_size **sps,
         (*sps)->page_shift = def->shift;
         (*sps)->slb_enc = def->sllp;
         (*sps)->enc[0].page_shift = def->shift;
-        /*
-         * Only return base page encoding. We don't want to return
-         * all the supporting pte_enc, because our H_ENTER doesn't
-         * support MPSS yet. Once they do, we can start passing all
-         * support pte_enc here
-         */
         (*sps)->enc[0].pte_enc = def->penc[linux_psize];
         /*
          * Add 16MB MPSS support if host supports it
@@ -2281,6 +2410,10 @@ static int kvmppc_core_init_vm_hv(struct kvm *kvm)
          */
         cpumask_setall(&kvm->arch.need_tlb_flush);
 
+        /* Start out with the default set of hcalls enabled */
+        memcpy(kvm->arch.enabled_hcalls, default_enabled_hcalls,
+               sizeof(kvm->arch.enabled_hcalls));
+
         kvm->arch.rma = NULL;
 
         kvm->arch.host_sdr1 = mfspr(SPRN_SDR1);
@@ -2323,8 +2456,14 @@ static void kvmppc_free_vcores(struct kvm *kvm)
 {
         long int i;
 
-        for (i = 0; i < KVM_MAX_VCORES; ++i)
+        for (i = 0; i < KVM_MAX_VCORES; ++i) {
+                if (kvm->arch.vcores[i] && kvm->arch.vcores[i]->mpp_buffer) {
+                        struct kvmppc_vcore *vc = kvm->arch.vcores[i];
+                        free_pages((unsigned long)vc->mpp_buffer,
+                                   MPP_BUFFER_ORDER);
+                }
                 kfree(kvm->arch.vcores[i]);
+        }
         kvm->arch.online_vcores = 0;
 }
 
@@ -2419,6 +2558,49 @@ static long kvm_arch_vm_ioctl_hv(struct file *filp,
         return r;
 }
 
+/*
+ * List of hcall numbers to enable by default.
+ * For compatibility with old userspace, we enable by default
+ * all hcalls that were implemented before the hcall-enabling
+ * facility was added.  Note this list should not include H_RTAS.
+ */
+static unsigned int default_hcall_list[] = {
+        H_REMOVE,
+        H_ENTER,
+        H_READ,
+        H_PROTECT,
+        H_BULK_REMOVE,
+        H_GET_TCE,
+        H_PUT_TCE,
+        H_SET_DABR,
+        H_SET_XDABR,
+        H_CEDE,
+        H_PROD,
+        H_CONFER,
+        H_REGISTER_VPA,
+#ifdef CONFIG_KVM_XICS
+        H_EOI,
+        H_CPPR,
+        H_IPI,
+        H_IPOLL,
+        H_XIRR,
+        H_XIRR_X,
+#endif
+        0
+};
+
+static void init_default_hcalls(void)
+{
+        int i;
+        unsigned int hcall;
+
+        for (i = 0; default_hcall_list[i]; ++i) {
+                hcall = default_hcall_list[i];
+                WARN_ON(!kvmppc_hcall_impl_hv(hcall));
+                __set_bit(hcall / 4, default_enabled_hcalls);
+        }
+}
+
 static struct kvmppc_ops kvm_ops_hv = {
         .get_sregs = kvm_arch_vcpu_ioctl_get_sregs_hv,
         .set_sregs = kvm_arch_vcpu_ioctl_set_sregs_hv,
@@ -2451,6 +2633,7 @@ static struct kvmppc_ops kvm_ops_hv = {
         .emulate_mfspr = kvmppc_core_emulate_mfspr_hv,
         .fast_vcpu_kick = kvmppc_fast_vcpu_kick_hv,
         .arch_vm_ioctl  = kvm_arch_vm_ioctl_hv,
+        .hcall_implemented = kvmppc_hcall_impl_hv,
 };
 
 static int kvmppc_book3s_init_hv(void)
@@ -2466,6 +2649,8 @@ static int kvmppc_book3s_init_hv(void)
         kvm_ops_hv.owner = THIS_MODULE;
         kvmppc_hv_ops = &kvm_ops_hv;
 
+        init_default_hcalls();
+
         r = kvmppc_mmu_hv_init();
         return r;
 }
diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c
index 7cde8a665205..329d7fdd0a6a 100644
--- a/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -16,12 +16,14 @@
 #include <linux/init.h>
 #include <linux/memblock.h>
 #include <linux/sizes.h>
+#include <linux/cma.h>
 
 #include <asm/cputable.h>
 #include <asm/kvm_ppc.h>
 #include <asm/kvm_book3s.h>
 
-#include "book3s_hv_cma.h"
+#define KVM_CMA_CHUNK_ORDER     18
+
 /*
  * Hash page table alignment on newer cpus(CPU_FTR_ARCH_206)
  * should be power of 2.
@@ -43,6 +45,8 @@ static unsigned long kvm_cma_resv_ratio = 5;
 unsigned long kvm_rma_pages = (1 << 27) >> PAGE_SHIFT;  /* 128MB */
 EXPORT_SYMBOL_GPL(kvm_rma_pages);
 
+static struct cma *kvm_cma;
+
 /* Work out RMLS (real mode limit selector) field value for a given RMA size.
    Assumes POWER7 or PPC970. */
 static inline int lpcr_rmls(unsigned long rma_size)
@@ -97,7 +101,7 @@ struct kvm_rma_info *kvm_alloc_rma()
         ri = kmalloc(sizeof(struct kvm_rma_info), GFP_KERNEL);
         if (!ri)
                 return NULL;
-        page = kvm_alloc_cma(kvm_rma_pages, kvm_rma_pages);
+        page = cma_alloc(kvm_cma, kvm_rma_pages, get_order(kvm_rma_pages));
         if (!page)
                 goto err_out;
         atomic_set(&ri->use_count, 1);
@@ -112,7 +116,7 @@ EXPORT_SYMBOL_GPL(kvm_alloc_rma);
 void kvm_release_rma(struct kvm_rma_info *ri)
 {
         if (atomic_dec_and_test(&ri->use_count)) {
-                kvm_release_cma(pfn_to_page(ri->base_pfn), kvm_rma_pages);
+                cma_release(kvm_cma, pfn_to_page(ri->base_pfn), kvm_rma_pages);
                 kfree(ri);
         }
 }
@@ -131,16 +135,18 @@ struct page *kvm_alloc_hpt(unsigned long nr_pages)
 {
         unsigned long align_pages = HPT_ALIGN_PAGES;
 
+        VM_BUG_ON(get_order(nr_pages) < KVM_CMA_CHUNK_ORDER - PAGE_SHIFT);
+
         /* 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);
+        return cma_alloc(kvm_cma, nr_pages, get_order(align_pages));
 }
 EXPORT_SYMBOL_GPL(kvm_alloc_hpt);
 
 void kvm_release_hpt(struct page *page, unsigned long nr_pages)
 {
-        kvm_release_cma(page, nr_pages);
+        cma_release(kvm_cma, page, nr_pages);
 }
 EXPORT_SYMBOL_GPL(kvm_release_hpt);
 
@@ -179,7 +185,8 @@ void __init kvm_cma_reserve(void)
                         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);
+                cma_declare_contiguous(0, selected_size, 0, align_size,
+                        KVM_CMA_CHUNK_ORDER - PAGE_SHIFT, false, &kvm_cma);
         }
 }
 
@@ -212,3 +219,16 @@ bool kvm_hv_mode_active(void)
 {
         return atomic_read(&hv_vm_count) != 0;
 }
+
+extern int hcall_real_table[], hcall_real_table_end[];
+
+int kvmppc_hcall_impl_hv_realmode(unsigned long cmd)
+{
+        cmd /= 4;
+        if (cmd < hcall_real_table_end - hcall_real_table &&
+            hcall_real_table[cmd])
+                return 1;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode);
diff --git a/arch/powerpc/kvm/book3s_hv_cma.c b/arch/powerpc/kvm/book3s_hv_cma.c
deleted file mode 100644
index d9d3d8553d51..000000000000
--- a/arch/powerpc/kvm/book3s_hv_cma.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 655144f75fa5..000000000000
--- a/arch/powerpc/kvm/book3s_hv_cma.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c
index 3a5c568b1e89..d562c8e2bc30 100644
--- a/arch/powerpc/kvm/book3s_hv_ras.c
+++ b/arch/powerpc/kvm/book3s_hv_ras.c
@@ -45,14 +45,14 @@ static void reload_slb(struct kvm_vcpu *vcpu)
                 return;
 
         /* Sanity check */
-        n = min_t(u32, slb->persistent, SLB_MIN_SIZE);
+        n = min_t(u32, be32_to_cpu(slb->persistent), SLB_MIN_SIZE);
         if ((void *) &slb->save_area[n] > vcpu->arch.slb_shadow.pinned_end)
                 return;
 
         /* Load up the SLB from that */
         for (i = 0; i < n; ++i) {
-                unsigned long rb = slb->save_area[i].esid;
-                unsigned long rs = slb->save_area[i].vsid;
+                unsigned long rb = be64_to_cpu(slb->save_area[i].esid);
+                unsigned long rs = be64_to_cpu(slb->save_area[i].vsid);
 
                 rb = (rb & ~0xFFFul) | i;       /* insert entry number */
                 asm volatile("slbmte %0,%1" : : "r" (rs), "r" (rb));
diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
index 5a24d3c2b6b8..084ad54c73cd 100644
--- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
@@ -154,10 +154,10 @@ static pte_t lookup_linux_pte_and_update(pgd_t *pgdir, unsigned long hva,
         return kvmppc_read_update_linux_pte(ptep, writing, hugepage_shift);
 }
 
-static inline void unlock_hpte(unsigned long *hpte, unsigned long hpte_v)
+static inline void unlock_hpte(__be64 *hpte, unsigned long hpte_v)
 {
         asm volatile(PPC_RELEASE_BARRIER "" : : : "memory");
-        hpte[0] = hpte_v;
+        hpte[0] = cpu_to_be64(hpte_v);
 }
 
 long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,
@@ -166,7 +166,7 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,
 {
         unsigned long i, pa, gpa, gfn, psize;
         unsigned long slot_fn, hva;
-        unsigned long *hpte;
+        __be64 *hpte;
         struct revmap_entry *rev;
         unsigned long g_ptel;
         struct kvm_memory_slot *memslot;
@@ -275,9 +275,9 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,
                 return H_PARAMETER;
         if (likely((flags & H_EXACT) == 0)) {
                 pte_index &= ~7UL;
-                hpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4));
+                hpte = (__be64 *)(kvm->arch.hpt_virt + (pte_index << 4));
                 for (i = 0; i < 8; ++i) {
-                        if ((*hpte & HPTE_V_VALID) == 0 &&
+                        if ((be64_to_cpu(*hpte) & HPTE_V_VALID) == 0 &&
                             try_lock_hpte(hpte, HPTE_V_HVLOCK | HPTE_V_VALID |
                                           HPTE_V_ABSENT))
                                 break;
@@ -292,11 +292,13 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,
                          */
                         hpte -= 16;
                         for (i = 0; i < 8; ++i) {
+                                u64 pte;
                                 while (!try_lock_hpte(hpte, HPTE_V_HVLOCK))
                                         cpu_relax();
-                                if (!(*hpte & (HPTE_V_VALID | HPTE_V_ABSENT)))
+                                pte = be64_to_cpu(*hpte);
+                                if (!(pte & (HPTE_V_VALID | HPTE_V_ABSENT)))
                                         break;
-                                *hpte &= ~HPTE_V_HVLOCK;
+                                *hpte &= ~cpu_to_be64(HPTE_V_HVLOCK);
                                 hpte += 2;
                         }
                         if (i == 8)
@@ -304,14 +306,17 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,
                 }
                 pte_index += i;
         } else {
-                hpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4));
+                hpte = (__be64 *)(kvm->arch.hpt_virt + (pte_index << 4));
                 if (!try_lock_hpte(hpte, HPTE_V_HVLOCK | HPTE_V_VALID |
                                    HPTE_V_ABSENT)) {
                         /* Lock the slot and check again */
+                        u64 pte;
+
                         while (!try_lock_hpte(hpte, HPTE_V_HVLOCK))
                                 cpu_relax();
-                        if (*hpte & (HPTE_V_VALID | HPTE_V_ABSENT)) {
-                                *hpte &= ~HPTE_V_HVLOCK;
+                        pte = be64_to_cpu(*hpte);
+                        if (pte & (HPTE_V_VALID | HPTE_V_ABSENT)) {
+                                *hpte &= ~cpu_to_be64(HPTE_V_HVLOCK);
                                 return H_PTEG_FULL;
                         }
                 }
@@ -347,11 +352,11 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,
                 }
         }
 
-        hpte[1] = ptel;
+        hpte[1] = cpu_to_be64(ptel);
 
         /* Write the first HPTE dword, unlocking the HPTE and making it valid */
         eieio();
-        hpte[0] = pteh;
+        hpte[0] = cpu_to_be64(pteh);
         asm volatile("ptesync" : : : "memory");
 
         *pte_idx_ret = pte_index;
@@ -468,30 +473,35 @@ long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,
                         unsigned long pte_index, unsigned long avpn,
                         unsigned long *hpret)
 {
-        unsigned long *hpte;
+        __be64 *hpte;
         unsigned long v, r, rb;
         struct revmap_entry *rev;
+        u64 pte;
 
         if (pte_index >= kvm->arch.hpt_npte)
                 return H_PARAMETER;
-        hpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4));
+        hpte = (__be64 *)(kvm->arch.hpt_virt + (pte_index << 4));
         while (!try_lock_hpte(hpte, HPTE_V_HVLOCK))
                 cpu_relax();
-        if ((hpte[0] & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||
-            ((flags & H_AVPN) && (hpte[0] & ~0x7fUL) != avpn) ||
-            ((flags & H_ANDCOND) && (hpte[0] & avpn) != 0)) {
-                hpte[0] &= ~HPTE_V_HVLOCK;
+        pte = be64_to_cpu(hpte[0]);
+        if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||
+            ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn) ||
+            ((flags & H_ANDCOND) && (pte & avpn) != 0)) {
+                hpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);
                 return H_NOT_FOUND;
         }
 
         rev = real_vmalloc_addr(&kvm->arch.revmap[pte_index]);
-        v = hpte[0] & ~HPTE_V_HVLOCK;
+        v = pte & ~HPTE_V_HVLOCK;
         if (v & HPTE_V_VALID) {
-                hpte[0] &= ~HPTE_V_VALID;
-                rb = compute_tlbie_rb(v, hpte[1], pte_index);
+                u64 pte1;
+
+                pte1 = be64_to_cpu(hpte[1]);
+                hpte[0] &= ~cpu_to_be64(HPTE_V_VALID);
+                rb = compute_tlbie_rb(v, pte1, pte_index);
                 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]);
+                remove_revmap_chain(kvm, pte_index, rev, v, pte1);
         }
         r = rev->guest_rpte & ~HPTE_GR_RESERVED;
         note_hpte_modification(kvm, rev);
@@ -514,12 +524,14 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)
 {
         struct kvm *kvm = vcpu->kvm;
         unsigned long *args = &vcpu->arch.gpr[4];
-        unsigned long *hp, *hptes[4], tlbrb[4];
+        __be64 *hp, *hptes[4];
+        unsigned long tlbrb[4];
         long int i, j, k, n, found, indexes[4];
         unsigned long flags, req, pte_index, rcbits;
         int global;
         long int ret = H_SUCCESS;
         struct revmap_entry *rev, *revs[4];
+        u64 hp0;
 
         global = global_invalidates(kvm, 0);
         for (i = 0; i < 4 && ret == H_SUCCESS; ) {
@@ -542,8 +554,7 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)
                                 ret = H_PARAMETER;
                                 break;
                         }
-                        hp = (unsigned long *)
-                                (kvm->arch.hpt_virt + (pte_index << 4));
+                        hp = (__be64 *) (kvm->arch.hpt_virt + (pte_index << 4));
                         /* to avoid deadlock, don't spin except for first */
                         if (!try_lock_hpte(hp, HPTE_V_HVLOCK)) {
                                 if (n)
@@ -552,23 +563,24 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)
                                         cpu_relax();
                         }
                         found = 0;
-                        if (hp[0] & (HPTE_V_ABSENT | HPTE_V_VALID)) {
+                        hp0 = be64_to_cpu(hp[0]);
+                        if (hp0 & (HPTE_V_ABSENT | HPTE_V_VALID)) {
                                 switch (flags & 3) {
                                 case 0:         /* absolute */
                                         found = 1;
                                         break;
                                 case 1:         /* andcond */
-                                        if (!(hp[0] & args[j + 1]))
+                                        if (!(hp0 & args[j + 1]))
                                                 found = 1;
                                         break;
                                 case 2:         /* AVPN */
-                                        if ((hp[0] & ~0x7fUL) == args[j + 1])
+                                        if ((hp0 & ~0x7fUL) == args[j + 1])
                                                 found = 1;
                                         break;
                                 }
                         }
                         if (!found) {
-                                hp[0] &= ~HPTE_V_HVLOCK;
+                                hp[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);
                                 args[j] = ((0x90 | flags) << 56) + pte_index;
                                 continue;
                         }
@@ -577,7 +589,7 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)
                         rev = real_vmalloc_addr(&kvm->arch.revmap[pte_index]);
                         note_hpte_modification(kvm, rev);
 
-                        if (!(hp[0] & HPTE_V_VALID)) {
+                        if (!(hp0 & HPTE_V_VALID)) {
                                 /* insert R and C bits from PTE */
                                 rcbits = rev->guest_rpte & (HPTE_R_R|HPTE_R_C);
                                 args[j] |= rcbits << (56 - 5);
@@ -585,8 +597,10 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)
                                 continue;
                         }
 
-                        hp[0] &= ~HPTE_V_VALID;         /* leave it locked */
-                        tlbrb[n] = compute_tlbie_rb(hp[0], hp[1], pte_index);
+                        /* leave it locked */
+                        hp[0] &= ~cpu_to_be64(HPTE_V_VALID);
+                        tlbrb[n] = compute_tlbie_rb(be64_to_cpu(hp[0]),
+                                be64_to_cpu(hp[1]), pte_index);
                         indexes[n] = j;
                         hptes[n] = hp;
                         revs[n] = rev;
@@ -605,7 +619,8 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)
                         pte_index = args[j] & ((1ul << 56) - 1);
                         hp = hptes[k];
                         rev = revs[k];
-                        remove_revmap_chain(kvm, pte_index, rev, hp[0], hp[1]);
+                        remove_revmap_chain(kvm, pte_index, rev,
+                                be64_to_cpu(hp[0]), be64_to_cpu(hp[1]));
                         rcbits = rev->guest_rpte & (HPTE_R_R|HPTE_R_C);
                         args[j] |= rcbits << (56 - 5);
                         hp[0] = 0;
@@ -620,23 +635,25 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,
                       unsigned long va)
 {
         struct kvm *kvm = vcpu->kvm;
-        unsigned long *hpte;
+        __be64 *hpte;
         struct revmap_entry *rev;
         unsigned long v, r, rb, mask, bits;
+        u64 pte;
 
         if (pte_index >= kvm->arch.hpt_npte)
                 return H_PARAMETER;
 
-        hpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4));
+        hpte = (__be64 *)(kvm->arch.hpt_virt + (pte_index << 4));
         while (!try_lock_hpte(hpte, HPTE_V_HVLOCK))
                 cpu_relax();
-        if ((hpte[0] & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||
-            ((flags & H_AVPN) && (hpte[0] & ~0x7fUL) != avpn)) {
-                hpte[0] &= ~HPTE_V_HVLOCK;
+        pte = be64_to_cpu(hpte[0]);
+        if ((pte & (HPTE_V_ABSENT | HPTE_V_VALID)) == 0 ||
+            ((flags & H_AVPN) && (pte & ~0x7fUL) != avpn)) {
+                hpte[0] &= ~cpu_to_be64(HPTE_V_HVLOCK);
                 return H_NOT_FOUND;
         }
 
-        v = hpte[0];
+        v = pte;
         bits = (flags << 55) & HPTE_R_PP0;
         bits |= (flags << 48) & HPTE_R_KEY_HI;
         bits |= flags & (HPTE_R_PP | HPTE_R_N | HPTE_R_KEY_LO);
@@ -650,12 +667,12 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,
                 rev->guest_rpte = r;
                 note_hpte_modification(kvm, rev);
         }
-        r = (hpte[1] & ~mask) | bits;
+        r = (be64_to_cpu(hpte[1]) & ~mask) | bits;
 
         /* Update HPTE */
         if (v & HPTE_V_VALID) {
                 rb = compute_tlbie_rb(v, r, pte_index);
-                hpte[0] = v & ~HPTE_V_VALID;
+                hpte[0] = cpu_to_be64(v & ~HPTE_V_VALID);
                 do_tlbies(kvm, &rb, 1, global_invalidates(kvm, flags), true);
                 /*
                  * If the host has this page as readonly but the guest
@@ -681,9 +698,9 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,
                         }
                 }
         }
-        hpte[1] = r;
+        hpte[1] = cpu_to_be64(r);
         eieio();
-        hpte[0] = v & ~HPTE_V_HVLOCK;
+        hpte[0] = cpu_to_be64(v & ~HPTE_V_HVLOCK);
         asm volatile("ptesync" : : : "memory");
         return H_SUCCESS;
 }
@@ -692,7 +709,8 @@ long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,
                    unsigned long pte_index)
 {
         struct kvm *kvm = vcpu->kvm;
-        unsigned long *hpte, v, r;
+        __be64 *hpte;
+        unsigned long v, r;
         int i, n = 1;
         struct revmap_entry *rev = NULL;
 
@@ -704,9 +722,9 @@ long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,
         }
         rev = real_vmalloc_addr(&kvm->arch.revmap[pte_index]);
         for (i = 0; i < n; ++i, ++pte_index) {
-                hpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4));
-                v = hpte[0] & ~HPTE_V_HVLOCK;
-                r = hpte[1];
+                hpte = (__be64 *)(kvm->arch.hpt_virt + (pte_index << 4));
+                v = be64_to_cpu(hpte[0]) & ~HPTE_V_HVLOCK;
+                r = be64_to_cpu(hpte[1]);
                 if (v & HPTE_V_ABSENT) {
                         v &= ~HPTE_V_ABSENT;
                         v |= HPTE_V_VALID;
@@ -721,25 +739,27 @@ long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,
         return H_SUCCESS;
 }
 
-void kvmppc_invalidate_hpte(struct kvm *kvm, unsigned long *hptep,
+void kvmppc_invalidate_hpte(struct kvm *kvm, __be64 *hptep,
                         unsigned long pte_index)
 {
         unsigned long rb;
 
-        hptep[0] &= ~HPTE_V_VALID;
-        rb = compute_tlbie_rb(hptep[0], hptep[1], pte_index);
+        hptep[0] &= ~cpu_to_be64(HPTE_V_VALID);
+        rb = compute_tlbie_rb(be64_to_cpu(hptep[0]), be64_to_cpu(hptep[1]),
+                              pte_index);
         do_tlbies(kvm, &rb, 1, 1, true);
 }
 EXPORT_SYMBOL_GPL(kvmppc_invalidate_hpte);
 
-void kvmppc_clear_ref_hpte(struct kvm *kvm, unsigned long *hptep,
+void kvmppc_clear_ref_hpte(struct kvm *kvm, __be64 *hptep,
                            unsigned long pte_index)
 {
         unsigned long rb;
         unsigned char rbyte;
 
-        rb = compute_tlbie_rb(hptep[0], hptep[1], pte_index);
-        rbyte = (hptep[1] & ~HPTE_R_R) >> 8;
+        rb = compute_tlbie_rb(be64_to_cpu(hptep[0]), be64_to_cpu(hptep[1]),
+                              pte_index);
+        rbyte = (be64_to_cpu(hptep[1]) & ~HPTE_R_R) >> 8;
         /* modify only the second-last byte, which contains the ref bit */
         *((char *)hptep + 14) = rbyte;
         do_tlbies(kvm, &rb, 1, 1, false);
@@ -765,7 +785,7 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,
         unsigned long somask;
         unsigned long vsid, hash;
         unsigned long avpn;
-        unsigned long *hpte;
+        __be64 *hpte;
         unsigned long mask, val;
         unsigned long v, r;
 
@@ -797,11 +817,11 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,
         val |= avpn;
 
         for (;;) {
-                hpte = (unsigned long *)(kvm->arch.hpt_virt + (hash << 7));
+                hpte = (__be64 *)(kvm->arch.hpt_virt + (hash << 7));
 
                 for (i = 0; i < 16; i += 2) {
                         /* Read the PTE racily */
-                        v = hpte[i] & ~HPTE_V_HVLOCK;
+                        v = be64_to_cpu(hpte[i]) & ~HPTE_V_HVLOCK;
 
                         /* Check valid/absent, hash, segment size and AVPN */
                         if (!(v & valid) || (v & mask) != val)
@@ -810,8 +830,8 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,
                         /* Lock the PTE and read it under the lock */
                         while (!try_lock_hpte(&hpte[i], HPTE_V_HVLOCK))
                                 cpu_relax();
-                        v = hpte[i] & ~HPTE_V_HVLOCK;
-                        r = hpte[i+1];
+                        v = be64_to_cpu(hpte[i]) & ~HPTE_V_HVLOCK;
+                        r = be64_to_cpu(hpte[i+1]);
 
                         /*
                          * Check the HPTE again, including base page size
@@ -822,7 +842,7 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v,
                                 return (hash << 3) + (i >> 1);
 
                         /* Unlock and move on */
-                        hpte[i] = v;
+                        hpte[i] = cpu_to_be64(v);
                 }
 
                 if (val & HPTE_V_SECONDARY)
@@ -851,7 +871,7 @@ long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,
         struct kvm *kvm = vcpu->kvm;
         long int index;
         unsigned long v, r, gr;
-        unsigned long *hpte;
+        __be64 *hpte;
         unsigned long valid;
         struct revmap_entry *rev;
         unsigned long pp, key;
@@ -867,9 +887,9 @@ long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,
                         return status;  /* there really was no HPTE */
                 return 0;               /* for prot fault, HPTE disappeared */
         }
-        hpte = (unsigned long *)(kvm->arch.hpt_virt + (index << 4));
-        v = hpte[0] & ~HPTE_V_HVLOCK;
-        r = hpte[1];
+        hpte = (__be64 *)(kvm->arch.hpt_virt + (index << 4));
+        v = be64_to_cpu(hpte[0]) & ~HPTE_V_HVLOCK;
+        r = be64_to_cpu(hpte[1]);
         rev = real_vmalloc_addr(&kvm->arch.revmap[index]);
         gr = rev->guest_rpte;
 
diff --git a/arch/powerpc/kvm/book3s_hv_rm_xics.c b/arch/powerpc/kvm/book3s_hv_rm_xics.c
index b4b0082f761c..3ee38e6e884f 100644
--- a/arch/powerpc/kvm/book3s_hv_rm_xics.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c
@@ -401,6 +401,11 @@ int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)
                 icp->rm_action |= XICS_RM_REJECT;
                 icp->rm_reject = irq;
         }
+
+        if (!hlist_empty(&vcpu->kvm->irq_ack_notifier_list)) {
+                icp->rm_action |= XICS_RM_NOTIFY_EOI;
+                icp->rm_eoied_irq = irq;
+        }
  bail:
         return check_too_hard(xics, icp);
 }
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 558a67df8126..f0c4db7704c3 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -32,10 +32,6 @@
 
 #define VCPU_GPRS_TM(reg) (((reg) * ULONG_SIZE) + VCPU_GPR_TM)
 
-#ifdef __LITTLE_ENDIAN__
-#error Need to fix lppaca and SLB shadow accesses in little endian mode
-#endif
-
 /* Values in HSTATE_NAPPING(r13) */
 #define NAPPING_CEDE    1
 #define NAPPING_NOVCPU  2
@@ -159,6 +155,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
         cmpwi   r12, BOOK3S_INTERRUPT_EXTERNAL
 BEGIN_FTR_SECTION
         beq     11f
+        cmpwi   cr2, r12, BOOK3S_INTERRUPT_HMI
+        beq     cr2, 14f                        /* HMI check */
 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206)
 
         /* RFI into the highmem handler, or branch to interrupt handler */
@@ -179,6 +177,10 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206)
 
 13:     b       machine_check_fwnmi
 
+14:     mtspr   SPRN_HSRR0, r8
+        mtspr   SPRN_HSRR1, r7
+        b       hmi_exception_after_realmode
+
 kvmppc_primary_no_guest:
         /* We handle this much like a ceded vcpu */
         /* set our bit in napping_threads */
@@ -595,9 +597,10 @@ kvmppc_got_guest:
         ld      r3, VCPU_VPA(r4)
         cmpdi   r3, 0
         beq     25f
-        lwz     r5, LPPACA_YIELDCOUNT(r3)
+        li      r6, LPPACA_YIELDCOUNT
+        LWZX_BE r5, r3, r6
         addi    r5, r5, 1
-        stw     r5, LPPACA_YIELDCOUNT(r3)
+        STWX_BE r5, r3, r6
         li      r6, 1
         stb     r6, VCPU_VPA_DIRTY(r4)
 25:
@@ -671,9 +674,9 @@ END_FTR_SECTION_IFCLR(CPU_FTR_TM)
 
         mr      r31, r4
         addi    r3, r31, VCPU_FPRS_TM
-        bl      .load_fp_state
+        bl      load_fp_state
         addi    r3, r31, VCPU_VRS_TM
-        bl      .load_vr_state
+        bl      load_vr_state
         mr      r4, r31
         lwz     r7, VCPU_VRSAVE_TM(r4)
         mtspr   SPRN_VRSAVE, r7
@@ -1417,9 +1420,9 @@ END_FTR_SECTION_IFCLR(CPU_FTR_TM)
 
         /* Save FP/VSX. */
         addi    r3, r9, VCPU_FPRS_TM
-        bl      .store_fp_state
+        bl      store_fp_state
         addi    r3, r9, VCPU_VRS_TM
-        bl      .store_vr_state
+        bl      store_vr_state
         mfspr   r6, SPRN_VRSAVE
         stw     r6, VCPU_VRSAVE_TM(r9)
 1:
@@ -1442,9 +1445,10 @@ END_FTR_SECTION_IFCLR(CPU_FTR_TM)
         ld      r8, VCPU_VPA(r9)        /* do they have a VPA? */
         cmpdi   r8, 0
         beq     25f
-        lwz     r3, LPPACA_YIELDCOUNT(r8)
+        li      r4, LPPACA_YIELDCOUNT
+        LWZX_BE r3, r8, r4
         addi    r3, r3, 1
-        stw     r3, LPPACA_YIELDCOUNT(r8)
+        STWX_BE r3, r8, r4
         li      r3, 1
         stb     r3, VCPU_VPA_DIRTY(r9)
 25:
@@ -1757,8 +1761,10 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S)
 33:     ld      r8,PACA_SLBSHADOWPTR(r13)
 
         .rept   SLB_NUM_BOLTED
-        ld      r5,SLBSHADOW_SAVEAREA(r8)
-        ld      r6,SLBSHADOW_SAVEAREA+8(r8)
+        li      r3, SLBSHADOW_SAVEAREA
+        LDX_BE  r5, r8, r3
+        addi    r3, r3, 8
+        LDX_BE  r6, r8, r3
         andis.  r7,r5,SLB_ESID_V@h
         beq     1f
         slbmte  r6,r5
@@ -1909,12 +1915,23 @@ hcall_try_real_mode:
         clrrdi  r3,r3,2
         cmpldi  r3,hcall_real_table_end - hcall_real_table
         bge     guest_exit_cont
+        /* See if this hcall is enabled for in-kernel handling */
+        ld      r4, VCPU_KVM(r9)
+        srdi    r0, r3, 8       /* r0 = (r3 / 4) >> 6 */
+        sldi    r0, r0, 3       /* index into kvm->arch.enabled_hcalls[] */
+        add     r4, r4, r0
+        ld      r0, KVM_ENABLED_HCALLS(r4)
+        rlwinm  r4, r3, 32-2, 0x3f      /* r4 = (r3 / 4) & 0x3f */
+        srd     r0, r0, r4
+        andi.   r0, r0, 1
+        beq     guest_exit_cont
+        /* Get pointer to handler, if any, and call it */
         LOAD_REG_ADDR(r4, hcall_real_table)
         lwax    r3,r3,r4
         cmpwi   r3,0
         beq     guest_exit_cont
-        add     r3,r3,r4
-        mtctr   r3
+        add     r12,r3,r4
+        mtctr   r12
         mr      r3,r9           /* get vcpu pointer */
         ld      r4,VCPU_GPR(R4)(r9)
         bctrl
@@ -2031,6 +2048,7 @@ hcall_real_table:
         .long   0               /* 0x12c */
         .long   0               /* 0x130 */
         .long   DOTSYM(kvmppc_h_set_xdabr) - hcall_real_table
+        .globl  hcall_real_table_end
 hcall_real_table_end:
 
 ignore_hdec:
@@ -2338,7 +2356,18 @@ kvmppc_read_intr:
         cmpdi   r6, 0
         beq-    1f
         lwzcix  r0, r6, r7
-        rlwinm. r3, r0, 0, 0xffffff
+        /*
+         * Save XIRR for later. Since we get in in reverse endian on LE
+         * systems, save it byte reversed and fetch it back in host endian.
+         */
+        li      r3, HSTATE_SAVED_XIRR
+        STWX_BE r0, r3, r13
+#ifdef __LITTLE_ENDIAN__
+        lwz     r3, HSTATE_SAVED_XIRR(r13)
+#else
+        mr      r3, r0
+#endif
+        rlwinm. r3, r3, 0, 0xffffff
         sync
         beq     1f                      /* if nothing pending in the ICP */
 
@@ -2370,10 +2399,9 @@ kvmppc_read_intr:
         li      r3, -1
 1:      blr
 
-42:     /* It's not an IPI and it's for the host, stash it in the PACA
-         * before exit, it will be picked up by the host ICP driver
+42:     /* It's not an IPI and it's for the host. We saved a copy of XIRR in
+         * the PACA earlier, it will be picked up by the host ICP driver
          */
-        stw     r0, HSTATE_SAVED_XIRR(r13)
         li      r3, 1
         b       1b
 
@@ -2408,11 +2436,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)
         mtmsrd  r8
         isync
         addi    r3,r3,VCPU_FPRS
-        bl      .store_fp_state
+        bl      store_fp_state
 #ifdef CONFIG_ALTIVEC
 BEGIN_FTR_SECTION
         addi    r3,r31,VCPU_VRS
-        bl      .store_vr_state
+        bl      store_vr_state
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif
         mfspr   r6,SPRN_VRSAVE
@@ -2444,11 +2472,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)
         mtmsrd  r8
         isync
         addi    r3,r4,VCPU_FPRS
-        bl      .load_fp_state
+        bl      load_fp_state
 #ifdef CONFIG_ALTIVEC
 BEGIN_FTR_SECTION
         addi    r3,r31,VCPU_VRS
-        bl      .load_vr_state
+        bl      load_vr_state
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif
         lwz     r7,VCPU_VRSAVE(r31)
diff --git a/arch/powerpc/kvm/book3s_paired_singles.c b/arch/powerpc/kvm/book3s_paired_singles.c
index 6c8011fd57e6..bfb8035314e3 100644
--- a/arch/powerpc/kvm/book3s_paired_singles.c
+++ b/arch/powerpc/kvm/book3s_paired_singles.c
@@ -639,26 +639,36 @@ static int kvmppc_ps_one_in(struct kvm_vcpu *vcpu, bool rc,
 
 int kvmppc_emulate_paired_single(struct kvm_run *run, struct kvm_vcpu *vcpu)
 {
-        u32 inst = kvmppc_get_last_inst(vcpu);
+        u32 inst;
         enum emulation_result emulated = EMULATE_DONE;
+        int ax_rd, ax_ra, ax_rb, ax_rc;
+        short full_d;
+        u64 *fpr_d, *fpr_a, *fpr_b, *fpr_c;
 
-        int ax_rd = inst_get_field(inst, 6, 10);
-        int ax_ra = inst_get_field(inst, 11, 15);
-        int ax_rb = inst_get_field(inst, 16, 20);
-        int ax_rc = inst_get_field(inst, 21, 25);
-        short full_d = inst_get_field(inst, 16, 31);
-
-        u64 *fpr_d = &VCPU_FPR(vcpu, ax_rd);
-        u64 *fpr_a = &VCPU_FPR(vcpu, ax_ra);
-        u64 *fpr_b = &VCPU_FPR(vcpu, ax_rb);
-        u64 *fpr_c = &VCPU_FPR(vcpu, ax_rc);
-
-        bool rcomp = (inst & 1) ? true : false;
-        u32 cr = kvmppc_get_cr(vcpu);
+        bool rcomp;
+        u32 cr;
 #ifdef DEBUG
         int i;
 #endif
 
+        emulated = kvmppc_get_last_inst(vcpu, INST_GENERIC, &inst);
+        if (emulated != EMULATE_DONE)
+                return emulated;
+
+        ax_rd = inst_get_field(inst, 6, 10);
+        ax_ra = inst_get_field(inst, 11, 15);
+        ax_rb = inst_get_field(inst, 16, 20);
+        ax_rc = inst_get_field(inst, 21, 25);
+        full_d = inst_get_field(inst, 16, 31);
+
+        fpr_d = &VCPU_FPR(vcpu, ax_rd);
+        fpr_a = &VCPU_FPR(vcpu, ax_ra);
+        fpr_b = &VCPU_FPR(vcpu, ax_rb);
+        fpr_c = &VCPU_FPR(vcpu, ax_rc);
+
+        rcomp = (inst & 1) ? true : false;
+        cr = kvmppc_get_cr(vcpu);
+
         if (!kvmppc_inst_is_paired_single(vcpu, inst))
                 return EMULATE_FAIL;
 
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 8eef1e519077..faffb27badd9 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -62,6 +62,35 @@ static void kvmppc_giveup_fac(struct kvm_vcpu *vcpu, ulong fac);
 #define HW_PAGE_SIZE PAGE_SIZE
 #endif
 
+static bool kvmppc_is_split_real(struct kvm_vcpu *vcpu)
+{
+        ulong msr = kvmppc_get_msr(vcpu);
+        return (msr & (MSR_IR|MSR_DR)) == MSR_DR;
+}
+
+static void kvmppc_fixup_split_real(struct kvm_vcpu *vcpu)
+{
+        ulong msr = kvmppc_get_msr(vcpu);
+        ulong pc = kvmppc_get_pc(vcpu);
+
+        /* We are in DR only split real mode */
+        if ((msr & (MSR_IR|MSR_DR)) != MSR_DR)
+                return;
+
+        /* We have not fixed up the guest already */
+        if (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK)
+                return;
+
+        /* The code is in fixupable address space */
+        if (pc & SPLIT_HACK_MASK)
+                return;
+
+        vcpu->arch.hflags |= BOOK3S_HFLAG_SPLIT_HACK;
+        kvmppc_set_pc(vcpu, pc | SPLIT_HACK_OFFS);
+}
+
+void kvmppc_unfixup_split_real(struct kvm_vcpu *vcpu);
+
 static void kvmppc_core_vcpu_load_pr(struct kvm_vcpu *vcpu, int cpu)
 {
 #ifdef CONFIG_PPC_BOOK3S_64
@@ -71,10 +100,19 @@ static void kvmppc_core_vcpu_load_pr(struct kvm_vcpu *vcpu, int cpu)
         svcpu->in_use = 0;
         svcpu_put(svcpu);
 #endif
+
+        /* Disable AIL if supported */
+        if (cpu_has_feature(CPU_FTR_HVMODE) &&
+            cpu_has_feature(CPU_FTR_ARCH_207S))
+                mtspr(SPRN_LPCR, mfspr(SPRN_LPCR) & ~LPCR_AIL);
+
         vcpu->cpu = smp_processor_id();
 #ifdef CONFIG_PPC_BOOK3S_32
         current->thread.kvm_shadow_vcpu = vcpu->arch.shadow_vcpu;
 #endif
+
+        if (kvmppc_is_split_real(vcpu))
+                kvmppc_fixup_split_real(vcpu);
 }
 
 static void kvmppc_core_vcpu_put_pr(struct kvm_vcpu *vcpu)
@@ -89,8 +127,17 @@ static void kvmppc_core_vcpu_put_pr(struct kvm_vcpu *vcpu)
         svcpu_put(svcpu);
 #endif
 
+        if (kvmppc_is_split_real(vcpu))
+                kvmppc_unfixup_split_real(vcpu);
+
         kvmppc_giveup_ext(vcpu, MSR_FP | MSR_VEC | MSR_VSX);
         kvmppc_giveup_fac(vcpu, FSCR_TAR_LG);
+
+        /* Enable AIL if supported */
+        if (cpu_has_feature(CPU_FTR_HVMODE) &&
+            cpu_has_feature(CPU_FTR_ARCH_207S))
+                mtspr(SPRN_LPCR, mfspr(SPRN_LPCR) | LPCR_AIL_3);
+
         vcpu->cpu = -1;
 }
 
@@ -120,6 +167,14 @@ void kvmppc_copy_to_svcpu(struct kvmppc_book3s_shadow_vcpu *svcpu,
 #ifdef CONFIG_PPC_BOOK3S_64
         svcpu->shadow_fscr = vcpu->arch.shadow_fscr;
 #endif
+        /*
+         * Now also save the current time base value. We use this
+         * to find the guest purr and spurr value.
+         */
+        vcpu->arch.entry_tb = get_tb();
+        vcpu->arch.entry_vtb = get_vtb();
+        if (cpu_has_feature(CPU_FTR_ARCH_207S))
+                vcpu->arch.entry_ic = mfspr(SPRN_IC);
         svcpu->in_use = true;
 }
 
@@ -166,6 +221,14 @@ void kvmppc_copy_from_svcpu(struct kvm_vcpu *vcpu,
 #ifdef CONFIG_PPC_BOOK3S_64
         vcpu->arch.shadow_fscr = svcpu->shadow_fscr;
 #endif
+        /*
+         * Update purr and spurr using time base on exit.
+         */
+        vcpu->arch.purr += get_tb() - vcpu->arch.entry_tb;
+        vcpu->arch.spurr += get_tb() - vcpu->arch.entry_tb;
+        vcpu->arch.vtb += get_vtb() - vcpu->arch.entry_vtb;
+        if (cpu_has_feature(CPU_FTR_ARCH_207S))
+                vcpu->arch.ic += mfspr(SPRN_IC) - vcpu->arch.entry_ic;
         svcpu->in_use = false;
 
 out:
@@ -294,6 +357,11 @@ static void kvmppc_set_msr_pr(struct kvm_vcpu *vcpu, u64 msr)
                 }
         }
 
+        if (kvmppc_is_split_real(vcpu))
+                kvmppc_fixup_split_real(vcpu);
+        else
+                kvmppc_unfixup_split_real(vcpu);
+
         if ((kvmppc_get_msr(vcpu) & (MSR_PR|MSR_IR|MSR_DR)) !=
                    (old_msr & (MSR_PR|MSR_IR|MSR_DR))) {
                 kvmppc_mmu_flush_segments(vcpu);
@@ -443,19 +511,19 @@ static void kvmppc_patch_dcbz(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte)
         put_page(hpage);
 }
 
-static int kvmppc_visible_gfn(struct kvm_vcpu *vcpu, gfn_t gfn)
+static int kvmppc_visible_gpa(struct kvm_vcpu *vcpu, gpa_t gpa)
 {
         ulong mp_pa = vcpu->arch.magic_page_pa;
 
         if (!(kvmppc_get_msr(vcpu) & MSR_SF))
                 mp_pa = (uint32_t)mp_pa;
 
-        if (unlikely(mp_pa) &&
-            unlikely((mp_pa & KVM_PAM) >> PAGE_SHIFT == gfn)) {
+        gpa &= ~0xFFFULL;
+        if (unlikely(mp_pa) && unlikely((mp_pa & KVM_PAM) == (gpa & KVM_PAM))) {
                 return 1;
         }
 
-        return kvm_is_visible_gfn(vcpu->kvm, gfn);
+        return kvm_is_visible_gfn(vcpu->kvm, gpa >> PAGE_SHIFT);
 }
 
 int kvmppc_handle_pagefault(struct kvm_run *run, struct kvm_vcpu *vcpu,
@@ -494,6 +562,11 @@ int kvmppc_handle_pagefault(struct kvm_run *run, struct kvm_vcpu *vcpu,
                 pte.vpage |= ((u64)VSID_REAL << (SID_SHIFT - 12));
                 break;
         case MSR_DR:
+                if (!data &&
+                    (vcpu->arch.hflags & BOOK3S_HFLAG_SPLIT_HACK) &&
+                    ((pte.raddr & SPLIT_HACK_MASK) == SPLIT_HACK_OFFS))
+                        pte.raddr &= ~SPLIT_HACK_MASK;
+                /* fall through */
         case MSR_IR:
                 vcpu->arch.mmu.esid_to_vsid(vcpu, eaddr >> SID_SHIFT, &vsid);
 
@@ -541,7 +614,7 @@ int kvmppc_handle_pagefault(struct kvm_run *run, struct kvm_vcpu *vcpu,
                 kvmppc_set_dar(vcpu, kvmppc_get_fault_dar(vcpu));
                 kvmppc_book3s_queue_irqprio(vcpu, vec + 0x80);
         } else if (!is_mmio &&
-                   kvmppc_visible_gfn(vcpu, pte.raddr >> PAGE_SHIFT)) {
+                   kvmppc_visible_gpa(vcpu, pte.raddr)) {
                 if (data && !(vcpu->arch.fault_dsisr & DSISR_NOHPTE)) {
                         /*
                          * There is already a host HPTE there, presumably
@@ -637,42 +710,6 @@ static void kvmppc_giveup_fac(struct kvm_vcpu *vcpu, ulong fac)
 #endif
 }
 
-static int kvmppc_read_inst(struct kvm_vcpu *vcpu)
-{
-        ulong srr0 = kvmppc_get_pc(vcpu);
-        u32 last_inst = kvmppc_get_last_inst(vcpu);
-        int ret;
-
-        ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);
-        if (ret == -ENOENT) {
-                ulong msr = kvmppc_get_msr(vcpu);
-
-                msr = kvmppc_set_field(msr, 33, 33, 1);
-                msr = kvmppc_set_field(msr, 34, 36, 0);
-                msr = kvmppc_set_field(msr, 42, 47, 0);
-                kvmppc_set_msr_fast(vcpu, msr);
-                kvmppc_book3s_queue_irqprio(vcpu, BOOK3S_INTERRUPT_INST_STORAGE);
-                return EMULATE_AGAIN;
-        }
-
-        return EMULATE_DONE;
-}
-
-static int kvmppc_check_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr)
-{
-
-        /* Need to do paired single emulation? */
-        if (!(vcpu->arch.hflags & BOOK3S_HFLAG_PAIRED_SINGLE))
-                return EMULATE_DONE;
-
-        /* Read out the instruction */
-        if (kvmppc_read_inst(vcpu) == EMULATE_DONE)
-                /* Need to emulate */
-                return EMULATE_FAIL;
-
-        return EMULATE_AGAIN;
-}
-
 /* Handle external providers (FPU, Altivec, VSX) */
 static int kvmppc_handle_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr,
                              ulong msr)
@@ -834,6 +871,15 @@ static int kvmppc_handle_fac(struct kvm_vcpu *vcpu, ulong fac)
 
         return RESUME_GUEST;
 }
+
+void kvmppc_set_fscr(struct kvm_vcpu *vcpu, u64 fscr)
+{
+        if ((vcpu->arch.fscr & FSCR_TAR) && !(fscr & FSCR_TAR)) {
+                /* TAR got dropped, drop it in shadow too */
+                kvmppc_giveup_fac(vcpu, FSCR_TAR_LG);
+        }
+        vcpu->arch.fscr = fscr;
+}
 #endif
 
 int kvmppc_handle_exit_pr(struct kvm_run *run, struct kvm_vcpu *vcpu,
@@ -858,6 +904,9 @@ int kvmppc_handle_exit_pr(struct kvm_run *run, struct kvm_vcpu *vcpu,
                 ulong shadow_srr1 = vcpu->arch.shadow_srr1;
                 vcpu->stat.pf_instruc++;
 
+                if (kvmppc_is_split_real(vcpu))
+                        kvmppc_fixup_split_real(vcpu);
+
 #ifdef CONFIG_PPC_BOOK3S_32
                 /* We set segments as unused segments when invalidating them. So
                  * treat the respective fault as segment fault. */
@@ -960,6 +1009,7 @@ int kvmppc_handle_exit_pr(struct kvm_run *run, struct kvm_vcpu *vcpu,
         case BOOK3S_INTERRUPT_DECREMENTER:
         case BOOK3S_INTERRUPT_HV_DECREMENTER:
         case BOOK3S_INTERRUPT_DOORBELL:
+        case BOOK3S_INTERRUPT_H_DOORBELL:
                 vcpu->stat.dec_exits++;
                 r = RESUME_GUEST;
                 break;
@@ -977,15 +1027,24 @@ int kvmppc_handle_exit_pr(struct kvm_run *run, struct kvm_vcpu *vcpu,
         {
                 enum emulation_result er;
                 ulong flags;
+                u32 last_inst;
+                int emul;
 
 program_interrupt:
                 flags = vcpu->arch.shadow_srr1 & 0x1f0000ull;
 
+                emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst);
+                if (emul != EMULATE_DONE) {
+                        r = RESUME_GUEST;
+                        break;
+                }
+
                 if (kvmppc_get_msr(vcpu) & MSR_PR) {
 #ifdef EXIT_DEBUG
-                        printk(KERN_INFO "Userspace triggered 0x700 exception at 0x%lx (0x%x)\n", kvmppc_get_pc(vcpu), kvmppc_get_last_inst(vcpu));
+                        pr_info("Userspace triggered 0x700 exception at\n 0x%lx (0x%x)\n",
+                                kvmppc_get_pc(vcpu), last_inst);
 #endif
-                        if ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !=
+                        if ((last_inst & 0xff0007ff) !=
                             (INS_DCBZ & 0xfffffff7)) {
                                 kvmppc_core_queue_program(vcpu, flags);
                                 r = RESUME_GUEST;
@@ -1004,7 +1063,7 @@ program_interrupt:
                         break;
                 case EMULATE_FAIL:
                         printk(KERN_CRIT "%s: emulation at %lx failed (%08x)\n",
-                               __func__, kvmppc_get_pc(vcpu), kvmppc_get_last_inst(vcpu));
+                               __func__, kvmppc_get_pc(vcpu), last_inst);
                         kvmppc_core_queue_program(vcpu, flags);
                         r = RESUME_GUEST;
                         break;
@@ -1021,8 +1080,23 @@ program_interrupt:
                 break;
         }
         case BOOK3S_INTERRUPT_SYSCALL:
+        {
+                u32 last_sc;
+                int emul;
+
+                /* Get last sc for papr */
+                if (vcpu->arch.papr_enabled) {
+                        /* The sc instuction points SRR0 to the next inst */
+                        emul = kvmppc_get_last_inst(vcpu, INST_SC, &last_sc);
+                        if (emul != EMULATE_DONE) {
+                                kvmppc_set_pc(vcpu, kvmppc_get_pc(vcpu) - 4);
+                                r = RESUME_GUEST;
+                                break;
+                        }
+                }
+
                 if (vcpu->arch.papr_enabled &&
-                    (kvmppc_get_last_sc(vcpu) == 0x44000022) &&
+                    (last_sc == 0x44000022) &&
                     !(kvmppc_get_msr(vcpu) & MSR_PR)) {
                         /* SC 1 papr hypercalls */
                         ulong cmd = kvmppc_get_gpr(vcpu, 3);
@@ -1067,36 +1141,51 @@ program_interrupt:
                         r = RESUME_GUEST;
                 }
                 break;
+        }
         case BOOK3S_INTERRUPT_FP_UNAVAIL:
         case BOOK3S_INTERRUPT_ALTIVEC:
         case BOOK3S_INTERRUPT_VSX:
         {
                 int ext_msr = 0;
+                int emul;
+                u32 last_inst;
+
+                if (vcpu->arch.hflags & BOOK3S_HFLAG_PAIRED_SINGLE) {
+                        /* Do paired single instruction emulation */
+                        emul = kvmppc_get_last_inst(vcpu, INST_GENERIC,
+                                                    &last_inst);
+                        if (emul == EMULATE_DONE)
+                                goto program_interrupt;
+                        else
+                                r = RESUME_GUEST;
 
-                switch (exit_nr) {
-                case BOOK3S_INTERRUPT_FP_UNAVAIL: ext_msr = MSR_FP;  break;
-                case BOOK3S_INTERRUPT_ALTIVEC:    ext_msr = MSR_VEC; break;
-                case BOOK3S_INTERRUPT_VSX:        ext_msr = MSR_VSX; break;
+                        break;
                 }
 
-                switch (kvmppc_check_ext(vcpu, exit_nr)) {
-                case EMULATE_DONE:
-                        /* everything ok - let's enable the ext */
-                        r = kvmppc_handle_ext(vcpu, exit_nr, ext_msr);
+                /* Enable external provider */
+                switch (exit_nr) {
+                case BOOK3S_INTERRUPT_FP_UNAVAIL:
+                        ext_msr = MSR_FP;
                         break;
-                case EMULATE_FAIL:
-                        /* we need to emulate this instruction */
-                        goto program_interrupt;
+
+                case BOOK3S_INTERRUPT_ALTIVEC:
+                        ext_msr = MSR_VEC;
                         break;
-                default:
-                        /* nothing to worry about - go again */
+
+                case BOOK3S_INTERRUPT_VSX:
+                        ext_msr = MSR_VSX;
                         break;
                 }
+
+                r = kvmppc_handle_ext(vcpu, exit_nr, ext_msr);
                 break;
         }
         case BOOK3S_INTERRUPT_ALIGNMENT:
-                if (kvmppc_read_inst(vcpu) == EMULATE_DONE) {
-                        u32 last_inst = kvmppc_get_last_inst(vcpu);
+        {
+                u32 last_inst;
+                int emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst);
+
+                if (emul == EMULATE_DONE) {
                         u32 dsisr;
                         u64 dar;
 
@@ -1110,6 +1199,7 @@ program_interrupt:
                 }
                 r = RESUME_GUEST;
                 break;
+        }
 #ifdef CONFIG_PPC_BOOK3S_64
         case BOOK3S_INTERRUPT_FAC_UNAVAIL:
                 kvmppc_handle_fac(vcpu, vcpu->arch.shadow_fscr >> 56);
@@ -1233,6 +1323,7 @@ static int kvmppc_get_one_reg_pr(struct kvm_vcpu *vcpu, u64 id,
                 *val = get_reg_val(id, to_book3s(vcpu)->hior);
                 break;
         case KVM_REG_PPC_LPCR:
+        case KVM_REG_PPC_LPCR_64:
                 /*
                  * We are only interested in the LPCR_ILE bit
                  */
@@ -1268,6 +1359,7 @@ static int kvmppc_set_one_reg_pr(struct kvm_vcpu *vcpu, u64 id,
                 to_book3s(vcpu)->hior_explicit = true;
                 break;
         case KVM_REG_PPC_LPCR:
+        case KVM_REG_PPC_LPCR_64:
                 kvmppc_set_lpcr_pr(vcpu, set_reg_val(id, *val));
                 break;
         default:
@@ -1310,8 +1402,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm,
         p = __get_free_page(GFP_KERNEL|__GFP_ZERO);
         if (!p)
                 goto uninit_vcpu;
-        /* the real shared page fills the last 4k of our page */
-        vcpu->arch.shared = (void *)(p + PAGE_SIZE - 4096);
+        vcpu->arch.shared = (void *)p;
 #ifdef CONFIG_PPC_BOOK3S_64
         /* Always start the shared struct in native endian mode */
 #ifdef __BIG_ENDIAN__
@@ -1568,6 +1659,11 @@ static int kvmppc_core_init_vm_pr(struct kvm *kvm)
 {
         mutex_init(&kvm->arch.hpt_mutex);
 
+#ifdef CONFIG_PPC_BOOK3S_64
+        /* Start out with the default set of hcalls enabled */
+        kvmppc_pr_init_default_hcalls(kvm);
+#endif
+
         if (firmware_has_feature(FW_FEATURE_SET_MODE)) {
                 spin_lock(&kvm_global_user_count_lock);
                 if (++kvm_global_user_count == 1)
@@ -1636,6 +1732,9 @@ static struct kvmppc_ops kvm_ops_pr = {
         .emulate_mfspr = kvmppc_core_emulate_mfspr_pr,
         .fast_vcpu_kick = kvm_vcpu_kick,
         .arch_vm_ioctl  = kvm_arch_vm_ioctl_pr,
+#ifdef CONFIG_PPC_BOOK3S_64
+        .hcall_implemented = kvmppc_hcall_impl_pr,
+#endif
 };
 
 
diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c
index 52a63bfe3f07..ce3c893d509b 100644
--- a/arch/powerpc/kvm/book3s_pr_papr.c
+++ b/arch/powerpc/kvm/book3s_pr_papr.c
@@ -40,8 +40,9 @@ static int kvmppc_h_pr_enter(struct kvm_vcpu *vcpu)
 {
         long flags = kvmppc_get_gpr(vcpu, 4);
         long pte_index = kvmppc_get_gpr(vcpu, 5);
-        unsigned long pteg[2 * 8];
-        unsigned long pteg_addr, i, *hpte;
+        __be64 pteg[2 * 8];
+        __be64 *hpte;
+        unsigned long pteg_addr, i;
         long int ret;
 
         i = pte_index & 7;
@@ -93,8 +94,8 @@ static int kvmppc_h_pr_remove(struct kvm_vcpu *vcpu)
         pteg = get_pteg_addr(vcpu, pte_index);
         mutex_lock(&vcpu->kvm->arch.hpt_mutex);
         copy_from_user(pte, (void __user *)pteg, sizeof(pte));
-        pte[0] = be64_to_cpu(pte[0]);
-        pte[1] = be64_to_cpu(pte[1]);
+        pte[0] = be64_to_cpu((__force __be64)pte[0]);
+        pte[1] = be64_to_cpu((__force __be64)pte[1]);
 
         ret = H_NOT_FOUND;
         if ((pte[0] & HPTE_V_VALID) == 0 ||
@@ -171,8 +172,8 @@ static int kvmppc_h_pr_bulk_remove(struct kvm_vcpu *vcpu)
 
                 pteg = get_pteg_addr(vcpu, tsh & H_BULK_REMOVE_PTEX);
                 copy_from_user(pte, (void __user *)pteg, sizeof(pte));
-                pte[0] = be64_to_cpu(pte[0]);
-                pte[1] = be64_to_cpu(pte[1]);
+                pte[0] = be64_to_cpu((__force __be64)pte[0]);
+                pte[1] = be64_to_cpu((__force __be64)pte[1]);
 
                 /* tsl = AVPN */
                 flags = (tsh & H_BULK_REMOVE_FLAGS) >> 26;
@@ -211,8 +212,8 @@ static int kvmppc_h_pr_protect(struct kvm_vcpu *vcpu)
         pteg = get_pteg_addr(vcpu, pte_index);
         mutex_lock(&vcpu->kvm->arch.hpt_mutex);
         copy_from_user(pte, (void __user *)pteg, sizeof(pte));
-        pte[0] = be64_to_cpu(pte[0]);
-        pte[1] = be64_to_cpu(pte[1]);
+        pte[0] = be64_to_cpu((__force __be64)pte[0]);
+        pte[1] = be64_to_cpu((__force __be64)pte[1]);
 
         ret = H_NOT_FOUND;
         if ((pte[0] & HPTE_V_VALID) == 0 ||
@@ -231,8 +232,8 @@ static int kvmppc_h_pr_protect(struct kvm_vcpu *vcpu)
 
         rb = compute_tlbie_rb(v, r, pte_index);
         vcpu->arch.mmu.tlbie(vcpu, rb, rb & 1 ? true : false);
-        pte[0] = cpu_to_be64(pte[0]);
-        pte[1] = cpu_to_be64(pte[1]);
+        pte[0] = (__force u64)cpu_to_be64(pte[0]);
+        pte[1] = (__force u64)cpu_to_be64(pte[1]);
         copy_to_user((void __user *)pteg, pte, sizeof(pte));
         ret = H_SUCCESS;
 
@@ -266,6 +267,12 @@ static int kvmppc_h_pr_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd)
 
 int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)
 {
+        int rc, idx;
+
+        if (cmd <= MAX_HCALL_OPCODE &&
+            !test_bit(cmd/4, vcpu->kvm->arch.enabled_hcalls))
+                return EMULATE_FAIL;
+
         switch (cmd) {
         case H_ENTER:
                 return kvmppc_h_pr_enter(vcpu);
@@ -294,8 +301,11 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)
                 break;
         case H_RTAS:
                 if (list_empty(&vcpu->kvm->arch.rtas_tokens))
-                        return RESUME_HOST;
-                if (kvmppc_rtas_hcall(vcpu))
+                        break;
+                idx = srcu_read_lock(&vcpu->kvm->srcu);
+                rc = kvmppc_rtas_hcall(vcpu);
+                srcu_read_unlock(&vcpu->kvm->srcu, idx);
+                if (rc)
                         break;
                 kvmppc_set_gpr(vcpu, 3, 0);
                 return EMULATE_DONE;
@@ -303,3 +313,61 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)
 
         return EMULATE_FAIL;
 }
+
+int kvmppc_hcall_impl_pr(unsigned long cmd)
+{
+        switch (cmd) {
+        case H_ENTER:
+        case H_REMOVE:
+        case H_PROTECT:
+        case H_BULK_REMOVE:
+        case H_PUT_TCE:
+        case H_CEDE:
+#ifdef CONFIG_KVM_XICS
+        case H_XIRR:
+        case H_CPPR:
+        case H_EOI:
+        case H_IPI:
+        case H_IPOLL:
+        case H_XIRR_X:
+#endif
+                return 1;
+        }
+        return 0;
+}
+
+/*
+ * List of hcall numbers to enable by default.
+ * For compatibility with old userspace, we enable by default
+ * all hcalls that were implemented before the hcall-enabling
+ * facility was added.  Note this list should not include H_RTAS.
+ */
+static unsigned int default_hcall_list[] = {
+        H_ENTER,
+        H_REMOVE,
+        H_PROTECT,
+        H_BULK_REMOVE,
+        H_PUT_TCE,
+        H_CEDE,
+#ifdef CONFIG_KVM_XICS
+        H_XIRR,
+        H_CPPR,
+        H_EOI,
+        H_IPI,
+        H_IPOLL,
+        H_XIRR_X,
+#endif
+        0
+};
+
+void kvmppc_pr_init_default_hcalls(struct kvm *kvm)
+{
+        int i;
+        unsigned int hcall;
+
+        for (i = 0; default_hcall_list[i]; ++i) {
+                hcall = default_hcall_list[i];
+                WARN_ON(!kvmppc_hcall_impl_pr(hcall));
+                __set_bit(hcall / 4, kvm->arch.enabled_hcalls);
+        }
+}
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c
index d1acd32a64c0..eaeb78047fb8 100644
--- a/arch/powerpc/kvm/book3s_xics.c
+++ b/arch/powerpc/kvm/book3s_xics.c
@@ -64,8 +64,12 @@
 static void icp_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,
                             u32 new_irq);
 
-static int ics_deliver_irq(struct kvmppc_xics *xics, u32 irq, u32 level,
-                           bool report_status)
+/*
+ * Return value ideally indicates how the interrupt was handled, but no
+ * callers look at it (given that we don't implement KVM_IRQ_LINE_STATUS),
+ * so just return 0.
+ */
+static int ics_deliver_irq(struct kvmppc_xics *xics, u32 irq, u32 level)
 {
         struct ics_irq_state *state;
         struct kvmppc_ics *ics;
@@ -82,17 +86,14 @@ static int ics_deliver_irq(struct kvmppc_xics *xics, u32 irq, u32 level,
         if (!state->exists)
                 return -EINVAL;
 
-        if (report_status)
-                return state->asserted;
-
         /*
          * We set state->asserted locklessly. This should be fine as
          * we are the only setter, thus concurrent access is undefined
          * to begin with.
          */
-        if (level == KVM_INTERRUPT_SET_LEVEL)
+        if (level == 1 || level == KVM_INTERRUPT_SET_LEVEL)
                 state->asserted = 1;
-        else if (level == KVM_INTERRUPT_UNSET) {
+        else if (level == 0 || level == KVM_INTERRUPT_UNSET) {
                 state->asserted = 0;
                 return 0;
         }
@@ -100,7 +101,7 @@ static int ics_deliver_irq(struct kvmppc_xics *xics, u32 irq, u32 level,
         /* Attempt delivery */
         icp_deliver_irq(xics, NULL, irq);
 
-        return state->asserted;
+        return 0;
 }
 
 static void ics_check_resend(struct kvmppc_xics *xics, struct kvmppc_ics *ics,
@@ -772,6 +773,8 @@ static noinline int kvmppc_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr)
         if (state->asserted)
                 icp_deliver_irq(xics, icp, irq);
 
+        kvm_notify_acked_irq(vcpu->kvm, 0, irq);
+
         return H_SUCCESS;
 }
 
@@ -789,6 +792,8 @@ static noinline int kvmppc_xics_rm_complete(struct kvm_vcpu *vcpu, u32 hcall)
                 icp_check_resend(xics, icp);
         if (icp->rm_action & XICS_RM_REJECT)
                 icp_deliver_irq(xics, icp, icp->rm_reject);
+        if (icp->rm_action & XICS_RM_NOTIFY_EOI)
+                kvm_notify_acked_irq(vcpu->kvm, 0, icp->rm_eoied_irq);
 
         icp->rm_action = 0;
 
@@ -1170,7 +1175,16 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level,
 {
         struct kvmppc_xics *xics = kvm->arch.xics;
 
-        return ics_deliver_irq(xics, irq, level, line_status);
+        return ics_deliver_irq(xics, irq, level);
+}
+
+int kvm_set_msi(struct kvm_kernel_irq_routing_entry *irq_entry, struct kvm *kvm,
+                int irq_source_id, int level, bool line_status)
+{
+        if (!level)
+                return -1;
+        return kvm_set_irq(kvm, irq_source_id, irq_entry->gsi,
+                           level, line_status);
 }
 
 static int xics_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
@@ -1301,3 +1315,26 @@ void kvmppc_xics_free_icp(struct kvm_vcpu *vcpu)
         vcpu->arch.icp = NULL;
         vcpu->arch.irq_type = KVMPPC_IRQ_DEFAULT;
 }
+
+static int xics_set_irq(struct kvm_kernel_irq_routing_entry *e,
+                        struct kvm *kvm, int irq_source_id, int level,
+                        bool line_status)
+{
+        return kvm_set_irq(kvm, irq_source_id, e->gsi, level, line_status);
+}
+
+int kvm_irq_map_gsi(struct kvm *kvm,
+                    struct kvm_kernel_irq_routing_entry *entries, int gsi)
+{
+        entries->gsi = gsi;
+        entries->type = KVM_IRQ_ROUTING_IRQCHIP;
+        entries->set = xics_set_irq;
+        entries->irqchip.irqchip = 0;
+        entries->irqchip.pin = gsi;
+        return 1;
+}
+
+int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin)
+{
+        return pin;
+}
diff --git a/arch/powerpc/kvm/book3s_xics.h b/arch/powerpc/kvm/book3s_xics.h
index dd9326c5c19b..e8aaa7a3f209 100644
--- a/arch/powerpc/kvm/book3s_xics.h
+++ b/arch/powerpc/kvm/book3s_xics.h
@@ -71,9 +71,11 @@ struct kvmppc_icp {
 #define XICS_RM_KICK_VCPU       0x1
 #define XICS_RM_CHECK_RESEND    0x2
 #define XICS_RM_REJECT          0x4
+#define XICS_RM_NOTIFY_EOI      0x8
         u32 rm_action;
         struct kvm_vcpu *rm_kick_target;
         u32  rm_reject;
+        u32  rm_eoied_irq;
 
         /* Debug stuff for real mode */
         union kvmppc_icp_state rm_dbgstate;
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index ab62109fdfa3..b4c89fa6f109 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -51,7 +51,6 @@ unsigned long kvmppc_booke_handlers;
 
 struct kvm_stats_debugfs_item debugfs_entries[] = {
         { "mmio",       VCPU_STAT(mmio_exits) },
-        { "dcr",        VCPU_STAT(dcr_exits) },
         { "sig",        VCPU_STAT(signal_exits) },
         { "itlb_r",     VCPU_STAT(itlb_real_miss_exits) },
         { "itlb_v",     VCPU_STAT(itlb_virt_miss_exits) },
@@ -185,24 +184,28 @@ static void kvmppc_booke_queue_irqprio(struct kvm_vcpu *vcpu,
         set_bit(priority, &vcpu->arch.pending_exceptions);
 }
 
-static void kvmppc_core_queue_dtlb_miss(struct kvm_vcpu *vcpu,
-                                        ulong dear_flags, ulong esr_flags)
+void kvmppc_core_queue_dtlb_miss(struct kvm_vcpu *vcpu,
+                                 ulong dear_flags, ulong esr_flags)
 {
         vcpu->arch.queued_dear = dear_flags;
         vcpu->arch.queued_esr = esr_flags;
         kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DTLB_MISS);
 }
 
-static void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu,
-                                           ulong dear_flags, ulong esr_flags)
+void kvmppc_core_queue_data_storage(struct kvm_vcpu *vcpu,
+                                    ulong dear_flags, ulong esr_flags)
 {
         vcpu->arch.queued_dear = dear_flags;
         vcpu->arch.queued_esr = esr_flags;
         kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DATA_STORAGE);
 }
 
-static void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu,
-                                           ulong esr_flags)
+void kvmppc_core_queue_itlb_miss(struct kvm_vcpu *vcpu)
+{
+        kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_ITLB_MISS);
+}
+
+void kvmppc_core_queue_inst_storage(struct kvm_vcpu *vcpu, ulong esr_flags)
 {
         vcpu->arch.queued_esr = esr_flags;
         kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_INST_STORAGE);
@@ -266,13 +269,8 @@ static void kvmppc_core_dequeue_watchdog(struct kvm_vcpu *vcpu)
 
 static void set_guest_srr(struct kvm_vcpu *vcpu, unsigned long srr0, u32 srr1)
 {
-#ifdef CONFIG_KVM_BOOKE_HV
-        mtspr(SPRN_GSRR0, srr0);
-        mtspr(SPRN_GSRR1, srr1);
-#else
-        vcpu->arch.shared->srr0 = srr0;
-        vcpu->arch.shared->srr1 = srr1;
-#endif
+        kvmppc_set_srr0(vcpu, srr0);
+        kvmppc_set_srr1(vcpu, srr1);
 }
 
 static void set_guest_csrr(struct kvm_vcpu *vcpu, unsigned long srr0, u32 srr1)
@@ -297,51 +295,6 @@ static void set_guest_mcsrr(struct kvm_vcpu *vcpu, unsigned long srr0, u32 srr1)
         vcpu->arch.mcsrr1 = srr1;
 }
 
-static unsigned long get_guest_dear(struct kvm_vcpu *vcpu)
-{
-#ifdef CONFIG_KVM_BOOKE_HV
-        return mfspr(SPRN_GDEAR);
-#else
-        return vcpu->arch.shared->dar;
-#endif
-}
-
-static void set_guest_dear(struct kvm_vcpu *vcpu, unsigned long dear)
-{
-#ifdef CONFIG_KVM_BOOKE_HV
-        mtspr(SPRN_GDEAR, dear);
-#else
-        vcpu->arch.shared->dar = dear;
-#endif
-}
-
-static unsigned long get_guest_esr(struct kvm_vcpu *vcpu)
-{
-#ifdef CONFIG_KVM_BOOKE_HV
-        return mfspr(SPRN_GESR);
-#else
-        return vcpu->arch.shared->esr;
-#endif
-}
-
-static void set_guest_esr(struct kvm_vcpu *vcpu, u32 esr)
-{
-#ifdef CONFIG_KVM_BOOKE_HV
-        mtspr(SPRN_GESR, esr);
-#else
-        vcpu->arch.shared->esr = esr;
-#endif
-}
-
-static unsigned long get_guest_epr(struct kvm_vcpu *vcpu)
-{
-#ifdef CONFIG_KVM_BOOKE_HV
-        return mfspr(SPRN_GEPR);
-#else
-        return vcpu->arch.epr;
-#endif
-}
-
 /* Deliver the interrupt of the corresponding priority, if possible. */
 static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
                                         unsigned int priority)
@@ -450,9 +403,9 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu,
 
                 vcpu->arch.pc = vcpu->arch.ivpr | vcpu->arch.ivor[priority];
                 if (update_esr == true)
-                        set_guest_esr(vcpu, vcpu->arch.queued_esr);
+                        kvmppc_set_esr(vcpu, vcpu->arch.queued_esr);
                 if (update_dear == true)
-                        set_guest_dear(vcpu, vcpu->arch.queued_dear);
+                        kvmppc_set_dar(vcpu, vcpu->arch.queued_dear);
                 if (update_epr == true) {
                         if (vcpu->arch.epr_flags & KVMPPC_EPR_USER)
                                 kvm_make_request(KVM_REQ_EPR_EXIT, vcpu);
@@ -752,9 +705,8 @@ static int emulation_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
                  * they were actually modified by emulation. */
                 return RESUME_GUEST_NV;
 
-        case EMULATE_DO_DCR:
-                run->exit_reason = KVM_EXIT_DCR;
-                return RESUME_HOST;
+        case EMULATE_AGAIN:
+                return RESUME_GUEST;
 
         case EMULATE_FAIL:
                 printk(KERN_CRIT "%s: emulation at %lx failed (%08x)\n",
@@ -866,6 +818,28 @@ static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
         }
 }
 
+static int kvmppc_resume_inst_load(struct kvm_run *run, struct kvm_vcpu *vcpu,
+                                  enum emulation_result emulated, u32 last_inst)
+{
+        switch (emulated) {
+        case EMULATE_AGAIN:
+                return RESUME_GUEST;
+
+        case EMULATE_FAIL:
+                pr_debug("%s: load instruction from guest address %lx failed\n",
+                       __func__, vcpu->arch.pc);
+                /* For debugging, encode the failing instruction and
+                 * report it to userspace. */
+                run->hw.hardware_exit_reason = ~0ULL << 32;
+                run->hw.hardware_exit_reason |= last_inst;
+                kvmppc_core_queue_program(vcpu, ESR_PIL);
+                return RESUME_HOST;
+
+        default:
+                BUG();
+        }
+}
+
 /**
  * kvmppc_handle_exit
  *
@@ -877,6 +851,8 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
         int r = RESUME_HOST;
         int s;
         int idx;
+        u32 last_inst = KVM_INST_FETCH_FAILED;
+        enum emulation_result emulated = EMULATE_DONE;
 
         /* update before a new last_exit_type is rewritten */
         kvmppc_update_timing_stats(vcpu);
@@ -884,6 +860,20 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
         /* restart interrupts if they were meant for the host */
         kvmppc_restart_interrupt(vcpu, exit_nr);
 
+        /*
+         * get last instruction before beeing preempted
+         * TODO: for e6500 check also BOOKE_INTERRUPT_LRAT_ERROR & ESR_DATA
+         */
+        switch (exit_nr) {
+        case BOOKE_INTERRUPT_DATA_STORAGE:
+        case BOOKE_INTERRUPT_DTLB_MISS:
+        case BOOKE_INTERRUPT_HV_PRIV:
+                emulated = kvmppc_get_last_inst(vcpu, false, &last_inst);
+                break;
+        default:
+                break;
+        }
+
         local_irq_enable();
 
         trace_kvm_exit(exit_nr, vcpu);
@@ -892,6 +882,11 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
         run->exit_reason = KVM_EXIT_UNKNOWN;
         run->ready_for_interrupt_injection = 1;
 
+        if (emulated != EMULATE_DONE) {
+                r = kvmppc_resume_inst_load(run, vcpu, emulated, last_inst);
+                goto out;
+        }
+
         switch (exit_nr) {
         case BOOKE_INTERRUPT_MACHINE_CHECK:
                 printk("MACHINE CHECK: %lx\n", mfspr(SPRN_MCSR));
@@ -1181,6 +1176,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
                 BUG();
         }
 
+out:
         /*
          * To avoid clobbering exit_reason, only check for signals if we
          * aren't already exiting to userspace for some other reason.
@@ -1265,17 +1261,17 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         regs->lr = vcpu->arch.lr;
         regs->xer = kvmppc_get_xer(vcpu);
         regs->msr = vcpu->arch.shared->msr;
-        regs->srr0 = vcpu->arch.shared->srr0;
-        regs->srr1 = vcpu->arch.shared->srr1;
+        regs->srr0 = kvmppc_get_srr0(vcpu);
+        regs->srr1 = kvmppc_get_srr1(vcpu);
         regs->pid = vcpu->arch.pid;
-        regs->sprg0 = vcpu->arch.shared->sprg0;
-        regs->sprg1 = vcpu->arch.shared->sprg1;
-        regs->sprg2 = vcpu->arch.shared->sprg2;
-        regs->sprg3 = vcpu->arch.shared->sprg3;
-        regs->sprg4 = vcpu->arch.shared->sprg4;
-        regs->sprg5 = vcpu->arch.shared->sprg5;
-        regs->sprg6 = vcpu->arch.shared->sprg6;
-        regs->sprg7 = vcpu->arch.shared->sprg7;
+        regs->sprg0 = kvmppc_get_sprg0(vcpu);
+        regs->sprg1 = kvmppc_get_sprg1(vcpu);
+        regs->sprg2 = kvmppc_get_sprg2(vcpu);
+        regs->sprg3 = kvmppc_get_sprg3(vcpu);
+        regs->sprg4 = kvmppc_get_sprg4(vcpu);
+        regs->sprg5 = kvmppc_get_sprg5(vcpu);
+        regs->sprg6 = kvmppc_get_sprg6(vcpu);
+        regs->sprg7 = kvmppc_get_sprg7(vcpu);
 
         for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)
                 regs->gpr[i] = kvmppc_get_gpr(vcpu, i);
@@ -1293,17 +1289,17 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         vcpu->arch.lr = regs->lr;
         kvmppc_set_xer(vcpu, regs->xer);
         kvmppc_set_msr(vcpu, regs->msr);
-        vcpu->arch.shared->srr0 = regs->srr0;
-        vcpu->arch.shared->srr1 = regs->srr1;
+        kvmppc_set_srr0(vcpu, regs->srr0);
+        kvmppc_set_srr1(vcpu, regs->srr1);
         kvmppc_set_pid(vcpu, regs->pid);
-        vcpu->arch.shared->sprg0 = regs->sprg0;
-        vcpu->arch.shared->sprg1 = regs->sprg1;
-        vcpu->arch.shared->sprg2 = regs->sprg2;
-        vcpu->arch.shared->sprg3 = regs->sprg3;
-        vcpu->arch.shared->sprg4 = regs->sprg4;
-        vcpu->arch.shared->sprg5 = regs->sprg5;
-        vcpu->arch.shared->sprg6 = regs->sprg6;
-        vcpu->arch.shared->sprg7 = regs->sprg7;
+        kvmppc_set_sprg0(vcpu, regs->sprg0);
+        kvmppc_set_sprg1(vcpu, regs->sprg1);
+        kvmppc_set_sprg2(vcpu, regs->sprg2);
+        kvmppc_set_sprg3(vcpu, regs->sprg3);
+        kvmppc_set_sprg4(vcpu, regs->sprg4);
+        kvmppc_set_sprg5(vcpu, regs->sprg5);
+        kvmppc_set_sprg6(vcpu, regs->sprg6);
+        kvmppc_set_sprg7(vcpu, regs->sprg7);
 
         for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)
                 kvmppc_set_gpr(vcpu, i, regs->gpr[i]);
@@ -1321,8 +1317,8 @@ static void get_sregs_base(struct kvm_vcpu *vcpu,
         sregs->u.e.csrr0 = vcpu->arch.csrr0;
         sregs->u.e.csrr1 = vcpu->arch.csrr1;
         sregs->u.e.mcsr = vcpu->arch.mcsr;
-        sregs->u.e.esr = get_guest_esr(vcpu);
-        sregs->u.e.dear = get_guest_dear(vcpu);
+        sregs->u.e.esr = kvmppc_get_esr(vcpu);
+        sregs->u.e.dear = kvmppc_get_dar(vcpu);
         sregs->u.e.tsr = vcpu->arch.tsr;
         sregs->u.e.tcr = vcpu->arch.tcr;
         sregs->u.e.dec = kvmppc_get_dec(vcpu, tb);
@@ -1339,8 +1335,8 @@ static int set_sregs_base(struct kvm_vcpu *vcpu,
         vcpu->arch.csrr0 = sregs->u.e.csrr0;
         vcpu->arch.csrr1 = sregs->u.e.csrr1;
         vcpu->arch.mcsr = sregs->u.e.mcsr;
-        set_guest_esr(vcpu, sregs->u.e.esr);
-        set_guest_dear(vcpu, sregs->u.e.dear);
+        kvmppc_set_esr(vcpu, sregs->u.e.esr);
+        kvmppc_set_dar(vcpu, sregs->u.e.dear);
         vcpu->arch.vrsave = sregs->u.e.vrsave;
         kvmppc_set_tcr(vcpu, sregs->u.e.tcr);
 
@@ -1493,7 +1489,7 @@ int kvm_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, struct kvm_one_reg *reg)
                 val = get_reg_val(reg->id, vcpu->arch.dbg_reg.dac2);
                 break;
         case KVM_REG_PPC_EPR: {
-                u32 epr = get_guest_epr(vcpu);
+                u32 epr = kvmppc_get_epr(vcpu);
                 val = get_reg_val(reg->id, epr);
                 break;
         }
@@ -1788,6 +1784,57 @@ void kvm_guest_protect_msr(struct kvm_vcpu *vcpu, ulong prot_bitmap, bool set)
 #endif
 }
 
+int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr, enum xlate_instdata xlid,
+                 enum xlate_readwrite xlrw, struct kvmppc_pte *pte)
+{
+        int gtlb_index;
+        gpa_t gpaddr;
+
+#ifdef CONFIG_KVM_E500V2
+        if (!(vcpu->arch.shared->msr & MSR_PR) &&
+            (eaddr & PAGE_MASK) == vcpu->arch.magic_page_ea) {
+                pte->eaddr = eaddr;
+                pte->raddr = (vcpu->arch.magic_page_pa & PAGE_MASK) |
+                             (eaddr & ~PAGE_MASK);
+                pte->vpage = eaddr >> PAGE_SHIFT;
+                pte->may_read = true;
+                pte->may_write = true;
+                pte->may_execute = true;
+
+                return 0;
+        }
+#endif
+
+        /* Check the guest TLB. */
+        switch (xlid) {
+        case XLATE_INST:
+                gtlb_index = kvmppc_mmu_itlb_index(vcpu, eaddr);
+                break;
+        case XLATE_DATA:
+                gtlb_index = kvmppc_mmu_dtlb_index(vcpu, eaddr);
+                break;
+        default:
+                BUG();
+        }
+
+        /* Do we have a TLB entry at all? */
+        if (gtlb_index < 0)
+                return -ENOENT;
+
+        gpaddr = kvmppc_mmu_xlate(vcpu, gtlb_index, eaddr);
+
+        pte->eaddr = eaddr;
+        pte->raddr = (gpaddr & PAGE_MASK) | (eaddr & ~PAGE_MASK);
+        pte->vpage = eaddr >> PAGE_SHIFT;
+
+        /* XXX read permissions from the guest TLB */
+        pte->may_read = true;
+        pte->may_write = true;
+        pte->may_execute = true;
+
+        return 0;
+}
+
 int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
                                          struct kvm_guest_debug *dbg)
 {
diff --git a/arch/powerpc/kvm/booke.h b/arch/powerpc/kvm/booke.h
index b632cd35919b..f753543c56fa 100644
--- a/arch/powerpc/kvm/booke.h
+++ b/arch/powerpc/kvm/booke.h
@@ -99,13 +99,6 @@ enum int_class {
 
 void kvmppc_set_pending_interrupt(struct kvm_vcpu *vcpu, enum int_class type);
 
-extern void kvmppc_mmu_destroy_44x(struct kvm_vcpu *vcpu);
-extern int kvmppc_core_emulate_op_44x(struct kvm_run *run, struct kvm_vcpu *vcpu,
-                                      unsigned int inst, int *advance);
-extern int kvmppc_core_emulate_mtspr_44x(struct kvm_vcpu *vcpu, int sprn,
-                                         ulong spr_val);
-extern int kvmppc_core_emulate_mfspr_44x(struct kvm_vcpu *vcpu, int sprn,
-                                         ulong *spr_val);
 extern void kvmppc_mmu_destroy_e500(struct kvm_vcpu *vcpu);
 extern int kvmppc_core_emulate_op_e500(struct kvm_run *run,
                                        struct kvm_vcpu *vcpu,
diff --git a/arch/powerpc/kvm/booke_emulate.c b/arch/powerpc/kvm/booke_emulate.c
index 27a4b2877c10..28c158881d23 100644
--- a/arch/powerpc/kvm/booke_emulate.c
+++ b/arch/powerpc/kvm/booke_emulate.c
@@ -165,16 +165,16 @@ int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)
          * guest (PR-mode only).
          */
         case SPRN_SPRG4:
-                vcpu->arch.shared->sprg4 = spr_val;
+                kvmppc_set_sprg4(vcpu, spr_val);
                 break;
         case SPRN_SPRG5:
-                vcpu->arch.shared->sprg5 = spr_val;
+                kvmppc_set_sprg5(vcpu, spr_val);
                 break;
         case SPRN_SPRG6:
-                vcpu->arch.shared->sprg6 = spr_val;
+                kvmppc_set_sprg6(vcpu, spr_val);
                 break;
         case SPRN_SPRG7:
-                vcpu->arch.shared->sprg7 = spr_val;
+                kvmppc_set_sprg7(vcpu, spr_val);
                 break;
 
         case SPRN_IVPR:
diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
index 2c6deb5ef2fe..84c308a9a371 100644
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -21,7 +21,6 @@
 #include <asm/ppc_asm.h>
 #include <asm/kvm_asm.h>
 #include <asm/reg.h>
-#include <asm/mmu-44x.h>
 #include <asm/page.h>
 #include <asm/asm-offsets.h>
 
@@ -424,10 +423,6 @@ lightweight_exit:
         mtspr   SPRN_PID1, r3
 #endif
 
-#ifdef CONFIG_44x
-        iccci   0, 0 /* XXX hack */
-#endif
-
         /* Load some guest volatiles. */
         lwz     r0, VCPU_GPR(R0)(r4)
         lwz     r2, VCPU_GPR(R2)(r4)
diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S
index a1712b818a5f..e9fa56a911fd 100644
--- a/arch/powerpc/kvm/bookehv_interrupts.S
+++ b/arch/powerpc/kvm/bookehv_interrupts.S
@@ -24,12 +24,10 @@
 #include <asm/ppc_asm.h>
 #include <asm/kvm_asm.h>
 #include <asm/reg.h>
-#include <asm/mmu-44x.h>
 #include <asm/page.h>
 #include <asm/asm-compat.h>
 #include <asm/asm-offsets.h>
 #include <asm/bitsperlong.h>
-#include <asm/thread_info.h>
 
 #ifdef CONFIG_64BIT
 #include <asm/exception-64e.h>
@@ -122,38 +120,14 @@
 1:
 
         .if     \flags & NEED_EMU
-        /*
-         * This assumes you have external PID support.
-         * To support a bookehv CPU without external PID, you'll
-         * need to look up the TLB entry and create a temporary mapping.
-         *
-         * FIXME: we don't currently handle if the lwepx faults.  PR-mode
-         * booke doesn't handle it either.  Since Linux doesn't use
-         * broadcast tlbivax anymore, the only way this should happen is
-         * if the guest maps its memory execute-but-not-read, or if we
-         * somehow take a TLB miss in the middle of this entry code and
-         * evict the relevant entry.  On e500mc, all kernel lowmem is
-         * bolted into TLB1 large page mappings, and we don't use
-         * broadcast invalidates, so we should not take a TLB miss here.
-         *
-         * Later we'll need to deal with faults here.  Disallowing guest
-         * mappings that are execute-but-not-read could be an option on
-         * e500mc, but not on chips with an LRAT if it is used.
-         */
-
-        mfspr   r3, SPRN_EPLC   /* will already have correct ELPID and EGS */
         PPC_STL r15, VCPU_GPR(R15)(r4)
         PPC_STL r16, VCPU_GPR(R16)(r4)
         PPC_STL r17, VCPU_GPR(R17)(r4)
         PPC_STL r18, VCPU_GPR(R18)(r4)
         PPC_STL r19, VCPU_GPR(R19)(r4)
-        mr      r8, r3
         PPC_STL r20, VCPU_GPR(R20)(r4)
-        rlwimi  r8, r6, EPC_EAS_SHIFT - MSR_IR_LG, EPC_EAS
         PPC_STL r21, VCPU_GPR(R21)(r4)
-        rlwimi  r8, r6, EPC_EPR_SHIFT - MSR_PR_LG, EPC_EPR
         PPC_STL r22, VCPU_GPR(R22)(r4)
-        rlwimi  r8, r10, EPC_EPID_SHIFT, EPC_EPID
         PPC_STL r23, VCPU_GPR(R23)(r4)
         PPC_STL r24, VCPU_GPR(R24)(r4)
         PPC_STL r25, VCPU_GPR(R25)(r4)
@@ -163,33 +137,15 @@
         PPC_STL r29, VCPU_GPR(R29)(r4)
         PPC_STL r30, VCPU_GPR(R30)(r4)
         PPC_STL r31, VCPU_GPR(R31)(r4)
-        mtspr   SPRN_EPLC, r8
-
-        /* disable preemption, so we are sure we hit the fixup handler */
-        CURRENT_THREAD_INFO(r8, r1)
-        li      r7, 1
-        stw     r7, TI_PREEMPT(r8)
-
-        isync
 
         /*
-         * In case the read goes wrong, we catch it and write an invalid value
-         * in LAST_INST instead.
+         * We don't use external PID support. lwepx faults would need to be
+         * handled by KVM and this implies aditional code in DO_KVM (for
+         * DTB_MISS, DSI and LRAT) to check ESR[EPID] and EPLC[EGS] which
+         * is too intrusive for the host. Get last instuction in
+         * kvmppc_get_last_inst().
          */
-1:      lwepx   r9, 0, r5
-2:
-.section .fixup, "ax"
-3:      li      r9, KVM_INST_FETCH_FAILED
-        b       2b
-.previous
-.section __ex_table,"a"
-        PPC_LONG_ALIGN
-        PPC_LONG 1b,3b
-.previous
-
-        mtspr   SPRN_EPLC, r3
-        li      r7, 0
-        stw     r7, TI_PREEMPT(r8)
+        li      r9, KVM_INST_FETCH_FAILED
         stw     r9, VCPU_LAST_INST(r4)
         .endif
 
@@ -441,6 +397,7 @@ _GLOBAL(kvmppc_resume_host)
 #ifdef CONFIG_64BIT
         PPC_LL  r3, PACA_SPRG_VDSO(r13)
 #endif
+        mfspr   r5, SPRN_SPRG9
         PPC_STD(r6, VCPU_SHARED_SPRG4, r11)
         mfspr   r8, SPRN_SPRG6
         PPC_STD(r7, VCPU_SHARED_SPRG5, r11)
@@ -448,6 +405,7 @@ _GLOBAL(kvmppc_resume_host)
 #ifdef CONFIG_64BIT
         mtspr   SPRN_SPRG_VDSO_WRITE, r3
 #endif
+        PPC_STD(r5, VCPU_SPRG9, r4)
         PPC_STD(r8, VCPU_SHARED_SPRG6, r11)
         mfxer   r3
         PPC_STD(r9, VCPU_SHARED_SPRG7, r11)
@@ -682,7 +640,9 @@ lightweight_exit:
         mtspr   SPRN_SPRG5W, r6
         PPC_LD(r8, VCPU_SHARED_SPRG7, r11)
         mtspr   SPRN_SPRG6W, r7
+        PPC_LD(r5, VCPU_SPRG9, r4)
         mtspr   SPRN_SPRG7W, r8
+        mtspr   SPRN_SPRG9, r5
 
         /* Load some guest volatiles. */
         PPC_LL  r3, VCPU_LR(r4)
diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 002d51764143..c99c40e9182a 100644
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -250,6 +250,14 @@ int kvmppc_core_emulate_mtspr_e500(struct kvm_vcpu *vcpu, int sprn, ulong spr_va
                                 spr_val);
                 break;
 
+        case SPRN_PWRMGTCR0:
+                /*
+                 * Guest relies on host power management configurations
+                 * Treat the request as a general store
+                 */
+                vcpu->arch.pwrmgtcr0 = spr_val;
+                break;
+
         /* extra exceptions */
         case SPRN_IVOR32:
                 vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] = spr_val;
@@ -368,6 +376,10 @@ int kvmppc_core_emulate_mfspr_e500(struct kvm_vcpu *vcpu, int sprn, ulong *spr_v
                 *spr_val = vcpu->arch.eptcfg;
                 break;
 
+        case SPRN_PWRMGTCR0:
+                *spr_val = vcpu->arch.pwrmgtcr0;
+                break;
+
         /* extra exceptions */
         case SPRN_IVOR32:
                 *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL];
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c
index 86903d3f5a03..08f14bb57897 100644
--- a/arch/powerpc/kvm/e500_mmu_host.c
+++ b/arch/powerpc/kvm/e500_mmu_host.c
@@ -107,11 +107,15 @@ static u32 get_host_mas0(unsigned long eaddr)
 {
         unsigned long flags;
         u32 mas0;
+        u32 mas4;
 
         local_irq_save(flags);
         mtspr(SPRN_MAS6, 0);
+        mas4 = mfspr(SPRN_MAS4);
+        mtspr(SPRN_MAS4, mas4 & ~MAS4_TLBSEL_MASK);
         asm volatile("tlbsx 0, %0" : : "b" (eaddr & ~CONFIG_PAGE_OFFSET));
         mas0 = mfspr(SPRN_MAS0);
+        mtspr(SPRN_MAS4, mas4);
         local_irq_restore(flags);
 
         return mas0;
@@ -607,6 +611,104 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 eaddr, gpa_t gpaddr,
         }
 }
 
+#ifdef CONFIG_KVM_BOOKE_HV
+int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
+                          u32 *instr)
+{
+        gva_t geaddr;
+        hpa_t addr;
+        hfn_t pfn;
+        hva_t eaddr;
+        u32 mas1, mas2, mas3;
+        u64 mas7_mas3;
+        struct page *page;
+        unsigned int addr_space, psize_shift;
+        bool pr;
+        unsigned long flags;
+
+        /* Search TLB for guest pc to get the real address */
+        geaddr = kvmppc_get_pc(vcpu);
+
+        addr_space = (vcpu->arch.shared->msr & MSR_IS) >> MSR_IR_LG;
+
+        local_irq_save(flags);
+        mtspr(SPRN_MAS6, (vcpu->arch.pid << MAS6_SPID_SHIFT) | addr_space);
+        mtspr(SPRN_MAS5, MAS5_SGS | vcpu->kvm->arch.lpid);
+        asm volatile("tlbsx 0, %[geaddr]\n" : :
+                     [geaddr] "r" (geaddr));
+        mtspr(SPRN_MAS5, 0);
+        mtspr(SPRN_MAS8, 0);
+        mas1 = mfspr(SPRN_MAS1);
+        mas2 = mfspr(SPRN_MAS2);
+        mas3 = mfspr(SPRN_MAS3);
+#ifdef CONFIG_64BIT
+        mas7_mas3 = mfspr(SPRN_MAS7_MAS3);
+#else
+        mas7_mas3 = ((u64)mfspr(SPRN_MAS7) << 32) | mas3;
+#endif
+        local_irq_restore(flags);
+
+        /*
+         * If the TLB entry for guest pc was evicted, return to the guest.
+         * There are high chances to find a valid TLB entry next time.
+         */
+        if (!(mas1 & MAS1_VALID))
+                return EMULATE_AGAIN;
+
+        /*
+         * Another thread may rewrite the TLB entry in parallel, don't
+         * execute from the address if the execute permission is not set
+         */
+        pr = vcpu->arch.shared->msr & MSR_PR;
+        if (unlikely((pr && !(mas3 & MAS3_UX)) ||
+                     (!pr && !(mas3 & MAS3_SX)))) {
+                pr_err_ratelimited(
+                        "%s: Instuction emulation from guest addres %08lx without execute permission\n",
+                        __func__, geaddr);
+                return EMULATE_AGAIN;
+        }
+
+        /*
+         * The real address will be mapped by a cacheable, memory coherent,
+         * write-back page. Check for mismatches when LRAT is used.
+         */
+        if (has_feature(vcpu, VCPU_FTR_MMU_V2) &&
+            unlikely((mas2 & MAS2_I) || (mas2 & MAS2_W) || !(mas2 & MAS2_M))) {
+                pr_err_ratelimited(
+                        "%s: Instuction emulation from guest addres %08lx mismatches storage attributes\n",
+                        __func__, geaddr);
+                return EMULATE_AGAIN;
+        }
+
+        /* Get pfn */
+        psize_shift = MAS1_GET_TSIZE(mas1) + 10;
+        addr = (mas7_mas3 & (~0ULL << psize_shift)) |
+               (geaddr & ((1ULL << psize_shift) - 1ULL));
+        pfn = addr >> PAGE_SHIFT;
+
+        /* Guard against emulation from devices area */
+        if (unlikely(!page_is_ram(pfn))) {
+                pr_err_ratelimited("%s: Instruction emulation from non-RAM host addres %08llx is not supported\n",
+                         __func__, addr);
+                return EMULATE_AGAIN;
+        }
+
+        /* Map a page and get guest's instruction */
+        page = pfn_to_page(pfn);
+        eaddr = (unsigned long)kmap_atomic(page);
+        *instr = *(u32 *)(eaddr | (unsigned long)(addr & ~PAGE_MASK));
+        kunmap_atomic((u32 *)eaddr);
+
+        return EMULATE_DONE;
+}
+#else
+int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
+                          u32 *instr)
+{
+        return EMULATE_AGAIN;
+}
+#endif
+
 /************* MMU Notifiers *************/
 
 int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)
diff --git a/arch/powerpc/kvm/e500mc.c b/arch/powerpc/kvm/e500mc.c
index 17e456279224..164bad2a19bf 100644
--- a/arch/powerpc/kvm/e500mc.c
+++ b/arch/powerpc/kvm/e500mc.c
@@ -110,7 +110,7 @@ void kvmppc_mmu_msr_notify(struct kvm_vcpu *vcpu, u32 old_msr)
 {
 }
 
-static DEFINE_PER_CPU(struct kvm_vcpu *, last_vcpu_on_cpu);
+static DEFINE_PER_CPU(struct kvm_vcpu *[KVMPPC_NR_LPIDS], last_vcpu_of_lpid);
 
 static void kvmppc_core_vcpu_load_e500mc(struct kvm_vcpu *vcpu, int cpu)
 {
@@ -141,9 +141,9 @@ static void kvmppc_core_vcpu_load_e500mc(struct kvm_vcpu *vcpu, int cpu)
         mtspr(SPRN_GESR, vcpu->arch.shared->esr);
 
         if (vcpu->arch.oldpir != mfspr(SPRN_PIR) ||
-            __get_cpu_var(last_vcpu_on_cpu) != vcpu) {
+            __get_cpu_var(last_vcpu_of_lpid)[vcpu->kvm->arch.lpid] != vcpu) {
                 kvmppc_e500_tlbil_all(vcpu_e500);
-                __get_cpu_var(last_vcpu_on_cpu) = vcpu;
+                __get_cpu_var(last_vcpu_of_lpid)[vcpu->kvm->arch.lpid] = vcpu;
         }
 
         kvmppc_load_guest_fp(vcpu);
@@ -267,14 +267,32 @@ static int kvmppc_core_set_sregs_e500mc(struct kvm_vcpu *vcpu,
 static int kvmppc_get_one_reg_e500mc(struct kvm_vcpu *vcpu, u64 id,
                               union kvmppc_one_reg *val)
 {
-        int r = kvmppc_get_one_reg_e500_tlb(vcpu, id, val);
+        int r = 0;
+
+        switch (id) {
+        case KVM_REG_PPC_SPRG9:
+                *val = get_reg_val(id, vcpu->arch.sprg9);
+                break;
+        default:
+                r = kvmppc_get_one_reg_e500_tlb(vcpu, id, val);
+        }
+
         return r;
 }
 
 static int kvmppc_set_one_reg_e500mc(struct kvm_vcpu *vcpu, u64 id,
                               union kvmppc_one_reg *val)
 {
-        int r = kvmppc_set_one_reg_e500_tlb(vcpu, id, val);
+        int r = 0;
+
+        switch (id) {
+        case KVM_REG_PPC_SPRG9:
+                vcpu->arch.sprg9 = set_reg_val(id, *val);
+                break;
+        default:
+                r = kvmppc_set_one_reg_e500_tlb(vcpu, id, val);
+        }
+
         return r;
 }
 
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index da86d9ba3476..e96b50d0bdab 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -207,36 +207,28 @@ static int kvmppc_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
         return emulated;
 }
 
-/* XXX to do:
- * lhax
- * lhaux
- * lswx
- * lswi
- * stswx
- * stswi
- * lha
- * lhau
- * lmw
- * stmw
- *
- */
 /* XXX Should probably auto-generate instruction decoding for a particular core
  * from opcode tables in the future. */
 int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 {
-        u32 inst = kvmppc_get_last_inst(vcpu);
-        int ra = get_ra(inst);
-        int rs = get_rs(inst);
-        int rt = get_rt(inst);
-        int sprn = get_sprn(inst);
-        enum emulation_result emulated = EMULATE_DONE;
+        u32 inst;
+        int rs, rt, sprn;
+        enum emulation_result emulated;
         int advance = 1;
 
         /* this default type might be overwritten by subcategories */
         kvmppc_set_exit_type(vcpu, EMULATED_INST_EXITS);
 
+        emulated = kvmppc_get_last_inst(vcpu, false, &inst);
+        if (emulated != EMULATE_DONE)
+                return emulated;
+
         pr_debug("Emulating opcode %d / %d\n", get_op(inst), get_xop(inst));
 
+        rs = get_rs(inst);
+        rt = get_rt(inst);
+        sprn = get_sprn(inst);
+
         switch (get_op(inst)) {
         case OP_TRAP:
 #ifdef CONFIG_PPC_BOOK3S
@@ -264,200 +256,24 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 #endif
                         advance = 0;
                         break;
-                case OP_31_XOP_LWZX:
-                        emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
-                        break;
-
-                case OP_31_XOP_LBZX:
-                        emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
-                        break;
-
-                case OP_31_XOP_LBZUX:
-                        emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
-                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                        break;
-
-                case OP_31_XOP_STWX:
-                        emulated = kvmppc_handle_store(run, vcpu,
-                                                       kvmppc_get_gpr(vcpu, rs),
-                                                       4, 1);
-                        break;
-
-                case OP_31_XOP_STBX:
-                        emulated = kvmppc_handle_store(run, vcpu,
-                                                       kvmppc_get_gpr(vcpu, rs),
-                                                       1, 1);
-                        break;
-
-                case OP_31_XOP_STBUX:
-                        emulated = kvmppc_handle_store(run, vcpu,
-                                                       kvmppc_get_gpr(vcpu, rs),
-                                                       1, 1);
-                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                        break;
-
-                case OP_31_XOP_LHAX:
-                        emulated = kvmppc_handle_loads(run, vcpu, rt, 2, 1);
-                        break;
-
-                case OP_31_XOP_LHZX:
-                        emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
-                        break;
-
-                case OP_31_XOP_LHZUX:
-                        emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
-                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                        break;
 
                 case OP_31_XOP_MFSPR:
                         emulated = kvmppc_emulate_mfspr(vcpu, sprn, rt);
                         break;
 
-                case OP_31_XOP_STHX:
-                        emulated = kvmppc_handle_store(run, vcpu,
-                                                       kvmppc_get_gpr(vcpu, rs),
-                                                       2, 1);
-                        break;
-
-                case OP_31_XOP_STHUX:
-                        emulated = kvmppc_handle_store(run, vcpu,
-                                                       kvmppc_get_gpr(vcpu, rs),
-                                                       2, 1);
-                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                        break;
-
                 case OP_31_XOP_MTSPR:
                         emulated = kvmppc_emulate_mtspr(vcpu, sprn, rs);
                         break;
 
-                case OP_31_XOP_DCBST:
-                case OP_31_XOP_DCBF:
-                case OP_31_XOP_DCBI:
-                        /* Do nothing. The guest is performing dcbi because
-                         * hardware DMA is not snooped by the dcache, but
-                         * emulated DMA either goes through the dcache as
-                         * normal writes, or the host kernel has handled dcache
-                         * coherence. */
-                        break;
-
-                case OP_31_XOP_LWBRX:
-                        emulated = kvmppc_handle_load(run, vcpu, rt, 4, 0);
-                        break;
-
                 case OP_31_XOP_TLBSYNC:
                         break;
 
-                case OP_31_XOP_STWBRX:
-                        emulated = kvmppc_handle_store(run, vcpu,
-                                                       kvmppc_get_gpr(vcpu, rs),
-                                                       4, 0);
-                        break;
-
-                case OP_31_XOP_LHBRX:
-                        emulated = kvmppc_handle_load(run, vcpu, rt, 2, 0);
-                        break;
-
-                case OP_31_XOP_STHBRX:
-                        emulated = kvmppc_handle_store(run, vcpu,
-                                                       kvmppc_get_gpr(vcpu, rs),
-                                                       2, 0);
-                        break;
-
                 default:
                         /* Attempt core-specific emulation below. */
                         emulated = EMULATE_FAIL;
                 }
                 break;
 
-        case OP_LWZ:
-                emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
-                break;
-
-        /* TBD: Add support for other 64 bit load variants like ldu, ldux, ldx etc. */
-        case OP_LD:
-                rt = get_rt(inst);
-                emulated = kvmppc_handle_load(run, vcpu, rt, 8, 1);
-                break;
-
-        case OP_LWZU:
-                emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                break;
-
-        case OP_LBZ:
-                emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
-                break;
-
-        case OP_LBZU:
-                emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                break;
-
-        case OP_STW:
-                emulated = kvmppc_handle_store(run, vcpu,
-                                               kvmppc_get_gpr(vcpu, rs),
-                                               4, 1);
-                break;
-
-        /* TBD: Add support for other 64 bit store variants like stdu, stdux, stdx etc. */
-        case OP_STD:
-                rs = get_rs(inst);
-                emulated = kvmppc_handle_store(run, vcpu,
-                                               kvmppc_get_gpr(vcpu, rs),
-                                               8, 1);
-                break;
-
-        case OP_STWU:
-                emulated = kvmppc_handle_store(run, vcpu,
-                                               kvmppc_get_gpr(vcpu, rs),
-                                               4, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                break;
-
-        case OP_STB:
-                emulated = kvmppc_handle_store(run, vcpu,
-                                               kvmppc_get_gpr(vcpu, rs),
-                                               1, 1);
-                break;
-
-        case OP_STBU:
-                emulated = kvmppc_handle_store(run, vcpu,
-                                               kvmppc_get_gpr(vcpu, rs),
-                                               1, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                break;
-
-        case OP_LHZ:
-                emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
-                break;
-
-        case OP_LHZU:
-                emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                break;
-
-        case OP_LHA:
-                emulated = kvmppc_handle_loads(run, vcpu, rt, 2, 1);
-                break;
-
-        case OP_LHAU:
-                emulated = kvmppc_handle_loads(run, vcpu, rt, 2, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                break;
-
-        case OP_STH:
-                emulated = kvmppc_handle_store(run, vcpu,
-                                               kvmppc_get_gpr(vcpu, rs),
-                                               2, 1);
-                break;
-
-        case OP_STHU:
-                emulated = kvmppc_handle_store(run, vcpu,
-                                               kvmppc_get_gpr(vcpu, rs),
-                                               2, 1);
-                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
-                break;
-
         default:
                 emulated = EMULATE_FAIL;
         }
diff --git a/arch/powerpc/kvm/emulate_loadstore.c b/arch/powerpc/kvm/emulate_loadstore.c
new file mode 100644
index 000000000000..0de4ffa175a9
--- /dev/null
+++ b/arch/powerpc/kvm/emulate_loadstore.c
@@ -0,0 +1,272 @@
+/*
+ * 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 IBM Corp. 2007
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ *
+ * Authors: Hollis Blanchard <hollisb@us.ibm.com>
+ */
+
+#include <linux/jiffies.h>
+#include <linux/hrtimer.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/kvm_host.h>
+#include <linux/clockchips.h>
+
+#include <asm/reg.h>
+#include <asm/time.h>
+#include <asm/byteorder.h>
+#include <asm/kvm_ppc.h>
+#include <asm/disassemble.h>
+#include <asm/ppc-opcode.h>
+#include "timing.h"
+#include "trace.h"
+
+/* XXX to do:
+ * lhax
+ * lhaux
+ * lswx
+ * lswi
+ * stswx
+ * stswi
+ * lha
+ * lhau
+ * lmw
+ * stmw
+ *
+ */
+int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu)
+{
+        struct kvm_run *run = vcpu->run;
+        u32 inst;
+        int ra, rs, rt;
+        enum emulation_result emulated;
+        int advance = 1;
+
+        /* this default type might be overwritten by subcategories */
+        kvmppc_set_exit_type(vcpu, EMULATED_INST_EXITS);
+
+        emulated = kvmppc_get_last_inst(vcpu, false, &inst);
+        if (emulated != EMULATE_DONE)
+                return emulated;
+
+        ra = get_ra(inst);
+        rs = get_rs(inst);
+        rt = get_rt(inst);
+
+        switch (get_op(inst)) {
+        case 31:
+                switch (get_xop(inst)) {
+                case OP_31_XOP_LWZX:
+                        emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
+                        break;
+
+                case OP_31_XOP_LBZX:
+                        emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
+                        break;
+
+                case OP_31_XOP_LBZUX:
+                        emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
+                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                        break;
+
+                case OP_31_XOP_STWX:
+                        emulated = kvmppc_handle_store(run, vcpu,
+                                                       kvmppc_get_gpr(vcpu, rs),
+                                                       4, 1);
+                        break;
+
+                case OP_31_XOP_STBX:
+                        emulated = kvmppc_handle_store(run, vcpu,
+                                                       kvmppc_get_gpr(vcpu, rs),
+                                                       1, 1);
+                        break;
+
+                case OP_31_XOP_STBUX:
+                        emulated = kvmppc_handle_store(run, vcpu,
+                                                       kvmppc_get_gpr(vcpu, rs),
+                                                       1, 1);
+                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                        break;
+
+                case OP_31_XOP_LHAX:
+                        emulated = kvmppc_handle_loads(run, vcpu, rt, 2, 1);
+                        break;
+
+                case OP_31_XOP_LHZX:
+                        emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
+                        break;
+
+                case OP_31_XOP_LHZUX:
+                        emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
+                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                        break;
+
+                case OP_31_XOP_STHX:
+                        emulated = kvmppc_handle_store(run, vcpu,
+                                                       kvmppc_get_gpr(vcpu, rs),
+                                                       2, 1);
+                        break;
+
+                case OP_31_XOP_STHUX:
+                        emulated = kvmppc_handle_store(run, vcpu,
+                                                       kvmppc_get_gpr(vcpu, rs),
+                                                       2, 1);
+                        kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                        break;
+
+                case OP_31_XOP_DCBST:
+                case OP_31_XOP_DCBF:
+                case OP_31_XOP_DCBI:
+                        /* Do nothing. The guest is performing dcbi because
+                         * hardware DMA is not snooped by the dcache, but
+                         * emulated DMA either goes through the dcache as
+                         * normal writes, or the host kernel has handled dcache
+                         * coherence. */
+                        break;
+
+                case OP_31_XOP_LWBRX:
+                        emulated = kvmppc_handle_load(run, vcpu, rt, 4, 0);
+                        break;
+
+                case OP_31_XOP_STWBRX:
+                        emulated = kvmppc_handle_store(run, vcpu,
+                                                       kvmppc_get_gpr(vcpu, rs),
+                                                       4, 0);
+                        break;
+
+                case OP_31_XOP_LHBRX:
+                        emulated = kvmppc_handle_load(run, vcpu, rt, 2, 0);
+                        break;
+
+                case OP_31_XOP_STHBRX:
+                        emulated = kvmppc_handle_store(run, vcpu,
+                                                       kvmppc_get_gpr(vcpu, rs),
+                                                       2, 0);
+                        break;
+
+                default:
+                        emulated = EMULATE_FAIL;
+                        break;
+                }
+                break;
+
+        case OP_LWZ:
+                emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
+                break;
+
+        /* TBD: Add support for other 64 bit load variants like ldu, ldux, ldx etc. */
+        case OP_LD:
+                rt = get_rt(inst);
+                emulated = kvmppc_handle_load(run, vcpu, rt, 8, 1);
+                break;
+
+        case OP_LWZU:
+                emulated = kvmppc_handle_load(run, vcpu, rt, 4, 1);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                break;
+
+        case OP_LBZ:
+                emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
+                break;
+
+        case OP_LBZU:
+                emulated = kvmppc_handle_load(run, vcpu, rt, 1, 1);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                break;
+
+        case OP_STW:
+                emulated = kvmppc_handle_store(run, vcpu,
+                                               kvmppc_get_gpr(vcpu, rs),
+                                               4, 1);
+                break;
+
+        /* TBD: Add support for other 64 bit store variants like stdu, stdux, stdx etc. */
+        case OP_STD:
+                rs = get_rs(inst);
+                emulated = kvmppc_handle_store(run, vcpu,
+                                               kvmppc_get_gpr(vcpu, rs),
+                                               8, 1);
+                break;
+
+        case OP_STWU:
+                emulated = kvmppc_handle_store(run, vcpu,
+                                               kvmppc_get_gpr(vcpu, rs),
+                                               4, 1);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                break;
+
+        case OP_STB:
+                emulated = kvmppc_handle_store(run, vcpu,
+                                               kvmppc_get_gpr(vcpu, rs),
+                                               1, 1);
+                break;
+
+        case OP_STBU:
+                emulated = kvmppc_handle_store(run, vcpu,
+                                               kvmppc_get_gpr(vcpu, rs),
+                                               1, 1);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                break;
+
+        case OP_LHZ:
+                emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
+                break;
+
+        case OP_LHZU:
+                emulated = kvmppc_handle_load(run, vcpu, rt, 2, 1);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                break;
+
+        case OP_LHA:
+                emulated = kvmppc_handle_loads(run, vcpu, rt, 2, 1);
+                break;
+
+        case OP_LHAU:
+                emulated = kvmppc_handle_loads(run, vcpu, rt, 2, 1);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                break;
+
+        case OP_STH:
+                emulated = kvmppc_handle_store(run, vcpu,
+                                               kvmppc_get_gpr(vcpu, rs),
+                                               2, 1);
+                break;
+
+        case OP_STHU:
+                emulated = kvmppc_handle_store(run, vcpu,
+                                               kvmppc_get_gpr(vcpu, rs),
+                                               2, 1);
+                kvmppc_set_gpr(vcpu, ra, vcpu->arch.vaddr_accessed);
+                break;
+
+        default:
+                emulated = EMULATE_FAIL;
+                break;
+        }
+
+        if (emulated == EMULATE_FAIL) {
+                advance = 0;
+                kvmppc_core_queue_program(vcpu, 0);
+        }
+
+        trace_kvm_ppc_instr(inst, kvmppc_get_pc(vcpu), emulated);
+
+        /* Advance past emulated instruction. */
+        if (advance)
+                kvmppc_set_pc(vcpu, kvmppc_get_pc(vcpu) + 4);
+
+        return emulated;
+}
diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c
index b68d0dc9479a..39b3a8f816f2 100644
--- a/arch/powerpc/kvm/mpic.c
+++ b/arch/powerpc/kvm/mpic.c
@@ -1826,8 +1826,7 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
         return 0;
 }
 
-int kvm_set_routing_entry(struct kvm_irq_routing_table *rt,
-                          struct kvm_kernel_irq_routing_entry *e,
+int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
                           const struct kvm_irq_routing_entry *ue)
 {
         int r = -EINVAL;
@@ -1839,7 +1838,6 @@ int kvm_set_routing_entry(struct kvm_irq_routing_table *rt,
                 e->irqchip.pin = ue->u.irqchip.pin;
                 if (e->irqchip.pin >= KVM_IRQCHIP_NUM_PINS)
                         goto out;
-                rt->chip[ue->u.irqchip.irqchip][e->irqchip.pin] = ue->gsi;
                 break;
         case KVM_IRQ_ROUTING_MSI:
                 e->set = kvm_set_msi;
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 61c738ab1283..4c79284b58be 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -190,6 +190,25 @@ int kvmppc_kvm_pv(struct kvm_vcpu *vcpu)
                 vcpu->arch.magic_page_pa = param1 & ~0xfffULL;
                 vcpu->arch.magic_page_ea = param2 & ~0xfffULL;
 
+#ifdef CONFIG_PPC_64K_PAGES
+                /*
+                 * Make sure our 4k magic page is in the same window of a 64k
+                 * page within the guest and within the host's page.
+                 */
+                if ((vcpu->arch.magic_page_pa & 0xf000) !=
+                    ((ulong)vcpu->arch.shared & 0xf000)) {
+                        void *old_shared = vcpu->arch.shared;
+                        ulong shared = (ulong)vcpu->arch.shared;
+                        void *new_shared;
+
+                        shared &= PAGE_MASK;
+                        shared |= vcpu->arch.magic_page_pa & 0xf000;
+                        new_shared = (void*)shared;
+                        memcpy(new_shared, old_shared, 0x1000);
+                        vcpu->arch.shared = new_shared;
+                }
+#endif
+
                 r2 = KVM_MAGIC_FEAT_SR | KVM_MAGIC_FEAT_MAS0_TO_SPRG7;
 
                 r = EV_SUCCESS;
@@ -198,7 +217,6 @@ int kvmppc_kvm_pv(struct kvm_vcpu *vcpu)
         case KVM_HCALL_TOKEN(KVM_HC_FEATURES):
                 r = EV_SUCCESS;
 #if defined(CONFIG_PPC_BOOK3S) || defined(CONFIG_KVM_E500V2)
-                /* XXX Missing magic page on 44x */
                 r2 |= (1 << KVM_FEATURE_MAGIC_PAGE);
 #endif
 
@@ -254,13 +272,16 @@ int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu)
         enum emulation_result er;
         int r;
 
-        er = kvmppc_emulate_instruction(run, vcpu);
+        er = kvmppc_emulate_loadstore(vcpu);
         switch (er) {
         case EMULATE_DONE:
                 /* Future optimization: only reload non-volatiles if they were
                  * actually modified. */
                 r = RESUME_GUEST_NV;
                 break;
+        case EMULATE_AGAIN:
+                r = RESUME_GUEST;
+                break;
         case EMULATE_DO_MMIO:
                 run->exit_reason = KVM_EXIT_MMIO;
                 /* We must reload nonvolatiles because "update" load/store
@@ -270,11 +291,15 @@ int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu)
                 r = RESUME_HOST_NV;
                 break;
         case EMULATE_FAIL:
+        {
+                u32 last_inst;
+
+                kvmppc_get_last_inst(vcpu, false, &last_inst);
                 /* XXX Deliver Program interrupt to guest. */
-                printk(KERN_EMERG "%s: emulation failed (%08x)\n", __func__,
-                       kvmppc_get_last_inst(vcpu));
+                pr_emerg("%s: emulation failed (%08x)\n", __func__, last_inst);
                 r = RESUME_HOST;
                 break;
+        }
         default:
                 WARN_ON(1);
                 r = RESUME_GUEST;
@@ -284,6 +309,81 @@ int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu)
 }
 EXPORT_SYMBOL_GPL(kvmppc_emulate_mmio);
 
+int kvmppc_st(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr,
+              bool data)
+{
+        ulong mp_pa = vcpu->arch.magic_page_pa & KVM_PAM & PAGE_MASK;
+        struct kvmppc_pte pte;
+        int r;
+
+        vcpu->stat.st++;
+
+        r = kvmppc_xlate(vcpu, *eaddr, data ? XLATE_DATA : XLATE_INST,
+                         XLATE_WRITE, &pte);
+        if (r < 0)
+                return r;
+
+        *eaddr = pte.raddr;
+
+        if (!pte.may_write)
+                return -EPERM;
+
+        /* Magic page override */
+        if (kvmppc_supports_magic_page(vcpu) && mp_pa &&
+            ((pte.raddr & KVM_PAM & PAGE_MASK) == mp_pa) &&
+            !(kvmppc_get_msr(vcpu) & MSR_PR)) {
+                void *magic = vcpu->arch.shared;
+                magic += pte.eaddr & 0xfff;
+                memcpy(magic, ptr, size);
+                return EMULATE_DONE;
+        }
+
+        if (kvm_write_guest(vcpu->kvm, pte.raddr, ptr, size))
+                return EMULATE_DO_MMIO;
+
+        return EMULATE_DONE;
+}
+EXPORT_SYMBOL_GPL(kvmppc_st);
+
+int kvmppc_ld(struct kvm_vcpu *vcpu, ulong *eaddr, int size, void *ptr,
+                      bool data)
+{
+        ulong mp_pa = vcpu->arch.magic_page_pa & KVM_PAM & PAGE_MASK;
+        struct kvmppc_pte pte;
+        int rc;
+
+        vcpu->stat.ld++;
+
+        rc = kvmppc_xlate(vcpu, *eaddr, data ? XLATE_DATA : XLATE_INST,
+                          XLATE_READ, &pte);
+        if (rc)
+                return rc;
+
+        *eaddr = pte.raddr;
+
+        if (!pte.may_read)
+                return -EPERM;
+
+        if (!data && !pte.may_execute)
+                return -ENOEXEC;
+
+        /* Magic page override */
+        if (kvmppc_supports_magic_page(vcpu) && mp_pa &&
+            ((pte.raddr & KVM_PAM & PAGE_MASK) == mp_pa) &&
+            !(kvmppc_get_msr(vcpu) & MSR_PR)) {
+                void *magic = vcpu->arch.shared;
+                magic += pte.eaddr & 0xfff;
+                memcpy(ptr, magic, size);
+                return EMULATE_DONE;
+        }
+
+        if (kvm_read_guest(vcpu->kvm, pte.raddr, ptr, size))
+                return EMULATE_DO_MMIO;
+
+        return EMULATE_DONE;
+}
+EXPORT_SYMBOL_GPL(kvmppc_ld);
+
 int kvm_arch_hardware_enable(void *garbage)
 {
         return 0;
@@ -366,14 +466,20 @@ void kvm_arch_sync_events(struct kvm *kvm)
 {
 }
 
-int kvm_dev_ioctl_check_extension(long ext)
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 {
         int r;
-        /* FIXME!!
-         * Should some of this be vm ioctl ? is it possible now ?
-         */
+        /* Assume we're using HV mode when the HV module is loaded */
         int hv_enabled = kvmppc_hv_ops ? 1 : 0;
 
+        if (kvm) {
+                /*
+                 * Hooray - we know which VM type we're running on. Depend on
+                 * that rather than the guess above.
+                 */
+                hv_enabled = is_kvmppc_hv_enabled(kvm);
+        }
+
         switch (ext) {
 #ifdef CONFIG_BOOKE
         case KVM_CAP_PPC_BOOKE_SREGS:
@@ -387,6 +493,7 @@ int kvm_dev_ioctl_check_extension(long ext)
         case KVM_CAP_PPC_UNSET_IRQ:
         case KVM_CAP_PPC_IRQ_LEVEL:
         case KVM_CAP_ENABLE_CAP:
+        case KVM_CAP_ENABLE_CAP_VM:
         case KVM_CAP_ONE_REG:
         case KVM_CAP_IOEVENTFD:
         case KVM_CAP_DEVICE_CTRL:
@@ -417,6 +524,7 @@ int kvm_dev_ioctl_check_extension(long ext)
         case KVM_CAP_PPC_ALLOC_HTAB:
         case KVM_CAP_PPC_RTAS:
         case KVM_CAP_PPC_FIXUP_HCALL:
+        case KVM_CAP_PPC_ENABLE_HCALL:
 #ifdef CONFIG_KVM_XICS
         case KVM_CAP_IRQ_XICS:
 #endif
@@ -635,12 +743,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 #endif
 }
 
-static void kvmppc_complete_dcr_load(struct kvm_vcpu *vcpu,
-                                     struct kvm_run *run)
-{
-        kvmppc_set_gpr(vcpu, vcpu->arch.io_gpr, run->dcr.data);
-}
-
 static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu,
                                       struct kvm_run *run)
 {
@@ -837,10 +939,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
                 if (!vcpu->mmio_is_write)
                         kvmppc_complete_mmio_load(vcpu, run);
                 vcpu->mmio_needed = 0;
-        } else if (vcpu->arch.dcr_needed) {
-                if (!vcpu->arch.dcr_is_write)
-                        kvmppc_complete_dcr_load(vcpu, run);
-                vcpu->arch.dcr_needed = 0;
         } else if (vcpu->arch.osi_needed) {
                 u64 *gprs = run->osi.gprs;
                 int i;
@@ -1099,6 +1197,42 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_event,
         return 0;
 }
 
+
+static int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
+                                   struct kvm_enable_cap *cap)
+{
+        int r;
+
+        if (cap->flags)
+                return -EINVAL;
+
+        switch (cap->cap) {
+#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
+        case KVM_CAP_PPC_ENABLE_HCALL: {
+                unsigned long hcall = cap->args[0];
+
+                r = -EINVAL;
+                if (hcall > MAX_HCALL_OPCODE || (hcall & 3) ||
+                    cap->args[1] > 1)
+                        break;
+                if (!kvmppc_book3s_hcall_implemented(kvm, hcall))
+                        break;
+                if (cap->args[1])
+                        set_bit(hcall / 4, kvm->arch.enabled_hcalls);
+                else
+                        clear_bit(hcall / 4, kvm->arch.enabled_hcalls);
+                r = 0;
+                break;
+        }
+#endif
+        default:
+                r = -EINVAL;
+                break;
+        }
+
+        return r;
+}
+
 long kvm_arch_vm_ioctl(struct file *filp,
                        unsigned int ioctl, unsigned long arg)
 {
@@ -1118,6 +1252,15 @@ long kvm_arch_vm_ioctl(struct file *filp,
 
                 break;
         }
+        case KVM_ENABLE_CAP:
+        {
+                struct kvm_enable_cap cap;
+                r = -EFAULT;
+                if (copy_from_user(&cap, argp, sizeof(cap)))
+                        goto out;
+                r = kvm_vm_ioctl_enable_cap(kvm, &cap);
+                break;
+        }
 #ifdef CONFIG_PPC_BOOK3S_64
         case KVM_CREATE_SPAPR_TCE: {
                 struct kvm_create_spapr_tce create_tce;
@@ -1204,3 +1347,5 @@ void kvm_arch_exit(void)
 {
 
 }
+
+EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_ppc_instr);
diff --git a/arch/powerpc/kvm/timing.c b/arch/powerpc/kvm/timing.c
index 07b6110a4bb7..e44d2b2ea97e 100644
--- a/arch/powerpc/kvm/timing.c
+++ b/arch/powerpc/kvm/timing.c
@@ -110,7 +110,6 @@ void kvmppc_update_timing_stats(struct kvm_vcpu *vcpu)
 
 static const char *kvm_exit_names[__NUMBER_OF_KVM_EXIT_TYPES] = {
         [MMIO_EXITS] =              "MMIO",
-        [DCR_EXITS] =               "DCR",
         [SIGNAL_EXITS] =            "SIGNAL",
         [ITLB_REAL_MISS_EXITS] =    "ITLBREAL",
         [ITLB_VIRT_MISS_EXITS] =    "ITLBVIRT",
diff --git a/arch/powerpc/kvm/timing.h b/arch/powerpc/kvm/timing.h
index bf191e72b2d8..3123690c82dc 100644
--- a/arch/powerpc/kvm/timing.h
+++ b/arch/powerpc/kvm/timing.h
@@ -63,9 +63,6 @@ static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type)
         case EMULATED_INST_EXITS:
                 vcpu->stat.emulated_inst_exits++;
                 break;
-        case DCR_EXITS:
-                vcpu->stat.dcr_exits++;
-                break;
         case DSI_EXITS:
                 vcpu->stat.dsi_exits++;
                 break;
diff --git a/arch/powerpc/lib/copyuser_64.S b/arch/powerpc/lib/copyuser_64.S
index 0860ee46013c..f09899e35991 100644
--- a/arch/powerpc/lib/copyuser_64.S
+++ b/arch/powerpc/lib/copyuser_64.S
@@ -461,8 +461,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_UNALIGNED_LD_STD)
 /*
  * Routine to copy a whole page of data, optimized for POWER4.
  * On POWER4 it is more than 50% faster than the simple loop
- * above (following the .Ldst_aligned label) but it runs slightly
- * slower on POWER3.
+ * above (following the .Ldst_aligned label).
  */
 .Lcopy_page_4K:
         std     r31,-32(1)
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c
index 0c9c8d7d0734..170a0346f756 100644
--- a/arch/powerpc/lib/locks.c
+++ b/arch/powerpc/lib/locks.c
@@ -70,12 +70,16 @@ void __rw_yield(arch_rwlock_t *rw)
 
 void arch_spin_unlock_wait(arch_spinlock_t *lock)
 {
+        smp_mb();
+
         while (lock->slock) {
                 HMT_low();
                 if (SHARED_PROCESSOR)
                         __spin_yield(lock);
         }
         HMT_medium();
+
+        smp_mb();
 }
 
 EXPORT_SYMBOL(arch_spin_unlock_wait);
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index 51230ee6a407..d0130fff20e5 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile
@@ -13,9 +13,7 @@ obj-$(CONFIG_PPC_MMU_NOHASH)	+= mmu_context_nohash.o tlb_nohash.o \
                                    tlb_nohash_low.o
 obj-$(CONFIG_PPC_BOOK3E)        += tlb_low_$(CONFIG_WORD_SIZE)e.o
 hash64-$(CONFIG_PPC_NATIVE)     := hash_native_64.o
-obj-$(CONFIG_PPC_STD_MMU_64)    += hash_utils_64.o \
-                                   slb_low.o slb.o stab.o \
-                                   $(hash64-y)
+obj-$(CONFIG_PPC_STD_MMU_64)    += hash_utils_64.o slb_low.o slb.o $(hash64-y)
 obj-$(CONFIG_PPC_STD_MMU_32)    += ppc_mmu_32.o
 obj-$(CONFIG_PPC_STD_MMU)       += hash_low_$(CONFIG_WORD_SIZE).o \
                                    tlb_hash$(CONFIG_WORD_SIZE).o \
diff --git a/arch/powerpc/mm/dma-noncoherent.c b/arch/powerpc/mm/dma-noncoherent.c
index 7b6c10750179..d85e86aac7fb 100644
--- a/arch/powerpc/mm/dma-noncoherent.c
+++ b/arch/powerpc/mm/dma-noncoherent.c
@@ -33,6 +33,7 @@
 #include <linux/export.h>
 
 #include <asm/tlbflush.h>
+#include <asm/dma.h>
 
 #include "mmu_decl.h"
 
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index cf1d325eae8b..afc0a8295f84 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -412,18 +412,18 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long vpn,
         local_irq_restore(flags);
 }
 
-static void native_hugepage_invalidate(struct mm_struct *mm,
+static void native_hugepage_invalidate(unsigned long vsid,
+                                       unsigned long addr,
                                        unsigned char *hpte_slot_array,
-                                       unsigned long addr, int psize)
+                                       int psize, int ssize)
 {
-        int ssize = 0, i;
-        int lock_tlbie;
+        int i;
         struct hash_pte *hptep;
         int actual_psize = MMU_PAGE_16M;
         unsigned int max_hpte_count, valid;
         unsigned long flags, s_addr = addr;
         unsigned long hpte_v, want_v, shift;
-        unsigned long hidx, vpn = 0, vsid, hash, slot;
+        unsigned long hidx, vpn = 0, hash, slot;
 
         shift = mmu_psize_defs[psize].shift;
         max_hpte_count = 1U << (PMD_SHIFT - shift);
@@ -437,15 +437,6 @@ static void native_hugepage_invalidate(struct mm_struct *mm,
 
                 /* get the vpn */
                 addr = s_addr + (i * (1ul << shift));
-                if (!is_kernel_addr(addr)) {
-                        ssize = user_segment_size(addr);
-                        vsid = get_vsid(mm->context.id, addr, ssize);
-                        WARN_ON(vsid == 0);
-                } else {
-                        vsid = get_kernel_vsid(addr, mmu_kernel_ssize);
-                        ssize = mmu_kernel_ssize;
-                }
-
                 vpn = hpt_vpn(addr, vsid, ssize);
                 hash = hpt_hash(vpn, shift, ssize);
                 if (hidx & _PTEIDX_SECONDARY)
@@ -465,22 +456,13 @@ static void native_hugepage_invalidate(struct mm_struct *mm,
                 else
                         /* Invalidate the hpte. NOTE: this also unlocks it */
                         hptep->v = 0;
+                /*
+                 * We need to do tlb invalidate for all the address, tlbie
+                 * instruction compares entry_VA in tlb with the VA specified
+                 * here
+                 */
+                tlbie(vpn, psize, actual_psize, ssize, 0);
         }
-        /*
-         * Since this is a hugepage, we just need a single tlbie.
-         * use the last vpn.
-         */
-        lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
-        if (lock_tlbie)
-                raw_spin_lock(&native_tlbie_lock);
-
-        asm volatile("ptesync":::"memory");
-        __tlbie(vpn, psize, actual_psize, ssize);
-        asm volatile("eieio; tlbsync; ptesync":::"memory");
-
-        if (lock_tlbie)
-                raw_spin_unlock(&native_tlbie_lock);
-
         local_irq_restore(flags);
 }
 
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 88fdd9d25077..daee7f4e5a14 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -243,7 +243,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
 }
 
 #ifdef CONFIG_MEMORY_HOTPLUG
-static int htab_remove_mapping(unsigned long vstart, unsigned long vend,
+int htab_remove_mapping(unsigned long vstart, unsigned long vend,
                       int psize, int ssize)
 {
         unsigned long vaddr;
@@ -821,21 +821,14 @@ static void __init htab_initialize(void)
 
 void __init early_init_mmu(void)
 {
-        /* Setup initial STAB address in the PACA */
-        get_paca()->stab_real = __pa((u64)&initial_stab);
-        get_paca()->stab_addr = (u64)&initial_stab;
-
         /* Initialize the MMU Hash table and create the linear mapping
-         * of memory. Has to be done before stab/slb initialization as
-         * this is currently where the page size encoding is obtained
+         * of memory. Has to be done before SLB initialization as this is
+         * currently where the page size encoding is obtained.
          */
         htab_initialize();
 
-        /* Initialize stab / SLB management */
-        if (mmu_has_feature(MMU_FTR_SLB))
-                slb_initialize();
-        else
-                stab_initialize(get_paca()->stab_real);
+        /* Initialize SLB management */
+        slb_initialize();
 }
 
 #ifdef CONFIG_SMP
@@ -845,13 +838,8 @@ void early_init_mmu_secondary(void)
         if (!firmware_has_feature(FW_FEATURE_LPAR))
                 mtspr(SPRN_SDR1, _SDR1);
 
-        /* Initialize STAB/SLB. We use a virtual address as it works
-         * in real mode on pSeries.
-         */
-        if (mmu_has_feature(MMU_FTR_SLB))
-                slb_initialize();
-        else
-                stab_initialize(get_paca()->stab_addr);
+        /* Initialize SLB */
+        slb_initialize();
 }
 #endif /* CONFIG_SMP */
 
diff --git a/arch/powerpc/mm/hugepage-hash64.c b/arch/powerpc/mm/hugepage-hash64.c
index 826893fcb3a7..5f5e6328c21c 100644
--- a/arch/powerpc/mm/hugepage-hash64.c
+++ b/arch/powerpc/mm/hugepage-hash64.c
@@ -18,6 +18,57 @@
 #include <linux/mm.h>
 #include <asm/machdep.h>
 
+static void invalidate_old_hpte(unsigned long vsid, unsigned long addr,
+                                pmd_t *pmdp, unsigned int psize, int ssize)
+{
+        int i, max_hpte_count, valid;
+        unsigned long s_addr;
+        unsigned char *hpte_slot_array;
+        unsigned long hidx, shift, vpn, hash, slot;
+
+        s_addr = addr & HPAGE_PMD_MASK;
+        hpte_slot_array = get_hpte_slot_array(pmdp);
+        /*
+         * IF we try to do a HUGE PTE update after a withdraw is done.
+         * we will find the below NULL. This happens when we do
+         * split_huge_page_pmd
+         */
+        if (!hpte_slot_array)
+                return;
+
+        if (ppc_md.hugepage_invalidate)
+                return ppc_md.hugepage_invalidate(vsid, s_addr, hpte_slot_array,
+                                                  psize, ssize);
+        /*
+         * No bluk hpte removal support, invalidate each entry
+         */
+        shift = mmu_psize_defs[psize].shift;
+        max_hpte_count = HPAGE_PMD_SIZE >> shift;
+        for (i = 0; i < max_hpte_count; i++) {
+                /*
+                 * 8 bits per each hpte entries
+                 * 000| [ secondary group (one bit) | hidx (3 bits) | valid bit]
+                 */
+                valid = hpte_valid(hpte_slot_array, i);
+                if (!valid)
+                        continue;
+                hidx =  hpte_hash_index(hpte_slot_array, i);
+
+                /* get the vpn */
+                addr = s_addr + (i * (1ul << shift));
+                vpn = hpt_vpn(addr, vsid, ssize);
+                hash = hpt_hash(vpn, shift, ssize);
+                if (hidx & _PTEIDX_SECONDARY)
+                        hash = ~hash;
+
+                slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
+                slot += hidx & _PTEIDX_GROUP_IX;
+                ppc_md.hpte_invalidate(slot, vpn, psize,
+                                       MMU_PAGE_16M, ssize, 0);
+        }
+}
+
+
 int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,
                     pmd_t *pmdp, unsigned long trap, int local, int ssize,
                     unsigned int psize)
@@ -33,7 +84,9 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,
          * atomically mark the linux large page PMD busy and dirty
          */
         do {
-                old_pmd = pmd_val(*pmdp);
+                pmd_t pmd = ACCESS_ONCE(*pmdp);
+
+                old_pmd = pmd_val(pmd);
                 /* If PMD busy, retry the access */
                 if (unlikely(old_pmd & _PAGE_BUSY))
                         return 0;
@@ -85,6 +138,15 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,
         vpn = hpt_vpn(ea, vsid, ssize);
         hash = hpt_hash(vpn, shift, ssize);
         hpte_slot_array = get_hpte_slot_array(pmdp);
+        if (psize == MMU_PAGE_4K) {
+                /*
+                 * invalidate the old hpte entry if we have that mapped via 64K
+                 * base page size. This is because demote_segment won't flush
+                 * hash page table entries.
+                 */
+                if ((old_pmd & _PAGE_HASHPTE) && !(old_pmd & _PAGE_COMBO))
+                        invalidate_old_hpte(vsid, ea, pmdp, MMU_PAGE_64K, ssize);
+        }
 
         valid = hpte_valid(hpte_slot_array, index);
         if (valid) {
@@ -107,11 +169,8 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,
                          * safely update this here.
                          */
                         valid = 0;
-                        new_pmd &= ~_PAGE_HPTEFLAGS;
                         hpte_slot_array[index] = 0;
-                } else
-                        /* clear the busy bits and set the hash pte bits */
-                        new_pmd = (new_pmd & ~_PAGE_HPTEFLAGS) | _PAGE_HASHPTE;
+                }
         }
 
         if (!valid) {
@@ -119,11 +178,7 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid,
 
                 /* insert new entry */
                 pa = pmd_pfn(__pmd(old_pmd)) << PAGE_SHIFT;
-repeat:
-                hpte_group = ((hash & htab_hash_mask) * HPTES_PER_GROUP) & ~0x7UL;
-
-                /* clear the busy bits and set the hash pte bits */
-                new_pmd = (new_pmd & ~_PAGE_HPTEFLAGS) | _PAGE_HASHPTE;
+                new_pmd |= _PAGE_HASHPTE;
 
                 /* Add in WIMG bits */
                 rflags |= (new_pmd & (_PAGE_WRITETHRU | _PAGE_NO_CACHE |
@@ -132,6 +187,8 @@ repeat:
                  * enable the memory coherence always
                  */
                 rflags |= HPTE_R_M;
+repeat:
+                hpte_group = ((hash & htab_hash_mask) * HPTES_PER_GROUP) & ~0x7UL;
 
                 /* Insert into the hash table, primary slot */
                 slot = ppc_md.hpte_insert(hpte_group, vpn, pa, rflags, 0,
@@ -172,8 +229,17 @@ repeat:
                 mark_hpte_slot_valid(hpte_slot_array, index, slot);
         }
         /*
-         * No need to use ldarx/stdcx here
+         * Mark the pte with _PAGE_COMBO, if we are trying to hash it with
+         * base page size 4k.
+         */
+        if (psize == MMU_PAGE_4K)
+                new_pmd |= _PAGE_COMBO;
+        /*
+         * The hpte valid is stored in the pgtable whose address is in the
+         * second half of the PMD. Order this against clearing of the busy bit in
+         * huge pmd.
          */
+        smp_wmb();
         *pmdp = __pmd(new_pmd & ~_PAGE_BUSY);
         return 0;
 }
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index e3734edffa69..253b4b971c8a 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -175,9 +175,10 @@ static unsigned long __meminit vmemmap_section_start(unsigned long page)
 static int __meminit vmemmap_populated(unsigned long start, int page_size)
 {
         unsigned long end = start + page_size;
+        start = (unsigned long)(pfn_to_page(vmemmap_section_start(start)));
 
         for (; start < end; start += (PAGES_PER_SECTION * sizeof(struct page)))
-                if (pfn_valid(vmemmap_section_start(start)))
+                if (pfn_valid(page_to_pfn((struct page *)start)))
                         return 1;
 
         return 0;
@@ -212,6 +213,13 @@ static void __meminit vmemmap_create_mapping(unsigned long start,
         for (i = 0; i < page_size; i += PAGE_SIZE)
                 BUG_ON(map_kernel_page(start + i, phys, flags));
 }
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+static void vmemmap_remove_mapping(unsigned long start,
+                                   unsigned long page_size)
+{
+}
+#endif
 #else /* CONFIG_PPC_BOOK3E */
 static void __meminit vmemmap_create_mapping(unsigned long start,
                                              unsigned long page_size,
@@ -223,17 +231,42 @@ static void __meminit vmemmap_create_mapping(unsigned long start,
                                         mmu_kernel_ssize);
         BUG_ON(mapped < 0);
 }
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+extern int htab_remove_mapping(unsigned long vstart, unsigned long vend,
+                        int psize, int ssize);
+
+static void vmemmap_remove_mapping(unsigned long start,
+                                   unsigned long page_size)
+{
+        int mapped = htab_remove_mapping(start, start + page_size,
+                                         mmu_vmemmap_psize,
+                                         mmu_kernel_ssize);
+        BUG_ON(mapped < 0);
+}
+#endif
+
 #endif /* CONFIG_PPC_BOOK3E */
 
 struct vmemmap_backing *vmemmap_list;
+static struct vmemmap_backing *next;
+static int num_left;
+static int num_freed;
 
 static __meminit struct vmemmap_backing * vmemmap_list_alloc(int node)
 {
-        static struct vmemmap_backing *next;
-        static int num_left;
+        struct vmemmap_backing *vmem_back;
+        /* get from freed entries first */
+        if (num_freed) {
+                num_freed--;
+                vmem_back = next;
+                next = next->list;
+
+                return vmem_back;
+        }
 
         /* allocate a page when required and hand out chunks */
-        if (!next || !num_left) {
+        if (!num_left) {
                 next = vmemmap_alloc_block(PAGE_SIZE, node);
                 if (unlikely(!next)) {
                         WARN_ON(1);
@@ -296,10 +329,85 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
         return 0;
 }
 
-void vmemmap_free(unsigned long start, unsigned long end)
+#ifdef CONFIG_MEMORY_HOTPLUG
+static unsigned long vmemmap_list_free(unsigned long start)
 {
+        struct vmemmap_backing *vmem_back, *vmem_back_prev;
+
+        vmem_back_prev = vmem_back = vmemmap_list;
+
+        /* look for it with prev pointer recorded */
+        for (; vmem_back; vmem_back = vmem_back->list) {
+                if (vmem_back->virt_addr == start)
+                        break;
+                vmem_back_prev = vmem_back;
+        }
+
+        if (unlikely(!vmem_back)) {
+                WARN_ON(1);
+                return 0;
+        }
+
+        /* remove it from vmemmap_list */
+        if (vmem_back == vmemmap_list) /* remove head */
+                vmemmap_list = vmem_back->list;
+        else
+                vmem_back_prev->list = vmem_back->list;
+
+        /* next point to this freed entry */
+        vmem_back->list = next;
+        next = vmem_back;
+        num_freed++;
+
+        return vmem_back->phys;
 }
 
+void __ref vmemmap_free(unsigned long start, unsigned long end)
+{
+        unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift;
+
+        start = _ALIGN_DOWN(start, page_size);
+
+        pr_debug("vmemmap_free %lx...%lx\n", start, end);
+
+        for (; start < end; start += page_size) {
+                unsigned long addr;
+
+                /*
+                 * the section has already be marked as invalid, so
+                 * vmemmap_populated() true means some other sections still
+                 * in this page, so skip it.
+                 */
+                if (vmemmap_populated(start, page_size))
+                        continue;
+
+                addr = vmemmap_list_free(start);
+                if (addr) {
+                        struct page *page = pfn_to_page(addr >> PAGE_SHIFT);
+
+                        if (PageReserved(page)) {
+                                /* allocated from bootmem */
+                                if (page_size < PAGE_SIZE) {
+                                        /*
+                                         * this shouldn't happen, but if it is
+                                         * the case, leave the memory there
+                                         */
+                                        WARN_ON_ONCE(1);
+                                } else {
+                                        unsigned int nr_pages =
+                                                1 << get_order(page_size);
+                                        while (nr_pages--)
+                                                free_reserved_page(page++);
+                                }
+                        } else
+                                free_pages((unsigned long)(__va(addr)),
+                                                        get_order(page_size));
+
+                        vmemmap_remove_mapping(start, page_size);
+                }
+        }
+}
+#endif
 void register_page_bootmem_memmap(unsigned long section_nr,
                                   struct page *start_page, unsigned long size)
 {
@@ -331,16 +439,16 @@ struct page *realmode_pfn_to_page(unsigned long pfn)
                 if (pg_va < vmem_back->virt_addr)
                         continue;
 
-                /* Check that page struct is not split between real pages */
-                if ((pg_va + sizeof(struct page)) >
-                                (vmem_back->virt_addr + page_size))
-                        return NULL;
-
-                page = (struct page *) (vmem_back->phys + pg_va -
+                /* After vmemmap_list entry free is possible, need check all */
+                if ((pg_va + sizeof(struct page)) <=
+                                (vmem_back->virt_addr + page_size)) {
+                        page = (struct page *) (vmem_back->phys + pg_va -
                                 vmem_back->virt_addr);
-                return page;
+                        return page;
+                }
         }
 
+        /* Probably that page struct is split between real pages */
         return NULL;
 }
 EXPORT_SYMBOL_GPL(realmode_pfn_to_page);
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 2c8e90f5789e..e0f7a189c48e 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -128,7 +128,8 @@ int arch_add_memory(int nid, u64 start, u64 size)
                 return -EINVAL;
 
         /* this should work for most non-highmem platforms */
-        zone = pgdata->node_zones;
+        zone = pgdata->node_zones +
+                zone_for_memory(nid, start, size, 0);
 
         return __add_pages(nid, zone, start_pfn, nr_pages);
 }
diff --git a/arch/powerpc/mm/mmu_context_hash32.c b/arch/powerpc/mm/mmu_context_hash32.c
index 78fef6726e10..aa5a7fd89461 100644
--- a/arch/powerpc/mm/mmu_context_hash32.c
+++ b/arch/powerpc/mm/mmu_context_hash32.c
@@ -2,7 +2,7 @@
  * This file contains the routines for handling the MMU on those
  * PowerPC implementations where the MMU substantially follows the
  * architecture specification.  This includes the 6xx, 7xx, 7xxx,
- * 8260, and POWER3 implementations but excludes the 8xx and 4xx.
+ * and 8260 implementations but excludes the 8xx and 4xx.
  *  -- paulus
  *
  *  Derived from arch/ppc/mm/init.c:
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 3b181b22cd46..d7737a542fd7 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -611,8 +611,8 @@ static int cpu_numa_callback(struct notifier_block *nfb, unsigned long action,
         case CPU_UP_CANCELED:
         case CPU_UP_CANCELED_FROZEN:
                 unmap_cpu_from_node(lcpu);
-                break;
                 ret = NOTIFY_OK;
+                break;
 #endif
         }
         return ret;
@@ -1049,7 +1049,7 @@ static void __init mark_reserved_regions_for_nid(int nid)
 
 void __init do_init_bootmem(void)
 {
-        int nid;
+        int nid, cpu;
 
         min_low_pfn = 0;
         max_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;
@@ -1122,8 +1122,15 @@ void __init do_init_bootmem(void)
 
         reset_numa_cpu_lookup_table();
         register_cpu_notifier(&ppc64_numa_nb);
-        cpu_numa_callback(&ppc64_numa_nb, CPU_UP_PREPARE,
-                          (void *)(unsigned long)boot_cpuid);
+        /*
+         * We need the numa_cpu_lookup_table to be accurate for all CPUs,
+         * even before we online them, so that we can use cpu_to_{node,mem}
+         * early in boot, cf. smp_prepare_cpus().
+         */
+        for_each_possible_cpu(cpu) {
+                cpu_numa_callback(&ppc64_numa_nb, CPU_UP_PREPARE,
+                                  (void *)(unsigned long)cpu);
+        }
 }
 
 void __init paging_init(void)
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 343a87fa78b5..cf11342bf519 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -41,7 +41,7 @@ unsigned long ioremap_base;
 unsigned long ioremap_bot;
 EXPORT_SYMBOL(ioremap_bot);     /* aka VMALLOC_END */
 
-#if defined(CONFIG_6xx) || defined(CONFIG_POWER3)
+#ifdef CONFIG_6xx
 #define HAVE_BATS       1
 #endif
 
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index f6ce1f111f5b..c8d709ab489d 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -54,6 +54,9 @@
 
 #include "mmu_decl.h"
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/thp.h>
+
 /* Some sanity checking */
 #if TASK_SIZE_USER64 > PGTABLE_RANGE
 #error TASK_SIZE_USER64 exceeds pagetable range
@@ -68,7 +71,7 @@
 unsigned long ioremap_bot = IOREMAP_BASE;
 
 #ifdef CONFIG_PPC_MMU_NOHASH
-static void *early_alloc_pgtable(unsigned long size)
+static __ref void *early_alloc_pgtable(unsigned long size)
 {
         void *pt;
 
@@ -537,8 +540,9 @@ unsigned long pmd_hugepage_update(struct mm_struct *mm, unsigned long addr,
         old = pmd_val(*pmdp);
         *pmdp = __pmd((old & ~clr) | set);
 #endif
+        trace_hugepage_update(addr, old, clr, set);
         if (old & _PAGE_HASHPTE)
-                hpte_do_hugepage_flush(mm, addr, pmdp);
+                hpte_do_hugepage_flush(mm, addr, pmdp, old);
         return old;
 }
 
@@ -642,10 +646,11 @@ void pmdp_splitting_flush(struct vm_area_struct *vma,
          * If we didn't had the splitting flag set, go and flush the
          * HPTE entries.
          */
+        trace_hugepage_splitting(address, old);
         if (!(old & _PAGE_SPLITTING)) {
                 /* We need to flush the hpte */
                 if (old & _PAGE_HASHPTE)
-                        hpte_do_hugepage_flush(vma->vm_mm, address, pmdp);
+                        hpte_do_hugepage_flush(vma->vm_mm, address, pmdp, old);
         }
         /*
          * This ensures that generic code that rely on IRQ disabling
@@ -709,6 +714,7 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr,
         assert_spin_locked(&mm->page_table_lock);
         WARN_ON(!pmd_trans_huge(pmd));
 #endif
+        trace_hugepage_set_pmd(addr, pmd);
         return set_pte_at(mm, addr, pmdp_ptep(pmdp), pmd_pte(pmd));
 }
 
@@ -723,7 +729,7 @@ void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
  * neesd to be flushed.
  */
 void hpte_do_hugepage_flush(struct mm_struct *mm, unsigned long addr,
-                            pmd_t *pmdp)
+                            pmd_t *pmdp, unsigned long old_pmd)
 {
         int ssize, i;
         unsigned long s_addr;
@@ -745,12 +751,29 @@ void hpte_do_hugepage_flush(struct mm_struct *mm, unsigned long addr,
         if (!hpte_slot_array)
                 return;
 
-        /* get the base page size */
+        /* get the base page size,vsid and segment size */
+#ifdef CONFIG_DEBUG_VM
         psize = get_slice_psize(mm, s_addr);
+        BUG_ON(psize == MMU_PAGE_16M);
+#endif
+        if (old_pmd & _PAGE_COMBO)
+                psize = MMU_PAGE_4K;
+        else
+                psize = MMU_PAGE_64K;
+
+        if (!is_kernel_addr(s_addr)) {
+                ssize = user_segment_size(s_addr);
+                vsid = get_vsid(mm->context.id, s_addr, ssize);
+                WARN_ON(vsid == 0);
+        } else {
+                vsid = get_kernel_vsid(s_addr, mmu_kernel_ssize);
+                ssize = mmu_kernel_ssize;
+        }
 
         if (ppc_md.hugepage_invalidate)
-                return ppc_md.hugepage_invalidate(mm, hpte_slot_array,
-                                                  s_addr, psize);
+                return ppc_md.hugepage_invalidate(vsid, s_addr,
+                                                  hpte_slot_array,
+                                                  psize, ssize);
         /*
          * No bluk hpte removal support, invalidate each entry
          */
@@ -768,15 +791,6 @@ void hpte_do_hugepage_flush(struct mm_struct *mm, unsigned long addr,
 
                 /* get the vpn */
                 addr = s_addr + (i * (1ul << shift));
-                if (!is_kernel_addr(addr)) {
-                        ssize = user_segment_size(addr);
-                        vsid = get_vsid(mm->context.id, addr, ssize);
-                        WARN_ON(vsid == 0);
-                } else {
-                        vsid = get_kernel_vsid(addr, mmu_kernel_ssize);
-                        ssize = mmu_kernel_ssize;
-                }
-
                 vpn = hpt_vpn(addr, vsid, ssize);
                 hash = hpt_hash(vpn, shift, ssize);
                 if (hidx & _PTEIDX_SECONDARY)
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index 11571e118831..5029dc19b517 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -2,7 +2,7 @@
  * This file contains the routines for handling the MMU on those
  * PowerPC implementations where the MMU substantially follows the
  * architecture specification.  This includes the 6xx, 7xx, 7xxx,
- * 8260, and POWER3 implementations but excludes the 8xx and 4xx.
+ * and 8260 implementations but excludes the 8xx and 4xx.
  *  -- paulus
  *
  *  Derived from arch/ppc/mm/init.c:
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c
deleted file mode 100644
index 3f8efa6f2997..000000000000
--- a/arch/powerpc/mm/stab.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * PowerPC64 Segment Translation Support.
- *
- * Dave Engebretsen and Mike Corrigan {engebret|mikejc}@us.ibm.com
- *    Copyright (c) 2001 Dave Engebretsen
- *
- * Copyright (C) 2002 Anton Blanchard <anton@au.ibm.com>, IBM
- *
- *      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/memblock.h>
-
-#include <asm/pgtable.h>
-#include <asm/mmu.h>
-#include <asm/mmu_context.h>
-#include <asm/paca.h>
-#include <asm/cputable.h>
-#include <asm/prom.h>
-
-struct stab_entry {
-        unsigned long esid_data;
-        unsigned long vsid_data;
-};
-
-#define NR_STAB_CACHE_ENTRIES 8
-static DEFINE_PER_CPU(long, stab_cache_ptr);
-static DEFINE_PER_CPU(long [NR_STAB_CACHE_ENTRIES], stab_cache);
-
-/*
- * Create a segment table entry for the given esid/vsid pair.
- */
-static int make_ste(unsigned long stab, unsigned long esid, unsigned long vsid)
-{
-        unsigned long esid_data, vsid_data;
-        unsigned long entry, group, old_esid, castout_entry, i;
-        unsigned int global_entry;
-        struct stab_entry *ste, *castout_ste;
-        unsigned long kernel_segment = (esid << SID_SHIFT) >= PAGE_OFFSET;
-
-        vsid_data = vsid << STE_VSID_SHIFT;
-        esid_data = esid << SID_SHIFT | STE_ESID_KP | STE_ESID_V;
-        if (! kernel_segment)
-                esid_data |= STE_ESID_KS;
-
-        /* Search the primary group first. */
-        global_entry = (esid & 0x1f) << 3;
-        ste = (struct stab_entry *)(stab | ((esid & 0x1f) << 7));
-
-        /* Find an empty entry, if one exists. */
-        for (group = 0; group < 2; group++) {
-                for (entry = 0; entry < 8; entry++, ste++) {
-                        if (!(ste->esid_data & STE_ESID_V)) {
-                                ste->vsid_data = vsid_data;
-                                eieio();
-                                ste->esid_data = esid_data;
-                                return (global_entry | entry);
-                        }
-                }
-                /* Now search the secondary group. */
-                global_entry = ((~esid) & 0x1f) << 3;
-                ste = (struct stab_entry *)(stab | (((~esid) & 0x1f) << 7));
-        }
-
-        /*
-         * Could not find empty entry, pick one with a round robin selection.
-         * Search all entries in the two groups.
-         */
-        castout_entry = get_paca()->stab_rr;
-        for (i = 0; i < 16; i++) {
-                if (castout_entry < 8) {
-                        global_entry = (esid & 0x1f) << 3;
-                        ste = (struct stab_entry *)(stab | ((esid & 0x1f) << 7));
-                        castout_ste = ste + castout_entry;
-                } else {
-                        global_entry = ((~esid) & 0x1f) << 3;
-                        ste = (struct stab_entry *)(stab | (((~esid) & 0x1f) << 7));
-                        castout_ste = ste + (castout_entry - 8);
-                }
-
-                /* Dont cast out the first kernel segment */
-                if ((castout_ste->esid_data & ESID_MASK) != PAGE_OFFSET)
-                        break;
-
-                castout_entry = (castout_entry + 1) & 0xf;
-        }
-
-        get_paca()->stab_rr = (castout_entry + 1) & 0xf;
-
-        /* Modify the old entry to the new value. */
-
-        /* Force previous translations to complete. DRENG */
-        asm volatile("isync" : : : "memory");
-
-        old_esid = castout_ste->esid_data >> SID_SHIFT;
-        castout_ste->esid_data = 0;             /* Invalidate old entry */
-
-        asm volatile("sync" : : : "memory");    /* Order update */
-
-        castout_ste->vsid_data = vsid_data;
-        eieio();                                /* Order update */
-        castout_ste->esid_data = esid_data;
-
-        asm volatile("slbie  %0" : : "r" (old_esid << SID_SHIFT));
-        /* Ensure completion of slbie */
-        asm volatile("sync" : : : "memory");
-
-        return (global_entry | (castout_entry & 0x7));
-}
-
-/*
- * Allocate a segment table entry for the given ea and mm
- */
-static int __ste_allocate(unsigned long ea, struct mm_struct *mm)
-{
-        unsigned long vsid;
-        unsigned char stab_entry;
-        unsigned long offset;
-
-        /* Kernel or user address? */
-        if (is_kernel_addr(ea)) {
-                vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
-        } else {
-                if ((ea >= TASK_SIZE_USER64) || (! mm))
-                        return 1;
-
-                vsid = get_vsid(mm->context.id, ea, MMU_SEGSIZE_256M);
-        }
-
-        stab_entry = make_ste(get_paca()->stab_addr, GET_ESID(ea), vsid);
-
-        if (!is_kernel_addr(ea)) {
-                offset = __get_cpu_var(stab_cache_ptr);
-                if (offset < NR_STAB_CACHE_ENTRIES)
-                        __get_cpu_var(stab_cache[offset++]) = stab_entry;
-                else
-                        offset = NR_STAB_CACHE_ENTRIES+1;
-                __get_cpu_var(stab_cache_ptr) = offset;
-
-                /* Order update */
-                asm volatile("sync":::"memory");
-        }
-
-        return 0;
-}
-
-int ste_allocate(unsigned long ea)
-{
-        return __ste_allocate(ea, current->mm);
-}
-
-/*
- * Do the segment table work for a context switch: flush all user
- * entries from the table, then preload some probably useful entries
- * for the new task
- */
-void switch_stab(struct task_struct *tsk, struct mm_struct *mm)
-{
-        struct stab_entry *stab = (struct stab_entry *) get_paca()->stab_addr;
-        struct stab_entry *ste;
-        unsigned long offset;
-        unsigned long pc = KSTK_EIP(tsk);
-        unsigned long stack = KSTK_ESP(tsk);
-        unsigned long unmapped_base;
-
-        /* Force previous translations to complete. DRENG */
-        asm volatile("isync" : : : "memory");
-
-        /*
-         * We need interrupts hard-disabled here, not just soft-disabled,
-         * so that a PMU interrupt can't occur, which might try to access
-         * user memory (to get a stack trace) and possible cause an STAB miss
-         * which would update the stab_cache/stab_cache_ptr per-cpu variables.
-         */
-        hard_irq_disable();
-
-        offset = __get_cpu_var(stab_cache_ptr);
-        if (offset <= NR_STAB_CACHE_ENTRIES) {
-                int i;
-
-                for (i = 0; i < offset; i++) {
-                        ste = stab + __get_cpu_var(stab_cache[i]);
-                        ste->esid_data = 0; /* invalidate entry */
-                }
-        } else {
-                unsigned long entry;
-
-                /* Invalidate all entries. */
-                ste = stab;
-
-                /* Never flush the first entry. */
-                ste += 1;
-                for (entry = 1;
-                     entry < (HW_PAGE_SIZE / sizeof(struct stab_entry));
-                     entry++, ste++) {
-                        unsigned long ea;
-                        ea = ste->esid_data & ESID_MASK;
-                        if (!is_kernel_addr(ea)) {
-                                ste->esid_data = 0;
-                        }
-                }
-        }
-
-        asm volatile("sync; slbia; sync":::"memory");
-
-        __get_cpu_var(stab_cache_ptr) = 0;
-
-        /* Now preload some entries for the new task */
-        if (test_tsk_thread_flag(tsk, TIF_32BIT))
-                unmapped_base = TASK_UNMAPPED_BASE_USER32;
-        else
-                unmapped_base = TASK_UNMAPPED_BASE_USER64;
-
-        __ste_allocate(pc, mm);
-
-        if (GET_ESID(pc) == GET_ESID(stack))
-                return;
-
-        __ste_allocate(stack, mm);
-
-        if ((GET_ESID(pc) == GET_ESID(unmapped_base))
-            || (GET_ESID(stack) == GET_ESID(unmapped_base)))
-                return;
-
-        __ste_allocate(unmapped_base, mm);
-
-        /* Order update */
-        asm volatile("sync" : : : "memory");
-}
-
-/*
- * Allocate segment tables for secondary CPUs.  These must all go in
- * the first (bolted) segment, so that do_stab_bolted won't get a
- * recursive segment miss on the segment table itself.
- */
-void __init stabs_alloc(void)
-{
-        int cpu;
-
-        if (mmu_has_feature(MMU_FTR_SLB))
-                return;
-
-        for_each_possible_cpu(cpu) {
-                unsigned long newstab;
-
-                if (cpu == 0)
-                        continue; /* stab for CPU 0 is statically allocated */
-
-                newstab = memblock_alloc_base(HW_PAGE_SIZE, HW_PAGE_SIZE,
-                                         1<<SID_SHIFT);
-                newstab = (unsigned long)__va(newstab);
-
-                memset((void *)newstab, 0, HW_PAGE_SIZE);
-
-                paca[cpu].stab_addr = newstab;
-                paca[cpu].stab_real = __pa(newstab);
-                printk(KERN_INFO "Segment table for CPU %d at 0x%llx "
-                       "virtual, 0x%llx absolute\n",
-                       cpu, paca[cpu].stab_addr, paca[cpu].stab_real);
-        }
-}
-
-/*
- * Build an entry for the base kernel segment and put it into
- * the segment table or SLB.  All other segment table or SLB
- * entries are faulted in.
- */
-void stab_initialize(unsigned long stab)
-{
-        unsigned long vsid = get_kernel_vsid(PAGE_OFFSET, MMU_SEGSIZE_256M);
-        unsigned long stabreal;
-
-        asm volatile("isync; slbia; isync":::"memory");
-        make_ste(stab, GET_ESID(PAGE_OFFSET), vsid);
-
-        /* Order update */
-        asm volatile("sync":::"memory");
-
-        /* Set ASR */
-        stabreal = get_paca()->stab_real | 0x1ul;
-
-        mtspr(SPRN_ASR, stabreal);
-}
diff --git a/arch/powerpc/mm/tlb_hash64.c b/arch/powerpc/mm/tlb_hash64.c
index c99f6510a0b2..d2a94b85dbc2 100644
--- a/arch/powerpc/mm/tlb_hash64.c
+++ b/arch/powerpc/mm/tlb_hash64.c
@@ -30,6 +30,8 @@
 #include <asm/tlb.h>
 #include <asm/bug.h>
 
+#include <trace/events/thp.h>
+
 DEFINE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch);
 
 /*
@@ -213,10 +215,12 @@ void __flush_hash_table_range(struct mm_struct *mm, unsigned long start,
                 if (ptep == NULL)
                         continue;
                 pte = pte_val(*ptep);
+                if (hugepage_shift)
+                        trace_hugepage_invalidate(start, pte_val(pte));
                 if (!(pte & _PAGE_HASHPTE))
                         continue;
                 if (unlikely(hugepage_shift && pmd_trans_huge(*(pmd_t *)pte)))
-                        hpte_do_hugepage_flush(mm, start, (pmd_t *)pte);
+                        hpte_do_hugepage_flush(mm, start, (pmd_t *)ptep, pte);
                 else
                         hpte_need_flush(mm, start, ptep, pte, 0);
         }
diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S
index 356e8b41fb09..89bf95bd63b1 100644
--- a/arch/powerpc/mm/tlb_low_64e.S
+++ b/arch/powerpc/mm/tlb_low_64e.S
@@ -296,9 +296,12 @@ itlb_miss_fault_bolted:
  * r14 = page table base
  * r13 = PACA
  * r11 = tlb_per_core ptr
- * r10 = cpu number
+ * r10 = crap (free to use)
  */
 tlb_miss_common_e6500:
+        crmove  cr2*4+2,cr0*4+2         /* cr2.eq != 0 if kernel address */
+
+BEGIN_FTR_SECTION               /* CPU_FTR_SMT */
         /*
          * Search if we already have an indirect entry for that virtual
          * address, and if we do, bail out.
@@ -309,6 +312,7 @@ tlb_miss_common_e6500:
         lhz     r10,PACAPACAINDEX(r13)
         cmpdi   r15,0
         cmpdi   cr1,r15,1       /* set cr1.eq = 0 for non-recursive */
+        addi    r10,r10,1
         bne     2f
         stbcx.  r10,0,r11
         bne     1b
@@ -322,18 +326,62 @@ tlb_miss_common_e6500:
         b       1b
         .previous
 
+        /*
+         * Erratum A-008139 says that we can't use tlbwe to change
+         * an indirect entry in any way (including replacing or
+         * invalidating) if the other thread could be in the process
+         * of a lookup.  The workaround is to invalidate the entry
+         * with tlbilx before overwriting.
+         */
+
+        lbz     r15,TCD_ESEL_NEXT(r11)
+        rlwinm  r10,r15,16,0xff0000
+        oris    r10,r10,MAS0_TLBSEL(1)@h
+        mtspr   SPRN_MAS0,r10
+        isync
+        tlbre
+        mfspr   r15,SPRN_MAS1
+        andis.  r15,r15,MAS1_VALID@h
+        beq     5f
+
+BEGIN_FTR_SECTION_NESTED(532)
+        mfspr   r10,SPRN_MAS8
+        rlwinm  r10,r10,0,0x80000fff  /* tgs,tlpid -> sgs,slpid */
+        mtspr   SPRN_MAS5,r10
+END_FTR_SECTION_NESTED(CPU_FTR_EMB_HV,CPU_FTR_EMB_HV,532)
+
+        mfspr   r10,SPRN_MAS1
+        rlwinm  r15,r10,0,0x3fff0000  /* tid -> spid */
+        rlwimi  r15,r10,20,0x00000003 /* ind,ts -> sind,sas */
+        mfspr   r10,SPRN_MAS6
+        mtspr   SPRN_MAS6,r15
+
         mfspr   r15,SPRN_MAS2
+        isync
+        tlbilxva 0,r15
+        isync
+
+        mtspr   SPRN_MAS6,r10
+
+5:
+BEGIN_FTR_SECTION_NESTED(532)
+        li      r10,0
+        mtspr   SPRN_MAS8,r10
+        mtspr   SPRN_MAS5,r10
+END_FTR_SECTION_NESTED(CPU_FTR_EMB_HV,CPU_FTR_EMB_HV,532)
 
         tlbsx   0,r16
         mfspr   r10,SPRN_MAS1
-        andis.  r10,r10,MAS1_VALID@h
+        andis.  r15,r10,MAS1_VALID@h
         bne     tlb_miss_done_e6500
-
-        /* Undo MAS-damage from the tlbsx */
+FTR_SECTION_ELSE
         mfspr   r10,SPRN_MAS1
+ALT_FTR_SECTION_END_IFSET(CPU_FTR_SMT)
+
         oris    r10,r10,MAS1_VALID@h
-        mtspr   SPRN_MAS1,r10
-        mtspr   SPRN_MAS2,r15
+        beq     cr2,4f
+        rlwinm  r10,r10,0,16,1          /* Clear TID */
+4:      mtspr   SPRN_MAS1,r10
 
         /* Now, we need to walk the page tables. First check if we are in
          * range.
@@ -394,11 +442,13 @@ tlb_miss_common_e6500:
 
 tlb_miss_done_e6500:
         .macro  tlb_unlock_e6500
+BEGIN_FTR_SECTION
         beq     cr1,1f          /* no unlock if lock was recursively grabbed */
         li      r15,0
         isync
         stb     r15,0(r11)
 1:
+END_FTR_SECTION_IFSET(CPU_FTR_SMT)
         .endm
 
         tlb_unlock_e6500
@@ -407,12 +457,9 @@ tlb_miss_done_e6500:
         rfi
 
 tlb_miss_kernel_e6500:
-        mfspr   r10,SPRN_MAS1
         ld      r14,PACA_KERNELPGD(r13)
-        cmpldi  cr0,r15,8               /* Check for vmalloc region */
-        rlwinm  r10,r10,0,16,1          /* Clear TID */
-        mtspr   SPRN_MAS1,r10
-        beq+    tlb_miss_common_e6500
+        cmpldi  cr1,r15,8               /* Check for vmalloc region */
+        beq+    cr1,tlb_miss_common_e6500
 
 tlb_miss_fault_e6500:
         tlb_unlock_e6500
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c
index 92cb18d52ea8..f38ea4df6a85 100644
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/arch/powerpc/mm/tlb_nohash.c
@@ -581,42 +581,10 @@ static void setup_mmu_htw(void)
 /*
  * Early initialization of the MMU TLB code
  */
-static void __early_init_mmu(int boot_cpu)
+static void early_init_this_mmu(void)
 {
         unsigned int mas4;
 
-        /* XXX This will have to be decided at runtime, but right
-         * now our boot and TLB miss code hard wires it. Ideally
-         * we should find out a suitable page size and patch the
-         * TLB miss code (either that or use the PACA to store
-         * the value we want)
-         */
-        mmu_linear_psize = MMU_PAGE_1G;
-
-        /* XXX This should be decided at runtime based on supported
-         * page sizes in the TLB, but for now let's assume 16M is
-         * always there and a good fit (which it probably is)
-         *
-         * Freescale booke only supports 4K pages in TLB0, so use that.
-         */
-        if (mmu_has_feature(MMU_FTR_TYPE_FSL_E))
-                mmu_vmemmap_psize = MMU_PAGE_4K;
-        else
-                mmu_vmemmap_psize = MMU_PAGE_16M;
-
-        /* XXX This code only checks for TLB 0 capabilities and doesn't
-         *     check what page size combos are supported by the HW. It
-         *     also doesn't handle the case where a separate array holds
-         *     the IND entries from the array loaded by the PT.
-         */
-        if (boot_cpu) {
-                /* Look for supported page sizes */
-                setup_page_sizes();
-
-                /* Look for HW tablewalk support */
-                setup_mmu_htw();
-        }
-
         /* Set MAS4 based on page table setting */
 
         mas4 = 0x4 << MAS4_WIMGED_SHIFT;
@@ -650,11 +618,6 @@ static void __early_init_mmu(int boot_cpu)
         }
         mtspr(SPRN_MAS4, mas4);
 
-        /* Set the global containing the top of the linear mapping
-         * for use by the TLB miss code
-         */
-        linear_map_top = memblock_end_of_DRAM();
-
 #ifdef CONFIG_PPC_FSL_BOOK3E
         if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) {
                 unsigned int num_cams;
@@ -662,10 +625,49 @@ static void __early_init_mmu(int boot_cpu)
                 /* use a quarter of the TLBCAM for bolted linear map */
                 num_cams = (mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) / 4;
                 linear_map_top = map_mem_in_cams(linear_map_top, num_cams);
+        }
+#endif
 
-                /* limit memory so we dont have linear faults */
-                memblock_enforce_memory_limit(linear_map_top);
+        /* A sync won't hurt us after mucking around with
+         * the MMU configuration
+         */
+        mb();
+}
 
+static void __init early_init_mmu_global(void)
+{
+        /* XXX This will have to be decided at runtime, but right
+         * now our boot and TLB miss code hard wires it. Ideally
+         * we should find out a suitable page size and patch the
+         * TLB miss code (either that or use the PACA to store
+         * the value we want)
+         */
+        mmu_linear_psize = MMU_PAGE_1G;
+
+        /* XXX This should be decided at runtime based on supported
+         * page sizes in the TLB, but for now let's assume 16M is
+         * always there and a good fit (which it probably is)
+         *
+         * Freescale booke only supports 4K pages in TLB0, so use that.
+         */
+        if (mmu_has_feature(MMU_FTR_TYPE_FSL_E))
+                mmu_vmemmap_psize = MMU_PAGE_4K;
+        else
+                mmu_vmemmap_psize = MMU_PAGE_16M;
+
+        /* XXX This code only checks for TLB 0 capabilities and doesn't
+         *     check what page size combos are supported by the HW. It
+         *     also doesn't handle the case where a separate array holds
+         *     the IND entries from the array loaded by the PT.
+         */
+        /* Look for supported page sizes */
+        setup_page_sizes();
+
+        /* Look for HW tablewalk support */
+        setup_mmu_htw();
+
+#ifdef CONFIG_PPC_FSL_BOOK3E
+        if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) {
                 if (book3e_htw_mode == PPC_HTW_NONE) {
                         extlb_level_exc = EX_TLB_SIZE;
                         patch_exception(0x1c0, exc_data_tlb_miss_bolted_book3e);
@@ -675,22 +677,41 @@ static void __early_init_mmu(int boot_cpu)
         }
 #endif
 
-        /* A sync won't hurt us after mucking around with
-         * the MMU configuration
+        /* Set the global containing the top of the linear mapping
+         * for use by the TLB miss code
          */
-        mb();
+        linear_map_top = memblock_end_of_DRAM();
+}
+
+static void __init early_mmu_set_memory_limit(void)
+{
+#ifdef CONFIG_PPC_FSL_BOOK3E
+        if (mmu_has_feature(MMU_FTR_TYPE_FSL_E)) {
+                /*
+                 * Limit memory so we dont have linear faults.
+                 * Unlike memblock_set_current_limit, which limits
+                 * memory available during early boot, this permanently
+                 * reduces the memory available to Linux.  We need to
+                 * do this because highmem is not supported on 64-bit.
+                 */
+                memblock_enforce_memory_limit(linear_map_top);
+        }
+#endif
 
         memblock_set_current_limit(linear_map_top);
 }
 
+/* boot cpu only */
 void __init early_init_mmu(void)
 {
-        __early_init_mmu(1);
+        early_init_mmu_global();
+        early_init_this_mmu();
+        early_mmu_set_memory_limit();
 }
 
 void early_init_mmu_secondary(void)
 {
-        __early_init_mmu(0);
+        early_init_this_mmu();
 }
 
 void setup_initial_memory_limit(phys_addr_t first_memblock_base,
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index 82e82cadcde5..3afa6f4c1957 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -25,7 +25,7 @@ static inline void bpf_flush_icache(void *start, void *end)
         flush_icache_range((unsigned long)start, (unsigned long)end);
 }
 
-static void bpf_jit_build_prologue(struct sk_filter *fp, u32 *image,
+static void bpf_jit_build_prologue(struct bpf_prog *fp, u32 *image,
                                    struct codegen_context *ctx)
 {
         int i;
@@ -121,7 +121,7 @@ static void bpf_jit_build_epilogue(u32 *image, struct codegen_context *ctx)
         ((int)K < 0 ? ((int)K >= SKF_LL_OFF ? func##_negative_offset : func) : func##_positive_offset)
 
 /* Assemble the body code between the prologue & epilogue. */
-static int bpf_jit_build_body(struct sk_filter *fp, u32 *image,
+static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                               struct codegen_context *ctx,
                               unsigned int *addrs)
 {
@@ -569,7 +569,7 @@ static int bpf_jit_build_body(struct sk_filter *fp, u32 *image,
         return 0;
 }
 
-void bpf_jit_compile(struct sk_filter *fp)
+void bpf_jit_compile(struct bpf_prog *fp)
 {
         unsigned int proglen;
         unsigned int alloclen;
@@ -693,7 +693,7 @@ out:
         return;
 }
 
-void bpf_jit_free(struct sk_filter *fp)
+void bpf_jit_free(struct bpf_prog *fp)
 {
         if (fp->jited)
                 module_free(NULL, fp->bpf_func);
diff --git a/arch/powerpc/oprofile/Makefile b/arch/powerpc/oprofile/Makefile
index 751ec7bd5018..cedbbeced632 100644
--- a/arch/powerpc/oprofile/Makefile
+++ b/arch/powerpc/oprofile/Makefile
@@ -14,6 +14,6 @@ oprofile-y := $(DRIVER_OBJS) common.o backtrace.o
 oprofile-$(CONFIG_OPROFILE_CELL) += op_model_cell.o \
                 cell/spu_profiler.o cell/vma_map.o \
                 cell/spu_task_sync.o
-oprofile-$(CONFIG_PPC_BOOK3S_64) += op_model_rs64.o op_model_power4.o op_model_pa6t.o
+oprofile-$(CONFIG_PPC_BOOK3S_64) += op_model_power4.o op_model_pa6t.o
 oprofile-$(CONFIG_FSL_EMB_PERFMON) += op_model_fsl_emb.o
 oprofile-$(CONFIG_6xx) += op_model_7450.o
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index c77348c5d463..bf094c5a4bd9 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -205,9 +205,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
                         ops->sync_stop = model->sync_stop;
                         break;
 #endif
-                case PPC_OPROFILE_RS64:
-                        model = &op_model_rs64;
-                        break;
                 case PPC_OPROFILE_POWER4:
                         model = &op_model_power4;
                         break;
diff --git a/arch/powerpc/oprofile/op_model_rs64.c b/arch/powerpc/oprofile/op_model_rs64.c
deleted file mode 100644
index 7e5b8ed3a1b7..000000000000
--- a/arch/powerpc/oprofile/op_model_rs64.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2004 Anton Blanchard <anton@au.ibm.com>, IBM
- *
- * 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/oprofile.h>
-#include <linux/smp.h>
-#include <asm/ptrace.h>
-#include <asm/processor.h>
-#include <asm/cputable.h>
-#include <asm/oprofile_impl.h>
-
-#define dbg(args...)
-
-static void ctrl_write(unsigned int i, unsigned int val)
-{
-        unsigned int tmp = 0;
-        unsigned long shift = 0, mask = 0;
-
-        dbg("ctrl_write %d %x\n", i, val);
-
-        switch(i) {
-        case 0:
-                tmp = mfspr(SPRN_MMCR0);
-                shift = 6;
-                mask = 0x7F;
-                break;
-        case 1:
-                tmp = mfspr(SPRN_MMCR0);
-                shift = 0;
-                mask = 0x3F;
-                break;
-        case 2:
-                tmp = mfspr(SPRN_MMCR1);
-                shift = 31 - 4;
-                mask = 0x1F;
-                break;
-        case 3:
-                tmp = mfspr(SPRN_MMCR1);
-                shift = 31 - 9;
-                mask = 0x1F;
-                break;
-        case 4:
-                tmp = mfspr(SPRN_MMCR1);
-                shift = 31 - 14;
-                mask = 0x1F;
-                break;
-        case 5:
-                tmp = mfspr(SPRN_MMCR1);
-                shift = 31 - 19;
-                mask = 0x1F;
-                break;
-        case 6:
-                tmp = mfspr(SPRN_MMCR1);
-                shift = 31 - 24;
-                mask = 0x1F;
-                break;
-        case 7:
-                tmp = mfspr(SPRN_MMCR1);
-                shift = 31 - 28;
-                mask = 0xF;
-                break;
-        }
-
-        tmp = tmp & ~(mask << shift);
-        tmp |= val << shift;
-
-        switch(i) {
-                case 0:
-                case 1:
-                        mtspr(SPRN_MMCR0, tmp);
-                        break;
-                default:
-                        mtspr(SPRN_MMCR1, tmp);
-        }
-
-        dbg("ctrl_write mmcr0 %lx mmcr1 %lx\n", mfspr(SPRN_MMCR0),
-               mfspr(SPRN_MMCR1));
-}
-
-static unsigned long reset_value[OP_MAX_COUNTER];
-
-static int num_counters;
-
-static int rs64_reg_setup(struct op_counter_config *ctr,
-                           struct op_system_config *sys,
-                           int num_ctrs)
-{
-        int i;
-
-        num_counters = num_ctrs;
-
-        for (i = 0; i < num_counters; ++i)
-                reset_value[i] = 0x80000000UL - ctr[i].count;
-
-        /* XXX setup user and kernel profiling */
-        return 0;
-}
-
-static int rs64_cpu_setup(struct op_counter_config *ctr)
-{
-        unsigned int mmcr0;
-
-        /* reset MMCR0 and set the freeze bit */
-        mmcr0 = MMCR0_FC;
-        mtspr(SPRN_MMCR0, mmcr0);
-
-        /* reset MMCR1, MMCRA */
-        mtspr(SPRN_MMCR1, 0);
-
-        if (cpu_has_feature(CPU_FTR_MMCRA))
-                mtspr(SPRN_MMCRA, 0);
-
-        mmcr0 |= MMCR0_FCM1|MMCR0_PMXE|MMCR0_FCECE;
-        /* Only applies to POWER3, but should be safe on RS64 */
-        mmcr0 |= MMCR0_PMC1CE|MMCR0_PMCjCE;
-        mtspr(SPRN_MMCR0, mmcr0);
-
-        dbg("setup on cpu %d, mmcr0 %lx\n", smp_processor_id(),
-            mfspr(SPRN_MMCR0));
-        dbg("setup on cpu %d, mmcr1 %lx\n", smp_processor_id(),
-            mfspr(SPRN_MMCR1));
-
-        return 0;
-}
-
-static int rs64_start(struct op_counter_config *ctr)
-{
-        int i;
-        unsigned int mmcr0;
-
-        /* set the PMM bit (see comment below) */
-        mtmsrd(mfmsr() | MSR_PMM);
-
-        for (i = 0; i < num_counters; ++i) {
-                if (ctr[i].enabled) {
-                        classic_ctr_write(i, reset_value[i]);
-                        ctrl_write(i, ctr[i].event);
-                } else {
-                        classic_ctr_write(i, 0);
-                }
-        }
-
-        mmcr0 = mfspr(SPRN_MMCR0);
-
-        /*
-         * now clear the freeze bit, counting will not start until we
-         * rfid from this excetion, because only at that point will
-         * the PMM bit be cleared
-         */
-        mmcr0 &= ~MMCR0_FC;
-        mtspr(SPRN_MMCR0, mmcr0);
-
-        dbg("start on cpu %d, mmcr0 %x\n", smp_processor_id(), mmcr0);
-        return 0;
-}
-
-static void rs64_stop(void)
-{
-        unsigned int mmcr0;
-
-        /* freeze counters */
-        mmcr0 = mfspr(SPRN_MMCR0);
-        mmcr0 |= MMCR0_FC;
-        mtspr(SPRN_MMCR0, mmcr0);
-
-        dbg("stop on cpu %d, mmcr0 %x\n", smp_processor_id(), mmcr0);
-
-        mb();
-}
-
-static void rs64_handle_interrupt(struct pt_regs *regs,
-                                  struct op_counter_config *ctr)
-{
-        unsigned int mmcr0;
-        int is_kernel;
-        int val;
-        int i;
-        unsigned long pc = mfspr(SPRN_SIAR);
-
-        is_kernel = is_kernel_addr(pc);
-
-        /* set the PMM bit (see comment below) */
-        mtmsrd(mfmsr() | MSR_PMM);
-
-        for (i = 0; i < num_counters; ++i) {
-                val = classic_ctr_read(i);
-                if (val < 0) {
-                        if (ctr[i].enabled) {
-                                oprofile_add_ext_sample(pc, regs, i, is_kernel);
-                                classic_ctr_write(i, reset_value[i]);
-                        } else {
-                                classic_ctr_write(i, 0);
-                        }
-                }
-        }
-
-        mmcr0 = mfspr(SPRN_MMCR0);
-
-        /* reset the perfmon trigger */
-        mmcr0 |= MMCR0_PMXE;
-
-        /*
-         * now clear the freeze bit, counting will not start until we
-         * rfid from this exception, because only at that point will
-         * the PMM bit be cleared
-         */
-        mmcr0 &= ~MMCR0_FC;
-        mtspr(SPRN_MMCR0, mmcr0);
-}
-
-struct op_powerpc_model op_model_rs64 = {
-        .reg_setup              = rs64_reg_setup,
-        .cpu_setup              = rs64_cpu_setup,
-        .start                  = rs64_start,
-        .stop                   = rs64_stop,
-        .handle_interrupt       = rs64_handle_interrupt,
-};
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index fe52db2eea6a..b7cd00b0171e 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -36,7 +36,12 @@ struct cpu_hw_events {
         struct perf_event *event[MAX_HWEVENTS];
         u64 events[MAX_HWEVENTS];
         unsigned int flags[MAX_HWEVENTS];
-        unsigned long mmcr[3];
+        /*
+         * The order of the MMCR array is:
+         *  - 64-bit, MMCR0, MMCR1, MMCRA, MMCR2
+         *  - 32-bit, MMCR0, MMCR1, MMCR2
+         */
+        unsigned long mmcr[4];
         struct perf_event *limited_counter[MAX_LIMITED_HWCOUNTERS];
         u8  limited_hwidx[MAX_LIMITED_HWCOUNTERS];
         u64 alternatives[MAX_HWEVENTS][MAX_EVENT_ALTERNATIVES];
@@ -112,9 +117,9 @@ static bool is_ebb_event(struct perf_event *event) { return false; }
 static int ebb_event_check(struct perf_event *event) { return 0; }
 static void ebb_event_add(struct perf_event *event) { }
 static void ebb_switch_out(unsigned long mmcr0) { }
-static unsigned long ebb_switch_in(bool ebb, unsigned long mmcr0)
+static unsigned long ebb_switch_in(bool ebb, struct cpu_hw_events *cpuhw)
 {
-        return mmcr0;
+        return cpuhw->mmcr[0];
 }
 
 static inline void power_pmu_bhrb_enable(struct perf_event *event) {}
@@ -542,8 +547,10 @@ static void ebb_switch_out(unsigned long mmcr0)
         current->thread.mmcr2 = mfspr(SPRN_MMCR2) & MMCR2_USER_MASK;
 }
 
-static unsigned long ebb_switch_in(bool ebb, unsigned long mmcr0)
+static unsigned long ebb_switch_in(bool ebb, struct cpu_hw_events *cpuhw)
 {
+        unsigned long mmcr0 = cpuhw->mmcr[0];
+
         if (!ebb)
                 goto out;
 
@@ -568,7 +575,15 @@ static unsigned long ebb_switch_in(bool ebb, unsigned long mmcr0)
         mtspr(SPRN_SIAR, current->thread.siar);
         mtspr(SPRN_SIER, current->thread.sier);
         mtspr(SPRN_SDAR, current->thread.sdar);
-        mtspr(SPRN_MMCR2, current->thread.mmcr2);
+
+        /*
+         * Merge the kernel & user values of MMCR2. The semantics we implement
+         * are that the user MMCR2 can set bits, ie. cause counters to freeze,
+         * but not clear bits. If a task wants to be able to clear bits, ie.
+         * unfreeze counters, it should not set exclude_xxx in its events and
+         * instead manage the MMCR2 entirely by itself.
+         */
+        mtspr(SPRN_MMCR2, cpuhw->mmcr[3] | current->thread.mmcr2);
 out:
         return mmcr0;
 }
@@ -915,6 +930,14 @@ static int check_excludes(struct perf_event **ctrs, unsigned int cflags[],
         int i, n, first;
         struct perf_event *event;
 
+        /*
+         * If the PMU we're on supports per event exclude settings then we
+         * don't need to do any of this logic. NB. This assumes no PMU has both
+         * per event exclude and limited PMCs.
+         */
+        if (ppmu->flags & PPMU_ARCH_207S)
+                return 0;
+
         n = n_prev + n_new;
         if (n <= 1)
                 return 0;
@@ -1219,28 +1242,31 @@ static void power_pmu_enable(struct pmu *pmu)
         }
 
         /*
-         * Compute MMCR* values for the new set of events
+         * Clear all MMCR settings and recompute them for the new set of events.
          */
+        memset(cpuhw->mmcr, 0, sizeof(cpuhw->mmcr));
+
         if (ppmu->compute_mmcr(cpuhw->events, cpuhw->n_events, hwc_index,
-                               cpuhw->mmcr)) {
+                               cpuhw->mmcr, cpuhw->event)) {
                 /* shouldn't ever get here */
                 printk(KERN_ERR "oops compute_mmcr failed\n");
                 goto out;
         }
 
-        /*
-         * Add in MMCR0 freeze bits corresponding to the
-         * attr.exclude_* bits for the first event.
-         * We have already checked that all events have the
-         * same values for these bits as the first event.
-         */
-        event = cpuhw->event[0];
-        if (event->attr.exclude_user)
-                cpuhw->mmcr[0] |= MMCR0_FCP;
-        if (event->attr.exclude_kernel)
-                cpuhw->mmcr[0] |= freeze_events_kernel;
-        if (event->attr.exclude_hv)
-                cpuhw->mmcr[0] |= MMCR0_FCHV;
+        if (!(ppmu->flags & PPMU_ARCH_207S)) {
+                /*
+                 * Add in MMCR0 freeze bits corresponding to the attr.exclude_*
+                 * bits for the first event. We have already checked that all
+                 * events have the same value for these bits as the first event.
+                 */
+                event = cpuhw->event[0];
+                if (event->attr.exclude_user)
+                        cpuhw->mmcr[0] |= MMCR0_FCP;
+                if (event->attr.exclude_kernel)
+                        cpuhw->mmcr[0] |= freeze_events_kernel;
+                if (event->attr.exclude_hv)
+                        cpuhw->mmcr[0] |= MMCR0_FCHV;
+        }
 
         /*
          * Write the new configuration to MMCR* with the freeze
@@ -1252,6 +1278,8 @@ static void power_pmu_enable(struct pmu *pmu)
         mtspr(SPRN_MMCR1, cpuhw->mmcr[1]);
         mtspr(SPRN_MMCR0, (cpuhw->mmcr[0] & ~(MMCR0_PMC1CE | MMCR0_PMCjCE))
                                 | MMCR0_FC);
+        if (ppmu->flags & PPMU_ARCH_207S)
+                mtspr(SPRN_MMCR2, cpuhw->mmcr[3]);
 
         /*
          * Read off any pre-existing events that need to move
@@ -1307,10 +1335,7 @@ static void power_pmu_enable(struct pmu *pmu)
  out_enable:
         pmao_restore_workaround(ebb);
 
-        if (ppmu->flags & PPMU_ARCH_207S)
-                mtspr(SPRN_MMCR2, 0);
-
-        mmcr0 = ebb_switch_in(ebb, cpuhw->mmcr[0]);
+        mmcr0 = ebb_switch_in(ebb, cpuhw);
 
         mb();
         if (cpuhw->bhrb_users)
diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index 66d0f179650f..70d4f748b54b 100644
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -223,7 +223,7 @@ e_free:
                 pr_err("h_get_24x7_catalog_page(ver=%lld, page=%lld) failed:"
                        " rc=%ld\n",
                        catalog_version_num, page_offset, hret);
-        kfree(page);
+        kmem_cache_free(hv_page_cache, page);
 
         pr_devel("catalog_read: offset=%lld(%lld) count=%zu(%zu) catalog_len=%zu(%zu) => %zd\n",
                         offset, page_offset, count, page_count, catalog_len,
diff --git a/arch/powerpc/perf/mpc7450-pmu.c b/arch/powerpc/perf/mpc7450-pmu.c
index fe21b515ca44..d115c5635bf3 100644
--- a/arch/powerpc/perf/mpc7450-pmu.c
+++ b/arch/powerpc/perf/mpc7450-pmu.c
@@ -260,8 +260,9 @@ static const u32 pmcsel_mask[N_COUNTER] = {
 /*
  * Compute MMCR0/1/2 values for a set of events.
  */
-static int mpc7450_compute_mmcr(u64 event[], int n_ev,
-                                unsigned int hwc[], unsigned long mmcr[])
+static int mpc7450_compute_mmcr(u64 event[], int n_ev, unsigned int hwc[],
+                                unsigned long mmcr[],
+                                struct perf_event *pevents[])
 {
         u8 event_index[N_CLASSES][N_COUNTER];
         int n_classevent[N_CLASSES];
diff --git a/arch/powerpc/perf/power4-pmu.c b/arch/powerpc/perf/power4-pmu.c
index 9103a1de864d..ce6072fa481b 100644
--- a/arch/powerpc/perf/power4-pmu.c
+++ b/arch/powerpc/perf/power4-pmu.c
@@ -356,7 +356,7 @@ static int p4_get_alternatives(u64 event, unsigned int flags, u64 alt[])
 }
 
 static int p4_compute_mmcr(u64 event[], int n_ev,
-                           unsigned int hwc[], unsigned long mmcr[])
+                           unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])
 {
         unsigned long mmcr0 = 0, mmcr1 = 0, mmcra = 0;
         unsigned int pmc, unit, byte, psel, lower;
diff --git a/arch/powerpc/perf/power5+-pmu.c b/arch/powerpc/perf/power5+-pmu.c
index b03b6dc0172d..0526dac66007 100644
--- a/arch/powerpc/perf/power5+-pmu.c
+++ b/arch/powerpc/perf/power5+-pmu.c
@@ -452,7 +452,7 @@ static int power5p_marked_instr_event(u64 event)
 }
 
 static int power5p_compute_mmcr(u64 event[], int n_ev,
-                                unsigned int hwc[], unsigned long mmcr[])
+                                unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])
 {
         unsigned long mmcr1 = 0;
         unsigned long mmcra = 0;
diff --git a/arch/powerpc/perf/power5-pmu.c b/arch/powerpc/perf/power5-pmu.c
index 1e8ce423c3af..4dc99f9f7962 100644
--- a/arch/powerpc/perf/power5-pmu.c
+++ b/arch/powerpc/perf/power5-pmu.c
@@ -383,7 +383,7 @@ static int power5_marked_instr_event(u64 event)
 }
 
 static int power5_compute_mmcr(u64 event[], int n_ev,
-                               unsigned int hwc[], unsigned long mmcr[])
+                               unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])
 {
         unsigned long mmcr1 = 0;
         unsigned long mmcra = MMCRA_SDAR_DCACHE_MISS | MMCRA_SDAR_ERAT_MISS;
diff --git a/arch/powerpc/perf/power6-pmu.c b/arch/powerpc/perf/power6-pmu.c
index 31128e086fed..9c9d646b68a1 100644
--- a/arch/powerpc/perf/power6-pmu.c
+++ b/arch/powerpc/perf/power6-pmu.c
@@ -175,7 +175,7 @@ static int power6_marked_instr_event(u64 event)
  * Assign PMC numbers and compute MMCR1 value for a set of events
  */
 static int p6_compute_mmcr(u64 event[], int n_ev,
-                           unsigned int hwc[], unsigned long mmcr[])
+                           unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])
 {
         unsigned long mmcr1 = 0;
         unsigned long mmcra = MMCRA_SDAR_DCACHE_MISS | MMCRA_SDAR_ERAT_MISS;
diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c
index 56c67bca2f75..5b62f2389290 100644
--- a/arch/powerpc/perf/power7-pmu.c
+++ b/arch/powerpc/perf/power7-pmu.c
@@ -245,7 +245,7 @@ static int power7_marked_instr_event(u64 event)
 }
 
 static int power7_compute_mmcr(u64 event[], int n_ev,
-                               unsigned int hwc[], unsigned long mmcr[])
+                               unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])
 {
         unsigned long mmcr1 = 0;
         unsigned long mmcra = MMCRA_SDAR_DCACHE_MISS | MMCRA_SDAR_ERAT_MISS;
diff --git a/arch/powerpc/perf/power8-pmu.c b/arch/powerpc/perf/power8-pmu.c
index 639cd9156585..396351db601b 100644
--- a/arch/powerpc/perf/power8-pmu.c
+++ b/arch/powerpc/perf/power8-pmu.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/perf_event.h>
 #include <asm/firmware.h>
+#include <asm/cputable.h>
 
 
 /*
@@ -266,6 +267,11 @@
 #define MMCRA_SDAR_MODE_TLB             (1ull << 42)
 #define MMCRA_IFM_SHIFT                 30
 
+/* Bits in MMCR2 for POWER8 */
+#define MMCR2_FCS(pmc)                  (1ull << (63 - (((pmc) - 1) * 9)))
+#define MMCR2_FCP(pmc)                  (1ull << (62 - (((pmc) - 1) * 9)))
+#define MMCR2_FCH(pmc)                  (1ull << (57 - (((pmc) - 1) * 9)))
+
 
 static inline bool event_is_fab_match(u64 event)
 {
@@ -393,9 +399,10 @@ static int power8_get_constraint(u64 event, unsigned long *maskp, unsigned long
 }
 
 static int power8_compute_mmcr(u64 event[], int n_ev,
-                               unsigned int hwc[], unsigned long mmcr[])
+                               unsigned int hwc[], unsigned long mmcr[],
+                               struct perf_event *pevents[])
 {
-        unsigned long mmcra, mmcr1, unit, combine, psel, cache, val;
+        unsigned long mmcra, mmcr1, mmcr2, unit, combine, psel, cache, val;
         unsigned int pmc, pmc_inuse;
         int i;
 
@@ -410,7 +417,7 @@ static int power8_compute_mmcr(u64 event[], int n_ev,
 
         /* In continous sampling mode, update SDAR on TLB miss */
         mmcra = MMCRA_SDAR_MODE_TLB;
-        mmcr1 = 0;
+        mmcr1 = mmcr2 = 0;
 
         /* Second pass: assign PMCs, set all MMCR1 fields */
         for (i = 0; i < n_ev; ++i) {
@@ -472,6 +479,19 @@ static int power8_compute_mmcr(u64 event[], int n_ev,
                         mmcra |= val << MMCRA_IFM_SHIFT;
                 }
 
+                if (pevents[i]->attr.exclude_user)
+                        mmcr2 |= MMCR2_FCP(pmc);
+
+                if (pevents[i]->attr.exclude_hv)
+                        mmcr2 |= MMCR2_FCH(pmc);
+
+                if (pevents[i]->attr.exclude_kernel) {
+                        if (cpu_has_feature(CPU_FTR_HVMODE))
+                                mmcr2 |= MMCR2_FCH(pmc);
+                        else
+                                mmcr2 |= MMCR2_FCS(pmc);
+                }
+
                 hwc[i] = pmc - 1;
         }
 
@@ -491,6 +511,7 @@ static int power8_compute_mmcr(u64 event[], int n_ev,
 
         mmcr[1] = mmcr1;
         mmcr[2] = mmcra;
+        mmcr[3] = mmcr2;
 
         return 0;
 }
diff --git a/arch/powerpc/perf/ppc970-pmu.c b/arch/powerpc/perf/ppc970-pmu.c
index 20139ceeacf6..8b6a8a36fa38 100644
--- a/arch/powerpc/perf/ppc970-pmu.c
+++ b/arch/powerpc/perf/ppc970-pmu.c
@@ -257,7 +257,7 @@ static int p970_get_alternatives(u64 event, unsigned int flags, u64 alt[])
 }
 
 static int p970_compute_mmcr(u64 event[], int n_ev,
-                             unsigned int hwc[], unsigned long mmcr[])
+                             unsigned int hwc[], unsigned long mmcr[], struct perf_event *pevents[])
 {
         unsigned long mmcr0 = 0, mmcr1 = 0, mmcra = 0;
         unsigned int pmc, unit, byte, psel;
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index 534574a97ec9..3a104284b338 100644
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -25,6 +25,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/ppc4xx.h>
+#include <asm/dma.h>
 
 
 static __initdata struct of_device_id warp_of_bus[] = {
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index 6e19b0ad5d26..3feffde9128d 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -13,6 +13,7 @@
 #include <generated/utsrelease.h>
 #include <linux/pci.h>
 #include <linux/of.h>
+#include <asm/dma.h>
 #include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index f442120e0033..0c1e6903597e 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -274,7 +274,7 @@ config CORENET_GENERIC
           For 32bit kernel, the following boards are supported:
             P2041 RDB, P3041 DS, P4080 DS, kmcoge4, and OCA4080
           For 64bit kernel, the following boards are supported:
-            T4240 QDS and B4 QDS
+            T208x QDS/RDB, T4240 QDS/RDB and B4 QDS
           The following boards are supported for both 32bit and 64bit kernel:
             P5020 DS, P5040 DS and T104xQDS
 
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index 5db1e117fdde..d22dd85e50bf 100644
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -119,7 +119,11 @@ static const char * const boards[] __initconst = {
         "fsl,P4080DS",
         "fsl,P5020DS",
         "fsl,P5040DS",
+        "fsl,T2080QDS",
+        "fsl,T2080RDB",
+        "fsl,T2081QDS",
         "fsl,T4240QDS",
+        "fsl,T4240RDB",
         "fsl,B4860QDS",
         "fsl,B4420QDS",
         "fsl,B4220QDS",
@@ -129,28 +133,14 @@ static const char * const boards[] __initconst = {
         NULL
 };
 
-static const char * const hv_boards[] __initconst = {
-        "fsl,P2041RDB-hv",
-        "fsl,P3041DS-hv",
-        "fsl,OCA4080-hv",
-        "fsl,P4080DS-hv",
-        "fsl,P5020DS-hv",
-        "fsl,P5040DS-hv",
-        "fsl,T4240QDS-hv",
-        "fsl,B4860QDS-hv",
-        "fsl,B4420QDS-hv",
-        "fsl,B4220QDS-hv",
-        "fsl,T1040QDS-hv",
-        "fsl,T1042QDS-hv",
-        NULL
-};
-
 /*
  * Called very early, device-tree isn't unflattened
  */
 static int __init corenet_generic_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
+        char hv_compat[24];
+        int i;
 #ifdef CONFIG_SMP
         extern struct smp_ops_t smp_85xx_ops;
 #endif
@@ -159,21 +149,26 @@ static int __init corenet_generic_probe(void)
                 return 1;
 
         /* Check if we're running under the Freescale hypervisor */
-        if (of_flat_dt_match(root, hv_boards)) {
-                ppc_md.init_IRQ = ehv_pic_init;
-                ppc_md.get_irq = ehv_pic_get_irq;
-                ppc_md.restart = fsl_hv_restart;
-                ppc_md.power_off = fsl_hv_halt;
-                ppc_md.halt = fsl_hv_halt;
+        for (i = 0; boards[i]; i++) {
+                snprintf(hv_compat, sizeof(hv_compat), "%s-hv", boards[i]);
+                if (of_flat_dt_is_compatible(root, hv_compat)) {
+                        ppc_md.init_IRQ = ehv_pic_init;
+
+                        ppc_md.get_irq = ehv_pic_get_irq;
+                        ppc_md.restart = fsl_hv_restart;
+                        ppc_md.power_off = fsl_hv_halt;
+                        ppc_md.halt = fsl_hv_halt;
 #ifdef CONFIG_SMP
-                /*
-                 * Disable the timebase sync operations because we can't write
-                 * to the timebase registers under the hypervisor.
-                  */
-                smp_85xx_ops.give_timebase = NULL;
-                smp_85xx_ops.take_timebase = NULL;
+                        /*
+                         * Disable the timebase sync operations because we
+                         * can't write to the timebase registers under the
+                         * hypervisor.
+                         */
+                        smp_85xx_ops.give_timebase = NULL;
+                        smp_85xx_ops.take_timebase = NULL;
 #endif
-                return 1;
+                        return 1;
+                }
         }
 
         return 0;
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index ba093f553678..d7c1e69f3070 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -28,6 +28,7 @@
 #include <asm/dbell.h>
 #include <asm/fsl_guts.h>
 #include <asm/code-patching.h>
+#include <asm/cputhreads.h>
 
 #include <sysdev/fsl_soc.h>
 #include <sysdev/mpic.h>
@@ -168,6 +169,24 @@ static inline u32 read_spin_table_addr_l(void *spin_table)
         return in_be32(&((struct epapr_spin_table *)spin_table)->addr_l);
 }
 
+#ifdef CONFIG_PPC64
+static void wake_hw_thread(void *info)
+{
+        void fsl_secondary_thread_init(void);
+        unsigned long imsr1, inia1;
+        int nr = *(const int *)info;
+
+        imsr1 = MSR_KERNEL;
+        inia1 = *(unsigned long *)fsl_secondary_thread_init;
+
+        mttmr(TMRN_IMSR1, imsr1);
+        mttmr(TMRN_INIA1, inia1);
+        mtspr(SPRN_TENS, TEN_THREAD(1));
+
+        smp_generic_kick_cpu(nr);
+}
+#endif
+
 static int smp_85xx_kick_cpu(int nr)
 {
         unsigned long flags;
@@ -183,6 +202,31 @@ static int smp_85xx_kick_cpu(int nr)
 
         pr_debug("smp_85xx_kick_cpu: kick CPU #%d\n", nr);
 
+#ifdef CONFIG_PPC64
+        /* Threads don't use the spin table */
+        if (cpu_thread_in_core(nr) != 0) {
+                int primary = cpu_first_thread_sibling(nr);
+
+                if (WARN_ON_ONCE(!cpu_has_feature(CPU_FTR_SMT)))
+                        return -ENOENT;
+
+                if (cpu_thread_in_core(nr) != 1) {
+                        pr_err("%s: cpu %d: invalid hw thread %d\n",
+                               __func__, nr, cpu_thread_in_core(nr));
+                        return -ENOENT;
+                }
+
+                if (!cpu_online(primary)) {
+                        pr_err("%s: cpu %d: primary %d not online\n",
+                               __func__, nr, primary);
+                        return -ENOENT;
+                }
+
+                smp_call_function_single(primary, wake_hw_thread, &nr, 0);
+                return 0;
+        }
+#endif
+
         np = of_get_cpu_node(nr, NULL);
         cpu_rel_addr = of_get_property(np, "cpu-release-addr", NULL);
 
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 587a2828b06c..d3037747031d 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -18,7 +18,6 @@
 #include <linux/fsl_devices.h>
 
 #include <asm/io.h>
-#include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
 #include <asm/prom.h>
 #include <asm/fs_pd.h>
@@ -28,8 +27,6 @@
 
 #include "mpc8xx.h"
 
-struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
-
 extern int cpm_pic_init(void);
 extern int cpm_get_irq(void);
 
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index c1262581b63c..5921dcb498fd 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -35,7 +35,6 @@
 #include <asm/page.h>
 #include <asm/processor.h>
 #include <asm/time.h>
-#include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
 #include <asm/cpm1.h>
 #include <asm/fs_pd.h>
@@ -46,61 +45,6 @@
 
 static u32 __iomem *bcsr, *bcsr5;
 
-#ifdef CONFIG_PCMCIA_M8XX
-static void pcmcia_hw_setup(int slot, int enable)
-{
-        if (enable)
-                clrbits32(&bcsr[1], BCSR1_PCCEN);
-        else
-                setbits32(&bcsr[1], BCSR1_PCCEN);
-}
-
-static int pcmcia_set_voltage(int slot, int vcc, int vpp)
-{
-        u32 reg = 0;
-
-        switch (vcc) {
-        case 0:
-                break;
-        case 33:
-                reg |= BCSR1_PCCVCC0;
-                break;
-        case 50:
-                reg |= BCSR1_PCCVCC1;
-                break;
-        default:
-                return 1;
-        }
-
-        switch (vpp) {
-        case 0:
-                break;
-        case 33:
-        case 50:
-                if (vcc == vpp)
-                        reg |= BCSR1_PCCVPP1;
-                else
-                        return 1;
-                break;
-        case 120:
-                if ((vcc == 33) || (vcc == 50))
-                        reg |= BCSR1_PCCVPP0;
-                else
-                        return 1;
-        default:
-                return 1;
-        }
-
-        /* first, turn off all power */
-        clrbits32(&bcsr[1], 0x00610000);
-
-        /* enable new powersettings */
-        setbits32(&bcsr[1], reg);
-
-        return 0;
-}
-#endif
-
 struct cpm_pin {
         int port, pin, flags;
 };
@@ -245,12 +189,6 @@ static void __init mpc885ads_setup_arch(void)
                 of_detach_node(np);
                 of_node_put(np);
         }
-
-#ifdef CONFIG_PCMCIA_M8XX
-        /* Set up board specific hook-ups.*/
-        m8xx_pcmcia_ops.hw_ctrl = pcmcia_hw_setup;
-        m8xx_pcmcia_ops.voltage_set = pcmcia_set_voltage;
-#endif
 }
 
 static int __init mpc885ads_probe(void)
diff --git a/arch/powerpc/platforms/8xx/tqm8xx_setup.c b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
index 251aba8759e4..dda607807def 100644
--- a/arch/powerpc/platforms/8xx/tqm8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
@@ -37,7 +37,6 @@
 #include <asm/page.h>
 #include <asm/processor.h>
 #include <asm/time.h>
-#include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
 #include <asm/cpm1.h>
 #include <asm/fs_pd.h>
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index a41bd023647a..e8bc40869cbd 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -61,7 +61,7 @@ choice
         help
           There are two families of 64 bit PowerPC chips supported.
           The most common ones are the desktop and server CPUs
-          (POWER3, RS64, POWER4, POWER5, POWER5+, POWER6, ...)
+          (POWER4, POWER5, 970, POWER5+, POWER6, POWER7, POWER8 ...)
 
           The other are the "embedded" processors compliant with the
           "Book 3E" variant of the architecture
@@ -140,14 +140,6 @@ config 6xx
         depends on PPC32 && PPC_BOOK3S
         select PPC_HAVE_PMU_SUPPORT
 
-config POWER3
-        depends on PPC64 && PPC_BOOK3S
-        def_bool y
-
-config POWER4
-        depends on PPC64 && PPC_BOOK3S
-        def_bool y
-
 config TUNE_CELL
         bool "Optimize for Cell Broadband Engine"
         depends on PPC64 && PPC_BOOK3S
@@ -244,7 +236,7 @@ config PHYS_64BIT
 
 config ALTIVEC
         bool "AltiVec Support"
-        depends on 6xx || POWER4 || (PPC_E500MC && PPC64)
+        depends on 6xx || PPC_BOOK3S_64 || (PPC_E500MC && PPC64)
         ---help---
           This option enables kernel support for the Altivec extensions to the
           PowerPC processor. The kernel currently supports saving and restoring
@@ -260,7 +252,7 @@ config ALTIVEC
 
 config VSX
         bool "VSX Support"
-        depends on POWER4 && ALTIVEC && PPC_FPU
+        depends on PPC_BOOK3S_64 && ALTIVEC && PPC_FPU
         ---help---
 
           This option enables kernel support for the Vector Scaler extensions
@@ -276,7 +268,7 @@ config VSX
 
 config PPC_ICSWX
         bool "Support for PowerPC icswx coprocessor instruction"
-        depends on POWER4
+        depends on PPC_BOOK3S_64
         default n
         ---help---
 
@@ -294,7 +286,7 @@ config PPC_ICSWX
 
 config PPC_ICSWX_PID
         bool "icswx requires direct PID management"
-        depends on PPC_ICSWX && POWER4
+        depends on PPC_ICSWX
         default y
         ---help---
           The PID register in server is used explicitly for ICSWX.  In
diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c
index 03aabc0e16ac..2fe12046279e 100644
--- a/arch/powerpc/platforms/amigaone/setup.c
+++ b/arch/powerpc/platforms/amigaone/setup.c
@@ -24,6 +24,7 @@
 #include <asm/i8259.h>
 #include <asm/time.h>
 #include <asm/udbg.h>
+#include <asm/dma.h>
 
 extern void __flush_disable_L1(void);
 
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index f85db3a69b4a..2930d1e81a05 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -611,7 +611,6 @@ static int __init create_spu(void *data)
         int ret;
         static int number;
         unsigned long flags;
-        struct timespec ts;
 
         ret = -ENOMEM;
         spu = kzalloc(sizeof (*spu), GFP_KERNEL);
@@ -652,8 +651,7 @@ static int __init create_spu(void *data)
         mutex_unlock(&spu_full_list_mutex);
 
         spu->stats.util_state = SPU_UTIL_IDLE_LOADED;
-        ktime_get_ts(&ts);
-        spu->stats.tstamp = timespec_to_ns(&ts);
+        spu->stats.tstamp = ktime_get_ns();
 
         INIT_LIST_HEAD(&spu->aff_list);
 
@@ -676,7 +674,6 @@ static const char *spu_state_names[] = {
 static unsigned long long spu_acct_time(struct spu *spu,
                 enum spu_utilization_state state)
 {
-        struct timespec ts;
         unsigned long long time = spu->stats.times[state];
 
         /*
@@ -684,10 +681,8 @@ static unsigned long long spu_acct_time(struct spu *spu,
          * statistics are not updated.  Apply the time delta from the
          * last recorded state of the spu.
          */
-        if (spu->stats.util_state == state) {
-                ktime_get_ts(&ts);
-                time += timespec_to_ns(&ts) - spu->stats.tstamp;
-        }
+        if (spu->stats.util_state == state)
+                time += ktime_get_ns() - spu->stats.tstamp;
 
         return time / NSEC_PER_MSEC;
 }
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 9c6790d17eda..3b4152faeb1f 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -36,7 +36,6 @@ atomic_t nr_spu_contexts = ATOMIC_INIT(0);
 struct spu_context *alloc_spu_context(struct spu_gang *gang)
 {
         struct spu_context *ctx;
-        struct timespec ts;
 
         ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
         if (!ctx)
@@ -67,8 +66,7 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
         __spu_update_sched_info(ctx);
         spu_set_timeslice(ctx);
         ctx->stats.util_state = SPU_UTIL_IDLE_LOADED;
-        ktime_get_ts(&ts);
-        ctx->stats.tstamp = timespec_to_ns(&ts);
+        ctx->stats.tstamp = ktime_get_ns();
 
         atomic_inc(&nr_spu_contexts);
         goto out;
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 90986923a53a..d966bbe58b8f 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -2338,7 +2338,6 @@ static const char *ctx_state_names[] = {
 static unsigned long long spufs_acct_time(struct spu_context *ctx,
                 enum spu_utilization_state state)
 {
-        struct timespec ts;
         unsigned long long time = ctx->stats.times[state];
 
         /*
@@ -2351,8 +2350,7 @@ static unsigned long long spufs_acct_time(struct spu_context *ctx,
          * of the spu context.
          */
         if (ctx->spu && ctx->stats.util_state == state) {
-                ktime_get_ts(&ts);
-                time += timespec_to_ns(&ts) - ctx->stats.tstamp;
+                time += ktime_get_ns() - ctx->stats.tstamp;
         }
 
         return time / NSEC_PER_MSEC;
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 4a0a64fe25df..998f632e7cce 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -1039,13 +1039,11 @@ void spuctx_switch_state(struct spu_context *ctx,
 {
         unsigned long long curtime;
         signed long long delta;
-        struct timespec ts;
         struct spu *spu;
         enum spu_utilization_state old_state;
         int node;
 
-        ktime_get_ts(&ts);
-        curtime = timespec_to_ns(&ts);
+        curtime = ktime_get_ns();
         delta = curtime - ctx->stats.tstamp;
 
         WARN_ON(!mutex_is_locked(&ctx->state_mutex));
diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
index 1afd10f67858..607124bae2e7 100644
--- a/arch/powerpc/platforms/powermac/Kconfig
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -10,7 +10,7 @@ config PPC_PMAC
 
 config PPC_PMAC64
         bool
-        depends on PPC_PMAC && POWER4
+        depends on PPC_PMAC && PPC64
         select MPIC
         select U3_DART
         select MPIC_U3_HT_IRQS
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 63d82bbc05e9..4882bfd90e27 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -158,7 +158,7 @@ static inline int simple_feature_tweak(struct device_node *node, int type,
         return 0;
 }
 
-#ifndef CONFIG_POWER4
+#ifndef CONFIG_PPC64
 
 static long ohare_htw_scc_enable(struct device_node *node, long param,
                                  long value)
@@ -1318,7 +1318,7 @@ intrepid_aack_delay_enable(struct device_node *node, long param, long value)
 }
 
 
-#endif /* CONFIG_POWER4 */
+#endif /* CONFIG_PPC64 */
 
 static long
 core99_read_gpio(struct device_node *node, long param, long value)
@@ -1338,7 +1338,7 @@ core99_write_gpio(struct device_node *node, long param, long value)
         return 0;
 }
 
-#ifdef CONFIG_POWER4
+#ifdef CONFIG_PPC64
 static long g5_gmac_enable(struct device_node *node, long param, long value)
 {
         struct macio_chip *macio = &macio_chips[0];
@@ -1550,9 +1550,9 @@ void g5_phy_disable_cpu1(void)
         if (uninorth_maj == 3)
                 UN_OUT(U3_API_PHY_CONFIG_1, 0);
 }
-#endif /* CONFIG_POWER4 */
+#endif /* CONFIG_PPC64 */
 
-#ifndef CONFIG_POWER4
+#ifndef CONFIG_PPC64
 
 
 #ifdef CONFIG_PM
@@ -1864,7 +1864,7 @@ core99_sleep_state(struct device_node *node, long param, long value)
         return 0;
 }
 
-#endif /* CONFIG_POWER4 */
+#endif /* CONFIG_PPC64 */
 
 static long
 generic_dev_can_wake(struct device_node *node, long param, long value)
@@ -1906,7 +1906,7 @@ static struct feature_table_entry any_features[] = {
         { 0, NULL }
 };
 
-#ifndef CONFIG_POWER4
+#ifndef CONFIG_PPC64
 
 /* OHare based motherboards. Currently, we only use these on the
  * 2400,3400 and 3500 series powerbooks. Some older desktops seem
@@ -2056,7 +2056,7 @@ static struct feature_table_entry intrepid_features[] = {
         { 0, NULL }
 };
 
-#else /* CONFIG_POWER4 */
+#else /* CONFIG_PPC64 */
 
 /* G5 features
  */
@@ -2074,10 +2074,10 @@ static struct feature_table_entry g5_features[] = {
         { 0, NULL }
 };
 
-#endif /* CONFIG_POWER4 */
+#endif /* CONFIG_PPC64 */
 
 static struct pmac_mb_def pmac_mb_defs[] = {
-#ifndef CONFIG_POWER4
+#ifndef CONFIG_PPC64
         /*
          * Desktops
          */
@@ -2342,7 +2342,7 @@ static struct pmac_mb_def pmac_mb_defs[] = {
                 PMAC_TYPE_UNKNOWN_INTREPID,     intrepid_features,
                 PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE,
         },
-#else /* CONFIG_POWER4 */
+#else /* CONFIG_PPC64 */
         {       "PowerMac7,2",                  "PowerMac G5",
                 PMAC_TYPE_POWERMAC_G5,          g5_features,
                 0,
@@ -2373,7 +2373,7 @@ static struct pmac_mb_def pmac_mb_defs[] = {
                 0,
         },
 #endif /* CONFIG_PPC64 */
-#endif /* CONFIG_POWER4 */
+#endif /* CONFIG_PPC64 */
 };
 
 /*
@@ -2441,7 +2441,7 @@ static int __init probe_motherboard(void)
 
         /* Fallback to selection depending on mac-io chip type */
         switch(macio->type) {
-#ifndef CONFIG_POWER4
+#ifndef CONFIG_PPC64
             case macio_grand_central:
                 pmac_mb.model_id = PMAC_TYPE_PSURGE;
                 pmac_mb.model_name = "Unknown PowerSurge";
@@ -2475,7 +2475,7 @@ static int __init probe_motherboard(void)
                 pmac_mb.model_name = "Unknown Intrepid-based";
                 pmac_mb.features = intrepid_features;
                 break;
-#else /* CONFIG_POWER4 */
+#else /* CONFIG_PPC64 */
         case macio_keylargo2:
                 pmac_mb.model_id = PMAC_TYPE_UNKNOWN_K2;
                 pmac_mb.model_name = "Unknown K2-based";
@@ -2486,13 +2486,13 @@ static int __init probe_motherboard(void)
                 pmac_mb.model_name = "Unknown Shasta-based";
                 pmac_mb.features = g5_features;
                 break;
-#endif /* CONFIG_POWER4 */
+#endif /* CONFIG_PPC64 */
         default:
                 ret = -ENODEV;
                 goto done;
         }
 found:
-#ifndef CONFIG_POWER4
+#ifndef CONFIG_PPC64
         /* Fixup Hooper vs. Comet */
         if (pmac_mb.model_id == PMAC_TYPE_HOOPER) {
                 u32 __iomem * mach_id_ptr = ioremap(0xf3000034, 4);
@@ -2546,9 +2546,9 @@ found:
          */
         powersave_lowspeed = 1;
 
-#else /* CONFIG_POWER4 */
+#else /* CONFIG_PPC64 */
         powersave_nap = 1;
-#endif  /* CONFIG_POWER4 */
+#endif  /* CONFIG_PPC64 */
 
         /* Check for "mobile" machine */
         if (model && (strncmp(model, "PowerBook", 9) == 0
@@ -2786,7 +2786,7 @@ set_initial_features(void)
                 MACIO_BIS(OHARE_FCR, OH_IOBUS_ENABLE);
         }
 
-#ifdef CONFIG_POWER4
+#ifdef CONFIG_PPC64
         if (macio_chips[0].type == macio_keylargo2 ||
             macio_chips[0].type == macio_shasta) {
 #ifndef CONFIG_SMP
@@ -2805,28 +2805,23 @@ set_initial_features(void)
                 /* Enable GMAC for now for PCI probing. It will be disabled
                  * later on after PCI probe
                  */
-                np = of_find_node_by_name(NULL, "ethernet");
-                while(np) {
+                for_each_node_by_name(np, "ethernet")
                         if (of_device_is_compatible(np, "K2-GMAC"))
                                 g5_gmac_enable(np, 0, 1);
-                        np = of_find_node_by_name(np, "ethernet");
-                }
 
                 /* Enable FW before PCI probe. Will be disabled later on
                  * Note: We should have a batter way to check that we are
                  * dealing with uninorth internal cell and not a PCI cell
                  * on the external PCI. The code below works though.
                  */
-                np = of_find_node_by_name(NULL, "firewire");
-                while(np) {
+                for_each_node_by_name(np, "firewire") {
                         if (of_device_is_compatible(np, "pci106b,5811")) {
                                 macio_chips[0].flags |= MACIO_FLAG_FW_SUPPORTED;
                                 g5_fw_enable(np, 0, 1);
                         }
-                        np = of_find_node_by_name(np, "firewire");
                 }
         }
-#else /* CONFIG_POWER4 */
+#else /* CONFIG_PPC64 */
 
         if (macio_chips[0].type == macio_keylargo ||
             macio_chips[0].type == macio_pangea ||
@@ -2834,13 +2829,11 @@ set_initial_features(void)
                 /* Enable GMAC for now for PCI probing. It will be disabled
                  * later on after PCI probe
                  */
-                np = of_find_node_by_name(NULL, "ethernet");
-                while(np) {
+                for_each_node_by_name(np, "ethernet") {
                         if (np->parent
                             && of_device_is_compatible(np->parent, "uni-north")
                             && of_device_is_compatible(np, "gmac"))
                                 core99_gmac_enable(np, 0, 1);
-                        np = of_find_node_by_name(np, "ethernet");
                 }
 
                 /* Enable FW before PCI probe. Will be disabled later on
@@ -2848,8 +2841,7 @@ set_initial_features(void)
                  * dealing with uninorth internal cell and not a PCI cell
                  * on the external PCI. The code below works though.
                  */
-                np = of_find_node_by_name(NULL, "firewire");
-                while(np) {
+                for_each_node_by_name(np, "firewire") {
                         if (np->parent
                             && of_device_is_compatible(np->parent, "uni-north")
                             && (of_device_is_compatible(np, "pci106b,18") ||
@@ -2858,18 +2850,16 @@ set_initial_features(void)
                                 macio_chips[0].flags |= MACIO_FLAG_FW_SUPPORTED;
                                 core99_firewire_enable(np, 0, 1);
                         }
-                        np = of_find_node_by_name(np, "firewire");
                 }
 
                 /* Enable ATA-100 before PCI probe. */
                 np = of_find_node_by_name(NULL, "ata-6");
-                while(np) {
+                for_each_node_by_name(np, "ata-6") {
                         if (np->parent
                             && of_device_is_compatible(np->parent, "uni-north")
                             && of_device_is_compatible(np, "kauai-ata")) {
                                 core99_ata100_enable(np, 1);
                         }
-                        np = of_find_node_by_name(np, "ata-6");
                 }
 
                 /* Switch airport off */
@@ -2895,7 +2885,7 @@ set_initial_features(void)
                 MACIO_BIC(HEATHROW_FCR, HRW_SOUND_POWER_N);
         }
 
-#endif /* CONFIG_POWER4 */
+#endif /* CONFIG_PPC64 */
 
         /* On all machines, switch modem & serial ports off */
         for_each_node_by_name(np, "ch-a")
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index cf7009b8c7b6..7e868ccf3b0d 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -698,7 +698,7 @@ static void __init fixup_nec_usb2(void)
 {
         struct device_node *nec;
 
-        for (nec = NULL; (nec = of_find_node_by_name(nec, "usb")) != NULL;) {
+        for_each_node_by_name(nec, "usb") {
                 struct pci_controller *hose;
                 u32 data;
                 const u32 *prop;
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 5cbd4d67d5c4..af094ae03dbb 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -577,7 +577,7 @@ static void __init smp_core99_setup_i2c_hwsync(int ncpus)
         int ok;
 
         /* Look for the clock chip */
-        while ((cc = of_find_node_by_name(cc, "i2c-hwclock")) != NULL) {
+        for_each_node_by_name(cc, "i2c-hwclock") {
                 p = of_get_parent(cc);
                 ok = p && of_device_is_compatible(p, "uni-n-i2c");
                 of_node_put(p);
diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c
index 44e0b55a2a02..366bd221edec 100644
--- a/arch/powerpc/platforms/powermac/udbg_adb.c
+++ b/arch/powerpc/platforms/powermac/udbg_adb.c
@@ -191,7 +191,7 @@ int __init udbg_adb_init(int force_btext)
          * of type "adb". If not, we return a failure, but we keep the
          * bext output set for now
          */
-        for (np = NULL; (np = of_find_node_by_name(np, "keyboard")) != NULL;) {
+        for_each_node_by_name(np, "keyboard") {
                 struct device_node *parent = of_get_parent(np);
                 int found = (parent && strcmp(parent->type, "adb") == 0);
                 of_node_put(parent);
diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile
index 4ad227d04c1a..f241accc053d 100644
--- a/arch/powerpc/platforms/powernv/Makefile
+++ b/arch/powerpc/platforms/powernv/Makefile
@@ -1,10 +1,11 @@
 obj-y                   += setup.o opal-wrappers.o opal.o opal-async.o
 obj-y                   += opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o
 obj-y                   += rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o
-obj-y                   += opal-msglog.o
+obj-y                   += opal-msglog.o opal-hmi.o
 
 obj-$(CONFIG_SMP)       += smp.o subcore.o subcore-asm.o
 obj-$(CONFIG_PCI)       += pci.o pci-p5ioc2.o pci-ioda.o
 obj-$(CONFIG_EEH)       += eeh-ioda.o eeh-powernv.o
 obj-$(CONFIG_PPC_SCOM)  += opal-xscom.o
 obj-$(CONFIG_MEMORY_FAILURE)    += opal-memory-errors.o
+obj-$(CONFIG_TRACEPOINTS)       += opal-tracepoints.o
diff --git a/arch/powerpc/platforms/powernv/eeh-ioda.c b/arch/powerpc/platforms/powernv/eeh-ioda.c
index 8ad0c5b891f4..c945bed4dc9e 100644
--- a/arch/powerpc/platforms/powernv/eeh-ioda.c
+++ b/arch/powerpc/platforms/powernv/eeh-ioda.c
@@ -187,10 +187,10 @@ static int ioda_eeh_post_init(struct pci_controller *hose)
  */
 static int ioda_eeh_set_option(struct eeh_pe *pe, int option)
 {
-        s64 ret;
-        u32 pe_no;
         struct pci_controller *hose = pe->phb;
         struct pnv_phb *phb = hose->private_data;
+        int enable, ret = 0;
+        s64 rc;
 
         /* Check on PE number */
         if (pe->addr < 0 || pe->addr >= phb->ioda.total_pe) {
@@ -201,184 +201,214 @@ static int ioda_eeh_set_option(struct eeh_pe *pe, int option)
                 return -EINVAL;
         }
 
-        pe_no = pe->addr;
         switch (option) {
         case EEH_OPT_DISABLE:
-                ret = -EEXIST;
-                break;
+                return -EPERM;
         case EEH_OPT_ENABLE:
-                ret = 0;
-                break;
+                return 0;
         case EEH_OPT_THAW_MMIO:
-                ret = opal_pci_eeh_freeze_clear(phb->opal_id, pe_no,
-                                OPAL_EEH_ACTION_CLEAR_FREEZE_MMIO);
-                if (ret) {
-                        pr_warning("%s: Failed to enable MMIO for "
-                                   "PHB#%x-PE#%x, err=%lld\n",
-                                __func__, hose->global_number, pe_no, ret);
-                        return -EIO;
-                }
-
+                enable = OPAL_EEH_ACTION_CLEAR_FREEZE_MMIO;
                 break;
         case EEH_OPT_THAW_DMA:
-                ret = opal_pci_eeh_freeze_clear(phb->opal_id, pe_no,
-                                OPAL_EEH_ACTION_CLEAR_FREEZE_DMA);
-                if (ret) {
-                        pr_warning("%s: Failed to enable DMA for "
-                                   "PHB#%x-PE#%x, err=%lld\n",
-                                __func__, hose->global_number, pe_no, ret);
-                        return -EIO;
-                }
-
+                enable = OPAL_EEH_ACTION_CLEAR_FREEZE_DMA;
                 break;
         default:
-                pr_warning("%s: Invalid option %d\n", __func__, option);
+                pr_warn("%s: Invalid option %d\n",
+                        __func__, option);
                 return -EINVAL;
         }
 
+        /* If PHB supports compound PE, to handle it */
+        if (phb->unfreeze_pe) {
+                ret = phb->unfreeze_pe(phb, pe->addr, enable);
+        } else {
+                rc = opal_pci_eeh_freeze_clear(phb->opal_id,
+                                               pe->addr,
+                                               enable);
+                if (rc != OPAL_SUCCESS) {
+                        pr_warn("%s: Failure %lld enable %d for PHB#%x-PE#%x\n",
+                                __func__, rc, option, phb->hose->global_number,
+                                pe->addr);
+                        ret = -EIO;
+                }
+        }
+
         return ret;
 }
 
-static void ioda_eeh_phb_diag(struct pci_controller *hose)
+static void ioda_eeh_phb_diag(struct eeh_pe *pe)
 {
-        struct pnv_phb *phb = hose->private_data;
+        struct pnv_phb *phb = pe->phb->private_data;
         long rc;
 
-        rc = opal_pci_get_phb_diag_data2(phb->opal_id, phb->diag.blob,
+        rc = opal_pci_get_phb_diag_data2(phb->opal_id, pe->data,
                                          PNV_PCI_DIAG_BUF_SIZE);
-        if (rc != OPAL_SUCCESS) {
-                pr_warning("%s: Failed to get diag-data for PHB#%x (%ld)\n",
-                            __func__, hose->global_number, rc);
-                return;
-        }
-
-        pnv_pci_dump_phb_diag_data(hose, phb->diag.blob);
+        if (rc != OPAL_SUCCESS)
+                pr_warn("%s: Failed to get diag-data for PHB#%x (%ld)\n",
+                        __func__, pe->phb->global_number, rc);
 }
 
-/**
- * ioda_eeh_get_state - Retrieve the state of PE
- * @pe: EEH PE
- *
- * The PE's state should be retrieved from the PEEV, PEST
- * IODA tables. Since the OPAL has exported the function
- * to do it, it'd better to use that.
- */
-static int ioda_eeh_get_state(struct eeh_pe *pe)
+static int ioda_eeh_get_phb_state(struct eeh_pe *pe)
 {
-        s64 ret = 0;
+        struct pnv_phb *phb = pe->phb->private_data;
         u8 fstate;
         __be16 pcierr;
-        u32 pe_no;
-        int result;
-        struct pci_controller *hose = pe->phb;
-        struct pnv_phb *phb = hose->private_data;
+        s64 rc;
+        int result = 0;
+
+        rc = opal_pci_eeh_freeze_status(phb->opal_id,
+                                        pe->addr,
+                                        &fstate,
+                                        &pcierr,
+                                        NULL);
+        if (rc != OPAL_SUCCESS) {
+                pr_warn("%s: Failure %lld getting PHB#%x state\n",
+                        __func__, rc, phb->hose->global_number);
+                return EEH_STATE_NOT_SUPPORT;
+        }
 
         /*
-         * Sanity check on PE address. The PHB PE address should
-         * be zero.
+         * Check PHB state. If the PHB is frozen for the
+         * first time, to dump the PHB diag-data.
          */
-        if (pe->addr < 0 || pe->addr >= phb->ioda.total_pe) {
-                pr_err("%s: PE address %x out of range [0, %x] "
-                       "on PHB#%x\n",
-                       __func__, pe->addr, phb->ioda.total_pe,
-                       hose->global_number);
-                return EEH_STATE_NOT_SUPPORT;
+        if (be16_to_cpu(pcierr) != OPAL_EEH_PHB_ERROR) {
+                result = (EEH_STATE_MMIO_ACTIVE  |
+                          EEH_STATE_DMA_ACTIVE   |
+                          EEH_STATE_MMIO_ENABLED |
+                          EEH_STATE_DMA_ENABLED);
+        } else if (!(pe->state & EEH_PE_ISOLATED)) {
+                eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
+                ioda_eeh_phb_diag(pe);
         }
 
+        return result;
+}
+
+static int ioda_eeh_get_pe_state(struct eeh_pe *pe)
+{
+        struct pnv_phb *phb = pe->phb->private_data;
+        u8 fstate;
+        __be16 pcierr;
+        s64 rc;
+        int result;
+
         /*
-         * If we're in middle of PE reset, return normal
-         * state to keep EEH core going. For PHB reset, we
-         * still expect to have fenced PHB cleared with
-         * PHB reset.
+         * We don't clobber hardware frozen state until PE
+         * reset is completed. In order to keep EEH core
+         * moving forward, we have to return operational
+         * state during PE reset.
          */
-        if (!(pe->type & EEH_PE_PHB) &&
-            (pe->state & EEH_PE_RESET)) {
-                result = (EEH_STATE_MMIO_ACTIVE |
-                          EEH_STATE_DMA_ACTIVE |
+        if (pe->state & EEH_PE_RESET) {
+                result = (EEH_STATE_MMIO_ACTIVE  |
+                          EEH_STATE_DMA_ACTIVE   |
                           EEH_STATE_MMIO_ENABLED |
                           EEH_STATE_DMA_ENABLED);
                 return result;
         }
 
-        /* Retrieve PE status through OPAL */
-        pe_no = pe->addr;
-        ret = opal_pci_eeh_freeze_status(phb->opal_id, pe_no,
-                        &fstate, &pcierr, NULL);
-        if (ret) {
-                pr_err("%s: Failed to get EEH status on "
-                       "PHB#%x-PE#%x\n, err=%lld\n",
-                       __func__, hose->global_number, pe_no, ret);
-                return EEH_STATE_NOT_SUPPORT;
-        }
-
-        /* Check PHB status */
-        if (pe->type & EEH_PE_PHB) {
-                result = 0;
-                result &= ~EEH_STATE_RESET_ACTIVE;
-
-                if (be16_to_cpu(pcierr) != OPAL_EEH_PHB_ERROR) {
-                        result |= EEH_STATE_MMIO_ACTIVE;
-                        result |= EEH_STATE_DMA_ACTIVE;
-                        result |= EEH_STATE_MMIO_ENABLED;
-                        result |= EEH_STATE_DMA_ENABLED;
-                } else if (!(pe->state & EEH_PE_ISOLATED)) {
-                        eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
-                        ioda_eeh_phb_diag(hose);
+        /*
+         * Fetch PE state from hardware. If the PHB
+         * supports compound PE, let it handle that.
+         */
+        if (phb->get_pe_state) {
+                fstate = phb->get_pe_state(phb, pe->addr);
+        } else {
+                rc = opal_pci_eeh_freeze_status(phb->opal_id,
+                                                pe->addr,
+                                                &fstate,
+                                                &pcierr,
+                                                NULL);
+                if (rc != OPAL_SUCCESS) {
+                        pr_warn("%s: Failure %lld getting PHB#%x-PE%x state\n",
+                                __func__, rc, phb->hose->global_number, pe->addr);
+                        return EEH_STATE_NOT_SUPPORT;
                 }
-
-                return result;
         }
 
-        /* Parse result out */
-        result = 0;
+        /* Figure out state */
         switch (fstate) {
         case OPAL_EEH_STOPPED_NOT_FROZEN:
-                result &= ~EEH_STATE_RESET_ACTIVE;
-                result |= EEH_STATE_MMIO_ACTIVE;
-                result |= EEH_STATE_DMA_ACTIVE;
-                result |= EEH_STATE_MMIO_ENABLED;
-                result |= EEH_STATE_DMA_ENABLED;
+                result = (EEH_STATE_MMIO_ACTIVE  |
+                          EEH_STATE_DMA_ACTIVE   |
+                          EEH_STATE_MMIO_ENABLED |
+                          EEH_STATE_DMA_ENABLED);
                 break;
         case OPAL_EEH_STOPPED_MMIO_FREEZE:
-                result &= ~EEH_STATE_RESET_ACTIVE;
-                result |= EEH_STATE_DMA_ACTIVE;
-                result |= EEH_STATE_DMA_ENABLED;
+                result = (EEH_STATE_DMA_ACTIVE |
+                          EEH_STATE_DMA_ENABLED);
                 break;
         case OPAL_EEH_STOPPED_DMA_FREEZE:
-                result &= ~EEH_STATE_RESET_ACTIVE;
-                result |= EEH_STATE_MMIO_ACTIVE;
-                result |= EEH_STATE_MMIO_ENABLED;
+                result = (EEH_STATE_MMIO_ACTIVE |
+                          EEH_STATE_MMIO_ENABLED);
                 break;
         case OPAL_EEH_STOPPED_MMIO_DMA_FREEZE:
-                result &= ~EEH_STATE_RESET_ACTIVE;
+                result = 0;
                 break;
         case OPAL_EEH_STOPPED_RESET:
-                result |= EEH_STATE_RESET_ACTIVE;
+                result = EEH_STATE_RESET_ACTIVE;
                 break;
         case OPAL_EEH_STOPPED_TEMP_UNAVAIL:
-                result |= EEH_STATE_UNAVAILABLE;
+                result = EEH_STATE_UNAVAILABLE;
                 break;
         case OPAL_EEH_STOPPED_PERM_UNAVAIL:
-                result |= EEH_STATE_NOT_SUPPORT;
+                result = EEH_STATE_NOT_SUPPORT;
                 break;
         default:
-                pr_warning("%s: Unexpected EEH status 0x%x "
-                           "on PHB#%x-PE#%x\n",
-                           __func__, fstate, hose->global_number, pe_no);
+                result = EEH_STATE_NOT_SUPPORT;
+                pr_warn("%s: Invalid PHB#%x-PE#%x state %x\n",
+                        __func__, phb->hose->global_number,
+                        pe->addr, fstate);
         }
 
-        /* Dump PHB diag-data for frozen PE */
-        if (result != EEH_STATE_NOT_SUPPORT &&
-            (result & (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE)) !=
-            (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE) &&
+        /*
+         * If PHB supports compound PE, to freeze all
+         * slave PEs for consistency.
+         *
+         * If the PE is switching to frozen state for the
+         * first time, to dump the PHB diag-data.
+         */
+        if (!(result & EEH_STATE_NOT_SUPPORT) &&
+            !(result & EEH_STATE_UNAVAILABLE) &&
+            !(result & EEH_STATE_MMIO_ACTIVE) &&
+            !(result & EEH_STATE_DMA_ACTIVE)  &&
             !(pe->state & EEH_PE_ISOLATED)) {
+                if (phb->freeze_pe)
+                        phb->freeze_pe(phb, pe->addr);
+
                 eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
-                ioda_eeh_phb_diag(hose);
+                ioda_eeh_phb_diag(pe);
         }
 
         return result;
 }
 
+/**
+ * ioda_eeh_get_state - Retrieve the state of PE
+ * @pe: EEH PE
+ *
+ * The PE's state should be retrieved from the PEEV, PEST
+ * IODA tables. Since the OPAL has exported the function
+ * to do it, it'd better to use that.
+ */
+static int ioda_eeh_get_state(struct eeh_pe *pe)
+{
+        struct pnv_phb *phb = pe->phb->private_data;
+
+        /* Sanity check on PE number. PHB PE should have 0 */
+        if (pe->addr < 0 ||
+            pe->addr >= phb->ioda.total_pe) {
+                pr_warn("%s: PHB#%x-PE#%x out of range [0, %x]\n",
+                        __func__, phb->hose->global_number,
+                        pe->addr, phb->ioda.total_pe);
+                return EEH_STATE_NOT_SUPPORT;
+        }
+
+        if (pe->type & EEH_PE_PHB)
+                return ioda_eeh_get_phb_state(pe);
+
+        return ioda_eeh_get_pe_state(pe);
+}
+
 static s64 ioda_eeh_phb_poll(struct pnv_phb *phb)
 {
         s64 rc = OPAL_HARDWARE;
@@ -589,6 +619,24 @@ static int ioda_eeh_reset(struct eeh_pe *pe, int option)
 }
 
 /**
+ * ioda_eeh_get_log - Retrieve error log
+ * @pe: frozen PE
+ * @severity: permanent or temporary error
+ * @drv_log: device driver log
+ * @len: length of device driver log
+ *
+ * Retrieve error log, which contains log from device driver
+ * and firmware.
+ */
+int ioda_eeh_get_log(struct eeh_pe *pe, int severity,
+                     char *drv_log, unsigned long len)
+{
+        pnv_pci_dump_phb_diag_data(pe->phb, pe->data);
+
+        return 0;
+}
+
+/**
  * ioda_eeh_configure_bridge - Configure the PCI bridges for the indicated PE
  * @pe: EEH PE
  *
@@ -605,18 +653,24 @@ static int ioda_eeh_configure_bridge(struct eeh_pe *pe)
 static void ioda_eeh_hub_diag_common(struct OpalIoP7IOCErrorData *data)
 {
         /* GEM */
-        pr_info("  GEM XFIR:        %016llx\n", data->gemXfir);
-        pr_info("  GEM RFIR:        %016llx\n", data->gemRfir);
-        pr_info("  GEM RIRQFIR:     %016llx\n", data->gemRirqfir);
-        pr_info("  GEM Mask:        %016llx\n", data->gemMask);
-        pr_info("  GEM RWOF:        %016llx\n", data->gemRwof);
+        if (data->gemXfir || data->gemRfir ||
+            data->gemRirqfir || data->gemMask || data->gemRwof)
+                pr_info("  GEM: %016llx %016llx %016llx %016llx %016llx\n",
+                        be64_to_cpu(data->gemXfir),
+                        be64_to_cpu(data->gemRfir),
+                        be64_to_cpu(data->gemRirqfir),
+                        be64_to_cpu(data->gemMask),
+                        be64_to_cpu(data->gemRwof));
 
         /* LEM */
-        pr_info("  LEM FIR:         %016llx\n", data->lemFir);
-        pr_info("  LEM Error Mask:  %016llx\n", data->lemErrMask);
-        pr_info("  LEM Action 0:    %016llx\n", data->lemAction0);
-        pr_info("  LEM Action 1:    %016llx\n", data->lemAction1);
-        pr_info("  LEM WOF:         %016llx\n", data->lemWof);
+        if (data->lemFir || data->lemErrMask ||
+            data->lemAction0 || data->lemAction1 || data->lemWof)
+                pr_info("  LEM: %016llx %016llx %016llx %016llx %016llx\n",
+                        be64_to_cpu(data->lemFir),
+                        be64_to_cpu(data->lemErrMask),
+                        be64_to_cpu(data->lemAction0),
+                        be64_to_cpu(data->lemAction1),
+                        be64_to_cpu(data->lemWof));
 }
 
 static void ioda_eeh_hub_diag(struct pci_controller *hose)
@@ -627,8 +681,8 @@ static void ioda_eeh_hub_diag(struct pci_controller *hose)
 
         rc = opal_pci_get_hub_diag_data(phb->hub_id, data, sizeof(*data));
         if (rc != OPAL_SUCCESS) {
-                pr_warning("%s: Failed to get HUB#%llx diag-data (%ld)\n",
-                           __func__, phb->hub_id, rc);
+                pr_warn("%s: Failed to get HUB#%llx diag-data (%ld)\n",
+                        __func__, phb->hub_id, rc);
                 return;
         }
 
@@ -636,24 +690,31 @@ static void ioda_eeh_hub_diag(struct pci_controller *hose)
         case OPAL_P7IOC_DIAG_TYPE_RGC:
                 pr_info("P7IOC diag-data for RGC\n\n");
                 ioda_eeh_hub_diag_common(data);
-                pr_info("  RGC Status:      %016llx\n", data->rgc.rgcStatus);
-                pr_info("  RGC LDCP:        %016llx\n", data->rgc.rgcLdcp);
+                if (data->rgc.rgcStatus || data->rgc.rgcLdcp)
+                        pr_info("  RGC: %016llx %016llx\n",
+                                be64_to_cpu(data->rgc.rgcStatus),
+                                be64_to_cpu(data->rgc.rgcLdcp));
                 break;
         case OPAL_P7IOC_DIAG_TYPE_BI:
                 pr_info("P7IOC diag-data for BI %s\n\n",
                         data->bi.biDownbound ? "Downbound" : "Upbound");
                 ioda_eeh_hub_diag_common(data);
-                pr_info("  BI LDCP 0:       %016llx\n", data->bi.biLdcp0);
-                pr_info("  BI LDCP 1:       %016llx\n", data->bi.biLdcp1);
-                pr_info("  BI LDCP 2:       %016llx\n", data->bi.biLdcp2);
-                pr_info("  BI Fence Status: %016llx\n", data->bi.biFenceStatus);
+                if (data->bi.biLdcp0 || data->bi.biLdcp1 ||
+                    data->bi.biLdcp2 || data->bi.biFenceStatus)
+                        pr_info("  BI:  %016llx %016llx %016llx %016llx\n",
+                                be64_to_cpu(data->bi.biLdcp0),
+                                be64_to_cpu(data->bi.biLdcp1),
+                                be64_to_cpu(data->bi.biLdcp2),
+                                be64_to_cpu(data->bi.biFenceStatus));
                 break;
         case OPAL_P7IOC_DIAG_TYPE_CI:
-                pr_info("P7IOC diag-data for CI Port %d\\nn",
+                pr_info("P7IOC diag-data for CI Port %d\n\n",
                         data->ci.ciPort);
                 ioda_eeh_hub_diag_common(data);
-                pr_info("  CI Port Status:  %016llx\n", data->ci.ciPortStatus);
-                pr_info("  CI Port LDCP:    %016llx\n", data->ci.ciPortLdcp);
+                if (data->ci.ciPortStatus || data->ci.ciPortLdcp)
+                        pr_info("  CI:  %016llx %016llx\n",
+                                be64_to_cpu(data->ci.ciPortStatus),
+                                be64_to_cpu(data->ci.ciPortLdcp));
                 break;
         case OPAL_P7IOC_DIAG_TYPE_MISC:
                 pr_info("P7IOC diag-data for MISC\n\n");
@@ -664,30 +725,51 @@ static void ioda_eeh_hub_diag(struct pci_controller *hose)
                 ioda_eeh_hub_diag_common(data);
                 break;
         default:
-                pr_warning("%s: Invalid type of HUB#%llx diag-data (%d)\n",
-                           __func__, phb->hub_id, data->type);
+                pr_warn("%s: Invalid type of HUB#%llx diag-data (%d)\n",
+                        __func__, phb->hub_id, data->type);
         }
 }
 
 static int ioda_eeh_get_pe(struct pci_controller *hose,
                            u16 pe_no, struct eeh_pe **pe)
 {
-        struct eeh_pe *phb_pe, *dev_pe;
-        struct eeh_dev dev;
+        struct pnv_phb *phb = hose->private_data;
+        struct pnv_ioda_pe *pnv_pe;
+        struct eeh_pe *dev_pe;
+        struct eeh_dev edev;
 
-        /* Find the PHB PE */
-        phb_pe = eeh_phb_pe_get(hose);
-        if (!phb_pe)
-                return -EEXIST;
+        /*
+         * If PHB supports compound PE, to fetch
+         * the master PE because slave PE is invisible
+         * to EEH core.
+         */
+        if (phb->get_pe_state) {
+                pnv_pe = &phb->ioda.pe_array[pe_no];
+                if (pnv_pe->flags & PNV_IODA_PE_SLAVE) {
+                        pnv_pe = pnv_pe->master;
+                        WARN_ON(!pnv_pe ||
+                                !(pnv_pe->flags & PNV_IODA_PE_MASTER));
+                        pe_no = pnv_pe->pe_number;
+                }
+        }
 
         /* Find the PE according to PE# */
-        memset(&dev, 0, sizeof(struct eeh_dev));
-        dev.phb = hose;
-        dev.pe_config_addr = pe_no;
-        dev_pe = eeh_pe_get(&dev);
-        if (!dev_pe) return -EEXIST;
+        memset(&edev, 0, sizeof(struct eeh_dev));
+        edev.phb = hose;
+        edev.pe_config_addr = pe_no;
+        dev_pe = eeh_pe_get(&edev);
+        if (!dev_pe)
+                return -EEXIST;
 
+        /*
+         * At this point, we're sure the compound PE should
+         * be put into frozen state.
+         */
         *pe = dev_pe;
+        if (phb->freeze_pe &&
+            !(dev_pe->state & EEH_PE_ISOLATED))
+                phb->freeze_pe(phb, pe_no);
+
         return 0;
 }
 
@@ -792,7 +874,8 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
                                         "detected, location: %s\n",
                                         hose->global_number,
                                         eeh_pe_loc_get(phb_pe));
-                                ioda_eeh_phb_diag(hose);
+                                ioda_eeh_phb_diag(phb_pe);
+                                pnv_pci_dump_phb_diag_data(hose, phb_pe->data);
                                 ret = EEH_NEXT_ERR_NONE;
                         }
 
@@ -812,7 +895,8 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
                                 opal_pci_eeh_freeze_clear(phb->opal_id, frozen_pe_no,
                                         OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);
                                 ret = EEH_NEXT_ERR_NONE;
-                        } else if ((*pe)->state & EEH_PE_ISOLATED) {
+                        } else if ((*pe)->state & EEH_PE_ISOLATED ||
+                                   eeh_pe_passed(*pe)) {
                                 ret = EEH_NEXT_ERR_NONE;
                         } else {
                                 pr_err("EEH: Frozen PE#%x on PHB#%x detected\n",
@@ -839,7 +923,7 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
                     ret == EEH_NEXT_ERR_FENCED_PHB) &&
                     !((*pe)->state & EEH_PE_ISOLATED)) {
                         eeh_pe_state_mark(*pe, EEH_PE_ISOLATED);
-                        ioda_eeh_phb_diag(hose);
+                        ioda_eeh_phb_diag(*pe);
                 }
 
                 /*
@@ -885,6 +969,7 @@ struct pnv_eeh_ops ioda_eeh_ops = {
         .set_option             = ioda_eeh_set_option,
         .get_state              = ioda_eeh_get_state,
         .reset                  = ioda_eeh_reset,
+        .get_log                = ioda_eeh_get_log,
         .configure_bridge       = ioda_eeh_configure_bridge,
         .next_error             = ioda_eeh_next_error
 };
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 56a206f32f77..fd7a16f855ed 100644
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -45,14 +45,31 @@
  */
 static int powernv_eeh_init(void)
 {
+        struct pci_controller *hose;
+        struct pnv_phb *phb;
+
         /* We require OPALv3 */
         if (!firmware_has_feature(FW_FEATURE_OPALv3)) {
-                pr_warning("%s: OPALv3 is required !\n", __func__);
+                pr_warn("%s: OPALv3 is required !\n",
+                        __func__);
                 return -EINVAL;
         }
 
-        /* Set EEH probe mode */
-        eeh_probe_mode_set(EEH_PROBE_MODE_DEV);
+        /* Set probe mode */
+        eeh_add_flag(EEH_PROBE_MODE_DEV);
+
+        /*
+         * P7IOC blocks PCI config access to frozen PE, but PHB3
+         * doesn't do that. So we have to selectively enable I/O
+         * prior to collecting error log.
+         */
+        list_for_each_entry(hose, &hose_list, list_node) {
+                phb = hose->private_data;
+
+                if (phb->model == PNV_PHB_MODEL_P7IOC)
+                        eeh_add_flag(EEH_ENABLE_IO_FOR_LOG);
+                break;
+        }
 
         return 0;
 }
@@ -107,6 +124,7 @@ static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag)
         struct pnv_phb *phb = hose->private_data;
         struct device_node *dn = pci_device_to_OF_node(dev);
         struct eeh_dev *edev = of_node_to_eeh_dev(dn);
+        int ret;
 
         /*
          * When probing the root bridge, which doesn't have any
@@ -143,13 +161,27 @@ static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag)
         edev->pe_config_addr    = phb->bdfn_to_pe(phb, dev->bus, dev->devfn & 0xff);
 
         /* Create PE */
-        eeh_add_to_parent_pe(edev);
+        ret = eeh_add_to_parent_pe(edev);
+        if (ret) {
+                pr_warn("%s: Can't add PCI dev %s to parent PE (%d)\n",
+                        __func__, pci_name(dev), ret);
+                return ret;
+        }
+
+        /*
+         * Cache the PE primary bus, which can't be fetched when
+         * full hotplug is in progress. In that case, all child
+         * PCI devices of the PE are expected to be removed prior
+         * to PE reset.
+         */
+        if (!edev->pe->bus)
+                edev->pe->bus = dev->bus;
 
         /*
          * Enable EEH explicitly so that we will do EEH check
          * while accessing I/O stuff
          */
-        eeh_set_enable(true);
+        eeh_add_flag(EEH_ENABLED);
 
         /* Save memory bars */
         eeh_save_bars(edev);
@@ -273,8 +305,8 @@ static int powernv_eeh_wait_state(struct eeh_pe *pe, int max_wait)
 
                 max_wait -= mwait;
                 if (max_wait <= 0) {
-                        pr_warning("%s: Timeout getting PE#%x's state (%d)\n",
-                                   __func__, pe->addr, max_wait);
+                        pr_warn("%s: Timeout getting PE#%x's state (%d)\n",
+                                __func__, pe->addr, max_wait);
                         return EEH_STATE_NOT_SUPPORT;
                 }
 
@@ -294,7 +326,7 @@ static int powernv_eeh_wait_state(struct eeh_pe *pe, int max_wait)
  * Retrieve the temporary or permanent error from the PE.
  */
 static int powernv_eeh_get_log(struct eeh_pe *pe, int severity,
-                        char *drv_log, unsigned long len)
+                               char *drv_log, unsigned long len)
 {
         struct pci_controller *hose = pe->phb;
         struct pnv_phb *phb = hose->private_data;
@@ -398,9 +430,7 @@ static int __init eeh_powernv_init(void)
 {
         int ret = -EINVAL;
 
-        if (!machine_is(powernv))
-                return ret;
-
+        eeh_set_pe_aux_size(PNV_PCI_DIAG_BUF_SIZE);
         ret = eeh_ops_register(&powernv_eeh_ops);
         if (!ret)
                 pr_info("EEH: PowerNV platform initialized\n");
@@ -409,5 +439,4 @@ static int __init eeh_powernv_init(void)
 
         return ret;
 }
-
-early_initcall(eeh_powernv_init);
+machine_early_initcall(powernv, eeh_powernv_init);
diff --git a/arch/powerpc/platforms/powernv/opal-async.c b/arch/powerpc/platforms/powernv/opal-async.c
index 32e2adfa5320..e462ab947d16 100644
--- a/arch/powerpc/platforms/powernv/opal-async.c
+++ b/arch/powerpc/platforms/powernv/opal-async.c
@@ -20,6 +20,7 @@
 #include <linux/wait.h>
 #include <linux/gfp.h>
 #include <linux/of.h>
+#include <asm/machdep.h>
 #include <asm/opal.h>
 
 #define N_ASYNC_COMPLETIONS     64
@@ -201,4 +202,4 @@ out_opal_node:
 out:
         return err;
 }
-subsys_initcall(opal_async_comp_init);
+machine_subsys_initcall(powernv, opal_async_comp_init);
diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/platforms/powernv/opal-dump.c
index 788a1977b9a5..85bb8fff7947 100644
--- a/arch/powerpc/platforms/powernv/opal-dump.c
+++ b/arch/powerpc/platforms/powernv/opal-dump.c
@@ -102,9 +102,9 @@ static ssize_t dump_ack_store(struct dump_obj *dump_obj,
  * due to the dynamic size of the dump
  */
 static struct dump_attribute id_attribute =
-        __ATTR(id, 0666, dump_id_show, NULL);
+        __ATTR(id, S_IRUGO, dump_id_show, NULL);
 static struct dump_attribute type_attribute =
-        __ATTR(type, 0666, dump_type_show, NULL);
+        __ATTR(type, S_IRUGO, dump_type_show, NULL);
 static struct dump_attribute ack_attribute =
         __ATTR(acknowledge, 0660, dump_ack_show, dump_ack_store);
 
diff --git a/arch/powerpc/platforms/powernv/opal-elog.c b/arch/powerpc/platforms/powernv/opal-elog.c
index 0ad533b617f7..bbdb3ffaab98 100644
--- a/arch/powerpc/platforms/powernv/opal-elog.c
+++ b/arch/powerpc/platforms/powernv/opal-elog.c
@@ -82,9 +82,9 @@ static ssize_t elog_ack_store(struct elog_obj *elog_obj,
 }
 
 static struct elog_attribute id_attribute =
-        __ATTR(id, 0666, elog_id_show, NULL);
+        __ATTR(id, S_IRUGO, elog_id_show, NULL);
 static struct elog_attribute type_attribute =
-        __ATTR(type, 0666, elog_type_show, NULL);
+        __ATTR(type, S_IRUGO, elog_type_show, NULL);
 static struct elog_attribute ack_attribute =
         __ATTR(acknowledge, 0660, elog_ack_show, elog_ack_store);
 
diff --git a/arch/powerpc/platforms/powernv/opal-hmi.c b/arch/powerpc/platforms/powernv/opal-hmi.c
new file mode 100644
index 000000000000..97ac8dc33667
--- /dev/null
+++ b/arch/powerpc/platforms/powernv/opal-hmi.c
@@ -0,0 +1,188 @@
+/*
+ * OPAL hypervisor Maintenance interrupt handling support in PowreNV.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2014 IBM Corporation
+ * Author: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
+ */
+
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/of.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+
+#include <asm/opal.h>
+#include <asm/cputable.h>
+
+static int opal_hmi_handler_nb_init;
+struct OpalHmiEvtNode {
+        struct list_head list;
+        struct OpalHMIEvent hmi_evt;
+};
+static LIST_HEAD(opal_hmi_evt_list);
+static DEFINE_SPINLOCK(opal_hmi_evt_lock);
+
+static void print_hmi_event_info(struct OpalHMIEvent *hmi_evt)
+{
+        const char *level, *sevstr, *error_info;
+        static const char *hmi_error_types[] = {
+                "Malfunction Alert",
+                "Processor Recovery done",
+                "Processor recovery occurred again",
+                "Processor recovery occurred for masked error",
+                "Timer facility experienced an error",
+                "TFMR SPR is corrupted",
+                "UPS (Uniterrupted Power System) Overflow indication",
+                "An XSCOM operation failure",
+                "An XSCOM operation completed",
+                "SCOM has set a reserved FIR bit to cause recovery",
+                "Debug trigger has set a reserved FIR bit to cause recovery",
+                "A hypervisor resource error occurred"
+        };
+
+        /* Print things out */
+        if (hmi_evt->version != OpalHMIEvt_V1) {
+                pr_err("HMI Interrupt, Unknown event version %d !\n",
+                        hmi_evt->version);
+                return;
+        }
+        switch (hmi_evt->severity) {
+        case OpalHMI_SEV_NO_ERROR:
+                level = KERN_INFO;
+                sevstr = "Harmless";
+                break;
+        case OpalHMI_SEV_WARNING:
+                level = KERN_WARNING;
+                sevstr = "";
+                break;
+        case OpalHMI_SEV_ERROR_SYNC:
+                level = KERN_ERR;
+                sevstr = "Severe";
+                break;
+        case OpalHMI_SEV_FATAL:
+        default:
+                level = KERN_ERR;
+                sevstr = "Fatal";
+                break;
+        }
+
+        printk("%s%s Hypervisor Maintenance interrupt [%s]\n",
+                level, sevstr,
+                hmi_evt->disposition == OpalHMI_DISPOSITION_RECOVERED ?
+                "Recovered" : "Not recovered");
+        error_info = hmi_evt->type < ARRAY_SIZE(hmi_error_types) ?
+                        hmi_error_types[hmi_evt->type]
+                        : "Unknown";
+        printk("%s Error detail: %s\n", level, error_info);
+        printk("%s      HMER: %016llx\n", level, be64_to_cpu(hmi_evt->hmer));
+        if ((hmi_evt->type == OpalHMI_ERROR_TFAC) ||
+                (hmi_evt->type == OpalHMI_ERROR_TFMR_PARITY))
+                printk("%s      TFMR: %016llx\n", level,
+                                                be64_to_cpu(hmi_evt->tfmr));
+}
+
+static void hmi_event_handler(struct work_struct *work)
+{
+        unsigned long flags;
+        struct OpalHMIEvent *hmi_evt;
+        struct OpalHmiEvtNode *msg_node;
+        uint8_t disposition;
+
+        spin_lock_irqsave(&opal_hmi_evt_lock, flags);
+        while (!list_empty(&opal_hmi_evt_list)) {
+                msg_node = list_entry(opal_hmi_evt_list.next,
+                                           struct OpalHmiEvtNode, list);
+                list_del(&msg_node->list);
+                spin_unlock_irqrestore(&opal_hmi_evt_lock, flags);
+
+                hmi_evt = (struct OpalHMIEvent *) &msg_node->hmi_evt;
+                print_hmi_event_info(hmi_evt);
+                disposition = hmi_evt->disposition;
+                kfree(msg_node);
+
+                /*
+                 * Check if HMI event has been recovered or not. If not
+                 * then we can't continue, invoke panic.
+                 */
+                if (disposition != OpalHMI_DISPOSITION_RECOVERED)
+                        panic("Unrecoverable HMI exception");
+
+                spin_lock_irqsave(&opal_hmi_evt_lock, flags);
+        }
+        spin_unlock_irqrestore(&opal_hmi_evt_lock, flags);
+}
+
+static DECLARE_WORK(hmi_event_work, hmi_event_handler);
+/*
+ * opal_handle_hmi_event - notifier handler that queues up HMI events
+ * to be preocessed later.
+ */
+static int opal_handle_hmi_event(struct notifier_block *nb,
+                          unsigned long msg_type, void *msg)
+{
+        unsigned long flags;
+        struct OpalHMIEvent *hmi_evt;
+        struct opal_msg *hmi_msg = msg;
+        struct OpalHmiEvtNode *msg_node;
+
+        /* Sanity Checks */
+        if (msg_type != OPAL_MSG_HMI_EVT)
+                return 0;
+
+        /* HMI event info starts from param[0] */
+        hmi_evt = (struct OpalHMIEvent *)&hmi_msg->params[0];
+
+        /* Delay the logging of HMI events to workqueue. */
+        msg_node = kzalloc(sizeof(*msg_node), GFP_ATOMIC);
+        if (!msg_node) {
+                pr_err("HMI: out of memory, Opal message event not handled\n");
+                return -ENOMEM;
+        }
+        memcpy(&msg_node->hmi_evt, hmi_evt, sizeof(struct OpalHMIEvent));
+
+        spin_lock_irqsave(&opal_hmi_evt_lock, flags);
+        list_add(&msg_node->list, &opal_hmi_evt_list);
+        spin_unlock_irqrestore(&opal_hmi_evt_lock, flags);
+
+        schedule_work(&hmi_event_work);
+        return 0;
+}
+
+static struct notifier_block opal_hmi_handler_nb = {
+        .notifier_call  = opal_handle_hmi_event,
+        .next           = NULL,
+        .priority       = 0,
+};
+
+static int __init opal_hmi_handler_init(void)
+{
+        int ret;
+
+        if (!opal_hmi_handler_nb_init) {
+                ret = opal_message_notifier_register(
+                                OPAL_MSG_HMI_EVT, &opal_hmi_handler_nb);
+                if (ret) {
+                        pr_err("%s: Can't register OPAL event notifier (%d)\n",
+                               __func__, ret);
+                        return ret;
+                }
+                opal_hmi_handler_nb_init = 1;
+        }
+        return 0;
+}
+subsys_initcall(opal_hmi_handler_init);
diff --git a/arch/powerpc/platforms/powernv/opal-lpc.c b/arch/powerpc/platforms/powernv/opal-lpc.c
index f04b4d8aca5a..ad4b31df779a 100644
--- a/arch/powerpc/platforms/powernv/opal-lpc.c
+++ b/arch/powerpc/platforms/powernv/opal-lpc.c
@@ -324,7 +324,7 @@ static int opal_lpc_init_debugfs(void)
         rc |= opal_lpc_debugfs_create_type(root, "fw", OPAL_LPC_FW);
         return rc;
 }
-device_initcall(opal_lpc_init_debugfs);
+machine_device_initcall(powernv, opal_lpc_init_debugfs);
 #endif  /* CONFIG_DEBUG_FS */
 
 void opal_lpc_init(void)
diff --git a/arch/powerpc/platforms/powernv/opal-memory-errors.c b/arch/powerpc/platforms/powernv/opal-memory-errors.c
index b17a34b695ef..43db2136dbff 100644
--- a/arch/powerpc/platforms/powernv/opal-memory-errors.c
+++ b/arch/powerpc/platforms/powernv/opal-memory-errors.c
@@ -27,6 +27,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
+#include <asm/machdep.h>
 #include <asm/opal.h>
 #include <asm/cputable.h>
 
@@ -143,4 +144,4 @@ static int __init opal_mem_err_init(void)
         }
         return 0;
 }
-subsys_initcall(opal_mem_err_init);
+machine_subsys_initcall(powernv, opal_mem_err_init);
diff --git a/arch/powerpc/platforms/powernv/opal-tracepoints.c b/arch/powerpc/platforms/powernv/opal-tracepoints.c
new file mode 100644
index 000000000000..d8a000a9988b
--- /dev/null
+++ b/arch/powerpc/platforms/powernv/opal-tracepoints.c
@@ -0,0 +1,84 @@
+#include <linux/percpu.h>
+#include <linux/jump_label.h>
+#include <asm/trace.h>
+
+#ifdef CONFIG_JUMP_LABEL
+struct static_key opal_tracepoint_key = STATIC_KEY_INIT;
+
+void opal_tracepoint_regfunc(void)
+{
+        static_key_slow_inc(&opal_tracepoint_key);
+}
+
+void opal_tracepoint_unregfunc(void)
+{
+        static_key_slow_dec(&opal_tracepoint_key);
+}
+#else
+/*
+ * We optimise OPAL calls by placing opal_tracepoint_refcount
+ * directly in the TOC so we can check if the opal tracepoints are
+ * enabled via a single load.
+ */
+
+/* NB: reg/unreg are called while guarded with the tracepoints_mutex */
+extern long opal_tracepoint_refcount;
+
+void opal_tracepoint_regfunc(void)
+{
+        opal_tracepoint_refcount++;
+}
+
+void opal_tracepoint_unregfunc(void)
+{
+        opal_tracepoint_refcount--;
+}
+#endif
+
+/*
+ * Since the tracing code might execute OPAL calls we need to guard against
+ * recursion.
+ */
+static DEFINE_PER_CPU(unsigned int, opal_trace_depth);
+
+void __trace_opal_entry(unsigned long opcode, unsigned long *args)
+{
+        unsigned long flags;
+        unsigned int *depth;
+
+        local_irq_save(flags);
+
+        depth = &__get_cpu_var(opal_trace_depth);
+
+        if (*depth)
+                goto out;
+
+        (*depth)++;
+        preempt_disable();
+        trace_opal_entry(opcode, args);
+        (*depth)--;
+
+out:
+        local_irq_restore(flags);
+}
+
+void __trace_opal_exit(long opcode, unsigned long retval)
+{
+        unsigned long flags;
+        unsigned int *depth;
+
+        local_irq_save(flags);
+
+        depth = &__get_cpu_var(opal_trace_depth);
+
+        if (*depth)
+                goto out;
+
+        (*depth)++;
+        trace_opal_exit(opcode, retval);
+        preempt_enable();
+        (*depth)--;
+
+out:
+        local_irq_restore(flags);
+}
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S
index 4abbff22a61f..2e6ce1b8dc8f 100644
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@ -13,30 +13,69 @@
 #include <asm/hvcall.h>
 #include <asm/asm-offsets.h>
 #include <asm/opal.h>
+#include <asm/jump_label.h>
+
+        .section        ".text"
+
+#ifdef CONFIG_TRACEPOINTS
+#ifdef CONFIG_JUMP_LABEL
+#define OPAL_BRANCH(LABEL)                                      \
+        ARCH_STATIC_BRANCH(LABEL, opal_tracepoint_key)
+#else
+
+        .section        ".toc","aw"
+
+        .globl opal_tracepoint_refcount
+opal_tracepoint_refcount:
+        .llong  0
+
+        .section        ".text"
+
+/*
+ * We branch around this in early init by using an unconditional cpu
+ * feature.
+ */
+#define OPAL_BRANCH(LABEL)                                      \
+BEGIN_FTR_SECTION;                                              \
+        b       1f;                                             \
+END_FTR_SECTION(0, 1);                                          \
+        ld      r12,opal_tracepoint_refcount@toc(r2);           \
+        std     r12,32(r1);                                     \
+        cmpdi   r12,0;                                          \
+        bne-    LABEL;                                          \
+1:
+
+#endif
+
+#else
+#define OPAL_BRANCH(LABEL)
+#endif
 
 /* TODO:
  *
  * - Trace irqs in/off (needs saving/restoring all args, argh...)
  * - Get r11 feed up by Dave so I can have better register usage
  */
+
 #define OPAL_CALL(name, token)          \
  _GLOBAL(name);                         \
         mflr    r0;                     \
-        mfcr    r12;                    \
         std     r0,16(r1);              \
+        li      r0,token;               \
+        OPAL_BRANCH(opal_tracepoint_entry) \
+        mfcr    r12;                    \
         stw     r12,8(r1);              \
         std     r1,PACAR1(r13);         \
-        li      r0,0;                   \
+        li      r11,0;                  \
         mfmsr   r12;                    \
-        ori     r0,r0,MSR_EE;           \
+        ori     r11,r11,MSR_EE;         \
         std     r12,PACASAVEDMSR(r13);  \
-        andc    r12,r12,r0;             \
+        andc    r12,r12,r11;            \
         mtmsrd  r12,1;                  \
-        LOAD_REG_ADDR(r0,opal_return);  \
-        mtlr    r0;                     \
-        li      r0,MSR_DR|MSR_IR|MSR_LE;\
-        andc    r12,r12,r0;             \
-        li      r0,token;               \
+        LOAD_REG_ADDR(r11,opal_return); \
+        mtlr    r11;                    \
+        li      r11,MSR_DR|MSR_IR|MSR_LE;\
+        andc    r12,r12,r11;            \
         mtspr   SPRN_HSRR1,r12;         \
         LOAD_REG_ADDR(r11,opal);        \
         ld      r12,8(r11);             \
@@ -61,6 +100,64 @@ opal_return:
         mtcr    r4;
         rfid
 
+#ifdef CONFIG_TRACEPOINTS
+opal_tracepoint_entry:
+        stdu    r1,-STACKFRAMESIZE(r1)
+        std     r0,STK_REG(R23)(r1)
+        std     r3,STK_REG(R24)(r1)
+        std     r4,STK_REG(R25)(r1)
+        std     r5,STK_REG(R26)(r1)
+        std     r6,STK_REG(R27)(r1)
+        std     r7,STK_REG(R28)(r1)
+        std     r8,STK_REG(R29)(r1)
+        std     r9,STK_REG(R30)(r1)
+        std     r10,STK_REG(R31)(r1)
+        mr      r3,r0
+        addi    r4,r1,STK_REG(R24)
+        bl      __trace_opal_entry
+        ld      r0,STK_REG(R23)(r1)
+        ld      r3,STK_REG(R24)(r1)
+        ld      r4,STK_REG(R25)(r1)
+        ld      r5,STK_REG(R26)(r1)
+        ld      r6,STK_REG(R27)(r1)
+        ld      r7,STK_REG(R28)(r1)
+        ld      r8,STK_REG(R29)(r1)
+        ld      r9,STK_REG(R30)(r1)
+        ld      r10,STK_REG(R31)(r1)
+        LOAD_REG_ADDR(r11,opal_tracepoint_return)
+        mfcr    r12
+        std     r11,16(r1)
+        stw     r12,8(r1)
+        std     r1,PACAR1(r13)
+        li      r11,0
+        mfmsr   r12
+        ori     r11,r11,MSR_EE
+        std     r12,PACASAVEDMSR(r13)
+        andc    r12,r12,r11
+        mtmsrd  r12,1
+        LOAD_REG_ADDR(r11,opal_return)
+        mtlr    r11
+        li      r11,MSR_DR|MSR_IR|MSR_LE
+        andc    r12,r12,r11
+        mtspr   SPRN_HSRR1,r12
+        LOAD_REG_ADDR(r11,opal)
+        ld      r12,8(r11)
+        ld      r2,0(r11)
+        mtspr   SPRN_HSRR0,r12
+        hrfid
+
+opal_tracepoint_return:
+        std     r3,STK_REG(R31)(r1)
+        mr      r4,r3
+        ld      r0,STK_REG(R23)(r1)
+        bl      __trace_opal_exit
+        ld      r3,STK_REG(R31)(r1)
+        addi    r1,r1,STACKFRAMESIZE
+        ld      r0,16(r1)
+        mtlr    r0
+        blr
+#endif
+
 OPAL_CALL(opal_invalid_call,                    OPAL_INVALID_CALL);
 OPAL_CALL(opal_console_write,                   OPAL_CONSOLE_WRITE);
 OPAL_CALL(opal_console_read,                    OPAL_CONSOLE_READ);
@@ -86,6 +183,7 @@ OPAL_CALL(opal_get_xive,			OPAL_GET_XIVE);
 OPAL_CALL(opal_register_exception_handler,      OPAL_REGISTER_OPAL_EXCEPTION_HANDLER);
 OPAL_CALL(opal_pci_eeh_freeze_status,           OPAL_PCI_EEH_FREEZE_STATUS);
 OPAL_CALL(opal_pci_eeh_freeze_clear,            OPAL_PCI_EEH_FREEZE_CLEAR);
+OPAL_CALL(opal_pci_eeh_freeze_set,              OPAL_PCI_EEH_FREEZE_SET);
 OPAL_CALL(opal_pci_shpc,                        OPAL_PCI_SHPC);
 OPAL_CALL(opal_pci_phb_mmio_enable,             OPAL_PCI_PHB_MMIO_ENABLE);
 OPAL_CALL(opal_pci_set_phb_mem_window,          OPAL_PCI_SET_PHB_MEM_WINDOW);
@@ -146,3 +244,6 @@ OPAL_CALL(opal_sync_host_reboot,		OPAL_SYNC_HOST_REBOOT);
 OPAL_CALL(opal_sensor_read,                     OPAL_SENSOR_READ);
 OPAL_CALL(opal_get_param,                       OPAL_GET_PARAM);
 OPAL_CALL(opal_set_param,                       OPAL_SET_PARAM);
+OPAL_CALL(opal_handle_hmi,                      OPAL_HANDLE_HMI);
+OPAL_CALL(opal_register_dump_region,            OPAL_REGISTER_DUMP_REGION);
+OPAL_CALL(opal_unregister_dump_region,          OPAL_UNREGISTER_DUMP_REGION);
diff --git a/arch/powerpc/platforms/powernv/opal-xscom.c b/arch/powerpc/platforms/powernv/opal-xscom.c
index 4cd2ea6c0dbe..7634d1c62299 100644
--- a/arch/powerpc/platforms/powernv/opal-xscom.c
+++ b/arch/powerpc/platforms/powernv/opal-xscom.c
@@ -130,4 +130,4 @@ static int opal_xscom_init(void)
                 scom_init(&opal_scom_controller);
         return 0;
 }
-arch_initcall(opal_xscom_init);
+machine_arch_initcall(powernv, opal_xscom_init);
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index 199975613fe9..b44eec3e8dbd 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -22,6 +22,8 @@
 #include <linux/kobject.h>
 #include <linux/delay.h>
 #include <linux/memblock.h>
+
+#include <asm/machdep.h>
 #include <asm/opal.h>
 #include <asm/firmware.h>
 #include <asm/mce.h>
@@ -192,16 +194,12 @@ static int __init opal_register_exception_handlers(void)
          * fwnmi area at 0x7000 to provide the glue space to OPAL
          */
         glue = 0x7000;
-        opal_register_exception_handler(OPAL_HYPERVISOR_MAINTENANCE_HANDLER,
-                                        0, glue);
-        glue += 128;
         opal_register_exception_handler(OPAL_SOFTPATCH_HANDLER, 0, glue);
 #endif
 
         return 0;
 }
-
-early_initcall(opal_register_exception_handlers);
+machine_early_initcall(powernv, opal_register_exception_handlers);
 
 int opal_notifier_register(struct notifier_block *nb)
 {
@@ -368,7 +366,7 @@ static int __init opal_message_init(void)
         }
         return 0;
 }
-early_initcall(opal_message_init);
+machine_early_initcall(powernv, opal_message_init);
 
 int opal_get_chars(uint32_t vtermno, char *buf, int count)
 {
@@ -513,6 +511,46 @@ int opal_machine_check(struct pt_regs *regs)
         return 0;
 }
 
+/* Early hmi handler called in real mode. */
+int opal_hmi_exception_early(struct pt_regs *regs)
+{
+        s64 rc;
+
+        /*
+         * call opal hmi handler. Pass paca address as token.
+         * The return value OPAL_SUCCESS is an indication that there is
+         * an HMI event generated waiting to pull by Linux.
+         */
+        rc = opal_handle_hmi();
+        if (rc == OPAL_SUCCESS) {
+                local_paca->hmi_event_available = 1;
+                return 1;
+        }
+        return 0;
+}
+
+/* HMI exception handler called in virtual mode during check_irq_replay. */
+int opal_handle_hmi_exception(struct pt_regs *regs)
+{
+        s64 rc;
+        __be64 evt = 0;
+
+        /*
+         * Check if HMI event is available.
+         * if Yes, then call opal_poll_events to pull opal messages and
+         * process them.
+         */
+        if (!local_paca->hmi_event_available)
+                return 0;
+
+        local_paca->hmi_event_available = 0;
+        rc = opal_poll_events(&evt);
+        if (rc == OPAL_SUCCESS && evt)
+                opal_do_notifier(be64_to_cpu(evt));
+
+        return 1;
+}
+
 static uint64_t find_recovery_address(uint64_t nip)
 {
         int i;
@@ -567,6 +605,24 @@ static int opal_sysfs_init(void)
         return 0;
 }
 
+static void __init opal_dump_region_init(void)
+{
+        void *addr;
+        uint64_t size;
+        int rc;
+
+        /* Register kernel log buffer */
+        addr = log_buf_addr_get();
+        size = log_buf_len_get();
+        rc = opal_register_dump_region(OPAL_DUMP_REGION_LOG_BUF,
+                                       __pa(addr), size);
+        /* Don't warn if this is just an older OPAL that doesn't
+         * know about that call
+         */
+        if (rc && rc != OPAL_UNSUPPORTED)
+                pr_warn("DUMP: Failed to register kernel log buffer. "
+                        "rc = %d\n", rc);
+}
 static int __init opal_init(void)
 {
         struct device_node *np, *consoles;
@@ -616,6 +672,8 @@ static int __init opal_init(void)
         /* Create "opal" kobject under /sys/firmware */
         rc = opal_sysfs_init();
         if (rc == 0) {
+                /* Setup dump region interface */
+                opal_dump_region_init();
                 /* Setup error log interface */
                 rc = opal_elog_init();
                 /* Setup code update interface */
@@ -630,7 +688,7 @@ static int __init opal_init(void)
 
         return 0;
 }
-subsys_initcall(opal_init);
+machine_subsys_initcall(powernv, opal_init);
 
 void opal_shutdown(void)
 {
@@ -656,6 +714,9 @@ void opal_shutdown(void)
                 else
                         mdelay(10);
         }
+
+        /* Unregister memory dump region */
+        opal_unregister_dump_region(OPAL_DUMP_REGION_LOG_BUF);
 }
 
 /* Export this so that test modules can use it */
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index de19edeaa7a7..df241b11d4f7 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -36,6 +36,7 @@
 #include <asm/tce.h>
 #include <asm/xics.h>
 #include <asm/debug.h>
+#include <asm/firmware.h>
 
 #include "powernv.h"
 #include "pci.h"
@@ -82,6 +83,12 @@ static inline void __raw_rm_writeq(u64 val, volatile void __iomem *paddr)
                 : : "r" (val), "r" (paddr) : "memory");
 }
 
+static inline bool pnv_pci_is_mem_pref_64(unsigned long flags)
+{
+        return ((flags & (IORESOURCE_MEM_64 | IORESOURCE_PREFETCH)) ==
+                (IORESOURCE_MEM_64 | IORESOURCE_PREFETCH));
+}
+
 static int pnv_ioda_alloc_pe(struct pnv_phb *phb)
 {
         unsigned long pe;
@@ -106,6 +113,380 @@ static void pnv_ioda_free_pe(struct pnv_phb *phb, int pe)
         clear_bit(pe, phb->ioda.pe_alloc);
 }
 
+/* The default M64 BAR is shared by all PEs */
+static int pnv_ioda2_init_m64(struct pnv_phb *phb)
+{
+        const char *desc;
+        struct resource *r;
+        s64 rc;
+
+        /* Configure the default M64 BAR */
+        rc = opal_pci_set_phb_mem_window(phb->opal_id,
+                                         OPAL_M64_WINDOW_TYPE,
+                                         phb->ioda.m64_bar_idx,
+                                         phb->ioda.m64_base,
+                                         0, /* unused */
+                                         phb->ioda.m64_size);
+        if (rc != OPAL_SUCCESS) {
+                desc = "configuring";
+                goto fail;
+        }
+
+        /* Enable the default M64 BAR */
+        rc = opal_pci_phb_mmio_enable(phb->opal_id,
+                                      OPAL_M64_WINDOW_TYPE,
+                                      phb->ioda.m64_bar_idx,
+                                      OPAL_ENABLE_M64_SPLIT);
+        if (rc != OPAL_SUCCESS) {
+                desc = "enabling";
+                goto fail;
+        }
+
+        /* Mark the M64 BAR assigned */
+        set_bit(phb->ioda.m64_bar_idx, &phb->ioda.m64_bar_alloc);
+
+        /*
+         * Strip off the segment used by the reserved PE, which is
+         * expected to be 0 or last one of PE capabicity.
+         */
+        r = &phb->hose->mem_resources[1];
+        if (phb->ioda.reserved_pe == 0)
+                r->start += phb->ioda.m64_segsize;
+        else if (phb->ioda.reserved_pe == (phb->ioda.total_pe - 1))
+                r->end -= phb->ioda.m64_segsize;
+        else
+                pr_warn("  Cannot strip M64 segment for reserved PE#%d\n",
+                        phb->ioda.reserved_pe);
+
+        return 0;
+
+fail:
+        pr_warn("  Failure %lld %s M64 BAR#%d\n",
+                rc, desc, phb->ioda.m64_bar_idx);
+        opal_pci_phb_mmio_enable(phb->opal_id,
+                                 OPAL_M64_WINDOW_TYPE,
+                                 phb->ioda.m64_bar_idx,
+                                 OPAL_DISABLE_M64);
+        return -EIO;
+}
+
+static void pnv_ioda2_alloc_m64_pe(struct pnv_phb *phb)
+{
+        resource_size_t sgsz = phb->ioda.m64_segsize;
+        struct pci_dev *pdev;
+        struct resource *r;
+        int base, step, i;
+
+        /*
+         * Root bus always has full M64 range and root port has
+         * M64 range used in reality. So we're checking root port
+         * instead of root bus.
+         */
+        list_for_each_entry(pdev, &phb->hose->bus->devices, bus_list) {
+                for (i = PCI_BRIDGE_RESOURCES;
+                     i <= PCI_BRIDGE_RESOURCE_END; i++) {
+                        r = &pdev->resource[i];
+                        if (!r->parent ||
+                            !pnv_pci_is_mem_pref_64(r->flags))
+                                continue;
+
+                        base = (r->start - phb->ioda.m64_base) / sgsz;
+                        for (step = 0; step < resource_size(r) / sgsz; step++)
+                                set_bit(base + step, phb->ioda.pe_alloc);
+                }
+        }
+}
+
+static int pnv_ioda2_pick_m64_pe(struct pnv_phb *phb,
+                                 struct pci_bus *bus, int all)
+{
+        resource_size_t segsz = phb->ioda.m64_segsize;
+        struct pci_dev *pdev;
+        struct resource *r;
+        struct pnv_ioda_pe *master_pe, *pe;
+        unsigned long size, *pe_alloc;
+        bool found;
+        int start, i, j;
+
+        /* Root bus shouldn't use M64 */
+        if (pci_is_root_bus(bus))
+                return IODA_INVALID_PE;
+
+        /* We support only one M64 window on each bus */
+        found = false;
+        pci_bus_for_each_resource(bus, r, i) {
+                if (r && r->parent &&
+                    pnv_pci_is_mem_pref_64(r->flags)) {
+                        found = true;
+                        break;
+                }
+        }
+
+        /* No M64 window found ? */
+        if (!found)
+                return IODA_INVALID_PE;
+
+        /* Allocate bitmap */
+        size = _ALIGN_UP(phb->ioda.total_pe / 8, sizeof(unsigned long));
+        pe_alloc = kzalloc(size, GFP_KERNEL);
+        if (!pe_alloc) {
+                pr_warn("%s: Out of memory !\n",
+                        __func__);
+                return IODA_INVALID_PE;
+        }
+
+        /*
+         * Figure out reserved PE numbers by the PE
+         * the its child PEs.
+         */
+        start = (r->start - phb->ioda.m64_base) / segsz;
+        for (i = 0; i < resource_size(r) / segsz; i++)
+                set_bit(start + i, pe_alloc);
+
+        if (all)
+                goto done;
+
+        /*
+         * If the PE doesn't cover all subordinate buses,
+         * we need subtract from reserved PEs for children.
+         */
+        list_for_each_entry(pdev, &bus->devices, bus_list) {
+                if (!pdev->subordinate)
+                        continue;
+
+                pci_bus_for_each_resource(pdev->subordinate, r, i) {
+                        if (!r || !r->parent ||
+                            !pnv_pci_is_mem_pref_64(r->flags))
+                                continue;
+
+                        start = (r->start - phb->ioda.m64_base) / segsz;
+                        for (j = 0; j < resource_size(r) / segsz ; j++)
+                                clear_bit(start + j, pe_alloc);
+                }
+        }
+
+        /*
+         * the current bus might not own M64 window and that's all
+         * contributed by its child buses. For the case, we needn't
+         * pick M64 dependent PE#.
+         */
+        if (bitmap_empty(pe_alloc, phb->ioda.total_pe)) {
+                kfree(pe_alloc);
+                return IODA_INVALID_PE;
+        }
+
+        /*
+         * Figure out the master PE and put all slave PEs to master
+         * PE's list to form compound PE.
+         */
+done:
+        master_pe = NULL;
+        i = -1;
+        while ((i = find_next_bit(pe_alloc, phb->ioda.total_pe, i + 1)) <
+                phb->ioda.total_pe) {
+                pe = &phb->ioda.pe_array[i];
+                pe->phb = phb;
+                pe->pe_number = i;
+
+                if (!master_pe) {
+                        pe->flags |= PNV_IODA_PE_MASTER;
+                        INIT_LIST_HEAD(&pe->slaves);
+                        master_pe = pe;
+                } else {
+                        pe->flags |= PNV_IODA_PE_SLAVE;
+                        pe->master = master_pe;
+                        list_add_tail(&pe->list, &master_pe->slaves);
+                }
+        }
+
+        kfree(pe_alloc);
+        return master_pe->pe_number;
+}
+
+static void __init pnv_ioda_parse_m64_window(struct pnv_phb *phb)
+{
+        struct pci_controller *hose = phb->hose;
+        struct device_node *dn = hose->dn;
+        struct resource *res;
+        const u32 *r;
+        u64 pci_addr;
+
+        if (!firmware_has_feature(FW_FEATURE_OPALv3)) {
+                pr_info("  Firmware too old to support M64 window\n");
+                return;
+        }
+
+        r = of_get_property(dn, "ibm,opal-m64-window", NULL);
+        if (!r) {
+                pr_info("  No <ibm,opal-m64-window> on %s\n",
+                        dn->full_name);
+                return;
+        }
+
+        /* FIXME: Support M64 for P7IOC */
+        if (phb->type != PNV_PHB_IODA2) {
+                pr_info("  Not support M64 window\n");
+                return;
+        }
+
+        res = &hose->mem_resources[1];
+        res->start = of_translate_address(dn, r + 2);
+        res->end = res->start + of_read_number(r + 4, 2) - 1;
+        res->flags = (IORESOURCE_MEM | IORESOURCE_MEM_64 | IORESOURCE_PREFETCH);
+        pci_addr = of_read_number(r, 2);
+        hose->mem_offset[1] = res->start - pci_addr;
+
+        phb->ioda.m64_size = resource_size(res);
+        phb->ioda.m64_segsize = phb->ioda.m64_size / phb->ioda.total_pe;
+        phb->ioda.m64_base = pci_addr;
+
+        /* Use last M64 BAR to cover M64 window */
+        phb->ioda.m64_bar_idx = 15;
+        phb->init_m64 = pnv_ioda2_init_m64;
+        phb->alloc_m64_pe = pnv_ioda2_alloc_m64_pe;
+        phb->pick_m64_pe = pnv_ioda2_pick_m64_pe;
+}
+
+static void pnv_ioda_freeze_pe(struct pnv_phb *phb, int pe_no)
+{
+        struct pnv_ioda_pe *pe = &phb->ioda.pe_array[pe_no];
+        struct pnv_ioda_pe *slave;
+        s64 rc;
+
+        /* Fetch master PE */
+        if (pe->flags & PNV_IODA_PE_SLAVE) {
+                pe = pe->master;
+                WARN_ON(!pe || !(pe->flags & PNV_IODA_PE_MASTER));
+                pe_no = pe->pe_number;
+        }
+
+        /* Freeze master PE */
+        rc = opal_pci_eeh_freeze_set(phb->opal_id,
+                                     pe_no,
+                                     OPAL_EEH_ACTION_SET_FREEZE_ALL);
+        if (rc != OPAL_SUCCESS) {
+                pr_warn("%s: Failure %lld freezing PHB#%x-PE#%x\n",
+                        __func__, rc, phb->hose->global_number, pe_no);
+                return;
+        }
+
+        /* Freeze slave PEs */
+        if (!(pe->flags & PNV_IODA_PE_MASTER))
+                return;
+
+        list_for_each_entry(slave, &pe->slaves, list) {
+                rc = opal_pci_eeh_freeze_set(phb->opal_id,
+                                             slave->pe_number,
+                                             OPAL_EEH_ACTION_SET_FREEZE_ALL);
+                if (rc != OPAL_SUCCESS)
+                        pr_warn("%s: Failure %lld freezing PHB#%x-PE#%x\n",
+                                __func__, rc, phb->hose->global_number,
+                                slave->pe_number);
+        }
+}
+
+int pnv_ioda_unfreeze_pe(struct pnv_phb *phb, int pe_no, int opt)
+{
+        struct pnv_ioda_pe *pe, *slave;
+        s64 rc;
+
+        /* Find master PE */
+        pe = &phb->ioda.pe_array[pe_no];
+        if (pe->flags & PNV_IODA_PE_SLAVE) {
+                pe = pe->master;
+                WARN_ON(!pe || !(pe->flags & PNV_IODA_PE_MASTER));
+                pe_no = pe->pe_number;
+        }
+
+        /* Clear frozen state for master PE */
+        rc = opal_pci_eeh_freeze_clear(phb->opal_id, pe_no, opt);
+        if (rc != OPAL_SUCCESS) {
+                pr_warn("%s: Failure %lld clear %d on PHB#%x-PE#%x\n",
+                        __func__, rc, opt, phb->hose->global_number, pe_no);
+                return -EIO;
+        }
+
+        if (!(pe->flags & PNV_IODA_PE_MASTER))
+                return 0;
+
+        /* Clear frozen state for slave PEs */
+        list_for_each_entry(slave, &pe->slaves, list) {
+                rc = opal_pci_eeh_freeze_clear(phb->opal_id,
+                                             slave->pe_number,
+                                             opt);
+                if (rc != OPAL_SUCCESS) {
+                        pr_warn("%s: Failure %lld clear %d on PHB#%x-PE#%x\n",
+                                __func__, rc, opt, phb->hose->global_number,
+                                slave->pe_number);
+                        return -EIO;
+                }
+        }
+
+        return 0;
+}
+
+static int pnv_ioda_get_pe_state(struct pnv_phb *phb, int pe_no)
+{
+        struct pnv_ioda_pe *slave, *pe;
+        u8 fstate, state;
+        __be16 pcierr;
+        s64 rc;
+
+        /* Sanity check on PE number */
+        if (pe_no < 0 || pe_no >= phb->ioda.total_pe)
+                return OPAL_EEH_STOPPED_PERM_UNAVAIL;
+
+        /*
+         * Fetch the master PE and the PE instance might be
+         * not initialized yet.
+         */
+        pe = &phb->ioda.pe_array[pe_no];
+        if (pe->flags & PNV_IODA_PE_SLAVE) {
+                pe = pe->master;
+                WARN_ON(!pe || !(pe->flags & PNV_IODA_PE_MASTER));
+                pe_no = pe->pe_number;
+        }
+
+        /* Check the master PE */
+        rc = opal_pci_eeh_freeze_status(phb->opal_id, pe_no,
+                                        &state, &pcierr, NULL);
+        if (rc != OPAL_SUCCESS) {
+                pr_warn("%s: Failure %lld getting "
+                        "PHB#%x-PE#%x state\n",
+                        __func__, rc,
+                        phb->hose->global_number, pe_no);
+                return OPAL_EEH_STOPPED_TEMP_UNAVAIL;
+        }
+
+        /* Check the slave PE */
+        if (!(pe->flags & PNV_IODA_PE_MASTER))
+                return state;
+
+        list_for_each_entry(slave, &pe->slaves, list) {
+                rc = opal_pci_eeh_freeze_status(phb->opal_id,
+                                                slave->pe_number,
+                                                &fstate,
+                                                &pcierr,
+                                                NULL);
+                if (rc != OPAL_SUCCESS) {
+                        pr_warn("%s: Failure %lld getting "
+                                "PHB#%x-PE#%x state\n",
+                                __func__, rc,
+                                phb->hose->global_number, slave->pe_number);
+                        return OPAL_EEH_STOPPED_TEMP_UNAVAIL;
+                }
+
+                /*
+                 * Override the result based on the ascending
+                 * priority.
+                 */
+                if (fstate > state)
+                        state = fstate;
+        }
+
+        return state;
+}
+
 /* Currently those 2 are only used when MSIs are enabled, this will change
  * but in the meantime, we need to protect them to avoid warnings
  */
@@ -363,9 +744,16 @@ static void pnv_ioda_setup_bus_PE(struct pci_bus *bus, int all)
         struct pci_controller *hose = pci_bus_to_host(bus);
         struct pnv_phb *phb = hose->private_data;
         struct pnv_ioda_pe *pe;
-        int pe_num;
+        int pe_num = IODA_INVALID_PE;
+
+        /* Check if PE is determined by M64 */
+        if (phb->pick_m64_pe)
+                pe_num = phb->pick_m64_pe(phb, bus, all);
+
+        /* The PE number isn't pinned by M64 */
+        if (pe_num == IODA_INVALID_PE)
+                pe_num = pnv_ioda_alloc_pe(phb);
 
-        pe_num = pnv_ioda_alloc_pe(phb);
         if (pe_num == IODA_INVALID_PE) {
                 pr_warning("%s: Not enough PE# available for PCI bus %04x:%02x\n",
                         __func__, pci_domain_nr(bus), bus->number);
@@ -373,7 +761,7 @@ static void pnv_ioda_setup_bus_PE(struct pci_bus *bus, int all)
         }
 
         pe = &phb->ioda.pe_array[pe_num];
-        pe->flags = (all ? PNV_IODA_PE_BUS_ALL : PNV_IODA_PE_BUS);
+        pe->flags |= (all ? PNV_IODA_PE_BUS_ALL : PNV_IODA_PE_BUS);
         pe->pbus = bus;
         pe->pdev = NULL;
         pe->tce32_seg = -1;
@@ -441,8 +829,15 @@ static void pnv_ioda_setup_PEs(struct pci_bus *bus)
 static void pnv_pci_ioda_setup_PEs(void)
 {
         struct pci_controller *hose, *tmp;
+        struct pnv_phb *phb;
 
         list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
+                phb = hose->private_data;
+
+                /* M64 layout might affect PE allocation */
+                if (phb->alloc_m64_pe)
+                        phb->alloc_m64_pe(phb);
+
                 pnv_ioda_setup_PEs(hose->bus);
         }
 }
@@ -462,7 +857,7 @@ static void pnv_pci_ioda_dma_dev_setup(struct pnv_phb *phb, struct pci_dev *pdev
 
         pe = &phb->ioda.pe_array[pdn->pe_number];
         WARN_ON(get_dma_ops(&pdev->dev) != &dma_iommu_ops);
-        set_iommu_table_base(&pdev->dev, &pe->tce32_table);
+        set_iommu_table_base_and_group(&pdev->dev, &pe->tce32_table);
 }
 
 static int pnv_pci_ioda_dma_set_mask(struct pnv_phb *phb,
@@ -491,17 +886,26 @@ static int pnv_pci_ioda_dma_set_mask(struct pnv_phb *phb,
                 set_dma_ops(&pdev->dev, &dma_iommu_ops);
                 set_iommu_table_base(&pdev->dev, &pe->tce32_table);
         }
+        *pdev->dev.dma_mask = dma_mask;
         return 0;
 }
 
-static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe, struct pci_bus *bus)
+static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe,
+                                   struct pci_bus *bus,
+                                   bool add_to_iommu_group)
 {
         struct pci_dev *dev;
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
-                set_iommu_table_base_and_group(&dev->dev, &pe->tce32_table);
+                if (add_to_iommu_group)
+                        set_iommu_table_base_and_group(&dev->dev,
+                                                       &pe->tce32_table);
+                else
+                        set_iommu_table_base(&dev->dev, &pe->tce32_table);
+
                 if (dev->subordinate)
-                        pnv_ioda_setup_bus_dma(pe, dev->subordinate);
+                        pnv_ioda_setup_bus_dma(pe, dev->subordinate,
+                                               add_to_iommu_group);
         }
 }
 
@@ -513,15 +917,16 @@ static void pnv_pci_ioda1_tce_invalidate(struct pnv_ioda_pe *pe,
                 (__be64 __iomem *)pe->tce_inval_reg_phys :
                 (__be64 __iomem *)tbl->it_index;
         unsigned long start, end, inc;
+        const unsigned shift = tbl->it_page_shift;
 
         start = __pa(startp);
         end = __pa(endp);
 
         /* BML uses this case for p6/p7/galaxy2: Shift addr and put in node */
         if (tbl->it_busno) {
-                start <<= 12;
-                end <<= 12;
-                inc = 128 << 12;
+                start <<= shift;
+                end <<= shift;
+                inc = 128ull << shift;
                 start |= tbl->it_busno;
                 end |= tbl->it_busno;
         } else if (tbl->it_type & TCE_PCI_SWINV_PAIR) {
@@ -559,18 +964,19 @@ static void pnv_pci_ioda2_tce_invalidate(struct pnv_ioda_pe *pe,
         __be64 __iomem *invalidate = rm ?
                 (__be64 __iomem *)pe->tce_inval_reg_phys :
                 (__be64 __iomem *)tbl->it_index;
+        const unsigned shift = tbl->it_page_shift;
 
         /* We'll invalidate DMA address in PE scope */
-        start = 0x2ul << 60;
+        start = 0x2ull << 60;
         start |= (pe->pe_number & 0xFF);
         end = start;
 
         /* Figure out the start, end and step */
         inc = tbl->it_offset + (((u64)startp - tbl->it_base) / sizeof(u64));
-        start |= (inc << 12);
+        start |= (inc << shift);
         inc = tbl->it_offset + (((u64)endp - tbl->it_base) / sizeof(u64));
-        end |= (inc << 12);
-        inc = (0x1ul << 12);
+        end |= (inc << shift);
+        inc = (0x1ull << shift);
         mb();
 
         while (start <= end) {
@@ -654,7 +1060,7 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb,
         /* Setup linux iommu table */
         tbl = &pe->tce32_table;
         pnv_pci_setup_iommu_table(tbl, addr, TCE32_TABLE_SIZE * segs,
-                                  base << 28);
+                                  base << 28, IOMMU_PAGE_SHIFT_4K);
 
         /* OPAL variant of P7IOC SW invalidated TCEs */
         swinvp = of_get_property(phb->hose->dn, "ibm,opal-tce-kill", NULL);
@@ -677,7 +1083,7 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb,
         if (pe->pdev)
                 set_iommu_table_base_and_group(&pe->pdev->dev, tbl);
         else
-                pnv_ioda_setup_bus_dma(pe, pe->pbus);
+                pnv_ioda_setup_bus_dma(pe, pe->pbus, true);
 
         return;
  fail:
@@ -713,11 +1119,15 @@ static void pnv_pci_ioda2_set_bypass(struct iommu_table *tbl, bool enable)
                                                      0);
 
                 /*
-                 * We might want to reset the DMA ops of all devices on
-                 * this PE. However in theory, that shouldn't be necessary
-                 * as this is used for VFIO/KVM pass-through and the device
-                 * hasn't yet been returned to its kernel driver
+                 * EEH needs the mapping between IOMMU table and group
+                 * of those VFIO/KVM pass-through devices. We can postpone
+                 * resetting DMA ops until the DMA mask is configured in
+                 * host side.
                  */
+                if (pe->pdev)
+                        set_iommu_table_base(&pe->pdev->dev, tbl);
+                else
+                        pnv_ioda_setup_bus_dma(pe, pe->pbus, false);
         }
         if (rc)
                 pe_err(pe, "OPAL error %lld configuring bypass window\n", rc);
@@ -784,7 +1194,8 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
 
         /* Setup linux iommu table */
         tbl = &pe->tce32_table;
-        pnv_pci_setup_iommu_table(tbl, addr, tce_table_size, 0);
+        pnv_pci_setup_iommu_table(tbl, addr, tce_table_size, 0,
+                        IOMMU_PAGE_SHIFT_4K);
 
         /* OPAL variant of PHB3 invalidated TCEs */
         swinvp = of_get_property(phb->hose->dn, "ibm,opal-tce-kill", NULL);
@@ -805,7 +1216,7 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
         if (pe->pdev)
                 set_iommu_table_base_and_group(&pe->pdev->dev, tbl);
         else
-                pnv_ioda_setup_bus_dma(pe, pe->pbus);
+                pnv_ioda_setup_bus_dma(pe, pe->pbus, true);
 
         /* Also create a bypass window */
         pnv_pci_ioda2_setup_bypass_pe(phb, pe);
@@ -1055,9 +1466,6 @@ static void pnv_ioda_setup_pe_seg(struct pci_controller *hose,
                                 index++;
                         }
                 } else if (res->flags & IORESOURCE_MEM) {
-                        /* WARNING: Assumes M32 is mem region 0 in PHB. We need to
-                         * harden that algorithm when we start supporting M64
-                         */
                         region.start = res->start -
                                        hose->mem_offset[0] -
                                        phb->ioda.m32_pci_base;
@@ -1141,9 +1549,8 @@ static void pnv_pci_ioda_fixup(void)
         pnv_pci_ioda_create_dbgfs();
 
 #ifdef CONFIG_EEH
-        eeh_probe_mode_set(EEH_PROBE_MODE_DEV);
-        eeh_addr_cache_build();
         eeh_init();
+        eeh_addr_cache_build();
 #endif
 }
 
@@ -1178,7 +1585,10 @@ static resource_size_t pnv_pci_window_alignment(struct pci_bus *bus,
                 bridge = bridge->bus->self;
         }
 
-        /* We need support prefetchable memory window later */
+        /* We fail back to M32 if M64 isn't supported */
+        if (phb->ioda.m64_segsize &&
+            pnv_pci_is_mem_pref_64(type))
+                return phb->ioda.m64_segsize;
         if (type & IORESOURCE_MEM)
                 return phb->ioda.m32_segsize;
 
@@ -1299,6 +1709,10 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
         prop32 = of_get_property(np, "ibm,opal-reserved-pe", NULL);
         if (prop32)
                 phb->ioda.reserved_pe = be32_to_cpup(prop32);
+
+        /* Parse 64-bit MMIO range */
+        pnv_ioda_parse_m64_window(phb);
+
         phb->ioda.m32_size = resource_size(&hose->mem_resources[0]);
         /* FW Has already off top 64k of M32 space (MSI space) */
         phb->ioda.m32_size += 0x10000;
@@ -1334,14 +1748,6 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
         /* Calculate how many 32-bit TCE segments we have */
         phb->ioda.tce32_count = phb->ioda.m32_pci_base >> 28;
 
-        /* Clear unusable m64 */
-        hose->mem_resources[1].flags = 0;
-        hose->mem_resources[1].start = 0;
-        hose->mem_resources[1].end = 0;
-        hose->mem_resources[2].flags = 0;
-        hose->mem_resources[2].start = 0;
-        hose->mem_resources[2].end = 0;
-
 #if 0 /* We should really do that ... */
         rc = opal_pci_set_phb_mem_window(opal->phb_id,
                                          window_type,
@@ -1351,14 +1757,21 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
                                          segment_size);
 #endif
 
-        pr_info("  %d (%d) PE's M32: 0x%x [segment=0x%x]"
-                " IO: 0x%x [segment=0x%x]\n",
-                phb->ioda.total_pe,
-                phb->ioda.reserved_pe,
-                phb->ioda.m32_size, phb->ioda.m32_segsize,
-                phb->ioda.io_size, phb->ioda.io_segsize);
+        pr_info("  %03d (%03d) PE's M32: 0x%x [segment=0x%x]\n",
+                phb->ioda.total_pe, phb->ioda.reserved_pe,
+                phb->ioda.m32_size, phb->ioda.m32_segsize);
+        if (phb->ioda.m64_size)
+                pr_info("                 M64: 0x%lx [segment=0x%lx]\n",
+                        phb->ioda.m64_size, phb->ioda.m64_segsize);
+        if (phb->ioda.io_size)
+                pr_info("                  IO: 0x%x [segment=0x%x]\n",
+                        phb->ioda.io_size, phb->ioda.io_segsize);
+
 
         phb->hose->ops = &pnv_pci_ops;
+        phb->get_pe_state = pnv_ioda_get_pe_state;
+        phb->freeze_pe = pnv_ioda_freeze_pe;
+        phb->unfreeze_pe = pnv_ioda_unfreeze_pe;
 #ifdef CONFIG_EEH
         phb->eeh_ops = &ioda_eeh_ops;
 #endif
@@ -1404,6 +1817,10 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
                 ioda_eeh_phb_reset(hose, EEH_RESET_FUNDAMENTAL);
                 ioda_eeh_phb_reset(hose, OPAL_DEASSERT_RESET);
         }
+
+        /* Configure M64 window */
+        if (phb->init_m64 && phb->init_m64(phb))
+                hose->mem_resources[1].flags = 0;
 }
 
 void __init pnv_pci_init_ioda2_phb(struct device_node *np)
diff --git a/arch/powerpc/platforms/powernv/pci-p5ioc2.c b/arch/powerpc/platforms/powernv/pci-p5ioc2.c
index e3807d69393e..94ce3481490b 100644
--- a/arch/powerpc/platforms/powernv/pci-p5ioc2.c
+++ b/arch/powerpc/platforms/powernv/pci-p5ioc2.c
@@ -172,7 +172,8 @@ static void __init pnv_pci_init_p5ioc2_phb(struct device_node *np, u64 hub_id,
         /* Setup TCEs */
         phb->dma_dev_setup = pnv_pci_p5ioc2_dma_dev_setup;
         pnv_pci_setup_iommu_table(&phb->p5ioc2.iommu_table,
-                                  tce_mem, tce_size, 0);
+                                  tce_mem, tce_size, 0,
+                                  IOMMU_PAGE_SHIFT_4K);
 }
 
 void __init pnv_pci_init_p5ioc2_hub(struct device_node *np)
diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
index f91a4e5d872e..b854b57ed5e1 100644
--- a/arch/powerpc/platforms/powernv/pci.c
+++ b/arch/powerpc/platforms/powernv/pci.c
@@ -132,61 +132,78 @@ static void pnv_pci_dump_p7ioc_diag_data(struct pci_controller *hose,
 
         data = (struct OpalIoP7IOCPhbErrorData *)common;
         pr_info("P7IOC PHB#%d Diag-data (Version: %d)\n",
-                hose->global_number, common->version);
+                hose->global_number, be32_to_cpu(common->version));
 
         if (data->brdgCtl)
                 pr_info("brdgCtl:     %08x\n",
-                        data->brdgCtl);
+                        be32_to_cpu(data->brdgCtl));
         if (data->portStatusReg || data->rootCmplxStatus ||
             data->busAgentStatus)
                 pr_info("UtlSts:      %08x %08x %08x\n",
-                        data->portStatusReg, data->rootCmplxStatus,
-                        data->busAgentStatus);
+                        be32_to_cpu(data->portStatusReg),
+                        be32_to_cpu(data->rootCmplxStatus),
+                        be32_to_cpu(data->busAgentStatus));
         if (data->deviceStatus || data->slotStatus   ||
             data->linkStatus   || data->devCmdStatus ||
             data->devSecStatus)
                 pr_info("RootSts:     %08x %08x %08x %08x %08x\n",
-                        data->deviceStatus, data->slotStatus,
-                        data->linkStatus, data->devCmdStatus,
-                        data->devSecStatus);
+                        be32_to_cpu(data->deviceStatus),
+                        be32_to_cpu(data->slotStatus),
+                        be32_to_cpu(data->linkStatus),
+                        be32_to_cpu(data->devCmdStatus),
+                        be32_to_cpu(data->devSecStatus));
         if (data->rootErrorStatus   || data->uncorrErrorStatus ||
             data->corrErrorStatus)
                 pr_info("RootErrSts:  %08x %08x %08x\n",
-                        data->rootErrorStatus, data->uncorrErrorStatus,
-                        data->corrErrorStatus);
+                        be32_to_cpu(data->rootErrorStatus),
+                        be32_to_cpu(data->uncorrErrorStatus),
+                        be32_to_cpu(data->corrErrorStatus));
         if (data->tlpHdr1 || data->tlpHdr2 ||
             data->tlpHdr3 || data->tlpHdr4)
                 pr_info("RootErrLog:  %08x %08x %08x %08x\n",
-                        data->tlpHdr1, data->tlpHdr2,
-                        data->tlpHdr3, data->tlpHdr4);
+                        be32_to_cpu(data->tlpHdr1),
+                        be32_to_cpu(data->tlpHdr2),
+                        be32_to_cpu(data->tlpHdr3),
+                        be32_to_cpu(data->tlpHdr4));
         if (data->sourceId || data->errorClass ||
             data->correlator)
                 pr_info("RootErrLog1: %08x %016llx %016llx\n",
-                        data->sourceId, data->errorClass,
-                        data->correlator);
+                        be32_to_cpu(data->sourceId),
+                        be64_to_cpu(data->errorClass),
+                        be64_to_cpu(data->correlator));
         if (data->p7iocPlssr || data->p7iocCsr)
                 pr_info("PhbSts:      %016llx %016llx\n",
-                        data->p7iocPlssr, data->p7iocCsr);
+                        be64_to_cpu(data->p7iocPlssr),
+                        be64_to_cpu(data->p7iocCsr));
         if (data->lemFir)
                 pr_info("Lem:         %016llx %016llx %016llx\n",
-                        data->lemFir, data->lemErrorMask,
-                        data->lemWOF);
+                        be64_to_cpu(data->lemFir),
+                        be64_to_cpu(data->lemErrorMask),
+                        be64_to_cpu(data->lemWOF));
         if (data->phbErrorStatus)
                 pr_info("PhbErr:      %016llx %016llx %016llx %016llx\n",
-                        data->phbErrorStatus, data->phbFirstErrorStatus,
-                        data->phbErrorLog0, data->phbErrorLog1);
+                        be64_to_cpu(data->phbErrorStatus),
+                        be64_to_cpu(data->phbFirstErrorStatus),
+                        be64_to_cpu(data->phbErrorLog0),
+                        be64_to_cpu(data->phbErrorLog1));
         if (data->mmioErrorStatus)
                 pr_info("OutErr:      %016llx %016llx %016llx %016llx\n",
-                        data->mmioErrorStatus, data->mmioFirstErrorStatus,
-                        data->mmioErrorLog0, data->mmioErrorLog1);
+                        be64_to_cpu(data->mmioErrorStatus),
+                        be64_to_cpu(data->mmioFirstErrorStatus),
+                        be64_to_cpu(data->mmioErrorLog0),
+                        be64_to_cpu(data->mmioErrorLog1));
         if (data->dma0ErrorStatus)
                 pr_info("InAErr:      %016llx %016llx %016llx %016llx\n",
-                        data->dma0ErrorStatus, data->dma0FirstErrorStatus,
-                        data->dma0ErrorLog0, data->dma0ErrorLog1);
+                        be64_to_cpu(data->dma0ErrorStatus),
+                        be64_to_cpu(data->dma0FirstErrorStatus),
+                        be64_to_cpu(data->dma0ErrorLog0),
+                        be64_to_cpu(data->dma0ErrorLog1));
         if (data->dma1ErrorStatus)
                 pr_info("InBErr:      %016llx %016llx %016llx %016llx\n",
-                        data->dma1ErrorStatus, data->dma1FirstErrorStatus,
-                        data->dma1ErrorLog0, data->dma1ErrorLog1);
+                        be64_to_cpu(data->dma1ErrorStatus),
+                        be64_to_cpu(data->dma1FirstErrorStatus),
+                        be64_to_cpu(data->dma1ErrorLog0),
+                        be64_to_cpu(data->dma1ErrorLog1));
 
         for (i = 0; i < OPAL_P7IOC_NUM_PEST_REGS; i++) {
                 if ((data->pestA[i] >> 63) == 0 &&
@@ -194,7 +211,8 @@ static void pnv_pci_dump_p7ioc_diag_data(struct pci_controller *hose,
                         continue;
 
                 pr_info("PE[%3d] A/B: %016llx %016llx\n",
-                        i, data->pestA[i], data->pestB[i]);
+                        i, be64_to_cpu(data->pestA[i]),
+                        be64_to_cpu(data->pestB[i]));
         }
 }
 
@@ -319,43 +337,52 @@ void pnv_pci_dump_phb_diag_data(struct pci_controller *hose,
 static void pnv_pci_handle_eeh_config(struct pnv_phb *phb, u32 pe_no)
 {
         unsigned long flags, rc;
-        int has_diag;
+        int has_diag, ret = 0;
 
         spin_lock_irqsave(&phb->lock, flags);
 
+        /* Fetch PHB diag-data */
         rc = opal_pci_get_phb_diag_data2(phb->opal_id, phb->diag.blob,
                                          PNV_PCI_DIAG_BUF_SIZE);
         has_diag = (rc == OPAL_SUCCESS);
 
-        rc = opal_pci_eeh_freeze_clear(phb->opal_id, pe_no,
+        /* If PHB supports compound PE, to handle it */
+        if (phb->unfreeze_pe) {
+                ret = phb->unfreeze_pe(phb,
+                                       pe_no,
                                        OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);
-        if (rc) {
-                pr_warning("PCI %d: Failed to clear EEH freeze state"
-                           " for PE#%d, err %ld\n",
-                           phb->hose->global_number, pe_no, rc);
-
-                /* For now, let's only display the diag buffer when we fail to clear
-                 * the EEH status. We'll do more sensible things later when we have
-                 * proper EEH support. We need to make sure we don't pollute ourselves
-                 * with the normal errors generated when probing empty slots
-                 */
-                if (has_diag)
-                        pnv_pci_dump_phb_diag_data(phb->hose, phb->diag.blob);
-                else
-                        pr_warning("PCI %d: No diag data available\n",
-                                   phb->hose->global_number);
+        } else {
+                rc = opal_pci_eeh_freeze_clear(phb->opal_id,
+                                             pe_no,
+                                             OPAL_EEH_ACTION_CLEAR_FREEZE_ALL);
+                if (rc) {
+                        pr_warn("%s: Failure %ld clearing frozen "
+                                "PHB#%x-PE#%x\n",
+                                __func__, rc, phb->hose->global_number,
+                                pe_no);
+                        ret = -EIO;
+                }
         }
 
+        /*
+         * For now, let's only display the diag buffer when we fail to clear
+         * the EEH status. We'll do more sensible things later when we have
+         * proper EEH support. We need to make sure we don't pollute ourselves
+         * with the normal errors generated when probing empty slots
+         */
+        if (has_diag && ret)
+                pnv_pci_dump_phb_diag_data(phb->hose, phb->diag.blob);
+
         spin_unlock_irqrestore(&phb->lock, flags);
 }
 
 static void pnv_pci_config_check_eeh(struct pnv_phb *phb,
                                      struct device_node *dn)
 {
-        s64     rc;
         u8      fstate;
         __be16  pcierr;
-        u32     pe_no;
+        int     pe_no;
+        s64     rc;
 
         /*
          * Get the PE#. During the PCI probe stage, we might not
@@ -370,20 +397,42 @@ static void pnv_pci_config_check_eeh(struct pnv_phb *phb,
                         pe_no = phb->ioda.reserved_pe;
         }
 
-        /* Read freeze status */
-        rc = opal_pci_eeh_freeze_status(phb->opal_id, pe_no, &fstate, &pcierr,
-                                        NULL);
-        if (rc) {
-                pr_warning("%s: Can't read EEH status (PE#%d) for "
-                           "%s, err %lld\n",
-                           __func__, pe_no, dn->full_name, rc);
-                return;
+        /*
+         * Fetch frozen state. If the PHB support compound PE,
+         * we need handle that case.
+         */
+        if (phb->get_pe_state) {
+                fstate = phb->get_pe_state(phb, pe_no);
+        } else {
+                rc = opal_pci_eeh_freeze_status(phb->opal_id,
+                                                pe_no,
+                                                &fstate,
+                                                &pcierr,
+                                                NULL);
+                if (rc) {
+                        pr_warn("%s: Failure %lld getting PHB#%x-PE#%x state\n",
+                                __func__, rc, phb->hose->global_number, pe_no);
+                        return;
+                }
         }
+
         cfg_dbg(" -> EEH check, bdfn=%04x PE#%d fstate=%x\n",
                 (PCI_DN(dn)->busno << 8) | (PCI_DN(dn)->devfn),
                 pe_no, fstate);
-        if (fstate != 0)
+
+        /* Clear the frozen state if applicable */
+        if (fstate == OPAL_EEH_STOPPED_MMIO_FREEZE ||
+            fstate == OPAL_EEH_STOPPED_DMA_FREEZE  ||
+            fstate == OPAL_EEH_STOPPED_MMIO_DMA_FREEZE) {
+                /*
+                 * If PHB supports compound PE, freeze it for
+                 * consistency.
+                 */
+                if (phb->freeze_pe)
+                        phb->freeze_pe(phb, pe_no);
+
                 pnv_pci_handle_eeh_config(phb, pe_no);
+        }
 }
 
 int pnv_pci_cfg_read(struct device_node *dn,
@@ -564,10 +613,11 @@ static int pnv_tce_build(struct iommu_table *tbl, long index, long npages,
                 proto_tce |= TCE_PCI_WRITE;
 
         tces = tcep = ((__be64 *)tbl->it_base) + index - tbl->it_offset;
-        rpn = __pa(uaddr) >> TCE_SHIFT;
+        rpn = __pa(uaddr) >> tbl->it_page_shift;
 
         while (npages--)
-                *(tcep++) = cpu_to_be64(proto_tce | (rpn++ << TCE_RPN_SHIFT));
+                *(tcep++) = cpu_to_be64(proto_tce |
+                                (rpn++ << tbl->it_page_shift));
 
         /* Some implementations won't cache invalid TCEs and thus may not
          * need that flush. We'll probably turn it_type into a bit mask
@@ -627,11 +677,11 @@ static void pnv_tce_free_rm(struct iommu_table *tbl, long index, long npages)
 
 void pnv_pci_setup_iommu_table(struct iommu_table *tbl,
                                void *tce_mem, u64 tce_size,
-                               u64 dma_offset)
+                               u64 dma_offset, unsigned page_shift)
 {
         tbl->it_blocksize = 16;
         tbl->it_base = (unsigned long)tce_mem;
-        tbl->it_page_shift = IOMMU_PAGE_SHIFT_4K;
+        tbl->it_page_shift = page_shift;
         tbl->it_offset = dma_offset >> tbl->it_page_shift;
         tbl->it_index = 0;
         tbl->it_size = tce_size >> 3;
@@ -656,7 +706,7 @@ static struct iommu_table *pnv_pci_setup_bml_iommu(struct pci_controller *hose)
         if (WARN_ON(!tbl))
                 return NULL;
         pnv_pci_setup_iommu_table(tbl, __va(be64_to_cpup(basep)),
-                                  be32_to_cpup(sizep), 0);
+                                  be32_to_cpup(sizep), 0, IOMMU_PAGE_SHIFT_4K);
         iommu_init_table(tbl, hose->node);
         iommu_register_group(tbl, pci_domain_nr(hose->bus), 0);
 
@@ -842,5 +892,4 @@ static int __init tce_iommu_bus_notifier_init(void)
         bus_register_notifier(&pci_bus_type, &tce_iommu_bus_nb);
         return 0;
 }
-
-subsys_initcall_sync(tce_iommu_bus_notifier_init);
+machine_subsys_initcall_sync(powernv, tce_iommu_bus_notifier_init);
diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
index 676232c34328..48494d4b6058 100644
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@ -21,6 +21,8 @@ enum pnv_phb_model {
 #define PNV_IODA_PE_DEV         (1 << 0)        /* PE has single PCI device     */
 #define PNV_IODA_PE_BUS         (1 << 1)        /* PE has primary PCI bus       */
 #define PNV_IODA_PE_BUS_ALL     (1 << 2)        /* PE has subordinate buses     */
+#define PNV_IODA_PE_MASTER      (1 << 3)        /* Master PE in compound case   */
+#define PNV_IODA_PE_SLAVE       (1 << 4)        /* Slave PE in compound case    */
 
 /* Data associated with a PE, including IOMMU tracking etc.. */
 struct pnv_phb;
@@ -64,6 +66,10 @@ struct pnv_ioda_pe {
          */
         int                     mve_number;
 
+        /* PEs in compound case */
+        struct pnv_ioda_pe      *master;
+        struct list_head        slaves;
+
         /* Link in list of PE#s */
         struct list_head        dma_link;
         struct list_head        list;
@@ -119,6 +125,12 @@ struct pnv_phb {
         void (*fixup_phb)(struct pci_controller *hose);
         u32 (*bdfn_to_pe)(struct pnv_phb *phb, struct pci_bus *bus, u32 devfn);
         void (*shutdown)(struct pnv_phb *phb);
+        int (*init_m64)(struct pnv_phb *phb);
+        void (*alloc_m64_pe)(struct pnv_phb *phb);
+        int (*pick_m64_pe)(struct pnv_phb *phb, struct pci_bus *bus, int all);
+        int (*get_pe_state)(struct pnv_phb *phb, int pe_no);
+        void (*freeze_pe)(struct pnv_phb *phb, int pe_no);
+        int (*unfreeze_pe)(struct pnv_phb *phb, int pe_no, int opt);
 
         union {
                 struct {
@@ -129,9 +141,20 @@ struct pnv_phb {
                         /* Global bridge info */
                         unsigned int            total_pe;
                         unsigned int            reserved_pe;
+
+                        /* 32-bit MMIO window */
                         unsigned int            m32_size;
                         unsigned int            m32_segsize;
                         unsigned int            m32_pci_base;
+
+                        /* 64-bit MMIO window */
+                        unsigned int            m64_bar_idx;
+                        unsigned long           m64_size;
+                        unsigned long           m64_segsize;
+                        unsigned long           m64_base;
+                        unsigned long           m64_bar_alloc;
+
+                        /* IO ports */
                         unsigned int            io_size;
                         unsigned int            io_segsize;
                         unsigned int            io_pci_base;
@@ -198,7 +221,7 @@ int pnv_pci_cfg_write(struct device_node *dn,
                       int where, int size, u32 val);
 extern void pnv_pci_setup_iommu_table(struct iommu_table *tbl,
                                       void *tce_mem, u64 tce_size,
-                                      u64 dma_offset);
+                                      u64 dma_offset, unsigned page_shift);
 extern void pnv_pci_init_p5ioc2_hub(struct device_node *np);
 extern void pnv_pci_init_ioda_hub(struct device_node *np);
 extern void pnv_pci_init_ioda2_phb(struct device_node *np);
diff --git a/arch/powerpc/platforms/powernv/rng.c b/arch/powerpc/platforms/powernv/rng.c
index 1cb160dc1609..80db43944afe 100644
--- a/arch/powerpc/platforms/powernv/rng.c
+++ b/arch/powerpc/platforms/powernv/rng.c
@@ -123,4 +123,4 @@ static __init int rng_init(void)
 
         return 0;
 }
-subsys_initcall(rng_init);
+machine_subsys_initcall(powernv, rng_init);
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index d9b88fa7c5a3..5a0e2dc6de5f 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -264,6 +264,8 @@ static void __init pnv_setup_machdep_opal(void)
         ppc_md.halt = pnv_halt;
         ppc_md.machine_check_exception = opal_machine_check;
         ppc_md.mce_check_early_recovery = opal_mce_check_early_recovery;
+        ppc_md.hmi_exception_early = opal_hmi_exception_early;
+        ppc_md.handle_hmi_exception = opal_handle_hmi_exception;
 }
 
 #ifdef CONFIG_PPC_POWERNV_RTAS
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 2d0b4d68a40a..a2450b8a50a5 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -400,10 +400,10 @@ out:
 static ssize_t dlpar_cpu_probe(const char *buf, size_t count)
 {
         struct device_node *dn, *parent;
-        unsigned long drc_index;
+        u32 drc_index;
         int rc;
 
-        rc = strict_strtoul(buf, 0, &drc_index);
+        rc = kstrtou32(buf, 0, &drc_index);
         if (rc)
                 return -EINVAL;
 
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index 7d61498e45c0..1062f71f5a85 100644
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -29,6 +29,7 @@
 #include <asm/lppaca.h>
 #include <asm/debug.h>
 #include <asm/plpar_wrappers.h>
+#include <asm/machdep.h>
 
 struct dtl {
         struct dtl_entry        *buf;
@@ -391,4 +392,4 @@ err_remove_dir:
 err:
         return rc;
 }
-arch_initcall(dtl_init);
+machine_arch_initcall(pseries, dtl_init);
diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c
index 0bec0c02c5e7..b08053819d99 100644
--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
@@ -89,26 +89,26 @@ static int pseries_eeh_init(void)
          * of domain/bus/slot/function for EEH RTAS operations.
          */
         if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE) {
-                pr_warning("%s: RTAS service <ibm,set-eeh-option> invalid\n",
+                pr_warn("%s: RTAS service <ibm,set-eeh-option> invalid\n",
                         __func__);
                 return -EINVAL;
         } else if (ibm_set_slot_reset == RTAS_UNKNOWN_SERVICE) {
-                pr_warning("%s: RTAS service <ibm,set-slot-reset> invalid\n",
+                pr_warn("%s: RTAS service <ibm,set-slot-reset> invalid\n",
                         __func__);
                 return -EINVAL;
         } else if (ibm_read_slot_reset_state2 == RTAS_UNKNOWN_SERVICE &&
                    ibm_read_slot_reset_state == RTAS_UNKNOWN_SERVICE) {
-                pr_warning("%s: RTAS service <ibm,read-slot-reset-state2> and "
+                pr_warn("%s: RTAS service <ibm,read-slot-reset-state2> and "
                         "<ibm,read-slot-reset-state> invalid\n",
                         __func__);
                 return -EINVAL;
         } else if (ibm_slot_error_detail == RTAS_UNKNOWN_SERVICE) {
-                pr_warning("%s: RTAS service <ibm,slot-error-detail> invalid\n",
+                pr_warn("%s: RTAS service <ibm,slot-error-detail> invalid\n",
                         __func__);
                 return -EINVAL;
         } else if (ibm_configure_pe == RTAS_UNKNOWN_SERVICE &&
                    ibm_configure_bridge == RTAS_UNKNOWN_SERVICE) {
-                pr_warning("%s: RTAS service <ibm,configure-pe> and "
+                pr_warn("%s: RTAS service <ibm,configure-pe> and "
                         "<ibm,configure-bridge> invalid\n",
                         __func__);
                 return -EINVAL;
@@ -118,17 +118,17 @@ static int pseries_eeh_init(void)
         spin_lock_init(&slot_errbuf_lock);
         eeh_error_buf_size = rtas_token("rtas-error-log-max");
         if (eeh_error_buf_size == RTAS_UNKNOWN_SERVICE) {
-                pr_warning("%s: unknown EEH error log size\n",
+                pr_warn("%s: unknown EEH error log size\n",
                         __func__);
                 eeh_error_buf_size = 1024;
         } else if (eeh_error_buf_size > RTAS_ERROR_LOG_MAX) {
-                pr_warning("%s: EEH error log size %d exceeds the maximal %d\n",
+                pr_warn("%s: EEH error log size %d exceeds the maximal %d\n",
                         __func__, eeh_error_buf_size, RTAS_ERROR_LOG_MAX);
                 eeh_error_buf_size = RTAS_ERROR_LOG_MAX;
         }
 
         /* Set EEH probe mode */
-        eeh_probe_mode_set(EEH_PROBE_MODE_DEVTREE);
+        eeh_add_flag(EEH_PROBE_MODE_DEVTREE | EEH_ENABLE_IO_FOR_LOG);
 
         return 0;
 }
@@ -270,7 +270,7 @@ static void *pseries_eeh_of_probe(struct device_node *dn, void *flag)
         /* Retrieve the device address */
         regs = of_get_property(dn, "reg", NULL);
         if (!regs) {
-                pr_warning("%s: OF node property %s::reg not found\n",
+                pr_warn("%s: OF node property %s::reg not found\n",
                         __func__, dn->full_name);
                 return NULL;
         }
@@ -297,7 +297,7 @@ static void *pseries_eeh_of_probe(struct device_node *dn, void *flag)
                         enable = 1;
 
                 if (enable) {
-                        eeh_set_enable(true);
+                        eeh_add_flag(EEH_ENABLED);
                         eeh_add_to_parent_pe(edev);
 
                         pr_debug("%s: EEH enabled on %s PHB#%d-PE#%x, config addr#%x\n",
@@ -398,7 +398,7 @@ static int pseries_eeh_get_pe_addr(struct eeh_pe *pe)
                                 pe->config_addr, BUID_HI(pe->phb->buid),
                                 BUID_LO(pe->phb->buid), 0);
                 if (ret) {
-                        pr_warning("%s: Failed to get address for PHB#%d-PE#%x\n",
+                        pr_warn("%s: Failed to get address for PHB#%d-PE#%x\n",
                                 __func__, pe->phb->global_number, pe->config_addr);
                         return 0;
                 }
@@ -411,7 +411,7 @@ static int pseries_eeh_get_pe_addr(struct eeh_pe *pe)
                                 pe->config_addr, BUID_HI(pe->phb->buid),
                                 BUID_LO(pe->phb->buid), 0);
                 if (ret) {
-                        pr_warning("%s: Failed to get address for PHB#%d-PE#%x\n",
+                        pr_warn("%s: Failed to get address for PHB#%d-PE#%x\n",
                                 __func__, pe->phb->global_number, pe->config_addr);
                         return 0;
                 }
@@ -584,17 +584,17 @@ static int pseries_eeh_wait_state(struct eeh_pe *pe, int max_wait)
                         return ret;
 
                 if (max_wait <= 0) {
-                        pr_warning("%s: Timeout when getting PE's state (%d)\n",
+                        pr_warn("%s: Timeout when getting PE's state (%d)\n",
                                 __func__, max_wait);
                         return EEH_STATE_NOT_SUPPORT;
                 }
 
                 if (mwait <= 0) {
-                        pr_warning("%s: Firmware returned bad wait value %d\n",
+                        pr_warn("%s: Firmware returned bad wait value %d\n",
                                 __func__, mwait);
                         mwait = EEH_STATE_MIN_WAIT_TIME;
                 } else if (mwait > EEH_STATE_MAX_WAIT_TIME) {
-                        pr_warning("%s: Firmware returned too long wait value %d\n",
+                        pr_warn("%s: Firmware returned too long wait value %d\n",
                                 __func__, mwait);
                         mwait = EEH_STATE_MAX_WAIT_TIME;
                 }
@@ -675,7 +675,7 @@ static int pseries_eeh_configure_bridge(struct eeh_pe *pe)
         }
 
         if (ret)
-                pr_warning("%s: Unable to configure bridge PHB#%d-PE#%x (%d)\n",
+                pr_warn("%s: Unable to configure bridge PHB#%d-PE#%x (%d)\n",
                         __func__, pe->phb->global_number, pe->addr, ret);
 
         return ret;
@@ -743,10 +743,7 @@ static struct eeh_ops pseries_eeh_ops = {
  */
 static int __init eeh_pseries_init(void)
 {
-        int ret = -EINVAL;
-
-        if (!machine_is(pseries))
-                return ret;
+        int ret;
 
         ret = eeh_ops_register(&pseries_eeh_ops);
         if (!ret)
@@ -757,5 +754,4 @@ static int __init eeh_pseries_init(void)
 
         return ret;
 }
-
-early_initcall(eeh_pseries_init);
+machine_early_initcall(pseries, eeh_pseries_init);
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 7995135170a3..c904583baf4b 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -146,7 +146,7 @@ static inline int pseries_remove_memblock(unsigned long base,
 }
 static inline int pseries_remove_mem_node(struct device_node *np)
 {
-        return -EOPNOTSUPP;
+        return 0;
 }
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 
@@ -194,7 +194,7 @@ static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
         if (!memblock_size)
                 return -EINVAL;
 
-        p = (u32 *)of_get_property(pr->dn, "ibm,dynamic-memory", NULL);
+        p = (u32 *) pr->old_prop->value;
         if (!p)
                 return -EINVAL;
 
diff --git a/arch/powerpc/platforms/pseries/hvCall.S b/arch/powerpc/platforms/pseries/hvCall.S
index 99ecf0a5a929..3fda3f17b84e 100644
--- a/arch/powerpc/platforms/pseries/hvCall.S
+++ b/arch/powerpc/platforms/pseries/hvCall.S
@@ -12,9 +12,13 @@
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
 #include <asm/ptrace.h>
+#include <asm/jump_label.h>
+
+        .section        ".text"
         
 #ifdef CONFIG_TRACEPOINTS
 
+#ifndef CONFIG_JUMP_LABEL
         .section        ".toc","aw"
 
         .globl hcall_tracepoint_refcount
@@ -22,21 +26,13 @@ hcall_tracepoint_refcount:
         .llong  0
 
         .section        ".text"
+#endif
 
 /*
  * precall must preserve all registers.  use unused STK_PARAM()
- * areas to save snapshots and opcode. We branch around this
- * in early init (eg when populating the MMU hashtable) by using an
- * unconditional cpu feature.
+ * areas to save snapshots and opcode.
  */
 #define HCALL_INST_PRECALL(FIRST_REG)                           \
-BEGIN_FTR_SECTION;                                              \
-        b       1f;                                             \
-END_FTR_SECTION(0, 1);                                          \
-        ld      r12,hcall_tracepoint_refcount@toc(r2);          \
-        std     r12,32(r1);                                     \
-        cmpdi   r12,0;                                          \
-        beq+    1f;                                             \
         mflr    r0;                                             \
         std     r3,STK_PARAM(R3)(r1);                           \
         std     r4,STK_PARAM(R4)(r1);                           \
@@ -50,45 +46,29 @@ END_FTR_SECTION(0, 1);						\
         addi    r4,r1,STK_PARAM(FIRST_REG);                     \
         stdu    r1,-STACK_FRAME_OVERHEAD(r1);                   \
         bl      __trace_hcall_entry;                            \
-        addi    r1,r1,STACK_FRAME_OVERHEAD;                     \
-        ld      r0,16(r1);                                      \
-        ld      r3,STK_PARAM(R3)(r1);                           \
-        ld      r4,STK_PARAM(R4)(r1);                           \
-        ld      r5,STK_PARAM(R5)(r1);                           \
-        ld      r6,STK_PARAM(R6)(r1);                           \
-        ld      r7,STK_PARAM(R7)(r1);                           \
-        ld      r8,STK_PARAM(R8)(r1);                           \
-        ld      r9,STK_PARAM(R9)(r1);                           \
-        ld      r10,STK_PARAM(R10)(r1);                         \
-        mtlr    r0;                                             \
-1:
+        ld      r3,STACK_FRAME_OVERHEAD+STK_PARAM(R3)(r1);      \
+        ld      r4,STACK_FRAME_OVERHEAD+STK_PARAM(R4)(r1);      \
+        ld      r5,STACK_FRAME_OVERHEAD+STK_PARAM(R5)(r1);      \
+        ld      r6,STACK_FRAME_OVERHEAD+STK_PARAM(R6)(r1);      \
+        ld      r7,STACK_FRAME_OVERHEAD+STK_PARAM(R7)(r1);      \
+        ld      r8,STACK_FRAME_OVERHEAD+STK_PARAM(R8)(r1);      \
+        ld      r9,STACK_FRAME_OVERHEAD+STK_PARAM(R9)(r1);      \
+        ld      r10,STACK_FRAME_OVERHEAD+STK_PARAM(R10)(r1)
 
 /*
  * postcall is performed immediately before function return which
- * allows liberal use of volatile registers.  We branch around this
- * in early init (eg when populating the MMU hashtable) by using an
- * unconditional cpu feature.
+ * allows liberal use of volatile registers.
  */
 #define __HCALL_INST_POSTCALL                                   \
-BEGIN_FTR_SECTION;                                              \
-        b       1f;                                             \
-END_FTR_SECTION(0, 1);                                          \
-        ld      r12,32(r1);                                     \
-        cmpdi   r12,0;                                          \
-        beq+    1f;                                             \
-        mflr    r0;                                             \
-        ld      r6,STK_PARAM(R3)(r1);                           \
-        std     r3,STK_PARAM(R3)(r1);                           \
+        ld      r0,STACK_FRAME_OVERHEAD+STK_PARAM(R3)(r1);      \
+        std     r3,STACK_FRAME_OVERHEAD+STK_PARAM(R3)(r1);      \
         mr      r4,r3;                                          \
-        mr      r3,r6;                                          \
-        std     r0,16(r1);                                      \
-        stdu    r1,-STACK_FRAME_OVERHEAD(r1);                   \
+        mr      r3,r0;                                          \
         bl      __trace_hcall_exit;                             \
+        ld      r0,STACK_FRAME_OVERHEAD+16(r1);                 \
         addi    r1,r1,STACK_FRAME_OVERHEAD;                     \
-        ld      r0,16(r1);                                      \
         ld      r3,STK_PARAM(R3)(r1);                           \
-        mtlr    r0;                                             \
-1:
+        mtlr    r0
 
 #define HCALL_INST_POSTCALL_NORETS                              \
         li      r5,0;                                           \
@@ -98,37 +78,62 @@ END_FTR_SECTION(0, 1);						\
         mr      r5,BUFREG;                                      \
         __HCALL_INST_POSTCALL
 
+#ifdef CONFIG_JUMP_LABEL
+#define HCALL_BRANCH(LABEL)                                     \
+        ARCH_STATIC_BRANCH(LABEL, hcall_tracepoint_key)
+#else
+
+/*
+ * We branch around this in early init (eg when populating the MMU
+ * hashtable) by using an unconditional cpu feature.
+ */
+#define HCALL_BRANCH(LABEL)                                     \
+BEGIN_FTR_SECTION;                                              \
+        b       1f;                                             \
+END_FTR_SECTION(0, 1);                                          \
+        ld      r12,hcall_tracepoint_refcount@toc(r2);          \
+        std     r12,32(r1);                                     \
+        cmpdi   r12,0;                                          \
+        bne-    LABEL;                                          \
+1:
+#endif
+
 #else
 #define HCALL_INST_PRECALL(FIRST_ARG)
 #define HCALL_INST_POSTCALL_NORETS
 #define HCALL_INST_POSTCALL(BUFREG)
+#define HCALL_BRANCH(LABEL)
 #endif
 
-        .text
-
 _GLOBAL_TOC(plpar_hcall_norets)
         HMT_MEDIUM
 
         mfcr    r0
         stw     r0,8(r1)
-
-        HCALL_INST_PRECALL(R4)
-
+        HCALL_BRANCH(plpar_hcall_norets_trace)
         HVSC                            /* invoke the hypervisor */
 
-        HCALL_INST_POSTCALL_NORETS
-
         lwz     r0,8(r1)
         mtcrf   0xff,r0
         blr                             /* return r3 = status */
 
+#ifdef CONFIG_TRACEPOINTS
+plpar_hcall_norets_trace:
+        HCALL_INST_PRECALL(R4)
+        HVSC
+        HCALL_INST_POSTCALL_NORETS
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+        blr
+#endif
+
 _GLOBAL_TOC(plpar_hcall)
         HMT_MEDIUM
 
         mfcr    r0
         stw     r0,8(r1)
 
-        HCALL_INST_PRECALL(R5)
+        HCALL_BRANCH(plpar_hcall_trace)
 
         std     r4,STK_PARAM(R4)(r1)     /* Save ret buffer */
 
@@ -147,12 +152,40 @@ _GLOBAL_TOC(plpar_hcall)
         std     r6, 16(r12)
         std     r7, 24(r12)
 
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+#ifdef CONFIG_TRACEPOINTS
+plpar_hcall_trace:
+        HCALL_INST_PRECALL(R5)
+
+        std     r4,STK_PARAM(R4)(r1)
+        mr      r0,r4
+
+        mr      r4,r5
+        mr      r5,r6
+        mr      r6,r7
+        mr      r7,r8
+        mr      r8,r9
+        mr      r9,r10
+
+        HVSC
+
+        ld      r12,STK_PARAM(R4)(r1)
+        std     r4,0(r12)
+        std     r5,8(r12)
+        std     r6,16(r12)
+        std     r7,24(r12)
+
         HCALL_INST_POSTCALL(r12)
 
         lwz     r0,8(r1)
         mtcrf   0xff,r0
 
-        blr                             /* return r3 = status */
+        blr
+#endif
 
 /*
  * plpar_hcall_raw can be called in real mode. kexec/kdump need some
@@ -194,7 +227,7 @@ _GLOBAL_TOC(plpar_hcall9)
         mfcr    r0
         stw     r0,8(r1)
 
-        HCALL_INST_PRECALL(R5)
+        HCALL_BRANCH(plpar_hcall9_trace)
 
         std     r4,STK_PARAM(R4)(r1)     /* Save ret buffer */
 
@@ -222,12 +255,49 @@ _GLOBAL_TOC(plpar_hcall9)
         std     r11,56(r12)
         std     r0, 64(r12)
 
+        lwz     r0,8(r1)
+        mtcrf   0xff,r0
+
+        blr                             /* return r3 = status */
+
+#ifdef CONFIG_TRACEPOINTS
+plpar_hcall9_trace:
+        HCALL_INST_PRECALL(R5)
+
+        std     r4,STK_PARAM(R4)(r1)
+        mr      r0,r4
+
+        mr      r4,r5
+        mr      r5,r6
+        mr      r6,r7
+        mr      r7,r8
+        mr      r8,r9
+        mr      r9,r10
+        ld      r10,STACK_FRAME_OVERHEAD+STK_PARAM(R11)(r1)
+        ld      r11,STACK_FRAME_OVERHEAD+STK_PARAM(R12)(r1)
+        ld      r12,STACK_FRAME_OVERHEAD+STK_PARAM(R13)(r1)
+
+        HVSC
+
+        mr      r0,r12
+        ld      r12,STACK_FRAME_OVERHEAD+STK_PARAM(R4)(r1)
+        std     r4,0(r12)
+        std     r5,8(r12)
+        std     r6,16(r12)
+        std     r7,24(r12)
+        std     r8,32(r12)
+        std     r9,40(r12)
+        std     r10,48(r12)
+        std     r11,56(r12)
+        std     r0,64(r12)
+
         HCALL_INST_POSTCALL(r12)
 
         lwz     r0,8(r1)
         mtcrf   0xff,r0
 
-        blr                             /* return r3 = status */
+        blr
+#endif
 
 /* See plpar_hcall_raw to see why this is needed */
 _GLOBAL(plpar_hcall9_raw)
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
index cf4e7736e4f1..4575f0c9e521 100644
--- a/arch/powerpc/platforms/pseries/hvCall_inst.c
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -27,6 +27,7 @@
 #include <asm/firmware.h>
 #include <asm/cputable.h>
 #include <asm/trace.h>
+#include <asm/machdep.h>
 
 DEFINE_PER_CPU(struct hcall_stats[HCALL_STAT_ARRAY_SIZE], hcall_stats);
 
@@ -162,4 +163,4 @@ static int __init hcall_inst_init(void)
 
         return 0;
 }
-__initcall(hcall_inst_init);
+machine_device_initcall(pseries, hcall_inst_init);
diff --git a/arch/powerpc/platforms/pseries/hvcserver.c b/arch/powerpc/platforms/pseries/hvcserver.c
index 4557e91626c4..eedb64594dc5 100644
--- a/arch/powerpc/platforms/pseries/hvcserver.c
+++ b/arch/powerpc/platforms/pseries/hvcserver.c
@@ -163,8 +163,8 @@ int hvcs_get_partner_info(uint32_t unit_address, struct list_head *head,
                         return retval;
                 }
 
-                last_p_partition_ID = pi_buff[0];
-                last_p_unit_address = pi_buff[1];
+                last_p_partition_ID = be64_to_cpu(pi_buff[0]);
+                last_p_unit_address = be64_to_cpu(pi_buff[1]);
 
                 /* This indicates that there are no further partners */
                 if (last_p_partition_ID == ~0UL
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 33b552ffbe57..4642d6a4d356 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -721,13 +721,13 @@ static int __init disable_ddw_setup(char *str)
 
 early_param("disable_ddw", disable_ddw_setup);
 
-static void remove_ddw(struct device_node *np)
+static void remove_ddw(struct device_node *np, bool remove_prop)
 {
         struct dynamic_dma_window_prop *dwp;
         struct property *win64;
         const u32 *ddw_avail;
         u64 liobn;
-        int len, ret;
+        int len, ret = 0;
 
         ddw_avail = of_get_property(np, "ibm,ddw-applicable", &len);
         win64 = of_find_property(np, DIRECT64_PROPNAME, NULL);
@@ -761,7 +761,8 @@ static void remove_ddw(struct device_node *np)
                         np->full_name, ret, ddw_avail[2], liobn);
 
 delprop:
-        ret = of_remove_property(np, win64);
+        if (remove_prop)
+                ret = of_remove_property(np, win64);
         if (ret)
                 pr_warning("%s: failed to remove direct window property: %d\n",
                         np->full_name, ret);
@@ -805,7 +806,7 @@ static int find_existing_ddw_windows(void)
                 window = kzalloc(sizeof(*window), GFP_KERNEL);
                 if (!window || len < sizeof(struct dynamic_dma_window_prop)) {
                         kfree(window);
-                        remove_ddw(pdn);
+                        remove_ddw(pdn, true);
                         continue;
                 }
 
@@ -1045,7 +1046,7 @@ out_free_window:
         kfree(window);
 
 out_clear_window:
-        remove_ddw(pdn);
+        remove_ddw(pdn, true);
 
 out_free_prop:
         kfree(win64->name);
@@ -1255,7 +1256,14 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti
 
         switch (action) {
         case OF_RECONFIG_DETACH_NODE:
-                remove_ddw(np);
+                /*
+                 * Removing the property will invoke the reconfig
+                 * notifier again, which causes dead-lock on the
+                 * read-write semaphore of the notifier chain. So
+                 * we have to remove the property when releasing
+                 * the device node.
+                 */
+                remove_ddw(np, false);
                 if (pci && pci->iommu_table)
                         iommu_free_table(pci->iommu_table, np->full_name);
 
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index b02af9ef3ff6..34e64237fff9 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -26,6 +26,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/console.h>
 #include <linux/export.h>
+#include <linux/static_key.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/page.h>
@@ -430,16 +431,17 @@ static void __pSeries_lpar_hugepage_invalidate(unsigned long *slot,
                 spin_unlock_irqrestore(&pSeries_lpar_tlbie_lock, flags);
 }
 
-static void pSeries_lpar_hugepage_invalidate(struct mm_struct *mm,
-                                       unsigned char *hpte_slot_array,
-                                       unsigned long addr, int psize)
+static void pSeries_lpar_hugepage_invalidate(unsigned long vsid,
+                                             unsigned long addr,
+                                             unsigned char *hpte_slot_array,
+                                             int psize, int ssize)
 {
-        int ssize = 0, i, index = 0;
+        int i, index = 0;
         unsigned long s_addr = addr;
         unsigned int max_hpte_count, valid;
         unsigned long vpn_array[PPC64_HUGE_HPTE_BATCH];
         unsigned long slot_array[PPC64_HUGE_HPTE_BATCH];
-        unsigned long shift, hidx, vpn = 0, vsid, hash, slot;
+        unsigned long shift, hidx, vpn = 0, hash, slot;
 
         shift = mmu_psize_defs[psize].shift;
         max_hpte_count = 1U << (PMD_SHIFT - shift);
@@ -452,15 +454,6 @@ static void pSeries_lpar_hugepage_invalidate(struct mm_struct *mm,
 
                 /* get the vpn */
                 addr = s_addr + (i * (1ul << shift));
-                if (!is_kernel_addr(addr)) {
-                        ssize = user_segment_size(addr);
-                        vsid = get_vsid(mm->context.id, addr, ssize);
-                        WARN_ON(vsid == 0);
-                } else {
-                        vsid = get_kernel_vsid(addr, mmu_kernel_ssize);
-                        ssize = mmu_kernel_ssize;
-                }
-
                 vpn = hpt_vpn(addr, vsid, ssize);
                 hash = hpt_hash(vpn, shift, ssize);
                 if (hidx & _PTEIDX_SECONDARY)
@@ -649,6 +642,19 @@ EXPORT_SYMBOL(arch_free_page);
 #endif
 
 #ifdef CONFIG_TRACEPOINTS
+#ifdef CONFIG_JUMP_LABEL
+struct static_key hcall_tracepoint_key = STATIC_KEY_INIT;
+
+void hcall_tracepoint_regfunc(void)
+{
+        static_key_slow_inc(&hcall_tracepoint_key);
+}
+
+void hcall_tracepoint_unregfunc(void)
+{
+        static_key_slow_dec(&hcall_tracepoint_key);
+}
+#else
 /*
  * We optimise our hcall path by placing hcall_tracepoint_refcount
  * directly in the TOC so we can check if the hcall tracepoints are
@@ -658,13 +664,6 @@ EXPORT_SYMBOL(arch_free_page);
 /* NB: reg/unreg are called while guarded with the tracepoints_mutex */
 extern long hcall_tracepoint_refcount;
 
-/* 
- * Since the tracing code might execute hcalls we need to guard against
- * recursion. One example of this are spinlocks calling H_YIELD on
- * shared processor partitions.
- */
-static DEFINE_PER_CPU(unsigned int, hcall_trace_depth);
-
 void hcall_tracepoint_regfunc(void)
 {
         hcall_tracepoint_refcount++;
@@ -674,6 +673,15 @@ void hcall_tracepoint_unregfunc(void)
 {
         hcall_tracepoint_refcount--;
 }
+#endif
+
+/*
+ * Since the tracing code might execute hcalls we need to guard against
+ * recursion. One example of this are spinlocks calling H_YIELD on
+ * shared processor partitions.
+ */
+static DEFINE_PER_CPU(unsigned int, hcall_trace_depth);
+
 
 void __trace_hcall_entry(unsigned long opcode, unsigned long *args)
 {
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index bde7ebad3949..e7cb6d4a871a 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 
+#include <asm/machdep.h>
 #include <asm/rtas.h>
 #include "pseries.h"
 
@@ -319,7 +320,7 @@ static ssize_t migrate_store(struct class *class, struct class_attribute *attr,
         u64 streamid;
         int rc;
 
-        rc = strict_strtoull(buf, 0, &streamid);
+        rc = kstrtou64(buf, 0, &streamid);
         if (rc)
                 return rc;
 
@@ -362,4 +363,4 @@ static int __init mobility_sysfs_init(void)
 
         return rc;
 }
-device_initcall(mobility_sysfs_init);
+machine_device_initcall(pseries, mobility_sysfs_init);
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index 0c882e83c4ce..18ff4626d74e 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -16,6 +16,7 @@
 #include <asm/rtas.h>
 #include <asm/hw_irq.h>
 #include <asm/ppc-pci.h>
+#include <asm/machdep.h>
 
 static int query_token, change_token;
 
@@ -532,5 +533,4 @@ static int rtas_msi_init(void)
 
         return 0;
 }
-arch_initcall(rtas_msi_init);
-
+machine_arch_initcall(pseries, rtas_msi_init);
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 203cbf0dc101..89e23811199c 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -118,10 +118,10 @@ int remove_phb_dynamic(struct pci_controller *phb)
                 }
         }
 
-        /* Unregister the bridge device from sysfs and remove the PCI bus */
-        device_unregister(b->bridge);
+        /* Remove the PCI bus and unregister the bridge device from sysfs */
         phb->bus = NULL;
         pci_remove_bus(b);
+        device_unregister(b->bridge);
 
         /* Now release the IO resource */
         if (res->flags & IORESOURCE_IO)
diff --git a/arch/powerpc/platforms/pseries/power.c b/arch/powerpc/platforms/pseries/power.c
index 6d6266236446..c26eadde434c 100644
--- a/arch/powerpc/platforms/pseries/power.c
+++ b/arch/powerpc/platforms/pseries/power.c
@@ -25,6 +25,7 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <asm/machdep.h>
 
 unsigned long rtas_poweron_auto; /* default and normal state is 0 */
 
@@ -71,11 +72,11 @@ static int __init pm_init(void)
                 return -ENOMEM;
         return sysfs_create_group(power_kobj, &attr_group);
 }
-core_initcall(pm_init);
+machine_core_initcall(pseries, pm_init);
 #else
 static int __init apo_pm_init(void)
 {
         return (sysfs_create_file(power_kobj, &auto_poweron_attr.attr));
 }
-__initcall(apo_pm_init);
+machine_device_initcall(pseries, apo_pm_init);
 #endif
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 9c5778e6ed4b..dff05b9eb946 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -71,7 +71,7 @@ static int __init init_ras_IRQ(void)
 
         return 0;
 }
-subsys_initcall(init_ras_IRQ);
+machine_subsys_initcall(pseries, init_ras_IRQ);
 
 #define EPOW_SHUTDOWN_NORMAL                            1
 #define EPOW_SHUTDOWN_ON_UPS                            2
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 1c0a60d98867..0f319521e002 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -446,13 +446,10 @@ static int proc_ppc64_create_ofdt(void)
 {
         struct proc_dir_entry *ent;
 
-        if (!machine_is(pseries))
-                return 0;
-
         ent = proc_create("powerpc/ofdt", S_IWUSR, NULL, &ofdt_fops);
         if (ent)
                 proc_set_size(ent, 0);
 
         return 0;
 }
-__initcall(proc_ppc64_create_ofdt);
+machine_device_initcall(pseries, proc_ppc64_create_ofdt);
diff --git a/arch/powerpc/platforms/pseries/rng.c b/arch/powerpc/platforms/pseries/rng.c
index 72a102758d4e..e09608770909 100644
--- a/arch/powerpc/platforms/pseries/rng.c
+++ b/arch/powerpc/platforms/pseries/rng.c
@@ -42,4 +42,4 @@ static __init int rng_init(void)
 
         return 0;
 }
-subsys_initcall(rng_init);
+machine_subsys_initcall(pseries, rng_init);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index f2f40e64658f..e724d3186e73 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -232,8 +232,7 @@ static void __init pseries_discover_pic(void)
         struct device_node *np;
         const char *typep;
 
-        for (np = NULL; (np = of_find_node_by_name(np,
-                                                   "interrupt-controller"));) {
+        for_each_node_by_name(np, "interrupt-controller") {
                 typep = of_get_property(np, "compatible", NULL);
                 if (strstr(typep, "open-pic")) {
                         pSeries_mpic_node = of_node_get(np);
@@ -351,7 +350,7 @@ static int alloc_dispatch_log_kmem_cache(void)
 
         return alloc_dispatch_logs();
 }
-early_initcall(alloc_dispatch_log_kmem_cache);
+machine_early_initcall(pseries, alloc_dispatch_log_kmem_cache);
 
 static void pseries_lpar_idle(void)
 {
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index b87b97849d4c..e76aefae2aa2 100644
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -265,7 +265,7 @@ static int __init pseries_suspend_init(void)
 {
         int rc;
 
-        if (!machine_is(pseries) || !firmware_has_feature(FW_FEATURE_LPAR))
+        if (!firmware_has_feature(FW_FEATURE_LPAR))
                 return 0;
 
         suspend_data.token = rtas_token("ibm,suspend-me");
@@ -280,5 +280,4 @@ static int __init pseries_suspend_init(void)
         suspend_set_ops(&pseries_suspend_ops);
         return 0;
 }
-
-__initcall(pseries_suspend_init);
+machine_device_initcall(pseries, pseries_suspend_init);
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 4bd091a05583..c5077673bd94 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -853,8 +853,8 @@ u64 fsl_pci_immrbar_base(struct pci_controller *hose)
                 in = pcie->cfg_type0 + PEX_RC_INWIN_BASE;
                 for (i = 0; i < 4; i++) {
                         /* not enabled, skip */
-                        if (!in_le32(&in[i].ar) & PEX_RCIWARn_EN)
-                                 continue;
+                        if (!(in_le32(&in[i].ar) & PEX_RCIWARn_EN))
+                                continue;
 
                         if (get_immrbase() == in_le32(&in[i].tar))
                                 return (u64)in_le32(&in[i].barh) << 32 |
diff --git a/arch/powerpc/sysdev/micropatch.c b/arch/powerpc/sysdev/micropatch.c
index c0bb76ef7242..6727dc54d549 100644
--- a/arch/powerpc/sysdev/micropatch.c
+++ b/arch/powerpc/sysdev/micropatch.c
@@ -13,7 +13,6 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <asm/irq.h>
-#include <asm/mpc8xx.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/8xx_immap.h>
diff --git a/arch/powerpc/sysdev/mpic_msgr.c b/arch/powerpc/sysdev/mpic_msgr.c
index 2c9b52aa266c..7bdf3cc741e4 100644
--- a/arch/powerpc/sysdev/mpic_msgr.c
+++ b/arch/powerpc/sysdev/mpic_msgr.c
@@ -184,7 +184,7 @@ static int mpic_msgr_probe(struct platform_device *dev)
                 dev_info(&dev->dev, "Found %d message registers\n",
                                 mpic_msgr_count);
 
-                mpic_msgrs = kzalloc(sizeof(struct mpic_msgr) * mpic_msgr_count,
+                mpic_msgrs = kcalloc(mpic_msgr_count, sizeof(*mpic_msgrs),
                                                          GFP_KERNEL);
                 if (!mpic_msgrs) {
                         dev_err(&dev->dev,
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index d199bfa2f1fa..b988b5addf86 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -24,6 +24,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/bug.h>
+#include <linux/nmi.h>
 
 #include <asm/ptrace.h>
 #include <asm/string.h>
@@ -374,6 +375,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
 #endif
 
         local_irq_save(flags);
+        hard_irq_disable();
 
         bp = in_breakpoint_table(regs->nip, &offset);
         if (bp != NULL) {
@@ -558,6 +560,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
 #endif
         insert_cpu_bpts();
 
+        touch_nmi_watchdog();
         local_irq_restore(flags);
 
         return cmd != 'X' && cmd != EOF;
@@ -2058,10 +2061,6 @@ static void dump_one_paca(int cpu)
         DUMP(p, kernel_toc, "lx");
         DUMP(p, kernelbase, "lx");
         DUMP(p, kernel_msr, "lx");
-#ifdef CONFIG_PPC_STD_MMU_64
-        DUMP(p, stab_real, "lx");
-        DUMP(p, stab_addr, "lx");
-#endif
         DUMP(p, emergency_sp, "p");
 #ifdef CONFIG_PPC_BOOK3S_64
         DUMP(p, mc_emergency_sp, "p");
@@ -2694,7 +2693,7 @@ static void xmon_print_symbol(unsigned long address, const char *mid,
 }
 
 #ifdef CONFIG_PPC_BOOK3S_64
-static void dump_slb(void)
+void dump_segments(void)
 {
         int i;
         unsigned long esid,vsid,valid;
@@ -2726,34 +2725,6 @@ static void dump_slb(void)
                 }
         }
 }
-
-static void dump_stab(void)
-{
-        int i;
-        unsigned long *tmp = (unsigned long *)local_paca->stab_addr;
-
-        printf("Segment table contents of cpu 0x%x\n", smp_processor_id());
-
-        for (i = 0; i < PAGE_SIZE/16; i++) {
-                unsigned long a, b;
-
-                a = *tmp++;
-                b = *tmp++;
-
-                if (a || b) {
-                        printf("%03d %016lx ", i, a);
-                        printf("%016lx\n", b);
-                }
-        }
-}
-
-void dump_segments(void)
-{
-        if (mmu_has_feature(MMU_FTR_SLB))
-                dump_slb();
-        else
-                dump_stab();
-}
 #endif
 
 #ifdef CONFIG_PPC_STD_MMU_32
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index f5af5f6ef0f4..ab39ceb89ecf 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -48,6 +48,8 @@ config ARCH_SUPPORTS_DEBUG_PAGEALLOC
 
 config KEXEC
         def_bool y
+        select CRYPTO
+        select CRYPTO_SHA256
 
 config AUDIT_ARCH
         def_bool y
@@ -92,6 +94,7 @@ config S390
         select ARCH_INLINE_WRITE_UNLOCK_IRQ
         select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
         select ARCH_SAVE_PAGE_KEYS if HIBERNATION
+        select ARCH_SUPPORTS_ATOMIC_RMW
         select ARCH_USE_CMPXCHG_LOCKREF
         select ARCH_WANT_IPC_PARSE_VERSION
         select BUILDTIME_EXTABLE_SORT
@@ -136,7 +139,6 @@ config S390
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_UID16 if 32BIT
         select HAVE_VIRT_CPU_ACCOUNTING
-        select KTIME_SCALAR if 32BIT
         select MODULES_USE_ELF_RELA
         select NO_BOOTMEM
         select OLD_SIGACTION
@@ -145,6 +147,7 @@ config S390
         select TTY
         select VIRT_CPU_ACCOUNTING
         select VIRT_TO_BUS
+        select ARCH_HAS_SG_CHAIN
 
 config SCHED_OMIT_FRAME_POINTER
         def_bool y
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig
index fd09a10a2b53..3ca1894ade09 100644
--- a/arch/s390/configs/default_defconfig
+++ b/arch/s390/configs/default_defconfig
@@ -366,7 +366,6 @@ CONFIG_VIRTIO_BLK=y
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
@@ -380,7 +379,6 @@ CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_ISCSI_TCP=m
 CONFIG_LIBFCOE=m
 CONFIG_SCSI_DEBUG=m
diff --git a/arch/s390/configs/gcov_defconfig b/arch/s390/configs/gcov_defconfig
index b061180d3544..4830aa6e6f53 100644
--- a/arch/s390/configs/gcov_defconfig
+++ b/arch/s390/configs/gcov_defconfig
@@ -363,7 +363,6 @@ CONFIG_VIRTIO_BLK=y
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
@@ -377,7 +376,6 @@ CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_ISCSI_TCP=m
 CONFIG_LIBFCOE=m
 CONFIG_SCSI_DEBUG=m
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig
index d279baa08014..61db449bf309 100644
--- a/arch/s390/configs/performance_defconfig
+++ b/arch/s390/configs/performance_defconfig
@@ -361,7 +361,6 @@ CONFIG_VIRTIO_BLK=y
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
@@ -375,7 +374,6 @@ CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_ISCSI_TCP=m
 CONFIG_LIBFCOE=m
 CONFIG_SCSI_DEBUG=m
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 57892a8a9055..b3fea0722ff1 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -4,4 +4,5 @@ generic-y += clkdev.h
 generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 114258eeaacd..7b2ac6e44166 100644
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -162,6 +162,4 @@ static inline int devmem_is_allowed(unsigned long pfn)
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
 
-#define __HAVE_ARCH_GATE_AREA 1
-
 #endif /* _S390_PAGE_H */
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index fcba5e03839f..b76317c1f3eb 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -287,7 +287,14 @@ extern unsigned long MODULES_END;
 #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_DIRTY    0       /* No sw dirty bit for 31-bit */
+#define _SEGMENT_ENTRY_YOUNG    0       /* No sw young bit for 31-bit */
+#define _SEGMENT_ENTRY_READ     0       /* No sw read bit for 31-bit */
+#define _SEGMENT_ENTRY_WRITE    0       /* No sw write bit for 31-bit */
+#define _SEGMENT_ENTRY_LARGE    0       /* No large pages for 31-bit */
+#define _SEGMENT_ENTRY_BITS_LARGE 0
+#define _SEGMENT_ENTRY_ORIGIN_LARGE 0
 
 #define _SEGMENT_ENTRY          (_SEGMENT_ENTRY_PTL)
 #define _SEGMENT_ENTRY_EMPTY    (_SEGMENT_ENTRY_INVALID)
@@ -350,7 +357,7 @@ extern unsigned long MODULES_END;
 
 /* Bits in the segment table entry */
 #define _SEGMENT_ENTRY_BITS     0xfffffffffffffe33UL
-#define _SEGMENT_ENTRY_BITS_LARGE 0xfffffffffff1ff33UL
+#define _SEGMENT_ENTRY_BITS_LARGE 0xfffffffffff0ff33UL
 #define _SEGMENT_ENTRY_ORIGIN_LARGE ~0xfffffUL /* large page address        */
 #define _SEGMENT_ENTRY_ORIGIN   ~0x7ffUL/* segment table origin             */
 #define _SEGMENT_ENTRY_PROTECT  0x200   /* page protection bit              */
@@ -359,30 +366,34 @@ extern unsigned long MODULES_END;
 #define _SEGMENT_ENTRY          (0)
 #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
+#define _SEGMENT_ENTRY_DIRTY    0x2000  /* SW segment dirty bit */
+#define _SEGMENT_ENTRY_YOUNG    0x1000  /* SW segment young bit */
+#define _SEGMENT_ENTRY_SPLIT    0x0800  /* THP splitting bit */
+#define _SEGMENT_ENTRY_LARGE    0x0400  /* STE-format control, large page */
+#define _SEGMENT_ENTRY_CO       0x0100  /* change-recording override   */
+#define _SEGMENT_ENTRY_READ     0x0002  /* SW segment read bit */
+#define _SEGMENT_ENTRY_WRITE    0x0001  /* SW segment write bit */
 
 /*
  * 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.
+ *                              dy..R...I...wr
+ * prot-none, clean, old        00..1...1...00
+ * prot-none, clean, young      01..1...1...00
+ * prot-none, dirty, old        10..1...1...00
+ * prot-none, dirty, young      11..1...1...00
+ * read-only, clean, old        00..1...1...01
+ * read-only, clean, young      01..1...0...01
+ * read-only, dirty, old        10..1...1...01
+ * read-only, dirty, young      11..1...0...01
+ * read-write, clean, old       00..1...1...11
+ * read-write, clean, young     01..1...0...11
+ * read-write, dirty, old       10..0...1...11
+ * read-write, dirty, young     11..0...0...11
  * 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 */
-
-/* Set of bits not changed in pmd_modify */
-#define _SEGMENT_CHG_MASK       (_SEGMENT_ENTRY_ORIGIN | _SEGMENT_ENTRY_LARGE \
-                                 | _SEGMENT_ENTRY_SPLIT | _SEGMENT_ENTRY_CO)
+#define _SEGMENT_ENTRY_SPLIT_BIT 11     /* THP splitting bit number */
 
 /* Page status table bits for virtualization */
 #define PGSTE_ACC_BITS  0xf000000000000000UL
@@ -455,10 +466,11 @@ extern unsigned long MODULES_END;
  * Segment entry (large page) protection definitions.
  */
 #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)
+#define SEGMENT_READ    __pgprot(_SEGMENT_ENTRY_PROTECT | \
+                                 _SEGMENT_ENTRY_READ)
+#define SEGMENT_WRITE   __pgprot(_SEGMENT_ENTRY_READ | \
+                                 _SEGMENT_ENTRY_WRITE)
 
 static inline int mm_has_pgste(struct mm_struct *mm)
 {
@@ -569,25 +581,23 @@ static inline int pmd_none(pmd_t pmd)
 
 static inline int pmd_large(pmd_t pmd)
 {
-#ifdef CONFIG_64BIT
         return (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) != 0;
-#else
-        return 0;
-#endif
 }
 
-static inline int pmd_prot_none(pmd_t pmd)
+static inline int pmd_pfn(pmd_t pmd)
 {
-        return (pmd_val(pmd) & _SEGMENT_ENTRY_INVALID) &&
-                (pmd_val(pmd) & _SEGMENT_ENTRY_NONE);
+        unsigned long origin_mask;
+
+        origin_mask = _SEGMENT_ENTRY_ORIGIN;
+        if (pmd_large(pmd))
+                origin_mask = _SEGMENT_ENTRY_ORIGIN_LARGE;
+        return (pmd_val(pmd) & origin_mask) >> PAGE_SHIFT;
 }
 
 static inline int pmd_bad(pmd_t pmd)
 {
-#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;
 }
 
@@ -607,20 +617,22 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma,
 #define __HAVE_ARCH_PMD_WRITE
 static inline int pmd_write(pmd_t pmd)
 {
-        if (pmd_prot_none(pmd))
-                return 0;
-        return (pmd_val(pmd) & _SEGMENT_ENTRY_PROTECT) == 0;
+        return (pmd_val(pmd) & _SEGMENT_ENTRY_WRITE) != 0;
+}
+
+static inline int pmd_dirty(pmd_t pmd)
+{
+        int dirty = 1;
+        if (pmd_large(pmd))
+                dirty = (pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY) != 0;
+        return dirty;
 }
 
 static inline int pmd_young(pmd_t pmd)
 {
-        int young = 0;
-#ifdef CONFIG_64BIT
-        if (pmd_prot_none(pmd))
-                young = (pmd_val(pmd) & _SEGMENT_ENTRY_PROTECT) != 0;
-        else
+        int young = 1;
+        if (pmd_large(pmd))
                 young = (pmd_val(pmd) & _SEGMENT_ENTRY_YOUNG) != 0;
-#endif
         return young;
 }
 
@@ -1391,7 +1403,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
 #define pte_pfn(x) (pte_val(x) >> PAGE_SHIFT)
 #define pte_page(x) pfn_to_page(pte_pfn(x))
 
-#define pmd_page(pmd) pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
+#define pmd_page(pmd) pfn_to_page(pmd_pfn(pmd))
 
 /* Find an entry in the lowest level page table.. */
 #define pte_offset(pmd, addr) ((pte_t *) pmd_deref(*(pmd)) + pte_index(addr))
@@ -1413,41 +1425,75 @@ static inline unsigned long massage_pgprot_pmd(pgprot_t pgprot)
         return pgprot_val(SEGMENT_WRITE);
 }
 
-static inline pmd_t pmd_mkyoung(pmd_t pmd)
+static inline pmd_t pmd_wrprotect(pmd_t pmd)
 {
-#ifdef CONFIG_64BIT
-        if (pmd_prot_none(pmd)) {
+        pmd_val(pmd) &= ~_SEGMENT_ENTRY_WRITE;
+        pmd_val(pmd) |= _SEGMENT_ENTRY_PROTECT;
+        return pmd;
+}
+
+static inline pmd_t pmd_mkwrite(pmd_t pmd)
+{
+        pmd_val(pmd) |= _SEGMENT_ENTRY_WRITE;
+        if (pmd_large(pmd) && !(pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY))
+                return pmd;
+        pmd_val(pmd) &= ~_SEGMENT_ENTRY_PROTECT;
+        return pmd;
+}
+
+static inline pmd_t pmd_mkclean(pmd_t pmd)
+{
+        if (pmd_large(pmd)) {
+                pmd_val(pmd) &= ~_SEGMENT_ENTRY_DIRTY;
                 pmd_val(pmd) |= _SEGMENT_ENTRY_PROTECT;
-        } else {
+        }
+        return pmd;
+}
+
+static inline pmd_t pmd_mkdirty(pmd_t pmd)
+{
+        if (pmd_large(pmd)) {
+                pmd_val(pmd) |= _SEGMENT_ENTRY_DIRTY;
+                if (pmd_val(pmd) & _SEGMENT_ENTRY_WRITE)
+                        pmd_val(pmd) &= ~_SEGMENT_ENTRY_PROTECT;
+        }
+        return pmd;
+}
+
+static inline pmd_t pmd_mkyoung(pmd_t pmd)
+{
+        if (pmd_large(pmd)) {
                 pmd_val(pmd) |= _SEGMENT_ENTRY_YOUNG;
-                pmd_val(pmd) &= ~_SEGMENT_ENTRY_INVALID;
+                if (pmd_val(pmd) & _SEGMENT_ENTRY_READ)
+                        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 {
+        if (pmd_large(pmd)) {
                 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;
+        if (pmd_large(pmd)) {
+                pmd_val(pmd) &= _SEGMENT_ENTRY_ORIGIN_LARGE |
+                        _SEGMENT_ENTRY_DIRTY | _SEGMENT_ENTRY_YOUNG |
+                        _SEGMENT_ENTRY_LARGE | _SEGMENT_ENTRY_SPLIT;
+                pmd_val(pmd) |= massage_pgprot_pmd(newprot);
+                if (!(pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY))
+                        pmd_val(pmd) |= _SEGMENT_ENTRY_PROTECT;
+                if (!(pmd_val(pmd) & _SEGMENT_ENTRY_YOUNG))
+                        pmd_val(pmd) |= _SEGMENT_ENTRY_INVALID;
+                return pmd;
+        }
+        pmd_val(pmd) &= _SEGMENT_ENTRY_ORIGIN;
         pmd_val(pmd) |= massage_pgprot_pmd(newprot);
-        if (young)
-                pmd = pmd_mkyoung(pmd);
         return pmd;
 }
 
@@ -1455,16 +1501,9 @@ 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_mkyoung(__pmd);
+        return __pmd;
 }
 
-static inline pmd_t pmd_mkwrite(pmd_t pmd)
-{
-        /* 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_csp(pmd_t *pmdp)
@@ -1555,34 +1594,21 @@ extern pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp);
 
 static inline int pmd_trans_splitting(pmd_t pmd)
 {
-        return pmd_val(pmd) & _SEGMENT_ENTRY_SPLIT;
+        return (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) &&
+                (pmd_val(pmd) & _SEGMENT_ENTRY_SPLIT);
 }
 
 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_INVALID) && MACHINE_HAS_EDAT1)
-                pmd_val(entry) |= _SEGMENT_ENTRY_CO;
         *pmdp = entry;
 }
 
 static inline pmd_t pmd_mkhuge(pmd_t pmd)
 {
         pmd_val(pmd) |= _SEGMENT_ENTRY_LARGE;
-        return pmd;
-}
-
-static inline pmd_t pmd_wrprotect(pmd_t pmd)
-{
-        /* Do not clobber PROT_NONE segments! */
-        if (!pmd_prot_none(pmd))
-                pmd_val(pmd) |= _SEGMENT_ENTRY_PROTECT;
-        return pmd;
-}
-
-static inline pmd_t pmd_mkdirty(pmd_t pmd)
-{
-        /* No dirty bit in the segment table entry. */
+        pmd_val(pmd) |= _SEGMENT_ENTRY_YOUNG;
+        pmd_val(pmd) |= _SEGMENT_ENTRY_PROTECT;
         return pmd;
 }
 
@@ -1647,11 +1673,6 @@ static inline int has_transparent_hugepage(void)
 {
         return MACHINE_HAS_HPAGE ? 1 : 0;
 }
-
-static inline unsigned long pmd_pfn(pmd_t pmd)
-{
-        return pmd_val(pmd) >> PAGE_SHIFT;
-}
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 
 /*
diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h
index d786c634e052..06f3034605a1 100644
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
@@ -415,6 +415,10 @@ struct qdio_brinfo_entry_l2 {
 #define QDIO_FLAG_SYNC_OUTPUT           0x02
 #define QDIO_FLAG_PCI_OUT               0x10
 
+int qdio_alloc_buffers(struct qdio_buffer **buf, unsigned int count);
+void qdio_free_buffers(struct qdio_buffer **buf, unsigned int count);
+void qdio_reset_buffers(struct qdio_buffer **buf, unsigned int count);
+
 extern int qdio_allocate(struct qdio_initialize *);
 extern int qdio_establish(struct qdio_initialize *);
 extern int qdio_activate(struct ccw_device *);
diff --git a/arch/s390/include/asm/scatterlist.h b/arch/s390/include/asm/scatterlist.h
deleted file mode 100644
index 6d45ef6c12a7..000000000000
--- a/arch/s390/include/asm/scatterlist.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <asm-generic/scatterlist.h>
-
-#define ARCH_HAS_SG_CHAIN
diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h
index abad78d5b10c..5bc12598ae9e 100644
--- a/arch/s390/include/asm/syscall.h
+++ b/arch/s390/include/asm/syscall.h
@@ -54,7 +54,7 @@ static inline void syscall_set_return_value(struct task_struct *task,
                                             struct pt_regs *regs,
                                             int error, long val)
 {
-        regs->gprs[2] = error ? -error : val;
+        regs->gprs[2] = error ? error : val;
 }
 
 static inline void syscall_get_arguments(struct task_struct *task,
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index f204d6920368..598b0b42668b 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -320,38 +320,39 @@ static inline int map_signal(int sig)
                 return sig;
 }
 
-static int setup_frame32(int sig, struct k_sigaction *ka,
-                        sigset_t *set, struct pt_regs * regs)
+static int setup_frame32(struct ksignal *ksig, sigset_t *set,
+                         struct pt_regs *regs)
 {
-        sigframe32 __user *frame = get_sigframe(ka, regs, sizeof(sigframe32));
+        int sig = ksig->sig;
+        sigframe32 __user *frame = get_sigframe(&ksig->ka, regs, sizeof(sigframe32));
 
         if (frame == (void __user *) -1UL)
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (__copy_to_user(&frame->sc.oldmask, &set->sig, _SIGMASK_COPY_SIZE32))
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (save_sigregs32(regs, &frame->sregs))
-                goto give_sigsegv;
+                return -EFAULT;
         if (save_sigregs_gprs_high(regs, frame->gprs_high))
-                goto give_sigsegv;
+                return -EFAULT;
         if (__put_user((unsigned long) &frame->sregs, &frame->sc.sregs))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* 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 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                regs->gprs[14] = (__u64 __force) ksig->ka.sa.sa_restorer | PSW32_ADDR_AMODE;
         } else {
                 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;
+                        return -EFAULT;
         }
 
         /* Set up backchain. */
         if (__put_user(regs->gprs[15], (unsigned int __user *) frame))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up registers for signal handler */
         regs->gprs[15] = (__force __u64) frame;
@@ -359,7 +360,7 @@ static int setup_frame32(int sig, struct k_sigaction *ka,
         regs->psw.mask = PSW_MASK_BA |
                 (PSW_USER_BITS & PSW_MASK_ASC) |
                 (regs->psw.mask & ~PSW_MASK_ASC);
-        regs->psw.addr = (__force __u64) ka->sa.sa_handler;
+        regs->psw.addr = (__force __u64) ksig->ka.sa.sa_handler;
 
         regs->gprs[2] = map_signal(sig);
         regs->gprs[3] = (__force __u64) &frame->sc;
@@ -376,25 +377,21 @@ static int setup_frame32(int sig, struct k_sigaction *ka,
 
         /* Place signal number on stack to allow backtrace from handler.  */
         if (__put_user(regs->gprs[2], (int __force __user *) &frame->signo))
-                goto give_sigsegv;
+                return -EFAULT;
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
-static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,
-                           sigset_t *set, struct pt_regs * regs)
+static int setup_rt_frame32(struct ksignal *ksig, sigset_t *set,
+                            struct pt_regs *regs)
 {
         int err = 0;
-        rt_sigframe32 __user *frame = get_sigframe(ka, regs, sizeof(rt_sigframe32));
+        rt_sigframe32 __user *frame = get_sigframe(&ksig->ka, regs, sizeof(rt_sigframe32));
 
         if (frame == (void __user *) -1UL)
-                goto give_sigsegv;
+                return -EFAULT;
 
-        if (copy_siginfo_to_user32(&frame->info, info))
-                goto give_sigsegv;
+        if (copy_siginfo_to_user32(&frame->info, &ksig->info))
+                return -EFAULT;
 
         /* Create the ucontext.  */
         err |= __put_user(UC_EXTENDED, &frame->uc.uc_flags);
@@ -404,22 +401,22 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= save_sigregs_gprs_high(regs, frame->gprs_high);
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* 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 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                regs->gprs[14] = (__u64 __force) ksig->ka.sa.sa_restorer | PSW32_ADDR_AMODE;
         } else {
                 regs->gprs[14] = (__u64 __force) frame->retcode | PSW32_ADDR_AMODE;
                 if (__put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,
                                (u16 __force __user *)(frame->retcode)))
-                        goto give_sigsegv;
+                        return -EFAULT;
         }
 
         /* Set up backchain. */
         if (__put_user(regs->gprs[15], (unsigned int __force __user *) frame))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up registers for signal handler */
         regs->gprs[15] = (__force __u64) frame;
@@ -427,36 +424,30 @@ 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 __force) ka->sa.sa_handler;
+        regs->psw.addr = (__u64 __force) ksig->ka.sa.sa_handler;
 
-        regs->gprs[2] = map_signal(sig);
+        regs->gprs[2] = map_signal(ksig->sig);
         regs->gprs[3] = (__force __u64) &frame->info;
         regs->gprs[4] = (__force __u64) &frame->uc;
         regs->gprs[5] = task_thread_info(current)->last_break;
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 /*
  * OK, we're invoking a handler
  */     
 
-void handle_signal32(unsigned long sig, struct k_sigaction *ka,
-                    siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
+void handle_signal32(struct ksignal *ksig, sigset_t *oldset,
+                     struct pt_regs *regs)
 {
         int ret;
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame32(sig, ka, info, oldset, regs);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame32(ksig, oldset, regs);
         else
-                ret = setup_frame32(sig, ka, oldset, regs);
-        if (ret)
-                return;
-        signal_delivered(sig, info, ka, regs,
-                                 test_thread_flag(TIF_SINGLE_STEP));
+                ret = setup_frame32(ksig, oldset, regs);
+
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLE_STEP));
 }
 
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index 6ac78192455f..1aad48398d06 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -48,8 +48,8 @@ void do_per_trap(struct pt_regs *regs);
 void syscall_trace(struct pt_regs *regs, int entryexit);
 void kernel_stack_overflow(struct pt_regs * regs);
 void do_signal(struct pt_regs *regs);
-void handle_signal32(unsigned long sig, struct k_sigaction *ka,
-                    siginfo_t *info, sigset_t *oldset, struct pt_regs *regs);
+void handle_signal32(struct ksignal *ksig, sigset_t *oldset,
+                     struct pt_regs *regs);
 void do_notify_resume(struct pt_regs *regs);
 
 void __init init_IRQ(void);
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 99b0b09646ca..8eb82443cfbd 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -30,6 +30,7 @@ DEFINE_PER_CPU_SHARED_ALIGNED(struct irq_stat, irq_stat);
 EXPORT_PER_CPU_SYMBOL_GPL(irq_stat);
 
 struct irq_class {
+        int irq;
         char *name;
         char *desc;
 };
@@ -45,9 +46,9 @@ struct irq_class {
  * up with having a sum which accounts each interrupt twice.
  */
 static const struct irq_class irqclass_main_desc[NR_IRQS_BASE] = {
-        [EXT_INTERRUPT]  = {.name = "EXT"},
-        [IO_INTERRUPT]   = {.name = "I/O"},
-        [THIN_INTERRUPT] = {.name = "AIO"},
+        {.irq = EXT_INTERRUPT,  .name = "EXT"},
+        {.irq = IO_INTERRUPT,   .name = "I/O"},
+        {.irq = THIN_INTERRUPT, .name = "AIO"},
 };
 
 /*
@@ -56,38 +57,38 @@ static const struct irq_class irqclass_main_desc[NR_IRQS_BASE] = {
  * In addition this list contains non external / I/O events like NMIs.
  */
 static const struct irq_class irqclass_sub_desc[NR_ARCH_IRQS] = {
-        [IRQEXT_CLK] = {.name = "CLK", .desc = "[EXT] Clock Comparator"},
-        [IRQEXT_EXC] = {.name = "EXC", .desc = "[EXT] External Call"},
-        [IRQEXT_EMS] = {.name = "EMS", .desc = "[EXT] Emergency Signal"},
-        [IRQEXT_TMR] = {.name = "TMR", .desc = "[EXT] CPU Timer"},
-        [IRQEXT_TLA] = {.name = "TAL", .desc = "[EXT] Timing Alert"},
-        [IRQEXT_PFL] = {.name = "PFL", .desc = "[EXT] Pseudo Page Fault"},
-        [IRQEXT_DSD] = {.name = "DSD", .desc = "[EXT] DASD Diag"},
-        [IRQEXT_VRT] = {.name = "VRT", .desc = "[EXT] Virtio"},
-        [IRQEXT_SCP] = {.name = "SCP", .desc = "[EXT] Service Call"},
-        [IRQEXT_IUC] = {.name = "IUC", .desc = "[EXT] IUCV"},
-        [IRQEXT_CMS] = {.name = "CMS", .desc = "[EXT] CPU-Measurement: Sampling"},
-        [IRQEXT_CMC] = {.name = "CMC", .desc = "[EXT] CPU-Measurement: Counter"},
-        [IRQEXT_CMR] = {.name = "CMR", .desc = "[EXT] CPU-Measurement: RI"},
-        [IRQIO_CIO]  = {.name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt"},
-        [IRQIO_QAI]  = {.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt"},
-        [IRQIO_DAS]  = {.name = "DAS", .desc = "[I/O] DASD"},
-        [IRQIO_C15]  = {.name = "C15", .desc = "[I/O] 3215"},
-        [IRQIO_C70]  = {.name = "C70", .desc = "[I/O] 3270"},
-        [IRQIO_TAP]  = {.name = "TAP", .desc = "[I/O] Tape"},
-        [IRQIO_VMR]  = {.name = "VMR", .desc = "[I/O] Unit Record Devices"},
-        [IRQIO_LCS]  = {.name = "LCS", .desc = "[I/O] LCS"},
-        [IRQIO_CLW]  = {.name = "CLW", .desc = "[I/O] CLAW"},
-        [IRQIO_CTC]  = {.name = "CTC", .desc = "[I/O] CTC"},
-        [IRQIO_APB]  = {.name = "APB", .desc = "[I/O] AP Bus"},
-        [IRQIO_ADM]  = {.name = "ADM", .desc = "[I/O] EADM Subchannel"},
-        [IRQIO_CSC]  = {.name = "CSC", .desc = "[I/O] CHSC Subchannel"},
-        [IRQIO_PCI]  = {.name = "PCI", .desc = "[I/O] PCI Interrupt" },
-        [IRQIO_MSI]  = {.name = "MSI", .desc = "[I/O] MSI Interrupt" },
-        [IRQIO_VIR]  = {.name = "VIR", .desc = "[I/O] Virtual I/O Devices"},
-        [IRQIO_VAI]  = {.name = "VAI", .desc = "[I/O] Virtual I/O Devices AI"},
-        [NMI_NMI]    = {.name = "NMI", .desc = "[NMI] Machine Check"},
-        [CPU_RST]    = {.name = "RST", .desc = "[CPU] CPU Restart"},
+        {.irq = IRQEXT_CLK, .name = "CLK", .desc = "[EXT] Clock Comparator"},
+        {.irq = IRQEXT_EXC, .name = "EXC", .desc = "[EXT] External Call"},
+        {.irq = IRQEXT_EMS, .name = "EMS", .desc = "[EXT] Emergency Signal"},
+        {.irq = IRQEXT_TMR, .name = "TMR", .desc = "[EXT] CPU Timer"},
+        {.irq = IRQEXT_TLA, .name = "TAL", .desc = "[EXT] Timing Alert"},
+        {.irq = IRQEXT_PFL, .name = "PFL", .desc = "[EXT] Pseudo Page Fault"},
+        {.irq = IRQEXT_DSD, .name = "DSD", .desc = "[EXT] DASD Diag"},
+        {.irq = IRQEXT_VRT, .name = "VRT", .desc = "[EXT] Virtio"},
+        {.irq = IRQEXT_SCP, .name = "SCP", .desc = "[EXT] Service Call"},
+        {.irq = IRQEXT_IUC, .name = "IUC", .desc = "[EXT] IUCV"},
+        {.irq = IRQEXT_CMS, .name = "CMS", .desc = "[EXT] CPU-Measurement: Sampling"},
+        {.irq = IRQEXT_CMC, .name = "CMC", .desc = "[EXT] CPU-Measurement: Counter"},
+        {.irq = IRQEXT_CMR, .name = "CMR", .desc = "[EXT] CPU-Measurement: RI"},
+        {.irq = IRQIO_CIO,  .name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt"},
+        {.irq = IRQIO_QAI,  .name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt"},
+        {.irq = IRQIO_DAS,  .name = "DAS", .desc = "[I/O] DASD"},
+        {.irq = IRQIO_C15,  .name = "C15", .desc = "[I/O] 3215"},
+        {.irq = IRQIO_C70,  .name = "C70", .desc = "[I/O] 3270"},
+        {.irq = IRQIO_TAP,  .name = "TAP", .desc = "[I/O] Tape"},
+        {.irq = IRQIO_VMR,  .name = "VMR", .desc = "[I/O] Unit Record Devices"},
+        {.irq = IRQIO_LCS,  .name = "LCS", .desc = "[I/O] LCS"},
+        {.irq = IRQIO_CLW,  .name = "CLW", .desc = "[I/O] CLAW"},
+        {.irq = IRQIO_CTC,  .name = "CTC", .desc = "[I/O] CTC"},
+        {.irq = IRQIO_APB,  .name = "APB", .desc = "[I/O] AP Bus"},
+        {.irq = IRQIO_ADM,  .name = "ADM", .desc = "[I/O] EADM Subchannel"},
+        {.irq = IRQIO_CSC,  .name = "CSC", .desc = "[I/O] CHSC Subchannel"},
+        {.irq = IRQIO_PCI,  .name = "PCI", .desc = "[I/O] PCI Interrupt" },
+        {.irq = IRQIO_MSI,  .name = "MSI", .desc = "[I/O] MSI Interrupt" },
+        {.irq = IRQIO_VIR,  .name = "VIR", .desc = "[I/O] Virtual I/O Devices"},
+        {.irq = IRQIO_VAI,  .name = "VAI", .desc = "[I/O] Virtual I/O Devices AI"},
+        {.irq = NMI_NMI,    .name = "NMI", .desc = "[NMI] Machine Check"},
+        {.irq = CPU_RST,    .name = "RST", .desc = "[CPU] CPU Restart"},
 };
 
 void __init init_IRQ(void)
@@ -116,33 +117,37 @@ void do_IRQ(struct pt_regs *regs, int irq)
  */
 int show_interrupts(struct seq_file *p, void *v)
 {
-        int irq = *(loff_t *) v;
-        int cpu;
+        int index = *(loff_t *) v;
+        int cpu, irq;
 
         get_online_cpus();
-        if (irq == 0) {
+        if (index == 0) {
                 seq_puts(p, "           ");
                 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)
+        if (index < NR_IRQS) {
+                if (index >= NR_IRQS_BASE)
                         goto out;
-                seq_printf(p, "%s: ", irqclass_main_desc[irq].name);
+                /* Adjust index to process irqclass_main_desc array entries */
+                index--;
+                seq_printf(p, "%s: ", irqclass_main_desc[index].name);
+                irq = irqclass_main_desc[index].irq;
                 for_each_online_cpu(cpu)
                         seq_printf(p, "%10u ", kstat_irqs_cpu(irq, cpu));
                 seq_putc(p, '\n');
                 goto out;
         }
-        for (irq = 0; irq < NR_ARCH_IRQS; irq++) {
-                seq_printf(p, "%s: ", irqclass_sub_desc[irq].name);
+        for (index = 0; index < NR_ARCH_IRQS; index++) {
+                seq_printf(p, "%s: ", irqclass_sub_desc[index].name);
+                irq = irqclass_sub_desc[index].irq;
                 for_each_online_cpu(cpu)
                         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);
+                if (irqclass_sub_desc[index].desc)
+                        seq_printf(p, "  %s", irqclass_sub_desc[index].desc);
                 seq_putc(p, '\n');
         }
 out:
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 1e2264b46e4c..ae1d5be7dd88 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -501,6 +501,8 @@ static int kdump_mem_notifier(struct notifier_block *nb,
 {
         struct memory_notify *arg = data;
 
+        if (action != MEM_GOING_OFFLINE)
+                return NOTIFY_OK;
         if (arg->start_pfn < PFN_DOWN(resource_size(&crashk_res)))
                 return NOTIFY_BAD;
         if (arg->start_pfn > PFN_DOWN(crashk_res.end))
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 42b49f9e19bf..469c4c6d9182 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -200,15 +200,15 @@ static int setup_frame(int sig, struct k_sigaction *ka,
         frame = get_sigframe(ka, regs, sizeof(sigframe));
 
         if (frame == (void __user *) -1UL)
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (__copy_to_user(&frame->sc.oldmask, &set->sig, _SIGMASK_COPY_SIZE))
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (save_sigregs(regs, &frame->sregs))
-                goto give_sigsegv;
+                return -EFAULT;
         if (__put_user(&frame->sregs, &frame->sc.sregs))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
@@ -220,12 +220,12 @@ static int setup_frame(int sig, struct k_sigaction *ka,
                         frame->retcode | PSW_ADDR_AMODE;
                 if (__put_user(S390_SYSCALL_OPCODE | __NR_sigreturn,
                                (u16 __user *)(frame->retcode)))
-                        goto give_sigsegv;
+                        return -EFAULT;
         }
 
         /* Set up backchain. */
         if (__put_user(regs->gprs[15], (addr_t __user *) frame))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up registers for signal handler */
         regs->gprs[15] = (unsigned long) frame;
@@ -250,27 +250,23 @@ static int setup_frame(int sig, struct k_sigaction *ka,
 
         /* Place signal number on stack to allow backtrace from handler.  */
         if (__put_user(regs->gprs[2], (int __user *) &frame->signo))
-                goto give_sigsegv;
+                return -EFAULT;
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                           sigset_t *set, struct pt_regs * regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         int err = 0;
         rt_sigframe __user *frame;
 
-        frame = get_sigframe(ka, regs, sizeof(rt_sigframe));
+        frame = get_sigframe(&ksig->ka, regs, sizeof(rt_sigframe));
 
         if (frame == (void __user *) -1UL)
-                goto give_sigsegv;
+                return -EFAULT;
 
-        if (copy_siginfo_to_user(&frame->info, info))
-                goto give_sigsegv;
+        if (copy_siginfo_to_user(&frame->info, &ksig->info))
+                return -EFAULT;
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -279,24 +275,24 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= save_sigregs(regs, &frame->uc.uc_mcontext);
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
-        if (ka->sa.sa_flags & SA_RESTORER) {
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
                 regs->gprs[14] = (unsigned long)
-                        ka->sa.sa_restorer | PSW_ADDR_AMODE;
+                        ksig->ka.sa.sa_restorer | PSW_ADDR_AMODE;
         } else {
                 regs->gprs[14] = (unsigned long)
                         frame->retcode | PSW_ADDR_AMODE;
                 if (__put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,
                                (u16 __user *)(frame->retcode)))
-                        goto give_sigsegv;
+                        return -EFAULT;
         }
 
         /* Set up backchain. */
         if (__put_user(regs->gprs[15], (addr_t __user *) frame))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up registers for signal handler */
         regs->gprs[15] = (unsigned long) frame;
@@ -304,34 +300,27 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->psw.mask = PSW_MASK_EA | PSW_MASK_BA |
                 (PSW_USER_BITS & PSW_MASK_ASC) |
                 (regs->psw.mask & ~PSW_MASK_ASC);
-        regs->psw.addr = (unsigned long) ka->sa.sa_handler | PSW_ADDR_AMODE;
+        regs->psw.addr = (unsigned long) ksig->ka.sa.sa_handler | PSW_ADDR_AMODE;
 
-        regs->gprs[2] = map_signal(sig);
+        regs->gprs[2] = map_signal(ksig->sig);
         regs->gprs[3] = (unsigned long) &frame->info;
         regs->gprs[4] = (unsigned long) &frame->uc;
         regs->gprs[5] = task_thread_info(current)->last_break;
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
-static void handle_signal(unsigned long sig, struct k_sigaction *ka,
-                         siginfo_t *info, sigset_t *oldset,
-                         struct pt_regs *regs)
+static void handle_signal(struct ksignal *ksig, sigset_t *oldset,
+                          struct pt_regs *regs)
 {
         int ret;
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame(ksig, oldset, regs);
         else
-                ret = setup_frame(sig, ka, oldset, regs);
-        if (ret)
-                return;
-        signal_delivered(sig, info, ka, regs,
-                                 test_thread_flag(TIF_SINGLE_STEP));
+                ret = setup_frame(ksig->sig, &ksig->ka, oldset, regs);
+
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLE_STEP));
 }
 
 /*
@@ -345,9 +334,7 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
  */
 void do_signal(struct pt_regs *regs)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
         sigset_t *oldset = sigmask_to_save();
 
         /*
@@ -357,9 +344,8 @@ void do_signal(struct pt_regs *regs)
          */
         current_thread_info()->system_call =
                 test_pt_regs_flag(regs, PIF_SYSCALL) ? regs->int_code : 0;
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
 
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Whee!  Actually deliver the signal.  */
                 if (current_thread_info()->system_call) {
                         regs->int_code = current_thread_info()->system_call;
@@ -370,7 +356,7 @@ void do_signal(struct pt_regs *regs)
                                 regs->gprs[2] = -EINTR;
                                 break;
                         case -ERESTARTSYS:
-                                if (!(ka.sa.sa_flags & SA_RESTART)) {
+                                if (!(ksig.ka.sa.sa_flags & SA_RESTART)) {
                                         regs->gprs[2] = -EINTR;
                                         break;
                                 }
@@ -387,9 +373,9 @@ void do_signal(struct pt_regs *regs)
                 clear_pt_regs_flag(regs, PIF_SYSCALL);
 
                 if (is_compat_task())
-                        handle_signal32(signr, &ka, &info, oldset, regs);
+                        handle_signal32(&ksig, oldset, regs);
                 else
-                        handle_signal(signr, &ka, &info, oldset, regs);
+                        handle_signal(&ksig, oldset, regs);
                 return;
         }
 
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 0931b110c826..4cef607f3711 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -214,26 +214,26 @@ void update_vsyscall(struct timekeeper *tk)
 {
         u64 nsecps;
 
-        if (tk->clock != &clocksource_tod)
+        if (tk->tkr.clock != &clocksource_tod)
                 return;
 
         /* Make userspace gettimeofday spin until we're done. */
         ++vdso_data->tb_update_count;
         smp_wmb();
-        vdso_data->xtime_tod_stamp = tk->clock->cycle_last;
+        vdso_data->xtime_tod_stamp = tk->tkr.cycle_last;
         vdso_data->xtime_clock_sec = tk->xtime_sec;
-        vdso_data->xtime_clock_nsec = tk->xtime_nsec;
+        vdso_data->xtime_clock_nsec = tk->tkr.xtime_nsec;
         vdso_data->wtom_clock_sec =
                 tk->xtime_sec + tk->wall_to_monotonic.tv_sec;
-        vdso_data->wtom_clock_nsec = tk->xtime_nsec +
-                + ((u64) tk->wall_to_monotonic.tv_nsec << tk->shift);
-        nsecps = (u64) NSEC_PER_SEC << tk->shift;
+        vdso_data->wtom_clock_nsec = tk->tkr.xtime_nsec +
+                + ((u64) tk->wall_to_monotonic.tv_nsec << tk->tkr.shift);
+        nsecps = (u64) NSEC_PER_SEC << tk->tkr.shift;
         while (vdso_data->wtom_clock_nsec >= nsecps) {
                 vdso_data->wtom_clock_nsec -= nsecps;
                 vdso_data->wtom_clock_sec++;
         }
-        vdso_data->tk_mult = tk->mult;
-        vdso_data->tk_shift = tk->shift;
+        vdso_data->tk_mult = tk->tkr.mult;
+        vdso_data->tk_shift = tk->tkr.shift;
         smp_wmb();
         ++vdso_data->tb_update_count;
 }
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index 613649096783..0bbb7e027c5a 100644
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -316,18 +316,3 @@ static int __init vdso_init(void)
         return 0;
 }
 early_initcall(vdso_init);
-
-int in_gate_area_no_mm(unsigned long addr)
-{
-        return 0;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long addr)
-{
-        return 0;
-}
-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-        return NULL;
-}
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index 10d529ac9821..646db9c467d1 100644
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -26,6 +26,7 @@ config KVM
         select KVM_ASYNC_PF
         select KVM_ASYNC_PF_SYNC
         select HAVE_KVM_IRQCHIP
+        select HAVE_KVM_IRQFD
         select HAVE_KVM_IRQ_ROUTING
         ---help---
           Support hosting paravirtualized guest machines using the SIE
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 92528a0bdda6..f4c819bfc193 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -1556,8 +1556,7 @@ static int set_adapter_int(struct kvm_kernel_irq_routing_entry *e,
         return ret;
 }
 
-int kvm_set_routing_entry(struct kvm_irq_routing_table *rt,
-                          struct kvm_kernel_irq_routing_entry *e,
+int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e,
                           const struct kvm_irq_routing_entry *ue)
 {
         int ret;
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 339b34a02fb8..ce81eb2ab76a 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -146,7 +146,7 @@ long kvm_arch_dev_ioctl(struct file *filp,
         return -EINVAL;
 }
 
-int kvm_dev_ioctl_check_extension(long ext)
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 {
         int r;
 
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index 0ff66a7e29bb..389bc17934b7 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -10,42 +10,33 @@
 
 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.
+         * Convert encoding               pte bits         pmd bits
+         *                              .IR...wrdytp    dy..R...I...wr
+         * empty                        .10...000000 -> 00..0...1...00
+         * prot-none, clean, old        .11...000001 -> 00..1...1...00
+         * prot-none, clean, young      .11...000101 -> 01..1...1...00
+         * prot-none, dirty, old        .10...001001 -> 10..1...1...00
+         * prot-none, dirty, young      .10...001101 -> 11..1...1...00
+         * read-only, clean, old        .11...010001 -> 00..1...1...01
+         * read-only, clean, young      .01...010101 -> 01..1...0...01
+         * read-only, dirty, old        .11...011001 -> 10..1...1...01
+         * read-only, dirty, young      .01...011101 -> 11..1...0...01
+         * read-write, clean, old       .11...110001 -> 00..0...1...11
+         * read-write, clean, young     .01...110101 -> 01..0...0...11
+         * read-write, dirty, old       .10...111001 -> 10..0...1...11
+         * read-write, dirty, young     .00...111101 -> 11..0...0...11
          */
         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;
+                pmd_val(pmd) |= (pte_val(pte) & _PAGE_READ) >> 4;
+                pmd_val(pmd) |= (pte_val(pte) & _PAGE_WRITE) >> 4;
+                pmd_val(pmd) |= (pte_val(pte) & _PAGE_INVALID) >> 5;
+                pmd_val(pmd) |= (pte_val(pte) & _PAGE_PROTECT);
+                pmd_val(pmd) |= (pte_val(pte) & _PAGE_DIRTY) << 10;
+                pmd_val(pmd) |= (pte_val(pte) & _PAGE_YOUNG) << 10;
         } else
                 pmd_val(pmd) = _SEGMENT_ENTRY_INVALID;
         return pmd;
@@ -56,34 +47,31 @@ 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
+         * Convert encoding                pmd bits         pte bits
+         *                              dy..R...I...wr    .IR...wrdytp
+         * empty                        00..0...1...00 -> .10...001100
+         * prot-none, clean, old        00..0...1...00 -> .10...000001
+         * prot-none, clean, young      01..0...1...00 -> .10...000101
+         * prot-none, dirty, old        10..0...1...00 -> .10...001001
+         * prot-none, dirty, young      11..0...1...00 -> .10...001101
+         * read-only, clean, old        00..1...1...01 -> .11...010001
+         * read-only, clean, young      01..1...1...01 -> .11...010101
+         * read-only, dirty, old        10..1...1...01 -> .11...011001
+         * read-only, dirty, young      11..1...1...01 -> .11...011101
+         * read-write, clean, old       00..0...1...11 -> .10...110001
+         * read-write, clean, young     01..0...1...11 -> .10...110101
+         * read-write, dirty, old       10..0...1...11 -> .10...111001
+         * read-write, dirty, young     11..0...1...11 -> .10...111101
          */
         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;
-                }
+                pte_val(pte) = pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN_LARGE;
+                pte_val(pte) |= _PAGE_LARGE | _PAGE_PRESENT;
+                pte_val(pte) |= (pmd_val(pmd) & _SEGMENT_ENTRY_READ) << 4;
+                pte_val(pte) |= (pmd_val(pmd) & _SEGMENT_ENTRY_WRITE) << 4;
+                pte_val(pte) |= (pmd_val(pmd) & _SEGMENT_ENTRY_INVALID) << 5;
+                pte_val(pte) |= (pmd_val(pmd) & _SEGMENT_ENTRY_PROTECT);
+                pmd_val(pmd) |= (pte_val(pte) & _PAGE_DIRTY) << 10;
+                pmd_val(pmd) |= (pte_val(pte) & _PAGE_YOUNG) << 10;
         } else
                 pte_val(pte) = _PAGE_INVALID;
         return pte;
@@ -96,6 +84,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
 
         pmd = __pte_to_pmd(pte);
         if (!MACHINE_HAS_HPAGE) {
+                /* Emulated huge ptes loose the dirty and young bit */
                 pmd_val(pmd) &= ~_SEGMENT_ENTRY_ORIGIN;
                 pmd_val(pmd) |= pte_page(pte)[1].index;
         } else
@@ -113,6 +102,8 @@ pte_t huge_ptep_get(pte_t *ptep)
                 origin = pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN;
                 pmd_val(pmd) &= ~_SEGMENT_ENTRY_ORIGIN;
                 pmd_val(pmd) |= *(unsigned long *) origin;
+                /* Emulated huge ptes are young and dirty by definition */
+                pmd_val(pmd) |= _SEGMENT_ENTRY_YOUNG | _SEGMENT_ENTRY_DIRTY;
         }
         return __pmd_to_pte(pmd);
 }
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 37b8241ec784..19daa53a3da4 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -1279,6 +1279,7 @@ static unsigned long page_table_realloc_pmd(struct mmu_gather *tlb,
 {
         unsigned long next, *table, *new;
         struct page *page;
+        spinlock_t *ptl;
         pmd_t *pmd;
 
         pmd = pmd_offset(pud, addr);
@@ -1296,7 +1297,7 @@ again:
                 if (!new)
                         return -ENOMEM;
 
-                spin_lock(&mm->page_table_lock);
+                ptl = pmd_lock(mm, pmd);
                 if (likely((unsigned long *) pmd_deref(*pmd) == table)) {
                         /* Nuke pmd entry pointing to the "short" page table */
                         pmdp_flush_lazy(mm, addr, pmd);
@@ -1310,7 +1311,7 @@ again:
                         page_table_free_rcu(tlb, table);
                         new = NULL;
                 }
-                spin_unlock(&mm->page_table_lock);
+                spin_unlock(ptl);
                 if (new) {
                         page_table_free_pgste(new);
                         goto again;
@@ -1432,6 +1433,9 @@ int pmdp_set_access_flags(struct vm_area_struct *vma,
 {
         VM_BUG_ON(address & ~HPAGE_PMD_MASK);
 
+        entry = pmd_mkyoung(entry);
+        if (dirty)
+                entry = pmd_mkdirty(entry);
         if (pmd_same(*pmdp, entry))
                 return 0;
         pmdp_invalidate(vma, address, pmdp);
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index a2cbd875543a..61e45b7c04d7 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -812,7 +812,7 @@ static struct bpf_binary_header *bpf_alloc_binary(unsigned int bpfsize,
         return header;
 }
 
-void bpf_jit_compile(struct sk_filter *fp)
+void bpf_jit_compile(struct bpf_prog *fp)
 {
         struct bpf_binary_header *header = NULL;
         unsigned long size, prg_len, lit_len;
@@ -875,7 +875,7 @@ out:
         kfree(addrs);
 }
 
-void bpf_jit_free(struct sk_filter *fp)
+void bpf_jit_free(struct bpf_prog *fp)
 {
         unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
         struct bpf_binary_header *header = (void *)addr;
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 30de42730b2f..2fa7b14b9c08 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -15,8 +15,8 @@
  *   Thomas Klein
  */
 
-#define COMPONENT "zPCI"
-#define pr_fmt(fmt) COMPONENT ": " fmt
+#define KMSG_COMPONENT "zpci"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index 96545d7659fd..6e22a247de9b 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -5,8 +5,8 @@
  *   Jan Glauber <jang@linux.vnet.ibm.com>
  */
 
-#define COMPONENT "zPCI"
-#define pr_fmt(fmt) COMPONENT ": " fmt
+#define KMSG_COMPONENT "zpci"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
 #include <linux/slab.h>
diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c
index c5c66840ac00..eec598c5939f 100644
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@ -5,8 +5,8 @@
  *    Jan Glauber <jang@linux.vnet.ibm.com>
  */
 
-#define COMPONENT "zPCI"
-#define pr_fmt(fmt) COMPONENT ": " fmt
+#define KMSG_COMPONENT "zpci"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
 #include <linux/seq_file.h>
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index f91c03119804..4cbb29a4d615 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -16,6 +16,13 @@
 
 static struct kmem_cache *dma_region_table_cache;
 static struct kmem_cache *dma_page_table_cache;
+static int s390_iommu_strict;
+
+static int zpci_refresh_global(struct zpci_dev *zdev)
+{
+        return zpci_refresh_trans((u64) zdev->fh << 32, zdev->start_dma,
+                                  zdev->iommu_pages * PAGE_SIZE);
+}
 
 static unsigned long *dma_alloc_cpu_table(void)
 {
@@ -155,18 +162,15 @@ static int dma_update_trans(struct zpci_dev *zdev, unsigned long pa,
         }
 
         /*
-         * rpcit is not required to establish new translations when previously
-         * invalid translation-table entries are validated, however it is
-         * required when altering previously valid entries.
+         * With zdev->tlb_refresh == 0, rpcit is not required to establish new
+         * translations when previously invalid translation-table entries are
+         * validated. With lazy unmap, it also is skipped for previously valid
+         * entries, but a global rpcit is then required before any address can
+         * be re-used, i.e. after each iommu bitmap wrap-around.
          */
         if (!zdev->tlb_refresh &&
-            ((flags & ZPCI_PTE_VALID_MASK) == ZPCI_PTE_VALID))
-                /*
-                 * TODO: also need to check that the old entry is indeed INVALID
-                 * and not only for one page but for the whole range...
-                 * -> now we WARN_ON in that case but with lazy unmap that
-                 * needs to be redone!
-                 */
+                        (!s390_iommu_strict ||
+                        ((flags & ZPCI_PTE_VALID_MASK) == ZPCI_PTE_VALID)))
                 goto no_refresh;
 
         rc = zpci_refresh_trans((u64) zdev->fh << 32, start_dma_addr,
@@ -220,16 +224,21 @@ static unsigned long __dma_alloc_iommu(struct zpci_dev *zdev,
 static unsigned long dma_alloc_iommu(struct zpci_dev *zdev, int size)
 {
         unsigned long offset, flags;
+        int wrap = 0;
 
         spin_lock_irqsave(&zdev->iommu_bitmap_lock, flags);
         offset = __dma_alloc_iommu(zdev, zdev->next_bit, size);
-        if (offset == -1)
+        if (offset == -1) {
+                /* wrap-around */
                 offset = __dma_alloc_iommu(zdev, 0, size);
+                wrap = 1;
+        }
 
         if (offset != -1) {
                 zdev->next_bit = offset + size;
-                if (zdev->next_bit >= zdev->iommu_pages)
-                        zdev->next_bit = 0;
+                if (!zdev->tlb_refresh && !s390_iommu_strict && wrap)
+                        /* global flush after wrap-around with lazy unmap */
+                        zpci_refresh_global(zdev);
         }
         spin_unlock_irqrestore(&zdev->iommu_bitmap_lock, flags);
         return offset;
@@ -243,7 +252,11 @@ static void dma_free_iommu(struct zpci_dev *zdev, unsigned long offset, int size
         if (!zdev->iommu_bitmap)
                 goto out;
         bitmap_clear(zdev->iommu_bitmap, offset, size);
-        if (offset >= zdev->next_bit)
+        /*
+         * Lazy flush for unmap: need to move next_bit to avoid address re-use
+         * until wrap-around.
+         */
+        if (!s390_iommu_strict && offset >= zdev->next_bit)
                 zdev->next_bit = offset + size;
 out:
         spin_unlock_irqrestore(&zdev->iommu_bitmap_lock, flags);
@@ -504,3 +517,12 @@ struct dma_map_ops s390_dma_ops = {
         /* dma_supported is unconditionally true without a callback */
 };
 EXPORT_SYMBOL_GPL(s390_dma_ops);
+
+static int __init s390_iommu_setup(char *str)
+{
+        if (!strncmp(str, "strict", 6))
+                s390_iommu_strict = 1;
+        return 0;
+}
+
+__setup("s390_iommu=", s390_iommu_setup);
diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
index 6d7f5a3016ca..460fdb21cf61 100644
--- a/arch/s390/pci/pci_event.c
+++ b/arch/s390/pci/pci_event.c
@@ -5,8 +5,8 @@
  *    Jan Glauber <jang@linux.vnet.ibm.com>
  */
 
-#define COMPONENT "zPCI"
-#define pr_fmt(fmt) COMPONENT ": " fmt
+#define KMSG_COMPONENT "zpci"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c
index 9190214b8702..fa3ce891e597 100644
--- a/arch/s390/pci/pci_sysfs.c
+++ b/arch/s390/pci/pci_sysfs.c
@@ -5,8 +5,8 @@
  *   Jan Glauber <jang@linux.vnet.ibm.com>
  */
 
-#define COMPONENT "zPCI"
-#define pr_fmt(fmt) COMPONENT ": " fmt
+#define KMSG_COMPONENT "zpci"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
 #include <linux/kernel.h>
 #include <linux/stat.h>
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index 2f947aba4bd4..aad209199f7e 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -8,5 +8,6 @@ generic-y += cputime.h
 generic-y += hash.h
 generic-y += mcs_spinlock.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += trace_clock.h
 generic-y += xor.h
diff --git a/arch/score/include/asm/scatterlist.h b/arch/score/include/asm/scatterlist.h
deleted file mode 100644
index 9f533b8362c7..000000000000
--- a/arch/score/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_SCATTERLIST_H
-#define _ASM_SCORE_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* _ASM_SCORE_SCATTERLIST_H */
diff --git a/arch/score/include/uapi/asm/ptrace.h b/arch/score/include/uapi/asm/ptrace.h
index f59771a3f127..5c5e794058be 100644
--- a/arch/score/include/uapi/asm/ptrace.h
+++ b/arch/score/include/uapi/asm/ptrace.h
@@ -4,17 +4,6 @@
 #define PTRACE_GETREGS          12
 #define PTRACE_SETREGS          13
 
-#define PC              32
-#define CONDITION       33
-#define ECR             34
-#define EMA             35
-#define CEH             36
-#define CEL             37
-#define COUNTER         38
-#define LDCR            39
-#define STCR            40
-#define PSR             41
-
 #define SINGLESTEP16_INSN       0x7006
 #define SINGLESTEP32_INSN       0x840C8000
 #define BREAKPOINT16_INSN       0x7002          /* work on SPG300 */
diff --git a/arch/score/kernel/signal.c b/arch/score/kernel/signal.c
index a00fba32b0eb..1651807774ad 100644
--- a/arch/score/kernel/signal.c
+++ b/arch/score/kernel/signal.c
@@ -173,15 +173,15 @@ badframe:
         return 0;
 }
 
-static int setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs,
-                int signr, sigset_t *set, siginfo_t *info)
+static int setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs,
+                          sigset_t *set)
 {
         struct rt_sigframe __user *frame;
         int err = 0;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         /*
          * Set up the return code ...
@@ -194,7 +194,7 @@ static int setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs,
         err |= __put_user(0x80008002, frame->rs_code + 1);
         flush_cache_sigtramp((unsigned long) frame->rs_code);
 
-        err |= copy_siginfo_to_user(&frame->rs_info, info);
+        err |= copy_siginfo_to_user(&frame->rs_info, &ksig->info);
         err |= __put_user(0, &frame->rs_uc.uc_flags);
         err |= __put_user(NULL, &frame->rs_uc.uc_link);
         err |= __save_altstack(&frame->rs_uc.uc_stack, regs->regs[0]);
@@ -202,26 +202,23 @@ static int setup_rt_frame(struct k_sigaction *ka, struct pt_regs *regs,
         err |= __copy_to_user(&frame->rs_uc.uc_sigmask, set, sizeof(*set));
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         regs->regs[0] = (unsigned long) frame;
         regs->regs[3] = (unsigned long) frame->rs_code;
-        regs->regs[4] = signr;
+        regs->regs[4] = ksig->sig;
         regs->regs[5] = (unsigned long) &frame->rs_info;
         regs->regs[6] = (unsigned long) &frame->rs_uc;
-        regs->regs[29] = (unsigned long) ka->sa.sa_handler;
-        regs->cp0_epc = (unsigned long) ka->sa.sa_handler;
+        regs->regs[29] = (unsigned long) ksig->ka.sa.sa_handler;
+        regs->cp0_epc = (unsigned long) ksig->ka.sa.sa_handler;
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(signr, current);
-        return -EFAULT;
 }
 
-static void handle_signal(unsigned long sig, siginfo_t *info,
-        struct k_sigaction *ka, struct pt_regs *regs)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
+        int ret;
+
         if (regs->is_syscall) {
                 switch (regs->regs[4]) {
                 case ERESTART_RESTARTBLOCK:
@@ -229,7 +226,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
                         regs->regs[4] = EINTR;
                         break;
                 case ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 regs->regs[4] = EINTR;
                                 break;
                         }
@@ -245,17 +242,14 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
         /*
          * Set up the stack frame
          */
-        if (setup_rt_frame(ka, regs, sig, sigmask_to_save(), info) < 0)
-                return;
+        ret = setup_rt_frame(ksig, regs, sigmask_to_save());
 
-        signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 static void do_signal(struct pt_regs *regs)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
+        struct ksignal ksig;
 
         /*
          * We want the common case to go fast, which is why we may in certain
@@ -265,10 +259,9 @@ static void do_signal(struct pt_regs *regs)
         if (!user_mode(regs))
                 return;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Actually deliver the signal.  */
-                handle_signal(signr, &info, &ka, regs);
+                handle_signal(&ksig, regs);
                 return;
         }
 
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index aa2df3eaeb29..453fa5c09550 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -595,6 +595,8 @@ source kernel/Kconfig.hz
 config KEXEC
         bool "kexec system call (EXPERIMENTAL)"
         depends on SUPERH32 && MMU
+        select CRYPTO
+        select CRYPTO_SHA256
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index e331e5373b8e..89963d13f930 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -371,7 +371,7 @@ if SH_MAGIC_PANEL_R2
 menu "Magic Panel R2 options"
 
 config SH_MAGIC_PANEL_R2_VERSION
-        int SH_MAGIC_PANEL_R2_VERSION
+        int "Magic Panel R2 Version"
         default "3"
         help
           Set the version of the Magic Panel R2
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 85d5255d259f..0d3049244cd3 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -874,6 +874,8 @@ static struct platform_device fsi_da7210_device = {
         .name   = "asoc-simple-card",
         .dev    = {
                 .platform_data  = &fsi_da7210_info,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
+                .dma_mask = &fsi_da7210_device.dev.coherent_dma_mask,
         },
 };
 
diff --git a/arch/sh/configs/sh2007_defconfig b/arch/sh/configs/sh2007_defconfig
index 0c08d9244c97..e741b1e36acd 100644
--- a/arch/sh/configs/sh2007_defconfig
+++ b/arch/sh/configs/sh2007_defconfig
@@ -52,7 +52,6 @@ CONFIG_CDROM_PKTCDVD=y
 # CONFIG_MISC_DEVICES is not set
 CONFIG_RAID_ATTRS=y
 CONFIG_SCSI=y
-CONFIG_SCSI_TGT=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_CHR_DEV_SG=y
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index cfd5b90a8628..78bc97b1d027 100644
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -12,9 +12,8 @@ config SH_DMA_IRQ_MULTI
         default y if CPU_SUBTYPE_SH7750  || CPU_SUBTYPE_SH7751  || \
                      CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || \
                      CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7091  || \
-                     CPU_SUBTYPE_SH7763  || CPU_SUBTYPE_SH7764  || \
-                     CPU_SUBTYPE_SH7780  || CPU_SUBTYPE_SH7785  || \
-                     CPU_SUBTYPE_SH7760
+                     CPU_SUBTYPE_SH7763  || CPU_SUBTYPE_SH7780  || \
+                     CPU_SUBTYPE_SH7785  || CPU_SUBTYPE_SH7760
 
 config SH_DMA_API
         depends on SH_DMA
diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c
index b22565623142..afde2a7d3eb3 100644
--- a/arch/sh/drivers/dma/dma-sh.c
+++ b/arch/sh/drivers/dma/dma-sh.c
@@ -25,7 +25,7 @@
  * Define the default configuration for dual address memory-memory transfer.
  * The 0x400 value represents auto-request, external->external.
  */
-#define RS_DUAL (DM_INC | SM_INC | 0x400 | TS_INDEX2VAL(XMIT_SZ_32BIT))
+#define RS_DUAL (DM_INC | SM_INC | RS_AUTO | TS_INDEX2VAL(XMIT_SZ_32BIT))
 
 static unsigned long dma_find_base(unsigned int chan)
 {
diff --git a/arch/sh/include/asm/dma-register.h b/arch/sh/include/asm/dma-register.h
index 51cd78feacff..c757b47e6b64 100644
--- a/arch/sh/include/asm/dma-register.h
+++ b/arch/sh/include/asm/dma-register.h
@@ -13,17 +13,17 @@
 #ifndef DMA_REGISTER_H
 #define DMA_REGISTER_H
 
-/* DMA register */
-#define SAR     0x00
-#define DAR     0x04
-#define TCR     0x08
-#define CHCR    0x0C
-#define DMAOR   0x40
+/* DMA registers */
+#define SAR     0x00    /* Source Address Register */
+#define DAR     0x04    /* Destination Address Register */
+#define TCR     0x08    /* Transfer Count Register */
+#define CHCR    0x0C    /* Channel Control Register */
+#define DMAOR   0x40    /* DMA Operation Register */
 
 /* DMAOR definitions */
-#define DMAOR_AE        0x00000004
+#define DMAOR_AE        0x00000004      /* Address Error Flag */
 #define DMAOR_NMIF      0x00000002
-#define DMAOR_DME       0x00000001
+#define DMAOR_DME       0x00000001      /* DMA Master Enable */
 
 /* Definitions for the SuperH DMAC */
 #define REQ_L   0x00000000
@@ -34,18 +34,20 @@
 #define ACK_W   0x00020000
 #define ACK_H   0x00000000
 #define ACK_L   0x00010000
-#define DM_INC  0x00004000
-#define DM_DEC  0x00008000
-#define DM_FIX  0x0000c000
-#define SM_INC  0x00001000
-#define SM_DEC  0x00002000
-#define SM_FIX  0x00003000
+#define DM_INC  0x00004000      /* Destination addresses are incremented */
+#define DM_DEC  0x00008000      /* Destination addresses are decremented */
+#define DM_FIX  0x0000c000      /* Destination address is fixed */
+#define SM_INC  0x00001000      /* Source addresses are incremented */
+#define SM_DEC  0x00002000      /* Source addresses are decremented */
+#define SM_FIX  0x00003000      /* Source address is fixed */
 #define RS_IN   0x00000200
 #define RS_OUT  0x00000300
+#define RS_AUTO 0x00000400      /* Auto Request */
+#define RS_ERS  0x00000800      /* DMA extended resource selector */
 #define TS_BLK  0x00000040
 #define TM_BUR  0x00000020
-#define CHCR_DE 0x00000001
-#define CHCR_TE 0x00000002
-#define CHCR_IE 0x00000004
+#define CHCR_DE 0x00000001      /* DMA Enable */
+#define CHCR_TE 0x00000002      /* Transfer End Flag */
+#define CHCR_IE 0x00000004      /* Interrupt Enable */
 
 #endif
diff --git a/arch/sh/include/asm/io_noioport.h b/arch/sh/include/asm/io_noioport.h
index 4d48f1436a63..c727e6ddf69e 100644
--- a/arch/sh/include/asm/io_noioport.h
+++ b/arch/sh/include/asm/io_noioport.h
@@ -34,6 +34,17 @@ static inline void outl(unsigned int x, unsigned long port)
         BUG();
 }
 
+static inline void __iomem *ioport_map(unsigned long port, unsigned int size)
+{
+        BUG();
+        return NULL;
+}
+
+static inline void ioport_unmap(void __iomem *addr)
+{
+        BUG();
+}
+
 #define inb_p(addr)     inb(addr)
 #define inw_p(addr)     inw(addr)
 #define inl_p(addr)     inl(addr)
diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h
index 15d970328f71..fe20d14ae051 100644
--- a/arch/sh/include/asm/page.h
+++ b/arch/sh/include/asm/page.h
@@ -186,11 +186,6 @@ typedef struct page *pgtable_t;
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
 
-/* vDSO support */
-#ifdef CONFIG_VSYSCALL
-#define __HAVE_ARCH_GATE_AREA
-#endif
-
 /*
  * Some drivers need to perform DMA into kmalloc'ed buffers
  * and so we have to increase the kmalloc minalign for this.
diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h
index 02788b6a03b7..9cd81e54056a 100644
--- a/arch/sh/include/cpu-sh4/cpu/dma-register.h
+++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h
@@ -32,7 +32,6 @@
 #define CHCR_TS_HIGH_SHIFT      (20 - 2)        /* 2 bits for shifted low TS */
 #elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \
         defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-        defined(CONFIG_CPU_SUBTYPE_SH7764) || \
         defined(CONFIG_CPU_SUBTYPE_SH7780) || \
         defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define CHCR_TS_LOW_MASK        0x00000018
diff --git a/arch/sh/include/cpu-sh4a/cpu/dma.h b/arch/sh/include/cpu-sh4a/cpu/dma.h
index 89afb650ce25..8ceccceae844 100644
--- a/arch/sh/include/cpu-sh4a/cpu/dma.h
+++ b/arch/sh/include/cpu-sh4a/cpu/dma.h
@@ -14,8 +14,7 @@
 #define DMTE4_IRQ       evt2irq(0xb80)
 #define DMAE0_IRQ       evt2irq(0xbc0)  /* DMA Error IRQ*/
 #define SH_DMAC_BASE0   0xFE008020
-#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-        defined(CONFIG_CPU_SUBTYPE_SH7764)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7763)
 #define DMTE0_IRQ       evt2irq(0x640)
 #define DMTE4_IRQ       evt2irq(0x780)
 #define DMAE0_IRQ       evt2irq(0x6c0)
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
index f579dd528198..c187b9579c21 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
@@ -307,7 +307,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_ICK_ID("fck", "sh-tmu.0", &mstp_clks[HWBLK_TMU0]),
         CLKDEV_ICK_ID("fck", "sh-tmu.1", &mstp_clks[HWBLK_TMU1]),
 
-        CLKDEV_ICK_ID("fck", "sh-cmt-16.0", &mstp_clks[HWBLK_CMT]),
+        CLKDEV_ICK_ID("fck", "sh-cmt-32.0", &mstp_clks[HWBLK_CMT]),
         CLKDEV_DEV_ID("sh-wdt.0", &mstp_clks[HWBLK_RWDT]),
         CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[HWBLK_DMAC1]),
 
@@ -332,6 +332,8 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("tsif0", &mstp_clks[HWBLK_TSIF]),
         CLKDEV_DEV_ID("renesas_usbhs.1", &mstp_clks[HWBLK_USB1]),
         CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[HWBLK_USB0]),
+        CLKDEV_CON_ID("usb1", &mstp_clks[HWBLK_USB1]),
+        CLKDEV_CON_ID("usb0", &mstp_clks[HWBLK_USB0]),
         CLKDEV_CON_ID("2dg0", &mstp_clks[HWBLK_2DG]),
         CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[HWBLK_SDHI0]),
         CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[HWBLK_SDHI1]),
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 57f83a92a505..7aa733307afc 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -30,62 +30,62 @@ static const struct sh_dmae_slave_config sh7722_dmae_slaves[] = {
         {
                 .slave_id       = SHDMA_SLAVE_SCIF0_TX,
                 .addr           = 0xffe0000c,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x21,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF0_RX,
                 .addr           = 0xffe00014,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x22,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF1_TX,
                 .addr           = 0xffe1000c,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x25,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF1_RX,
                 .addr           = 0xffe10014,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x26,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF2_TX,
                 .addr           = 0xffe2000c,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x29,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF2_RX,
                 .addr           = 0xffe20014,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x2a,
         }, {
                 .slave_id       = SHDMA_SLAVE_SIUA_TX,
                 .addr           = 0xa454c098,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xb1,
         }, {
                 .slave_id       = SHDMA_SLAVE_SIUA_RX,
                 .addr           = 0xa454c090,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xb2,
         }, {
                 .slave_id       = SHDMA_SLAVE_SIUB_TX,
                 .addr           = 0xa454c09c,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xb5,
         }, {
                 .slave_id       = SHDMA_SLAVE_SIUB_RX,
                 .addr           = 0xa454c094,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xb6,
         }, {
                 .slave_id       = SHDMA_SLAVE_SDHI0_TX,
                 .addr           = 0x04ce0030,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xc1,
         }, {
                 .slave_id       = SHDMA_SLAVE_SDHI0_RX,
                 .addr           = 0x04ce0030,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xc2,
         },
 };
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index b9e84b1d3aa7..ea5780b3c7f6 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -36,122 +36,122 @@ static const struct sh_dmae_slave_config sh7724_dmae_slaves[] = {
         {
                 .slave_id       = SHDMA_SLAVE_SCIF0_TX,
                 .addr           = 0xffe0000c,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x21,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF0_RX,
                 .addr           = 0xffe00014,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x22,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF1_TX,
                 .addr           = 0xffe1000c,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x25,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF1_RX,
                 .addr           = 0xffe10014,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x26,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF2_TX,
                 .addr           = 0xffe2000c,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x29,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF2_RX,
                 .addr           = 0xffe20014,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x2a,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF3_TX,
                 .addr           = 0xa4e30020,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x2d,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF3_RX,
                 .addr           = 0xa4e30024,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x2e,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF4_TX,
                 .addr           = 0xa4e40020,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x31,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF4_RX,
                 .addr           = 0xa4e40024,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x32,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF5_TX,
                 .addr           = 0xa4e50020,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x35,
         }, {
                 .slave_id       = SHDMA_SLAVE_SCIF5_RX,
                 .addr           = 0xa4e50024,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x36,
         }, {
                 .slave_id       = SHDMA_SLAVE_USB0D0_TX,
                 .addr           = 0xA4D80100,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0x73,
         }, {
                 .slave_id       = SHDMA_SLAVE_USB0D0_RX,
                 .addr           = 0xA4D80100,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0x73,
         }, {
                 .slave_id       = SHDMA_SLAVE_USB0D1_TX,
                 .addr           = 0xA4D80120,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0x77,
         }, {
                 .slave_id       = SHDMA_SLAVE_USB0D1_RX,
                 .addr           = 0xA4D80120,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0x77,
         }, {
                 .slave_id       = SHDMA_SLAVE_USB1D0_TX,
                 .addr           = 0xA4D90100,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xab,
         }, {
                 .slave_id       = SHDMA_SLAVE_USB1D0_RX,
                 .addr           = 0xA4D90100,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xab,
         }, {
                 .slave_id       = SHDMA_SLAVE_USB1D1_TX,
                 .addr           = 0xA4D90120,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xaf,
         }, {
                 .slave_id       = SHDMA_SLAVE_USB1D1_RX,
                 .addr           = 0xA4D90120,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_32BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xaf,
         }, {
                 .slave_id       = SHDMA_SLAVE_SDHI0_TX,
                 .addr           = 0x04ce0030,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xc1,
         }, {
                 .slave_id       = SHDMA_SLAVE_SDHI0_RX,
                 .addr           = 0x04ce0030,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xc2,
         }, {
                 .slave_id       = SHDMA_SLAVE_SDHI1_TX,
                 .addr           = 0x04cf0030,
-                .chcr           = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT),
+                .chcr           = DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xc9,
         }, {
                 .slave_id       = SHDMA_SLAVE_SDHI1_RX,
                 .addr           = 0x04cf0030,
-                .chcr           = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT),
+                .chcr           = DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xca,
         },
 };
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index 7b24ec4b409a..18bcd70cd813 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -123,28 +123,28 @@ static const struct sh_dmae_slave_config sh7757_dmae0_slaves[] = {
         {
                 .slave_id       = SHDMA_SLAVE_SDHI_TX,
                 .addr           = 0x1fe50030,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xc5,
         },
         {
                 .slave_id       = SHDMA_SLAVE_SDHI_RX,
                 .addr           = 0x1fe50030,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xc6,
         },
         {
                 .slave_id       = SHDMA_SLAVE_MMCIF_TX,
                 .addr           = 0x1fcb0034,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xd3,
         },
         {
                 .slave_id       = SHDMA_SLAVE_MMCIF_RX,
                 .addr           = 0x1fcb0034,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_32BIT),
                 .mid_rid        = 0xd7,
         },
@@ -154,56 +154,56 @@ static const struct sh_dmae_slave_config sh7757_dmae1_slaves[] = {
         {
                 .slave_id       = SHDMA_SLAVE_SCIF2_TX,
                 .addr           = 0x1f4b000c,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x21,
         },
         {
                 .slave_id       = SHDMA_SLAVE_SCIF2_RX,
                 .addr           = 0x1f4b0014,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x22,
         },
         {
                 .slave_id       = SHDMA_SLAVE_SCIF3_TX,
                 .addr           = 0x1f4c000c,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x29,
         },
         {
                 .slave_id       = SHDMA_SLAVE_SCIF3_RX,
                 .addr           = 0x1f4c0014,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x2a,
         },
         {
                 .slave_id       = SHDMA_SLAVE_SCIF4_TX,
                 .addr           = 0x1f4d000c,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x41,
         },
         {
                 .slave_id       = SHDMA_SLAVE_SCIF4_RX,
                 .addr           = 0x1f4d0014,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x42,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RSPI_TX,
                 .addr           = 0xfe480004,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xc1,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RSPI_RX,
                 .addr           = 0xfe480004,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_16BIT),
                 .mid_rid        = 0xc2,
         },
@@ -213,70 +213,70 @@ static const struct sh_dmae_slave_config sh7757_dmae2_slaves[] = {
         {
                 .slave_id       = SHDMA_SLAVE_RIIC0_TX,
                 .addr           = 0x1e500012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x21,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC0_RX,
                 .addr           = 0x1e500013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x22,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC1_TX,
                 .addr           = 0x1e510012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x29,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC1_RX,
                 .addr           = 0x1e510013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x2a,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC2_TX,
                 .addr           = 0x1e520012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0xa1,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC2_RX,
                 .addr           = 0x1e520013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0xa2,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC3_TX,
                 .addr           = 0x1e530012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0xa9,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC3_RX,
                 .addr           = 0x1e530013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0xaf,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC4_TX,
                 .addr           = 0x1e540012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0xc5,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC4_RX,
                 .addr           = 0x1e540013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0xc6,
         },
@@ -286,70 +286,70 @@ static const struct sh_dmae_slave_config sh7757_dmae3_slaves[] = {
         {
                 .slave_id       = SHDMA_SLAVE_RIIC5_TX,
                 .addr           = 0x1e550012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x21,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC5_RX,
                 .addr           = 0x1e550013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x22,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC6_TX,
                 .addr           = 0x1e560012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x29,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC6_RX,
                 .addr           = 0x1e560013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x2a,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC7_TX,
                 .addr           = 0x1e570012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x41,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC7_RX,
                 .addr           = 0x1e570013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x42,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC8_TX,
                 .addr           = 0x1e580012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x45,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC8_RX,
                 .addr           = 0x1e580013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x46,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC9_TX,
                 .addr           = 0x1e590012,
-                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                .chcr           = SM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x51,
         },
         {
                 .slave_id       = SHDMA_SLAVE_RIIC9_RX,
                 .addr           = 0x1e590013,
-                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                .chcr           = DM_INC | RS_ERS | 0x40000000 |
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x52,
         },
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 594cd371aa28..2f002b24fb92 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -262,17 +262,17 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
 extern void __kernel_sigreturn(void);
 extern void __kernel_rt_sigreturn(void);
 
-static int setup_frame(int sig, struct k_sigaction *ka,
-                        sigset_t *set, struct pt_regs *regs)
+static int setup_frame(struct ksignal *ksig, sigset_t *set,
+                       struct pt_regs *regs)
 {
         struct sigframe __user *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
         int signal;
 
-        frame = get_sigframe(ka, regs->regs[15], sizeof(*frame));
+        frame = get_sigframe(&ksig->ka, regs->regs[15], sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         signal = current_thread_info()->exec_domain
                 && current_thread_info()->exec_domain->signal_invmap
@@ -288,8 +288,8 @@ static int setup_frame(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->pr = (unsigned long) ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                regs->pr = (unsigned long) ksig->ka.sa.sa_restorer;
 #ifdef CONFIG_VSYSCALL
         } else if (likely(current->mm->context.vdso)) {
                 regs->pr = VDSO_SYM(&__kernel_sigreturn);
@@ -309,7 +309,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
         }
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up registers for signal handler */
         regs->regs[15] = (unsigned long) frame;
@@ -319,15 +319,15 @@ static int setup_frame(int sig, struct k_sigaction *ka,
 
         if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
-                        (struct fdpic_func_descriptor __user *)ka->sa.sa_handler;
+                        (struct fdpic_func_descriptor __user *)ksig->ka.sa.sa_handler;
 
                 err |= __get_user(regs->pc, &funcptr->text);
                 err |= __get_user(regs->regs[12], &funcptr->GOT);
         } else
-                regs->pc = (unsigned long)ka->sa.sa_handler;
+                regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         set_fs(USER_DS);
 
@@ -335,23 +335,19 @@ static int setup_frame(int sig, struct k_sigaction *ka,
                  current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                           sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
         int signal;
 
-        frame = get_sigframe(ka, regs->regs[15], sizeof(*frame));
+        frame = get_sigframe(&ksig->ka, regs->regs[15], sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         signal = current_thread_info()->exec_domain
                 && current_thread_info()->exec_domain->signal_invmap
@@ -359,7 +355,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 ? current_thread_info()->exec_domain->signal_invmap[sig]
                 : sig;
 
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -371,8 +367,8 @@ static int setup_rt_frame(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->pr = (unsigned long) ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                regs->pr = (unsigned long) ksig->ka.sa.sa_restorer;
 #ifdef CONFIG_VSYSCALL
         } else if (likely(current->mm->context.vdso)) {
                 regs->pr = VDSO_SYM(&__kernel_rt_sigreturn);
@@ -392,7 +388,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         }
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up registers for signal handler */
         regs->regs[15] = (unsigned long) frame;
@@ -402,15 +398,15 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
         if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
-                        (struct fdpic_func_descriptor __user *)ka->sa.sa_handler;
+                        (struct fdpic_func_descriptor __user *)ksig->ka.sa.sa_handler;
 
                 err |= __get_user(regs->pc, &funcptr->text);
                 err |= __get_user(regs->regs[12], &funcptr->GOT);
         } else
-                regs->pc = (unsigned long)ka->sa.sa_handler;
+                regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
 
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         set_fs(USER_DS);
 
@@ -418,10 +414,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                  current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 static inline void
@@ -455,22 +447,18 @@ handle_syscall_restart(unsigned long save_r0, struct pt_regs *regs,
  * OK, we're invoking a handler
  */
 static void
-handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
-              struct pt_regs *regs, unsigned int save_r0)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs, unsigned int save_r0)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame(ksig, oldset, regs);
         else
-                ret = setup_frame(sig, ka, oldset, regs);
+                ret = setup_frame(ksig, oldset, regs);
 
-        if (ret)
-                return;
-        signal_delivered(sig, info, ka, regs,
-                        test_thread_flag(TIF_SINGLESTEP));
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -484,9 +472,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
  */
 static void do_signal(struct pt_regs *regs, unsigned int save_r0)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         /*
          * We want the common case to go fast, which
@@ -497,12 +483,11 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
         if (!user_mode(regs))
                 return;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
-                handle_syscall_restart(save_r0, regs, &ka.sa);
+        if (get_signal(&ksig)) {
+                handle_syscall_restart(save_r0, regs, &ksig.ka.sa);
 
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(signr, &ka, &info, regs, save_r0);
+                handle_signal(&ksig, regs, save_r0);
                 return;
         }
 
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c
index 23d4c71c91af..897abe7b871e 100644
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
@@ -41,8 +41,7 @@
 #define DEBUG_SIG 0
 
 static void
-handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
-                struct pt_regs * regs);
+handle_signal(struct ksignal *ksig, struct pt_regs *regs);
 
 static inline void
 handle_syscall_restart(struct pt_regs *regs, struct sigaction *sa)
@@ -82,9 +81,7 @@ handle_syscall_restart(struct pt_regs *regs, struct sigaction *sa)
  */
 static void do_signal(struct pt_regs *regs)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         /*
          * We want the common case to go fast, which
@@ -95,12 +92,11 @@ static void do_signal(struct pt_regs *regs)
         if (!user_mode(regs))
                 return;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, 0);
-        if (signr > 0) {
-                handle_syscall_restart(regs, &ka.sa);
+        if (get_signal(&ksig)) {
+                handle_syscall_restart(regs, &ksig.ka.sa);
 
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(signr, &info, &ka, regs);
+                handle_signal(&ksig, regs);
                 return;
         }
 
@@ -378,17 +374,16 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
 void sa_default_restorer(void);         /* See comments below */
 void sa_default_rt_restorer(void);      /* See comments below */
 
-static int setup_frame(int sig, struct k_sigaction *ka,
-                       sigset_t *set, struct pt_regs *regs)
+static int setup_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         struct sigframe __user *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
         int signal;
 
-        frame = get_sigframe(ka, regs->regs[REG_SP], sizeof(*frame));
+        frame = get_sigframe(&ksig->ka, regs->regs[REG_SP], sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         signal = current_thread_info()->exec_domain
                 && current_thread_info()->exec_domain->signal_invmap
@@ -400,7 +395,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
 
         /* Give up earlier as i386, in case */
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         if (_NSIG_WORDS > 1) {
                 err |= __copy_to_user(frame->extramask, &set->sig[1],
@@ -408,16 +403,16 @@ static int setup_frame(int sig, struct k_sigaction *ka,
 
         /* Give up earlier as i386, in case */
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
-        if (ka->sa.sa_flags & SA_RESTORER) {
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
                 /*
                  * On SH5 all edited pointers are subject to NEFF
                  */
                 DEREF_REG_PR = neff_sign_extend((unsigned long)
-                        ka->sa.sa_restorer | 0x1);
+                        ksig->ka->sa.sa_restorer | 0x1);
         } else {
                 /*
                  * Different approach on SH5.
@@ -435,7 +430,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
 
                 if (__copy_to_user(frame->retcode,
                         (void *)((unsigned long)sa_default_restorer & (~1)), 16) != 0)
-                        goto give_sigsegv;
+                        return -EFAULT;
 
                 /* Cohere the trampoline with the I-cache. */
                 flush_cache_sigtramp(DEREF_REG_PR-1);
@@ -460,7 +455,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
         regs->regs[REG_ARG2] = (unsigned long long)(unsigned long)(signed long)&frame->sc;
         regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->sc;
 
-        regs->pc = neff_sign_extend((unsigned long)ka->sa.sa_handler);
+        regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler);
 
         set_fs(USER_DS);
 
@@ -471,23 +466,19 @@ static int setup_frame(int sig, struct k_sigaction *ka,
                  DEREF_REG_PR >> 32, DEREF_REG_PR & 0xffffffff);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *kig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
         int signal;
 
-        frame = get_sigframe(ka, regs->regs[REG_SP], sizeof(*frame));
+        frame = get_sigframe(&ksig->ka, regs->regs[REG_SP], sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                return -EFAULT;
 
         signal = current_thread_info()->exec_domain
                 && current_thread_info()->exec_domain->signal_invmap
@@ -497,11 +488,11 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         /* Give up earlier as i386, in case */
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Create the ucontext.  */
         err |= __put_user(0, &frame->uc.uc_flags);
@@ -513,16 +504,16 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
         /* Give up earlier as i386, in case */
         if (err)
-                goto give_sigsegv;
+                return -EFAULT;
 
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
-        if (ka->sa.sa_flags & SA_RESTORER) {
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
                 /*
                  * On SH5 all edited pointers are subject to NEFF
                  */
                 DEREF_REG_PR = neff_sign_extend((unsigned long)
-                        ka->sa.sa_restorer | 0x1);
+                        ksig->ka.sa.sa_restorer | 0x1);
         } else {
                 /*
                  * Different approach on SH5.
@@ -540,7 +531,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
                 if (__copy_to_user(frame->retcode,
                         (void *)((unsigned long)sa_default_rt_restorer & (~1)), 16) != 0)
-                        goto give_sigsegv;
+                        return -EFAULT;
 
                 /* Cohere the trampoline with the I-cache. */
                 flush_icache_range(DEREF_REG_PR-1, DEREF_REG_PR-1+15);
@@ -554,7 +545,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->regs[REG_ARG1] = signal; /* Arg for signal handler */
         regs->regs[REG_ARG2] = (unsigned long long)(unsigned long)(signed long)&frame->info;
         regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->uc.uc_mcontext;
-        regs->pc = neff_sign_extend((unsigned long)ka->sa.sa_handler);
+        regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler);
 
         set_fs(USER_DS);
 
@@ -564,33 +555,24 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                  DEREF_REG_PR >> 32, DEREF_REG_PR & 0xffffffff);
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 /*
  * OK, we're invoking a handler
  */
 static void
-handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
-                struct pt_regs * regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
 
         /* Set up the stack frame */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame(ksig, oldset, regs);
         else
-                ret = setup_frame(sig, ka, oldset, regs);
-
-        if (ret)
-                return;
+                ret = setup_frame(ksig, oldset, regs);
 
-        signal_delivered(sig, info, ka, regs,
-                        test_thread_flag(TIF_SINGLESTEP));
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 }
 
 asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index 552c8fcf9416..d6d0a986c6e9 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -80,10 +80,8 @@ static int __init rtc_generic_init(void)
                 return -ENODEV;
 
         pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
-        if (IS_ERR(pdev))
-                return PTR_ERR(pdev);
 
-        return 0;
+        return PTR_ERR_OR_ZERO(pdev);
 }
 module_init(rtc_generic_init);
 
diff --git a/arch/sh/kernel/vsyscall/vsyscall.c b/arch/sh/kernel/vsyscall/vsyscall.c
index 5ca579720a09..ea2aa1393b87 100644
--- a/arch/sh/kernel/vsyscall/vsyscall.c
+++ b/arch/sh/kernel/vsyscall/vsyscall.c
@@ -92,18 +92,3 @@ const char *arch_vma_name(struct vm_area_struct *vma)
 
         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;
-}
diff --git a/arch/sh/mm/asids-debugfs.c b/arch/sh/mm/asids-debugfs.c
index 74c03ecc4871..ecfc6b0c1da1 100644
--- a/arch/sh/mm/asids-debugfs.c
+++ b/arch/sh/mm/asids-debugfs.c
@@ -67,10 +67,8 @@ static int __init asids_debugfs_init(void)
                                            NULL, &asids_debugfs_fops);
         if (!asids_dentry)
                 return -ENOMEM;
-        if (IS_ERR(asids_dentry))
-                return PTR_ERR(asids_dentry);
 
-        return 0;
+        return PTR_ERR_OR_ZERO(asids_dentry);
 }
 module_init(asids_debugfs_init);
 
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 2d089fe2cba9..2790b6a64157 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -495,8 +495,9 @@ int arch_add_memory(int nid, u64 start, u64 size)
         pgdat = NODE_DATA(nid);
 
         /* We only have ZONE_NORMAL, so this is easy.. */
-        ret = __add_pages(nid, pgdat->node_zones + ZONE_NORMAL,
-                                start_pfn, nr_pages);
+        ret = __add_pages(nid, pgdat->node_zones +
+                        zone_for_memory(nid, start, size, ZONE_NORMAL),
+                        start_pfn, nr_pages);
         if (unlikely(ret))
                 printk("%s: Failed, __add_pages() == %d\n", __func__, ret);
 
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 4692c90936f1..a537816613f9 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -42,6 +42,7 @@ config SPARC
         select MODULES_USE_ELF_RELA
         select ODD_RT_SIGACTION
         select OLD_SIGSUSPEND
+        select ARCH_HAS_SG_CHAIN
 
 config SPARC32
         def_bool !64BIT
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 9ff423678cbc..eaee14637d93 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -68,6 +68,9 @@ all: zImage
 image zImage uImage tftpboot.img vmlinux.aout: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
+install:
+        $(Q)$(MAKE) $(build)=$(boot) $@
+
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile
index 6e63afb128d9..6a4ceae5ec67 100644
--- a/arch/sparc/boot/Makefile
+++ b/arch/sparc/boot/Makefile
@@ -69,3 +69,7 @@ $(obj)/image: vmlinux FORCE
 $(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback System.map $(ROOT_IMG) FORCE
         $(call if_changed,elftoaout)
         $(call if_changed,piggy)
+
+install:
+        sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(obj)/zImage \
+                System.map "$(INSTALL_PATH)"
diff --git a/arch/sparc/boot/install.sh b/arch/sparc/boot/install.sh
new file mode 100644
index 000000000000..b32851eae693
--- /dev/null
+++ b/arch/sparc/boot/install.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# 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) 1995 by Linus Torvalds
+#
+# Adapted from code in arch/i386/boot/Makefile by H. Peter Anvin
+#
+# "make install" script for SPARC architecture
+#
+# Arguments:
+#   $1 - kernel version
+#   $2 - kernel image file
+#   $3 - kernel map file
+#   $4 - default install path (blank if root directory)
+#
+
+verify () {
+        if [ ! -f "$1" ]; then
+                echo ""                                                   1>&2
+                echo " *** Missing file: $1"                              1>&2
+                echo ' *** You need to run "make" before "make install".' 1>&2
+                echo ""                                                   1>&2
+                exit 1
+        fi
+}
+
+# Make sure the files actually exist
+verify "$2"
+verify "$3"
+
+# User may have a custom install script
+
+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi
+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi
+
+# Default install - same as make zlilo
+
+if [ -f $4/vmlinuz ]; then
+        mv $4/vmlinuz $4/vmlinuz.old
+fi
+
+if [ -f $4/System.map ]; then
+        mv $4/System.map $4/System.old
+fi
+
+cat $2 > $4/vmlinuz
+cp $3 $4/System.map
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
index a45821818003..cdd1b447bb6c 100644
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
@@ -15,6 +15,7 @@ generic-y += mcs_spinlock.h
 generic-y += module.h
 generic-y += mutex.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += serial.h
 generic-y += trace_clock.h
 generic-y += types.h
diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h
index 05381c3a4228..80b54b326d49 100644
--- a/arch/sparc/include/asm/io_64.h
+++ b/arch/sparc/include/asm/io_64.h
@@ -9,125 +9,99 @@
 #include <asm/asi.h>
 #include <asm-generic/pci_iomap.h>
 
-/* PC crapola... */
-#define __SLOW_DOWN_IO  do { } while (0)
-#define SLOW_DOWN_IO    do { } while (0)
-
 /* BIO layer definitions. */
 extern unsigned long kern_base, kern_size;
 
-static inline u8 _inb(unsigned long addr)
+/* __raw_{read,write}{b,w,l,q} uses direct access.
+ * Access the memory as big endian bypassing the cache
+ * by using ASI_PHYS_BYPASS_EC_E
+ */
+#define __raw_readb __raw_readb
+static inline u8 __raw_readb(const volatile void __iomem *addr)
 {
         u8 ret;
 
-        __asm__ __volatile__("lduba\t[%1] %2, %0\t/* pci_inb */"
+        __asm__ __volatile__("lduba\t[%1] %2, %0\t/* pci_raw_readb */"
                              : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E_L)
-                             : "memory");
+                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 
         return ret;
 }
 
-static inline u16 _inw(unsigned long addr)
+#define __raw_readw __raw_readw
+static inline u16 __raw_readw(const volatile void __iomem *addr)
 {
         u16 ret;
 
-        __asm__ __volatile__("lduha\t[%1] %2, %0\t/* pci_inw */"
+        __asm__ __volatile__("lduha\t[%1] %2, %0\t/* pci_raw_readw */"
                              : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E_L)
-                             : "memory");
+                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 
         return ret;
 }
 
-static inline u32 _inl(unsigned long addr)
+#define __raw_readl __raw_readl
+static inline u32 __raw_readl(const volatile void __iomem *addr)
 {
         u32 ret;
 
-        __asm__ __volatile__("lduwa\t[%1] %2, %0\t/* pci_inl */"
+        __asm__ __volatile__("lduwa\t[%1] %2, %0\t/* pci_raw_readl */"
                              : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E_L)
-                             : "memory");
+                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 
         return ret;
 }
 
-static inline void _outb(u8 b, unsigned long addr)
-{
-        __asm__ __volatile__("stba\t%r0, [%1] %2\t/* pci_outb */"
-                             : /* no outputs */
-                             : "Jr" (b), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E_L)
-                             : "memory");
-}
-
-static inline void _outw(u16 w, unsigned long addr)
+#define __raw_readq __raw_readq
+static inline u64 __raw_readq(const volatile void __iomem *addr)
 {
-        __asm__ __volatile__("stha\t%r0, [%1] %2\t/* pci_outw */"
-                             : /* no outputs */
-                             : "Jr" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E_L)
-                             : "memory");
-}
-
-static inline void _outl(u32 l, unsigned long addr)
-{
-        __asm__ __volatile__("stwa\t%r0, [%1] %2\t/* pci_outl */"
-                             : /* no outputs */
-                             : "Jr" (l), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E_L)
-                             : "memory");
-}
-
-#define inb(__addr)             (_inb((unsigned long)(__addr)))
-#define inw(__addr)             (_inw((unsigned long)(__addr)))
-#define inl(__addr)             (_inl((unsigned long)(__addr)))
-#define outb(__b, __addr)       (_outb((u8)(__b), (unsigned long)(__addr)))
-#define outw(__w, __addr)       (_outw((u16)(__w), (unsigned long)(__addr)))
-#define outl(__l, __addr)       (_outl((u32)(__l), (unsigned long)(__addr)))
-
-#define inb_p(__addr)           inb(__addr)
-#define outb_p(__b, __addr)     outb(__b, __addr)
-#define inw_p(__addr)           inw(__addr)
-#define outw_p(__w, __addr)     outw(__w, __addr)
-#define inl_p(__addr)           inl(__addr)
-#define outl_p(__l, __addr)     outl(__l, __addr)
+        u64 ret;
 
-void outsb(unsigned long, const void *, unsigned long);
-void outsw(unsigned long, const void *, unsigned long);
-void outsl(unsigned long, const void *, unsigned long);
-void insb(unsigned long, void *, unsigned long);
-void insw(unsigned long, void *, unsigned long);
-void insl(unsigned long, void *, unsigned long);
+        __asm__ __volatile__("ldxa\t[%1] %2, %0\t/* pci_raw_readq */"
+                             : "=r" (ret)
+                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 
-static inline void ioread8_rep(void __iomem *port, void *buf, unsigned long count)
-{
-        insb((unsigned long __force)port, buf, count);
-}
-static inline void ioread16_rep(void __iomem *port, void *buf, unsigned long count)
-{
-        insw((unsigned long __force)port, buf, count);
+        return ret;
 }
 
-static inline void ioread32_rep(void __iomem *port, void *buf, unsigned long count)
+#define __raw_writeb __raw_writeb
+static inline void __raw_writeb(u8 b, const volatile void __iomem *addr)
 {
-        insl((unsigned long __force)port, buf, count);
+        __asm__ __volatile__("stba\t%r0, [%1] %2\t/* pci_raw_writeb */"
+                             : /* no outputs */
+                             : "Jr" (b), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 }
 
-static inline void iowrite8_rep(void __iomem *port, const void *buf, unsigned long count)
+#define __raw_writew __raw_writew
+static inline void __raw_writew(u16 w, const volatile void __iomem *addr)
 {
-        outsb((unsigned long __force)port, buf, count);
+        __asm__ __volatile__("stha\t%r0, [%1] %2\t/* pci_raw_writew */"
+                             : /* no outputs */
+                             : "Jr" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 }
 
-static inline void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count)
+#define __raw_writel __raw_writel
+static inline void __raw_writel(u32 l, const volatile void __iomem *addr)
 {
-        outsw((unsigned long __force)port, buf, count);
+        __asm__ __volatile__("stwa\t%r0, [%1] %2\t/* pci_raw_writel */"
+                             : /* no outputs */
+                             : "Jr" (l), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 }
 
-static inline void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count)
+#define __raw_writeq __raw_writeq
+static inline void __raw_writeq(u64 q, const volatile void __iomem *addr)
 {
-        outsl((unsigned long __force)port, buf, count);
+        __asm__ __volatile__("stxa\t%r0, [%1] %2\t/* pci_raw_writeq */"
+                             : /* no outputs */
+                             : "Jr" (q), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 }
 
-/* Memory functions, same as I/O accesses on Ultra. */
-static inline u8 _readb(const volatile void __iomem *addr)
+/* Memory functions, same as I/O accesses on Ultra.
+ * Access memory as little endian bypassing
+ * the cache by using ASI_PHYS_BYPASS_EC_E_L
+ */
+#define readb readb
+static inline u8 readb(const volatile void __iomem *addr)
 {       u8 ret;
 
         __asm__ __volatile__("lduba\t[%1] %2, %0\t/* pci_readb */"
@@ -137,7 +111,8 @@ static inline u8 _readb(const volatile void __iomem *addr)
         return ret;
 }
 
-static inline u16 _readw(const volatile void __iomem *addr)
+#define readw readw
+static inline u16 readw(const volatile void __iomem *addr)
 {       u16 ret;
 
         __asm__ __volatile__("lduha\t[%1] %2, %0\t/* pci_readw */"
@@ -148,7 +123,8 @@ static inline u16 _readw(const volatile void __iomem *addr)
         return ret;
 }
 
-static inline u32 _readl(const volatile void __iomem *addr)
+#define readl readl
+static inline u32 readl(const volatile void __iomem *addr)
 {       u32 ret;
 
         __asm__ __volatile__("lduwa\t[%1] %2, %0\t/* pci_readl */"
@@ -159,7 +135,8 @@ static inline u32 _readl(const volatile void __iomem *addr)
         return ret;
 }
 
-static inline u64 _readq(const volatile void __iomem *addr)
+#define readq readq
+static inline u64 readq(const volatile void __iomem *addr)
 {       u64 ret;
 
         __asm__ __volatile__("ldxa\t[%1] %2, %0\t/* pci_readq */"
@@ -170,7 +147,8 @@ static inline u64 _readq(const volatile void __iomem *addr)
         return ret;
 }
 
-static inline void _writeb(u8 b, volatile void __iomem *addr)
+#define writeb writeb
+static inline void writeb(u8 b, volatile void __iomem *addr)
 {
         __asm__ __volatile__("stba\t%r0, [%1] %2\t/* pci_writeb */"
                              : /* no outputs */
@@ -178,7 +156,8 @@ static inline void _writeb(u8 b, volatile void __iomem *addr)
                              : "memory");
 }
 
-static inline void _writew(u16 w, volatile void __iomem *addr)
+#define writew writew
+static inline void writew(u16 w, volatile void __iomem *addr)
 {
         __asm__ __volatile__("stha\t%r0, [%1] %2\t/* pci_writew */"
                              : /* no outputs */
@@ -186,7 +165,8 @@ static inline void _writew(u16 w, volatile void __iomem *addr)
                              : "memory");
 }
 
-static inline void _writel(u32 l, volatile void __iomem *addr)
+#define writel writel
+static inline void writel(u32 l, volatile void __iomem *addr)
 {
         __asm__ __volatile__("stwa\t%r0, [%1] %2\t/* pci_writel */"
                              : /* no outputs */
@@ -194,7 +174,8 @@ static inline void _writel(u32 l, volatile void __iomem *addr)
                              : "memory");
 }
 
-static inline void _writeq(u64 q, volatile void __iomem *addr)
+#define writeq writeq
+static inline void writeq(u64 q, volatile void __iomem *addr)
 {
         __asm__ __volatile__("stxa\t%r0, [%1] %2\t/* pci_writeq */"
                              : /* no outputs */
@@ -202,100 +183,91 @@ static inline void _writeq(u64 q, volatile void __iomem *addr)
                              : "memory");
 }
 
-#define readb(__addr)           _readb(__addr)
-#define readw(__addr)           _readw(__addr)
-#define readl(__addr)           _readl(__addr)
-#define readq(__addr)           _readq(__addr)
-#define readb_relaxed(__addr)   _readb(__addr)
-#define readw_relaxed(__addr)   _readw(__addr)
-#define readl_relaxed(__addr)   _readl(__addr)
-#define readq_relaxed(__addr)   _readq(__addr)
-#define writeb(__b, __addr)     _writeb(__b, __addr)
-#define writew(__w, __addr)     _writew(__w, __addr)
-#define writel(__l, __addr)     _writel(__l, __addr)
-#define writeq(__q, __addr)     _writeq(__q, __addr)
 
-/* Now versions without byte-swapping. */
-static inline u8 _raw_readb(unsigned long addr)
+#define inb inb
+static inline u8 inb(unsigned long addr)
 {
-        u8 ret;
-
-        __asm__ __volatile__("lduba\t[%1] %2, %0\t/* pci_raw_readb */"
-                             : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-
-        return ret;
+        return readb((volatile void __iomem *)addr);
 }
 
-static inline u16 _raw_readw(unsigned long addr)
+#define inw inw
+static inline u16 inw(unsigned long addr)
 {
-        u16 ret;
-
-        __asm__ __volatile__("lduha\t[%1] %2, %0\t/* pci_raw_readw */"
-                             : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-
-        return ret;
+        return readw((volatile void __iomem *)addr);
 }
 
-static inline u32 _raw_readl(unsigned long addr)
+#define inl inl
+static inline u32 inl(unsigned long addr)
 {
-        u32 ret;
+        return readl((volatile void __iomem *)addr);
+}
 
-        __asm__ __volatile__("lduwa\t[%1] %2, %0\t/* pci_raw_readl */"
-                             : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
+#define outb outb
+static inline void outb(u8 b, unsigned long addr)
+{
+        writeb(b, (volatile void __iomem *)addr);
+}
 
-        return ret;
+#define outw outw
+static inline void outw(u16 w, unsigned long addr)
+{
+        writew(w, (volatile void __iomem *)addr);
 }
 
-static inline u64 _raw_readq(unsigned long addr)
+#define outl outl
+static inline void outl(u32 l, unsigned long addr)
 {
-        u64 ret;
+        writel(l, (volatile void __iomem *)addr);
+}
 
-        __asm__ __volatile__("ldxa\t[%1] %2, %0\t/* pci_raw_readq */"
-                             : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 
-        return ret;
+#define inb_p(__addr)           inb(__addr)
+#define outb_p(__b, __addr)     outb(__b, __addr)
+#define inw_p(__addr)           inw(__addr)
+#define outw_p(__w, __addr)     outw(__w, __addr)
+#define inl_p(__addr)           inl(__addr)
+#define outl_p(__l, __addr)     outl(__l, __addr)
+
+void outsb(unsigned long, const void *, unsigned long);
+void outsw(unsigned long, const void *, unsigned long);
+void outsl(unsigned long, const void *, unsigned long);
+void insb(unsigned long, void *, unsigned long);
+void insw(unsigned long, void *, unsigned long);
+void insl(unsigned long, void *, unsigned long);
+
+static inline void ioread8_rep(void __iomem *port, void *buf, unsigned long count)
+{
+        insb((unsigned long __force)port, buf, count);
+}
+static inline void ioread16_rep(void __iomem *port, void *buf, unsigned long count)
+{
+        insw((unsigned long __force)port, buf, count);
 }
 
-static inline void _raw_writeb(u8 b, unsigned long addr)
+static inline void ioread32_rep(void __iomem *port, void *buf, unsigned long count)
 {
-        __asm__ __volatile__("stba\t%r0, [%1] %2\t/* pci_raw_writeb */"
-                             : /* no outputs */
-                             : "Jr" (b), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
+        insl((unsigned long __force)port, buf, count);
 }
 
-static inline void _raw_writew(u16 w, unsigned long addr)
+static inline void iowrite8_rep(void __iomem *port, const void *buf, unsigned long count)
 {
-        __asm__ __volatile__("stha\t%r0, [%1] %2\t/* pci_raw_writew */"
-                             : /* no outputs */
-                             : "Jr" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
+        outsb((unsigned long __force)port, buf, count);
 }
 
-static inline void _raw_writel(u32 l, unsigned long addr)
+static inline void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count)
 {
-        __asm__ __volatile__("stwa\t%r0, [%1] %2\t/* pci_raw_writel */"
-                             : /* no outputs */
-                             : "Jr" (l), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
+        outsw((unsigned long __force)port, buf, count);
 }
 
-static inline void _raw_writeq(u64 q, unsigned long addr)
+static inline void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count)
 {
-        __asm__ __volatile__("stxa\t%r0, [%1] %2\t/* pci_raw_writeq */"
-                             : /* no outputs */
-                             : "Jr" (q), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
+        outsl((unsigned long __force)port, buf, count);
 }
 
-#define __raw_readb(__addr)             (_raw_readb((unsigned long)(__addr)))
-#define __raw_readw(__addr)             (_raw_readw((unsigned long)(__addr)))
-#define __raw_readl(__addr)             (_raw_readl((unsigned long)(__addr)))
-#define __raw_readq(__addr)             (_raw_readq((unsigned long)(__addr)))
-#define __raw_writeb(__b, __addr)       (_raw_writeb((u8)(__b), (unsigned long)(__addr)))
-#define __raw_writew(__w, __addr)       (_raw_writew((u16)(__w), (unsigned long)(__addr)))
-#define __raw_writel(__l, __addr)       (_raw_writel((u32)(__l), (unsigned long)(__addr)))
-#define __raw_writeq(__q, __addr)       (_raw_writeq((u64)(__q), (unsigned long)(__addr)))
+#define readb_relaxed(__addr)   readb(__addr)
+#define readw_relaxed(__addr)   readw(__addr)
+#define readl_relaxed(__addr)   readl(__addr)
+#define readq_relaxed(__addr)   readq(__addr)
 
 /* Valid I/O Space regions are anywhere, because each PCI bus supported
  * can live in an arbitrary area of the physical address range.
@@ -305,96 +277,47 @@ static inline void _raw_writeq(u64 q, unsigned long addr)
 /* Now, SBUS variants, only difference from PCI is that we do
  * not use little-endian ASIs.
  */
-static inline u8 _sbus_readb(const volatile void __iomem *addr)
+static inline u8 sbus_readb(const volatile void __iomem *addr)
 {
-        u8 ret;
-
-        __asm__ __volatile__("lduba\t[%1] %2, %0\t/* sbus_readb */"
-                             : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E)
-                             : "memory");
-
-        return ret;
+        return __raw_readb(addr);
 }
 
-static inline u16 _sbus_readw(const volatile void __iomem *addr)
+static inline u16 sbus_readw(const volatile void __iomem *addr)
 {
-        u16 ret;
-
-        __asm__ __volatile__("lduha\t[%1] %2, %0\t/* sbus_readw */"
-                             : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E)
-                             : "memory");
-
-        return ret;
+        return __raw_readw(addr);
 }
 
-static inline u32 _sbus_readl(const volatile void __iomem *addr)
+static inline u32 sbus_readl(const volatile void __iomem *addr)
 {
-        u32 ret;
-
-        __asm__ __volatile__("lduwa\t[%1] %2, %0\t/* sbus_readl */"
-                             : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E)
-                             : "memory");
-
-        return ret;
+        return __raw_readl(addr);
 }
 
-static inline u64 _sbus_readq(const volatile void __iomem *addr)
+static inline u64 sbus_readq(const volatile void __iomem *addr)
 {
-        u64 ret;
-
-        __asm__ __volatile__("ldxa\t[%1] %2, %0\t/* sbus_readq */"
-                             : "=r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E)
-                             : "memory");
-
-        return ret;
+        return __raw_readq(addr);
 }
 
-static inline void _sbus_writeb(u8 b, volatile void __iomem *addr)
+static inline void sbus_writeb(u8 b, volatile void __iomem *addr)
 {
-        __asm__ __volatile__("stba\t%r0, [%1] %2\t/* sbus_writeb */"
-                             : /* no outputs */
-                             : "Jr" (b), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E)
-                             : "memory");
+        __raw_writeb(b, addr);
 }
 
-static inline void _sbus_writew(u16 w, volatile void __iomem *addr)
+static inline void sbus_writew(u16 w, volatile void __iomem *addr)
 {
-        __asm__ __volatile__("stha\t%r0, [%1] %2\t/* sbus_writew */"
-                             : /* no outputs */
-                             : "Jr" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E)
-                             : "memory");
+        __raw_writew(w, addr);
 }
 
-static inline void _sbus_writel(u32 l, volatile void __iomem *addr)
+static inline void sbus_writel(u32 l, volatile void __iomem *addr)
 {
-        __asm__ __volatile__("stwa\t%r0, [%1] %2\t/* sbus_writel */"
-                             : /* no outputs */
-                             : "Jr" (l), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E)
-                             : "memory");
+        __raw_writel(l, addr);
 }
 
-static inline void _sbus_writeq(u64 l, volatile void __iomem *addr)
+static inline void sbus_writeq(u64 q, volatile void __iomem *addr)
 {
-        __asm__ __volatile__("stxa\t%r0, [%1] %2\t/* sbus_writeq */"
-                             : /* no outputs */
-                             : "Jr" (l), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E)
-                             : "memory");
+        __raw_writeq(q, addr);
 }
 
-#define sbus_readb(__addr)              _sbus_readb(__addr)
-#define sbus_readw(__addr)              _sbus_readw(__addr)
-#define sbus_readl(__addr)              _sbus_readl(__addr)
-#define sbus_readq(__addr)              _sbus_readq(__addr)
-#define sbus_writeb(__b, __addr)        _sbus_writeb(__b, __addr)
-#define sbus_writew(__w, __addr)        _sbus_writew(__w, __addr)
-#define sbus_writel(__l, __addr)        _sbus_writel(__l, __addr)
-#define sbus_writeq(__l, __addr)        _sbus_writeq(__l, __addr)
-
-static inline void _sbus_memset_io(volatile void __iomem *dst, int c, __kernel_size_t n)
+static inline void sbus_memset_io(volatile void __iomem *dst, int c, __kernel_size_t n)
 {
         while(n--) {
                 sbus_writeb(c, dst);
@@ -402,10 +325,7 @@ static inline void _sbus_memset_io(volatile void __iomem *dst, int c, __kernel_s
         }
 }
 
-#define sbus_memset_io(d,c,sz)  _sbus_memset_io(d,c,sz)
-
-static inline void
-_memset_io(volatile void __iomem *dst, int c, __kernel_size_t n)
+static inline void memset_io(volatile void __iomem *dst, int c, __kernel_size_t n)
 {
         volatile void __iomem *d = dst;
 
@@ -415,11 +335,8 @@ _memset_io(volatile void __iomem *dst, int c, __kernel_size_t n)
         }
 }
 
-#define memset_io(d,c,sz)       _memset_io(d,c,sz)
-
-static inline void
-_sbus_memcpy_fromio(void *dst, const volatile void __iomem *src,
-                    __kernel_size_t n)
+static inline void sbus_memcpy_fromio(void *dst, const volatile void __iomem *src,
+                                      __kernel_size_t n)
 {
         char *d = dst;
 
@@ -430,10 +347,9 @@ _sbus_memcpy_fromio(void *dst, const volatile void __iomem *src,
         }
 }
 
-#define sbus_memcpy_fromio(d, s, sz)    _sbus_memcpy_fromio(d, s, sz)
 
-static inline void
-_memcpy_fromio(void *dst, const volatile void __iomem *src, __kernel_size_t n)
+static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,
+                                 __kernel_size_t n)
 {
         char *d = dst;
 
@@ -444,11 +360,8 @@ _memcpy_fromio(void *dst, const volatile void __iomem *src, __kernel_size_t n)
         }
 }
 
-#define memcpy_fromio(d,s,sz)   _memcpy_fromio(d,s,sz)
-
-static inline void
-_sbus_memcpy_toio(volatile void __iomem *dst, const void *src,
-                  __kernel_size_t n)
+static inline void sbus_memcpy_toio(volatile void __iomem *dst, const void *src,
+                                    __kernel_size_t n)
 {
         const char *s = src;
         volatile void __iomem *d = dst;
@@ -460,10 +373,8 @@ _sbus_memcpy_toio(volatile void __iomem *dst, const void *src,
         }
 }
 
-#define sbus_memcpy_toio(d, s, sz)      _sbus_memcpy_toio(d, s, sz)
-
-static inline void
-_memcpy_toio(volatile void __iomem *dst, const void *src, __kernel_size_t n)
+static inline void memcpy_toio(volatile void __iomem *dst, const void *src,
+                               __kernel_size_t n)
 {
         const char *s = src;
         volatile void __iomem *d = dst;
@@ -475,8 +386,6 @@ _memcpy_toio(volatile void __iomem *dst, const void *src, __kernel_size_t n)
         }
 }
 
-#define memcpy_toio(d,s,sz)     _memcpy_toio(d,s,sz)
-
 #define mmiowb()
 
 #ifdef __KERNEL__
diff --git a/arch/sparc/include/asm/scatterlist.h b/arch/sparc/include/asm/scatterlist.h
deleted file mode 100644
index 92bb638313f8..000000000000
--- a/arch/sparc/include/asm/scatterlist.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SPARC_SCATTERLIST_H
-#define _SPARC_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#define ARCH_HAS_SG_CHAIN
-
-#endif /* !(_SPARC_SCATTERLIST_H) */
diff --git a/arch/sparc/include/asm/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h
index 816d8202fa0a..dea1cfa2122b 100644
--- a/arch/sparc/include/asm/tlbflush_64.h
+++ b/arch/sparc/include/asm/tlbflush_64.h
@@ -34,6 +34,8 @@ static inline void flush_tlb_range(struct vm_area_struct *vma,
 {
 }
 
+void flush_tlb_kernel_range(unsigned long start, unsigned long end);
+
 #define __HAVE_ARCH_ENTER_LAZY_MMU_MODE
 
 void flush_tlb_pending(void);
@@ -48,11 +50,6 @@ void __flush_tlb_kernel_range(unsigned long start, unsigned long end);
 
 #ifndef CONFIG_SMP
 
-#define flush_tlb_kernel_range(start,end) \
-do {    flush_tsb_kernel_range(start,end); \
-        __flush_tlb_kernel_range(start,end); \
-} while (0)
-
 static inline void global_flush_tlb_page(struct mm_struct *mm, unsigned long vaddr)
 {
         __flush_tlb_page(CTX_HWBITS(mm->context), vaddr);
@@ -63,11 +60,6 @@ static inline void global_flush_tlb_page(struct mm_struct *mm, unsigned long vad
 void smp_flush_tlb_kernel_range(unsigned long start, unsigned long end);
 void smp_flush_tlb_page(struct mm_struct *mm, unsigned long vaddr);
 
-#define flush_tlb_kernel_range(start, end) \
-do {    flush_tsb_kernel_range(start,end); \
-        smp_flush_tlb_kernel_range(start, end); \
-} while (0)
-
 #define global_flush_tlb_page(mm, vaddr) \
         smp_flush_tlb_page(mm, vaddr)
 
diff --git a/arch/sparc/include/uapi/asm/unistd.h b/arch/sparc/include/uapi/asm/unistd.h
index 42f2bca1d338..c842a89b1190 100644
--- a/arch/sparc/include/uapi/asm/unistd.h
+++ b/arch/sparc/include/uapi/asm/unistd.h
@@ -411,8 +411,11 @@
 #define __NR_sched_setattr      343
 #define __NR_sched_getattr      344
 #define __NR_renameat2          345
+#define __NR_seccomp            346
+#define __NR_getrandom          347
+#define __NR_memfd_create       348
 
-#define NR_syscalls             346
+#define NR_syscalls             349
 
 /* Bitmask values returned from kern_features system call.  */
 #define KERN_FEATURE_MIXED_MODE_STACK   0x00000001
diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index e01d75d40329..66dacd56bb10 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -1336,7 +1336,7 @@ int ldc_connect(struct ldc_channel *lp)
         if (!(lp->flags & LDC_FLAG_ALLOCED_QUEUES) ||
             !(lp->flags & LDC_FLAG_REGISTERED_QUEUES) ||
             lp->hs_state != LDC_HS_OPEN)
-                err = -EINVAL;
+                err = ((lp->hs_state > LDC_HS_OPEN) ? 0 : -EINVAL);
         else
                 err = start_handshake(lp);
 
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index a1a4400d4025..99632a87e697 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -906,29 +906,85 @@ void mdesc_fill_in_cpu_data(cpumask_t *mask)
         smp_fill_in_sib_core_maps();
 }
 
-static ssize_t mdesc_read(struct file *file, char __user *buf,
-                          size_t len, loff_t *offp)
+/* mdesc_open() - Grab a reference to mdesc_handle when /dev/mdesc is
+ * opened. Hold this reference until /dev/mdesc is closed to ensure
+ * mdesc data structure is not released underneath us. Store the
+ * pointer to mdesc structure in private_data for read and seek to use
+ */
+static int mdesc_open(struct inode *inode, struct file *file)
 {
         struct mdesc_handle *hp = mdesc_grab();
-        int err;
 
         if (!hp)
                 return -ENODEV;
 
-        err = hp->handle_size;
-        if (len < hp->handle_size)
-                err = -EMSGSIZE;
-        else if (copy_to_user(buf, &hp->mdesc, hp->handle_size))
-                err = -EFAULT;
-        mdesc_release(hp);
+        file->private_data = hp;
+
+        return 0;
+}
+
+static ssize_t mdesc_read(struct file *file, char __user *buf,
+                          size_t len, loff_t *offp)
+{
+        struct mdesc_handle *hp = file->private_data;
+        unsigned char *mdesc;
+        int bytes_left, count = len;
+
+        if (*offp >= hp->handle_size)
+                return 0;
+
+        bytes_left = hp->handle_size - *offp;
+        if (count > bytes_left)
+                count = bytes_left;
+
+        mdesc = (unsigned char *)&hp->mdesc;
+        mdesc += *offp;
+        if (!copy_to_user(buf, mdesc, count)) {
+                *offp += count;
+                return count;
+        } else {
+                return -EFAULT;
+        }
+}
 
-        return err;
+static loff_t mdesc_llseek(struct file *file, loff_t offset, int whence)
+{
+        struct mdesc_handle *hp;
+
+        switch (whence) {
+        case SEEK_CUR:
+                offset += file->f_pos;
+                break;
+        case SEEK_SET:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        hp = file->private_data;
+        if (offset > hp->handle_size)
+                return -EINVAL;
+        else
+                file->f_pos = offset;
+
+        return offset;
+}
+
+/* mdesc_close() - /dev/mdesc is being closed, release the reference to
+ * mdesc structure.
+ */
+static int mdesc_close(struct inode *inode, struct file *file)
+{
+        mdesc_release(file->private_data);
+        return 0;
 }
 
 static const struct file_operations mdesc_fops = {
-        .read   = mdesc_read,
-        .owner  = THIS_MODULE,
-        .llseek = noop_llseek,
+        .open    = mdesc_open,
+        .read    = mdesc_read,
+        .llseek  = mdesc_llseek,
+        .release = mdesc_close,
+        .owner   = THIS_MODULE,
 };
 
 static struct miscdevice mdesc_misc = {
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index 337094556916..5b1151dcba13 100644
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -130,7 +130,6 @@ static inline unsigned int get_nmi_count(int cpu)
 
 static __init void nmi_cpu_busy(void *data)
 {
-        local_irq_enable_in_hardirq();
         while (endflag == 0)
                 mb();
 }
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 539babf00bb2..b36365f49478 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -432,6 +432,11 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
                        node->full_name);
                 return;
         }
+
+        if (ofpci_verbose)
+                printk("    Bridge bus range [%u --> %u]\n",
+                       busrange[0], busrange[1]);
+
         ranges = of_get_property(node, "ranges", &len);
         simba = 0;
         if (ranges == NULL) {
@@ -451,6 +456,10 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
         pci_bus_insert_busn_res(bus, busrange[0], busrange[1]);
         bus->bridge_ctl = 0;
 
+        if (ofpci_verbose)
+                printk("    Bridge ranges[%p] simba[%d]\n",
+                       ranges, simba);
+
         /* parse ranges property, or cook one up by hand for Simba */
         /* PCI #address-cells == 3 and #size-cells == 2 always */
         res = &dev->resource[PCI_BRIDGE_RESOURCES];
@@ -468,10 +477,29 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
         }
         i = 1;
         for (; len >= 32; len -= 32, ranges += 8) {
+                u64 start;
+
+                if (ofpci_verbose)
+                        printk("    RAW Range[%08x:%08x:%08x:%08x:%08x:%08x:"
+                               "%08x:%08x]\n",
+                               ranges[0], ranges[1], ranges[2], ranges[3],
+                               ranges[4], ranges[5], ranges[6], ranges[7]);
+
                 flags = pci_parse_of_flags(ranges[0]);
                 size = GET_64BIT(ranges, 6);
                 if (flags == 0 || size == 0)
                         continue;
+
+                /* On PCI-Express systems, PCI bridges that have no devices downstream
+                 * have a bogus size value where the first 32-bit cell is 0xffffffff.
+                 * This results in a bogus range where start + size overflows.
+                 *
+                 * Just skip these otherwise the kernel will complain when the resource
+                 * tries to be claimed.
+                 */
+                if (size >> 32 == 0xffffffff)
+                        continue;
+
                 if (flags & IORESOURCE_IO) {
                         res = bus->resource[0];
                         if (res->flags) {
@@ -490,8 +518,13 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm,
                 }
 
                 res->flags = flags;
-                region.start = GET_64BIT(ranges, 1);
+                region.start = start = GET_64BIT(ranges, 1);
                 region.end = region.start + size - 1;
+
+                if (ofpci_verbose)
+                        printk("      Using flags[%08x] start[%016llx] size[%016llx]\n",
+                               flags, start, size);
+
                 pcibios_bus_to_resource(dev->bus, res, &region);
         }
 after_ranges:
@@ -584,6 +617,36 @@ static void pci_bus_register_of_sysfs(struct pci_bus *bus)
                 pci_bus_register_of_sysfs(child_bus);
 }
 
+static void pci_claim_bus_resources(struct pci_bus *bus)
+{
+        struct pci_bus *child_bus;
+        struct pci_dev *dev;
+
+        list_for_each_entry(dev, &bus->devices, bus_list) {
+                int i;
+
+                for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+                        struct resource *r = &dev->resource[i];
+
+                        if (r->parent || !r->start || !r->flags)
+                                continue;
+
+                        if (ofpci_verbose)
+                                printk("PCI: Claiming %s: "
+                                       "Resource %d: %016llx..%016llx [%x]\n",
+                                       pci_name(dev), i,
+                                       (unsigned long long)r->start,
+                                       (unsigned long long)r->end,
+                                       (unsigned int)r->flags);
+
+                        pci_claim_resource(dev, i);
+                }
+        }
+
+        list_for_each_entry(child_bus, &bus->children, node)
+                pci_claim_bus_resources(child_bus);
+}
+
 struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
                                  struct device *parent)
 {
@@ -614,6 +677,8 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,
         pci_bus_add_devices(bus);
         pci_bus_register_of_sysfs(bus);
 
+        pci_claim_bus_resources(bus);
+
         return bus;
 }
 
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index 8efd33753ad3..d35c490a91cb 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -1671,9 +1671,12 @@ static bool __init supported_pmu(void)
 
 static int __init init_hw_perf_events(void)
 {
+        int err;
+
         pr_info("Performance events: ");
 
-        if (!supported_pmu()) {
+        err = pcr_arch_init();
+        if (err || !supported_pmu()) {
                 pr_cont("No support for PMU type '%s'\n", sparc_pmu_type);
                 return 0;
         }
@@ -1685,7 +1688,7 @@ static int __init init_hw_perf_events(void)
 
         return 0;
 }
-early_initcall(init_hw_perf_events);
+pure_initcall(init_hw_perf_events);
 
 void perf_callchain_kernel(struct perf_callchain_entry *entry,
                            struct pt_regs *regs)
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 027e09986194..0be7bf978cb1 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -312,6 +312,9 @@ static void __global_pmu_self(int this_cpu)
         struct global_pmu_snapshot *pp;
         int i, num;
 
+        if (!pcr_ops)
+                return;
+
         pp = &global_cpu_snapshot[this_cpu].pmu;
 
         num = 1;
diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index 7958242d63c5..b3a5d81b20f0 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -68,7 +68,7 @@ void smp_store_cpu_info(int id)
         mid = cpu_get_hwmid(cpu_node);
 
         if (mid < 0) {
-                printk(KERN_NOTICE "No MID found for CPU%d at node 0x%08d", id, cpu_node);
+                printk(KERN_NOTICE "No MID found for CPU%d at node 0x%08x", id, cpu_node);
                 mid = 0;
         }
         cpu_data(id).mid = mid;
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 41aa2478f3ca..f7ba87543e5f 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1383,7 +1383,6 @@ void __cpu_die(unsigned int cpu)
 
 void __init smp_cpus_done(unsigned int max_cpus)
 {
-        pcr_arch_init();
 }
 
 void smp_send_reschedule(int cpu)
diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S
index 85fe9b1087cd..6a873c344bc0 100644
--- a/arch/sparc/kernel/systbls_32.S
+++ b/arch/sparc/kernel/systbls_32.S
@@ -86,4 +86,4 @@ sys_call_table:
 /*330*/ .long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime
 /*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev
 /*340*/ .long sys_ni_syscall, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr
-/*345*/ .long sys_renameat2
+/*345*/ .long sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S
index 33ecba2826ea..d9151b6490d8 100644
--- a/arch/sparc/kernel/systbls_64.S
+++ b/arch/sparc/kernel/systbls_64.S
@@ -87,7 +87,7 @@ sys_call_table32:
 /*330*/ .word compat_sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime
         .word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev
 /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr
-        .word sys32_renameat2
+        .word sys32_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create
 
 #endif /* CONFIG_COMPAT */
 
@@ -166,4 +166,4 @@ sys_call_table:
 /*330*/ .word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime
         .word sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev
 /*340*/ .word sys_kern_features, sys_kcmp, sys_finit_module, sys_sched_setattr, sys_sched_getattr
-        .word sys_renameat2
+        .word sys_renameat2, sys_seccomp, sys_getrandom, sys_memfd_create
diff --git a/arch/sparc/kernel/unaligned_32.c b/arch/sparc/kernel/unaligned_32.c
index c5c61b3c6b56..32b61d1b6379 100644
--- a/arch/sparc/kernel/unaligned_32.c
+++ b/arch/sparc/kernel/unaligned_32.c
@@ -166,7 +166,7 @@ unsigned long safe_compute_effective_address(struct pt_regs *regs,
 /* This is just to make gcc think panic does return... */
 static void unaligned_panic(char *str)
 {
-        panic(str);
+        panic("%s", str);
 }
 
 /* una_asm.S */
diff --git a/arch/sparc/lib/PeeCeeI.c b/arch/sparc/lib/PeeCeeI.c
index 6529f8657597..e6d183675990 100644
--- a/arch/sparc/lib/PeeCeeI.c
+++ b/arch/sparc/lib/PeeCeeI.c
@@ -15,7 +15,7 @@ void outsb(unsigned long __addr, const void *src, unsigned long count)
         const u8 *p = src;
 
         while (count--)
-                outb(*p++, addr);
+                __raw_writeb(*p++, addr);
 }
 EXPORT_SYMBOL(outsb);
 
@@ -93,21 +93,21 @@ void insb(unsigned long __addr, void *dst, unsigned long count)
                 u8 *pb = dst;
 
                 while ((((unsigned long)pb) & 0x3) && count--)
-                        *pb++ = inb(addr);
+                        *pb++ = __raw_readb(addr);
                 pi = (u32 *)pb;
                 while (count >= 4) {
                         u32 w;
 
-                        w  = (inb(addr) << 24);
-                        w |= (inb(addr) << 16);
-                        w |= (inb(addr) << 8);
-                        w |= (inb(addr) << 0);
+                        w  = (__raw_readb(addr) << 24);
+                        w |= (__raw_readb(addr) << 16);
+                        w |= (__raw_readb(addr) << 8);
+                        w |= (__raw_readb(addr) << 0);
                         *pi++ = w;
                         count -= 4;
                 }
                 pb = (u8 *)pi;
                 while (count--)
-                        *pb++ = inb(addr);
+                        *pb++ = __raw_readb(addr);
         }
 }
 EXPORT_SYMBOL(insb);
@@ -121,21 +121,21 @@ void insw(unsigned long __addr, void *dst, unsigned long count)
                 u32 *pi;
 
                 if (((unsigned long)ps) & 0x2) {
-                        *ps++ = le16_to_cpu(inw(addr));
+                        *ps++ = __raw_readw(addr);
                         count--;
                 }
                 pi = (u32 *)ps;
                 while (count >= 2) {
                         u32 w;
 
-                        w  = (le16_to_cpu(inw(addr)) << 16);
-                        w |= (le16_to_cpu(inw(addr)) << 0);
+                        w  = __raw_readw(addr) << 16;
+                        w |= __raw_readw(addr) << 0;
                         *pi++ = w;
                         count -= 2;
                 }
                 ps = (u16 *)pi;
                 if (count)
-                        *ps = le16_to_cpu(inw(addr));
+                        *ps = __raw_readw(addr);
         }
 }
 EXPORT_SYMBOL(insw);
@@ -148,7 +148,7 @@ void insl(unsigned long __addr, void *dst, unsigned long count)
                 if ((((unsigned long)dst) & 0x3) == 0) {
                         u32 *pi = dst;
                         while (count--)
-                                *pi++ = le32_to_cpu(inl(addr));
+                                *pi++ = __raw_readl(addr);
                 } else {
                         u32 l = 0, l2, *pi;
                         u16 *ps;
@@ -158,11 +158,11 @@ void insl(unsigned long __addr, void *dst, unsigned long count)
                         case 0x2:
                                 ps = dst;
                                 count -= 1;
-                                l = le32_to_cpu(inl(addr));
+                                l = __raw_readl(addr);
                                 *ps++ = l;
                                 pi = (u32 *)ps;
                                 while (count--) {
-                                        l2 = le32_to_cpu(inl(addr));
+                                        l2 = __raw_readl(addr);
                                         *pi++ = (l << 16) | (l2 >> 16);
                                         l = l2;
                                 }
@@ -173,13 +173,13 @@ void insl(unsigned long __addr, void *dst, unsigned long count)
                         case 0x1:
                                 pb = dst;
                                 count -= 1;
-                                l = le32_to_cpu(inl(addr));
+                                l = __raw_readl(addr);
                                 *pb++ = l >> 24;
                                 ps = (u16 *)pb;
                                 *ps++ = ((l >> 8) & 0xffff);
                                 pi = (u32 *)ps;
                                 while (count--) {
-                                        l2 = le32_to_cpu(inl(addr));
+                                        l2 = __raw_readl(addr);
                                         *pi++ = (l << 24) | (l2 >> 8);
                                         l = l2;
                                 }
@@ -190,11 +190,11 @@ void insl(unsigned long __addr, void *dst, unsigned long count)
                         case 0x3:
                                 pb = (u8 *)dst;
                                 count -= 1;
-                                l = le32_to_cpu(inl(addr));
+                                l = __raw_readl(addr);
                                 *pb++ = l >> 24;
                                 pi = (u32 *)pb;
                                 while (count--) {
-                                        l2 = le32_to_cpu(inl(addr));
+                                        l2 = __raw_readl(addr);
                                         *pi++ = (l << 8) | (l2 >> 24);
                                         l = l2;
                                 }
diff --git a/arch/sparc/math-emu/math_32.c b/arch/sparc/math-emu/math_32.c
index aa4d55b0bdf0..5ce8f2f64604 100644
--- a/arch/sparc/math-emu/math_32.c
+++ b/arch/sparc/math-emu/math_32.c
@@ -499,7 +499,7 @@ static int do_one_mathemu(u32 insn, unsigned long *pfsr, unsigned long *fregs)
                 case 0: fsr = *pfsr;
                         if (IR == -1) IR = 2;
                         /* fcc is always fcc0 */
-                        fsr &= ~0xc00; fsr |= (IR << 10); break;
+                        fsr &= ~0xc00; fsr |= (IR << 10);
                         *pfsr = fsr;
                         break;
                 case 1: rd->s = IR; break;
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 16b58ff11e65..98ac8e80adae 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -22,6 +22,7 @@
 #include <linux/kprobes.h>
 #include <linux/cache.h>
 #include <linux/sort.h>
+#include <linux/ioport.h>
 #include <linux/percpu.h>
 #include <linux/memblock.h>
 #include <linux/mmzone.h>
@@ -351,6 +352,10 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *
 
         mm = vma->vm_mm;
 
+        /* Don't insert a non-valid PTE into the TSB, we'll deadlock.  */
+        if (!pte_accessible(mm, pte))
+                return;
+
         spin_lock_irqsave(&mm->context.lock, flags);
 
 #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
@@ -2619,6 +2624,10 @@ void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr,
 
         pte = pmd_val(entry);
 
+        /* Don't insert a non-valid PMD into the TSB, we'll deadlock.  */
+        if (!(pte & _PAGE_VALID))
+                return;
+
         /* We are fabricating 8MB pages using 4MB real hw pages.  */
         pte |= (addr & (1UL << REAL_HPAGE_SHIFT));
 
@@ -2699,3 +2708,90 @@ void hugetlb_setup(struct pt_regs *regs)
         }
 }
 #endif
+
+static struct resource code_resource = {
+        .name   = "Kernel code",
+        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+static struct resource data_resource = {
+        .name   = "Kernel data",
+        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+static struct resource bss_resource = {
+        .name   = "Kernel bss",
+        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM
+};
+
+static inline resource_size_t compute_kern_paddr(void *addr)
+{
+        return (resource_size_t) (addr - KERNBASE + kern_base);
+}
+
+static void __init kernel_lds_init(void)
+{
+        code_resource.start = compute_kern_paddr(_text);
+        code_resource.end   = compute_kern_paddr(_etext - 1);
+        data_resource.start = compute_kern_paddr(_etext);
+        data_resource.end   = compute_kern_paddr(_edata - 1);
+        bss_resource.start  = compute_kern_paddr(__bss_start);
+        bss_resource.end    = compute_kern_paddr(_end - 1);
+}
+
+static int __init report_memory(void)
+{
+        int i;
+        struct resource *res;
+
+        kernel_lds_init();
+
+        for (i = 0; i < pavail_ents; i++) {
+                res = kzalloc(sizeof(struct resource), GFP_KERNEL);
+
+                if (!res) {
+                        pr_warn("Failed to allocate source.\n");
+                        break;
+                }
+
+                res->name = "System RAM";
+                res->start = pavail[i].phys_addr;
+                res->end = pavail[i].phys_addr + pavail[i].reg_size - 1;
+                res->flags = IORESOURCE_BUSY | IORESOURCE_MEM;
+
+                if (insert_resource(&iomem_resource, res) < 0) {
+                        pr_warn("Resource insertion failed.\n");
+                        break;
+                }
+
+                insert_resource(res, &code_resource);
+                insert_resource(res, &data_resource);
+                insert_resource(res, &bss_resource);
+        }
+
+        return 0;
+}
+device_initcall(report_memory);
+
+#ifdef CONFIG_SMP
+#define do_flush_tlb_kernel_range       smp_flush_tlb_kernel_range
+#else
+#define do_flush_tlb_kernel_range       __flush_tlb_kernel_range
+#endif
+
+void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+{
+        if (start < HI_OBP_ADDRESS && end > LOW_OBP_ADDRESS) {
+                if (start < LOW_OBP_ADDRESS) {
+                        flush_tsb_kernel_range(start, LOW_OBP_ADDRESS);
+                        do_flush_tlb_kernel_range(start, LOW_OBP_ADDRESS);
+                }
+                if (end > HI_OBP_ADDRESS) {
+                        flush_tsb_kernel_range(end, HI_OBP_ADDRESS);
+                        do_flush_tlb_kernel_range(end, HI_OBP_ADDRESS);
+                }
+        } else {
+                flush_tsb_kernel_range(start, end);
+                do_flush_tlb_kernel_range(start, end);
+        }
+}
diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index 892a102671ad..1f76c22a6a75 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -354,7 +354,7 @@ do {	*prog++ = BR_OPC | WDISP22(OFF);		\
  * emit_jump() calls with adjusted offsets.
  */
 
-void bpf_jit_compile(struct sk_filter *fp)
+void bpf_jit_compile(struct bpf_prog *fp)
 {
         unsigned int cleanup_addr, proglen, oldproglen = 0;
         u32 temp[8], *prog, *func, seen = 0, pass;
@@ -808,7 +808,7 @@ out:
         return;
 }
 
-void bpf_jit_free(struct sk_filter *fp)
+void bpf_jit_free(struct bpf_prog *fp)
 {
         if (fp->jited)
                 module_free(NULL, fp->bpf_func);
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 7fcd492adbfc..a3ffe2dd4832 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -191,6 +191,8 @@ source "kernel/Kconfig.hz"
 
 config KEXEC
         bool "kexec system call"
+        select CRYPTO
+        select CRYPTO_SHA256
         ---help---
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 730e40d9cf62..91de7dd7427f 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -170,7 +170,6 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_ATA_OVER_ETH=m
 CONFIG_RAID_ATTRS=m
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 80fc32ed0491..c7702b7ab7a5 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -301,7 +301,6 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_ATA_OVER_ETH=m
 CONFIG_RAID_ATTRS=m
-CONFIG_SCSI_TGT=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h
index ffd4493efc78..c14e36f008c8 100644
--- a/arch/tile/include/asm/compat.h
+++ b/arch/tile/include/asm/compat.h
@@ -267,8 +267,7 @@ static inline int is_compat_task(void)
         return current_thread_info()->status & TS_COMPAT;
 }
 
-extern int compat_setup_rt_frame(int sig, struct k_sigaction *ka,
-                                 siginfo_t *info, sigset_t *set,
+extern int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set,
                                  struct pt_regs *regs);
 
 /* Compat syscalls. */
diff --git a/arch/tile/include/asm/hardwall.h b/arch/tile/include/asm/hardwall.h
index 2f572b6b7bc2..44d2765bde2b 100644
--- a/arch/tile/include/asm/hardwall.h
+++ b/arch/tile/include/asm/hardwall.h
@@ -23,7 +23,7 @@
 struct proc_dir_entry;
 #ifdef CONFIG_HARDWALL
 void proc_tile_hardwall_init(struct proc_dir_entry *root);
-int proc_pid_hardwall(struct task_struct *task, char *buffer);
+int proc_pid_hardwall(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task);
 #else
 static inline void proc_tile_hardwall_init(struct proc_dir_entry *root) {}
 #endif
diff --git a/arch/tile/include/asm/page.h b/arch/tile/include/asm/page.h
index 672768008618..a213a8d84a95 100644
--- a/arch/tile/include/asm/page.h
+++ b/arch/tile/include/asm/page.h
@@ -39,12 +39,6 @@
 #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>.
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index 19c04b5ce408..8c5abf2e4794 100644
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -190,18 +190,18 @@ static inline void __user *compat_get_sigframe(struct k_sigaction *ka,
         return (void __user *) sp;
 }
 
-int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                          sigset_t *set, struct pt_regs *regs)
+int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         unsigned long restorer;
         struct compat_rt_sigframe __user *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
         int usig;
 
-        frame = compat_get_sigframe(ka, regs, sizeof(*frame));
+        frame = compat_get_sigframe(&ksig->ka, regs, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                goto err;
 
         usig = current_thread_info()->exec_domain
                 && current_thread_info()->exec_domain->signal_invmap
@@ -210,12 +210,12 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 : sig;
 
         /* Always write at least the signal number for the stack backtracer. */
-        if (ka->sa.sa_flags & SA_SIGINFO) {
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
                 /* At sigreturn time, restore the callee-save registers too. */
-                err |= copy_siginfo_to_user32(&frame->info, info);
+                err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
                 regs->flags |= PT_FLAGS_RESTORE_REGS;
         } else {
-                err |= __put_user(info->si_signo, &frame->info.si_signo);
+                err |= __put_user(ksig->info.si_signo, &frame->info.si_signo);
         }
 
         /* Create the ucontext.  */
@@ -226,11 +226,11 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= setup_sigcontext(&frame->uc.uc_mcontext, regs);
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
         if (err)
-                goto give_sigsegv;
+                goto err;
 
         restorer = VDSO_SYM(&__vdso_rt_sigreturn);
-        if (ka->sa.sa_flags & SA_RESTORER)
-                restorer = ptr_to_compat_reg(ka->sa.sa_restorer);
+        if (ksig->ka.sa.sa_flags & SA_RESTORER)
+                restorer = ptr_to_compat_reg(ksig->ka.sa.sa_restorer);
 
         /*
          * Set up registers for signal handler.
@@ -239,7 +239,7 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
          * We always pass siginfo and mcontext, regardless of SA_SIGINFO,
          * since some things rely on this (e.g. glibc's debug/segfault.c).
          */
-        regs->pc = ptr_to_compat_reg(ka->sa.sa_handler);
+        regs->pc = ptr_to_compat_reg(ksig->ka.sa.sa_handler);
         regs->ex1 = PL_ICS_EX1(USER_PL, 1); /* set crit sec in handler */
         regs->sp = ptr_to_compat_reg(frame);
         regs->lr = restorer;
@@ -249,7 +249,8 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->flags |= PT_FLAGS_CALLER_SAVES;
         return 0;
 
-give_sigsegv:
-        signal_fault("bad setup frame", regs, frame, sig);
+err:
+        trace_unhandled_signal("bad sigreturn frame", regs,
+                              (unsigned long)frame, SIGSEGV);
         return -EFAULT;
 }
diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c
index 531f4c365351..aca6000bca75 100644
--- a/arch/tile/kernel/hardwall.c
+++ b/arch/tile/kernel/hardwall.c
@@ -947,15 +947,15 @@ static void hardwall_remove_proc(struct hardwall_info *info)
         remove_proc_entry(buf, info->type->proc_dir);
 }
 
-int proc_pid_hardwall(struct task_struct *task, char *buffer)
+int proc_pid_hardwall(struct seq_file *m, struct pid_namespace *ns,
+                      struct pid *pid, struct task_struct *task)
 {
         int i;
         int n = 0;
         for (i = 0; i < HARDWALL_TYPES; ++i) {
                 struct hardwall_info *info = task->thread.hardwall[i].info;
                 if (info)
-                        n += sprintf(&buffer[n], "%s: %d\n",
-                                     info->type->name, info->id);
+                        seq_printf(m, "%s: %d\n", info->type->name, info->id);
         }
         return n;
 }
diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c
index 4918d91bc3a6..d19b13e3a59f 100644
--- a/arch/tile/kernel/module.c
+++ b/arch/tile/kernel/module.c
@@ -58,7 +58,7 @@ void *module_alloc(unsigned long size)
         area->nr_pages = npages;
         area->pages = pages;
 
-        if (map_vm_area(area, prot_rwx, &pages)) {
+        if (map_vm_area(area, prot_rwx, pages)) {
                 vunmap(area->addr);
                 goto error;
         }
diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c
index d1d026f01267..7c2fecc52177 100644
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
@@ -153,18 +153,18 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
         return (void __user *) sp;
 }
 
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                           sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         unsigned long restorer;
         struct rt_sigframe __user *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
         int usig;
 
-        frame = get_sigframe(ka, regs, sizeof(*frame));
+        frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
-                goto give_sigsegv;
+                goto err;
 
         usig = current_thread_info()->exec_domain
                 && current_thread_info()->exec_domain->signal_invmap
@@ -173,12 +173,12 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 : sig;
 
         /* Always write at least the signal number for the stack backtracer. */
-        if (ka->sa.sa_flags & SA_SIGINFO) {
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
                 /* At sigreturn time, restore the callee-save registers too. */
-                err |= copy_siginfo_to_user(&frame->info, info);
+                err |= copy_siginfo_to_user(&frame->info, &ksig->info);
                 regs->flags |= PT_FLAGS_RESTORE_REGS;
         } else {
-                err |= __put_user(info->si_signo, &frame->info.si_signo);
+                err |= __put_user(ksig->info.si_signo, &frame->info.si_signo);
         }
 
         /* Create the ucontext.  */
@@ -189,11 +189,11 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= setup_sigcontext(&frame->uc.uc_mcontext, regs);
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
         if (err)
-                goto give_sigsegv;
+                goto err;
 
         restorer = VDSO_SYM(&__vdso_rt_sigreturn);
-        if (ka->sa.sa_flags & SA_RESTORER)
-                restorer = (unsigned long) ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER)
+                restorer = (unsigned long) ksig->ka.sa.sa_restorer;
 
         /*
          * Set up registers for signal handler.
@@ -202,7 +202,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
          * We always pass siginfo and mcontext, regardless of SA_SIGINFO,
          * since some things rely on this (e.g. glibc's debug/segfault.c).
          */
-        regs->pc = (unsigned long) ka->sa.sa_handler;
+        regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
         regs->ex1 = PL_ICS_EX1(USER_PL, 1); /* set crit sec in handler */
         regs->sp = (unsigned long) frame;
         regs->lr = restorer;
@@ -212,8 +212,9 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->flags |= PT_FLAGS_CALLER_SAVES;
         return 0;
 
-give_sigsegv:
-        signal_fault("bad setup frame", regs, frame, sig);
+err:
+        trace_unhandled_signal("bad sigreturn frame", regs,
+                              (unsigned long)frame, SIGSEGV);
         return -EFAULT;
 }
 
@@ -221,9 +222,7 @@ give_sigsegv:
  * OK, we're invoking a handler
  */
 
-static void handle_signal(unsigned long sig, siginfo_t *info,
-                         struct k_sigaction *ka,
-                         struct pt_regs *regs)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
@@ -238,7 +237,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
                         break;
 
                 case -ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 regs->regs[0] = -EINTR;
                                 break;
                         }
@@ -254,14 +253,12 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
         /* Set up the stack frame */
 #ifdef CONFIG_COMPAT
         if (is_compat_task())
-                ret = compat_setup_rt_frame(sig, ka, info, oldset, regs);
+                ret = compat_setup_rt_frame(ksig, oldset, regs);
         else
 #endif
-                ret = setup_rt_frame(sig, ka, info, oldset, regs);
-        if (ret)
-                return;
-        signal_delivered(sig, info, ka, regs,
-                        test_thread_flag(TIF_SINGLESTEP));
+                ret = setup_rt_frame(ksig, oldset, regs);
+
+        signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
 }
 
 /*
@@ -271,9 +268,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
  */
 void do_signal(struct pt_regs *regs)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         /*
          * i386 will check if we're coming from kernel mode and bail out
@@ -282,10 +277,9 @@ void do_signal(struct pt_regs *regs)
          * helpful, we can reinstate the check on "!user_mode(regs)".
          */
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 /* Whee! Actually deliver the signal.  */
-                handle_signal(signr, &info, &ka, regs);
+                handle_signal(&ksig, regs);
                 goto done;
         }
 
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index 462dcd0c1700..d8fbc289e680 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -260,9 +260,8 @@ void update_vsyscall_tz(void)
 
 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;
+        struct clocksource *clock = tk->tkr.clock;
 
         if (clock != &cycle_counter_cs)
                 return;
@@ -270,13 +269,13 @@ void update_vsyscall(struct timekeeper *tk)
         /* 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->xtime_tod_stamp = tk->tkr.cycle_last;
+        vdso_data->xtime_clock_sec = tk->xtime_sec;
+        vdso_data->xtime_clock_nsec = tk->tkr.xtime_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;
+        vdso_data->mult = tk->tkr.mult;
+        vdso_data->shift = tk->tkr.shift;
         smp_wmb();
         ++vdso_data->tb_update_count;
 }
diff --git a/arch/tile/kernel/vdso.c b/arch/tile/kernel/vdso.c
index 1533af24106e..5bc51d7dfdcb 100644
--- a/arch/tile/kernel/vdso.c
+++ b/arch/tile/kernel/vdso.c
@@ -121,21 +121,6 @@ const char *arch_vma_name(struct vm_area_struct *vma)
         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;
diff --git a/arch/tile/kernel/vdso/vgettimeofday.c b/arch/tile/kernel/vdso/vgettimeofday.c
index 51ec8e46f5f9..e933fb9fbf5c 100644
--- a/arch/tile/kernel/vdso/vgettimeofday.c
+++ b/arch/tile/kernel/vdso/vgettimeofday.c
@@ -83,10 +83,11 @@ int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
                 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;
+                cycles = get_cycles() - vdso_data->xtime_tod_stamp;
+                ns = (cycles * vdso_data->mult) + vdso_data->xtime_clock_nsec;
+                ns >>= vdso_data->shift;
+
                 if (ns >= NSEC_PER_SEC) {
                         ns -= NSEC_PER_SEC;
                         sec += 1;
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index a5e4b6068213..7bd64aa2e94a 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -21,6 +21,7 @@ generic-y += param.h
 generic-y += pci.h
 generic-y += percpu.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += sections.h
 generic-y += switch_to.h
 generic-y += topology.h
diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
index 5ff53d9185f7..71c5d132062a 100644
--- a/arch/um/include/asm/page.h
+++ b/arch/um/include/asm/page.h
@@ -119,4 +119,9 @@ extern unsigned long uml_physmem;
 #include <asm-generic/getorder.h>
 
 #endif  /* __ASSEMBLY__ */
+
+#ifdef CONFIG_X86_32
+#define __HAVE_ARCH_GATE_AREA 1
+#endif
+
 #endif  /* __UM_PAGE_H */
diff --git a/arch/um/include/shared/frame_kern.h b/arch/um/include/shared/frame_kern.h
index f2ca5702a4e2..a5cde5c433b4 100644
--- a/arch/um/include/shared/frame_kern.h
+++ b/arch/um/include/shared/frame_kern.h
@@ -6,14 +6,10 @@
 #ifndef __FRAME_KERN_H_
 #define __FRAME_KERN_H_
 
-extern int setup_signal_stack_sc(unsigned long stack_top, int sig,
-                                 struct k_sigaction *ka,
-                                 struct pt_regs *regs,
-                                 sigset_t *mask);
-extern int setup_signal_stack_si(unsigned long stack_top, int sig,
-                                 struct k_sigaction *ka,
-                                 struct pt_regs *regs, struct siginfo *info,
-                                 sigset_t *mask);
+extern int setup_signal_stack_sc(unsigned long stack_top, struct ksignal *ksig,
+                                 struct pt_regs *regs, sigset_t *mask);
+extern int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,
+                                 struct pt_regs *regs, sigset_t *mask);
 
 #endif
 
diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c
index f57e02e7910f..4f60e4aad790 100644
--- a/arch/um/kernel/signal.c
+++ b/arch/um/kernel/signal.c
@@ -18,8 +18,7 @@ EXPORT_SYMBOL(unblock_signals);
 /*
  * OK, we're invoking a handler
  */
-static void handle_signal(struct pt_regs *regs, unsigned long signr,
-                         struct k_sigaction *ka, struct siginfo *info)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int singlestep = 0;
@@ -39,7 +38,7 @@ static void handle_signal(struct pt_regs *regs, unsigned long signr,
                         break;
 
                 case -ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 PT_REGS_SYSCALL_RET(regs) = -EINTR;
                                 break;
                         }
@@ -52,32 +51,28 @@ static void handle_signal(struct pt_regs *regs, unsigned long signr,
         }
 
         sp = PT_REGS_SP(regs);
-        if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0))
+        if ((ksig->ka.sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0))
                 sp = current->sas_ss_sp + current->sas_ss_size;
 
 #ifdef CONFIG_ARCH_HAS_SC_SIGNALS
-        if (!(ka->sa.sa_flags & SA_SIGINFO))
-                err = setup_signal_stack_sc(sp, signr, ka, regs, oldset);
+        if (!(ksig->ka.sa.sa_flags & SA_SIGINFO))
+                err = setup_signal_stack_sc(sp, ksig, regs, oldset);
         else
 #endif
-                err = setup_signal_stack_si(sp, signr, ka, regs, info, oldset);
+                err = setup_signal_stack_si(sp, ksig, regs, oldset);
 
-        if (err)
-                force_sigsegv(signr, current);
-        else
-                signal_delivered(signr, info, ka, regs, singlestep);
+        signal_setup_done(err, ksig, singlestep);
 }
 
 static int kern_do_signal(struct pt_regs *regs)
 {
-        struct k_sigaction ka_copy;
-        struct siginfo info;
-        int sig, handled_sig = 0;
+        struct ksignal ksig;
+        int handled_sig = 0;
 
-        while ((sig = get_signal_to_deliver(&info, &ka_copy, regs, NULL)) > 0) {
+        while (get_signal(&ksig)) {
                 handled_sig = 1;
                 /* Whee!  Actually deliver the signal.  */
-                handle_signal(regs, sig, &ka_copy, &info);
+                handle_signal(&ksig, regs);
         }
 
         /* Did we come from a system call? */
diff --git a/arch/unicore32/kernel/puv3-core.c b/arch/unicore32/kernel/puv3-core.c
index 254adeecc61a..438dd2edba4f 100644
--- a/arch/unicore32/kernel/puv3-core.c
+++ b/arch/unicore32/kernel/puv3-core.c
@@ -272,7 +272,7 @@ void __init puv3_core_init(void)
         platform_device_register_simple("PKUnity-v3-UART", 1,
                         puv3_uart1_resources, ARRAY_SIZE(puv3_uart1_resources));
         platform_device_register_simple("PKUnity-v3-AC97", -1, NULL, 0);
-        platform_device_register_resndata(&platform_bus, "musb_hdrc", -1,
+        platform_device_register_resndata(NULL, "musb_hdrc", -1,
                         puv3_usb_resources, ARRAY_SIZE(puv3_usb_resources),
                         &puv3_usb_plat, sizeof(puv3_usb_plat));
 }
diff --git a/arch/unicore32/kernel/puv3-nb0916.c b/arch/unicore32/kernel/puv3-nb0916.c
index 0c6618e71897..46ebfdccbc31 100644
--- a/arch/unicore32/kernel/puv3-nb0916.c
+++ b/arch/unicore32/kernel/puv3-nb0916.c
@@ -112,13 +112,13 @@ int __init mach_nb0916_init(void)
         platform_device_register_simple("PKUnity-v3-I2C", -1,
                         puv3_i2c_resources, ARRAY_SIZE(puv3_i2c_resources));
 
-        platform_device_register_data(&platform_bus, "pwm-backlight", -1,
+        platform_device_register_data(NULL, "pwm-backlight", -1,
                         &nb0916_backlight_data, sizeof(nb0916_backlight_data));
 
-        platform_device_register_data(&platform_bus, "gpio-keys", -1,
+        platform_device_register_data(NULL, "gpio-keys", -1,
                         &nb0916_gpio_button_data, sizeof(nb0916_gpio_button_data));
 
-        platform_device_register_resndata(&platform_bus, "physmap-flash", -1,
+        platform_device_register_resndata(NULL, "physmap-flash", -1,
                         &physmap_flash_resource, 1,
                         &physmap_flash_data, sizeof(physmap_flash_data));
 
diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c
index 6905f0ebdc77..780d77388dec 100644
--- a/arch/unicore32/kernel/signal.c
+++ b/arch/unicore32/kernel/signal.c
@@ -238,10 +238,10 @@ static int setup_return(struct pt_regs *regs, struct k_sigaction *ka,
         return 0;
 }
 
-static int setup_frame(int usig, struct k_sigaction *ka,
-                sigset_t *set, struct pt_regs *regs)
+static int setup_frame(struct ksignal *ksig, sigset_t *set,
+                       struct pt_regs *regs)
 {
-        struct sigframe __user *frame = get_sigframe(ka, regs, sizeof(*frame));
+        struct sigframe __user *frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
         int err = 0;
 
         if (!frame)
@@ -254,29 +254,29 @@ static int setup_frame(int usig, struct k_sigaction *ka,
 
         err |= setup_sigframe(frame, regs, set);
         if (err == 0)
-                err |= setup_return(regs, ka, frame->retcode, frame, usig);
+                err |= setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
 
         return err;
 }
 
-static int setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info,
-               sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+                          struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame =
-                        get_sigframe(ka, regs, sizeof(*frame));
+                        get_sigframe(&ksig->ka, regs, sizeof(*frame));
         int err = 0;
 
         if (!frame)
                 return 1;
 
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
 
         err |= __put_user(0, &frame->sig.uc.uc_flags);
         err |= __put_user(NULL, &frame->sig.uc.uc_link);
         err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp);
         err |= setup_sigframe(&frame->sig, regs, set);
         if (err == 0)
-                err |= setup_return(regs, ka, frame->sig.retcode, frame, usig);
+                err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
 
         if (err == 0) {
                 /*
@@ -299,13 +299,13 @@ static inline void setup_syscall_restart(struct pt_regs *regs)
 /*
  * OK, we're invoking a handler
  */
-static void handle_signal(unsigned long sig, struct k_sigaction *ka,
-              siginfo_t *info, struct pt_regs *regs, int syscall)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs,
+                          int syscall)
 {
         struct thread_info *thread = current_thread_info();
         struct task_struct *tsk = current;
         sigset_t *oldset = sigmask_to_save();
-        int usig = sig;
+        int usig = ksig->sig;
         int ret;
 
         /*
@@ -318,7 +318,7 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
                         regs->UCreg_00 = -EINTR;
                         break;
                 case -ERESTARTSYS:
-                        if (!(ka->sa.sa_flags & SA_RESTART)) {
+                        if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
                                 regs->UCreg_00 = -EINTR;
                                 break;
                         }
@@ -338,22 +338,17 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
         /*
          * Set up the stack frame
          */
-        if (ka->sa.sa_flags & SA_SIGINFO)
-                ret = setup_rt_frame(usig, ka, info, oldset, regs);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+                ret = setup_rt_frame(ksig, oldset, regs);
         else
-                ret = setup_frame(usig, ka, oldset, regs);
+                ret = setup_frame(ksig, oldset, regs);
 
         /*
          * Check that the resulting registers are actually sane.
          */
         ret |= !valid_user_regs(regs);
 
-        if (ret != 0) {
-                force_sigsegv(sig, tsk);
-                return;
-        }
-
-        signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 /*
@@ -367,9 +362,7 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
  */
 static void do_signal(struct pt_regs *regs, int syscall)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
+        struct ksignal ksig;
 
         /*
          * We want the common case to go fast, which
@@ -380,9 +373,8 @@ static void do_signal(struct pt_regs *regs, int syscall)
         if (!user_mode(regs))
                 return;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-        if (signr > 0) {
-                handle_signal(signr, &ka, &info, regs, syscall);
+        if (get_signsl(&ksig)) {
+                handle_signal(&ksig, regs, syscall);
                 return;
         }
 
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
index e5287d8517aa..61b6d51866f8 100644
--- a/arch/x86/Kbuild
+++ b/arch/x86/Kbuild
@@ -16,3 +16,7 @@ obj-$(CONFIG_IA32_EMULATION) += ia32/
 
 obj-y += platform/
 obj-y += net/
+
+ifeq ($(CONFIG_X86_64),y)
+obj-$(CONFIG_KEXEC) += purgatory/
+endif
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6b71f0417293..5d0bf1aa9dcb 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -21,6 +21,7 @@ config X86_64
 ### Arch settings
 config X86
         def_bool y
+        select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
         select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
         select ARCH_MIGHT_HAVE_PC_PARPORT
         select ARCH_MIGHT_HAVE_PC_SERIO
@@ -95,6 +96,7 @@ config X86
         select IRQ_FORCED_THREADING
         select HAVE_BPF_JIT if X86_64
         select HAVE_ARCH_TRANSPARENT_HUGEPAGE
+        select ARCH_HAS_SG_CHAIN
         select CLKEVT_I8253
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select GENERIC_IOMAP
@@ -108,9 +110,9 @@ config X86
         select CLOCKSOURCE_WATCHDOG
         select GENERIC_CLOCKEVENTS
         select ARCH_CLOCKSOURCE_DATA
+        select CLOCKSOURCE_VALIDATE_LAST_CYCLE
         select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
         select GENERIC_TIME_VSYSCALL
-        select KTIME_SCALAR if X86_32
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
         select HAVE_CONTEXT_TRACKING if X86_64
@@ -133,6 +135,7 @@ config X86
         select ARCH_SUPPORTS_ATOMIC_RMW
         select HAVE_ACPI_APEI if ACPI
         select HAVE_ACPI_APEI_NMI if ACPI
+        select ACPI_LEGACY_TABLES_LOOKUP if ACPI
 
 config INSTRUCTION_DECODER
         def_bool y
@@ -431,6 +434,7 @@ config X86_INTEL_CE
         bool "CE4100 TV platform"
         depends on PCI
         depends on PCI_GODIRECT
+        depends on X86_IO_APIC
         depends on X86_32
         depends on X86_EXTENDED_PLATFORM
         select X86_REBOOTFIXUPS
@@ -837,6 +841,7 @@ config X86_IO_APIC
         def_bool y
         depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI
         select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
+        select IRQ_DOMAIN
 
 config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
         bool "Reroute for broken boot IRQs"
@@ -1538,7 +1543,8 @@ config EFI
 
 config EFI_STUB
        bool "EFI stub support"
-       depends on EFI
+       depends on EFI && !X86_USE_3DNOW
+       select RELOCATABLE
        ---help---
           This kernel feature allows a bzImage to be loaded directly
           by EFI firmware without the use of a bootloader.
@@ -1579,6 +1585,9 @@ source kernel/Kconfig.hz
 
 config KEXEC
         bool "kexec system call"
+        select BUILD_BIN2C
+        select CRYPTO
+        select CRYPTO_SHA256
         ---help---
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
@@ -1593,6 +1602,28 @@ config KEXEC
           interface is strongly in flux, so no good recommendation can be
           made.
 
+config KEXEC_VERIFY_SIG
+        bool "Verify kernel signature during kexec_file_load() syscall"
+        depends on KEXEC
+        ---help---
+          This option makes kernel signature verification mandatory for
+          kexec_file_load() syscall. If kernel is signature can not be
+          verified, kexec_file_load() will fail.
+
+          This option enforces signature verification at generic level.
+          One needs to enable signature verification for type of kernel
+          image being loaded to make sure it works. For example, enable
+          bzImage signature verification option to be able to load and
+          verify signatures of bzImage. Otherwise kernel loading will fail.
+
+config KEXEC_BZIMAGE_VERIFY_SIG
+        bool "Enable bzImage signature verification support"
+        depends on KEXEC_VERIFY_SIG
+        depends on SIGNED_PE_FILE_VERIFICATION
+        select SYSTEM_TRUSTED_KEYRING
+        ---help---
+          Enable bzImage signature verification support.
+
 config CRASH_DUMP
         bool "kernel crash dumps"
         depends on X86_64 || (X86_32 && HIGHMEM)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index c65fd9650467..c1aa36887843 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -183,6 +183,14 @@ archscripts: scripts_basic
 archheaders:
         $(Q)$(MAKE) $(build)=arch/x86/syscalls all
 
+archprepare:
+ifeq ($(CONFIG_KEXEC),y)
+# Build only for 64bit. No loaders for 32bit yet.
+ ifeq ($(CONFIG_X86_64),y)
+        $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
+ endif
+endif
+
 ###
 # Kernel objects
 
diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild
index 3ca9762e1649..3bf000fab0ae 100644
--- a/arch/x86/include/asm/Kbuild
+++ b/arch/x86/include/asm/Kbuild
@@ -5,6 +5,7 @@ genhdr-y += unistd_64.h
 genhdr-y += unistd_x32.h
 
 generic-y += clkdev.h
-generic-y += early_ioremap.h
 generic-y += cputime.h
+generic-y += early_ioremap.h
 generic-y += mcs_spinlock.h
+generic-y += scatterlist.h
diff --git a/arch/x86/include/asm/acenv.h b/arch/x86/include/asm/acenv.h
index 66873297e9f5..1b010a859b8b 100644
--- a/arch/x86/include/asm/acenv.h
+++ b/arch/x86/include/asm/acenv.h
@@ -18,8 +18,6 @@
 
 #define ACPI_FLUSH_CPU_CACHE()  wbinvd()
 
-#ifdef CONFIG_ACPI
-
 int __acpi_acquire_global_lock(unsigned int *lock);
 int __acpi_release_global_lock(unsigned int *lock);
 
@@ -44,6 +42,4 @@ int __acpi_release_global_lock(unsigned int *lock);
             : "=r"(n_hi), "=r"(n_lo)    \
             : "0"(n_hi), "1"(n_lo))
 
-#endif
-
 #endif /* _ASM_X86_ACENV_H */
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index e06225eda635..0ab4f9fd2687 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -121,6 +121,11 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf)
                 buf[2] &= ~(ACPI_PDC_C_C2C3_FFH);
 }
 
+static inline bool acpi_has_cpu_in_madt(void)
+{
+        return !!acpi_lapic;
+}
+
 #else /* !CONFIG_ACPI */
 
 #define acpi_lapic 0
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 0a3f9c9f98d5..473bdbee378a 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -161,6 +161,20 @@ static inline int alternatives_text_reserved(void *start, void *end)
         asm volatile (ALTERNATIVE(oldinstr, newinstr, feature)          \
                 : : "i" (0), ## input)
 
+/*
+ * This is similar to alternative_input. But it has two features and
+ * respective instructions.
+ *
+ * If CPU has feature2, newinstr2 is used.
+ * Otherwise, if CPU has feature1, newinstr1 is used.
+ * Otherwise, oldinstr is used.
+ */
+#define alternative_input_2(oldinstr, newinstr1, feature1, newinstr2,        \
+                           feature2, input...)                               \
+        asm volatile(ALTERNATIVE_2(oldinstr, newinstr1, feature1,            \
+                newinstr2, feature2)                                         \
+                : : "i" (0), ## input)
+
 /* Like alternative_input, but with a single output argument */
 #define alternative_io(oldinstr, newinstr, feature, output, input...)   \
         asm volatile (ALTERNATIVE(oldinstr, newinstr, feature)          \
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 79752f2bdec5..465b309af254 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -85,14 +85,6 @@ static inline bool apic_from_smp_config(void)
 #include <asm/paravirt.h>
 #endif
 
-#ifdef CONFIG_X86_64
-extern int is_vsmp_box(void);
-#else
-static inline int is_vsmp_box(void)
-{
-        return 0;
-}
-#endif
 extern int setup_profiling_timer(unsigned int);
 
 static inline void native_apic_mem_write(u32 reg, u32 v)
@@ -300,7 +292,6 @@ struct apic {
 
         int dest_logical;
         unsigned long (*check_apicid_used)(physid_mask_t *map, int apicid);
-        unsigned long (*check_apicid_present)(int apicid);
 
         void (*vector_allocation_domain)(int cpu, struct cpumask *retmask,
                                          const struct cpumask *mask);
@@ -309,21 +300,11 @@ struct apic {
         void (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap);
 
         void (*setup_apic_routing)(void);
-        int (*multi_timer_check)(int apic, int irq);
         int (*cpu_present_to_apicid)(int mps_cpu);
         void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap);
-        void (*setup_portio_remap)(void);
         int (*check_phys_apicid_present)(int phys_apicid);
-        void (*enable_apic_mode)(void);
         int (*phys_pkg_id)(int cpuid_apic, int index_msb);
 
-        /*
-         * When one of the next two hooks returns 1 the apic
-         * is switched to this. Essentially they are additional
-         * probe functions:
-         */
-        int (*mps_oem_check)(struct mpc_table *mpc, char *oem, char *productid);
-
         unsigned int (*get_apic_id)(unsigned long x);
         unsigned long (*set_apic_id)(unsigned int id);
         unsigned long apic_id_mask;
@@ -343,11 +324,7 @@ struct apic {
         /* wakeup_secondary_cpu */
         int (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip);
 
-        int trampoline_phys_low;
-        int trampoline_phys_high;
-
         bool wait_for_init_deassert;
-        void (*smp_callin_clear_local_apic)(void);
         void (*inquire_remote_apic)(int apicid);
 
         /* apic ops */
@@ -378,14 +355,6 @@ struct apic {
          * won't be applied properly during early boot in this case.
          */
         int (*x86_32_early_logical_apicid)(int cpu);
-
-        /*
-         * Optional method called from setup_local_APIC() after logical
-         * apicid is guaranteed to be known to initialize apicid -> node
-         * mapping if NUMA initialization hasn't done so already.  Don't
-         * add new users.
-         */
-        int (*x86_32_numa_cpu_node)(int cpu);
 #endif
 };
 
@@ -496,14 +465,12 @@ static inline unsigned default_get_apic_id(unsigned long x)
 }
 
 /*
- * Warm reset vector default position:
+ * Warm reset vector position:
  */
-#define DEFAULT_TRAMPOLINE_PHYS_LOW             0x467
-#define DEFAULT_TRAMPOLINE_PHYS_HIGH            0x469
+#define TRAMPOLINE_PHYS_LOW             0x467
+#define TRAMPOLINE_PHYS_HIGH            0x469
 
 #ifdef CONFIG_X86_64
-extern int default_acpi_madt_oem_check(char *, char *);
-
 extern void apic_send_IPI_self(int vector);
 
 DECLARE_PER_CPU(int, x2apic_extra_bits);
@@ -552,6 +519,8 @@ static inline int default_apic_id_valid(int apicid)
         return (apicid < 255);
 }
 
+extern int default_acpi_madt_oem_check(char *, char *);
+
 extern void default_setup_apic_routing(void);
 
 extern struct apic apic_noop;
@@ -635,11 +604,6 @@ static inline unsigned long default_check_apicid_used(physid_mask_t *map, int ap
         return physid_isset(apicid, *map);
 }
 
-static inline unsigned long default_check_apicid_present(int bit)
-{
-        return physid_isset(bit, phys_cpu_present_map);
-}
-
 static inline void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap)
 {
         *retmap = *phys_map;
diff --git a/arch/x86/include/asm/crash.h b/arch/x86/include/asm/crash.h
new file mode 100644
index 000000000000..f498411f2500
--- /dev/null
+++ b/arch/x86/include/asm/crash.h
@@ -0,0 +1,9 @@
+#ifndef _ASM_X86_CRASH_H
+#define _ASM_X86_CRASH_H
+
+int crash_load_segments(struct kimage *image);
+int crash_copy_backup_region(struct kimage *image);
+int crash_setup_memmap_entries(struct kimage *image,
+                struct boot_params *params);
+
+#endif /* _ASM_X86_CRASH_H */
diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
index e3b85422cf12..412ececa00b9 100644
--- a/arch/x86/include/asm/fpu-internal.h
+++ b/arch/x86/include/asm/fpu-internal.h
@@ -508,9 +508,12 @@ static inline void user_fpu_begin(void)
 
 static inline void __save_fpu(struct task_struct *tsk)
 {
-        if (use_xsave())
-                xsave_state(&tsk->thread.fpu.state->xsave, -1);
-        else
+        if (use_xsave()) {
+                if (unlikely(system_state == SYSTEM_BOOTING))
+                        xsave_state_booting(&tsk->thread.fpu.state->xsave, -1);
+                else
+                        xsave_state(&tsk->thread.fpu.state->xsave, -1);
+        } else
                 fpu_fxsave(&tsk->thread.fpu);
 }
 
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index 230853da4ec0..0f5fb6b6567e 100644
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -40,9 +40,6 @@ typedef struct {
 
 DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
 
-/* We can have at most NR_VECTORS irqs routed to a cpu at a time */
-#define MAX_HARDIRQS_PER_CPU NR_VECTORS
-
 #define __ARCH_IRQ_STAT
 
 #define inc_irq_stat(member)    this_cpu_inc(irq_stat.member)
diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
index a20365953bf8..ccffa53750a8 100644
--- a/arch/x86/include/asm/i8259.h
+++ b/arch/x86/include/asm/i8259.h
@@ -67,4 +67,9 @@ struct legacy_pic {
 extern struct legacy_pic *legacy_pic;
 extern struct legacy_pic null_legacy_pic;
 
+static inline int nr_legacy_irqs(void)
+{
+        return legacy_pic->nr_legacy_irqs;
+}
+
 #endif /* _ASM_X86_I8259_H */
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index 90f97b4b9347..0aeed5ca356e 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -98,6 +98,8 @@ struct IR_IO_APIC_route_entry {
 #define IOAPIC_AUTO     -1
 #define IOAPIC_EDGE     0
 #define IOAPIC_LEVEL    1
+#define IOAPIC_MAP_ALLOC                0x1
+#define IOAPIC_MAP_CHECK                0x2
 
 #ifdef CONFIG_X86_IO_APIC
 
@@ -118,9 +120,6 @@ extern int mp_irq_entries;
 /* MP IRQ source entries */
 extern struct mpc_intsrc mp_irqs[MAX_IRQ_SOURCES];
 
-/* non-0 if default (table-less) MP configuration */
-extern int mpc_default_type;
-
 /* Older SiS APIC requires we rewrite the index register */
 extern int sis_apic_bug;
 
@@ -133,9 +132,6 @@ extern int noioapicquirk;
 /* -1 if "noapic" boot option passed */
 extern int noioapicreroute;
 
-/* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */
-extern int timer_through_8259;
-
 /*
  * If we use the IO-APIC for IRQ routing, disable automatic
  * assignment of PCI IRQ's.
@@ -145,24 +141,17 @@ extern int timer_through_8259;
 
 struct io_apic_irq_attr;
 struct irq_cfg;
-extern int io_apic_set_pci_routing(struct device *dev, int irq,
-                 struct io_apic_irq_attr *irq_attr);
-void setup_IO_APIC_irq_extra(u32 gsi);
 extern void ioapic_insert_resources(void);
 
 extern int native_setup_ioapic_entry(int, struct IO_APIC_route_entry *,
                                      unsigned int, int,
                                      struct io_apic_irq_attr *);
-extern int native_setup_ioapic_entry(int, struct IO_APIC_route_entry *,
-                                     unsigned int, int,
-                                     struct io_apic_irq_attr *);
 extern void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg);
 
 extern void native_compose_msi_msg(struct pci_dev *pdev,
                                    unsigned int irq, unsigned int dest,
                                    struct msi_msg *msg, u8 hpet_id);
 extern void native_eoi_ioapic_pin(int apic, int pin, int vector);
-int io_apic_setup_irq_pin_once(unsigned int irq, int node, struct io_apic_irq_attr *attr);
 
 extern int save_ioapic_entries(void);
 extern void mask_ioapic_entries(void);
@@ -171,15 +160,40 @@ extern int restore_ioapic_entries(void);
 extern void setup_ioapic_ids_from_mpc(void);
 extern void setup_ioapic_ids_from_mpc_nocheck(void);
 
+enum ioapic_domain_type {
+        IOAPIC_DOMAIN_INVALID,
+        IOAPIC_DOMAIN_LEGACY,
+        IOAPIC_DOMAIN_STRICT,
+        IOAPIC_DOMAIN_DYNAMIC,
+};
+
+struct device_node;
+struct irq_domain;
+struct irq_domain_ops;
+
+struct ioapic_domain_cfg {
+        enum ioapic_domain_type         type;
+        const struct irq_domain_ops     *ops;
+        struct device_node              *dev;
+};
+
 struct mp_ioapic_gsi{
         u32 gsi_base;
         u32 gsi_end;
 };
-extern struct mp_ioapic_gsi  mp_gsi_routing[];
 extern u32 gsi_top;
-int mp_find_ioapic(u32 gsi);
-int mp_find_ioapic_pin(int ioapic, u32 gsi);
-void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);
+
+extern int mp_find_ioapic(u32 gsi);
+extern int mp_find_ioapic_pin(int ioapic, u32 gsi);
+extern u32 mp_pin_to_gsi(int ioapic, int pin);
+extern int mp_map_gsi_to_irq(u32 gsi, unsigned int flags);
+extern void mp_unmap_irq(int irq);
+extern void __init mp_register_ioapic(int id, u32 address, u32 gsi_base,
+                                      struct ioapic_domain_cfg *cfg);
+extern int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq,
+                            irq_hw_number_t hwirq);
+extern void mp_irqdomain_unmap(struct irq_domain *domain, unsigned int virq);
+extern int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node);
 extern void __init pre_init_apic_IRQ0(void);
 
 extern void mp_save_irq(struct mpc_intsrc *m);
@@ -217,14 +231,12 @@ extern void io_apic_eoi(unsigned int apic, unsigned int vector);
 
 #define io_apic_assign_pci_irqs 0
 #define setup_ioapic_ids_from_mpc x86_init_noop
-static const int timer_through_8259 = 0;
 static inline void ioapic_insert_resources(void) { }
 #define gsi_top (NR_IRQS_LEGACY)
 static inline int mp_find_ioapic(u32 gsi) { return 0; }
-
-struct io_apic_irq_attr;
-static inline int io_apic_set_pci_routing(struct device *dev, int irq,
-                 struct io_apic_irq_attr *irq_attr) { return 0; }
+static inline u32 mp_pin_to_gsi(int ioapic, int pin) { return UINT_MAX; }
+static inline int mp_map_gsi_to_irq(u32 gsi, unsigned int flags) { return gsi; }
+static inline void mp_unmap_irq(int irq) { }
 
 static inline int save_ioapic_entries(void)
 {
diff --git a/arch/x86/include/asm/kexec-bzimage64.h b/arch/x86/include/asm/kexec-bzimage64.h
new file mode 100644
index 000000000000..d1b5d194e31d
--- /dev/null
+++ b/arch/x86/include/asm/kexec-bzimage64.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_KEXEC_BZIMAGE64_H
+#define _ASM_KEXEC_BZIMAGE64_H
+
+extern struct kexec_file_ops kexec_bzImage64_ops;
+
+#endif  /* _ASM_KEXE_BZIMAGE64_H */
diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h
index 17483a492f18..d2434c1cad05 100644
--- a/arch/x86/include/asm/kexec.h
+++ b/arch/x86/include/asm/kexec.h
@@ -23,6 +23,9 @@
 
 #include <asm/page.h>
 #include <asm/ptrace.h>
+#include <asm/bootparam.h>
+
+struct kimage;
 
 /*
  * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
@@ -61,6 +64,10 @@
 # define KEXEC_ARCH KEXEC_ARCH_X86_64
 #endif
 
+/* Memory to backup during crash kdump */
+#define KEXEC_BACKUP_SRC_START  (0UL)
+#define KEXEC_BACKUP_SRC_END    (640 * 1024UL)  /* 640K */
+
 /*
  * CPU does not save ss and sp on stack if execution is already
  * running in kernel mode at the time of NMI occurrence. This code
@@ -160,6 +167,44 @@ struct kimage_arch {
         pud_t *pud;
         pmd_t *pmd;
         pte_t *pte;
+        /* Details of backup region */
+        unsigned long backup_src_start;
+        unsigned long backup_src_sz;
+
+        /* Physical address of backup segment */
+        unsigned long backup_load_addr;
+
+        /* Core ELF header buffer */
+        void *elf_headers;
+        unsigned long elf_headers_sz;
+        unsigned long elf_load_addr;
+};
+#endif /* CONFIG_X86_32 */
+
+#ifdef CONFIG_X86_64
+/*
+ * Number of elements and order of elements in this structure should match
+ * with the ones in arch/x86/purgatory/entry64.S. If you make a change here
+ * make an appropriate change in purgatory too.
+ */
+struct kexec_entry64_regs {
+        uint64_t rax;
+        uint64_t rcx;
+        uint64_t rdx;
+        uint64_t rbx;
+        uint64_t rsp;
+        uint64_t rbp;
+        uint64_t rsi;
+        uint64_t rdi;
+        uint64_t r8;
+        uint64_t r9;
+        uint64_t r10;
+        uint64_t r11;
+        uint64_t r12;
+        uint64_t r13;
+        uint64_t r14;
+        uint64_t r15;
+        uint64_t rip;
 };
 #endif
 
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index f5a617956735..b07233b64578 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -40,8 +40,6 @@ extern int mp_bus_id_to_type[MAX_MP_BUSSES];
 extern DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES);
 
 extern unsigned int boot_cpu_physical_apicid;
-extern unsigned int max_physical_apicid;
-extern int mpc_default_type;
 extern unsigned long mp_lapic_addr;
 
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -88,15 +86,6 @@ static inline void early_reserve_e820_mpc_new(void) { }
 #endif
 
 int generic_processor_info(int apicid, int version);
-#ifdef CONFIG_ACPI
-extern void mp_register_ioapic(int id, u32 address, u32 gsi_base);
-extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
-                                   u32 gsi);
-extern void mp_config_acpi_legacy_irqs(void);
-struct device;
-extern int mp_register_gsi(struct device *dev, u32 gsi, int edge_level,
-                                 int active_high_low);
-#endif /* CONFIG_ACPI */
 
 #define PHYSID_ARRAY_SIZE       BITS_TO_LONGS(MAX_LOCAL_APIC)
 
@@ -161,8 +150,4 @@ static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map)
 
 extern physid_mask_t phys_cpu_present_map;
 
-extern int generic_mps_oem_check(struct mpc_table *, char *, char *);
-
-extern int default_acpi_madt_oem_check(char *, char *);
-
 #endif /* _ASM_X86_MPSPEC_H */
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
index 775873d3be55..802dde30c928 100644
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -70,7 +70,6 @@ extern bool __virt_addr_valid(unsigned long kaddr);
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
 
-#define __HAVE_ARCH_GATE_AREA 1
 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
 
 #endif  /* __KERNEL__ */
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
index 0f1ddee6a0ce..f408caf73430 100644
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -39,4 +39,6 @@ void copy_page(void *to, void *from);
 
 #endif  /* !__ASSEMBLY__ */
 
+#define __HAVE_ARCH_GATE_AREA 1
+
 #endif /* _ASM_X86_PAGE_64_H */
diff --git a/arch/x86/include/asm/platform_sst_audio.h b/arch/x86/include/asm/platform_sst_audio.h
new file mode 100644
index 000000000000..0a4e140315b6
--- /dev/null
+++ b/arch/x86/include/asm/platform_sst_audio.h
@@ -0,0 +1,78 @@
+/*
+ * platform_sst_audio.h:  sst audio platform data header file
+ *
+ * Copyright (C) 2012-14 Intel Corporation
+ * Author: Jeeja KP <jeeja.kp@intel.com>
+ *      Omair Mohammed Abdullah <omair.m.abdullah@intel.com>
+ *      Vinod Koul ,vinod.koul@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; version 2
+ * of the License.
+ */
+#ifndef _PLATFORM_SST_AUDIO_H_
+#define _PLATFORM_SST_AUDIO_H_
+
+#include <linux/sfi.h>
+
+enum sst_audio_task_id_mrfld {
+        SST_TASK_ID_NONE = 0,
+        SST_TASK_ID_SBA = 1,
+        SST_TASK_ID_MEDIA = 3,
+        SST_TASK_ID_MAX = SST_TASK_ID_MEDIA,
+};
+
+/* Device IDs for Merrifield are Pipe IDs,
+ * ref: DSP spec v0.75 */
+enum sst_audio_device_id_mrfld {
+        /* Output pipeline IDs */
+        PIPE_ID_OUT_START = 0x0,
+        PIPE_CODEC_OUT0 = 0x2,
+        PIPE_CODEC_OUT1 = 0x3,
+        PIPE_SPROT_LOOP_OUT = 0x4,
+        PIPE_MEDIA_LOOP1_OUT = 0x5,
+        PIPE_MEDIA_LOOP2_OUT = 0x6,
+        PIPE_VOIP_OUT = 0xC,
+        PIPE_PCM0_OUT = 0xD,
+        PIPE_PCM1_OUT = 0xE,
+        PIPE_PCM2_OUT = 0xF,
+        PIPE_MEDIA0_OUT = 0x12,
+        PIPE_MEDIA1_OUT = 0x13,
+/* Input Pipeline IDs */
+        PIPE_ID_IN_START = 0x80,
+        PIPE_CODEC_IN0 = 0x82,
+        PIPE_CODEC_IN1 = 0x83,
+        PIPE_SPROT_LOOP_IN = 0x84,
+        PIPE_MEDIA_LOOP1_IN = 0x85,
+        PIPE_MEDIA_LOOP2_IN = 0x86,
+        PIPE_VOIP_IN = 0x8C,
+        PIPE_PCM0_IN = 0x8D,
+        PIPE_PCM1_IN = 0x8E,
+        PIPE_MEDIA0_IN = 0x8F,
+        PIPE_MEDIA1_IN = 0x90,
+        PIPE_MEDIA2_IN = 0x91,
+        PIPE_RSVD = 0xFF,
+};
+
+/* The stream map for each platform consists of an array of the below
+ * stream map structure.
+ */
+struct sst_dev_stream_map {
+        u8 dev_num;             /* device id */
+        u8 subdev_num;          /* substream */
+        u8 direction;
+        u8 device_id;           /* fw id */
+        u8 task_id;             /* fw task */
+        u8 status;
+};
+
+struct sst_platform_data {
+        /* Intel software platform id*/
+        struct sst_dev_stream_map *pdev_strm_map;
+        unsigned int strm_map_size;
+};
+
+int add_sst_platform_device(void);
+#endif
+
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index ee30b9f0b91c..eb71ec794732 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -385,8 +385,8 @@ struct bndcsr_struct {
 
 struct xsave_hdr_struct {
         u64 xstate_bv;
-        u64 reserved1[2];
-        u64 reserved2[5];
+        u64 xcomp_bv;
+        u64 reserved[6];
 } __attribute__((packed));
 
 struct xsave_struct {
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index fbeb06ed0eaa..1d081ac1cd69 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -26,12 +26,10 @@
 extern int of_ioapic;
 extern u64 initial_dtb;
 extern void add_dtb(u64 data);
-extern void x86_add_irq_domains(void);
 void x86_of_pci_init(void);
 void x86_dtb_init(void);
 #else
 static inline void add_dtb(u64 data) { }
-static inline void x86_add_irq_domains(void) { }
 static inline void x86_of_pci_init(void) { }
 static inline void x86_dtb_init(void) { }
 #define of_ioapic 0
diff --git a/arch/x86/include/asm/scatterlist.h b/arch/x86/include/asm/scatterlist.h
deleted file mode 100644
index 4240878b9d76..000000000000
--- a/arch/x86/include/asm/scatterlist.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _ASM_X86_SCATTERLIST_H
-#define _ASM_X86_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#define ARCH_HAS_SG_CHAIN
-
-#endif /* _ASM_X86_SCATTERLIST_H */
diff --git a/arch/x86/include/asm/smpboot_hooks.h b/arch/x86/include/asm/smpboot_hooks.h
index 49adfd7bb4a4..0da7409f0bec 100644
--- a/arch/x86/include/asm/smpboot_hooks.h
+++ b/arch/x86/include/asm/smpboot_hooks.h
@@ -17,11 +17,11 @@ static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
         spin_unlock_irqrestore(&rtc_lock, flags);
         local_flush_tlb();
         pr_debug("1.\n");
-        *((volatile unsigned short *)phys_to_virt(apic->trampoline_phys_high)) =
-                                                                 start_eip >> 4;
+        *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) =
+                                                        start_eip >> 4;
         pr_debug("2.\n");
-        *((volatile unsigned short *)phys_to_virt(apic->trampoline_phys_low)) =
-                                                         start_eip & 0xf;
+        *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) =
+                                                        start_eip & 0xf;
         pr_debug("3.\n");
 }
 
@@ -42,7 +42,7 @@ static inline void smpboot_restore_warm_reset_vector(void)
         CMOS_WRITE(0, 0xf);
         spin_unlock_irqrestore(&rtc_lock, flags);
 
-        *((volatile u32 *)phys_to_virt(apic->trampoline_phys_low)) = 0;
+        *((volatile u32 *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = 0;
 }
 
 static inline void __init smpboot_setup_io_apic(void)
diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
index d949ef28c48b..7e7a79ada658 100644
--- a/arch/x86/include/asm/xsave.h
+++ b/arch/x86/include/asm/xsave.h
@@ -52,24 +52,170 @@ extern void xsave_init(void);
 extern void update_regset_xstate_info(unsigned int size, u64 xstate_mask);
 extern int init_fpu(struct task_struct *child);
 
-static inline int fpu_xrstor_checking(struct xsave_struct *fx)
+/* These macros all use (%edi)/(%rdi) as the single memory argument. */
+#define XSAVE           ".byte " REX_PREFIX "0x0f,0xae,0x27"
+#define XSAVEOPT        ".byte " REX_PREFIX "0x0f,0xae,0x37"
+#define XSAVES          ".byte " REX_PREFIX "0x0f,0xc7,0x2f"
+#define XRSTOR          ".byte " REX_PREFIX "0x0f,0xae,0x2f"
+#define XRSTORS         ".byte " REX_PREFIX "0x0f,0xc7,0x1f"
+
+#define xstate_fault    ".section .fixup,\"ax\"\n"      \
+                        "3:  movl $-1,%[err]\n"         \
+                        "    jmp  2b\n"                 \
+                        ".previous\n"                   \
+                        _ASM_EXTABLE(1b, 3b)            \
+                        : [err] "=r" (err)
+
+/*
+ * This function is called only during boot time when x86 caps are not set
+ * up and alternative can not be used yet.
+ */
+static inline int xsave_state_booting(struct xsave_struct *fx, u64 mask)
 {
-        int err;
+        u32 lmask = mask;
+        u32 hmask = mask >> 32;
+        int err = 0;
+
+        WARN_ON(system_state != SYSTEM_BOOTING);
+
+        if (boot_cpu_has(X86_FEATURE_XSAVES))
+                asm volatile("1:"XSAVES"\n\t"
+                        "2:\n\t"
+                        : : "D" (fx), "m" (*fx), "a" (lmask), "d" (hmask)
+                        :   "memory");
+        else
+                asm volatile("1:"XSAVE"\n\t"
+                        "2:\n\t"
+                        : : "D" (fx), "m" (*fx), "a" (lmask), "d" (hmask)
+                        :   "memory");
+
+        asm volatile(xstate_fault
+                     : "0" (0)
+                     : "memory");
+
+        return err;
+}
+
+/*
+ * This function is called only during boot time when x86 caps are not set
+ * up and alternative can not be used yet.
+ */
+static inline int xrstor_state_booting(struct xsave_struct *fx, u64 mask)
+{
+        u32 lmask = mask;
+        u32 hmask = mask >> 32;
+        int err = 0;
+
+        WARN_ON(system_state != SYSTEM_BOOTING);
 
-        asm volatile("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n\t"
-                     "2:\n"
-                     ".section .fixup,\"ax\"\n"
-                     "3:  movl $-1,%[err]\n"
-                     "    jmp  2b\n"
-                     ".previous\n"
-                     _ASM_EXTABLE(1b, 3b)
-                     : [err] "=r" (err)
-                     : "D" (fx), "m" (*fx), "a" (-1), "d" (-1), "0" (0)
+        if (boot_cpu_has(X86_FEATURE_XSAVES))
+                asm volatile("1:"XRSTORS"\n\t"
+                        "2:\n\t"
+                        : : "D" (fx), "m" (*fx), "a" (lmask), "d" (hmask)
+                        :   "memory");
+        else
+                asm volatile("1:"XRSTOR"\n\t"
+                        "2:\n\t"
+                        : : "D" (fx), "m" (*fx), "a" (lmask), "d" (hmask)
+                        :   "memory");
+
+        asm volatile(xstate_fault
+                     : "0" (0)
+                     : "memory");
+
+        return err;
+}
+
+/*
+ * Save processor xstate to xsave area.
+ */
+static inline int xsave_state(struct xsave_struct *fx, u64 mask)
+{
+        u32 lmask = mask;
+        u32 hmask = mask >> 32;
+        int err = 0;
+
+        /*
+         * If xsaves is enabled, xsaves replaces xsaveopt because
+         * it supports compact format and supervisor states in addition to
+         * modified optimization in xsaveopt.
+         *
+         * Otherwise, if xsaveopt is enabled, xsaveopt replaces xsave
+         * because xsaveopt supports modified optimization which is not
+         * supported by xsave.
+         *
+         * If none of xsaves and xsaveopt is enabled, use xsave.
+         */
+        alternative_input_2(
+                "1:"XSAVE,
+                "1:"XSAVEOPT,
+                X86_FEATURE_XSAVEOPT,
+                "1:"XSAVES,
+                X86_FEATURE_XSAVES,
+                [fx] "D" (fx), "a" (lmask), "d" (hmask) :
+                "memory");
+        asm volatile("2:\n\t"
+                     xstate_fault
+                     : "0" (0)
                      : "memory");
 
         return err;
 }
 
+/*
+ * Restore processor xstate from xsave area.
+ */
+static inline int xrstor_state(struct xsave_struct *fx, u64 mask)
+{
+        int err = 0;
+        u32 lmask = mask;
+        u32 hmask = mask >> 32;
+
+        /*
+         * Use xrstors to restore context if it is enabled. xrstors supports
+         * compacted format of xsave area which is not supported by xrstor.
+         */
+        alternative_input(
+                "1: " XRSTOR,
+                "1: " XRSTORS,
+                X86_FEATURE_XSAVES,
+                "D" (fx), "m" (*fx), "a" (lmask), "d" (hmask)
+                : "memory");
+
+        asm volatile("2:\n"
+                     xstate_fault
+                     : "0" (0)
+                     : "memory");
+
+        return err;
+}
+
+/*
+ * Save xstate context for old process during context switch.
+ */
+static inline void fpu_xsave(struct fpu *fpu)
+{
+        xsave_state(&fpu->state->xsave, -1);
+}
+
+/*
+ * Restore xstate context for new process during context switch.
+ */
+static inline int fpu_xrstor_checking(struct xsave_struct *fx)
+{
+        return xrstor_state(fx, -1);
+}
+
+/*
+ * Save xstate to user space xsave area.
+ *
+ * We don't use modified optimization because xrstor/xrstors might track
+ * a different application.
+ *
+ * We don't use compacted format xsave area for
+ * backward compatibility for old applications which don't understand
+ * compacted format of xsave area.
+ */
 static inline int xsave_user(struct xsave_struct __user *buf)
 {
         int err;
@@ -83,69 +229,34 @@ static inline int xsave_user(struct xsave_struct __user *buf)
                 return -EFAULT;
 
         __asm__ __volatile__(ASM_STAC "\n"
-                             "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
+                             "1:"XSAVE"\n"
                              "2: " ASM_CLAC "\n"
-                             ".section .fixup,\"ax\"\n"
-                             "3:  movl $-1,%[err]\n"
-                             "    jmp  2b\n"
-                             ".previous\n"
-                             _ASM_EXTABLE(1b,3b)
-                             : [err] "=r" (err)
+                             xstate_fault
                              : "D" (buf), "a" (-1), "d" (-1), "0" (0)
                              : "memory");
         return err;
 }
 
+/*
+ * Restore xstate from user space xsave area.
+ */
 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
 {
-        int err;
+        int err = 0;
         struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
         u32 lmask = mask;
         u32 hmask = mask >> 32;
 
         __asm__ __volatile__(ASM_STAC "\n"
-                             "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
+                             "1:"XRSTOR"\n"
                              "2: " ASM_CLAC "\n"
-                             ".section .fixup,\"ax\"\n"
-                             "3:  movl $-1,%[err]\n"
-                             "    jmp  2b\n"
-                             ".previous\n"
-                             _ASM_EXTABLE(1b,3b)
-                             : [err] "=r" (err)
+                             xstate_fault
                              : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
                              : "memory");       /* memory required? */
         return err;
 }
 
-static inline void xrstor_state(struct xsave_struct *fx, u64 mask)
-{
-        u32 lmask = mask;
-        u32 hmask = mask >> 32;
-
-        asm volatile(".byte " REX_PREFIX "0x0f,0xae,0x2f\n\t"
-                     : : "D" (fx), "m" (*fx), "a" (lmask), "d" (hmask)
-                     :   "memory");
-}
-
-static inline void xsave_state(struct xsave_struct *fx, u64 mask)
-{
-        u32 lmask = mask;
-        u32 hmask = mask >> 32;
+void *get_xsave_addr(struct xsave_struct *xsave, int xstate);
+void setup_xstate_comp(void);
 
-        asm volatile(".byte " REX_PREFIX "0x0f,0xae,0x27\n\t"
-                     : : "D" (fx), "m" (*fx), "a" (lmask), "d" (hmask)
-                     :   "memory");
-}
-
-static inline void fpu_xsave(struct fpu *fpu)
-{
-        /* This, however, we can work around by forcing the compiler to select
-           an addressing mode that doesn't require extended registers. */
-        alternative_input(
-                ".byte " REX_PREFIX "0x0f,0xae,0x27",
-                ".byte " REX_PREFIX "0x0f,0xae,0x37",
-                X86_FEATURE_XSAVEOPT,
-                [fx] "D" (&fpu->state->xsave), "a" (-1), "d" (-1) :
-                "memory");
-}
 #endif
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h
index eac9e92fe181..e21331ce368f 100644
--- a/arch/x86/include/uapi/asm/msr-index.h
+++ b/arch/x86/include/uapi/asm/msr-index.h
@@ -149,6 +149,9 @@
 
 #define MSR_CORE_C1_RES                 0x00000660
 
+#define MSR_CC6_DEMOTION_POLICY_CONFIG  0x00000668
+#define MSR_MC6_DEMOTION_POLICY_CONFIG  0x00000669
+
 #define MSR_AMD64_MC0_MASK              0xc0010044
 
 #define MSR_IA32_MCx_CTL(x)             (MSR_IA32_MC0_CTL + 4*(x))
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index bde3993624f1..b5ea75c4a4b4 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -118,4 +118,5 @@ ifeq ($(CONFIG_X86_64),y)
 
         obj-$(CONFIG_PCI_MMCONFIG)      += mmconf-fam10h_64.o
         obj-y                           += vsmp_64.o
+        obj-$(CONFIG_KEXEC)             += kexec-bzimage64.o
 endif
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index a531f6564ed0..b436fc735aa4 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -31,6 +31,7 @@
 #include <linux/module.h>
 #include <linux/dmi.h>
 #include <linux/irq.h>
+#include <linux/irqdomain.h>
 #include <linux/slab.h>
 #include <linux/bootmem.h>
 #include <linux/ioport.h>
@@ -43,6 +44,7 @@
 #include <asm/io.h>
 #include <asm/mpspec.h>
 #include <asm/smp.h>
+#include <asm/i8259.h>
 
 #include "sleep.h" /* To include x86_acpi_suspend_lowlevel */
 static int __initdata acpi_force = 0;
@@ -93,44 +95,7 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = {
         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
 };
 
-static unsigned int gsi_to_irq(unsigned int gsi)
-{
-        unsigned int irq = gsi + NR_IRQS_LEGACY;
-        unsigned int i;
-
-        for (i = 0; i < NR_IRQS_LEGACY; i++) {
-                if (isa_irq_to_gsi[i] == gsi) {
-                        return i;
-                }
-        }
-
-        /* Provide an identity mapping of gsi == irq
-         * except on truly weird platforms that have
-         * non isa irqs in the first 16 gsis.
-         */
-        if (gsi >= NR_IRQS_LEGACY)
-                irq = gsi;
-        else
-                irq = gsi_top + gsi;
-
-        return irq;
-}
-
-static u32 irq_to_gsi(int irq)
-{
-        unsigned int gsi;
-
-        if (irq < NR_IRQS_LEGACY)
-                gsi = isa_irq_to_gsi[irq];
-        else if (irq < gsi_top)
-                gsi = irq;
-        else if (irq < (gsi_top + NR_IRQS_LEGACY))
-                gsi = irq - gsi_top;
-        else
-                gsi = 0xffffffff;
-
-        return gsi;
-}
+#define ACPI_INVALID_GSI                INT_MIN
 
 /*
  * This is just a simple wrapper around early_ioremap(),
@@ -341,11 +306,145 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e
 #endif                          /*CONFIG_X86_LOCAL_APIC */
 
 #ifdef CONFIG_X86_IO_APIC
+#define MP_ISA_BUS              0
+
+static void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
+                                          u32 gsi)
+{
+        int ioapic;
+        int pin;
+        struct mpc_intsrc mp_irq;
+
+        /*
+         * Convert 'gsi' to 'ioapic.pin'.
+         */
+        ioapic = mp_find_ioapic(gsi);
+        if (ioapic < 0)
+                return;
+        pin = mp_find_ioapic_pin(ioapic, gsi);
+
+        /*
+         * TBD: This check is for faulty timer entries, where the override
+         *      erroneously sets the trigger to level, resulting in a HUGE
+         *      increase of timer interrupts!
+         */
+        if ((bus_irq == 0) && (trigger == 3))
+                trigger = 1;
+
+        mp_irq.type = MP_INTSRC;
+        mp_irq.irqtype = mp_INT;
+        mp_irq.irqflag = (trigger << 2) | polarity;
+        mp_irq.srcbus = MP_ISA_BUS;
+        mp_irq.srcbusirq = bus_irq;     /* IRQ */
+        mp_irq.dstapic = mpc_ioapic_id(ioapic); /* APIC ID */
+        mp_irq.dstirq = pin;    /* INTIN# */
+
+        mp_save_irq(&mp_irq);
+
+        /*
+         * Reset default identity mapping if gsi is also an legacy IRQ,
+         * otherwise there will be more than one entry with the same GSI
+         * and acpi_isa_irq_to_gsi() may give wrong result.
+         */
+        if (gsi < nr_legacy_irqs() && isa_irq_to_gsi[gsi] == gsi)
+                isa_irq_to_gsi[gsi] = ACPI_INVALID_GSI;
+        isa_irq_to_gsi[bus_irq] = gsi;
+}
+
+static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
+                        int polarity)
+{
+#ifdef CONFIG_X86_MPPARSE
+        struct mpc_intsrc mp_irq;
+        struct pci_dev *pdev;
+        unsigned char number;
+        unsigned int devfn;
+        int ioapic;
+        u8 pin;
+
+        if (!acpi_ioapic)
+                return 0;
+        if (!dev || !dev_is_pci(dev))
+                return 0;
+
+        pdev = to_pci_dev(dev);
+        number = pdev->bus->number;
+        devfn = pdev->devfn;
+        pin = pdev->pin;
+        /* print the entry should happen on mptable identically */
+        mp_irq.type = MP_INTSRC;
+        mp_irq.irqtype = mp_INT;
+        mp_irq.irqflag = (trigger == ACPI_EDGE_SENSITIVE ? 4 : 0x0c) |
+                                (polarity == ACPI_ACTIVE_HIGH ? 1 : 3);
+        mp_irq.srcbus = number;
+        mp_irq.srcbusirq = (((devfn >> 3) & 0x1f) << 2) | ((pin - 1) & 3);
+        ioapic = mp_find_ioapic(gsi);
+        mp_irq.dstapic = mpc_ioapic_id(ioapic);
+        mp_irq.dstirq = mp_find_ioapic_pin(ioapic, gsi);
+
+        mp_save_irq(&mp_irq);
+#endif
+        return 0;
+}
+
+static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
+                           int polarity)
+{
+        int irq, node;
+
+        if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
+                return gsi;
+
+        /* Don't set up the ACPI SCI because it's already set up */
+        if (acpi_gbl_FADT.sci_interrupt == gsi)
+                return gsi;
+
+        trigger = trigger == ACPI_EDGE_SENSITIVE ? 0 : 1;
+        polarity = polarity == ACPI_ACTIVE_HIGH ? 0 : 1;
+        node = dev ? dev_to_node(dev) : NUMA_NO_NODE;
+        if (mp_set_gsi_attr(gsi, trigger, polarity, node)) {
+                pr_warn("Failed to set pin attr for GSI%d\n", gsi);
+                return -1;
+        }
+
+        irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC);
+        if (irq < 0)
+                return irq;
+
+        if (enable_update_mptable)
+                mp_config_acpi_gsi(dev, gsi, trigger, polarity);
+
+        return irq;
+}
+
+static void mp_unregister_gsi(u32 gsi)
+{
+        int irq;
+
+        if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
+                return;
+
+        if (acpi_gbl_FADT.sci_interrupt == gsi)
+                return;
+
+        irq = mp_map_gsi_to_irq(gsi, 0);
+        if (irq > 0)
+                mp_unmap_irq(irq);
+}
+
+static struct irq_domain_ops acpi_irqdomain_ops = {
+        .map = mp_irqdomain_map,
+        .unmap = mp_irqdomain_unmap,
+};
 
 static int __init
 acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)
 {
         struct acpi_madt_io_apic *ioapic = NULL;
+        struct ioapic_domain_cfg cfg = {
+                .type = IOAPIC_DOMAIN_DYNAMIC,
+                .ops = &acpi_irqdomain_ops,
+        };
 
         ioapic = (struct acpi_madt_io_apic *)header;
 
@@ -354,8 +453,12 @@ acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)
 
         acpi_table_print_madt_entry(header);
 
-        mp_register_ioapic(ioapic->id,
-                           ioapic->address, ioapic->global_irq_base);
+        /* Statically assign IRQ numbers for IOAPICs hosting legacy IRQs */
+        if (ioapic->global_irq_base < nr_legacy_irqs())
+                cfg.type = IOAPIC_DOMAIN_LEGACY;
+
+        mp_register_ioapic(ioapic->id, ioapic->address, ioapic->global_irq_base,
+                           &cfg);
 
         return 0;
 }
@@ -378,11 +481,6 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger,
         if (acpi_sci_flags & ACPI_MADT_POLARITY_MASK)
                 polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK;
 
-        /*
-         * mp_config_acpi_legacy_irqs() already setup IRQs < 16
-         * If GSI is < 16, this will update its flags,
-         * else it will create a new mp_irqs[] entry.
-         */
         mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);
 
         /*
@@ -504,25 +602,28 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
         outb(new >> 8, 0x4d1);
 }
 
-int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
+int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)
 {
-        *irq = gsi_to_irq(gsi);
+        int irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);
 
-#ifdef CONFIG_X86_IO_APIC
-        if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC)
-                setup_IO_APIC_irq_extra(gsi);
-#endif
+        if (irq >= 0) {
+                *irqp = irq;
+                return 0;
+        }
 
-        return 0;
+        return -1;
 }
 EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
 
 int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
 {
-        if (isa_irq >= 16)
-                return -1;
-        *gsi = irq_to_gsi(isa_irq);
-        return 0;
+        if (isa_irq < nr_legacy_irqs() &&
+            isa_irq_to_gsi[isa_irq] != ACPI_INVALID_GSI) {
+                *gsi = isa_irq_to_gsi[isa_irq];
+                return 0;
+        }
+
+        return -1;
 }
 
 static int acpi_register_gsi_pic(struct device *dev, u32 gsi,
@@ -542,15 +643,25 @@ static int acpi_register_gsi_pic(struct device *dev, u32 gsi,
 static int acpi_register_gsi_ioapic(struct device *dev, u32 gsi,
                                     int trigger, int polarity)
 {
+        int irq = gsi;
+
 #ifdef CONFIG_X86_IO_APIC
-        gsi = mp_register_gsi(dev, gsi, trigger, polarity);
+        irq = mp_register_gsi(dev, gsi, trigger, polarity);
 #endif
 
-        return gsi;
+        return irq;
+}
+
+static void acpi_unregister_gsi_ioapic(u32 gsi)
+{
+#ifdef CONFIG_X86_IO_APIC
+        mp_unregister_gsi(gsi);
+#endif
 }
 
 int (*__acpi_register_gsi)(struct device *dev, u32 gsi,
                            int trigger, int polarity) = acpi_register_gsi_pic;
+void (*__acpi_unregister_gsi)(u32 gsi) = NULL;
 
 #ifdef CONFIG_ACPI_SLEEP
 int (*acpi_suspend_lowlevel)(void) = x86_acpi_suspend_lowlevel;
@@ -564,32 +675,22 @@ int (*acpi_suspend_lowlevel)(void);
  */
 int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)
 {
-        unsigned int irq;
-        unsigned int plat_gsi = gsi;
-
-        plat_gsi = (*__acpi_register_gsi)(dev, gsi, trigger, polarity);
-        irq = gsi_to_irq(plat_gsi);
-
-        return irq;
+        return __acpi_register_gsi(dev, gsi, trigger, polarity);
 }
 EXPORT_SYMBOL_GPL(acpi_register_gsi);
 
 void acpi_unregister_gsi(u32 gsi)
 {
+        if (__acpi_unregister_gsi)
+                __acpi_unregister_gsi(gsi);
 }
 EXPORT_SYMBOL_GPL(acpi_unregister_gsi);
 
-void __init acpi_set_irq_model_pic(void)
-{
-        acpi_irq_model = ACPI_IRQ_MODEL_PIC;
-        __acpi_register_gsi = acpi_register_gsi_pic;
-        acpi_ioapic = 0;
-}
-
-void __init acpi_set_irq_model_ioapic(void)
+static void __init acpi_set_irq_model_ioapic(void)
 {
         acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC;
         __acpi_register_gsi = acpi_register_gsi_ioapic;
+        __acpi_unregister_gsi = acpi_unregister_gsi_ioapic;
         acpi_ioapic = 1;
 }
 
@@ -825,9 +926,8 @@ static int __init early_acpi_parse_madt_lapic_addr_ovr(void)
          * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
          */
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
-                                  acpi_parse_lapic_addr_ovr, 0);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
+                                      acpi_parse_lapic_addr_ovr, 0);
         if (count < 0) {
                 printk(KERN_ERR PREFIX
                        "Error parsing LAPIC address override entry\n");
@@ -852,9 +952,8 @@ static int __init acpi_parse_madt_lapic_entries(void)
          * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
          */
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
-                                  acpi_parse_lapic_addr_ovr, 0);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
+                                      acpi_parse_lapic_addr_ovr, 0);
         if (count < 0) {
                 printk(KERN_ERR PREFIX
                        "Error parsing LAPIC address override entry\n");
@@ -882,11 +981,10 @@ static int __init acpi_parse_madt_lapic_entries(void)
                 return count;
         }
 
-        x2count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC_NMI,
-                                  acpi_parse_x2apic_nmi, 0);
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI, acpi_parse_lapic_nmi, 0);
+        x2count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC_NMI,
+                                        acpi_parse_x2apic_nmi, 0);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI,
+                                      acpi_parse_lapic_nmi, 0);
         if (count < 0 || x2count < 0) {
                 printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
                 /* TBD: Cleanup to allow fallback to MPS */
@@ -897,44 +995,7 @@ static int __init acpi_parse_madt_lapic_entries(void)
 #endif                          /* CONFIG_X86_LOCAL_APIC */
 
 #ifdef  CONFIG_X86_IO_APIC
-#define MP_ISA_BUS              0
-
-void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
-{
-        int ioapic;
-        int pin;
-        struct mpc_intsrc mp_irq;
-
-        /*
-         * Convert 'gsi' to 'ioapic.pin'.
-         */
-        ioapic = mp_find_ioapic(gsi);
-        if (ioapic < 0)
-                return;
-        pin = mp_find_ioapic_pin(ioapic, gsi);
-
-        /*
-         * TBD: This check is for faulty timer entries, where the override
-         *      erroneously sets the trigger to level, resulting in a HUGE
-         *      increase of timer interrupts!
-         */
-        if ((bus_irq == 0) && (trigger == 3))
-                trigger = 1;
-
-        mp_irq.type = MP_INTSRC;
-        mp_irq.irqtype = mp_INT;
-        mp_irq.irqflag = (trigger << 2) | polarity;
-        mp_irq.srcbus = MP_ISA_BUS;
-        mp_irq.srcbusirq = bus_irq;     /* IRQ */
-        mp_irq.dstapic = mpc_ioapic_id(ioapic); /* APIC ID */
-        mp_irq.dstirq = pin;    /* INTIN# */
-
-        mp_save_irq(&mp_irq);
-
-        isa_irq_to_gsi[bus_irq] = gsi;
-}
-
-void __init mp_config_acpi_legacy_irqs(void)
+static void __init mp_config_acpi_legacy_irqs(void)
 {
         int i;
         struct mpc_intsrc mp_irq;
@@ -952,7 +1013,7 @@ void __init mp_config_acpi_legacy_irqs(void)
          * Use the default configuration for the IRQs 0-15.  Unless
          * overridden by (MADT) interrupt source override entries.
          */
-        for (i = 0; i < 16; i++) {
+        for (i = 0; i < nr_legacy_irqs(); i++) {
                 int ioapic, pin;
                 unsigned int dstapic;
                 int idx;
@@ -1000,84 +1061,6 @@ void __init mp_config_acpi_legacy_irqs(void)
         }
 }
 
-static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
-                        int polarity)
-{
-#ifdef CONFIG_X86_MPPARSE
-        struct mpc_intsrc mp_irq;
-        struct pci_dev *pdev;
-        unsigned char number;
-        unsigned int devfn;
-        int ioapic;
-        u8 pin;
-
-        if (!acpi_ioapic)
-                return 0;
-        if (!dev || !dev_is_pci(dev))
-                return 0;
-
-        pdev = to_pci_dev(dev);
-        number = pdev->bus->number;
-        devfn = pdev->devfn;
-        pin = pdev->pin;
-        /* print the entry should happen on mptable identically */
-        mp_irq.type = MP_INTSRC;
-        mp_irq.irqtype = mp_INT;
-        mp_irq.irqflag = (trigger == ACPI_EDGE_SENSITIVE ? 4 : 0x0c) |
-                                (polarity == ACPI_ACTIVE_HIGH ? 1 : 3);
-        mp_irq.srcbus = number;
-        mp_irq.srcbusirq = (((devfn >> 3) & 0x1f) << 2) | ((pin - 1) & 3);
-        ioapic = mp_find_ioapic(gsi);
-        mp_irq.dstapic = mpc_ioapic_id(ioapic);
-        mp_irq.dstirq = mp_find_ioapic_pin(ioapic, gsi);
-
-        mp_save_irq(&mp_irq);
-#endif
-        return 0;
-}
-
-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;
-
-        /* Don't set up the ACPI SCI because it's already set up */
-        if (acpi_gbl_FADT.sci_interrupt == gsi)
-                return gsi;
-
-        ioapic = mp_find_ioapic(gsi);
-        if (ioapic < 0) {
-                printk(KERN_WARNING "No IOAPIC for GSI %u\n", gsi);
-                return gsi;
-        }
-
-        ioapic_pin = mp_find_ioapic_pin(ioapic, gsi);
-
-        if (ioapic_pin > MP_MAX_IOAPIC_PIN) {
-                printk(KERN_ERR "Invalid reference to IOAPIC pin "
-                       "%d-%d\n", mpc_ioapic_id(ioapic),
-                       ioapic_pin);
-                return gsi;
-        }
-
-        if (enable_update_mptable)
-                mp_config_acpi_gsi(dev, gsi, trigger, polarity);
-
-        set_io_apic_irq_attr(&irq_attr, ioapic, ioapic_pin,
-                             trigger == ACPI_EDGE_SENSITIVE ? 0 : 1,
-                             polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
-        ret = io_apic_set_pci_routing(dev, gsi_to_irq(gsi), &irq_attr);
-        if (ret < 0)
-                gsi = INT_MIN;
-
-        return gsi;
-}
-
 /*
  * Parse IOAPIC related entries in MADT
  * returns 0 on success, < 0 on error
@@ -1107,9 +1090,8 @@ static int __init acpi_parse_madt_ioapic_entries(void)
                 return -ENODEV;
         }
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_IO_APIC, acpi_parse_ioapic,
-                                  MAX_IO_APICS);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_IO_APIC, acpi_parse_ioapic,
+                                      MAX_IO_APICS);
         if (!count) {
                 printk(KERN_ERR PREFIX "No IOAPIC entries present\n");
                 return -ENODEV;
@@ -1118,9 +1100,8 @@ static int __init acpi_parse_madt_ioapic_entries(void)
                 return count;
         }
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr,
-                                  nr_irqs);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE,
+                                      acpi_parse_int_src_ovr, nr_irqs);
         if (count < 0) {
                 printk(KERN_ERR PREFIX
                        "Error parsing interrupt source overrides entry\n");
@@ -1139,9 +1120,8 @@ static int __init acpi_parse_madt_ioapic_entries(void)
         /* Fill in identity legacy mappings where no override */
         mp_config_acpi_legacy_irqs();
 
-        count =
-            acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE, acpi_parse_nmi_src,
-                                  nr_irqs);
+        count = acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE,
+                                      acpi_parse_nmi_src, nr_irqs);
         if (count < 0) {
                 printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
                 /* TBD: Cleanup to allow fallback to MPS */
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index ad28db7e6bde..67760275544b 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -67,7 +67,7 @@ EXPORT_SYMBOL_GPL(boot_cpu_physical_apicid);
 /*
  * The highest APIC ID seen during enumeration.
  */
-unsigned int max_physical_apicid;
+static unsigned int max_physical_apicid;
 
 /*
  * Bitmask of physically existing CPUs:
@@ -1342,17 +1342,6 @@ void setup_local_APIC(void)
         /* always use the value from LDR */
         early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
                 logical_smp_processor_id();
-
-        /*
-         * Some NUMA implementations (NUMAQ) don't initialize apicid to
-         * node mapping during NUMA init.  Now that logical apicid is
-         * guaranteed to be known, give it another chance.  This is already
-         * a bit too late - percpu allocation has already happened without
-         * proper NUMA affinity.
-         */
-        if (apic->x86_32_numa_cpu_node)
-                set_apicid_to_node(early_per_cpu(x86_cpu_to_apicid, cpu),
-                                   apic->x86_32_numa_cpu_node(cpu));
 #endif
 
         /*
@@ -2053,8 +2042,6 @@ void __init connect_bsp_APIC(void)
                 imcr_pic_to_apic();
         }
 #endif
-        if (apic->enable_apic_mode)
-                apic->enable_apic_mode();
 }
 
 /**
@@ -2451,51 +2438,6 @@ static void apic_pm_activate(void) { }
 
 #ifdef CONFIG_X86_64
 
-static int apic_cluster_num(void)
-{
-        int i, clusters, zeros;
-        unsigned id;
-        u16 *bios_cpu_apicid;
-        DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
-
-        bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
-        bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
-
-        for (i = 0; i < nr_cpu_ids; i++) {
-                /* are we being called early in kernel startup? */
-                if (bios_cpu_apicid) {
-                        id = bios_cpu_apicid[i];
-                } else if (i < nr_cpu_ids) {
-                        if (cpu_present(i))
-                                id = per_cpu(x86_bios_cpu_apicid, i);
-                        else
-                                continue;
-                } else
-                        break;
-
-                if (id != BAD_APICID)
-                        __set_bit(APIC_CLUSTERID(id), clustermap);
-        }
-
-        /* Problem:  Partially populated chassis may not have CPUs in some of
-         * the APIC clusters they have been allocated.  Only present CPUs have
-         * x86_bios_cpu_apicid entries, thus causing zeroes in the bitmap.
-         * Since clusters are allocated sequentially, count zeros only if
-         * they are bounded by ones.
-         */
-        clusters = 0;
-        zeros = 0;
-        for (i = 0; i < NUM_APIC_CLUSTERS; i++) {
-                if (test_bit(i, clustermap)) {
-                        clusters += 1 + zeros;
-                        zeros = 0;
-                } else
-                        ++zeros;
-        }
-
-        return clusters;
-}
-
 static int multi_checked;
 static int multi;
 
@@ -2540,20 +2482,7 @@ static void dmi_check_multi(void)
 int apic_is_clustered_box(void)
 {
         dmi_check_multi();
-        if (multi)
-                return 1;
-
-        if (!is_vsmp_box())
-                return 0;
-
-        /*
-         * ScaleMP vSMPowered boxes have one cluster per board and TSCs are
-         * not guaranteed to be synced between boards
-         */
-        if (apic_cluster_num() > 1)
-                return 1;
-
-        return 0;
+        return multi;
 }
 #endif
 
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 7c1b29479513..de918c410eae 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -168,21 +168,16 @@ static struct apic apic_flat =  {
         .disable_esr                    = 0,
         .dest_logical                   = APIC_DEST_LOGICAL,
         .check_apicid_used              = NULL,
-        .check_apicid_present           = NULL,
 
         .vector_allocation_domain       = flat_vector_allocation_domain,
         .init_apic_ldr                  = flat_init_apic_ldr,
 
         .ioapic_phys_id_map             = NULL,
         .setup_apic_routing             = NULL,
-        .multi_timer_check              = NULL,
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
         .apicid_to_cpu_present          = NULL,
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = flat_phys_pkg_id,
-        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = flat_get_apic_id,
         .set_apic_id                    = set_apic_id,
@@ -196,10 +191,7 @@ static struct apic apic_flat =  {
         .send_IPI_all                   = flat_send_IPI_all,
         .send_IPI_self                  = apic_send_IPI_self,
 
-        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = false,
-        .smp_callin_clear_local_apic    = NULL,
         .inquire_remote_apic            = default_inquire_remote_apic,
 
         .read                           = native_apic_mem_read,
@@ -283,7 +275,6 @@ static struct apic apic_physflat =  {
         .disable_esr                    = 0,
         .dest_logical                   = 0,
         .check_apicid_used              = NULL,
-        .check_apicid_present           = NULL,
 
         .vector_allocation_domain       = default_vector_allocation_domain,
         /* not needed, but shouldn't hurt: */
@@ -291,14 +282,10 @@ static struct apic apic_physflat =  {
 
         .ioapic_phys_id_map             = NULL,
         .setup_apic_routing             = NULL,
-        .multi_timer_check              = NULL,
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
         .apicid_to_cpu_present          = NULL,
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = flat_phys_pkg_id,
-        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = flat_get_apic_id,
         .set_apic_id                    = set_apic_id,
@@ -312,10 +299,7 @@ static struct apic apic_physflat =  {
         .send_IPI_all                   = physflat_send_IPI_all,
         .send_IPI_self                  = apic_send_IPI_self,
 
-        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = false,
-        .smp_callin_clear_local_apic    = NULL,
         .inquire_remote_apic            = default_inquire_remote_apic,
 
         .read                           = native_apic_mem_read,
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 8c7c98249c20..b205cdbdbe6a 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -89,16 +89,6 @@ static const struct cpumask *noop_target_cpus(void)
         return cpumask_of(0);
 }
 
-static unsigned long noop_check_apicid_used(physid_mask_t *map, int apicid)
-{
-        return physid_isset(apicid, *map);
-}
-
-static unsigned long noop_check_apicid_present(int bit)
-{
-        return physid_isset(bit, phys_cpu_present_map);
-}
-
 static void noop_vector_allocation_domain(int cpu, struct cpumask *retmask,
                                           const struct cpumask *mask)
 {
@@ -133,27 +123,21 @@ struct apic apic_noop = {
         .target_cpus                    = noop_target_cpus,
         .disable_esr                    = 0,
         .dest_logical                   = APIC_DEST_LOGICAL,
-        .check_apicid_used              = noop_check_apicid_used,
-        .check_apicid_present           = noop_check_apicid_present,
+        .check_apicid_used              = default_check_apicid_used,
 
         .vector_allocation_domain       = noop_vector_allocation_domain,
         .init_apic_ldr                  = noop_init_apic_ldr,
 
         .ioapic_phys_id_map             = default_ioapic_phys_id_map,
         .setup_apic_routing             = NULL,
-        .multi_timer_check              = NULL,
 
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
         .apicid_to_cpu_present          = physid_set_mask_of_physid,
 
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
 
         .phys_pkg_id                    = noop_phys_pkg_id,
 
-        .mps_oem_check                  = NULL,
-
         .get_apic_id                    = noop_get_apic_id,
         .set_apic_id                    = NULL,
         .apic_id_mask                   = 0x0F << 24,
@@ -168,12 +152,7 @@ struct apic apic_noop = {
 
         .wakeup_secondary_cpu           = noop_wakeup_secondary_cpu,
 
-        /* should be safe */
-        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
-
         .wait_for_init_deassert         = false,
-        .smp_callin_clear_local_apic    = NULL,
         .inquire_remote_apic            = NULL,
 
         .read                           = noop_apic_read,
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index a5b45df8bc88..ae915391ebec 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -217,21 +217,16 @@ static const struct apic apic_numachip __refconst = {
         .disable_esr                    = 0,
         .dest_logical                   = 0,
         .check_apicid_used              = NULL,
-        .check_apicid_present           = NULL,
 
         .vector_allocation_domain       = default_vector_allocation_domain,
         .init_apic_ldr                  = flat_init_apic_ldr,
 
         .ioapic_phys_id_map             = NULL,
         .setup_apic_routing             = NULL,
-        .multi_timer_check              = NULL,
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
         .apicid_to_cpu_present          = NULL,
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = numachip_phys_pkg_id,
-        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = get_apic_id,
         .set_apic_id                    = set_apic_id,
@@ -246,10 +241,7 @@ static const struct apic apic_numachip __refconst = {
         .send_IPI_self                  = numachip_send_IPI_self,
 
         .wakeup_secondary_cpu           = numachip_wakeup_secondary,
-        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = false,
-        .smp_callin_clear_local_apic    = NULL,
         .inquire_remote_apic            = NULL, /* REMRD not supported */
 
         .read                           = native_apic_mem_read,
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index e4840aa7a255..c4a8d63f8220 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -31,11 +31,6 @@ static unsigned long bigsmp_check_apicid_used(physid_mask_t *map, int apicid)
         return 0;
 }
 
-static unsigned long bigsmp_check_apicid_present(int bit)
-{
-        return 1;
-}
-
 static int bigsmp_early_logical_apicid(int cpu)
 {
         /* on bigsmp, logical apicid is the same as physical */
@@ -168,21 +163,16 @@ static struct apic apic_bigsmp = {
         .disable_esr                    = 1,
         .dest_logical                   = 0,
         .check_apicid_used              = bigsmp_check_apicid_used,
-        .check_apicid_present           = bigsmp_check_apicid_present,
 
         .vector_allocation_domain       = default_vector_allocation_domain,
         .init_apic_ldr                  = bigsmp_init_apic_ldr,
 
         .ioapic_phys_id_map             = bigsmp_ioapic_phys_id_map,
         .setup_apic_routing             = bigsmp_setup_apic_routing,
-        .multi_timer_check              = NULL,
         .cpu_present_to_apicid          = bigsmp_cpu_present_to_apicid,
         .apicid_to_cpu_present          = physid_set_mask_of_physid,
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = bigsmp_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = bigsmp_phys_pkg_id,
-        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = bigsmp_get_apic_id,
         .set_apic_id                    = NULL,
@@ -196,11 +186,7 @@ static struct apic apic_bigsmp = {
         .send_IPI_all                   = bigsmp_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
-
         .wait_for_init_deassert         = true,
-        .smp_callin_clear_local_apic    = NULL,
         .inquire_remote_apic            = default_inquire_remote_apic,
 
         .read                           = native_apic_mem_read,
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 81e08eff05ee..29290f554e79 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -31,6 +31,7 @@
 #include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/syscore_ops.h>
+#include <linux/irqdomain.h>
 #include <linux/msi.h>
 #include <linux/htirq.h>
 #include <linux/freezer.h>
@@ -62,6 +63,16 @@
 
 #define __apicdebuginit(type) static type __init
 
+#define for_each_ioapic(idx)            \
+        for ((idx) = 0; (idx) < nr_ioapics; (idx)++)
+#define for_each_ioapic_reverse(idx)    \
+        for ((idx) = nr_ioapics - 1; (idx) >= 0; (idx)--)
+#define for_each_pin(idx, pin)          \
+        for ((pin) = 0; (pin) < ioapics[(idx)].nr_registers; (pin)++)
+#define for_each_ioapic_pin(idx, pin)   \
+        for_each_ioapic((idx))          \
+                for_each_pin((idx), (pin))
+
 #define for_each_irq_pin(entry, head) \
         for (entry = head; entry; entry = entry->next)
 
@@ -73,6 +84,17 @@ int sis_apic_bug = -1;
 
 static DEFINE_RAW_SPINLOCK(ioapic_lock);
 static DEFINE_RAW_SPINLOCK(vector_lock);
+static DEFINE_MUTEX(ioapic_mutex);
+static unsigned int ioapic_dynirq_base;
+static int ioapic_initialized;
+
+struct mp_pin_info {
+        int trigger;
+        int polarity;
+        int node;
+        int set;
+        u32 count;
+};
 
 static struct ioapic {
         /*
@@ -87,7 +109,9 @@ static struct ioapic {
         struct mpc_ioapic mp_config;
         /* IO APIC gsi routing info */
         struct mp_ioapic_gsi  gsi_config;
-        DECLARE_BITMAP(pin_programmed, MP_MAX_IOAPIC_PIN + 1);
+        struct ioapic_domain_cfg irqdomain_cfg;
+        struct irq_domain *irqdomain;
+        struct mp_pin_info *pin_info;
 } ioapics[MAX_IO_APICS];
 
 #define mpc_ioapic_ver(ioapic_idx)      ioapics[ioapic_idx].mp_config.apicver
@@ -107,6 +131,41 @@ struct mp_ioapic_gsi *mp_ioapic_gsi_routing(int ioapic_idx)
         return &ioapics[ioapic_idx].gsi_config;
 }
 
+static inline int mp_ioapic_pin_count(int ioapic)
+{
+        struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(ioapic);
+
+        return gsi_cfg->gsi_end - gsi_cfg->gsi_base + 1;
+}
+
+u32 mp_pin_to_gsi(int ioapic, int pin)
+{
+        return mp_ioapic_gsi_routing(ioapic)->gsi_base + pin;
+}
+
+/*
+ * Initialize all legacy IRQs and all pins on the first IOAPIC
+ * if we have legacy interrupt controller. Kernel boot option "pirq="
+ * may rely on non-legacy pins on the first IOAPIC.
+ */
+static inline int mp_init_irq_at_boot(int ioapic, int irq)
+{
+        if (!nr_legacy_irqs())
+                return 0;
+
+        return ioapic == 0 || (irq >= 0 && irq < nr_legacy_irqs());
+}
+
+static inline struct mp_pin_info *mp_pin_info(int ioapic_idx, int pin)
+{
+        return ioapics[ioapic_idx].pin_info + pin;
+}
+
+static inline struct irq_domain *mp_ioapic_irqdomain(int ioapic)
+{
+        return ioapics[ioapic].irqdomain;
+}
+
 int nr_ioapics;
 
 /* The one past the highest gsi number used */
@@ -118,9 +177,6 @@ struct mpc_intsrc mp_irqs[MAX_IRQ_SOURCES];
 /* # of MP IRQ source entries */
 int mp_irq_entries;
 
-/* GSI interrupts */
-static int nr_irqs_gsi = NR_IRQS_LEGACY;
-
 #ifdef CONFIG_EISA
 int mp_bus_id_to_type[MAX_MP_BUSSES];
 #endif
@@ -149,8 +205,7 @@ static int __init parse_noapic(char *str)
 }
 early_param("noapic", parse_noapic);
 
-static int io_apic_setup_irq_pin(unsigned int irq, int node,
-                                 struct io_apic_irq_attr *attr);
+static struct irq_cfg *alloc_irq_and_cfg_at(unsigned int at, int node);
 
 /* Will be called in mpparse/acpi/sfi codes for saving IRQ info */
 void mp_save_irq(struct mpc_intsrc *m)
@@ -182,19 +237,15 @@ static struct irq_pin_list *alloc_irq_pin_list(int node)
         return kzalloc_node(sizeof(struct irq_pin_list), GFP_KERNEL, node);
 }
 
-
-/* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */
-static struct irq_cfg irq_cfgx[NR_IRQS_LEGACY];
-
 int __init arch_early_irq_init(void)
 {
         struct irq_cfg *cfg;
-        int count, node, i;
+        int i, node = cpu_to_node(0);
 
-        if (!legacy_pic->nr_legacy_irqs)
+        if (!nr_legacy_irqs())
                 io_apic_irqs = ~0UL;
 
-        for (i = 0; i < nr_ioapics; i++) {
+        for_each_ioapic(i) {
                 ioapics[i].saved_registers =
                         kzalloc(sizeof(struct IO_APIC_route_entry) *
                                 ioapics[i].nr_registers, GFP_KERNEL);
@@ -202,28 +253,20 @@ int __init arch_early_irq_init(void)
                         pr_err("IOAPIC %d: suspend/resume impossible!\n", i);
         }
 
-        cfg = irq_cfgx;
-        count = ARRAY_SIZE(irq_cfgx);
-        node = cpu_to_node(0);
-
-        for (i = 0; i < count; i++) {
-                irq_set_chip_data(i, &cfg[i]);
-                zalloc_cpumask_var_node(&cfg[i].domain, GFP_KERNEL, node);
-                zalloc_cpumask_var_node(&cfg[i].old_domain, GFP_KERNEL, node);
-                /*
-                 * For legacy IRQ's, start with assigning irq0 to irq15 to
-                 * IRQ0_VECTOR to IRQ15_VECTOR for all cpu's.
-                 */
-                if (i < legacy_pic->nr_legacy_irqs) {
-                        cfg[i].vector = IRQ0_VECTOR + i;
-                        cpumask_setall(cfg[i].domain);
-                }
+        /*
+         * For legacy IRQ's, start with assigning irq0 to irq15 to
+         * IRQ0_VECTOR to IRQ15_VECTOR for all cpu's.
+         */
+        for (i = 0; i < nr_legacy_irqs(); i++) {
+                cfg = alloc_irq_and_cfg_at(i, node);
+                cfg->vector = IRQ0_VECTOR + i;
+                cpumask_setall(cfg->domain);
         }
 
         return 0;
 }
 
-static struct irq_cfg *irq_cfg(unsigned int irq)
+static inline struct irq_cfg *irq_cfg(unsigned int irq)
 {
         return irq_get_chip_data(irq);
 }
@@ -265,7 +308,7 @@ static struct irq_cfg *alloc_irq_and_cfg_at(unsigned int at, int node)
         if (res < 0) {
                 if (res != -EEXIST)
                         return NULL;
-                cfg = irq_get_chip_data(at);
+                cfg = irq_cfg(at);
                 if (cfg)
                         return cfg;
         }
@@ -425,6 +468,21 @@ static int __add_pin_to_irq_node(struct irq_cfg *cfg, int node, int apic, int pi
         return 0;
 }
 
+static void __remove_pin_from_irq(struct irq_cfg *cfg, int apic, int pin)
+{
+        struct irq_pin_list **last, *entry;
+
+        last = &cfg->irq_2_pin;
+        for_each_irq_pin(entry, cfg->irq_2_pin)
+                if (entry->apic == apic && entry->pin == pin) {
+                        *last = entry->next;
+                        kfree(entry);
+                        return;
+                } else {
+                        last = &entry->next;
+                }
+}
+
 static void add_pin_to_irq_node(struct irq_cfg *cfg, int node, int apic, int pin)
 {
         if (__add_pin_to_irq_node(cfg, node, apic, pin))
@@ -627,9 +685,8 @@ static void clear_IO_APIC (void)
 {
         int apic, pin;
 
-        for (apic = 0; apic < nr_ioapics; apic++)
-                for (pin = 0; pin < ioapics[apic].nr_registers; pin++)
-                        clear_IO_APIC_pin(apic, pin);
+        for_each_ioapic_pin(apic, pin)
+                clear_IO_APIC_pin(apic, pin);
 }
 
 #ifdef CONFIG_X86_32
@@ -678,13 +735,13 @@ int save_ioapic_entries(void)
         int apic, pin;
         int err = 0;
 
-        for (apic = 0; apic < nr_ioapics; apic++) {
+        for_each_ioapic(apic) {
                 if (!ioapics[apic].saved_registers) {
                         err = -ENOMEM;
                         continue;
                 }
 
-                for (pin = 0; pin < ioapics[apic].nr_registers; pin++)
+                for_each_pin(apic, pin)
                         ioapics[apic].saved_registers[pin] =
                                 ioapic_read_entry(apic, pin);
         }
@@ -699,11 +756,11 @@ void mask_ioapic_entries(void)
 {
         int apic, pin;
 
-        for (apic = 0; apic < nr_ioapics; apic++) {
+        for_each_ioapic(apic) {
                 if (!ioapics[apic].saved_registers)
                         continue;
 
-                for (pin = 0; pin < ioapics[apic].nr_registers; pin++) {
+                for_each_pin(apic, pin) {
                         struct IO_APIC_route_entry entry;
 
                         entry = ioapics[apic].saved_registers[pin];
@@ -722,11 +779,11 @@ int restore_ioapic_entries(void)
 {
         int apic, pin;
 
-        for (apic = 0; apic < nr_ioapics; apic++) {
+        for_each_ioapic(apic) {
                 if (!ioapics[apic].saved_registers)
                         continue;
 
-                for (pin = 0; pin < ioapics[apic].nr_registers; pin++)
+                for_each_pin(apic, pin)
                         ioapic_write_entry(apic, pin,
                                            ioapics[apic].saved_registers[pin]);
         }
@@ -785,7 +842,7 @@ static int __init find_isa_irq_apic(int irq, int type)
         if (i < mp_irq_entries) {
                 int ioapic_idx;
 
-                for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++)
+                for_each_ioapic(ioapic_idx)
                         if (mpc_ioapic_id(ioapic_idx) == mp_irqs[i].dstapic)
                                 return ioapic_idx;
         }
@@ -799,7 +856,7 @@ static int __init find_isa_irq_apic(int irq, int type)
  */
 static int EISA_ELCR(unsigned int irq)
 {
-        if (irq < legacy_pic->nr_legacy_irqs) {
+        if (irq < nr_legacy_irqs()) {
                 unsigned int port = 0x4d0 + (irq >> 3);
                 return (inb(port) >> (irq & 7)) & 1;
         }
@@ -939,29 +996,101 @@ static int irq_trigger(int idx)
         return trigger;
 }
 
-static int pin_2_irq(int idx, int apic, int pin)
+static int alloc_irq_from_domain(struct irq_domain *domain, u32 gsi, int pin)
+{
+        int irq = -1;
+        int ioapic = (int)(long)domain->host_data;
+        int type = ioapics[ioapic].irqdomain_cfg.type;
+
+        switch (type) {
+        case IOAPIC_DOMAIN_LEGACY:
+                /*
+                 * Dynamically allocate IRQ number for non-ISA IRQs in the first 16
+                 * GSIs on some weird platforms.
+                 */
+                if (gsi < nr_legacy_irqs())
+                        irq = irq_create_mapping(domain, pin);
+                else if (irq_create_strict_mappings(domain, gsi, pin, 1) == 0)
+                        irq = gsi;
+                break;
+        case IOAPIC_DOMAIN_STRICT:
+                if (irq_create_strict_mappings(domain, gsi, pin, 1) == 0)
+                        irq = gsi;
+                break;
+        case IOAPIC_DOMAIN_DYNAMIC:
+                irq = irq_create_mapping(domain, pin);
+                break;
+        default:
+                WARN(1, "ioapic: unknown irqdomain type %d\n", type);
+                break;
+        }
+
+        return irq > 0 ? irq : -1;
+}
+
+static int mp_map_pin_to_irq(u32 gsi, int idx, int ioapic, int pin,
+                             unsigned int flags)
 {
         int irq;
-        int bus = mp_irqs[idx].srcbus;
-        struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(apic);
+        struct irq_domain *domain = mp_ioapic_irqdomain(ioapic);
+        struct mp_pin_info *info = mp_pin_info(ioapic, pin);
+
+        if (!domain)
+                return -1;
+
+        mutex_lock(&ioapic_mutex);
 
         /*
-         * Debugging check, we are in big trouble if this message pops up!
+         * Don't use irqdomain to manage ISA IRQs because there may be
+         * multiple IOAPIC pins sharing the same ISA IRQ number and
+         * irqdomain only supports 1:1 mapping between IOAPIC pin and
+         * IRQ number. A typical IOAPIC has 24 pins, pin 0-15 are used
+         * for legacy IRQs and pin 16-23 are used for PCI IRQs (PIRQ A-H).
+         * When ACPI is disabled, only legacy IRQ numbers (IRQ0-15) are
+         * available, and some BIOSes may use MP Interrupt Source records
+         * to override IRQ numbers for PIRQs instead of reprogramming
+         * the interrupt routing logic. Thus there may be multiple pins
+         * sharing the same legacy IRQ number when ACPI is disabled.
          */
-        if (mp_irqs[idx].dstirq != pin)
-                pr_err("broken BIOS or MPTABLE parser, ayiee!!\n");
-
-        if (test_bit(bus, mp_bus_not_pci)) {
+        if (idx >= 0 && test_bit(mp_irqs[idx].srcbus, mp_bus_not_pci)) {
                 irq = mp_irqs[idx].srcbusirq;
+                if (flags & IOAPIC_MAP_ALLOC) {
+                        if (info->count == 0 &&
+                            mp_irqdomain_map(domain, irq, pin) != 0)
+                                irq = -1;
+
+                        /* special handling for timer IRQ0 */
+                        if (irq == 0)
+                                info->count++;
+                }
         } else {
-                u32 gsi = gsi_cfg->gsi_base + pin;
+                irq = irq_find_mapping(domain, pin);
+                if (irq <= 0 && (flags & IOAPIC_MAP_ALLOC))
+                        irq = alloc_irq_from_domain(domain, gsi, pin);
+        }
 
-                if (gsi >= NR_IRQS_LEGACY)
-                        irq = gsi;
-                else
-                        irq = gsi_top + gsi;
+        if (flags & IOAPIC_MAP_ALLOC) {
+                if (irq > 0)
+                        info->count++;
+                else if (info->count == 0)
+                        info->set = 0;
         }
 
+        mutex_unlock(&ioapic_mutex);
+
+        return irq > 0 ? irq : -1;
+}
+
+static int pin_2_irq(int idx, int ioapic, int pin, unsigned int flags)
+{
+        u32 gsi = mp_pin_to_gsi(ioapic, pin);
+
+        /*
+         * Debugging check, we are in big trouble if this message pops up!
+         */
+        if (mp_irqs[idx].dstirq != pin)
+                pr_err("broken BIOS or MPTABLE parser, ayiee!!\n");
+
 #ifdef CONFIG_X86_32
         /*
          * PCI IRQ command line redirection. Yes, limits are hardcoded.
@@ -972,16 +1101,58 @@ static int pin_2_irq(int idx, int apic, int pin)
                                 apic_printk(APIC_VERBOSE, KERN_DEBUG
                                                 "disabling PIRQ%d\n", pin-16);
                         } else {
-                                irq = pirq_entries[pin-16];
+                                int irq = pirq_entries[pin-16];
                                 apic_printk(APIC_VERBOSE, KERN_DEBUG
                                                 "using PIRQ%d -> IRQ %d\n",
                                                 pin-16, irq);
+                                return irq;
                         }
                 }
         }
 #endif
 
-        return irq;
+        return  mp_map_pin_to_irq(gsi, idx, ioapic, pin, flags);
+}
+
+int mp_map_gsi_to_irq(u32 gsi, unsigned int flags)
+{
+        int ioapic, pin, idx;
+
+        ioapic = mp_find_ioapic(gsi);
+        if (ioapic < 0)
+                return -1;
+
+        pin = mp_find_ioapic_pin(ioapic, gsi);
+        idx = find_irq_entry(ioapic, pin, mp_INT);
+        if ((flags & IOAPIC_MAP_CHECK) && idx < 0)
+                return -1;
+
+        return mp_map_pin_to_irq(gsi, idx, ioapic, pin, flags);
+}
+
+void mp_unmap_irq(int irq)
+{
+        struct irq_data *data = irq_get_irq_data(irq);
+        struct mp_pin_info *info;
+        int ioapic, pin;
+
+        if (!data || !data->domain)
+                return;
+
+        ioapic = (int)(long)data->domain->host_data;
+        pin = (int)data->hwirq;
+        info = mp_pin_info(ioapic, pin);
+
+        mutex_lock(&ioapic_mutex);
+        if (--info->count == 0) {
+                info->set = 0;
+                if (irq < nr_legacy_irqs() &&
+                    ioapics[ioapic].irqdomain_cfg.type == IOAPIC_DOMAIN_LEGACY)
+                        mp_irqdomain_unmap(data->domain, irq);
+                else
+                        irq_dispose_mapping(irq);
+        }
+        mutex_unlock(&ioapic_mutex);
 }
 
 /*
@@ -991,7 +1162,7 @@ static int pin_2_irq(int idx, int apic, int pin)
 int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
                                 struct io_apic_irq_attr *irq_attr)
 {
-        int ioapic_idx, i, best_guess = -1;
+        int irq, i, best_ioapic = -1, best_idx = -1;
 
         apic_printk(APIC_DEBUG,
                     "querying PCI -> IRQ mapping bus:%d, slot:%d, pin:%d.\n",
@@ -1001,44 +1172,56 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
                             "PCI BIOS passed nonexistent PCI bus %d!\n", bus);
                 return -1;
         }
+
         for (i = 0; i < mp_irq_entries; i++) {
                 int lbus = mp_irqs[i].srcbus;
+                int ioapic_idx, found = 0;
 
-                for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++)
+                if (bus != lbus || mp_irqs[i].irqtype != mp_INT ||
+                    slot != ((mp_irqs[i].srcbusirq >> 2) & 0x1f))
+                        continue;
+
+                for_each_ioapic(ioapic_idx)
                         if (mpc_ioapic_id(ioapic_idx) == mp_irqs[i].dstapic ||
-                            mp_irqs[i].dstapic == MP_APIC_ALL)
+                            mp_irqs[i].dstapic == MP_APIC_ALL) {
+                                found = 1;
                                 break;
+                        }
+                if (!found)
+                        continue;
 
-                if (!test_bit(lbus, mp_bus_not_pci) &&
-                    !mp_irqs[i].irqtype &&
-                    (bus == lbus) &&
-                    (slot == ((mp_irqs[i].srcbusirq >> 2) & 0x1f))) {
-                        int irq = pin_2_irq(i, ioapic_idx, mp_irqs[i].dstirq);
+                /* Skip ISA IRQs */
+                irq = pin_2_irq(i, ioapic_idx, mp_irqs[i].dstirq, 0);
+                if (irq > 0 && !IO_APIC_IRQ(irq))
+                        continue;
 
-                        if (!(ioapic_idx || IO_APIC_IRQ(irq)))
-                                continue;
+                if (pin == (mp_irqs[i].srcbusirq & 3)) {
+                        best_idx = i;
+                        best_ioapic = ioapic_idx;
+                        goto out;
+                }
 
-                        if (pin == (mp_irqs[i].srcbusirq & 3)) {
-                                set_io_apic_irq_attr(irq_attr, ioapic_idx,
-                                                     mp_irqs[i].dstirq,
-                                                     irq_trigger(i),
-                                                     irq_polarity(i));
-                                return irq;
-                        }
-                        /*
-                         * Use the first all-but-pin matching entry as a
-                         * best-guess fuzzy result for broken mptables.
-                         */
-                        if (best_guess < 0) {
-                                set_io_apic_irq_attr(irq_attr, ioapic_idx,
-                                                     mp_irqs[i].dstirq,
-                                                     irq_trigger(i),
-                                                     irq_polarity(i));
-                                best_guess = irq;
-                        }
+                /*
+                 * Use the first all-but-pin matching entry as a
+                 * best-guess fuzzy result for broken mptables.
+                 */
+                if (best_idx < 0) {
+                        best_idx = i;
+                        best_ioapic = ioapic_idx;
                 }
         }
-        return best_guess;
+        if (best_idx < 0)
+                return -1;
+
+out:
+        irq = pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq,
+                        IOAPIC_MAP_ALLOC);
+        if (irq > 0)
+                set_io_apic_irq_attr(irq_attr, best_ioapic,
+                                     mp_irqs[best_idx].dstirq,
+                                     irq_trigger(best_idx),
+                                     irq_polarity(best_idx));
+        return irq;
 }
 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
 
@@ -1198,7 +1381,7 @@ void __setup_vector_irq(int cpu)
         raw_spin_lock(&vector_lock);
         /* Mark the inuse vectors */
         for_each_active_irq(irq) {
-                cfg = irq_get_chip_data(irq);
+                cfg = irq_cfg(irq);
                 if (!cfg)
                         continue;
 
@@ -1227,12 +1410,10 @@ static inline int IO_APIC_irq_trigger(int irq)
 {
         int apic, idx, pin;
 
-        for (apic = 0; apic < nr_ioapics; apic++) {
-                for (pin = 0; pin < ioapics[apic].nr_registers; pin++) {
-                        idx = find_irq_entry(apic, pin, mp_INT);
-                        if ((idx != -1) && (irq == pin_2_irq(idx, apic, pin)))
-                                return irq_trigger(idx);
-                }
+        for_each_ioapic_pin(apic, pin) {
+                idx = find_irq_entry(apic, pin, mp_INT);
+                if ((idx != -1) && (irq == pin_2_irq(idx, apic, pin, 0)))
+                        return irq_trigger(idx);
         }
         /*
          * nonexistent IRQs are edge default
@@ -1330,95 +1511,29 @@ static void setup_ioapic_irq(unsigned int irq, struct irq_cfg *cfg,
         }
 
         ioapic_register_intr(irq, cfg, attr->trigger);
-        if (irq < legacy_pic->nr_legacy_irqs)
+        if (irq < nr_legacy_irqs())
                 legacy_pic->mask(irq);
 
         ioapic_write_entry(attr->ioapic, attr->ioapic_pin, entry);
 }
 
-static bool __init io_apic_pin_not_connected(int idx, int ioapic_idx, int pin)
-{
-        if (idx != -1)
-                return false;
-
-        apic_printk(APIC_VERBOSE, KERN_DEBUG " apic %d pin %d not connected\n",
-                    mpc_ioapic_id(ioapic_idx), pin);
-        return true;
-}
-
-static void __init __io_apic_setup_irqs(unsigned int ioapic_idx)
-{
-        int idx, node = cpu_to_node(0);
-        struct io_apic_irq_attr attr;
-        unsigned int pin, irq;
-
-        for (pin = 0; pin < ioapics[ioapic_idx].nr_registers; pin++) {
-                idx = find_irq_entry(ioapic_idx, pin, mp_INT);
-                if (io_apic_pin_not_connected(idx, ioapic_idx, pin))
-                        continue;
-
-                irq = pin_2_irq(idx, ioapic_idx, pin);
-
-                if ((ioapic_idx > 0) && (irq > 16))
-                        continue;
-
-                /*
-                 * Skip the timer IRQ if there's a quirk handler
-                 * installed and if it returns 1:
-                 */
-                if (apic->multi_timer_check &&
-                    apic->multi_timer_check(ioapic_idx, irq))
-                        continue;
-
-                set_io_apic_irq_attr(&attr, ioapic_idx, pin, irq_trigger(idx),
-                                     irq_polarity(idx));
-
-                io_apic_setup_irq_pin(irq, node, &attr);
-        }
-}
-
 static void __init setup_IO_APIC_irqs(void)
 {
-        unsigned int ioapic_idx;
+        unsigned int ioapic, pin;
+        int idx;
 
         apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n");
 
-        for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++)
-                __io_apic_setup_irqs(ioapic_idx);
-}
-
-/*
- * for the gsit that is not in first ioapic
- * but could not use acpi_register_gsi()
- * like some special sci in IBM x3330
- */
-void setup_IO_APIC_irq_extra(u32 gsi)
-{
-        int ioapic_idx = 0, pin, idx, irq, node = cpu_to_node(0);
-        struct io_apic_irq_attr attr;
-
-        /*
-         * Convert 'gsi' to 'ioapic.pin'.
-         */
-        ioapic_idx = mp_find_ioapic(gsi);
-        if (ioapic_idx < 0)
-                return;
-
-        pin = mp_find_ioapic_pin(ioapic_idx, gsi);
-        idx = find_irq_entry(ioapic_idx, pin, mp_INT);
-        if (idx == -1)
-                return;
-
-        irq = pin_2_irq(idx, ioapic_idx, pin);
-
-        /* Only handle the non legacy irqs on secondary ioapics */
-        if (ioapic_idx == 0 || irq < NR_IRQS_LEGACY)
-                return;
-
-        set_io_apic_irq_attr(&attr, ioapic_idx, pin, irq_trigger(idx),
-                             irq_polarity(idx));
-
-        io_apic_setup_irq_pin_once(irq, node, &attr);
+        for_each_ioapic_pin(ioapic, pin) {
+                idx = find_irq_entry(ioapic, pin, mp_INT);
+                if (idx < 0)
+                        apic_printk(APIC_VERBOSE,
+                                    KERN_DEBUG " apic %d pin %d not connected\n",
+                                    mpc_ioapic_id(ioapic), pin);
+                else
+                        pin_2_irq(idx, ioapic, pin,
+                                  ioapic ? 0 : IOAPIC_MAP_ALLOC);
+        }
 }
 
 /*
@@ -1586,7 +1701,7 @@ __apicdebuginit(void) print_IO_APICs(void)
         struct irq_chip *chip;
 
         printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries);
-        for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++)
+        for_each_ioapic(ioapic_idx)
                 printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n",
                        mpc_ioapic_id(ioapic_idx),
                        ioapics[ioapic_idx].nr_registers);
@@ -1597,7 +1712,7 @@ __apicdebuginit(void) print_IO_APICs(void)
          */
         printk(KERN_INFO "testing the IO APIC.......................\n");
 
-        for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++)
+        for_each_ioapic(ioapic_idx)
                 print_IO_APIC(ioapic_idx);
 
         printk(KERN_DEBUG "IRQ to pin mappings:\n");
@@ -1608,7 +1723,7 @@ __apicdebuginit(void) print_IO_APICs(void)
                 if (chip != &ioapic_chip)
                         continue;
 
-                cfg = irq_get_chip_data(irq);
+                cfg = irq_cfg(irq);
                 if (!cfg)
                         continue;
                 entry = cfg->irq_2_pin;
@@ -1758,7 +1873,7 @@ __apicdebuginit(void) print_PIC(void)
         unsigned int v;
         unsigned long flags;
 
-        if (!legacy_pic->nr_legacy_irqs)
+        if (!nr_legacy_irqs())
                 return;
 
         printk(KERN_DEBUG "\nprinting PIC contents\n");
@@ -1828,26 +1943,22 @@ static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
 void __init enable_IO_APIC(void)
 {
         int i8259_apic, i8259_pin;
-        int apic;
+        int apic, pin;
 
-        if (!legacy_pic->nr_legacy_irqs)
+        if (!nr_legacy_irqs())
                 return;
 
-        for(apic = 0; apic < nr_ioapics; apic++) {
-                int pin;
+        for_each_ioapic_pin(apic, pin) {
                 /* See if any of the pins is in ExtINT mode */
-                for (pin = 0; pin < ioapics[apic].nr_registers; pin++) {
-                        struct IO_APIC_route_entry entry;
-                        entry = ioapic_read_entry(apic, pin);
+                struct IO_APIC_route_entry entry = ioapic_read_entry(apic, pin);
 
-                        /* If the interrupt line is enabled and in ExtInt mode
-                         * I have found the pin where the i8259 is connected.
-                         */
-                        if ((entry.mask == 0) && (entry.delivery_mode == dest_ExtINT)) {
-                                ioapic_i8259.apic = apic;
-                                ioapic_i8259.pin  = pin;
-                                goto found_i8259;
-                        }
+                /* If the interrupt line is enabled and in ExtInt mode
+                 * I have found the pin where the i8259 is connected.
+                 */
+                if ((entry.mask == 0) && (entry.delivery_mode == dest_ExtINT)) {
+                        ioapic_i8259.apic = apic;
+                        ioapic_i8259.pin  = pin;
+                        goto found_i8259;
                 }
         }
  found_i8259:
@@ -1919,7 +2030,7 @@ void disable_IO_APIC(void)
          */
         clear_IO_APIC();
 
-        if (!legacy_pic->nr_legacy_irqs)
+        if (!nr_legacy_irqs())
                 return;
 
         x86_io_apic_ops.disable();
@@ -1950,7 +2061,7 @@ void __init setup_ioapic_ids_from_mpc_nocheck(void)
         /*
          * Set the IOAPIC ID to the value stored in the MPC table.
          */
-        for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) {
+        for_each_ioapic(ioapic_idx) {
                 /* Read the register 0 value */
                 raw_spin_lock_irqsave(&ioapic_lock, flags);
                 reg_00.raw = io_apic_read(ioapic_idx, 0);
@@ -2123,7 +2234,7 @@ static unsigned int startup_ioapic_irq(struct irq_data *data)
         unsigned long flags;
 
         raw_spin_lock_irqsave(&ioapic_lock, flags);
-        if (irq < legacy_pic->nr_legacy_irqs) {
+        if (irq < nr_legacy_irqs()) {
                 legacy_pic->mask(irq);
                 if (legacy_pic->irq_pending(irq))
                         was_pending = 1;
@@ -2225,7 +2336,7 @@ asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)
                         apic->send_IPI_self(IRQ_MOVE_CLEANUP_VECTOR);
                         goto unlock;
                 }
-                __this_cpu_write(vector_irq[vector], -1);
+                __this_cpu_write(vector_irq[vector], VECTOR_UNDEFINED);
 unlock:
                 raw_spin_unlock(&desc->lock);
         }
@@ -2253,7 +2364,7 @@ static void irq_complete_move(struct irq_cfg *cfg)
 
 void irq_force_complete_move(int irq)
 {
-        struct irq_cfg *cfg = irq_get_chip_data(irq);
+        struct irq_cfg *cfg = irq_cfg(irq);
 
         if (!cfg)
                 return;
@@ -2514,26 +2625,15 @@ static inline void init_IO_APIC_traps(void)
         struct irq_cfg *cfg;
         unsigned int irq;
 
-        /*
-         * NOTE! The local APIC isn't very good at handling
-         * multiple interrupts at the same interrupt level.
-         * As the interrupt level is determined by taking the
-         * vector number and shifting that right by 4, we
-         * want to spread these out a bit so that they don't
-         * all fall in the same interrupt level.
-         *
-         * Also, we've got to be careful not to trash gate
-         * 0x80, because int 0x80 is hm, kind of importantish. ;)
-         */
         for_each_active_irq(irq) {
-                cfg = irq_get_chip_data(irq);
+                cfg = irq_cfg(irq);
                 if (IO_APIC_IRQ(irq) && cfg && !cfg->vector) {
                         /*
                          * Hmm.. We don't have an entry for this,
                          * so default to an old-fashioned 8259
                          * interrupt if we can..
                          */
-                        if (irq < legacy_pic->nr_legacy_irqs)
+                        if (irq < nr_legacy_irqs())
                                 legacy_pic->make_irq(irq);
                         else
                                 /* Strange. Oh, well.. */
@@ -2649,8 +2749,6 @@ static int __init disable_timer_pin_setup(char *arg)
 }
 early_param("disable_timer_pin_1", disable_timer_pin_setup);
 
-int timer_through_8259 __initdata;
-
 /*
  * This code may look a bit paranoid, but it's supposed to cooperate with
  * a wide range of boards and BIOS bugs.  Fortunately only the timer IRQ
@@ -2661,7 +2759,7 @@ int timer_through_8259 __initdata;
  */
 static inline void __init check_timer(void)
 {
-        struct irq_cfg *cfg = irq_get_chip_data(0);
+        struct irq_cfg *cfg = irq_cfg(0);
         int node = cpu_to_node(0);
         int apic1, pin1, apic2, pin2;
         unsigned long flags;
@@ -2755,7 +2853,6 @@ static inline void __init check_timer(void)
                 legacy_pic->unmask(0);
                 if (timer_irq_works()) {
                         apic_printk(APIC_QUIET, KERN_INFO "....... works.\n");
-                        timer_through_8259 = 1;
                         goto out;
                 }
                 /*
@@ -2827,15 +2924,54 @@ out:
  */
 #define PIC_IRQS        (1UL << PIC_CASCADE_IR)
 
+static int mp_irqdomain_create(int ioapic)
+{
+        size_t size;
+        int hwirqs = mp_ioapic_pin_count(ioapic);
+        struct ioapic *ip = &ioapics[ioapic];
+        struct ioapic_domain_cfg *cfg = &ip->irqdomain_cfg;
+        struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(ioapic);
+
+        size = sizeof(struct mp_pin_info) * mp_ioapic_pin_count(ioapic);
+        ip->pin_info = kzalloc(size, GFP_KERNEL);
+        if (!ip->pin_info)
+                return -ENOMEM;
+
+        if (cfg->type == IOAPIC_DOMAIN_INVALID)
+                return 0;
+
+        ip->irqdomain = irq_domain_add_linear(cfg->dev, hwirqs, cfg->ops,
+                                              (void *)(long)ioapic);
+        if(!ip->irqdomain) {
+                kfree(ip->pin_info);
+                ip->pin_info = NULL;
+                return -ENOMEM;
+        }
+
+        if (cfg->type == IOAPIC_DOMAIN_LEGACY ||
+            cfg->type == IOAPIC_DOMAIN_STRICT)
+                ioapic_dynirq_base = max(ioapic_dynirq_base,
+                                         gsi_cfg->gsi_end + 1);
+
+        if (gsi_cfg->gsi_base == 0)
+                irq_set_default_host(ip->irqdomain);
+
+        return 0;
+}
+
 void __init setup_IO_APIC(void)
 {
+        int ioapic;
 
         /*
          * calling enable_IO_APIC() is moved to setup_local_APIC for BP
          */
-        io_apic_irqs = legacy_pic->nr_legacy_irqs ? ~PIC_IRQS : ~0UL;
+        io_apic_irqs = nr_legacy_irqs() ? ~PIC_IRQS : ~0UL;
 
         apic_printk(APIC_VERBOSE, "ENABLING IO-APIC IRQs\n");
+        for_each_ioapic(ioapic)
+                BUG_ON(mp_irqdomain_create(ioapic));
+
         /*
          * Set up IO-APIC IRQ routing.
          */
@@ -2844,8 +2980,10 @@ void __init setup_IO_APIC(void)
         sync_Arb_IDs();
         setup_IO_APIC_irqs();
         init_IO_APIC_traps();
-        if (legacy_pic->nr_legacy_irqs)
+        if (nr_legacy_irqs())
                 check_timer();
+
+        ioapic_initialized = 1;
 }
 
 /*
@@ -2880,7 +3018,7 @@ static void ioapic_resume(void)
 {
         int ioapic_idx;
 
-        for (ioapic_idx = nr_ioapics - 1; ioapic_idx >= 0; ioapic_idx--)
+        for_each_ioapic_reverse(ioapic_idx)
                 resume_ioapic_id(ioapic_idx);
 
         restore_ioapic_entries();
@@ -2926,7 +3064,7 @@ int arch_setup_hwirq(unsigned int irq, int node)
 
 void arch_teardown_hwirq(unsigned int irq)
 {
-        struct irq_cfg *cfg = irq_get_chip_data(irq);
+        struct irq_cfg *cfg = irq_cfg(irq);
         unsigned long flags;
 
         free_remapped_irq(irq);
@@ -3053,7 +3191,7 @@ int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
         if (!irq_offset)
                 write_msi_msg(irq, &msg);
 
-        setup_remapped_irq(irq, irq_get_chip_data(irq), chip);
+        setup_remapped_irq(irq, irq_cfg(irq), chip);
 
         irq_set_chip_and_handler_name(irq, chip, handle_edge_irq, "edge");
 
@@ -3192,7 +3330,7 @@ int default_setup_hpet_msi(unsigned int irq, unsigned int id)
 
         hpet_msi_write(irq_get_handler_data(irq), &msg);
         irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);
-        setup_remapped_irq(irq, irq_get_chip_data(irq), chip);
+        setup_remapped_irq(irq, irq_cfg(irq), chip);
 
         irq_set_chip_and_handler_name(irq, chip, handle_edge_irq, "edge");
         return 0;
@@ -3303,27 +3441,6 @@ io_apic_setup_irq_pin(unsigned int irq, int node, struct io_apic_irq_attr *attr)
         return ret;
 }
 
-int io_apic_setup_irq_pin_once(unsigned int irq, int node,
-                               struct io_apic_irq_attr *attr)
-{
-        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);
-                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)
-                set_bit(pin, ioapics[ioapic_idx].pin_programmed);
-        return ret;
-}
-
 static int __init io_apic_get_redir_entries(int ioapic)
 {
         union IO_APIC_reg_01    reg_01;
@@ -3340,20 +3457,13 @@ static int __init io_apic_get_redir_entries(int ioapic)
         return reg_01.bits.entries + 1;
 }
 
-static void __init probe_nr_irqs_gsi(void)
-{
-        int nr;
-
-        nr = gsi_top + NR_IRQS_LEGACY;
-        if (nr > nr_irqs_gsi)
-                nr_irqs_gsi = nr;
-
-        printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
-}
-
 unsigned int arch_dynirq_lower_bound(unsigned int from)
 {
-        return from < nr_irqs_gsi ? nr_irqs_gsi : from;
+        /*
+         * dmar_alloc_hwirq() may be called before setup_IO_APIC(), so use
+         * gsi_top if ioapic_dynirq_base hasn't been initialized yet.
+         */
+        return ioapic_initialized ? ioapic_dynirq_base : gsi_top;
 }
 
 int __init arch_probe_nr_irqs(void)
@@ -3363,33 +3473,17 @@ int __init arch_probe_nr_irqs(void)
         if (nr_irqs > (NR_VECTORS * nr_cpu_ids))
                 nr_irqs = NR_VECTORS * nr_cpu_ids;
 
-        nr = nr_irqs_gsi + 8 * nr_cpu_ids;
+        nr = (gsi_top + nr_legacy_irqs()) + 8 * nr_cpu_ids;
 #if defined(CONFIG_PCI_MSI) || defined(CONFIG_HT_IRQ)
         /*
          * for MSI and HT dyn irq
          */
-        nr += nr_irqs_gsi * 16;
+        nr += gsi_top * 16;
 #endif
         if (nr < nr_irqs)
                 nr_irqs = nr;
 
-        return NR_IRQS_LEGACY;
-}
-
-int io_apic_set_pci_routing(struct device *dev, int irq,
-                            struct io_apic_irq_attr *irq_attr)
-{
-        int node;
-
-        if (!IO_APIC_IRQ(irq)) {
-                apic_printk(APIC_QUIET,KERN_ERR "IOAPIC[%d]: Invalid reference to IRQ 0\n",
-                            irq_attr->ioapic);
-                return -EINVAL;
-        }
-
-        node = dev ? dev_to_node(dev) : cpu_to_node(0);
-
-        return io_apic_setup_irq_pin_once(irq, node, irq_attr);
+        return 0;
 }
 
 #ifdef CONFIG_X86_32
@@ -3483,9 +3577,8 @@ static u8 __init io_apic_unique_id(u8 id)
         DECLARE_BITMAP(used, 256);
 
         bitmap_zero(used, 256);
-        for (i = 0; i < nr_ioapics; i++) {
+        for_each_ioapic(i)
                 __set_bit(mpc_ioapic_id(i), used);
-        }
         if (!test_bit(id, used))
                 return id;
         return find_first_zero_bit(used, 256);
@@ -3543,14 +3636,13 @@ void __init setup_ioapic_dest(void)
         if (skip_ioapic_setup == 1)
                 return;
 
-        for (ioapic = 0; ioapic < nr_ioapics; ioapic++)
-        for (pin = 0; pin < ioapics[ioapic].nr_registers; pin++) {
+        for_each_ioapic_pin(ioapic, pin) {
                 irq_entry = find_irq_entry(ioapic, pin, mp_INT);
                 if (irq_entry == -1)
                         continue;
-                irq = pin_2_irq(irq_entry, ioapic, pin);
 
-                if ((ioapic > 0) && (irq > 16))
+                irq = pin_2_irq(irq_entry, ioapic, pin, 0);
+                if (irq < 0 || !mp_init_irq_at_boot(ioapic, irq))
                         continue;
 
                 idata = irq_get_irq_data(irq);
@@ -3573,29 +3665,33 @@ void __init setup_ioapic_dest(void)
 
 static struct resource *ioapic_resources;
 
-static struct resource * __init ioapic_setup_resources(int nr_ioapics)
+static struct resource * __init ioapic_setup_resources(void)
 {
         unsigned long n;
         struct resource *res;
         char *mem;
-        int i;
+        int i, num = 0;
 
-        if (nr_ioapics <= 0)
+        for_each_ioapic(i)
+                num++;
+        if (num == 0)
                 return NULL;
 
         n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);
-        n *= nr_ioapics;
+        n *= num;
 
         mem = alloc_bootmem(n);
         res = (void *)mem;
 
-        mem += sizeof(struct resource) * nr_ioapics;
+        mem += sizeof(struct resource) * num;
 
-        for (i = 0; i < nr_ioapics; i++) {
-                res[i].name = mem;
-                res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+        num = 0;
+        for_each_ioapic(i) {
+                res[num].name = mem;
+                res[num].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
                 snprintf(mem, IOAPIC_RESOURCE_NAME_SIZE, "IOAPIC %u", i);
                 mem += IOAPIC_RESOURCE_NAME_SIZE;
+                num++;
         }
 
         ioapic_resources = res;
@@ -3609,8 +3705,8 @@ void __init native_io_apic_init_mappings(void)
         struct resource *ioapic_res;
         int i;
 
-        ioapic_res = ioapic_setup_resources(nr_ioapics);
-        for (i = 0; i < nr_ioapics; i++) {
+        ioapic_res = ioapic_setup_resources();
+        for_each_ioapic(i) {
                 if (smp_found_config) {
                         ioapic_phys = mpc_ioapic_addr(i);
 #ifdef CONFIG_X86_32
@@ -3641,8 +3737,6 @@ fake_ioapic_page:
                 ioapic_res->end = ioapic_phys + IO_APIC_SLOT_SIZE - 1;
                 ioapic_res++;
         }
-
-        probe_nr_irqs_gsi();
 }
 
 void __init ioapic_insert_resources(void)
@@ -3657,7 +3751,7 @@ void __init ioapic_insert_resources(void)
                 return;
         }
 
-        for (i = 0; i < nr_ioapics; i++) {
+        for_each_ioapic(i) {
                 insert_resource(&iomem_resource, r);
                 r++;
         }
@@ -3665,16 +3759,15 @@ void __init ioapic_insert_resources(void)
 
 int mp_find_ioapic(u32 gsi)
 {
-        int i = 0;
+        int i;
 
         if (nr_ioapics == 0)
                 return -1;
 
         /* Find the IOAPIC that manages this GSI. */
-        for (i = 0; i < nr_ioapics; i++) {
+        for_each_ioapic(i) {
                 struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(i);
-                if ((gsi >= gsi_cfg->gsi_base)
-                    && (gsi <= gsi_cfg->gsi_end))
+                if (gsi >= gsi_cfg->gsi_base && gsi <= gsi_cfg->gsi_end)
                         return i;
         }
 
@@ -3686,7 +3779,7 @@ int mp_find_ioapic_pin(int ioapic, u32 gsi)
 {
         struct mp_ioapic_gsi *gsi_cfg;
 
-        if (WARN_ON(ioapic == -1))
+        if (WARN_ON(ioapic < 0))
                 return -1;
 
         gsi_cfg = mp_ioapic_gsi_routing(ioapic);
@@ -3729,7 +3822,8 @@ static __init int bad_ioapic_register(int idx)
         return 0;
 }
 
-void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
+void __init mp_register_ioapic(int id, u32 address, u32 gsi_base,
+                               struct ioapic_domain_cfg *cfg)
 {
         int idx = 0;
         int entries;
@@ -3743,6 +3837,8 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
         ioapics[idx].mp_config.type = MP_IOAPIC;
         ioapics[idx].mp_config.flags = MPC_APIC_USABLE;
         ioapics[idx].mp_config.apicaddr = address;
+        ioapics[idx].irqdomain = NULL;
+        ioapics[idx].irqdomain_cfg = *cfg;
 
         set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address);
 
@@ -3779,6 +3875,77 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
         nr_ioapics++;
 }
 
+int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq,
+                     irq_hw_number_t hwirq)
+{
+        int ioapic = (int)(long)domain->host_data;
+        struct mp_pin_info *info = mp_pin_info(ioapic, hwirq);
+        struct io_apic_irq_attr attr;
+
+        /* Get default attribute if not set by caller yet */
+        if (!info->set) {
+                u32 gsi = mp_pin_to_gsi(ioapic, hwirq);
+
+                if (acpi_get_override_irq(gsi, &info->trigger,
+                                          &info->polarity) < 0) {
+                        /*
+                         * PCI interrupts are always polarity one level
+                         * triggered.
+                         */
+                        info->trigger = 1;
+                        info->polarity = 1;
+                }
+                info->node = NUMA_NO_NODE;
+                info->set = 1;
+        }
+        set_io_apic_irq_attr(&attr, ioapic, hwirq, info->trigger,
+                             info->polarity);
+
+        return io_apic_setup_irq_pin(virq, info->node, &attr);
+}
+
+void mp_irqdomain_unmap(struct irq_domain *domain, unsigned int virq)
+{
+        struct irq_data *data = irq_get_irq_data(virq);
+        struct irq_cfg *cfg = irq_cfg(virq);
+        int ioapic = (int)(long)domain->host_data;
+        int pin = (int)data->hwirq;
+
+        ioapic_mask_entry(ioapic, pin);
+        __remove_pin_from_irq(cfg, ioapic, pin);
+        WARN_ON(cfg->irq_2_pin != NULL);
+        arch_teardown_hwirq(virq);
+}
+
+int mp_set_gsi_attr(u32 gsi, int trigger, int polarity, int node)
+{
+        int ret = 0;
+        int ioapic, pin;
+        struct mp_pin_info *info;
+
+        ioapic = mp_find_ioapic(gsi);
+        if (ioapic < 0)
+                return -ENODEV;
+
+        pin = mp_find_ioapic_pin(ioapic, gsi);
+        info = mp_pin_info(ioapic, pin);
+        trigger = trigger ? 1 : 0;
+        polarity = polarity ? 1 : 0;
+
+        mutex_lock(&ioapic_mutex);
+        if (!info->set) {
+                info->trigger = trigger;
+                info->polarity = polarity;
+                info->node = node;
+                info->set = 1;
+        } else if (info->trigger != trigger || info->polarity != polarity) {
+                ret = -EBUSY;
+        }
+        mutex_unlock(&ioapic_mutex);
+
+        return ret;
+}
+
 /* Enable IOAPIC early just for system timer */
 void __init pre_init_apic_IRQ0(void)
 {
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index cceb352c968c..bda488680dbc 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -88,21 +88,16 @@ static struct apic apic_default = {
         .disable_esr                    = 0,
         .dest_logical                   = APIC_DEST_LOGICAL,
         .check_apicid_used              = default_check_apicid_used,
-        .check_apicid_present           = default_check_apicid_present,
 
         .vector_allocation_domain       = flat_vector_allocation_domain,
         .init_apic_ldr                  = default_init_apic_ldr,
 
         .ioapic_phys_id_map             = default_ioapic_phys_id_map,
         .setup_apic_routing             = setup_apic_flat_routing,
-        .multi_timer_check              = NULL,
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
         .apicid_to_cpu_present          = physid_set_mask_of_physid,
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = default_phys_pkg_id,
-        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = default_get_apic_id,
         .set_apic_id                    = NULL,
@@ -116,11 +111,7 @@ static struct apic apic_default = {
         .send_IPI_all                   = default_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
-
         .wait_for_init_deassert         = true,
-        .smp_callin_clear_local_apic    = NULL,
         .inquire_remote_apic            = default_inquire_remote_apic,
 
         .read                           = native_apic_mem_read,
@@ -214,29 +205,7 @@ void __init generic_apic_probe(void)
         printk(KERN_INFO "Using APIC driver %s\n", apic->name);
 }
 
-/* These functions can switch the APIC even after the initial ->probe() */
-
-int __init
-generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
-{
-        struct apic **drv;
-
-        for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {
-                if (!((*drv)->mps_oem_check))
-                        continue;
-                if (!(*drv)->mps_oem_check(mpc, oem, productid))
-                        continue;
-
-                if (!cmdline_apic) {
-                        apic = *drv;
-                        printk(KERN_INFO "Switched to APIC driver `%s'.\n",
-                               apic->name);
-                }
-                return 1;
-        }
-        return 0;
-}
-
+/* This function can switch the APIC even after the initial ->probe() */
 int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
         struct apic **drv;
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index e66766bf1641..6ce600f9bc78 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -249,21 +249,16 @@ static struct apic apic_x2apic_cluster = {
         .disable_esr                    = 0,
         .dest_logical                   = APIC_DEST_LOGICAL,
         .check_apicid_used              = NULL,
-        .check_apicid_present           = NULL,
 
         .vector_allocation_domain       = cluster_vector_allocation_domain,
         .init_apic_ldr                  = init_x2apic_ldr,
 
         .ioapic_phys_id_map             = NULL,
         .setup_apic_routing             = NULL,
-        .multi_timer_check              = NULL,
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
         .apicid_to_cpu_present          = NULL,
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = x2apic_phys_pkg_id,
-        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = x2apic_get_apic_id,
         .set_apic_id                    = x2apic_set_apic_id,
@@ -277,10 +272,7 @@ static struct apic apic_x2apic_cluster = {
         .send_IPI_all                   = x2apic_send_IPI_all,
         .send_IPI_self                  = x2apic_send_IPI_self,
 
-        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = false,
-        .smp_callin_clear_local_apic    = NULL,
         .inquire_remote_apic            = NULL,
 
         .read                           = native_apic_msr_read,
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 6d600ebf6c12..6fae733e9194 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -103,21 +103,16 @@ static struct apic apic_x2apic_phys = {
         .disable_esr                    = 0,
         .dest_logical                   = 0,
         .check_apicid_used              = NULL,
-        .check_apicid_present           = NULL,
 
         .vector_allocation_domain       = default_vector_allocation_domain,
         .init_apic_ldr                  = init_x2apic_ldr,
 
         .ioapic_phys_id_map             = NULL,
         .setup_apic_routing             = NULL,
-        .multi_timer_check              = NULL,
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
         .apicid_to_cpu_present          = NULL,
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = x2apic_phys_pkg_id,
-        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = x2apic_get_apic_id,
         .set_apic_id                    = x2apic_set_apic_id,
@@ -131,10 +126,7 @@ static struct apic apic_x2apic_phys = {
         .send_IPI_all                   = x2apic_send_IPI_all,
         .send_IPI_self                  = x2apic_send_IPI_self,
 
-        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = false,
-        .smp_callin_clear_local_apic    = NULL,
         .inquire_remote_apic            = NULL,
 
         .read                           = native_apic_msr_read,
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 293b41df54ef..004f017aa7b9 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -365,21 +365,16 @@ static struct apic __refdata apic_x2apic_uv_x = {
         .disable_esr                    = 0,
         .dest_logical                   = APIC_DEST_LOGICAL,
         .check_apicid_used              = NULL,
-        .check_apicid_present           = NULL,
 
         .vector_allocation_domain       = default_vector_allocation_domain,
         .init_apic_ldr                  = uv_init_apic_ldr,
 
         .ioapic_phys_id_map             = NULL,
         .setup_apic_routing             = NULL,
-        .multi_timer_check              = NULL,
         .cpu_present_to_apicid          = default_cpu_present_to_apicid,
         .apicid_to_cpu_present          = NULL,
-        .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
-        .enable_apic_mode               = NULL,
         .phys_pkg_id                    = uv_phys_pkg_id,
-        .mps_oem_check                  = NULL,
 
         .get_apic_id                    = x2apic_get_apic_id,
         .set_apic_id                    = set_apic_id,
@@ -394,10 +389,7 @@ static struct apic __refdata apic_x2apic_uv_x = {
         .send_IPI_self                  = uv_send_IPI_self,
 
         .wakeup_secondary_cpu           = uv_wakeup_secondary,
-        .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
-        .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = false,
-        .smp_callin_clear_local_apic    = NULL,
         .inquire_remote_apic            = NULL,
 
         .read                           = native_apic_msr_read,
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 333fd5209336..e4ab2b42bd6f 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -148,6 +148,7 @@ static int __init x86_xsave_setup(char *s)
 {
         setup_clear_cpu_cap(X86_FEATURE_XSAVE);
         setup_clear_cpu_cap(X86_FEATURE_XSAVEOPT);
+        setup_clear_cpu_cap(X86_FEATURE_XSAVES);
         setup_clear_cpu_cap(X86_FEATURE_AVX);
         setup_clear_cpu_cap(X86_FEATURE_AVX2);
         return 1;
@@ -161,6 +162,13 @@ static int __init x86_xsaveopt_setup(char *s)
 }
 __setup("noxsaveopt", x86_xsaveopt_setup);
 
+static int __init x86_xsaves_setup(char *s)
+{
+        setup_clear_cpu_cap(X86_FEATURE_XSAVES);
+        return 1;
+}
+__setup("noxsaves", x86_xsaves_setup);
+
 #ifdef CONFIG_X86_32
 static int cachesize_override = -1;
 static int disable_x86_serial_nr = 1;
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 9c8f7394c612..c7035073dfc1 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -461,7 +461,7 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf,
 
         cpu = cpumask_first(to_cpumask(this_leaf->shared_cpu_map));
 
-        if (strict_strtoul(buf, 10, &val) < 0)
+        if (kstrtoul(buf, 10, &val) < 0)
                 return -EINVAL;
 
         err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val);
@@ -511,7 +511,7 @@ store_subcaches(struct _cpuid4_info *this_leaf, const char *buf, size_t count,
         if (!this_leaf->base.nb || !amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
                 return -EINVAL;
 
-        if (strict_strtoul(buf, 16, &val) < 0)
+        if (kstrtoul(buf, 16, &val) < 0)
                 return -EINVAL;
 
         if (amd_set_subcaches(cpu, val))
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 4fc57975acc1..bd9ccda8087f 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2136,7 +2136,7 @@ static ssize_t set_bank(struct device *s, struct device_attribute *attr,
 {
         u64 new;
 
-        if (strict_strtoull(buf, 0, &new) < 0)
+        if (kstrtou64(buf, 0, &new) < 0)
                 return -EINVAL;
 
         attr_to_bank(attr)->ctl = new;
@@ -2174,7 +2174,7 @@ static ssize_t set_ignore_ce(struct device *s,
 {
         u64 new;
 
-        if (strict_strtoull(buf, 0, &new) < 0)
+        if (kstrtou64(buf, 0, &new) < 0)
                 return -EINVAL;
 
         if (mca_cfg.ignore_ce ^ !!new) {
@@ -2198,7 +2198,7 @@ static ssize_t set_cmci_disabled(struct device *s,
 {
         u64 new;
 
-        if (strict_strtoull(buf, 0, &new) < 0)
+        if (kstrtou64(buf, 0, &new) < 0)
                 return -EINVAL;
 
         if (mca_cfg.cmci_disabled ^ !!new) {
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 603df4f74640..1e49f8f41276 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -353,7 +353,7 @@ store_interrupt_enable(struct threshold_block *b, const char *buf, size_t size)
         if (!b->interrupt_capable)
                 return -EINVAL;
 
-        if (strict_strtoul(buf, 0, &new) < 0)
+        if (kstrtoul(buf, 0, &new) < 0)
                 return -EINVAL;
 
         b->interrupt_enable = !!new;
@@ -372,7 +372,7 @@ store_threshold_limit(struct threshold_block *b, const char *buf, size_t size)
         struct thresh_restart tr;
         unsigned long new;
 
-        if (strict_strtoul(buf, 0, &new) < 0)
+        if (kstrtoul(buf, 0, &new) < 0)
                 return -EINVAL;
 
         if (new > THRESHOLD_MAX)
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel.c b/arch/x86/kernel/cpu/mcheck/mce_intel.c
index 9a316b21df8b..3bdb95ae8c43 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel.c
@@ -42,7 +42,7 @@ static DEFINE_PER_CPU(mce_banks_t, mce_banks_owned);
  * cmci_discover_lock protects against parallel discovery attempts
  * which could race against each other.
  */
-static DEFINE_SPINLOCK(cmci_discover_lock);
+static DEFINE_RAW_SPINLOCK(cmci_discover_lock);
 
 #define CMCI_THRESHOLD          1
 #define CMCI_POLL_INTERVAL      (30 * HZ)
@@ -144,14 +144,14 @@ static void cmci_storm_disable_banks(void)
         int bank;
         u64 val;
 
-        spin_lock_irqsave(&cmci_discover_lock, flags);
+        raw_spin_lock_irqsave(&cmci_discover_lock, flags);
         owned = __get_cpu_var(mce_banks_owned);
         for_each_set_bit(bank, owned, MAX_NR_BANKS) {
                 rdmsrl(MSR_IA32_MCx_CTL2(bank), val);
                 val &= ~MCI_CTL2_CMCI_EN;
                 wrmsrl(MSR_IA32_MCx_CTL2(bank), val);
         }
-        spin_unlock_irqrestore(&cmci_discover_lock, flags);
+        raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
 }
 
 static bool cmci_storm_detect(void)
@@ -211,7 +211,7 @@ static void cmci_discover(int banks)
         int i;
         int bios_wrong_thresh = 0;
 
-        spin_lock_irqsave(&cmci_discover_lock, flags);
+        raw_spin_lock_irqsave(&cmci_discover_lock, flags);
         for (i = 0; i < banks; i++) {
                 u64 val;
                 int bios_zero_thresh = 0;
@@ -266,7 +266,7 @@ static void cmci_discover(int banks)
                         WARN_ON(!test_bit(i, __get_cpu_var(mce_poll_banks)));
                 }
         }
-        spin_unlock_irqrestore(&cmci_discover_lock, flags);
+        raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
         if (mca_cfg.bios_cmci_threshold && bios_wrong_thresh) {
                 pr_info_once(
                         "bios_cmci_threshold: Some banks do not have valid thresholds set\n");
@@ -316,10 +316,10 @@ void cmci_clear(void)
 
         if (!cmci_supported(&banks))
                 return;
-        spin_lock_irqsave(&cmci_discover_lock, flags);
+        raw_spin_lock_irqsave(&cmci_discover_lock, flags);
         for (i = 0; i < banks; i++)
                 __cmci_disable_bank(i);
-        spin_unlock_irqrestore(&cmci_discover_lock, flags);
+        raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
 }
 
 static void cmci_rediscover_work_func(void *arg)
@@ -360,9 +360,9 @@ void cmci_disable_bank(int bank)
         if (!cmci_supported(&banks))
                 return;
 
-        spin_lock_irqsave(&cmci_discover_lock, flags);
+        raw_spin_lock_irqsave(&cmci_discover_lock, flags);
         __cmci_disable_bank(bank);
-        spin_unlock_irqrestore(&cmci_discover_lock, flags);
+        raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
 }
 
 static void intel_init_cmci(void)
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index cfc6f9dfcd90..0939f86f543d 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -945,7 +945,7 @@ static struct intel_uncore_type *snbep_pci_uncores[] = {
         NULL,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(snbep_uncore_pci_ids) = {
+static const struct pci_device_id snbep_uncore_pci_ids[] = {
         { /* Home Agent */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA),
                 .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_HA, 0),
@@ -1510,7 +1510,7 @@ static struct intel_uncore_type *ivt_pci_uncores[] = {
         NULL,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = {
+static const struct pci_device_id ivt_uncore_pci_ids[] = {
         { /* Home Agent 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30),
                 .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_HA, 0),
@@ -1985,7 +1985,7 @@ static struct intel_uncore_type *snb_pci_uncores[] = {
         NULL,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = {
+static const struct pci_device_id snb_uncore_pci_ids[] = {
         { /* IMC */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SNB_IMC),
                 .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
@@ -1993,7 +1993,7 @@ static DEFINE_PCI_DEVICE_TABLE(snb_uncore_pci_ids) = {
         { /* end: all zeroes */ },
 };
 
-static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = {
+static const struct pci_device_id ivb_uncore_pci_ids[] = {
         { /* IMC */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IVB_IMC),
                 .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
@@ -2001,7 +2001,7 @@ static DEFINE_PCI_DEVICE_TABLE(ivb_uncore_pci_ids) = {
         { /* end: all zeroes */ },
 };
 
-static DEFINE_PCI_DEVICE_TABLE(hsw_uncore_pci_ids) = {
+static const struct pci_device_id hsw_uncore_pci_ids[] = {
         { /* IMC */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HSW_IMC),
                 .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 507de8066594..0553a34fa0df 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -4,9 +4,14 @@
  * Created by: Hariprasad Nellitheertha (hari@in.ibm.com)
  *
  * Copyright (C) IBM Corporation, 2004. All rights reserved.
+ * Copyright (C) Red Hat Inc., 2014. All rights reserved.
+ * Authors:
+ *      Vivek Goyal <vgoyal@redhat.com>
  *
  */
 
+#define pr_fmt(fmt)     "kexec: " fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/smp.h>
@@ -16,6 +21,7 @@
 #include <linux/elf.h>
 #include <linux/elfcore.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include <asm/processor.h>
 #include <asm/hardirq.h>
@@ -28,6 +34,45 @@
 #include <asm/reboot.h>
 #include <asm/virtext.h>
 
+/* Alignment required for elf header segment */
+#define ELF_CORE_HEADER_ALIGN   4096
+
+/* This primarily represents number of split ranges due to exclusion */
+#define CRASH_MAX_RANGES        16
+
+struct crash_mem_range {
+        u64 start, end;
+};
+
+struct crash_mem {
+        unsigned int nr_ranges;
+        struct crash_mem_range ranges[CRASH_MAX_RANGES];
+};
+
+/* Misc data about ram ranges needed to prepare elf headers */
+struct crash_elf_data {
+        struct kimage *image;
+        /*
+         * Total number of ram ranges we have after various adjustments for
+         * GART, crash reserved region etc.
+         */
+        unsigned int max_nr_ranges;
+        unsigned long gart_start, gart_end;
+
+        /* Pointer to elf header */
+        void *ehdr;
+        /* Pointer to next phdr */
+        void *bufp;
+        struct crash_mem mem;
+};
+
+/* Used while preparing memory map entries for second kernel */
+struct crash_memmap_data {
+        struct boot_params *params;
+        /* Type of memory */
+        unsigned int type;
+};
+
 int in_crash_kexec;
 
 /*
@@ -39,6 +84,7 @@ int in_crash_kexec;
  */
 crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss = NULL;
 EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss);
+unsigned long crash_zero_bytes;
 
 static inline void cpu_crash_vmclear_loaded_vmcss(void)
 {
@@ -135,3 +181,520 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
 #endif
         crash_save_cpu(regs, safe_smp_processor_id());
 }
+
+#ifdef CONFIG_X86_64
+
+static int get_nr_ram_ranges_callback(unsigned long start_pfn,
+                                unsigned long nr_pfn, void *arg)
+{
+        int *nr_ranges = arg;
+
+        (*nr_ranges)++;
+        return 0;
+}
+
+static int get_gart_ranges_callback(u64 start, u64 end, void *arg)
+{
+        struct crash_elf_data *ced = arg;
+
+        ced->gart_start = start;
+        ced->gart_end = end;
+
+        /* Not expecting more than 1 gart aperture */
+        return 1;
+}
+
+
+/* Gather all the required information to prepare elf headers for ram regions */
+static void fill_up_crash_elf_data(struct crash_elf_data *ced,
+                                   struct kimage *image)
+{
+        unsigned int nr_ranges = 0;
+
+        ced->image = image;
+
+        walk_system_ram_range(0, -1, &nr_ranges,
+                                get_nr_ram_ranges_callback);
+
+        ced->max_nr_ranges = nr_ranges;
+
+        /*
+         * We don't create ELF headers for GART aperture as an attempt
+         * to dump this memory in second kernel leads to hang/crash.
+         * If gart aperture is present, one needs to exclude that region
+         * and that could lead to need of extra phdr.
+         */
+        walk_iomem_res("GART", IORESOURCE_MEM, 0, -1,
+                                ced, get_gart_ranges_callback);
+
+        /*
+         * If we have gart region, excluding that could potentially split
+         * a memory range, resulting in extra header. Account for  that.
+         */
+        if (ced->gart_end)
+                ced->max_nr_ranges++;
+
+        /* Exclusion of crash region could split memory ranges */
+        ced->max_nr_ranges++;
+
+        /* If crashk_low_res is not 0, another range split possible */
+        if (crashk_low_res.end != 0)
+                ced->max_nr_ranges++;
+}
+
+static int exclude_mem_range(struct crash_mem *mem,
+                unsigned long long mstart, unsigned long long mend)
+{
+        int i, j;
+        unsigned long long start, end;
+        struct crash_mem_range temp_range = {0, 0};
+
+        for (i = 0; i < mem->nr_ranges; i++) {
+                start = mem->ranges[i].start;
+                end = mem->ranges[i].end;
+
+                if (mstart > end || mend < start)
+                        continue;
+
+                /* Truncate any area outside of range */
+                if (mstart < start)
+                        mstart = start;
+                if (mend > end)
+                        mend = end;
+
+                /* Found completely overlapping range */
+                if (mstart == start && mend == end) {
+                        mem->ranges[i].start = 0;
+                        mem->ranges[i].end = 0;
+                        if (i < mem->nr_ranges - 1) {
+                                /* Shift rest of the ranges to left */
+                                for (j = i; j < mem->nr_ranges - 1; j++) {
+                                        mem->ranges[j].start =
+                                                mem->ranges[j+1].start;
+                                        mem->ranges[j].end =
+                                                        mem->ranges[j+1].end;
+                                }
+                        }
+                        mem->nr_ranges--;
+                        return 0;
+                }
+
+                if (mstart > start && mend < end) {
+                        /* Split original range */
+                        mem->ranges[i].end = mstart - 1;
+                        temp_range.start = mend + 1;
+                        temp_range.end = end;
+                } else if (mstart != start)
+                        mem->ranges[i].end = mstart - 1;
+                else
+                        mem->ranges[i].start = mend + 1;
+                break;
+        }
+
+        /* If a split happend, add the split to array */
+        if (!temp_range.end)
+                return 0;
+
+        /* Split happened */
+        if (i == CRASH_MAX_RANGES - 1) {
+                pr_err("Too many crash ranges after split\n");
+                return -ENOMEM;
+        }
+
+        /* Location where new range should go */
+        j = i + 1;
+        if (j < mem->nr_ranges) {
+                /* Move over all ranges one slot towards the end */
+                for (i = mem->nr_ranges - 1; i >= j; i--)
+                        mem->ranges[i + 1] = mem->ranges[i];
+        }
+
+        mem->ranges[j].start = temp_range.start;
+        mem->ranges[j].end = temp_range.end;
+        mem->nr_ranges++;
+        return 0;
+}
+
+/*
+ * Look for any unwanted ranges between mstart, mend and remove them. This
+ * might lead to split and split ranges are put in ced->mem.ranges[] array
+ */
+static int elf_header_exclude_ranges(struct crash_elf_data *ced,
+                unsigned long long mstart, unsigned long long mend)
+{
+        struct crash_mem *cmem = &ced->mem;
+        int ret = 0;
+
+        memset(cmem->ranges, 0, sizeof(cmem->ranges));
+
+        cmem->ranges[0].start = mstart;
+        cmem->ranges[0].end = mend;
+        cmem->nr_ranges = 1;
+
+        /* Exclude crashkernel region */
+        ret = exclude_mem_range(cmem, crashk_res.start, crashk_res.end);
+        if (ret)
+                return ret;
+
+        ret = exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);
+        if (ret)
+                return ret;
+
+        /* Exclude GART region */
+        if (ced->gart_end) {
+                ret = exclude_mem_range(cmem, ced->gart_start, ced->gart_end);
+                if (ret)
+                        return ret;
+        }
+
+        return ret;
+}
+
+static int prepare_elf64_ram_headers_callback(u64 start, u64 end, void *arg)
+{
+        struct crash_elf_data *ced = arg;
+        Elf64_Ehdr *ehdr;
+        Elf64_Phdr *phdr;
+        unsigned long mstart, mend;
+        struct kimage *image = ced->image;
+        struct crash_mem *cmem;
+        int ret, i;
+
+        ehdr = ced->ehdr;
+
+        /* Exclude unwanted mem ranges */
+        ret = elf_header_exclude_ranges(ced, start, end);
+        if (ret)
+                return ret;
+
+        /* Go through all the ranges in ced->mem.ranges[] and prepare phdr */
+        cmem = &ced->mem;
+
+        for (i = 0; i < cmem->nr_ranges; i++) {
+                mstart = cmem->ranges[i].start;
+                mend = cmem->ranges[i].end;
+
+                phdr = ced->bufp;
+                ced->bufp += sizeof(Elf64_Phdr);
+
+                phdr->p_type = PT_LOAD;
+                phdr->p_flags = PF_R|PF_W|PF_X;
+                phdr->p_offset  = mstart;
+
+                /*
+                 * If a range matches backup region, adjust offset to backup
+                 * segment.
+                 */
+                if (mstart == image->arch.backup_src_start &&
+                    (mend - mstart + 1) == image->arch.backup_src_sz)
+                        phdr->p_offset = image->arch.backup_load_addr;
+
+                phdr->p_paddr = mstart;
+                phdr->p_vaddr = (unsigned long long) __va(mstart);
+                phdr->p_filesz = phdr->p_memsz = mend - mstart + 1;
+                phdr->p_align = 0;
+                ehdr->e_phnum++;
+                pr_debug("Crash PT_LOAD elf header. phdr=%p vaddr=0x%llx, paddr=0x%llx, sz=0x%llx e_phnum=%d p_offset=0x%llx\n",
+                        phdr, phdr->p_vaddr, phdr->p_paddr, phdr->p_filesz,
+                        ehdr->e_phnum, phdr->p_offset);
+        }
+
+        return ret;
+}
+
+static int prepare_elf64_headers(struct crash_elf_data *ced,
+                void **addr, unsigned long *sz)
+{
+        Elf64_Ehdr *ehdr;
+        Elf64_Phdr *phdr;
+        unsigned long nr_cpus = num_possible_cpus(), nr_phdr, elf_sz;
+        unsigned char *buf, *bufp;
+        unsigned int cpu;
+        unsigned long long notes_addr;
+        int ret;
+
+        /* extra phdr for vmcoreinfo elf note */
+        nr_phdr = nr_cpus + 1;
+        nr_phdr += ced->max_nr_ranges;
+
+        /*
+         * kexec-tools creates an extra PT_LOAD phdr for kernel text mapping
+         * area on x86_64 (ffffffff80000000 - ffffffffa0000000).
+         * I think this is required by tools like gdb. So same physical
+         * memory will be mapped in two elf headers. One will contain kernel
+         * text virtual addresses and other will have __va(physical) addresses.
+         */
+
+        nr_phdr++;
+        elf_sz = sizeof(Elf64_Ehdr) + nr_phdr * sizeof(Elf64_Phdr);
+        elf_sz = ALIGN(elf_sz, ELF_CORE_HEADER_ALIGN);
+
+        buf = vzalloc(elf_sz);
+        if (!buf)
+                return -ENOMEM;
+
+        bufp = buf;
+        ehdr = (Elf64_Ehdr *)bufp;
+        bufp += sizeof(Elf64_Ehdr);
+        memcpy(ehdr->e_ident, ELFMAG, SELFMAG);
+        ehdr->e_ident[EI_CLASS] = ELFCLASS64;
+        ehdr->e_ident[EI_DATA] = ELFDATA2LSB;
+        ehdr->e_ident[EI_VERSION] = EV_CURRENT;
+        ehdr->e_ident[EI_OSABI] = ELF_OSABI;
+        memset(ehdr->e_ident + EI_PAD, 0, EI_NIDENT - EI_PAD);
+        ehdr->e_type = ET_CORE;
+        ehdr->e_machine = ELF_ARCH;
+        ehdr->e_version = EV_CURRENT;
+        ehdr->e_phoff = sizeof(Elf64_Ehdr);
+        ehdr->e_ehsize = sizeof(Elf64_Ehdr);
+        ehdr->e_phentsize = sizeof(Elf64_Phdr);
+
+        /* Prepare one phdr of type PT_NOTE for each present cpu */
+        for_each_present_cpu(cpu) {
+                phdr = (Elf64_Phdr *)bufp;
+                bufp += sizeof(Elf64_Phdr);
+                phdr->p_type = PT_NOTE;
+                notes_addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu));
+                phdr->p_offset = phdr->p_paddr = notes_addr;
+                phdr->p_filesz = phdr->p_memsz = sizeof(note_buf_t);
+                (ehdr->e_phnum)++;
+        }
+
+        /* Prepare one PT_NOTE header for vmcoreinfo */
+        phdr = (Elf64_Phdr *)bufp;
+        bufp += sizeof(Elf64_Phdr);
+        phdr->p_type = PT_NOTE;
+        phdr->p_offset = phdr->p_paddr = paddr_vmcoreinfo_note();
+        phdr->p_filesz = phdr->p_memsz = sizeof(vmcoreinfo_note);
+        (ehdr->e_phnum)++;
+
+#ifdef CONFIG_X86_64
+        /* Prepare PT_LOAD type program header for kernel text region */
+        phdr = (Elf64_Phdr *)bufp;
+        bufp += sizeof(Elf64_Phdr);
+        phdr->p_type = PT_LOAD;
+        phdr->p_flags = PF_R|PF_W|PF_X;
+        phdr->p_vaddr = (Elf64_Addr)_text;
+        phdr->p_filesz = phdr->p_memsz = _end - _text;
+        phdr->p_offset = phdr->p_paddr = __pa_symbol(_text);
+        (ehdr->e_phnum)++;
+#endif
+
+        /* Prepare PT_LOAD headers for system ram chunks. */
+        ced->ehdr = ehdr;
+        ced->bufp = bufp;
+        ret = walk_system_ram_res(0, -1, ced,
+                        prepare_elf64_ram_headers_callback);
+        if (ret < 0)
+                return ret;
+
+        *addr = buf;
+        *sz = elf_sz;
+        return 0;
+}
+
+/* Prepare elf headers. Return addr and size */
+static int prepare_elf_headers(struct kimage *image, void **addr,
+                                        unsigned long *sz)
+{
+        struct crash_elf_data *ced;
+        int ret;
+
+        ced = kzalloc(sizeof(*ced), GFP_KERNEL);
+        if (!ced)
+                return -ENOMEM;
+
+        fill_up_crash_elf_data(ced, image);
+
+        /* By default prepare 64bit headers */
+        ret =  prepare_elf64_headers(ced, addr, sz);
+        kfree(ced);
+        return ret;
+}
+
+static int add_e820_entry(struct boot_params *params, struct e820entry *entry)
+{
+        unsigned int nr_e820_entries;
+
+        nr_e820_entries = params->e820_entries;
+        if (nr_e820_entries >= E820MAX)
+                return 1;
+
+        memcpy(&params->e820_map[nr_e820_entries], entry,
+                        sizeof(struct e820entry));
+        params->e820_entries++;
+        return 0;
+}
+
+static int memmap_entry_callback(u64 start, u64 end, void *arg)
+{
+        struct crash_memmap_data *cmd = arg;
+        struct boot_params *params = cmd->params;
+        struct e820entry ei;
+
+        ei.addr = start;
+        ei.size = end - start + 1;
+        ei.type = cmd->type;
+        add_e820_entry(params, &ei);
+
+        return 0;
+}
+
+static int memmap_exclude_ranges(struct kimage *image, struct crash_mem *cmem,
+                                 unsigned long long mstart,
+                                 unsigned long long mend)
+{
+        unsigned long start, end;
+        int ret = 0;
+
+        cmem->ranges[0].start = mstart;
+        cmem->ranges[0].end = mend;
+        cmem->nr_ranges = 1;
+
+        /* Exclude Backup region */
+        start = image->arch.backup_load_addr;
+        end = start + image->arch.backup_src_sz - 1;
+        ret = exclude_mem_range(cmem, start, end);
+        if (ret)
+                return ret;
+
+        /* Exclude elf header region */
+        start = image->arch.elf_load_addr;
+        end = start + image->arch.elf_headers_sz - 1;
+        return exclude_mem_range(cmem, start, end);
+}
+
+/* Prepare memory map for crash dump kernel */
+int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params)
+{
+        int i, ret = 0;
+        unsigned long flags;
+        struct e820entry ei;
+        struct crash_memmap_data cmd;
+        struct crash_mem *cmem;
+
+        cmem = vzalloc(sizeof(struct crash_mem));
+        if (!cmem)
+                return -ENOMEM;
+
+        memset(&cmd, 0, sizeof(struct crash_memmap_data));
+        cmd.params = params;
+
+        /* Add first 640K segment */
+        ei.addr = image->arch.backup_src_start;
+        ei.size = image->arch.backup_src_sz;
+        ei.type = E820_RAM;
+        add_e820_entry(params, &ei);
+
+        /* Add ACPI tables */
+        cmd.type = E820_ACPI;
+        flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+        walk_iomem_res("ACPI Tables", flags, 0, -1, &cmd,
+                       memmap_entry_callback);
+
+        /* Add ACPI Non-volatile Storage */
+        cmd.type = E820_NVS;
+        walk_iomem_res("ACPI Non-volatile Storage", flags, 0, -1, &cmd,
+                        memmap_entry_callback);
+
+        /* Add crashk_low_res region */
+        if (crashk_low_res.end) {
+                ei.addr = crashk_low_res.start;
+                ei.size = crashk_low_res.end - crashk_low_res.start + 1;
+                ei.type = E820_RAM;
+                add_e820_entry(params, &ei);
+        }
+
+        /* Exclude some ranges from crashk_res and add rest to memmap */
+        ret = memmap_exclude_ranges(image, cmem, crashk_res.start,
+                                                crashk_res.end);
+        if (ret)
+                goto out;
+
+        for (i = 0; i < cmem->nr_ranges; i++) {
+                ei.size = cmem->ranges[i].end - cmem->ranges[i].start + 1;
+
+                /* If entry is less than a page, skip it */
+                if (ei.size < PAGE_SIZE)
+                        continue;
+                ei.addr = cmem->ranges[i].start;
+                ei.type = E820_RAM;
+                add_e820_entry(params, &ei);
+        }
+
+out:
+        vfree(cmem);
+        return ret;
+}
+
+static int determine_backup_region(u64 start, u64 end, void *arg)
+{
+        struct kimage *image = arg;
+
+        image->arch.backup_src_start = start;
+        image->arch.backup_src_sz = end - start + 1;
+
+        /* Expecting only one range for backup region */
+        return 1;
+}
+
+int crash_load_segments(struct kimage *image)
+{
+        unsigned long src_start, src_sz, elf_sz;
+        void *elf_addr;
+        int ret;
+
+        /*
+         * Determine and load a segment for backup area. First 640K RAM
+         * region is backup source
+         */
+
+        ret = walk_system_ram_res(KEXEC_BACKUP_SRC_START, KEXEC_BACKUP_SRC_END,
+                                image, determine_backup_region);
+
+        /* Zero or postive return values are ok */
+        if (ret < 0)
+                return ret;
+
+        src_start = image->arch.backup_src_start;
+        src_sz = image->arch.backup_src_sz;
+
+        /* Add backup segment. */
+        if (src_sz) {
+                /*
+                 * Ideally there is no source for backup segment. This is
+                 * copied in purgatory after crash. Just add a zero filled
+                 * segment for now to make sure checksum logic works fine.
+                 */
+                ret = kexec_add_buffer(image, (char *)&crash_zero_bytes,
+                                       sizeof(crash_zero_bytes), src_sz,
+                                       PAGE_SIZE, 0, -1, 0,
+                                       &image->arch.backup_load_addr);
+                if (ret)
+                        return ret;
+                pr_debug("Loaded backup region at 0x%lx backup_start=0x%lx memsz=0x%lx\n",
+                         image->arch.backup_load_addr, src_start, src_sz);
+        }
+
+        /* Prepare elf headers and add a segment */
+        ret = prepare_elf_headers(image, &elf_addr, &elf_sz);
+        if (ret)
+                return ret;
+
+        image->arch.elf_headers = elf_addr;
+        image->arch.elf_headers_sz = elf_sz;
+
+        ret = kexec_add_buffer(image, (char *)elf_addr, elf_sz, elf_sz,
+                        ELF_CORE_HEADER_ALIGN, 0, -1, 0,
+                        &image->arch.elf_load_addr);
+        if (ret) {
+                vfree((void *)image->arch.elf_headers);
+                return ret;
+        }
+        pr_debug("Loaded ELF headers at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
+                 image->arch.elf_load_addr, elf_sz, elf_sz);
+
+        return ret;
+}
+
+#endif /* CONFIG_X86_64 */
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 7db54b5d5f86..3d3503351242 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -21,6 +21,7 @@
 #include <asm/apic.h>
 #include <asm/pci_x86.h>
 #include <asm/setup.h>
+#include <asm/i8259.h>
 
 __initdata u64 initial_dtb;
 char __initdata cmd_line[COMMAND_LINE_SIZE];
@@ -165,82 +166,6 @@ static void __init dtb_lapic_setup(void)
 #ifdef CONFIG_X86_IO_APIC
 static unsigned int ioapic_id;
 
-static void __init dtb_add_ioapic(struct device_node *dn)
-{
-        struct resource r;
-        int ret;
-
-        ret = of_address_to_resource(dn, 0, &r);
-        if (ret) {
-                printk(KERN_ERR "Can't obtain address from node %s.\n",
-                                dn->full_name);
-                return;
-        }
-        mp_register_ioapic(++ioapic_id, r.start, gsi_top);
-}
-
-static void __init dtb_ioapic_setup(void)
-{
-        struct device_node *dn;
-
-        for_each_compatible_node(dn, NULL, "intel,ce4100-ioapic")
-                dtb_add_ioapic(dn);
-
-        if (nr_ioapics) {
-                of_ioapic = 1;
-                return;
-        }
-        printk(KERN_ERR "Error: No information about IO-APIC in OF.\n");
-}
-#else
-static void __init dtb_ioapic_setup(void) {}
-#endif
-
-static void __init dtb_apic_setup(void)
-{
-        dtb_lapic_setup();
-        dtb_ioapic_setup();
-}
-
-#ifdef CONFIG_OF_FLATTREE
-static void __init x86_flattree_get_config(void)
-{
-        u32 size, map_len;
-        void *dt;
-
-        if (!initial_dtb)
-                return;
-
-        map_len = max(PAGE_SIZE - (initial_dtb & ~PAGE_MASK), (u64)128);
-
-        initial_boot_params = dt = early_memremap(initial_dtb, map_len);
-        size = of_get_flat_dt_size();
-        if (map_len < size) {
-                early_iounmap(dt, map_len);
-                initial_boot_params = dt = early_memremap(initial_dtb, size);
-                map_len = size;
-        }
-
-        unflatten_and_copy_device_tree();
-        early_iounmap(dt, map_len);
-}
-#else
-static inline void x86_flattree_get_config(void) { }
-#endif
-
-void __init x86_dtb_init(void)
-{
-        x86_flattree_get_config();
-
-        if (!of_have_populated_dt())
-                return;
-
-        dtb_setup_hpet();
-        dtb_apic_setup();
-}
-
-#ifdef CONFIG_X86_IO_APIC
-
 struct of_ioapic_type {
         u32 out_type;
         u32 trigger;
@@ -276,10 +201,8 @@ static int ioapic_xlate(struct irq_domain *domain,
                         const u32 *intspec, u32 intsize,
                         irq_hw_number_t *out_hwirq, u32 *out_type)
 {
-        struct io_apic_irq_attr attr;
         struct of_ioapic_type *it;
-        u32 line, idx;
-        int rc;
+        u32 line, idx, gsi;
 
         if (WARN_ON(intsize < 2))
                 return -EINVAL;
@@ -291,13 +214,10 @@ static int ioapic_xlate(struct irq_domain *domain,
 
         it = &of_ioapic_type[intspec[1]];
 
-        idx = (u32) domain->host_data;
-        set_io_apic_irq_attr(&attr, idx, line, it->trigger, it->polarity);
-
-        rc = io_apic_setup_irq_pin_once(irq_find_mapping(domain, line),
-                                        cpu_to_node(0), &attr);
-        if (rc)
-                return rc;
+        idx = (u32)(long)domain->host_data;
+        gsi = mp_pin_to_gsi(idx, line);
+        if (mp_set_gsi_attr(gsi, it->trigger, it->polarity, cpu_to_node(0)))
+                return -EBUSY;
 
         *out_hwirq = line;
         *out_type = it->out_type;
@@ -305,81 +225,86 @@ static int ioapic_xlate(struct irq_domain *domain,
 }
 
 const struct irq_domain_ops ioapic_irq_domain_ops = {
+        .map = mp_irqdomain_map,
+        .unmap = mp_irqdomain_unmap,
         .xlate = ioapic_xlate,
 };
 
-static void dt_add_ioapic_domain(unsigned int ioapic_num,
-                struct device_node *np)
+static void __init dtb_add_ioapic(struct device_node *dn)
 {
-        struct irq_domain *id;
-        struct mp_ioapic_gsi *gsi_cfg;
+        struct resource r;
         int ret;
-        int num;
-
-        gsi_cfg = mp_ioapic_gsi_routing(ioapic_num);
-        num = gsi_cfg->gsi_end - gsi_cfg->gsi_base + 1;
-
-        id = irq_domain_add_linear(np, num, &ioapic_irq_domain_ops,
-                        (void *)ioapic_num);
-        BUG_ON(!id);
-        if (gsi_cfg->gsi_base == 0) {
-                /*
-                 * The first NR_IRQS_LEGACY irq descs are allocated in
-                 * early_irq_init() and need just a mapping. The
-                 * remaining irqs need both. All of them are preallocated
-                 * and assigned so we can keep the 1:1 mapping which the ioapic
-                 * is having.
-                 */
-                irq_domain_associate_many(id, 0, 0, NR_IRQS_LEGACY);
-
-                if (num > NR_IRQS_LEGACY) {
-                        ret = irq_create_strict_mappings(id, NR_IRQS_LEGACY,
-                                        NR_IRQS_LEGACY, num - NR_IRQS_LEGACY);
-                        if (ret)
-                                pr_err("Error creating mapping for the "
-                                                "remaining IRQs: %d\n", ret);
-                }
-                irq_set_default_host(id);
-        } else {
-                ret = irq_create_strict_mappings(id, gsi_cfg->gsi_base, 0, num);
-                if (ret)
-                        pr_err("Error creating IRQ mapping: %d\n", ret);
+        struct ioapic_domain_cfg cfg = {
+                .type = IOAPIC_DOMAIN_DYNAMIC,
+                .ops = &ioapic_irq_domain_ops,
+                .dev = dn,
+        };
+
+        ret = of_address_to_resource(dn, 0, &r);
+        if (ret) {
+                printk(KERN_ERR "Can't obtain address from node %s.\n",
+                                dn->full_name);
+                return;
         }
+        mp_register_ioapic(++ioapic_id, r.start, gsi_top, &cfg);
 }
 
-static void __init ioapic_add_ofnode(struct device_node *np)
+static void __init dtb_ioapic_setup(void)
 {
-        struct resource r;
-        int i, ret;
+        struct device_node *dn;
 
-        ret = of_address_to_resource(np, 0, &r);
-        if (ret) {
-                printk(KERN_ERR "Failed to obtain address for %s\n",
-                                np->full_name);
+        for_each_compatible_node(dn, NULL, "intel,ce4100-ioapic")
+                dtb_add_ioapic(dn);
+
+        if (nr_ioapics) {
+                of_ioapic = 1;
                 return;
         }
+        printk(KERN_ERR "Error: No information about IO-APIC in OF.\n");
+}
+#else
+static void __init dtb_ioapic_setup(void) {}
+#endif
 
-        for (i = 0; i < nr_ioapics; i++) {
-                if (r.start == mpc_ioapic_addr(i)) {
-                        dt_add_ioapic_domain(i, np);
-                        return;
-                }
-        }
-        printk(KERN_ERR "IOxAPIC at %s is not registered.\n", np->full_name);
+static void __init dtb_apic_setup(void)
+{
+        dtb_lapic_setup();
+        dtb_ioapic_setup();
 }
 
-void __init x86_add_irq_domains(void)
+#ifdef CONFIG_OF_FLATTREE
+static void __init x86_flattree_get_config(void)
 {
-        struct device_node *dp;
+        u32 size, map_len;
+        void *dt;
 
-        if (!of_have_populated_dt())
+        if (!initial_dtb)
                 return;
 
-        for_each_node_with_property(dp, "interrupt-controller") {
-                if (of_device_is_compatible(dp, "intel,ce4100-ioapic"))
-                        ioapic_add_ofnode(dp);
+        map_len = max(PAGE_SIZE - (initial_dtb & ~PAGE_MASK), (u64)128);
+
+        initial_boot_params = dt = early_memremap(initial_dtb, map_len);
+        size = of_get_flat_dt_size();
+        if (map_len < size) {
+                early_iounmap(dt, map_len);
+                initial_boot_params = dt = early_memremap(initial_dtb, size);
+                map_len = size;
         }
+
+        unflatten_and_copy_device_tree();
+        early_iounmap(dt, map_len);
 }
 #else
-void __init x86_add_irq_domains(void) { }
+static inline void x86_flattree_get_config(void) { }
 #endif
+
+void __init x86_dtb_init(void)
+{
+        x86_flattree_get_config();
+
+        if (!of_have_populated_dt())
+                return;
+
+        dtb_setup_hpet();
+        dtb_apic_setup();
+}
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index d5dd80814419..a9a4229f6161 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -375,7 +375,7 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
         /*
          * These bits must be zero.
          */
-        xsave_hdr->reserved1[0] = xsave_hdr->reserved1[1] = 0;
+        memset(xsave_hdr->reserved, 0, 48);
 
         return ret;
 }
diff --git a/arch/x86/kernel/iosf_mbi.c b/arch/x86/kernel/iosf_mbi.c
index d30acdc1229d..9030e83db6ee 100644
--- a/arch/x86/kernel/iosf_mbi.c
+++ b/arch/x86/kernel/iosf_mbi.c
@@ -202,7 +202,7 @@ static int iosf_mbi_probe(struct pci_dev *pdev,
         return 0;
 }
 
-static DEFINE_PCI_DEVICE_TABLE(iosf_mbi_pci_ids) = {
+static const struct pci_device_id iosf_mbi_pci_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_BAYTRAIL) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_QUARK_X1000) },
         { 0, },
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
index 7f50156542fb..1e6cff5814fa 100644
--- a/arch/x86/kernel/irqinit.c
+++ b/arch/x86/kernel/irqinit.c
@@ -78,7 +78,7 @@ void __init init_ISA_irqs(void)
 #endif
         legacy_pic->init(0);
 
-        for (i = 0; i < legacy_pic->nr_legacy_irqs; i++)
+        for (i = 0; i < nr_legacy_irqs(); i++)
                 irq_set_chip_and_handler_name(i, chip, handle_level_irq, name);
 }
 
@@ -87,12 +87,6 @@ void __init init_IRQ(void)
         int i;
 
         /*
-         * We probably need a better place for this, but it works for
-         * now ...
-         */
-        x86_add_irq_domains();
-
-        /*
          * On cpu 0, Assign IRQ0_VECTOR..IRQ15_VECTOR's to IRQ 0..15.
          * If these IRQ's are handled by legacy interrupt-controllers like PIC,
          * then this configuration will likely be static after the boot. If
@@ -100,7 +94,7 @@ void __init init_IRQ(void)
          * then this vector space can be freed and re-used dynamically as the
          * irq's migrate etc.
          */
-        for (i = 0; i < legacy_pic->nr_legacy_irqs; i++)
+        for (i = 0; i < nr_legacy_irqs(); i++)
                 per_cpu(vector_irq, 0)[IRQ0_VECTOR + i] = i;
 
         x86_init.irqs.intr_init();
@@ -121,7 +115,7 @@ void setup_vector_irq(int cpu)
          * legacy PIC, for the new cpu that is coming online, setup the static
          * legacy vector to irq mapping:
          */
-        for (irq = 0; irq < legacy_pic->nr_legacy_irqs; irq++)
+        for (irq = 0; irq < nr_legacy_irqs(); irq++)
                 per_cpu(vector_irq, cpu)[IRQ0_VECTOR + irq] = irq;
 #endif
 
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
new file mode 100644
index 000000000000..9642b9b33655
--- /dev/null
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -0,0 +1,553 @@
+/*
+ * Kexec bzImage loader
+ *
+ * Copyright (C) 2014 Red Hat Inc.
+ * Authors:
+ *      Vivek Goyal <vgoyal@redhat.com>
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#define pr_fmt(fmt)     "kexec-bzImage64: " fmt
+
+#include <linux/string.h>
+#include <linux/printk.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/kexec.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/efi.h>
+#include <linux/verify_pefile.h>
+#include <keys/system_keyring.h>
+
+#include <asm/bootparam.h>
+#include <asm/setup.h>
+#include <asm/crash.h>
+#include <asm/efi.h>
+
+#define MAX_ELFCOREHDR_STR_LEN  30      /* elfcorehdr=0x<64bit-value> */
+
+/*
+ * Defines lowest physical address for various segments. Not sure where
+ * exactly these limits came from. Current bzimage64 loader in kexec-tools
+ * uses these so I am retaining it. It can be changed over time as we gain
+ * more insight.
+ */
+#define MIN_PURGATORY_ADDR      0x3000
+#define MIN_BOOTPARAM_ADDR      0x3000
+#define MIN_KERNEL_LOAD_ADDR    0x100000
+#define MIN_INITRD_LOAD_ADDR    0x1000000
+
+/*
+ * This is a place holder for all boot loader specific data structure which
+ * gets allocated in one call but gets freed much later during cleanup
+ * time. Right now there is only one field but it can grow as need be.
+ */
+struct bzimage64_data {
+        /*
+         * Temporary buffer to hold bootparams buffer. This should be
+         * freed once the bootparam segment has been loaded.
+         */
+        void *bootparams_buf;
+};
+
+static int setup_initrd(struct boot_params *params,
+                unsigned long initrd_load_addr, unsigned long initrd_len)
+{
+        params->hdr.ramdisk_image = initrd_load_addr & 0xffffffffUL;
+        params->hdr.ramdisk_size = initrd_len & 0xffffffffUL;
+
+        params->ext_ramdisk_image = initrd_load_addr >> 32;
+        params->ext_ramdisk_size = initrd_len >> 32;
+
+        return 0;
+}
+
+static int setup_cmdline(struct kimage *image, struct boot_params *params,
+                         unsigned long bootparams_load_addr,
+                         unsigned long cmdline_offset, char *cmdline,
+                         unsigned long cmdline_len)
+{
+        char *cmdline_ptr = ((char *)params) + cmdline_offset;
+        unsigned long cmdline_ptr_phys, len;
+        uint32_t cmdline_low_32, cmdline_ext_32;
+
+        memcpy(cmdline_ptr, cmdline, cmdline_len);
+        if (image->type == KEXEC_TYPE_CRASH) {
+                len = sprintf(cmdline_ptr + cmdline_len - 1,
+                        " elfcorehdr=0x%lx", image->arch.elf_load_addr);
+                cmdline_len += len;
+        }
+        cmdline_ptr[cmdline_len - 1] = '\0';
+
+        pr_debug("Final command line is: %s\n", cmdline_ptr);
+        cmdline_ptr_phys = bootparams_load_addr + cmdline_offset;
+        cmdline_low_32 = cmdline_ptr_phys & 0xffffffffUL;
+        cmdline_ext_32 = cmdline_ptr_phys >> 32;
+
+        params->hdr.cmd_line_ptr = cmdline_low_32;
+        if (cmdline_ext_32)
+                params->ext_cmd_line_ptr = cmdline_ext_32;
+
+        return 0;
+}
+
+static int setup_e820_entries(struct boot_params *params)
+{
+        unsigned int nr_e820_entries;
+
+        nr_e820_entries = e820_saved.nr_map;
+
+        /* TODO: Pass entries more than E820MAX in bootparams setup data */
+        if (nr_e820_entries > E820MAX)
+                nr_e820_entries = E820MAX;
+
+        params->e820_entries = nr_e820_entries;
+        memcpy(&params->e820_map, &e820_saved.map,
+               nr_e820_entries * sizeof(struct e820entry));
+
+        return 0;
+}
+
+#ifdef CONFIG_EFI
+static int setup_efi_info_memmap(struct boot_params *params,
+                                  unsigned long params_load_addr,
+                                  unsigned int efi_map_offset,
+                                  unsigned int efi_map_sz)
+{
+        void *efi_map = (void *)params + efi_map_offset;
+        unsigned long efi_map_phys_addr = params_load_addr + efi_map_offset;
+        struct efi_info *ei = &params->efi_info;
+
+        if (!efi_map_sz)
+                return 0;
+
+        efi_runtime_map_copy(efi_map, efi_map_sz);
+
+        ei->efi_memmap = efi_map_phys_addr & 0xffffffff;
+        ei->efi_memmap_hi = efi_map_phys_addr >> 32;
+        ei->efi_memmap_size = efi_map_sz;
+
+        return 0;
+}
+
+static int
+prepare_add_efi_setup_data(struct boot_params *params,
+                       unsigned long params_load_addr,
+                       unsigned int efi_setup_data_offset)
+{
+        unsigned long setup_data_phys;
+        struct setup_data *sd = (void *)params + efi_setup_data_offset;
+        struct efi_setup_data *esd = (void *)sd + sizeof(struct setup_data);
+
+        esd->fw_vendor = efi.fw_vendor;
+        esd->runtime = efi.runtime;
+        esd->tables = efi.config_table;
+        esd->smbios = efi.smbios;
+
+        sd->type = SETUP_EFI;
+        sd->len = sizeof(struct efi_setup_data);
+
+        /* Add setup data */
+        setup_data_phys = params_load_addr + efi_setup_data_offset;
+        sd->next = params->hdr.setup_data;
+        params->hdr.setup_data = setup_data_phys;
+
+        return 0;
+}
+
+static int
+setup_efi_state(struct boot_params *params, unsigned long params_load_addr,
+                unsigned int efi_map_offset, unsigned int efi_map_sz,
+                unsigned int efi_setup_data_offset)
+{
+        struct efi_info *current_ei = &boot_params.efi_info;
+        struct efi_info *ei = &params->efi_info;
+
+        if (!current_ei->efi_memmap_size)
+                return 0;
+
+        /*
+         * If 1:1 mapping is not enabled, second kernel can not setup EFI
+         * and use EFI run time services. User space will have to pass
+         * acpi_rsdp=<addr> on kernel command line to make second kernel boot
+         * without efi.
+         */
+        if (efi_enabled(EFI_OLD_MEMMAP))
+                return 0;
+
+        ei->efi_loader_signature = current_ei->efi_loader_signature;
+        ei->efi_systab = current_ei->efi_systab;
+        ei->efi_systab_hi = current_ei->efi_systab_hi;
+
+        ei->efi_memdesc_version = current_ei->efi_memdesc_version;
+        ei->efi_memdesc_size = efi_get_runtime_map_desc_size();
+
+        setup_efi_info_memmap(params, params_load_addr, efi_map_offset,
+                              efi_map_sz);
+        prepare_add_efi_setup_data(params, params_load_addr,
+                                   efi_setup_data_offset);
+        return 0;
+}
+#endif /* CONFIG_EFI */
+
+static int
+setup_boot_parameters(struct kimage *image, struct boot_params *params,
+                      unsigned long params_load_addr,
+                      unsigned int efi_map_offset, unsigned int efi_map_sz,
+                      unsigned int efi_setup_data_offset)
+{
+        unsigned int nr_e820_entries;
+        unsigned long long mem_k, start, end;
+        int i, ret = 0;
+
+        /* Get subarch from existing bootparams */
+        params->hdr.hardware_subarch = boot_params.hdr.hardware_subarch;
+
+        /* Copying screen_info will do? */
+        memcpy(&params->screen_info, &boot_params.screen_info,
+                                sizeof(struct screen_info));
+
+        /* Fill in memsize later */
+        params->screen_info.ext_mem_k = 0;
+        params->alt_mem_k = 0;
+
+        /* Default APM info */
+        memset(&params->apm_bios_info, 0, sizeof(params->apm_bios_info));
+
+        /* Default drive info */
+        memset(&params->hd0_info, 0, sizeof(params->hd0_info));
+        memset(&params->hd1_info, 0, sizeof(params->hd1_info));
+
+        /* Default sysdesc table */
+        params->sys_desc_table.length = 0;
+
+        if (image->type == KEXEC_TYPE_CRASH) {
+                ret = crash_setup_memmap_entries(image, params);
+                if (ret)
+                        return ret;
+        } else
+                setup_e820_entries(params);
+
+        nr_e820_entries = params->e820_entries;
+
+        for (i = 0; i < nr_e820_entries; i++) {
+                if (params->e820_map[i].type != E820_RAM)
+                        continue;
+                start = params->e820_map[i].addr;
+                end = params->e820_map[i].addr + params->e820_map[i].size - 1;
+
+                if ((start <= 0x100000) && end > 0x100000) {
+                        mem_k = (end >> 10) - (0x100000 >> 10);
+                        params->screen_info.ext_mem_k = mem_k;
+                        params->alt_mem_k = mem_k;
+                        if (mem_k > 0xfc00)
+                                params->screen_info.ext_mem_k = 0xfc00; /* 64M*/
+                        if (mem_k > 0xffffffff)
+                                params->alt_mem_k = 0xffffffff;
+                }
+        }
+
+#ifdef CONFIG_EFI
+        /* Setup EFI state */
+        setup_efi_state(params, params_load_addr, efi_map_offset, efi_map_sz,
+                        efi_setup_data_offset);
+#endif
+
+        /* Setup EDD info */
+        memcpy(params->eddbuf, boot_params.eddbuf,
+                                EDDMAXNR * sizeof(struct edd_info));
+        params->eddbuf_entries = boot_params.eddbuf_entries;
+
+        memcpy(params->edd_mbr_sig_buffer, boot_params.edd_mbr_sig_buffer,
+               EDD_MBR_SIG_MAX * sizeof(unsigned int));
+
+        return ret;
+}
+
+int bzImage64_probe(const char *buf, unsigned long len)
+{
+        int ret = -ENOEXEC;
+        struct setup_header *header;
+
+        /* kernel should be atleast two sectors long */
+        if (len < 2 * 512) {
+                pr_err("File is too short to be a bzImage\n");
+                return ret;
+        }
+
+        header = (struct setup_header *)(buf + offsetof(struct boot_params, hdr));
+        if (memcmp((char *)&header->header, "HdrS", 4) != 0) {
+                pr_err("Not a bzImage\n");
+                return ret;
+        }
+
+        if (header->boot_flag != 0xAA55) {
+                pr_err("No x86 boot sector present\n");
+                return ret;
+        }
+
+        if (header->version < 0x020C) {
+                pr_err("Must be at least protocol version 2.12\n");
+                return ret;
+        }
+
+        if (!(header->loadflags & LOADED_HIGH)) {
+                pr_err("zImage not a bzImage\n");
+                return ret;
+        }
+
+        if (!(header->xloadflags & XLF_KERNEL_64)) {
+                pr_err("Not a bzImage64. XLF_KERNEL_64 is not set.\n");
+                return ret;
+        }
+
+        if (!(header->xloadflags & XLF_CAN_BE_LOADED_ABOVE_4G)) {
+                pr_err("XLF_CAN_BE_LOADED_ABOVE_4G is not set.\n");
+                return ret;
+        }
+
+        /*
+         * Can't handle 32bit EFI as it does not allow loading kernel
+         * above 4G. This should be handled by 32bit bzImage loader
+         */
+        if (efi_enabled(EFI_RUNTIME_SERVICES) && !efi_enabled(EFI_64BIT)) {
+                pr_debug("EFI is 32 bit. Can't load kernel above 4G.\n");
+                return ret;
+        }
+
+        /* I've got a bzImage */
+        pr_debug("It's a relocatable bzImage64\n");
+        ret = 0;
+
+        return ret;
+}
+
+void *bzImage64_load(struct kimage *image, char *kernel,
+                     unsigned long kernel_len, char *initrd,
+                     unsigned long initrd_len, char *cmdline,
+                     unsigned long cmdline_len)
+{
+
+        struct setup_header *header;
+        int setup_sects, kern16_size, ret = 0;
+        unsigned long setup_header_size, params_cmdline_sz, params_misc_sz;
+        struct boot_params *params;
+        unsigned long bootparam_load_addr, kernel_load_addr, initrd_load_addr;
+        unsigned long purgatory_load_addr;
+        unsigned long kernel_bufsz, kernel_memsz, kernel_align;
+        char *kernel_buf;
+        struct bzimage64_data *ldata;
+        struct kexec_entry64_regs regs64;
+        void *stack;
+        unsigned int setup_hdr_offset = offsetof(struct boot_params, hdr);
+        unsigned int efi_map_offset, efi_map_sz, efi_setup_data_offset;
+
+        header = (struct setup_header *)(kernel + setup_hdr_offset);
+        setup_sects = header->setup_sects;
+        if (setup_sects == 0)
+                setup_sects = 4;
+
+        kern16_size = (setup_sects + 1) * 512;
+        if (kernel_len < kern16_size) {
+                pr_err("bzImage truncated\n");
+                return ERR_PTR(-ENOEXEC);
+        }
+
+        if (cmdline_len > header->cmdline_size) {
+                pr_err("Kernel command line too long\n");
+                return ERR_PTR(-EINVAL);
+        }
+
+        /*
+         * In case of crash dump, we will append elfcorehdr=<addr> to
+         * command line. Make sure it does not overflow
+         */
+        if (cmdline_len + MAX_ELFCOREHDR_STR_LEN > header->cmdline_size) {
+                pr_debug("Appending elfcorehdr=<addr> to command line exceeds maximum allowed length\n");
+                return ERR_PTR(-EINVAL);
+        }
+
+        /* Allocate and load backup region */
+        if (image->type == KEXEC_TYPE_CRASH) {
+                ret = crash_load_segments(image);
+                if (ret)
+                        return ERR_PTR(ret);
+        }
+
+        /*
+         * Load purgatory. For 64bit entry point, purgatory  code can be
+         * anywhere.
+         */
+        ret = kexec_load_purgatory(image, MIN_PURGATORY_ADDR, ULONG_MAX, 1,
+                                   &purgatory_load_addr);
+        if (ret) {
+                pr_err("Loading purgatory failed\n");
+                return ERR_PTR(ret);
+        }
+
+        pr_debug("Loaded purgatory at 0x%lx\n", purgatory_load_addr);
+
+
+        /*
+         * Load Bootparams and cmdline and space for efi stuff.
+         *
+         * Allocate memory together for multiple data structures so
+         * that they all can go in single area/segment and we don't
+         * have to create separate segment for each. Keeps things
+         * little bit simple
+         */
+        efi_map_sz = efi_get_runtime_map_size();
+        efi_map_sz = ALIGN(efi_map_sz, 16);
+        params_cmdline_sz = sizeof(struct boot_params) + cmdline_len +
+                                MAX_ELFCOREHDR_STR_LEN;
+        params_cmdline_sz = ALIGN(params_cmdline_sz, 16);
+        params_misc_sz = params_cmdline_sz + efi_map_sz +
+                                sizeof(struct setup_data) +
+                                sizeof(struct efi_setup_data);
+
+        params = kzalloc(params_misc_sz, GFP_KERNEL);
+        if (!params)
+                return ERR_PTR(-ENOMEM);
+        efi_map_offset = params_cmdline_sz;
+        efi_setup_data_offset = efi_map_offset + efi_map_sz;
+
+        /* Copy setup header onto bootparams. Documentation/x86/boot.txt */
+        setup_header_size = 0x0202 + kernel[0x0201] - setup_hdr_offset;
+
+        /* Is there a limit on setup header size? */
+        memcpy(&params->hdr, (kernel + setup_hdr_offset), setup_header_size);
+
+        ret = kexec_add_buffer(image, (char *)params, params_misc_sz,
+                               params_misc_sz, 16, MIN_BOOTPARAM_ADDR,
+                               ULONG_MAX, 1, &bootparam_load_addr);
+        if (ret)
+                goto out_free_params;
+        pr_debug("Loaded boot_param, command line and misc at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
+                 bootparam_load_addr, params_misc_sz, params_misc_sz);
+
+        /* Load kernel */
+        kernel_buf = kernel + kern16_size;
+        kernel_bufsz =  kernel_len - kern16_size;
+        kernel_memsz = PAGE_ALIGN(header->init_size);
+        kernel_align = header->kernel_alignment;
+
+        ret = kexec_add_buffer(image, kernel_buf,
+                               kernel_bufsz, kernel_memsz, kernel_align,
+                               MIN_KERNEL_LOAD_ADDR, ULONG_MAX, 1,
+                               &kernel_load_addr);
+        if (ret)
+                goto out_free_params;
+
+        pr_debug("Loaded 64bit kernel at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
+                 kernel_load_addr, kernel_memsz, kernel_memsz);
+
+        /* Load initrd high */
+        if (initrd) {
+                ret = kexec_add_buffer(image, initrd, initrd_len, initrd_len,
+                                       PAGE_SIZE, MIN_INITRD_LOAD_ADDR,
+                                       ULONG_MAX, 1, &initrd_load_addr);
+                if (ret)
+                        goto out_free_params;
+
+                pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
+                                initrd_load_addr, initrd_len, initrd_len);
+
+                setup_initrd(params, initrd_load_addr, initrd_len);
+        }
+
+        setup_cmdline(image, params, bootparam_load_addr,
+                      sizeof(struct boot_params), cmdline, cmdline_len);
+
+        /* bootloader info. Do we need a separate ID for kexec kernel loader? */
+        params->hdr.type_of_loader = 0x0D << 4;
+        params->hdr.loadflags = 0;
+
+        /* Setup purgatory regs for entry */
+        ret = kexec_purgatory_get_set_symbol(image, "entry64_regs", &regs64,
+                                             sizeof(regs64), 1);
+        if (ret)
+                goto out_free_params;
+
+        regs64.rbx = 0; /* Bootstrap Processor */
+        regs64.rsi = bootparam_load_addr;
+        regs64.rip = kernel_load_addr + 0x200;
+        stack = kexec_purgatory_get_symbol_addr(image, "stack_end");
+        if (IS_ERR(stack)) {
+                pr_err("Could not find address of symbol stack_end\n");
+                ret = -EINVAL;
+                goto out_free_params;
+        }
+
+        regs64.rsp = (unsigned long)stack;
+        ret = kexec_purgatory_get_set_symbol(image, "entry64_regs", &regs64,
+                                             sizeof(regs64), 0);
+        if (ret)
+                goto out_free_params;
+
+        ret = setup_boot_parameters(image, params, bootparam_load_addr,
+                                    efi_map_offset, efi_map_sz,
+                                    efi_setup_data_offset);
+        if (ret)
+                goto out_free_params;
+
+        /* Allocate loader specific data */
+        ldata = kzalloc(sizeof(struct bzimage64_data), GFP_KERNEL);
+        if (!ldata) {
+                ret = -ENOMEM;
+                goto out_free_params;
+        }
+
+        /*
+         * Store pointer to params so that it could be freed after loading
+         * params segment has been loaded and contents have been copied
+         * somewhere else.
+         */
+        ldata->bootparams_buf = params;
+        return ldata;
+
+out_free_params:
+        kfree(params);
+        return ERR_PTR(ret);
+}
+
+/* This cleanup function is called after various segments have been loaded */
+int bzImage64_cleanup(void *loader_data)
+{
+        struct bzimage64_data *ldata = loader_data;
+
+        if (!ldata)
+                return 0;
+
+        kfree(ldata->bootparams_buf);
+        ldata->bootparams_buf = NULL;
+
+        return 0;
+}
+
+#ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG
+int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len)
+{
+        bool trusted;
+        int ret;
+
+        ret = verify_pefile_signature(kernel, kernel_len,
+                                      system_trusted_keyring, &trusted);
+        if (ret < 0)
+                return ret;
+        if (!trusted)
+                return -EKEYREJECTED;
+        return 0;
+}
+#endif
+
+struct kexec_file_ops kexec_bzImage64_ops = {
+        .probe = bzImage64_probe,
+        .load = bzImage64_load,
+        .cleanup = bzImage64_cleanup,
+#ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG
+        .verify_sig = bzImage64_verify_sig,
+#endif
+};
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index 679cef0791cd..8b04018e5d1f 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -6,6 +6,8 @@
  * Version 2.  See the file COPYING for more details.
  */
 
+#define pr_fmt(fmt)     "kexec: " fmt
+
 #include <linux/mm.h>
 #include <linux/kexec.h>
 #include <linux/string.h>
@@ -21,6 +23,11 @@
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
 #include <asm/debugreg.h>
+#include <asm/kexec-bzimage64.h>
+
+static struct kexec_file_ops *kexec_file_loaders[] = {
+                &kexec_bzImage64_ops,
+};
 
 static void free_transition_pgtable(struct kimage *image)
 {
@@ -171,6 +178,38 @@ static void load_segments(void)
                 );
 }
 
+/* Update purgatory as needed after various image segments have been prepared */
+static int arch_update_purgatory(struct kimage *image)
+{
+        int ret = 0;
+
+        if (!image->file_mode)
+                return 0;
+
+        /* Setup copying of backup region */
+        if (image->type == KEXEC_TYPE_CRASH) {
+                ret = kexec_purgatory_get_set_symbol(image, "backup_dest",
+                                &image->arch.backup_load_addr,
+                                sizeof(image->arch.backup_load_addr), 0);
+                if (ret)
+                        return ret;
+
+                ret = kexec_purgatory_get_set_symbol(image, "backup_src",
+                                &image->arch.backup_src_start,
+                                sizeof(image->arch.backup_src_start), 0);
+                if (ret)
+                        return ret;
+
+                ret = kexec_purgatory_get_set_symbol(image, "backup_sz",
+                                &image->arch.backup_src_sz,
+                                sizeof(image->arch.backup_src_sz), 0);
+                if (ret)
+                        return ret;
+        }
+
+        return ret;
+}
+
 int machine_kexec_prepare(struct kimage *image)
 {
         unsigned long start_pgtable;
@@ -184,6 +223,11 @@ int machine_kexec_prepare(struct kimage *image)
         if (result)
                 return result;
 
+        /* update purgatory as needed */
+        result = arch_update_purgatory(image);
+        if (result)
+                return result;
+
         return 0;
 }
 
@@ -283,3 +327,198 @@ void arch_crash_save_vmcoreinfo(void)
                               (unsigned long)&_text - __START_KERNEL);
 }
 
+/* arch-dependent functionality related to kexec file-based syscall */
+
+int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
+                                  unsigned long buf_len)
+{
+        int i, ret = -ENOEXEC;
+        struct kexec_file_ops *fops;
+
+        for (i = 0; i < ARRAY_SIZE(kexec_file_loaders); i++) {
+                fops = kexec_file_loaders[i];
+                if (!fops || !fops->probe)
+                        continue;
+
+                ret = fops->probe(buf, buf_len);
+                if (!ret) {
+                        image->fops = fops;
+                        return ret;
+                }
+        }
+
+        return ret;
+}
+
+void *arch_kexec_kernel_image_load(struct kimage *image)
+{
+        vfree(image->arch.elf_headers);
+        image->arch.elf_headers = NULL;
+
+        if (!image->fops || !image->fops->load)
+                return ERR_PTR(-ENOEXEC);
+
+        return image->fops->load(image, image->kernel_buf,
+                                 image->kernel_buf_len, image->initrd_buf,
+                                 image->initrd_buf_len, image->cmdline_buf,
+                                 image->cmdline_buf_len);
+}
+
+int arch_kimage_file_post_load_cleanup(struct kimage *image)
+{
+        if (!image->fops || !image->fops->cleanup)
+                return 0;
+
+        return image->fops->cleanup(image->image_loader_data);
+}
+
+int arch_kexec_kernel_verify_sig(struct kimage *image, void *kernel,
+                                 unsigned long kernel_len)
+{
+        if (!image->fops || !image->fops->verify_sig) {
+                pr_debug("kernel loader does not support signature verification.");
+                return -EKEYREJECTED;
+        }
+
+        return image->fops->verify_sig(kernel, kernel_len);
+}
+
+/*
+ * Apply purgatory relocations.
+ *
+ * ehdr: Pointer to elf headers
+ * sechdrs: Pointer to section headers.
+ * relsec: section index of SHT_RELA section.
+ *
+ * TODO: Some of the code belongs to generic code. Move that in kexec.c.
+ */
+int arch_kexec_apply_relocations_add(const Elf64_Ehdr *ehdr,
+                                     Elf64_Shdr *sechdrs, unsigned int relsec)
+{
+        unsigned int i;
+        Elf64_Rela *rel;
+        Elf64_Sym *sym;
+        void *location;
+        Elf64_Shdr *section, *symtabsec;
+        unsigned long address, sec_base, value;
+        const char *strtab, *name, *shstrtab;
+
+        /*
+         * ->sh_offset has been modified to keep the pointer to section
+         * contents in memory
+         */
+        rel = (void *)sechdrs[relsec].sh_offset;
+
+        /* Section to which relocations apply */
+        section = &sechdrs[sechdrs[relsec].sh_info];
+
+        pr_debug("Applying relocate section %u to %u\n", relsec,
+                 sechdrs[relsec].sh_info);
+
+        /* Associated symbol table */
+        symtabsec = &sechdrs[sechdrs[relsec].sh_link];
+
+        /* String table */
+        if (symtabsec->sh_link >= ehdr->e_shnum) {
+                /* Invalid strtab section number */
+                pr_err("Invalid string table section index %d\n",
+                       symtabsec->sh_link);
+                return -ENOEXEC;
+        }
+
+        strtab = (char *)sechdrs[symtabsec->sh_link].sh_offset;
+
+        /* section header string table */
+        shstrtab = (char *)sechdrs[ehdr->e_shstrndx].sh_offset;
+
+        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
+
+                /*
+                 * rel[i].r_offset contains byte offset from beginning
+                 * of section to the storage unit affected.
+                 *
+                 * This is location to update (->sh_offset). This is temporary
+                 * buffer where section is currently loaded. This will finally
+                 * be loaded to a different address later, pointed to by
+                 * ->sh_addr. kexec takes care of moving it
+                 *  (kexec_load_segment()).
+                 */
+                location = (void *)(section->sh_offset + rel[i].r_offset);
+
+                /* Final address of the location */
+                address = section->sh_addr + rel[i].r_offset;
+
+                /*
+                 * rel[i].r_info contains information about symbol table index
+                 * w.r.t which relocation must be made and type of relocation
+                 * to apply. ELF64_R_SYM() and ELF64_R_TYPE() macros get
+                 * these respectively.
+                 */
+                sym = (Elf64_Sym *)symtabsec->sh_offset +
+                                ELF64_R_SYM(rel[i].r_info);
+
+                if (sym->st_name)
+                        name = strtab + sym->st_name;
+                else
+                        name = shstrtab + sechdrs[sym->st_shndx].sh_name;
+
+                pr_debug("Symbol: %s info: %02x shndx: %02x value=%llx size: %llx\n",
+                         name, sym->st_info, sym->st_shndx, sym->st_value,
+                         sym->st_size);
+
+                if (sym->st_shndx == SHN_UNDEF) {
+                        pr_err("Undefined symbol: %s\n", name);
+                        return -ENOEXEC;
+                }
+
+                if (sym->st_shndx == SHN_COMMON) {
+                        pr_err("symbol '%s' in common section\n", name);
+                        return -ENOEXEC;
+                }
+
+                if (sym->st_shndx == SHN_ABS)
+                        sec_base = 0;
+                else if (sym->st_shndx >= ehdr->e_shnum) {
+                        pr_err("Invalid section %d for symbol %s\n",
+                               sym->st_shndx, name);
+                        return -ENOEXEC;
+                } else
+                        sec_base = sechdrs[sym->st_shndx].sh_addr;
+
+                value = sym->st_value;
+                value += sec_base;
+                value += rel[i].r_addend;
+
+                switch (ELF64_R_TYPE(rel[i].r_info)) {
+                case R_X86_64_NONE:
+                        break;
+                case R_X86_64_64:
+                        *(u64 *)location = value;
+                        break;
+                case R_X86_64_32:
+                        *(u32 *)location = value;
+                        if (value != *(u32 *)location)
+                                goto overflow;
+                        break;
+                case R_X86_64_32S:
+                        *(s32 *)location = value;
+                        if ((s64)value != *(s32 *)location)
+                                goto overflow;
+                        break;
+                case R_X86_64_PC32:
+                        value -= (u64)address;
+                        *(u32 *)location = value;
+                        break;
+                default:
+                        pr_err("Unknown rela relocation: %llu\n",
+                               ELF64_R_TYPE(rel[i].r_info));
+                        return -ENOEXEC;
+                }
+        }
+        return 0;
+
+overflow:
+        pr_err("Overflow in relocation type %d value 0x%lx\n",
+               (int)ELF64_R_TYPE(rel[i].r_info), value);
+        return -ENOEXEC;
+}
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index d2b56489d70f..2d2a237f2c73 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -19,6 +19,7 @@
 #include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/pci.h>
+#include <linux/irqdomain.h>
 
 #include <asm/mtrr.h>
 #include <asm/mpspec.h>
@@ -67,7 +68,7 @@ static void __init MP_processor_info(struct mpc_cpu *m)
                 boot_cpu_physical_apicid = m->apicid;
         }
 
-        printk(KERN_INFO "Processor #%d%s\n", m->apicid, bootup_cpu);
+        pr_info("Processor #%d%s\n", m->apicid, bootup_cpu);
         generic_processor_info(apicid, m->apicver);
 }
 
@@ -87,9 +88,8 @@ static void __init MP_bus_info(struct mpc_bus *m)
 
 #if MAX_MP_BUSSES < 256
         if (m->busid >= MAX_MP_BUSSES) {
-                printk(KERN_WARNING "MP table busid value (%d) for bustype %s "
-                       " is too large, max. supported is %d\n",
-                       m->busid, str, MAX_MP_BUSSES - 1);
+                pr_warn("MP table busid value (%d) for bustype %s is too large, max. supported is %d\n",
+                        m->busid, str, MAX_MP_BUSSES - 1);
                 return;
         }
 #endif
@@ -110,19 +110,29 @@ static void __init MP_bus_info(struct mpc_bus *m)
                 mp_bus_id_to_type[m->busid] = MP_BUS_EISA;
 #endif
         } else
-                printk(KERN_WARNING "Unknown bustype %s - ignoring\n", str);
+                pr_warn("Unknown bustype %s - ignoring\n", str);
 }
 
+static struct irq_domain_ops mp_ioapic_irqdomain_ops = {
+        .map = mp_irqdomain_map,
+        .unmap = mp_irqdomain_unmap,
+};
+
 static void __init MP_ioapic_info(struct mpc_ioapic *m)
 {
+        struct ioapic_domain_cfg cfg = {
+                .type = IOAPIC_DOMAIN_LEGACY,
+                .ops = &mp_ioapic_irqdomain_ops,
+        };
+
         if (m->flags & MPC_APIC_USABLE)
-                mp_register_ioapic(m->apicid, m->apicaddr, gsi_top);
+                mp_register_ioapic(m->apicid, m->apicaddr, gsi_top, &cfg);
 }
 
 static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq)
 {
-        apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"
-                " IRQ %02x, APIC ID %x, APIC INT %02x\n",
+        apic_printk(APIC_VERBOSE,
+                "Int: type %d, pol %d, trig %d, bus %02x, IRQ %02x, APIC ID %x, APIC INT %02x\n",
                 mp_irq->irqtype, mp_irq->irqflag & 3,
                 (mp_irq->irqflag >> 2) & 3, mp_irq->srcbus,
                 mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq);
@@ -135,8 +145,8 @@ static inline void __init MP_ioapic_info(struct mpc_ioapic *m) {}
 
 static void __init MP_lintsrc_info(struct mpc_lintsrc *m)
 {
-        apic_printk(APIC_VERBOSE, "Lint: type %d, pol %d, trig %d, bus %02x,"
-                " IRQ %02x, APIC ID %x, APIC LINT %02x\n",
+        apic_printk(APIC_VERBOSE,
+                "Lint: type %d, pol %d, trig %d, bus %02x, IRQ %02x, APIC ID %x, APIC LINT %02x\n",
                 m->irqtype, m->irqflag & 3, (m->irqflag >> 2) & 3, m->srcbusid,
                 m->srcbusirq, m->destapic, m->destapiclint);
 }
@@ -148,34 +158,33 @@ static int __init smp_check_mpc(struct mpc_table *mpc, char *oem, char *str)
 {
 
         if (memcmp(mpc->signature, MPC_SIGNATURE, 4)) {
-                printk(KERN_ERR "MPTABLE: bad signature [%c%c%c%c]!\n",
+                pr_err("MPTABLE: bad signature [%c%c%c%c]!\n",
                        mpc->signature[0], mpc->signature[1],
                        mpc->signature[2], mpc->signature[3]);
                 return 0;
         }
         if (mpf_checksum((unsigned char *)mpc, mpc->length)) {
-                printk(KERN_ERR "MPTABLE: checksum error!\n");
+                pr_err("MPTABLE: checksum error!\n");
                 return 0;
         }
         if (mpc->spec != 0x01 && mpc->spec != 0x04) {
-                printk(KERN_ERR "MPTABLE: bad table version (%d)!!\n",
-                       mpc->spec);
+                pr_err("MPTABLE: bad table version (%d)!!\n", mpc->spec);
                 return 0;
         }
         if (!mpc->lapic) {
-                printk(KERN_ERR "MPTABLE: null local APIC address!\n");
+                pr_err("MPTABLE: null local APIC address!\n");
                 return 0;
         }
         memcpy(oem, mpc->oem, 8);
         oem[8] = 0;
-        printk(KERN_INFO "MPTABLE: OEM ID: %s\n", oem);
+        pr_info("MPTABLE: OEM ID: %s\n", oem);
 
         memcpy(str, mpc->productid, 12);
         str[12] = 0;
 
-        printk(KERN_INFO "MPTABLE: Product ID: %s\n", str);
+        pr_info("MPTABLE: Product ID: %s\n", str);
 
-        printk(KERN_INFO "MPTABLE: APIC at: 0x%X\n", mpc->lapic);
+        pr_info("MPTABLE: APIC at: 0x%X\n", mpc->lapic);
 
         return 1;
 }
@@ -188,8 +197,8 @@ static void skip_entry(unsigned char **ptr, int *count, int size)
 
 static void __init smp_dump_mptable(struct mpc_table *mpc, unsigned char *mpt)
 {
-        printk(KERN_ERR "Your mptable is wrong, contact your HW vendor!\n"
-                "type %x\n", *mpt);
+        pr_err("Your mptable is wrong, contact your HW vendor!\n");
+        pr_cont("type %x\n", *mpt);
         print_hex_dump(KERN_ERR, "  ", DUMP_PREFIX_ADDRESS, 16,
                         1, mpc, mpc->length, 1);
 }
@@ -207,9 +216,6 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
         if (!smp_check_mpc(mpc, oem, str))
                 return 0;
 
-#ifdef CONFIG_X86_32
-        generic_mps_oem_check(mpc, oem, str);
-#endif
         /* Initialize the lapic mapping */
         if (!acpi_lapic)
                 register_lapic_address(mpc->lapic);
@@ -259,7 +265,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
         }
 
         if (!num_processors)
-                printk(KERN_ERR "MPTABLE: no processors registered!\n");
+                pr_err("MPTABLE: no processors registered!\n");
         return num_processors;
 }
 
@@ -295,16 +301,13 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)
          *  If it does, we assume it's valid.
          */
         if (mpc_default_type == 5) {
-                printk(KERN_INFO "ISA/PCI bus type with no IRQ information... "
-                       "falling back to ELCR\n");
+                pr_info("ISA/PCI bus type with no IRQ information... falling back to ELCR\n");
 
                 if (ELCR_trigger(0) || ELCR_trigger(1) || ELCR_trigger(2) ||
                     ELCR_trigger(13))
-                        printk(KERN_ERR "ELCR contains invalid data... "
-                               "not using ELCR\n");
+                        pr_err("ELCR contains invalid data... not using ELCR\n");
                 else {
-                        printk(KERN_INFO
-                               "Using ELCR to identify PCI interrupts\n");
+                        pr_info("Using ELCR to identify PCI interrupts\n");
                         ELCR_fallback = 1;
                 }
         }
@@ -353,7 +356,7 @@ static void __init construct_ioapic_table(int mpc_default_type)
         bus.busid = 0;
         switch (mpc_default_type) {
         default:
-                printk(KERN_ERR "???\nUnknown standard configuration %d\n",
+                pr_err("???\nUnknown standard configuration %d\n",
                        mpc_default_type);
                 /* fall through */
         case 1:
@@ -462,8 +465,8 @@ static int __init check_physptr(struct mpf_intel *mpf, unsigned int early)
 #ifdef CONFIG_X86_LOCAL_APIC
                 smp_found_config = 0;
 #endif
-                printk(KERN_ERR "BIOS bug, MP table errors detected!...\n"
-                        "... disabling SMP support. (tell your hw vendor)\n");
+                pr_err("BIOS bug, MP table errors detected!...\n");
+                pr_cont("... disabling SMP support. (tell your hw vendor)\n");
                 early_iounmap(mpc, size);
                 return -1;
         }
@@ -481,8 +484,7 @@ static int __init check_physptr(struct mpf_intel *mpf, unsigned int early)
         if (!mp_irq_entries) {
                 struct mpc_bus bus;
 
-                printk(KERN_ERR "BIOS bug, no explicit IRQ entries, "
-                       "using default mptable. (tell your hw vendor)\n");
+                pr_err("BIOS bug, no explicit IRQ entries, using default mptable. (tell your hw vendor)\n");
 
                 bus.type = MP_BUS;
                 bus.busid = 0;
@@ -516,14 +518,14 @@ void __init default_get_smp_config(unsigned int early)
         if (acpi_lapic && acpi_ioapic)
                 return;
 
-        printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",
-               mpf->specification);
+        pr_info("Intel MultiProcessor Specification v1.%d\n",
+                mpf->specification);
 #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
         if (mpf->feature2 & (1 << 7)) {
-                printk(KERN_INFO "    IMCR and PIC compatibility mode.\n");
+                pr_info("    IMCR and PIC compatibility mode.\n");
                 pic_mode = 1;
         } else {
-                printk(KERN_INFO "    Virtual Wire compatibility mode.\n");
+                pr_info("    Virtual Wire compatibility mode.\n");
                 pic_mode = 0;
         }
 #endif
@@ -539,8 +541,7 @@ void __init default_get_smp_config(unsigned int early)
                         return;
                 }
 
-                printk(KERN_INFO "Default MP configuration #%d\n",
-                       mpf->feature1);
+                pr_info("Default MP configuration #%d\n", mpf->feature1);
                 construct_default_ISA_mptable(mpf->feature1);
 
         } else if (mpf->physptr) {
@@ -550,7 +551,7 @@ void __init default_get_smp_config(unsigned int early)
                 BUG();
 
         if (!early)
-                printk(KERN_INFO "Processors: %d\n", num_processors);
+                pr_info("Processors: %d\n", num_processors);
         /*
          * Only use the first configuration found.
          */
@@ -583,10 +584,10 @@ static int __init smp_scan_config(unsigned long base, unsigned long length)
 #endif
                         mpf_found = mpf;
 
-                        printk(KERN_INFO "found SMP MP-table at [mem %#010llx-%#010llx] mapped at [%p]\n",
-                               (unsigned long long) virt_to_phys(mpf),
-                               (unsigned long long) virt_to_phys(mpf) +
-                               sizeof(*mpf) - 1, mpf);
+                        pr_info("found SMP MP-table at [mem %#010llx-%#010llx] mapped at [%p]\n",
+                                (unsigned long long) virt_to_phys(mpf),
+                                (unsigned long long) virt_to_phys(mpf) +
+                                sizeof(*mpf) - 1, mpf);
 
                         mem = virt_to_phys(mpf);
                         memblock_reserve(mem, sizeof(*mpf));
@@ -735,7 +736,7 @@ static int  __init replace_intsrc_all(struct mpc_table *mpc,
         int nr_m_spare = 0;
         unsigned char *mpt = ((unsigned char *)mpc) + count;
 
-        printk(KERN_INFO "mpc_length %x\n", mpc->length);
+        pr_info("mpc_length %x\n", mpc->length);
         while (count < mpc->length) {
                 switch (*mpt) {
                 case MP_PROCESSOR:
@@ -862,13 +863,13 @@ static int __init update_mp_table(void)
         if (!smp_check_mpc(mpc, oem, str))
                 return 0;
 
-        printk(KERN_INFO "mpf: %llx\n", (u64)virt_to_phys(mpf));
-        printk(KERN_INFO "physptr: %x\n", mpf->physptr);
+        pr_info("mpf: %llx\n", (u64)virt_to_phys(mpf));
+        pr_info("physptr: %x\n", mpf->physptr);
 
         if (mpc_new_phys && mpc->length > mpc_new_length) {
                 mpc_new_phys = 0;
-                printk(KERN_INFO "mpc_new_length is %ld, please use alloc_mptable=8k\n",
-                         mpc_new_length);
+                pr_info("mpc_new_length is %ld, please use alloc_mptable=8k\n",
+                        mpc_new_length);
         }
 
         if (!mpc_new_phys) {
@@ -879,10 +880,10 @@ static int __init update_mp_table(void)
                 mpc->checksum = 0xff;
                 new = mpf_checksum((unsigned char *)mpc, mpc->length);
                 if (old == new) {
-                        printk(KERN_INFO "mpc is readonly, please try alloc_mptable instead\n");
+                        pr_info("mpc is readonly, please try alloc_mptable instead\n");
                         return 0;
                 }
-                printk(KERN_INFO "use in-position replacing\n");
+                pr_info("use in-position replacing\n");
         } else {
                 mpf->physptr = mpc_new_phys;
                 mpc_new = phys_to_virt(mpc_new_phys);
@@ -892,7 +893,7 @@ static int __init update_mp_table(void)
                 if (mpc_new_phys - mpf->physptr) {
                         struct mpf_intel *mpf_new;
                         /* steal 16 bytes from [0, 1k) */
-                        printk(KERN_INFO "mpf new: %x\n", 0x400 - 16);
+                        pr_info("mpf new: %x\n", 0x400 - 16);
                         mpf_new = phys_to_virt(0x400 - 16);
                         memcpy(mpf_new, mpf, 16);
                         mpf = mpf_new;
@@ -900,7 +901,7 @@ static int __init update_mp_table(void)
                 }
                 mpf->checksum = 0;
                 mpf->checksum -= mpf_checksum((unsigned char *)mpf, 16);
-                printk(KERN_INFO "physptr new: %x\n", mpf->physptr);
+                pr_info("physptr new: %x\n", mpf->physptr);
         }
 
         /*
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 4505e2a950d8..f804dc935d2a 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -93,6 +93,7 @@ void arch_task_cache_init(void)
                 kmem_cache_create("task_xstate", xstate_size,
                                   __alignof__(union thread_xstate),
                                   SLAB_PANIC | SLAB_NOTRACK, NULL);
+        setup_xstate_comp();
 }
 
 /*
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 5492798930ef..2d872e08fab9 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -168,10 +168,6 @@ static void smp_callin(void)
          * CPU, first the APIC. (this is probably redundant on most
          * boards)
          */
-
-        pr_debug("CALLIN, before setup_local_APIC()\n");
-        if (apic->smp_callin_clear_local_apic)
-                apic->smp_callin_clear_local_apic();
         setup_local_APIC();
         end_local_APIC_setup();
 
@@ -1143,10 +1139,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
                 enable_IO_APIC();
 
         bsp_end_local_APIC_setup();
-
-        if (apic->setup_portio_remap)
-                apic->setup_portio_remap();
-
         smpboot_setup_io_apic();
         /*
          * Set up local APIC timer on boot CPU.
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 56b0c338061e..b6025f9e36c6 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -950,7 +950,7 @@ core_initcall(cpufreq_tsc);
 static struct clocksource clocksource_tsc;
 
 /*
- * We compare the TSC to the cycle_last value in the clocksource
+ * We used to compare the TSC to the cycle_last value in the clocksource
  * structure to avoid a nasty time-warp. This can be observed in a
  * very small window right after one CPU updated cycle_last under
  * xtime/vsyscall_gtod lock and the other CPU reads a TSC value which
@@ -960,26 +960,23 @@ static struct clocksource clocksource_tsc;
  * due to the unsigned delta calculation of the time keeping core
  * code, which is necessary to support wrapping clocksources like pm
  * timer.
+ *
+ * This sanity check is now done in the core timekeeping code.
+ * checking the result of read_tsc() - cycle_last for being negative.
+ * That works because CLOCKSOURCE_MASK(64) does not mask out any bit.
  */
 static cycle_t read_tsc(struct clocksource *cs)
 {
-        cycle_t ret = (cycle_t)get_cycles();
-
-        return ret >= clocksource_tsc.cycle_last ?
-                ret : clocksource_tsc.cycle_last;
-}
-
-static void resume_tsc(struct clocksource *cs)
-{
-        if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC_S3))
-                clocksource_tsc.cycle_last = 0;
+        return (cycle_t)get_cycles();
 }
 
+/*
+ * .mask MUST be CLOCKSOURCE_MASK(64). See comment above read_tsc()
+ */
 static struct clocksource clocksource_tsc = {
         .name                   = "tsc",
         .rating                 = 300,
         .read                   = read_tsc,
-        .resume                 = resume_tsc,
         .mask                   = CLOCKSOURCE_MASK(64),
         .flags                  = CLOCK_SOURCE_IS_CONTINUOUS |
                                   CLOCK_SOURCE_MUST_VERIFY,
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index b99b9ad8540c..ee22c1d93ae5 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -152,7 +152,7 @@ static void __init detect_vsmp_box(void)
                 is_vsmp = 1;
 }
 
-int is_vsmp_box(void)
+static int is_vsmp_box(void)
 {
         if (is_vsmp != -1)
                 return is_vsmp;
@@ -166,7 +166,7 @@ int is_vsmp_box(void)
 static void __init detect_vsmp_box(void)
 {
 }
-int is_vsmp_box(void)
+static int is_vsmp_box(void)
 {
         return 0;
 }
diff --git a/arch/x86/kernel/vsyscall_gtod.c b/arch/x86/kernel/vsyscall_gtod.c
index 9531fbb123ba..c7d791f32b98 100644
--- a/arch/x86/kernel/vsyscall_gtod.c
+++ b/arch/x86/kernel/vsyscall_gtod.c
@@ -31,29 +31,30 @@ void update_vsyscall(struct timekeeper *tk)
         gtod_write_begin(vdata);
 
         /* copy vsyscall data */
-        vdata->vclock_mode      = tk->clock->archdata.vclock_mode;
-        vdata->cycle_last       = tk->clock->cycle_last;
-        vdata->mask             = tk->clock->mask;
-        vdata->mult             = tk->mult;
-        vdata->shift            = tk->shift;
+        vdata->vclock_mode      = tk->tkr.clock->archdata.vclock_mode;
+        vdata->cycle_last       = tk->tkr.cycle_last;
+        vdata->mask             = tk->tkr.mask;
+        vdata->mult             = tk->tkr.mult;
+        vdata->shift            = tk->tkr.shift;
 
         vdata->wall_time_sec            = tk->xtime_sec;
-        vdata->wall_time_snsec          = tk->xtime_nsec;
+        vdata->wall_time_snsec          = tk->tkr.xtime_nsec;
 
         vdata->monotonic_time_sec       = tk->xtime_sec
                                         + tk->wall_to_monotonic.tv_sec;
-        vdata->monotonic_time_snsec     = tk->xtime_nsec
+        vdata->monotonic_time_snsec     = tk->tkr.xtime_nsec
                                         + ((u64)tk->wall_to_monotonic.tv_nsec
-                                                << tk->shift);
+                                                << tk->tkr.shift);
         while (vdata->monotonic_time_snsec >=
-                                        (((u64)NSEC_PER_SEC) << tk->shift)) {
+                                        (((u64)NSEC_PER_SEC) << tk->tkr.shift)) {
                 vdata->monotonic_time_snsec -=
-                                        ((u64)NSEC_PER_SEC) << tk->shift;
+                                        ((u64)NSEC_PER_SEC) << tk->tkr.shift;
                 vdata->monotonic_time_sec++;
         }
 
         vdata->wall_time_coarse_sec     = tk->xtime_sec;
-        vdata->wall_time_coarse_nsec    = (long)(tk->xtime_nsec >> tk->shift);
+        vdata->wall_time_coarse_nsec    = (long)(tk->tkr.xtime_nsec >>
+                                                 tk->tkr.shift);
 
         vdata->monotonic_time_coarse_sec =
                 vdata->wall_time_coarse_sec + tk->wall_to_monotonic.tv_sec;
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index a4b451c6addf..940b142cc11f 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
@@ -8,6 +8,7 @@
 
 #include <linux/bootmem.h>
 #include <linux/compat.h>
+#include <linux/cpu.h>
 #include <asm/i387.h>
 #include <asm/fpu-internal.h>
 #include <asm/sigframe.h>
@@ -24,7 +25,9 @@ u64 pcntxt_mask;
 struct xsave_struct *init_xstate_buf;
 
 static struct _fpx_sw_bytes fx_sw_reserved, fx_sw_reserved_ia32;
-static unsigned int *xstate_offsets, *xstate_sizes, xstate_features;
+static unsigned int *xstate_offsets, *xstate_sizes;
+static unsigned int xstate_comp_offsets[sizeof(pcntxt_mask)*8];
+static unsigned int xstate_features;
 
 /*
  * If a processor implementation discern that a processor state component is
@@ -283,7 +286,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
 
         if (use_xsave()) {
                 /* These bits must be zero. */
-                xsave_hdr->reserved1[0] = xsave_hdr->reserved1[1] = 0;
+                memset(xsave_hdr->reserved, 0, 48);
 
                 /*
                  * Init the state that is not present in the memory
@@ -479,6 +482,52 @@ static void __init setup_xstate_features(void)
 }
 
 /*
+ * This function sets up offsets and sizes of all extended states in
+ * xsave area. This supports both standard format and compacted format
+ * of the xsave aread.
+ *
+ * Input: void
+ * Output: void
+ */
+void setup_xstate_comp(void)
+{
+        unsigned int xstate_comp_sizes[sizeof(pcntxt_mask)*8];
+        int i;
+
+        /*
+         * The FP xstates and SSE xstates are legacy states. They are always
+         * in the fixed offsets in the xsave area in either compacted form
+         * or standard form.
+         */
+        xstate_comp_offsets[0] = 0;
+        xstate_comp_offsets[1] = offsetof(struct i387_fxsave_struct, xmm_space);
+
+        if (!cpu_has_xsaves) {
+                for (i = 2; i < xstate_features; i++) {
+                        if (test_bit(i, (unsigned long *)&pcntxt_mask)) {
+                                xstate_comp_offsets[i] = xstate_offsets[i];
+                                xstate_comp_sizes[i] = xstate_sizes[i];
+                        }
+                }
+                return;
+        }
+
+        xstate_comp_offsets[2] = FXSAVE_SIZE + XSAVE_HDR_SIZE;
+
+        for (i = 2; i < xstate_features; i++) {
+                if (test_bit(i, (unsigned long *)&pcntxt_mask))
+                        xstate_comp_sizes[i] = xstate_sizes[i];
+                else
+                        xstate_comp_sizes[i] = 0;
+
+                if (i > 2)
+                        xstate_comp_offsets[i] = xstate_comp_offsets[i-1]
+                                        + xstate_comp_sizes[i-1];
+
+        }
+}
+
+/*
  * setup the xstate image representing the init state
  */
 static void __init setup_init_fpu_buf(void)
@@ -496,15 +545,21 @@ static void __init setup_init_fpu_buf(void)
 
         setup_xstate_features();
 
+        if (cpu_has_xsaves) {
+                init_xstate_buf->xsave_hdr.xcomp_bv =
+                                                (u64)1 << 63 | pcntxt_mask;
+                init_xstate_buf->xsave_hdr.xstate_bv = pcntxt_mask;
+        }
+
         /*
          * Init all the features state with header_bv being 0x0
          */
-        xrstor_state(init_xstate_buf, -1);
+        xrstor_state_booting(init_xstate_buf, -1);
         /*
          * Dump the init state again. This is to identify the init state
          * of any feature which is not represented by all zero's.
          */
-        xsave_state(init_xstate_buf, -1);
+        xsave_state_booting(init_xstate_buf, -1);
 }
 
 static enum { AUTO, ENABLE, DISABLE } eagerfpu = AUTO;
@@ -520,6 +575,30 @@ static int __init eager_fpu_setup(char *s)
 }
 __setup("eagerfpu=", eager_fpu_setup);
 
+
+/*
+ * Calculate total size of enabled xstates in XCR0/pcntxt_mask.
+ */
+static void __init init_xstate_size(void)
+{
+        unsigned int eax, ebx, ecx, edx;
+        int i;
+
+        if (!cpu_has_xsaves) {
+                cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx);
+                xstate_size = ebx;
+                return;
+        }
+
+        xstate_size = FXSAVE_SIZE + XSAVE_HDR_SIZE;
+        for (i = 2; i < 64; i++) {
+                if (test_bit(i, (unsigned long *)&pcntxt_mask)) {
+                        cpuid_count(XSTATE_CPUID, i, &eax, &ebx, &ecx, &edx);
+                        xstate_size += eax;
+                }
+        }
+}
+
 /*
  * Enable and initialize the xsave feature.
  */
@@ -551,8 +630,7 @@ static void __init xstate_enable_boot_cpu(void)
         /*
          * Recompute the context size for enabled features
          */
-        cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx);
-        xstate_size = ebx;
+        init_xstate_size();
 
         update_regset_xstate_info(xstate_size, pcntxt_mask);
         prepare_fx_sw_frame();
@@ -572,8 +650,9 @@ static void __init xstate_enable_boot_cpu(void)
                 }
         }
 
-        pr_info("enabled xstate_bv 0x%llx, cntxt size 0x%x\n",
-                pcntxt_mask, xstate_size);
+        pr_info("enabled xstate_bv 0x%llx, cntxt size 0x%x using %s\n",
+                pcntxt_mask, xstate_size,
+                cpu_has_xsaves ? "compacted form" : "standard form");
 }
 
 /*
@@ -635,3 +714,26 @@ void eager_fpu_init(void)
         else
                 fxrstor_checking(&init_xstate_buf->i387);
 }
+
+/*
+ * Given the xsave area and a state inside, this function returns the
+ * address of the state.
+ *
+ * This is the API that is called to get xstate address in either
+ * standard format or compacted format of xsave area.
+ *
+ * Inputs:
+ *      xsave: base address of the xsave area;
+ *      xstate: state which is defined in xsave.h (e.g. XSTATE_FP, XSTATE_SSE,
+ *      etc.)
+ * Output:
+ *      address of the state in the xsave area.
+ */
+void *get_xsave_addr(struct xsave_struct *xsave, int xstate)
+{
+        int feature = fls64(xstate) - 1;
+        if (!test_bit(feature, (unsigned long *)&pcntxt_mask))
+                return NULL;
+
+        return (void *)xsave + xstate_comp_offsets[feature];
+}
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 287e4c85fff9..f9d16ff56c6b 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -27,6 +27,7 @@ config KVM
         select MMU_NOTIFIER
         select ANON_INODES
         select HAVE_KVM_IRQCHIP
+        select HAVE_KVM_IRQFD
         select HAVE_KVM_IRQ_ROUTING
         select HAVE_KVM_EVENTFD
         select KVM_APIC_ARCHITECTURE
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
index bd0da433e6d7..a1ec6a50a05a 100644
--- a/arch/x86/kvm/irq.c
+++ b/arch/x86/kvm/irq.c
@@ -108,7 +108,7 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v)
 
         vector = kvm_cpu_get_extint(v);
 
-        if (kvm_apic_vid_enabled(v->kvm) || vector != -1)
+        if (vector != -1)
                 return vector;                  /* PIC */
 
         return kvm_get_apic_interrupt(v);       /* APIC */
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 3855103f71fd..08e8a899e005 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -352,25 +352,46 @@ static inline int apic_find_highest_irr(struct kvm_lapic *apic)
 
 static inline void apic_clear_irr(int vec, struct kvm_lapic *apic)
 {
-        apic->irr_pending = false;
+        struct kvm_vcpu *vcpu;
+
+        vcpu = apic->vcpu;
+
         apic_clear_vector(vec, apic->regs + APIC_IRR);
-        if (apic_search_irr(apic) != -1)
-                apic->irr_pending = true;
+        if (unlikely(kvm_apic_vid_enabled(vcpu->kvm)))
+                /* try to update RVI */
+                kvm_make_request(KVM_REQ_EVENT, vcpu);
+        else {
+                vec = apic_search_irr(apic);
+                apic->irr_pending = (vec != -1);
+        }
 }
 
 static inline void apic_set_isr(int vec, struct kvm_lapic *apic)
 {
-        /* Note that we never get here with APIC virtualization enabled.  */
+        struct kvm_vcpu *vcpu;
+
+        if (__apic_test_and_set_vector(vec, apic->regs + APIC_ISR))
+                return;
+
+        vcpu = apic->vcpu;
 
-        if (!__apic_test_and_set_vector(vec, apic->regs + APIC_ISR))
-                ++apic->isr_count;
-        BUG_ON(apic->isr_count > MAX_APIC_VECTOR);
         /*
-         * ISR (in service register) bit is set when injecting an interrupt.
-         * The highest vector is injected. Thus the latest bit set matches
-         * the highest bit in ISR.
+         * With APIC virtualization enabled, all caching is disabled
+         * because the processor can modify ISR under the hood.  Instead
+         * just set SVI.
          */
-        apic->highest_isr_cache = vec;
+        if (unlikely(kvm_apic_vid_enabled(vcpu->kvm)))
+                kvm_x86_ops->hwapic_isr_update(vcpu->kvm, vec);
+        else {
+                ++apic->isr_count;
+                BUG_ON(apic->isr_count > MAX_APIC_VECTOR);
+                /*
+                 * ISR (in service register) bit is set when injecting an interrupt.
+                 * The highest vector is injected. Thus the latest bit set matches
+                 * the highest bit in ISR.
+                 */
+                apic->highest_isr_cache = vec;
+        }
 }
 
 static inline int apic_find_highest_isr(struct kvm_lapic *apic)
@@ -1627,11 +1648,16 @@ int kvm_get_apic_interrupt(struct kvm_vcpu *vcpu)
         int vector = kvm_apic_has_interrupt(vcpu);
         struct kvm_lapic *apic = vcpu->arch.apic;
 
-        /* Note that we never get here with APIC virtualization enabled.  */
-
         if (vector == -1)
                 return -1;
 
+        /*
+         * We get here even with APIC virtualization enabled, if doing
+         * nested virtualization and L1 runs with the "acknowledge interrupt
+         * on exit" mode.  Then we cannot inject the interrupt via RVI,
+         * because the process would deliver it through the IDT.
+         */
+
         apic_set_isr(vector, apic);
         apic_update_ppr(apic);
         apic_clear_irr(vector, apic);
diff --git a/arch/x86/kvm/mmu_audit.c b/arch/x86/kvm/mmu_audit.c
index 1185fe7a7f47..9ade5cfb5a4c 100644
--- a/arch/x86/kvm/mmu_audit.c
+++ b/arch/x86/kvm/mmu_audit.c
@@ -273,7 +273,7 @@ static int mmu_audit_set(const char *val, const struct kernel_param *kp)
         int ret;
         unsigned long enable;
 
-        ret = strict_strtoul(val, 10, &enable);
+        ret = kstrtoul(val, 10, &enable);
         if (ret < 0)
                 return -EINVAL;
 
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index e618f34bde2d..bfe11cf124a1 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -8754,6 +8754,8 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,
         prepare_vmcs12(vcpu, vmcs12, exit_reason, exit_intr_info,
                        exit_qualification);
 
+        vmx_load_vmcs01(vcpu);
+
         if ((exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT)
             && nested_exit_intr_ack_set(vcpu)) {
                 int irq = kvm_cpu_get_interrupt(vcpu);
@@ -8769,8 +8771,6 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason,
                                        vmcs12->vm_exit_intr_error_code,
                                        KVM_ISA_VMX);
 
-        vmx_load_vmcs01(vcpu);
-
         vm_entry_controls_init(vmx, vmcs_read32(VM_ENTRY_CONTROLS));
         vm_exit_controls_init(vmx, vmcs_read32(VM_EXIT_CONTROLS));
         vmx_segment_cache_clear(vmx);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index b86d329b953a..8f1e22d3b286 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1020,9 +1020,8 @@ struct pvclock_gtod_data {
                 u32     shift;
         } clock;
 
-        /* open coded 'struct timespec' */
-        u64             monotonic_time_snsec;
-        time_t          monotonic_time_sec;
+        u64             boot_ns;
+        u64             nsec_base;
 };
 
 static struct pvclock_gtod_data pvclock_gtod_data;
@@ -1030,27 +1029,21 @@ static struct pvclock_gtod_data pvclock_gtod_data;
 static void update_pvclock_gtod(struct timekeeper *tk)
 {
         struct pvclock_gtod_data *vdata = &pvclock_gtod_data;
+        u64 boot_ns;
+
+        boot_ns = ktime_to_ns(ktime_add(tk->tkr.base_mono, tk->offs_boot));
 
         write_seqcount_begin(&vdata->seq);
 
         /* copy pvclock gtod data */
-        vdata->clock.vclock_mode        = tk->clock->archdata.vclock_mode;
-        vdata->clock.cycle_last         = tk->clock->cycle_last;
-        vdata->clock.mask               = tk->clock->mask;
-        vdata->clock.mult               = tk->mult;
-        vdata->clock.shift              = tk->shift;
-
-        vdata->monotonic_time_sec       = tk->xtime_sec
-                                        + tk->wall_to_monotonic.tv_sec;
-        vdata->monotonic_time_snsec     = tk->xtime_nsec
-                                        + (tk->wall_to_monotonic.tv_nsec
-                                                << tk->shift);
-        while (vdata->monotonic_time_snsec >=
-                                        (((u64)NSEC_PER_SEC) << tk->shift)) {
-                vdata->monotonic_time_snsec -=
-                                        ((u64)NSEC_PER_SEC) << tk->shift;
-                vdata->monotonic_time_sec++;
-        }
+        vdata->clock.vclock_mode        = tk->tkr.clock->archdata.vclock_mode;
+        vdata->clock.cycle_last         = tk->tkr.cycle_last;
+        vdata->clock.mask               = tk->tkr.mask;
+        vdata->clock.mult               = tk->tkr.mult;
+        vdata->clock.shift              = tk->tkr.shift;
+
+        vdata->boot_ns                  = boot_ns;
+        vdata->nsec_base                = tk->tkr.xtime_nsec;
 
         write_seqcount_end(&vdata->seq);
 }
@@ -1145,11 +1138,7 @@ static void kvm_get_time_scale(uint32_t scaled_khz, uint32_t base_khz,
 
 static inline u64 get_kernel_ns(void)
 {
-        struct timespec ts;
-
-        ktime_get_ts(&ts);
-        monotonic_to_bootbased(&ts);
-        return timespec_to_ns(&ts);
+        return ktime_get_boot_ns();
 }
 
 #ifdef CONFIG_X86_64
@@ -1414,23 +1403,22 @@ static inline u64 vgettsc(cycle_t *cycle_now)
         return v * gtod->clock.mult;
 }
 
-static int do_monotonic(struct timespec *ts, cycle_t *cycle_now)
+static int do_monotonic_boot(s64 *t, cycle_t *cycle_now)
 {
+        struct pvclock_gtod_data *gtod = &pvclock_gtod_data;
         unsigned long seq;
-        u64 ns;
         int mode;
-        struct pvclock_gtod_data *gtod = &pvclock_gtod_data;
+        u64 ns;
 
-        ts->tv_nsec = 0;
         do {
                 seq = read_seqcount_begin(&gtod->seq);
                 mode = gtod->clock.vclock_mode;
-                ts->tv_sec = gtod->monotonic_time_sec;
-                ns = gtod->monotonic_time_snsec;
+                ns = gtod->nsec_base;
                 ns += vgettsc(cycle_now);
                 ns >>= gtod->clock.shift;
+                ns += gtod->boot_ns;
         } while (unlikely(read_seqcount_retry(&gtod->seq, seq)));
-        timespec_add_ns(ts, ns);
+        *t = ns;
 
         return mode;
 }
@@ -1438,19 +1426,11 @@ static int do_monotonic(struct timespec *ts, cycle_t *cycle_now)
 /* returns true if host is using tsc clocksource */
 static bool kvm_get_time_and_clockread(s64 *kernel_ns, cycle_t *cycle_now)
 {
-        struct timespec ts;
-
         /* checked again under seqlock below */
         if (pvclock_gtod_data.clock.vclock_mode != VCLOCK_TSC)
                 return false;
 
-        if (do_monotonic(&ts, cycle_now) != VCLOCK_TSC)
-                return false;
-
-        monotonic_to_bootbased(&ts);
-        *kernel_ns = timespec_to_ns(&ts);
-
-        return true;
+        return do_monotonic_boot(kernel_ns, cycle_now) == VCLOCK_TSC;
 }
 #endif
 
@@ -2656,7 +2636,7 @@ out:
         return r;
 }
 
-int kvm_dev_ioctl_check_extension(long ext)
+int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 {
         int r;
 
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 1dbade870f90..a24194681513 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -1218,7 +1218,8 @@ good_area:
         /*
          * If for any reason at all we couldn't handle the fault,
          * make sure we exit gracefully rather than endlessly redo
-         * the fault:
+         * the fault.  Since we never set FAULT_FLAG_RETRY_NOWAIT, if
+         * we get VM_FAULT_RETRY back, the mmap_sem has been unlocked.
          */
         fault = handle_mm_fault(mm, vma, address, flags);
 
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index e39504878aec..7d05565ba781 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -825,7 +825,8 @@ void __init mem_init(void)
 int arch_add_memory(int nid, u64 start, u64 size)
 {
         struct pglist_data *pgdata = NODE_DATA(nid);
-        struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM;
+        struct zone *zone = pgdata->node_zones +
+                zone_for_memory(nid, start, size, ZONE_HIGHMEM);
         unsigned long start_pfn = start >> PAGE_SHIFT;
         unsigned long nr_pages = size >> PAGE_SHIFT;
 
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index df1a9927ad29..5621c47d7a1a 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -691,7 +691,8 @@ static void  update_end_of_memory_vars(u64 start, u64 size)
 int arch_add_memory(int nid, u64 start, u64 size)
 {
         struct pglist_data *pgdat = NODE_DATA(nid);
-        struct zone *zone = pgdat->node_zones + ZONE_NORMAL;
+        struct zone *zone = pgdat->node_zones +
+                zone_for_memory(nid, start, size, ZONE_NORMAL);
         unsigned long start_pfn = start >> PAGE_SHIFT;
         unsigned long nr_pages = size >> PAGE_SHIFT;
         int ret;
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 99bef86ed6df..5c8cb8043c5a 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -211,10 +211,10 @@ struct jit_context {
         bool seen_ld_abs;
 };
 
-static int do_jit(struct sk_filter *bpf_prog, int *addrs, u8 *image,
+static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
                   int oldproglen, struct jit_context *ctx)
 {
-        struct sock_filter_int *insn = bpf_prog->insnsi;
+        struct bpf_insn *insn = bpf_prog->insnsi;
         int insn_cnt = bpf_prog->len;
         u8 temp[64];
         int i;
@@ -235,7 +235,7 @@ static int do_jit(struct sk_filter *bpf_prog, int *addrs, u8 *image,
         /* mov qword ptr [rbp-X],rbx */
         EMIT3_off32(0x48, 0x89, 0x9D, -stacksize);
 
-        /* sk_convert_filter() maps classic BPF register X to R7 and uses R8
+        /* bpf_convert_filter() maps classic BPF register X to R7 and uses R8
          * as temporary, so all tcpdump filters need to spill/fill R7(r13) and
          * R8(r14). R9(r15) spill could be made conditional, but there is only
          * one 'bpf_error' return path out of helper functions inside bpf_jit.S
@@ -841,7 +841,7 @@ common_load:		ctx->seen_ld_abs = true;
                         /* By design x64 JIT should support all BPF instructions
                          * This error will be seen if new instruction was added
                          * to interpreter, but not to JIT
-                         * or if there is junk in sk_filter
+                         * or if there is junk in bpf_prog
                          */
                         pr_err("bpf_jit: unknown opcode %02x\n", insn->code);
                         return -EINVAL;
@@ -862,11 +862,11 @@ common_load:		ctx->seen_ld_abs = true;
         return proglen;
 }
 
-void bpf_jit_compile(struct sk_filter *prog)
+void bpf_jit_compile(struct bpf_prog *prog)
 {
 }
 
-void bpf_int_jit_compile(struct sk_filter *prog)
+void bpf_int_jit_compile(struct bpf_prog *prog)
 {
         struct bpf_binary_header *header = NULL;
         int proglen, oldproglen = 0;
@@ -932,7 +932,7 @@ out:
 
 static void bpf_jit_free_deferred(struct work_struct *work)
 {
-        struct sk_filter *fp = container_of(work, struct sk_filter, work);
+        struct bpf_prog *fp = container_of(work, struct bpf_prog, work);
         unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
         struct bpf_binary_header *header = (void *)addr;
 
@@ -941,7 +941,7 @@ static void bpf_jit_free_deferred(struct work_struct *work)
         kfree(fp);
 }
 
-void bpf_jit_free(struct sk_filter *fp)
+void bpf_jit_free(struct bpf_prog *fp)
 {
         if (fp->jited) {
                 INIT_WORK(&fp->work, bpf_jit_free_deferred);
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 5075371ab593..cfd1b132b8e3 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -448,7 +448,7 @@ static void probe_pci_root_info(struct pci_root_info *info,
                 return;
 
         size = sizeof(*info->res) * info->res_num;
-        info->res = kzalloc(size, GFP_KERNEL);
+        info->res = kzalloc_node(size, GFP_KERNEL, info->sd.node);
         if (!info->res) {
                 info->res_num = 0;
                 return;
@@ -456,7 +456,7 @@ static void probe_pci_root_info(struct pci_root_info *info,
 
         size = sizeof(*info->res_offset) * info->res_num;
         info->res_num = 0;
-        info->res_offset = kzalloc(size, GFP_KERNEL);
+        info->res_offset = kzalloc_node(size, GFP_KERNEL, info->sd.node);
         if (!info->res_offset) {
                 kfree(info->res);
                 info->res = NULL;
@@ -499,7 +499,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
         if (node != NUMA_NO_NODE && !node_online(node))
                 node = NUMA_NO_NODE;
 
-        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc_node(sizeof(*info), GFP_KERNEL, node);
         if (!info) {
                 printk(KERN_WARNING "pci_bus %04x:%02x: "
                        "ignored (out of memory)\n", domain, busnum);
diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
index 84b9d672843d..3865116c51fb 100644
--- a/arch/x86/pci/intel_mid_pci.c
+++ b/arch/x86/pci/intel_mid_pci.c
@@ -208,27 +208,31 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,
 
 static int intel_mid_pci_irq_enable(struct pci_dev *dev)
 {
-        u8 pin;
-        struct io_apic_irq_attr irq_attr;
+        int polarity;
 
-        pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+        if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_TANGIER)
+                polarity = 0; /* active high */
+        else
+                polarity = 1; /* active low */
 
         /*
          * 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);
-        irq_attr.ioapic_pin = dev->irq;
-        irq_attr.trigger = 1; /* level */
-        if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_TANGIER)
-                irq_attr.polarity = 0; /* active high */
-        else
-                irq_attr.polarity = 1; /* active low */
-        io_apic_set_pci_routing(&dev->dev, dev->irq, &irq_attr);
+        if (mp_set_gsi_attr(dev->irq, 1, polarity, dev_to_node(&dev->dev)))
+                return -EBUSY;
+        if (mp_map_gsi_to_irq(dev->irq, IOAPIC_MAP_ALLOC) < 0)
+                return -EBUSY;
 
         return 0;
 }
 
+static void intel_mid_pci_irq_disable(struct pci_dev *dev)
+{
+        if (!dev->dev.power.is_prepared && dev->irq > 0)
+                mp_unmap_irq(dev->irq);
+}
+
 struct pci_ops intel_mid_pci_ops = {
         .read = pci_read,
         .write = pci_write,
@@ -245,6 +249,7 @@ int __init intel_mid_pci_init(void)
         pr_info("Intel MID platform detected, using MID PCI ops\n");
         pci_mmcfg_late_init();
         pcibios_enable_irq = intel_mid_pci_irq_enable;
+        pcibios_disable_irq = intel_mid_pci_irq_disable;
         pci_root_ops = intel_mid_pci_ops;
         pci_soc_mode = 1;
         /* Continue with standard init */
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 84112f55dd7a..bc1a2c341891 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -26,6 +26,7 @@ static int acer_tm360_irqrouting;
 static struct irq_routing_table *pirq_table;
 
 static int pirq_enable_irq(struct pci_dev *dev);
+static void pirq_disable_irq(struct pci_dev *dev);
 
 /*
  * Never use: 0, 1, 2 (timer, keyboard, and cascade)
@@ -53,7 +54,7 @@ struct irq_router_handler {
 };
 
 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
-void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
+void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
 
 /*
  *  Check passed address for the PCI IRQ Routing Table signature
@@ -1186,7 +1187,7 @@ void pcibios_penalize_isa_irq(int irq, int active)
 
 static int pirq_enable_irq(struct pci_dev *dev)
 {
-        u8 pin;
+        u8 pin = 0;
 
         pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
         if (pin && !pcibios_lookup_irq(dev, 1)) {
@@ -1227,8 +1228,6 @@ static int pirq_enable_irq(struct pci_dev *dev)
                         }
                         dev = temp_dev;
                         if (irq >= 0) {
-                                io_apic_set_pci_routing(&dev->dev, irq,
-                                                         &irq_attr);
                                 dev->irq = irq;
                                 dev_info(&dev->dev, "PCI->APIC IRQ transform: "
                                          "INT %c -> IRQ %d\n", 'A' + pin - 1, irq);
@@ -1254,3 +1253,12 @@ static int pirq_enable_irq(struct pci_dev *dev)
         }
         return 0;
 }
+
+static void pirq_disable_irq(struct pci_dev *dev)
+{
+        if (io_apic_assign_pci_irqs && !dev->dev.power.is_prepared &&
+            dev->irq) {
+                mp_unmap_irq(dev->irq);
+                dev->irq = 0;
+        }
+}
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 905956f16465..093f5f4272d3 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -23,6 +23,7 @@
 #include <xen/features.h>
 #include <xen/events.h>
 #include <asm/xen/pci.h>
+#include <asm/i8259.h>
 
 static int xen_pcifront_enable_irq(struct pci_dev *dev)
 {
@@ -40,7 +41,7 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev)
         /* In PV DomU the Xen PCI backend puts the PIRQ in the interrupt line.*/
         pirq = gsi;
 
-        if (gsi < NR_IRQS_LEGACY)
+        if (gsi < nr_legacy_irqs())
                 share = 0;
 
         rc = xen_bind_pirq_gsi_to_irq(gsi, pirq, share, "pcifront");
@@ -511,7 +512,7 @@ int __init pci_xen_initial_domain(void)
         xen_setup_acpi_sci();
         __acpi_register_gsi = acpi_register_gsi_xen;
         /* Pre-allocate legacy irqs */
-        for (irq = 0; irq < NR_IRQS_LEGACY; irq++) {
+        for (irq = 0; irq < nr_legacy_irqs(); irq++) {
                 int trigger, polarity;
 
                 if (acpi_get_override_irq(irq, &trigger, &polarity) == -1)
@@ -522,7 +523,7 @@ int __init pci_xen_initial_domain(void)
                         true /* Map GSI to PIRQ */);
         }
         if (0 == nr_ioapics) {
-                for (irq = 0; irq < NR_IRQS_LEGACY; irq++)
+                for (irq = 0; irq < nr_legacy_irqs(); irq++)
                         xen_bind_pirq_gsi_to_irq(irq, irq, 0, "xt-pic");
         }
         return 0;
diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c
index 8244f5ec2f4c..701fd5843c87 100644
--- a/arch/x86/platform/ce4100/ce4100.c
+++ b/arch/x86/platform/ce4100/ce4100.c
@@ -135,14 +135,10 @@ static void __init sdv_arch_setup(void)
         sdv_serial_fixup();
 }
 
-#ifdef CONFIG_X86_IO_APIC
 static void sdv_pci_init(void)
 {
         x86_of_pci_init();
-        /* We can't set this earlier, because we need to calibrate the timer */
-        legacy_pic = &null_legacy_pic;
 }
-#endif
 
 /*
  * CE4100 specific x86_init function overrides and early setup
@@ -155,7 +151,9 @@ void __init x86_ce4100_early_setup(void)
         x86_init.resources.probe_roms = x86_init_noop;
         x86_init.mpparse.get_smp_config = x86_init_uint_noop;
         x86_init.mpparse.find_smp_config = x86_init_noop;
+        x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc_nocheck;
         x86_init.pci.init = ce4100_pci_init;
+        x86_init.pci.init_irq = sdv_pci_init;
 
         /*
          * By default, the reboot method is ACPI which is supported by the
@@ -166,10 +164,5 @@ void __init x86_ce4100_early_setup(void)
          */
         reboot_type = BOOT_KBD;
 
-#ifdef CONFIG_X86_IO_APIC
-        x86_init.pci.init_irq = sdv_pci_init;
-        x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc_nocheck;
-#endif
-
         pm_power_off = ce4100_power_off;
 }
diff --git a/arch/x86/platform/intel-mid/device_libs/platform_wdt.c b/arch/x86/platform/intel-mid/device_libs/platform_wdt.c
index 973cf3bfa9fd..0b283d4d0ad7 100644
--- a/arch/x86/platform/intel-mid/device_libs/platform_wdt.c
+++ b/arch/x86/platform/intel-mid/device_libs/platform_wdt.c
@@ -26,28 +26,18 @@ static struct platform_device wdt_dev = {
 
 static int tangier_probe(struct platform_device *pdev)
 {
-        int ioapic;
-        int irq;
+        int gsi;
         struct intel_mid_wdt_pdata *pdata = pdev->dev.platform_data;
-        struct io_apic_irq_attr irq_attr = { 0 };
 
         if (!pdata)
                 return -EINVAL;
 
-        irq = pdata->irq;
-        ioapic = mp_find_ioapic(irq);
-        if (ioapic >= 0) {
-                int ret;
-                irq_attr.ioapic = ioapic;
-                irq_attr.ioapic_pin = irq;
-                irq_attr.trigger = 1;
-                /* irq_attr.polarity = 0; -> Active high */
-                ret = io_apic_set_pci_routing(NULL, irq, &irq_attr);
-                if (ret)
-                        return ret;
-        } else {
+        /* IOAPIC builds identity mapping between GSI and IRQ on MID */
+        gsi = pdata->irq;
+        if (mp_set_gsi_attr(gsi, 1, 0, cpu_to_node(0)) ||
+            mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC) <= 0) {
                 dev_warn(&pdev->dev, "cannot find interrupt %d in ioapic\n",
-                         irq);
+                         gsi);
                 return -EINVAL;
         }
 
diff --git a/arch/x86/platform/intel-mid/sfi.c b/arch/x86/platform/intel-mid/sfi.c
index 994c40bd7cb7..3c53a90fdb18 100644
--- a/arch/x86/platform/intel-mid/sfi.c
+++ b/arch/x86/platform/intel-mid/sfi.c
@@ -432,9 +432,8 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)
         struct sfi_table_simple *sb;
         struct sfi_device_table_entry *pentry;
         struct devs_id *dev = NULL;
-        int num, i;
-        int ioapic;
-        struct io_apic_irq_attr irq_attr;
+        int num, i, ret;
+        int polarity;
 
         sb = (struct sfi_table_simple *)table;
         num = SFI_GET_NUM_ENTRIES(sb, struct sfi_device_table_entry);
@@ -448,35 +447,30 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)
                          * devices, but they have separate RTE entry in IOAPIC
                          * so we have to enable them one by one here
                          */
-                        ioapic = mp_find_ioapic(irq);
-                        if (ioapic >= 0) {
-                                irq_attr.ioapic = ioapic;
-                                irq_attr.ioapic_pin = irq;
-                                irq_attr.trigger = 1;
-                                if (intel_mid_identify_cpu() ==
-                                                INTEL_MID_CPU_CHIP_TANGIER) {
-                                        if (!strncmp(pentry->name,
-                                                        "r69001-ts-i2c", 13))
-                                                /* active low */
-                                                irq_attr.polarity = 1;
-                                        else if (!strncmp(pentry->name,
-                                                        "synaptics_3202", 14))
-                                                /* active low */
-                                                irq_attr.polarity = 1;
-                                        else if (irq == 41)
-                                                /* fast_int_1 */
-                                                irq_attr.polarity = 1;
-                                        else
-                                                /* active high */
-                                                irq_attr.polarity = 0;
-                                } else {
-                                        /* PNW and CLV go with active low */
-                                        irq_attr.polarity = 1;
-                                }
-                                io_apic_set_pci_routing(NULL, irq, &irq_attr);
+                        if (intel_mid_identify_cpu() ==
+                                        INTEL_MID_CPU_CHIP_TANGIER) {
+                                if (!strncmp(pentry->name, "r69001-ts-i2c", 13))
+                                        /* active low */
+                                        polarity = 1;
+                                else if (!strncmp(pentry->name,
+                                                "synaptics_3202", 14))
+                                        /* active low */
+                                        polarity = 1;
+                                else if (irq == 41)
+                                        /* fast_int_1 */
+                                        polarity = 1;
+                                else
+                                        /* active high */
+                                        polarity = 0;
+                        } else {
+                                /* PNW and CLV go with active low */
+                                polarity = 1;
                         }
-                } else {
-                        irq = 0; /* No irq */
+
+                        ret = mp_set_gsi_attr(irq, 1, polarity, NUMA_NO_NODE);
+                        if (ret == 0)
+                                ret = mp_map_gsi_to_irq(irq, IOAPIC_MAP_ALLOC);
+                        WARN_ON(ret < 0);
                 }
 
                 dev = get_device_id(pentry->type, pentry->name);
diff --git a/arch/x86/platform/sfi/sfi.c b/arch/x86/platform/sfi/sfi.c
index bcd1a703e3e6..2a8a74f3bd76 100644
--- a/arch/x86/platform/sfi/sfi.c
+++ b/arch/x86/platform/sfi/sfi.c
@@ -25,6 +25,7 @@
 #include <linux/init.h>
 #include <linux/sfi.h>
 #include <linux/io.h>
+#include <linux/irqdomain.h>
 
 #include <asm/io_apic.h>
 #include <asm/mpspec.h>
@@ -70,19 +71,26 @@ static int __init sfi_parse_cpus(struct sfi_table_header *table)
 #endif /* CONFIG_X86_LOCAL_APIC */
 
 #ifdef CONFIG_X86_IO_APIC
+static struct irq_domain_ops sfi_ioapic_irqdomain_ops = {
+        .map = mp_irqdomain_map,
+};
 
 static int __init sfi_parse_ioapic(struct sfi_table_header *table)
 {
         struct sfi_table_simple *sb;
         struct sfi_apic_table_entry *pentry;
         int i, num;
+        struct ioapic_domain_cfg cfg = {
+                .type = IOAPIC_DOMAIN_STRICT,
+                .ops = &sfi_ioapic_irqdomain_ops,
+        };
 
         sb = (struct sfi_table_simple *)table;
         num = SFI_GET_NUM_ENTRIES(sb, struct sfi_apic_table_entry);
         pentry = (struct sfi_apic_table_entry *)sb->pentry;
 
         for (i = 0; i < num; i++) {
-                mp_register_ioapic(i, pentry->phys_addr, gsi_top);
+                mp_register_ioapic(i, pentry->phys_addr, gsi_top, &cfg);
                 pentry++;
         }
 
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index ed161c6e278b..3968d67d366b 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1479,7 +1479,7 @@ static ssize_t ptc_proc_write(struct file *file, const char __user *user,
                 return count;
         }
 
-        if (strict_strtol(optstr, 10, &input_arg) < 0) {
+        if (kstrtol(optstr, 10, &input_arg) < 0) {
                 printk(KERN_DEBUG "%s is invalid\n", optstr);
                 return -EINVAL;
         }
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
new file mode 100644
index 000000000000..7fde9ee438a4
--- /dev/null
+++ b/arch/x86/purgatory/Makefile
@@ -0,0 +1,30 @@
+purgatory-y := purgatory.o stack.o setup-x86_$(BITS).o sha256.o entry64.o string.o
+
+targets += $(purgatory-y)
+PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
+
+LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib
+targets += purgatory.ro
+
+# Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That
+# in turn leaves some undefined symbols like __fentry__ in purgatory and not
+# sure how to relocate those. Like kexec-tools, use custom flags.
+
+KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -c -MD -Os -mcmodel=large
+
+$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
+                $(call if_changed,ld)
+
+targets += kexec-purgatory.c
+
+quiet_cmd_bin2c = BIN2C   $@
+      cmd_bin2c = cat $(obj)/purgatory.ro | $(objtree)/scripts/basic/bin2c kexec_purgatory > $(obj)/kexec-purgatory.c
+
+$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE
+        $(call if_changed,bin2c)
+
+
+# No loaders for 32bits yet.
+ifeq ($(CONFIG_X86_64),y)
+ obj-$(CONFIG_KEXEC)            += kexec-purgatory.o
+endif
diff --git a/arch/x86/purgatory/entry64.S b/arch/x86/purgatory/entry64.S
new file mode 100644
index 000000000000..d1a4291d3568
--- /dev/null
+++ b/arch/x86/purgatory/entry64.S
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2003,2004  Eric Biederman (ebiederm@xmission.com)
+ * Copyright (C) 2014  Red Hat Inc.
+
+ * Author(s): Vivek Goyal <vgoyal@redhat.com>
+ *
+ * This code has been taken from kexec-tools.
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+        .text
+        .balign 16
+        .code64
+        .globl entry64, entry64_regs
+
+
+entry64:
+        /* Setup a gdt that should be preserved */
+        lgdt gdt(%rip)
+
+        /* load the data segments */
+        movl    $0x18, %eax     /* data segment */
+        movl    %eax, %ds
+        movl    %eax, %es
+        movl    %eax, %ss
+        movl    %eax, %fs
+        movl    %eax, %gs
+
+        /* Setup new stack */
+        leaq    stack_init(%rip), %rsp
+        pushq   $0x10 /* CS */
+        leaq    new_cs_exit(%rip), %rax
+        pushq   %rax
+        lretq
+new_cs_exit:
+
+        /* Load the registers */
+        movq    rax(%rip), %rax
+        movq    rbx(%rip), %rbx
+        movq    rcx(%rip), %rcx
+        movq    rdx(%rip), %rdx
+        movq    rsi(%rip), %rsi
+        movq    rdi(%rip), %rdi
+        movq    rsp(%rip), %rsp
+        movq    rbp(%rip), %rbp
+        movq    r8(%rip), %r8
+        movq    r9(%rip), %r9
+        movq    r10(%rip), %r10
+        movq    r11(%rip), %r11
+        movq    r12(%rip), %r12
+        movq    r13(%rip), %r13
+        movq    r14(%rip), %r14
+        movq    r15(%rip), %r15
+
+        /* Jump to the new code... */
+        jmpq    *rip(%rip)
+
+        .section ".rodata"
+        .balign 4
+entry64_regs:
+rax:    .quad 0x0
+rcx:    .quad 0x0
+rdx:    .quad 0x0
+rbx:    .quad 0x0
+rsp:    .quad 0x0
+rbp:    .quad 0x0
+rsi:    .quad 0x0
+rdi:    .quad 0x0
+r8:     .quad 0x0
+r9:     .quad 0x0
+r10:    .quad 0x0
+r11:    .quad 0x0
+r12:    .quad 0x0
+r13:    .quad 0x0
+r14:    .quad 0x0
+r15:    .quad 0x0
+rip:    .quad 0x0
+        .size entry64_regs, . - entry64_regs
+
+        /* GDT */
+        .section ".rodata"
+        .balign 16
+gdt:
+        /* 0x00 unusable segment
+         * 0x08 unused
+         * so use them as gdt ptr
+         */
+        .word gdt_end - gdt - 1
+        .quad gdt
+        .word 0, 0, 0
+
+        /* 0x10 4GB flat code segment */
+        .word 0xFFFF, 0x0000, 0x9A00, 0x00AF
+
+        /* 0x18 4GB flat data segment */
+        .word 0xFFFF, 0x0000, 0x9200, 0x00CF
+gdt_end:
+stack:  .quad   0, 0
+stack_init:
diff --git a/arch/x86/purgatory/purgatory.c b/arch/x86/purgatory/purgatory.c
new file mode 100644
index 000000000000..25e068ba3382
--- /dev/null
+++ b/arch/x86/purgatory/purgatory.c
@@ -0,0 +1,72 @@
+/*
+ * purgatory: Runs between two kernels
+ *
+ * Copyright (C) 2014 Red Hat Inc.
+ *
+ * Author:
+ *       Vivek Goyal <vgoyal@redhat.com>
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#include "sha256.h"
+#include "../boot/string.h"
+
+struct sha_region {
+        unsigned long start;
+        unsigned long len;
+};
+
+unsigned long backup_dest = 0;
+unsigned long backup_src = 0;
+unsigned long backup_sz = 0;
+
+u8 sha256_digest[SHA256_DIGEST_SIZE] = { 0 };
+
+struct sha_region sha_regions[16] = {};
+
+/*
+ * On x86, second kernel requries first 640K of memory to boot. Copy
+ * first 640K to a backup region in reserved memory range so that second
+ * kernel can use first 640K.
+ */
+static int copy_backup_region(void)
+{
+        if (backup_dest)
+                memcpy((void *)backup_dest, (void *)backup_src, backup_sz);
+
+        return 0;
+}
+
+int verify_sha256_digest(void)
+{
+        struct sha_region *ptr, *end;
+        u8 digest[SHA256_DIGEST_SIZE];
+        struct sha256_state sctx;
+
+        sha256_init(&sctx);
+        end = &sha_regions[sizeof(sha_regions)/sizeof(sha_regions[0])];
+        for (ptr = sha_regions; ptr < end; ptr++)
+                sha256_update(&sctx, (uint8_t *)(ptr->start), ptr->len);
+
+        sha256_final(&sctx, digest);
+
+        if (memcmp(digest, sha256_digest, sizeof(digest)))
+                return 1;
+
+        return 0;
+}
+
+void purgatory(void)
+{
+        int ret;
+
+        ret = verify_sha256_digest();
+        if (ret) {
+                /* loop forever */
+                for (;;)
+                        ;
+        }
+        copy_backup_region();
+}
diff --git a/arch/x86/purgatory/setup-x86_64.S b/arch/x86/purgatory/setup-x86_64.S
new file mode 100644
index 000000000000..fe3c91ba1bd0
--- /dev/null
+++ b/arch/x86/purgatory/setup-x86_64.S
@@ -0,0 +1,58 @@
+/*
+ * purgatory:  setup code
+ *
+ * Copyright (C) 2003,2004  Eric Biederman (ebiederm@xmission.com)
+ * Copyright (C) 2014 Red Hat Inc.
+ *
+ * This code has been taken from kexec-tools.
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+        .text
+        .globl purgatory_start
+        .balign 16
+purgatory_start:
+        .code64
+
+        /* Load a gdt so I know what the segment registers are */
+        lgdt    gdt(%rip)
+
+        /* load the data segments */
+        movl    $0x18, %eax     /* data segment */
+        movl    %eax, %ds
+        movl    %eax, %es
+        movl    %eax, %ss
+        movl    %eax, %fs
+        movl    %eax, %gs
+
+        /* Setup a stack */
+        leaq    lstack_end(%rip), %rsp
+
+        /* Call the C code */
+        call purgatory
+        jmp     entry64
+
+        .section ".rodata"
+        .balign 16
+gdt:    /* 0x00 unusable segment
+         * 0x08 unused
+         * so use them as the gdt ptr
+         */
+        .word   gdt_end - gdt - 1
+        .quad   gdt
+        .word   0, 0, 0
+
+        /* 0x10 4GB flat code segment */
+        .word   0xFFFF, 0x0000, 0x9A00, 0x00AF
+
+        /* 0x18 4GB flat data segment */
+        .word   0xFFFF, 0x0000, 0x9200, 0x00CF
+gdt_end:
+
+        .bss
+        .balign 4096
+lstack:
+        .skip 4096
+lstack_end:
diff --git a/arch/x86/purgatory/sha256.c b/arch/x86/purgatory/sha256.c
new file mode 100644
index 000000000000..548ca675a14a
--- /dev/null
+++ b/arch/x86/purgatory/sha256.c
@@ -0,0 +1,283 @@
+/*
+ * SHA-256, as specified in
+ * http://csrc.nist.gov/groups/STM/cavp/documents/shs/sha256-384-512.pdf
+ *
+ * SHA-256 code by Jean-Luc Cooke <jlcooke@certainkey.com>.
+ *
+ * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com>
+ * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
+ * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
+ * Copyright (c) 2014 Red Hat 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/bitops.h>
+#include <asm/byteorder.h>
+#include "sha256.h"
+#include "../boot/string.h"
+
+static inline u32 Ch(u32 x, u32 y, u32 z)
+{
+        return z ^ (x & (y ^ z));
+}
+
+static inline u32 Maj(u32 x, u32 y, u32 z)
+{
+        return (x & y) | (z & (x | y));
+}
+
+#define e0(x)       (ror32(x, 2) ^ ror32(x, 13) ^ ror32(x, 22))
+#define e1(x)       (ror32(x, 6) ^ ror32(x, 11) ^ ror32(x, 25))
+#define s0(x)       (ror32(x, 7) ^ ror32(x, 18) ^ (x >> 3))
+#define s1(x)       (ror32(x, 17) ^ ror32(x, 19) ^ (x >> 10))
+
+static inline void LOAD_OP(int I, u32 *W, const u8 *input)
+{
+        W[I] = __be32_to_cpu(((__be32 *)(input))[I]);
+}
+
+static inline void BLEND_OP(int I, u32 *W)
+{
+        W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16];
+}
+
+static void sha256_transform(u32 *state, const u8 *input)
+{
+        u32 a, b, c, d, e, f, g, h, t1, t2;
+        u32 W[64];
+        int i;
+
+        /* load the input */
+        for (i = 0; i < 16; i++)
+                LOAD_OP(i, W, input);
+
+        /* now blend */
+        for (i = 16; i < 64; i++)
+                BLEND_OP(i, W);
+
+        /* load the state into our registers */
+        a = state[0];  b = state[1];  c = state[2];  d = state[3];
+        e = state[4];  f = state[5];  g = state[6];  h = state[7];
+
+        /* now iterate */
+        t1 = h + e1(e) + Ch(e, f, g) + 0x428a2f98 + W[0];
+        t2 = e0(a) + Maj(a, b, c);    d += t1;    h = t1 + t2;
+        t1 = g + e1(d) + Ch(d, e, f) + 0x71374491 + W[1];
+        t2 = e0(h) + Maj(h, a, b);    c += t1;    g = t1 + t2;
+        t1 = f + e1(c) + Ch(c, d, e) + 0xb5c0fbcf + W[2];
+        t2 = e0(g) + Maj(g, h, a);    b += t1;    f = t1 + t2;
+        t1 = e + e1(b) + Ch(b, c, d) + 0xe9b5dba5 + W[3];
+        t2 = e0(f) + Maj(f, g, h);    a += t1;    e = t1 + t2;
+        t1 = d + e1(a) + Ch(a, b, c) + 0x3956c25b + W[4];
+        t2 = e0(e) + Maj(e, f, g);    h += t1;    d = t1 + t2;
+        t1 = c + e1(h) + Ch(h, a, b) + 0x59f111f1 + W[5];
+        t2 = e0(d) + Maj(d, e, f);    g += t1;    c = t1 + t2;
+        t1 = b + e1(g) + Ch(g, h, a) + 0x923f82a4 + W[6];
+        t2 = e0(c) + Maj(c, d, e);    f += t1;    b = t1 + t2;
+        t1 = a + e1(f) + Ch(f, g, h) + 0xab1c5ed5 + W[7];
+        t2 = e0(b) + Maj(b, c, d);    e += t1;    a = t1 + t2;
+
+        t1 = h + e1(e) + Ch(e, f, g) + 0xd807aa98 + W[8];
+        t2 = e0(a) + Maj(a, b, c);    d += t1;    h = t1 + t2;
+        t1 = g + e1(d) + Ch(d, e, f) + 0x12835b01 + W[9];
+        t2 = e0(h) + Maj(h, a, b);    c += t1;    g = t1 + t2;
+        t1 = f + e1(c) + Ch(c, d, e) + 0x243185be + W[10];
+        t2 = e0(g) + Maj(g, h, a);    b += t1;    f = t1 + t2;
+        t1 = e + e1(b) + Ch(b, c, d) + 0x550c7dc3 + W[11];
+        t2 = e0(f) + Maj(f, g, h);    a += t1;    e = t1 + t2;
+        t1 = d + e1(a) + Ch(a, b, c) + 0x72be5d74 + W[12];
+        t2 = e0(e) + Maj(e, f, g);    h += t1;    d = t1 + t2;
+        t1 = c + e1(h) + Ch(h, a, b) + 0x80deb1fe + W[13];
+        t2 = e0(d) + Maj(d, e, f);    g += t1;    c = t1 + t2;
+        t1 = b + e1(g) + Ch(g, h, a) + 0x9bdc06a7 + W[14];
+        t2 = e0(c) + Maj(c, d, e);    f += t1;    b = t1 + t2;
+        t1 = a + e1(f) + Ch(f, g, h) + 0xc19bf174 + W[15];
+        t2 = e0(b) + Maj(b, c, d);    e += t1;    a = t1+t2;
+
+        t1 = h + e1(e) + Ch(e, f, g) + 0xe49b69c1 + W[16];
+        t2 = e0(a) + Maj(a, b, c);    d += t1;    h = t1+t2;
+        t1 = g + e1(d) + Ch(d, e, f) + 0xefbe4786 + W[17];
+        t2 = e0(h) + Maj(h, a, b);    c += t1;    g = t1+t2;
+        t1 = f + e1(c) + Ch(c, d, e) + 0x0fc19dc6 + W[18];
+        t2 = e0(g) + Maj(g, h, a);    b += t1;    f = t1+t2;
+        t1 = e + e1(b) + Ch(b, c, d) + 0x240ca1cc + W[19];
+        t2 = e0(f) + Maj(f, g, h);    a += t1;    e = t1+t2;
+        t1 = d + e1(a) + Ch(a, b, c) + 0x2de92c6f + W[20];
+        t2 = e0(e) + Maj(e, f, g);    h += t1;    d = t1+t2;
+        t1 = c + e1(h) + Ch(h, a, b) + 0x4a7484aa + W[21];
+        t2 = e0(d) + Maj(d, e, f);    g += t1;    c = t1+t2;
+        t1 = b + e1(g) + Ch(g, h, a) + 0x5cb0a9dc + W[22];
+        t2 = e0(c) + Maj(c, d, e);    f += t1;    b = t1+t2;
+        t1 = a + e1(f) + Ch(f, g, h) + 0x76f988da + W[23];
+        t2 = e0(b) + Maj(b, c, d);    e += t1;    a = t1+t2;
+
+        t1 = h + e1(e) + Ch(e, f, g) + 0x983e5152 + W[24];
+        t2 = e0(a) + Maj(a, b, c);    d += t1;    h = t1+t2;
+        t1 = g + e1(d) + Ch(d, e, f) + 0xa831c66d + W[25];
+        t2 = e0(h) + Maj(h, a, b);    c += t1;    g = t1+t2;
+        t1 = f + e1(c) + Ch(c, d, e) + 0xb00327c8 + W[26];
+        t2 = e0(g) + Maj(g, h, a);    b += t1;    f = t1+t2;
+        t1 = e + e1(b) + Ch(b, c, d) + 0xbf597fc7 + W[27];
+        t2 = e0(f) + Maj(f, g, h);    a += t1;    e = t1+t2;
+        t1 = d + e1(a) + Ch(a, b, c) + 0xc6e00bf3 + W[28];
+        t2 = e0(e) + Maj(e, f, g);    h += t1;    d = t1+t2;
+        t1 = c + e1(h) + Ch(h, a, b) + 0xd5a79147 + W[29];
+        t2 = e0(d) + Maj(d, e, f);    g += t1;    c = t1+t2;
+        t1 = b + e1(g) + Ch(g, h, a) + 0x06ca6351 + W[30];
+        t2 = e0(c) + Maj(c, d, e);    f += t1;    b = t1+t2;
+        t1 = a + e1(f) + Ch(f, g, h) + 0x14292967 + W[31];
+        t2 = e0(b) + Maj(b, c, d);    e += t1;    a = t1+t2;
+
+        t1 = h + e1(e) + Ch(e, f, g) + 0x27b70a85 + W[32];
+        t2 = e0(a) + Maj(a, b, c);    d += t1;    h = t1+t2;
+        t1 = g + e1(d) + Ch(d, e, f) + 0x2e1b2138 + W[33];
+        t2 = e0(h) + Maj(h, a, b);    c += t1;    g = t1+t2;
+        t1 = f + e1(c) + Ch(c, d, e) + 0x4d2c6dfc + W[34];
+        t2 = e0(g) + Maj(g, h, a);    b += t1;    f = t1+t2;
+        t1 = e + e1(b) + Ch(b, c, d) + 0x53380d13 + W[35];
+        t2 = e0(f) + Maj(f, g, h);    a += t1;    e = t1+t2;
+        t1 = d + e1(a) + Ch(a, b, c) + 0x650a7354 + W[36];
+        t2 = e0(e) + Maj(e, f, g);    h += t1;    d = t1+t2;
+        t1 = c + e1(h) + Ch(h, a, b) + 0x766a0abb + W[37];
+        t2 = e0(d) + Maj(d, e, f);    g += t1;    c = t1+t2;
+        t1 = b + e1(g) + Ch(g, h, a) + 0x81c2c92e + W[38];
+        t2 = e0(c) + Maj(c, d, e);    f += t1;    b = t1+t2;
+        t1 = a + e1(f) + Ch(f, g, h) + 0x92722c85 + W[39];
+        t2 = e0(b) + Maj(b, c, d);    e += t1;    a = t1+t2;
+
+        t1 = h + e1(e) + Ch(e, f, g) + 0xa2bfe8a1 + W[40];
+        t2 = e0(a) + Maj(a, b, c);    d += t1;    h = t1+t2;
+        t1 = g + e1(d) + Ch(d, e, f) + 0xa81a664b + W[41];
+        t2 = e0(h) + Maj(h, a, b);    c += t1;    g = t1+t2;
+        t1 = f + e1(c) + Ch(c, d, e) + 0xc24b8b70 + W[42];
+        t2 = e0(g) + Maj(g, h, a);    b += t1;    f = t1+t2;
+        t1 = e + e1(b) + Ch(b, c, d) + 0xc76c51a3 + W[43];
+        t2 = e0(f) + Maj(f, g, h);    a += t1;    e = t1+t2;
+        t1 = d + e1(a) + Ch(a, b, c) + 0xd192e819 + W[44];
+        t2 = e0(e) + Maj(e, f, g);    h += t1;    d = t1+t2;
+        t1 = c + e1(h) + Ch(h, a, b) + 0xd6990624 + W[45];
+        t2 = e0(d) + Maj(d, e, f);    g += t1;    c = t1+t2;
+        t1 = b + e1(g) + Ch(g, h, a) + 0xf40e3585 + W[46];
+        t2 = e0(c) + Maj(c, d, e);    f += t1;    b = t1+t2;
+        t1 = a + e1(f) + Ch(f, g, h) + 0x106aa070 + W[47];
+        t2 = e0(b) + Maj(b, c, d);    e += t1;    a = t1+t2;
+
+        t1 = h + e1(e) + Ch(e, f, g) + 0x19a4c116 + W[48];
+        t2 = e0(a) + Maj(a, b, c);    d += t1;    h = t1+t2;
+        t1 = g + e1(d) + Ch(d, e, f) + 0x1e376c08 + W[49];
+        t2 = e0(h) + Maj(h, a, b);    c += t1;    g = t1+t2;
+        t1 = f + e1(c) + Ch(c, d, e) + 0x2748774c + W[50];
+        t2 = e0(g) + Maj(g, h, a);    b += t1;    f = t1+t2;
+        t1 = e + e1(b) + Ch(b, c, d) + 0x34b0bcb5 + W[51];
+        t2 = e0(f) + Maj(f, g, h);    a += t1;    e = t1+t2;
+        t1 = d + e1(a) + Ch(a, b, c) + 0x391c0cb3 + W[52];
+        t2 = e0(e) + Maj(e, f, g);    h += t1;    d = t1+t2;
+        t1 = c + e1(h) + Ch(h, a, b) + 0x4ed8aa4a + W[53];
+        t2 = e0(d) + Maj(d, e, f);    g += t1;    c = t1+t2;
+        t1 = b + e1(g) + Ch(g, h, a) + 0x5b9cca4f + W[54];
+        t2 = e0(c) + Maj(c, d, e);    f += t1;    b = t1+t2;
+        t1 = a + e1(f) + Ch(f, g, h) + 0x682e6ff3 + W[55];
+        t2 = e0(b) + Maj(b, c, d);    e += t1;    a = t1+t2;
+
+        t1 = h + e1(e) + Ch(e, f, g) + 0x748f82ee + W[56];
+        t2 = e0(a) + Maj(a, b, c);    d += t1;    h = t1+t2;
+        t1 = g + e1(d) + Ch(d, e, f) + 0x78a5636f + W[57];
+        t2 = e0(h) + Maj(h, a, b);    c += t1;    g = t1+t2;
+        t1 = f + e1(c) + Ch(c, d, e) + 0x84c87814 + W[58];
+        t2 = e0(g) + Maj(g, h, a);    b += t1;    f = t1+t2;
+        t1 = e + e1(b) + Ch(b, c, d) + 0x8cc70208 + W[59];
+        t2 = e0(f) + Maj(f, g, h);    a += t1;    e = t1+t2;
+        t1 = d + e1(a) + Ch(a, b, c) + 0x90befffa + W[60];
+        t2 = e0(e) + Maj(e, f, g);    h += t1;    d = t1+t2;
+        t1 = c + e1(h) + Ch(h, a, b) + 0xa4506ceb + W[61];
+        t2 = e0(d) + Maj(d, e, f);    g += t1;    c = t1+t2;
+        t1 = b + e1(g) + Ch(g, h, a) + 0xbef9a3f7 + W[62];
+        t2 = e0(c) + Maj(c, d, e);    f += t1;    b = t1+t2;
+        t1 = a + e1(f) + Ch(f, g, h) + 0xc67178f2 + W[63];
+        t2 = e0(b) + Maj(b, c, d);    e += t1;    a = t1+t2;
+
+        state[0] += a; state[1] += b; state[2] += c; state[3] += d;
+        state[4] += e; state[5] += f; state[6] += g; state[7] += h;
+
+        /* clear any sensitive info... */
+        a = b = c = d = e = f = g = h = t1 = t2 = 0;
+        memset(W, 0, 64 * sizeof(u32));
+}
+
+int sha256_init(struct sha256_state *sctx)
+{
+        sctx->state[0] = SHA256_H0;
+        sctx->state[1] = SHA256_H1;
+        sctx->state[2] = SHA256_H2;
+        sctx->state[3] = SHA256_H3;
+        sctx->state[4] = SHA256_H4;
+        sctx->state[5] = SHA256_H5;
+        sctx->state[6] = SHA256_H6;
+        sctx->state[7] = SHA256_H7;
+        sctx->count = 0;
+
+        return 0;
+}
+
+int sha256_update(struct sha256_state *sctx, const u8 *data, unsigned int len)
+{
+        unsigned int partial, done;
+        const u8 *src;
+
+        partial = sctx->count & 0x3f;
+        sctx->count += len;
+        done = 0;
+        src = data;
+
+        if ((partial + len) > 63) {
+                if (partial) {
+                        done = -partial;
+                        memcpy(sctx->buf + partial, data, done + 64);
+                        src = sctx->buf;
+                }
+
+                do {
+                        sha256_transform(sctx->state, src);
+                        done += 64;
+                        src = data + done;
+                } while (done + 63 < len);
+
+                partial = 0;
+        }
+        memcpy(sctx->buf + partial, src, len - done);
+
+        return 0;
+}
+
+int sha256_final(struct sha256_state *sctx, u8 *out)
+{
+        __be32 *dst = (__be32 *)out;
+        __be64 bits;
+        unsigned int index, pad_len;
+        int i;
+        static const u8 padding[64] = { 0x80, };
+
+        /* Save number of bits */
+        bits = cpu_to_be64(sctx->count << 3);
+
+        /* Pad out to 56 mod 64. */
+        index = sctx->count & 0x3f;
+        pad_len = (index < 56) ? (56 - index) : ((64+56) - index);
+        sha256_update(sctx, padding, pad_len);
+
+        /* Append length (before padding) */
+        sha256_update(sctx, (const u8 *)&bits, sizeof(bits));
+
+        /* Store state in digest */
+        for (i = 0; i < 8; i++)
+                dst[i] = cpu_to_be32(sctx->state[i]);
+
+        /* Zeroize sensitive information. */
+        memset(sctx, 0, sizeof(*sctx));
+
+        return 0;
+}
diff --git a/arch/x86/purgatory/sha256.h b/arch/x86/purgatory/sha256.h
new file mode 100644
index 000000000000..bd15a4127735
--- /dev/null
+++ b/arch/x86/purgatory/sha256.h
@@ -0,0 +1,22 @@
+/*
+ *  Copyright (C) 2014 Red Hat Inc.
+ *
+ *  Author: Vivek Goyal <vgoyal@redhat.com>
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#ifndef SHA256_H
+#define SHA256_H
+
+
+#include <linux/types.h>
+#include <crypto/sha.h>
+
+extern int sha256_init(struct sha256_state *sctx);
+extern int sha256_update(struct sha256_state *sctx, const u8 *input,
+                                unsigned int length);
+extern int sha256_final(struct sha256_state *sctx, u8 *hash);
+
+#endif /* SHA256_H */
diff --git a/arch/x86/purgatory/stack.S b/arch/x86/purgatory/stack.S
new file mode 100644
index 000000000000..3cefba1fefc8
--- /dev/null
+++ b/arch/x86/purgatory/stack.S
@@ -0,0 +1,19 @@
+/*
+ * purgatory:  stack
+ *
+ * Copyright (C) 2014 Red Hat Inc.
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+        /* A stack for the loaded kernel.
+         * Seperate and in the data section so it can be prepopulated.
+         */
+        .data
+        .balign 4096
+        .globl stack, stack_end
+
+stack:
+        .skip 4096
+stack_end:
diff --git a/arch/x86/purgatory/string.c b/arch/x86/purgatory/string.c
new file mode 100644
index 000000000000..d886b1fa36f0
--- /dev/null
+++ b/arch/x86/purgatory/string.c
@@ -0,0 +1,13 @@
+/*
+ * Simple string functions.
+ *
+ * Copyright (C) 2014 Red Hat Inc.
+ *
+ * Author:
+ *       Vivek Goyal <vgoyal@redhat.com>
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#include "../boot/string.c"
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
index d6b867921612..028b78168d85 100644
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@ -360,3 +360,6 @@
 351     i386    sched_setattr           sys_sched_setattr
 352     i386    sched_getattr           sys_sched_getattr
 353     i386    renameat2               sys_renameat2
+354     i386    seccomp                 sys_seccomp
+355     i386    getrandom               sys_getrandom
+356     i386    memfd_create            sys_memfd_create
diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl
index ec255a1646d2..35dd922727b9 100644
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@ -323,6 +323,10 @@
 314     common  sched_setattr           sys_sched_setattr
 315     common  sched_getattr           sys_sched_getattr
 316     common  renameat2               sys_renameat2
+317     common  seccomp                 sys_seccomp
+318     common  getrandom               sys_getrandom
+319     common  memfd_create            sys_memfd_create
+320     common  kexec_file_load         sys_kexec_file_load
 
 #
 # x32-specific system call numbers start at 512 to avoid cache impact
diff --git a/arch/x86/um/asm/elf.h b/arch/x86/um/asm/elf.h
index 0feee2fd5077..25a1022dd793 100644
--- a/arch/x86/um/asm/elf.h
+++ b/arch/x86/um/asm/elf.h
@@ -216,6 +216,5 @@ extern long elf_aux_hwcap;
 #define ELF_HWCAP (elf_aux_hwcap)
 
 #define SET_PERSONALITY(ex) do ; while(0)
-#define __HAVE_ARCH_GATE_AREA 1
 
 #endif
diff --git a/arch/x86/um/mem_64.c b/arch/x86/um/mem_64.c
index c6492e75797b..f8fecaddcc0d 100644
--- a/arch/x86/um/mem_64.c
+++ b/arch/x86/um/mem_64.c
@@ -9,18 +9,3 @@ const char *arch_vma_name(struct vm_area_struct *vma)
 
         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 addr)
-{
-        return 0;
-}
-
-int in_gate_area_no_mm(unsigned long addr)
-{
-        return 0;
-}
diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c
index 5e04a1c899fa..79d824551c1a 100644
--- a/arch/x86/um/signal.c
+++ b/arch/x86/um/signal.c
@@ -370,13 +370,12 @@ struct rt_sigframe
         char retcode[8];
 };
 
-int setup_signal_stack_sc(unsigned long stack_top, int sig,
-                          struct k_sigaction *ka, struct pt_regs *regs,
-                          sigset_t *mask)
+int setup_signal_stack_sc(unsigned long stack_top, struct ksignal *ksig,
+                          struct pt_regs *regs, sigset_t *mask)
 {
         struct sigframe __user *frame;
         void __user *restorer;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
 
         /* This is the same calculation as i386 - ((sp + 4) & 15) == 0 */
         stack_top = ((stack_top + 4) & -16UL) - 4;
@@ -385,8 +384,8 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig,
                 return 1;
 
         restorer = frame->retcode;
-        if (ka->sa.sa_flags & SA_RESTORER)
-                restorer = ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER)
+                restorer = ksig->ka.sa.sa_restorer;
 
         err |= __put_user(restorer, &frame->pretcode);
         err |= __put_user(sig, &frame->sig);
@@ -410,20 +409,19 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig,
                 return err;
 
         PT_REGS_SP(regs) = (unsigned long) frame;
-        PT_REGS_IP(regs) = (unsigned long) ka->sa.sa_handler;
+        PT_REGS_IP(regs) = (unsigned long) ksig->ka.sa.sa_handler;
         PT_REGS_AX(regs) = (unsigned long) sig;
         PT_REGS_DX(regs) = (unsigned long) 0;
         PT_REGS_CX(regs) = (unsigned long) 0;
         return 0;
 }
 
-int setup_signal_stack_si(unsigned long stack_top, int sig,
-                          struct k_sigaction *ka, struct pt_regs *regs,
-                          siginfo_t *info, sigset_t *mask)
+int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,
+                          struct pt_regs *regs, sigset_t *mask)
 {
         struct rt_sigframe __user *frame;
         void __user *restorer;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
 
         stack_top &= -8UL;
         frame = (struct rt_sigframe __user *) stack_top - 1;
@@ -431,14 +429,14 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
                 return 1;
 
         restorer = frame->retcode;
-        if (ka->sa.sa_flags & SA_RESTORER)
-                restorer = ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER)
+                restorer = ksig->ka.sa.sa_restorer;
 
         err |= __put_user(restorer, &frame->pretcode);
         err |= __put_user(sig, &frame->sig);
         err |= __put_user(&frame->info, &frame->pinfo);
         err |= __put_user(&frame->uc, &frame->puc);
-        err |= copy_siginfo_to_user(&frame->info, info);
+        err |= copy_siginfo_to_user(&frame->info, &ksig->info);
         err |= copy_ucontext_to_user(&frame->uc, &frame->fpstate, mask,
                                         PT_REGS_SP(regs));
 
@@ -457,7 +455,7 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
                 return err;
 
         PT_REGS_SP(regs) = (unsigned long) frame;
-        PT_REGS_IP(regs) = (unsigned long) ka->sa.sa_handler;
+        PT_REGS_IP(regs) = (unsigned long) ksig->ka.sa.sa_handler;
         PT_REGS_AX(regs) = (unsigned long) sig;
         PT_REGS_DX(regs) = (unsigned long) &frame->info;
         PT_REGS_CX(regs) = (unsigned long) &frame->uc;
@@ -502,12 +500,11 @@ struct rt_sigframe
         struct _fpstate fpstate;
 };
 
-int setup_signal_stack_si(unsigned long stack_top, int sig,
-                          struct k_sigaction *ka, struct pt_regs * regs,
-                          siginfo_t *info, sigset_t *set)
+int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,
+                          struct pt_regs *regs, sigset_t *set)
 {
         struct rt_sigframe __user *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
 
         frame = (struct rt_sigframe __user *)
                 round_down(stack_top - sizeof(struct rt_sigframe), 16);
@@ -517,8 +514,8 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 goto out;
 
-        if (ka->sa.sa_flags & SA_SIGINFO) {
-                err |= copy_siginfo_to_user(&frame->info, info);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
+                err |= copy_siginfo_to_user(&frame->info, &ksig->info);
                 if (err)
                         goto out;
         }
@@ -543,8 +540,8 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
          * already in userspace.
          */
         /* x86-64 should always use SA_RESTORER. */
-        if (ka->sa.sa_flags & SA_RESTORER)
-                err |= __put_user(ka->sa.sa_restorer, &frame->pretcode);
+        if (ksig->ka.sa.sa_flags & SA_RESTORER)
+                err |= __put_user(ksig->ka.sa.sa_restorer, &frame->pretcode);
         else
                 /* could use a vstub here */
                 return err;
@@ -570,7 +567,7 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
          */
         PT_REGS_SI(regs) = (unsigned long) &frame->info;
         PT_REGS_DX(regs) = (unsigned long) &frame->uc;
-        PT_REGS_IP(regs) = (unsigned long) ka->sa.sa_handler;
+        PT_REGS_IP(regs) = (unsigned long) ksig->ka.sa.sa_handler;
  out:
         return err;
 }
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index e4f7781ee162..e904c270573b 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -115,23 +115,6 @@ static __init int ia32_binfmt_init(void)
         return 0;
 }
 __initcall(ia32_binfmt_init);
-#endif
-
-#else  /* CONFIG_X86_32 */
-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-        return NULL;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long addr)
-{
-        return 0;
-}
-
-int in_gate_area_no_mm(unsigned long addr)
-{
-        return 0;
-}
+#endif /* CONFIG_SYSCTL */
 
 #endif  /* CONFIG_X86_64 */
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 94813515fdd6..c0cb11fb5008 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1828,8 +1828,19 @@ static void __init xen_hvm_guest_init(void)
         xen_hvm_init_mmu_ops();
 }
 
+static bool xen_nopv = false;
+static __init int xen_parse_nopv(char *arg)
+{
+       xen_nopv = true;
+       return 0;
+}
+early_param("xen_nopv", xen_parse_nopv);
+
 static uint32_t __init xen_hvm_platform(void)
 {
+        if (xen_nopv)
+                return 0;
+
         if (xen_pv_domain())
                 return 0;
 
@@ -1838,6 +1849,8 @@ static uint32_t __init xen_hvm_platform(void)
 
 bool xen_hvm_need_lapic(void)
 {
+        if (xen_nopv)
+                return false;
         if (xen_pv_domain())
                 return false;
         if (!xen_hvm_domain())
diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c
index ebfa9b2c871d..1580e7a5a4cf 100644
--- a/arch/x86/xen/grant-table.c
+++ b/arch/x86/xen/grant-table.c
@@ -49,7 +49,7 @@
 static struct gnttab_vm_area {
         struct vm_struct *area;
         pte_t **ptes;
-} gnttab_shared_vm_area, gnttab_status_vm_area;
+} gnttab_shared_vm_area;
 
 int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
                            unsigned long max_nr_gframes,
@@ -73,43 +73,16 @@ int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
         return 0;
 }
 
-int arch_gnttab_map_status(uint64_t *frames, unsigned long nr_gframes,
-                           unsigned long max_nr_gframes,
-                           grant_status_t **__shared)
-{
-        grant_status_t *shared = *__shared;
-        unsigned long addr;
-        unsigned long i;
-
-        if (shared == NULL)
-                *__shared = shared = gnttab_status_vm_area.area->addr;
-
-        addr = (unsigned long)shared;
-
-        for (i = 0; i < nr_gframes; i++) {
-                set_pte_at(&init_mm, addr, gnttab_status_vm_area.ptes[i],
-                           mfn_pte(frames[i], PAGE_KERNEL));
-                addr += PAGE_SIZE;
-        }
-
-        return 0;
-}
-
 void arch_gnttab_unmap(void *shared, unsigned long nr_gframes)
 {
-        pte_t **ptes;
         unsigned long addr;
         unsigned long i;
 
-        if (shared == gnttab_status_vm_area.area->addr)
-                ptes = gnttab_status_vm_area.ptes;
-        else
-                ptes = gnttab_shared_vm_area.ptes;
-
         addr = (unsigned long)shared;
 
         for (i = 0; i < nr_gframes; i++) {
-                set_pte_at(&init_mm, addr, ptes[i], __pte(0));
+                set_pte_at(&init_mm, addr, gnttab_shared_vm_area.ptes[i],
+                           __pte(0));
                 addr += PAGE_SIZE;
         }
 }
@@ -129,35 +102,12 @@ static int arch_gnttab_valloc(struct gnttab_vm_area *area, unsigned nr_frames)
         return 0;
 }
 
-static void arch_gnttab_vfree(struct gnttab_vm_area *area)
+int arch_gnttab_init(unsigned long nr_shared)
 {
-        free_vm_area(area->area);
-        kfree(area->ptes);
-}
-
-int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status)
-{
-        int ret;
-
         if (!xen_pv_domain())
                 return 0;
 
-        ret = arch_gnttab_valloc(&gnttab_shared_vm_area, nr_shared);
-        if (ret < 0)
-                return ret;
-
-        /*
-         * Always allocate the space for the status frames in case
-         * we're migrated to a host with V2 support.
-         */
-        ret = arch_gnttab_valloc(&gnttab_status_vm_area, nr_status);
-        if (ret < 0)
-                goto err;
-
-        return 0;
-  err:
-        arch_gnttab_vfree(&gnttab_shared_vm_area);
-        return -ENOMEM;
+        return arch_gnttab_valloc(&gnttab_shared_vm_area, nr_shared);
 }
 
 #ifdef CONFIG_XEN_PVH
@@ -168,6 +118,7 @@ static int __init xlated_setup_gnttab_pages(void)
 {
         struct page **pages;
         xen_pfn_t *pfns;
+        void *vaddr;
         int rc;
         unsigned int i;
         unsigned long nr_grant_frames = gnttab_max_grant_frames();
@@ -193,21 +144,20 @@ static int __init xlated_setup_gnttab_pages(void)
         for (i = 0; i < nr_grant_frames; i++)
                 pfns[i] = page_to_pfn(pages[i]);
 
-        rc = arch_gnttab_map_shared(pfns, nr_grant_frames, nr_grant_frames,
-                                    &xen_auto_xlat_grant_frames.vaddr);
-
-        if (rc) {
+        vaddr = vmap(pages, nr_grant_frames, 0, PAGE_KERNEL);
+        if (!vaddr) {
                 pr_warn("%s Couldn't map %ld pfns rc:%d\n", __func__,
                         nr_grant_frames, rc);
                 free_xenballooned_pages(nr_grant_frames, pages);
                 kfree(pages);
                 kfree(pfns);
-                return rc;
+                return -ENOMEM;
         }
         kfree(pages);
 
         xen_auto_xlat_grant_frames.pfn = pfns;
         xen_auto_xlat_grant_frames.count = nr_grant_frames;
+        xen_auto_xlat_grant_frames.vaddr = vaddr;
 
         return 0;
 }
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index 9bb3d82ffec8..3172692381ae 100644
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -841,10 +841,9 @@ unsigned long __init set_phys_range_identity(unsigned long pfn_s,
                         pfn = ALIGN(pfn, P2M_PER_PAGE);
         }
 
-        if (!WARN((pfn - pfn_s) != (pfn_e - pfn_s),
+        WARN((pfn - pfn_s) != (pfn_e - pfn_s),
                 "Identity mapping failed. We are %ld short of 1-1 mappings!\n",
-                (pfn_e - pfn_s) - (pfn - pfn_s)))
-                printk(KERN_DEBUG "1-1 mapping on %lx->%lx\n", pfn_s, pfn);
+                (pfn_e - pfn_s) - (pfn - pfn_s));
 
         return pfn - pfn_s;
 }
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 7b78f88c1707..5718b0b58b60 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -444,7 +444,7 @@ void xen_setup_timer(int cpu)
 
         irq = bind_virq_to_irqhandler(VIRQ_TIMER, cpu, xen_timer_interrupt,
                                       IRQF_PERCPU|IRQF_NOBALANCING|IRQF_TIMER|
-                                      IRQF_FORCE_RESUME,
+                                      IRQF_FORCE_RESUME|IRQF_EARLY_RESUME,
                                       name, NULL);
         (void)xen_set_irq_priority(irq, XEN_IRQ_PRIORITY_MAX);
 
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index 98b67d5f1514..4612321c73cc 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -331,17 +331,17 @@ gen_return_code(unsigned char *codemem)
 }
 
 
-static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
-                       sigset_t *set, struct pt_regs *regs)
+static int setup_frame(struct ksignal *ksig, sigset_t *set,
+                       struct pt_regs *regs)
 {
         struct rt_sigframe *frame;
-        int err = 0;
+        int err = 0, sig = ksig->sig;
         int signal;
         unsigned long sp, ra, tp;
 
         sp = regs->areg[1];
 
-        if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && sas_ss_flags(sp) == 0) {
+        if ((ksig->ka.sa.sa_flags & SA_ONSTACK) != 0 && sas_ss_flags(sp) == 0) {
                 sp = current->sas_ss_sp + current->sas_ss_size;
         }
 
@@ -351,7 +351,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 panic ("Double exception sys_sigreturn\n");
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) {
-                goto give_sigsegv;
+                return -EFAULT;
         }
 
         signal = current_thread_info()->exec_domain
@@ -360,8 +360,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 ? current_thread_info()->exec_domain->signal_invmap[sig]
                 : sig;
 
-        if (ka->sa.sa_flags & SA_SIGINFO) {
-                err |= copy_siginfo_to_user(&frame->info, info);
+        if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
+                err |= copy_siginfo_to_user(&frame->info, &ksig->info);
         }
 
         /* Create the user context.  */
@@ -372,8 +372,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= setup_sigcontext(frame, regs);
         err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
 
-        if (ka->sa.sa_flags & SA_RESTORER) {
-                ra = (unsigned long)ka->sa.sa_restorer;
+        if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+                ra = (unsigned long)ksig->ka.sa.sa_restorer;
         } else {
 
                 /* Create sys_rt_sigreturn syscall in stack frame */
@@ -381,7 +381,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 err |= gen_return_code(frame->retcode);
 
                 if (err) {
-                        goto give_sigsegv;
+                        return -EFAULT;
                 }
                 ra = (unsigned long) frame->retcode;
         }
@@ -393,7 +393,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 
         /* Set up registers for signal handler; preserve the threadptr */
         tp = regs->threadptr;
-        start_thread(regs, (unsigned long) ka->sa.sa_handler,
+        start_thread(regs, (unsigned long) ksig->ka.sa.sa_handler,
                      (unsigned long) frame);
 
         /* Set up a stack frame for a call4
@@ -416,10 +416,6 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 #endif
 
         return 0;
-
-give_sigsegv:
-        force_sigsegv(sig, current);
-        return -EFAULT;
 }
 
 /*
@@ -433,15 +429,11 @@ give_sigsegv:
  */
 static void do_signal(struct pt_regs *regs)
 {
-        siginfo_t info;
-        int signr;
-        struct k_sigaction ka;
+        struct ksignal ksig;
 
         task_pt_regs(current)->icountlevel = 0;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 int ret;
 
                 /* Are we from a system call? */
@@ -457,7 +449,7 @@ static void do_signal(struct pt_regs *regs)
                                         break;
 
                                 case -ERESTARTSYS:
-                                        if (!(ka.sa.sa_flags & SA_RESTART)) {
+                                        if (!(ksig.ka.sa.sa_flags & SA_RESTART)) {
                                                 regs->areg[2] = -EINTR;
                                                 break;
                                         }
@@ -476,11 +468,8 @@ static void do_signal(struct pt_regs *regs)
 
                 /* Whee!  Actually deliver the signal.  */
                 /* Set up the stack frame */
-                ret = setup_frame(signr, &ka, &info, sigmask_to_save(), regs);
-                if (ret)
-                        return;
-
-                signal_delivered(signr, &info, &ka, regs, 0);
+                ret = setup_frame(&ksig, sigmask_to_save(), regs);
+                signal_setup_done(ret, &ksig, 0);
                 if (current->ptrace & PT_SINGLESTEP)
                         task_pt_regs(current)->icountlevel = 1;