ARM: fix mach-bcmring UART declarations

This error appeared in the bcmring_defconfig build:

CC arch/arm/mach-bcmring/core.o
arch/arm/mach-bcmring/core.c:55: error: macro "AMBA_APB_DEVICE" requires 6 arguments, but only 5 given arch/arm/mach-bcmring/core.c:55: warning: type defaults to 'int' in declaration of 'AMBA_APB_DEVICE' arch/arm/mach-bcmring/core.c:56: error: macro "AMBA_APB_DEVICE" requires 6 arguments, but only 5 given arch/arm/mach-bcmring/core.c:56: warning: type defaults to 'int' in declaration of 'AMBA_APB_DEVICE' arch/arm/mach-bcmring/core.c:134: error: 'uartA_device' undeclared here (not in a function) arch/arm/mach-bcmring/core.c:135: error: 'uartB_device' undeclared here (not in a function) make[2]: *** [arch/arm/mach-bcmring/core.o] Error 1

It appeared as of commit 8ede1ae65e61282cddba39bde4142be3885a6f5a

"ARM: amba: bcmring: use common amba device initializers"

Note that in include/linux/amba/bus.h we have:
#define AMBA_APB_DEVICE(name, busid, id, base, irqs, data) ...

There is an a --> A case error in the busid and a missing zero placeholder for the id field.

index 22e4e0a..adbfb19 100644
@@ -52,8 +52,8 @@
 #include <mach/csp/chipcHw_inline.h>
 #include <mach/csp/tmrHw_reg.h>
 
-static AMBA_APB_DEVICE(uartA, "uarta", MM_ADDR_IO_UARTA, { IRQ_UARTA }, NULL);
-static AMBA_APB_DEVICE(uartB, "uartb", MM_ADDR_IO_UARTB, { IRQ_UARTB }, NULL);
+static AMBA_APB_DEVICE(uartA, "uartA", 0, MM_ADDR_IO_UARTA, {IRQ_UARTA}, NULL);
+static AMBA_APB_DEVICE(uartB, "uartB", 0, MM_ADDR_IO_UARTB, {IRQ_UARTB}, NULL);
 
 static struct clk pll1_clk = {
 	.name = "PLL1",

1.7.9.1

[...]

Thanks, I guess it just hasn't made it into linux-next yet.

Paul.

Actually, I didn't fix the bus id case error, so I'll apply your version. I could just fix up mine the same way, but git am -s is quicker. :)

-Olof

Add debug macro to bcmring so that it supports LL debug and early printk.

---
arch/arm/mach-bcmring/include/mach/debug-macro.S | 19 +++++++++++++++++++

  1 files changed, 19 insertions(+), 0 deletions(-)

create mode 100755 arch/arm/mach-bcmring/include/mach/debug-macro.S

b/arch/arm/mach-bcmring/include/mach/debug-macro.S new file mode 100755
index 0000000..fae01fd

@@ -0,0 +1,19 @@
+/* arch/arm/mach-bcmring/include/mach/debug-macro.S
+ *
+ * Debugging macro include header
+ *
+ *  Based on arch/arm/mach-versatile/include/mach/debug-macro.S
+ *  by Jiandong Zheng
+ *
+ * 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.
+ *
+*/
+        .macro    addruart, rp, rv, tmp
+        mov    \rp,      #0x00012000
+        orr    \rv, \rp, #0xf8000000    @ virtual base
+        orr    \rp, \rp, #0x80000000    @ physical base
+        .endm
+
+#include <asm/hardware/debug-pl01x.S>

1.7.9.1