Merge branch 'dt/gic' into highbank/soc

Conflicts:
	arch/arm/Kconfig

23 files changed, 24 insertions, 36 deletions

diff --git a/arch/arm/mach-orion5x/d2net-setup.c b/arch/arm/mach-orion5x/d2net-setup.c
index 19cf5bf99f1b..8c8300951f46 100644
--- a/arch/arm/mach-orion5x/d2net-setup.c
+++ b/arch/arm/mach-orion5x/d2net-setup.c
@@ -336,7 +336,7 @@ static void __init d2net_init(void)
 
 #ifdef CONFIG_MACH_D2NET
 MACHINE_START(D2NET, "LaCie d2 Network")
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = d2net_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
@@ -348,7 +348,7 @@ MACHINE_END
 
 #ifdef CONFIG_MACH_BIGDISK
 MACHINE_START(BIGDISK, "LaCie Big Disk Network")
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = d2net_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 6d771cbf06a4..4b79a80d5e1f 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -358,7 +358,7 @@ static void __init db88f5281_init(void)
 
 MACHINE_START(DB88F5281, "Marvell Orion-2 Development Board")
         /* Maintainer: Tzachi Perelstein <tzachi@marvell.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = db88f5281_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 6fb4908e998b..343f60e9639f 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -729,7 +729,7 @@ static void __init dns323_init(void)
 /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */
 MACHINE_START(DNS323, "D-Link DNS-323")
         /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = dns323_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/edmini_v2-setup.c b/arch/arm/mach-orion5x/edmini_v2-setup.c
index b67cff0d4cfe..70a4e9265f06 100644
--- a/arch/arm/mach-orion5x/edmini_v2-setup.c
+++ b/arch/arm/mach-orion5x/edmini_v2-setup.c
@@ -251,7 +251,7 @@ static void __init edmini_v2_init(void)
 /* Warning: LaCie use a wrong mach-type (0x20e=526) in their bootloader. */
 MACHINE_START(EDMINI_V2, "LaCie Ethernet Disk mini V2")
         /* Maintainer: Christopher Moore <moore@free.fr> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = edmini_v2_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/include/mach/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S
index 5e3bf5b68aec..f340ed8f8dd0 100644
--- a/arch/arm/mach-orion5x/include/mach/debug-macro.S
+++ b/arch/arm/mach-orion5x/include/mach/debug-macro.S
@@ -10,7 +10,7 @@
 
 #include <mach/orion5x.h>
 
-        .macro  addruart, rp, rv
+        .macro  addruart, rp, rv, tmp
         ldr     \rp, =ORION5X_REGS_PHYS_BASE
         ldr     \rv, =ORION5X_REGS_VIRT_BASE
         orr     \rp, \rp, #0x00012000
diff --git a/arch/arm/mach-orion5x/include/mach/memory.h b/arch/arm/mach-orion5x/include/mach/memory.h
deleted file mode 100644
index 6769917882fe..000000000000
--- a/arch/arm/mach-orion5x/include/mach/memory.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/arm/mach-orion5x/include/mach/memory.h
- *
- * Marvell Orion memory definitions
- */
-
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#define PLAT_PHYS_OFFSET        UL(0x00000000)
-
-#endif
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index f88f54bb7562..d3cd3f63258a 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -379,7 +379,7 @@ static void __init kurobox_pro_init(void)
 #ifdef CONFIG_MACH_KUROBOX_PRO
 MACHINE_START(KUROBOX_PRO, "Buffalo/Revogear Kurobox Pro")
         /* Maintainer: Ronen Shitrit <rshitrit@marvell.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = kurobox_pro_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
@@ -392,7 +392,7 @@ MACHINE_END
 #ifdef CONFIG_MACH_LINKSTATION_PRO
 MACHINE_START(LINKSTATION_PRO, "Buffalo Linkstation Pro/Live")
         /* Maintainer: Byron Bradley <byron.bbradley@gmail.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = kurobox_pro_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/ls-chl-setup.c b/arch/arm/mach-orion5x/ls-chl-setup.c
index 5065803ca82a..9503fff404e3 100644
--- a/arch/arm/mach-orion5x/ls-chl-setup.c
+++ b/arch/arm/mach-orion5x/ls-chl-setup.c
@@ -318,7 +318,7 @@ static void __init lschl_init(void)
 
 MACHINE_START(LINKSTATION_LSCHL, "Buffalo Linkstation LiveV3 (LS-CHL)")
         /* Maintainer: Ash Hughes <ashley.hughes@blueyonder.co.uk> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = lschl_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c
index 8503d0a42d41..ed6d772f4a24 100644
--- a/arch/arm/mach-orion5x/ls_hgl-setup.c
+++ b/arch/arm/mach-orion5x/ls_hgl-setup.c
@@ -265,7 +265,7 @@ static void __init ls_hgl_init(void)
 
 MACHINE_START(LINKSTATION_LS_HGL, "Buffalo Linkstation LS-HGL")
         /* Maintainer: Zhu Qingsen <zhuqs@cn.fujistu.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = ls_hgl_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c
index 9c82723c05c0..743f7f1db181 100644
--- a/arch/arm/mach-orion5x/lsmini-setup.c
+++ b/arch/arm/mach-orion5x/lsmini-setup.c
@@ -267,7 +267,7 @@ static void __init lsmini_init(void)
 #ifdef CONFIG_MACH_LINKSTATION_MINI
 MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini")
         /* Maintainer: Alexey Kopytko <alexey@kopytko.ru> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = lsmini_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c
index ef3bb8e9a4c2..6020e26b1c71 100644
--- a/arch/arm/mach-orion5x/mss2-setup.c
+++ b/arch/arm/mach-orion5x/mss2-setup.c
@@ -261,7 +261,7 @@ static void __init mss2_init(void)
 
 MACHINE_START(MSS2, "Maxtor Shared Storage II")
         /* Maintainer: Sylver Bruneau <sylver.bruneau@googlemail.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = mss2_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c
index 525eb1286859..201ae3676289 100644
--- a/arch/arm/mach-orion5x/mv2120-setup.c
+++ b/arch/arm/mach-orion5x/mv2120-setup.c
@@ -228,7 +228,7 @@ static void __init mv2120_init(void)
 /* Warning: HP uses a wrong mach-type (=526) in their bootloader */
 MACHINE_START(MV2120, "HP Media Vault mv2120")
         /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = mv2120_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c
index e43b39cc7fe9..6197c79a2ecb 100644
--- a/arch/arm/mach-orion5x/net2big-setup.c
+++ b/arch/arm/mach-orion5x/net2big-setup.c
@@ -419,7 +419,7 @@ static void __init net2big_init(void)
 
 /* Warning: LaCie use a wrong mach-type (0x20e=526) in their bootloader. */
 MACHINE_START(NET2BIG, "LaCie 2Big Network")
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = net2big_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 50aae6f571b8..ebd6767d8e88 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -168,7 +168,7 @@ subsys_initcall(rd88f5181l_fxo_pci_init);
 
 MACHINE_START(RD88F5181L_FXO, "Marvell Orion-VoIP FXO Reference Design")
         /* Maintainer: Nicolas Pitre <nico@marvell.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = rd88f5181l_fxo_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index 35f106ac593a..05db2d336b08 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -180,7 +180,7 @@ subsys_initcall(rd88f5181l_ge_pci_init);
 
 MACHINE_START(RD88F5181L_GE, "Marvell Orion-VoIP GE Reference Design")
         /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = rd88f5181l_ge_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 9bb2b8bafbfd..e47fa0578ae3 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -305,7 +305,7 @@ static void __init rd88f5182_init(void)
 
 MACHINE_START(RD88F5182, "Marvell Orion-NAS Reference Design")
         /* Maintainer: Ronen Shitrit <rshitrit@marvell.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = rd88f5182_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
index 1d00df9ad464..64317251ec00 100644
--- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
@@ -121,7 +121,7 @@ subsys_initcall(rd88f6183ap_ge_pci_init);
 
 MACHINE_START(RD88F6183AP_GE, "Marvell Orion-1-90 AP GE Reference Design")
         /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = rd88f6183ap_ge_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c
index c9dd31d34866..29f1526f7b70 100644
--- a/arch/arm/mach-orion5x/terastation_pro2-setup.c
+++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c
@@ -357,7 +357,7 @@ static void __init tsp2_init(void)
 
 MACHINE_START(TERASTATION_PRO2, "Buffalo Terastation Pro II/Live")
         /* Maintainer:  Sylver Bruneau <sylver.bruneau@googlemail.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = tsp2_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 764307b8abfc..31e51f9b4b64 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -322,7 +322,7 @@ static void __init qnap_ts209_init(void)
 
 MACHINE_START(TS209, "QNAP TS-109/TS-209")
         /* Maintainer: Byron Bradley <byron.bbradley@gmail.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = qnap_ts209_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c
index 0572dd1c8aaa..0fbcc14e09d7 100644
--- a/arch/arm/mach-orion5x/ts409-setup.c
+++ b/arch/arm/mach-orion5x/ts409-setup.c
@@ -311,7 +311,7 @@ static void __init qnap_ts409_init(void)
 
 MACHINE_START(TS409, "QNAP TS-409")
         /* Maintainer:  Sylver Bruneau <sylver.bruneau@gmail.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = qnap_ts409_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 6b7b54116f30..6c75cd35c4c8 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -621,7 +621,7 @@ static void __init ts78xx_init(void)
 
 MACHINE_START(TS78XX, "Technologic Systems TS-78xx SBC")
         /* Maintainer: Alexander Clouter <alex@digriz.org.uk> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = ts78xx_init,
         .map_io         = ts78xx_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c
index cdad50bd4891..b8be7d8d0cf4 100644
--- a/arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
@@ -172,7 +172,7 @@ subsys_initcall(wnr854t_pci_init);
 
 MACHINE_START(WNR854T, "Netgear WNR854T")
         /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = wnr854t_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index 8f10ffd77ec3..faf81a039360 100644
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -260,7 +260,7 @@ subsys_initcall(wrt350n_v2_pci_init);
 
 MACHINE_START(WRT350N_V2, "Linksys WRT350N v2")
         /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
         .init_machine   = wrt350n_v2_init,
         .map_io         = orion5x_map_io,
         .init_early     = orion5x_init_early,