Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC platform updates from Olof Johansson:
 "Improved and new platform support for various SoCs:

  New SoC support:
   - Broadcom BCM23550
   - Freescale i.MX7Solo
   - Qualcomm MDM9615
   - Renesas r8a7792

  Improvements:
   - convert clps711x to multiplatform
   - debug uart improvements for Atmel platforms
   - Tango platform improvements: HOTPLUG_CPU, Suspend-to-ram
   - OMAP tweaks and improvements to hwmod
   - OMAP support for kexec on SMP"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (109 commits)
  ARM: davinci: fix build break because of undeclared dm365_evm_snd_data
  ARM: s3c64xx: smartq: Avoid sparse warnings
  ARM: sti: Implement dummy L2 cache's write_sec
  ARM: STi: Update machine _namestr to be more generic.
  arm: meson: explicitly select clk drivers
  ARM: tango: add Suspend-to-RAM support
  ARM: hisi: consolidate the hisilicon machine entries
  ARM: tango: fix CONFIG_HOTPLUG_CPU=n build
  MAINTAINERS: Update BCM281XX/BCM11XXX/BCM216XX entry
  MAINTAINERS: Update BCM63XX entry
  MAINTAINERS: Add NS2 entry
  MAINTAINERS: Fix nsp false-positives
  MAINTAINERS: Change L to M for Broadcom ARM/ARM64 SoC entries
  ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
  ARM: clps711x: Switch to MULTIPLATFORM
  ARM: clps711x: Remove boards support
  ARM: clps711x: Add basic DT support
  ARM: clps711x: Reduce static map size
  ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu
  ARM: oxnas: Change OX810SE default driver config
  ...

4 files changed, 16 insertions, 12 deletions

diff --git a/arch/arm/include/debug/at91.S b/arch/arm/include/debug/at91.S
index d4ae3b8e2426..0098401e5aeb 100644
--- a/arch/arm/include/debug/at91.S
+++ b/arch/arm/include/debug/at91.S
@@ -9,14 +9,6 @@
  *
 */
 
-#ifdef CONFIG_MMU
-#define AT91_IO_P2V(x) ((x) - 0x01000000)
-#else
-#define AT91_IO_P2V(x) (x)
-#endif
-
-#define AT91_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS)
-
 #define AT91_DBGU_SR            (0x14)  /* Status Register */
 #define AT91_DBGU_THR           (0x1c)  /* Transmitter Holding Register */
 #define AT91_DBGU_TXRDY         (1 << 1)        /* Transmitter Ready */
@@ -24,7 +16,7 @@
 
         .macro  addruart, rp, rv, tmp
         ldr     \rp, =CONFIG_DEBUG_UART_PHYS            @ System peripherals (phys address)
-        ldr     \rv, =AT91_DEBUG_UART_VIRT              @ System peripherals (virt address)
+        ldr     \rv, =CONFIG_DEBUG_UART_VIRT            @ System peripherals (virt address)
         .endm
 
         .macro  senduart,rd,rx
diff --git a/arch/arm/include/debug/clps711x.S b/arch/arm/include/debug/clps711x.S
index abe225436686..c17ac5c9e5f3 100644
--- a/arch/arm/include/debug/clps711x.S
+++ b/arch/arm/include/debug/clps711x.S
@@ -9,10 +9,10 @@
 
 #ifndef CONFIG_DEBUG_CLPS711X_UART2
 #define CLPS711X_UART_PADDR     (0x80000000 + 0x0000)
-#define CLPS711X_UART_VADDR     (0xfeff0000 + 0x0000)
+#define CLPS711X_UART_VADDR     (0xfeff4000 + 0x0000)
 #else
 #define CLPS711X_UART_PADDR     (0x80000000 + 0x1000)
-#define CLPS711X_UART_VADDR     (0xfeff0000 + 0x1000)
+#define CLPS711X_UART_VADDR     (0xfeff4000 + 0x1000)
 #endif
 
 #define SYSFLG          (0x0140)
diff --git a/arch/arm/include/debug/exynos.S b/arch/arm/include/debug/exynos.S
index b17fdb7fbd34..60bf3c23200d 100644
--- a/arch/arm/include/debug/exynos.S
+++ b/arch/arm/include/debug/exynos.S
@@ -24,7 +24,11 @@
                 mrc     p15, 0, \tmp, c0, c0, 0
                 and     \tmp, \tmp, #0xf0
                 teq     \tmp, #0xf0             @@ A15
-                ldreq   \rp, =EXYNOS5_PA_UART
+                beq     100f
+                mrc     p15, 0, \tmp, c0, c0, 5
+                and     \tmp, \tmp, #0xf00
+                teq     \tmp, #0x100            @@ A15 + A7 but boot to A7
+100:            ldreq   \rp, =EXYNOS5_PA_UART
                 movne   \rp, #EXYNOS4_PA_UART   @@ EXYNOS4
                 ldr     \rv, =S3C_VA_UART
 #if CONFIG_DEBUG_S3C_UART != 0
diff --git a/arch/arm/include/debug/samsung.S b/arch/arm/include/debug/samsung.S
index 8d8d922e5e44..f4eeed2a1981 100644
--- a/arch/arm/include/debug/samsung.S
+++ b/arch/arm/include/debug/samsung.S
@@ -15,11 +15,13 @@
 
         .macro fifo_level_s5pv210 rd, rx
                 ldr     \rd, [\rx, # S3C2410_UFSTAT]
+ARM_BE8(rev \rd, \rd)
                 and     \rd, \rd, #S5PV210_UFSTAT_TXMASK
         .endm
 
         .macro  fifo_full_s5pv210 rd, rx
                 ldr     \rd, [\rx, # S3C2410_UFSTAT]
+ARM_BE8(rev \rd, \rd)
                 tst     \rd, #S5PV210_UFSTAT_TXFULL
         .endm
 
@@ -28,6 +30,7 @@
 
         .macro fifo_level_s3c2440 rd, rx
                 ldr     \rd, [\rx, # S3C2410_UFSTAT]
+ARM_BE8(rev \rd, \rd)
                 and     \rd, \rd, #S3C2440_UFSTAT_TXMASK
         .endm
 
@@ -37,6 +40,7 @@
 
         .macro  fifo_full_s3c2440 rd, rx
                 ldr     \rd, [\rx, # S3C2410_UFSTAT]
+ARM_BE8(rev \rd, \rd)
                 tst     \rd, #S3C2440_UFSTAT_TXFULL
         .endm
 
@@ -50,6 +54,7 @@
 
         .macro  busyuart, rd, rx
                 ldr     \rd, [\rx, # S3C2410_UFCON]
+ARM_BE8(rev \rd, \rd)
                 tst     \rd, #S3C2410_UFCON_FIFOMODE    @ fifo enabled?
                 beq     1001f                           @
                 @ FIFO enabled...
@@ -61,6 +66,7 @@
 1001:
                 @ busy waiting for non fifo
                 ldr     \rd, [\rx, # S3C2410_UTRSTAT]
+ARM_BE8(rev \rd, \rd)
                 tst     \rd, #S3C2410_UTRSTAT_TXFE
                 beq     1001b
 
@@ -69,6 +75,7 @@
 
         .macro  waituart,rd,rx
                 ldr     \rd, [\rx, # S3C2410_UFCON]
+ARM_BE8(rev \rd, \rd)
                 tst     \rd, #S3C2410_UFCON_FIFOMODE    @ fifo enabled?
                 beq     1001f                           @
                 @ FIFO enabled...
@@ -80,6 +87,7 @@
 1001:
                 @ idle waiting for non fifo
                 ldr     \rd, [\rx, # S3C2410_UTRSTAT]
+ARM_BE8(rev \rd, \rd)
                 tst     \rd, #S3C2410_UTRSTAT_TXFE
                 beq     1001b