27 files changed, 83 insertions, 190 deletions

diff --git a/arch/arm/boot/compressed/head-shmobile.S b/arch/arm/boot/compressed/head-shmobile.S
index e2d636336b7c..e7f80928949c 100644
--- a/arch/arm/boot/compressed/head-shmobile.S
+++ b/arch/arm/boot/compressed/head-shmobile.S
@@ -55,12 +55,47 @@ __tmp_stack:
 __continue:
 #endif /* CONFIG_ZBOOT_ROM_MMC || CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI */
 
-        /* Set board ID necessary for boot */
-        ldr     r7, 1f                          @ Set machine type register
-        mov     r8, #0                          @ pass null pointer as atag
+        adr     r0, dtb_info
+        ldmia   r0, {r1, r3, r4, r5, r7}
+
+        sub     r0, r0, r1              @ calculate the delta offset
+        add     r5, r5, r0              @ _edata
+
+        ldr     lr, [r5, #0]            @ check if valid DTB is present
+        cmp     lr, r3
+        bne     0f
+
+        add     r9, r7, #31             @ rounded up to a multiple
+        bic     r9, r9, #31             @ ... of 32 bytes
+
+        add     r6, r9, r5              @ copy from _edata
+        add     r9, r9, r4              @ to MEMORY_START
+
+1:      ldmdb   r6!, {r0 - r3, r10 - r12, lr}
+        cmp     r6, r5
+        stmdb   r9!, {r0 - r3, r10 - r12, lr}
+        bhi     1b
+
+        /* Success: Zero board ID, pointer to start of memory for atag/dtb */
+        mov     r7, #0
+        mov     r8, r4
         b       2f
 
-1 :     .long MACH_TYPE
+        .align  2
+dtb_info:
+        .word   dtb_info
+#ifndef __ARMEB__
+        .word   0xedfe0dd0              @ sig is 0xd00dfeed big endian
+#else
+        .word   0xd00dfeed
+#endif
+        .word   MEMORY_START
+        .word   _edata
+        .word   0x4000                  @ maximum DTB size
+0:
+        /* Failure: Zero board ID, NULL atag/dtb */
+        mov     r7, #0
+        mov     r8, #0                  @ pass null pointer as atag
 2 :
 
 #endif /* CONFIG_ZBOOT_ROM */
diff --git a/arch/arm/boot/dts/keystone.dts b/arch/arm/boot/dts/keystone.dts
index 1334b42c6b77..a68e34bbecb2 100644
--- a/arch/arm/boot/dts/keystone.dts
+++ b/arch/arm/boot/dts/keystone.dts
@@ -7,7 +7,9 @@
  */
 
 /dts-v1/;
-/include/ "skeleton.dtsi"
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+#include "skeleton.dtsi"
 
 / {
         model = "Texas Instruments Keystone 2 SoC";
@@ -67,18 +69,23 @@
 
         timer {
                 compatible = "arm,armv7-timer";
-                interrupts = <1 13 0xf08>,
-                             <1 14 0xf08>,
-                             <1 11 0xf08>,
-                             <1 10 0x308>;
+                interrupts =
+                        <GIC_PPI 13
+                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                        <GIC_PPI 14
+                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                        <GIC_PPI 11
+                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                        <GIC_PPI 10
+                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
         };
 
         pmu {
                 compatible = "arm,cortex-a15-pmu";
-                interrupts = <0 20 0xf01>,
-                             <0 21 0xf01>,
-                             <0 22 0xf01>,
-                             <0 23 0xf01>;
+                interrupts = <GIC_SPI 20 IRQ_TYPE_EDGE_RISING>,
+                             <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
+                             <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>,
+                             <GIC_SPI 23 IRQ_TYPE_EDGE_RISING>;
         };
 
         soc {
@@ -100,7 +107,7 @@
                         reg-io-width = <4>;
                         reg = <0x02530c00 0x100>;
                         clock-frequency = <133120000>;
-                        interrupts = <0 277 0xf01>;
+                        interrupts = <GIC_SPI 277 IRQ_TYPE_EDGE_RISING>;
                 };
 
                 uart1:  serial@02531000 {
@@ -110,7 +117,7 @@
                         reg-io-width = <4>;
                         reg = <0x02531000 0x100>;
                         clock-frequency = <133120000>;
-                        interrupts = <0 280 0xf01>;
+                        interrupts = <GIC_SPI 280 IRQ_TYPE_EDGE_RISING>;
                 };
 
         };
diff --git a/arch/arm/boot/dts/skeleton64.dtsi b/arch/arm/boot/dts/skeleton64.dtsi
index 15994158a998..b5d7f36f33de 100644
--- a/arch/arm/boot/dts/skeleton64.dtsi
+++ b/arch/arm/boot/dts/skeleton64.dtsi
@@ -9,5 +9,5 @@
         #size-cells = <2>;
         chosen { };
         aliases { };
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; reg = <0 0 0 0>; };
 };
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index 01ad4d41e728..bea6295c8c59 100644
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -33,9 +33,6 @@ config ARCH_P720T
           Say Y here if you intend to run this kernel on the ARM Prospector
           720T.
 
-config ARCH_FORTUNET
-        bool "FORTUNET"
-
 config EP72XX_ROM_BOOT
         bool "EP721x/EP731x ROM boot"
         help
diff --git a/arch/arm/mach-clps711x/Makefile b/arch/arm/mach-clps711x/Makefile
index f30ed2b496fb..f04151efd96a 100644
--- a/arch/arm/mach-clps711x/Makefile
+++ b/arch/arm/mach-clps711x/Makefile
@@ -10,5 +10,4 @@ obj-$(CONFIG_ARCH_AUTCPU12)	+= board-autcpu12.o
 obj-$(CONFIG_ARCH_CDB89712)     += board-cdb89712.o
 obj-$(CONFIG_ARCH_CLEP7312)     += board-clep7312.o
 obj-$(CONFIG_ARCH_EDB7211)      += board-edb7211.o
-obj-$(CONFIG_ARCH_FORTUNET)     += board-fortunet.o
 obj-$(CONFIG_ARCH_P720T)        += board-p720t.o
diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c
index 5867aebd8d0c..f8d71a89644a 100644
--- a/arch/arm/mach-clps711x/board-autcpu12.c
+++ b/arch/arm/mach-clps711x/board-autcpu12.c
@@ -259,11 +259,7 @@ static void __init autcpu12_init(void)
 static void __init autcpu12_init_late(void)