Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into next/multiplatform

Enable initial ARM multi-platform support for highbank, mvebu,
socfpga, picoxcell, and vexpress.

Multi-platform support is dependent on mach/gpio.h removal and
restructuring of DEBUG_LL and dtb build rules included in this branch.

This has been built for all defconfigs, and booted on highbank with
all 5 platforms enabled.

By Rob Herring (18) and Arnd Bergmann (1)
via Rob Herring
* tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux:
  ARM: vexpress: convert to multi-platform
  ARM: initial multiplatform support
  ARM: mvebu: move armada-370-xp.h in mach dir
  ARM: vexpress: remove dependency on mach/* headers
  ARM: picoxcell: remove dependency on mach/* headers
  ARM: move all dtb targets out of Makefile.boot
  ARM: picoxcell: move debug macros to include/debug
  ARM: socfpga: move debug macros to include/debug
  ARM: mvebu: move debug macros to include/debug
  ARM: vexpress: move debug macros to include/debug
  ARM: highbank: move debug macros to include/debug
  ARM: move debug macros to common location
  ARM: make mach/gpio.h headers optional
  ARM: orion: move custom gpio functions to orion-gpio.h
  ARM: shmobile: move custom gpio functions to sh-gpio.h
  ARM: pxa: use gpio_to_irq for sharppm_sl
  net: pxaficp_ir: add irq resources
  usb: pxa27x_udc: remove IRQ_USB define
  staging: ste_rmi4: remove gpio.h include

Conflicts due to addition of bcm2835 and removal of pnx4008 in:
	arch/arm/Kconfig
	arch/arm/Makefile

Conflicts due to new dtb targets, moved to arch/arm/boot/dts/Makefile in:
	arch/arm/mach-imx/Makefile.boot
	arch/arm/mach-mxs/Makefile.boot
	arch/arm/mach-tegra/Makefile.boot

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 5 insertions, 86 deletions

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index c45522c36787..66f711b2e0e8 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -20,90 +20,9 @@
  * references to these in a production kernel!
  */
 
-#if defined(CONFIG_DEBUG_ICEDCC)
-                @@ debug using ARM EmbeddedICE DCC channel
-
-                .macro  addruart, rp, rv, tmp
-                .endm
-
-#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)
-
-                .macro  senduart, rd, rx
-                mcr     p14, 0, \rd, c0, c5, 0
-                .endm
-
-                .macro  busyuart, rd, rx
-1001:
-                mrc     p14, 0, \rx, c0, c1, 0
-                tst     \rx, #0x20000000
-                beq     1001b
-                .endm
-
-                .macro  waituart, rd, rx
-                mov     \rd, #0x2000000
-1001:
-                subs    \rd, \rd, #1
-                bmi     1002f
-                mrc     p14, 0, \rx, c0, c1, 0
-                tst     \rx, #0x20000000
-                bne     1001b
-1002:
-                .endm
-
-#elif defined(CONFIG_CPU_XSCALE)
-
-                .macro  senduart, rd, rx
-                mcr     p14, 0, \rd, c8, c0, 0
-                .endm
-
-                .macro  busyuart, rd, rx
-1001:
-                mrc     p14, 0, \rx, c14, c0, 0
-                tst     \rx, #0x10000000
-                beq     1001b
-                .endm
-
-                .macro  waituart, rd, rx
-                mov     \rd, #0x10000000
-1001:
-                subs    \rd, \rd, #1
-                bmi     1002f
-                mrc     p14, 0, \rx, c14, c0, 0
-                tst     \rx, #0x10000000
-                bne     1001b
-1002:
-                .endm
-
-#else
-
-                .macro  senduart, rd, rx
-                mcr     p14, 0, \rd, c1, c0, 0
-                .endm
-
-                .macro  busyuart, rd, rx
-1001:
-                mrc     p14, 0, \rx, c0, c0, 0
-                tst     \rx, #2
-                beq     1001b
-
-                .endm
-
-                .macro  waituart, rd, rx
-                mov     \rd, #0x2000000
-1001:
-                subs    \rd, \rd, #1
-                bmi     1002f
-                mrc     p14, 0, \rx, c0, c0, 0
-                tst     \rx, #2
-                bne     1001b
-1002:
-                .endm
-
-#endif  /* CONFIG_CPU_V6 */
-
-#elif !defined(CONFIG_DEBUG_SEMIHOSTING)
-#include <mach/debug-macro.S>
-#endif  /* CONFIG_DEBUG_ICEDCC */
+#if !defined(CONFIG_DEBUG_SEMIHOSTING)
+#include CONFIG_DEBUG_LL_INCLUDE
+#endif
 
 #ifdef CONFIG_MMU
                 .macro  addruart_current, rx, tmp1, tmp2
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 3db960e20cb8..9874d0741191 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -23,8 +23,8 @@
 #include <asm/thread_info.h>
 #include <asm/pgtable.h>
 
-#ifdef CONFIG_DEBUG_LL
-#include <mach/debug-macro.S>
+#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING)
+#include CONFIG_DEBUG_LL_INCLUDE
 #endif
 
 /*