Merge tag 'bcm63138-v4' of http://github.com/brcm/linux into next/soc

Merge "ARM: BCM: Broadcom BCM63138 support" from Florian Fainelli:

This patchset adds very minimal support for the BCM63138 SoC which is
a xDSL SoC using a dual Cortex A9 CPU complex.

* tag 'bcm63138-v4' of http://github.com/brcm/linux:
  MAINTAINERS: add entry for the Broadcom BCM63xx ARM SoCs
  ARM: BCM63XX: add BCM963138DVT Reference platform DTS
  ARM: BCM63XX: add BCM63138 minimal Device Tree
  ARM: BCM63XX: add low-level UART debug support
  ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC

Conflicts:
	arch/arm/Kconfig.debug

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 33 insertions, 0 deletions

diff --git a/arch/arm/include/debug/bcm63xx.S b/arch/arm/include/debug/bcm63xx.S
new file mode 100644
index 000000000000..e7164d570f44
--- /dev/null
+++ b/arch/arm/include/debug/bcm63xx.S
@@ -0,0 +1,33 @@
+/*
+ * Broadcom BCM63xx low-level UART debug
+ *
+ * Copyright (C) 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 version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/serial_bcm63xx.h>
+
+        .macro  addruart, rp, rv, tmp
+        ldr     \rp, =CONFIG_DEBUG_UART_PHYS
+        ldr     \rv, =CONFIG_DEBUG_UART_VIRT
+        .endm
+
+        .macro  senduart, rd, rx
+        /* word access do not work */
+        strb    \rd, [\rx, #UART_FIFO_REG]
+        .endm
+
+        .macro  waituart, rd, rx
+1001:   ldr     \rd, [\rx, #UART_IR_REG]
+        tst     \rd, #(1 << UART_IR_TXEMPTY)
+        beq     1001b
+        .endm
+
+        .macro  busyuart, rd, rx
+1002:   ldr     \rd, [\rx, #UART_IR_REG]
+        tst     \rd, #(1 << UART_IR_TXTRESH)
+        beq     1002b
+        .endm