MIPS: xburst: use common serial code

MIPS: xburst: use common serial code

[Antony Pavlov]

This commit series moves the UART code for Ingenic SoCs
from board level to machine level. So the code
can be reused for different boards or even
different Ingenic SoCs.

[PATCH 1/2] MIPS: xburst: use common serial code
[PATCH 2/2] MIPS: rzx50: switch to common mach-xburst serial code

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/2] MIPS: xburst: use common serial code

[Antony Pavlov]

The Ingenic JZ4740, JZ4755 and JZ4770 SoCs use
the same IP core for UART interface. This IP core
is NS16550-compatible, but it needs small workaround.

This commit moves the UART code for Ingenic SoCs
from board level to machine level. So the code
can be reused for different boards or even
different SoCs.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/mach-xburst/Makefile               |    1 +
 arch/mips/mach-xburst/include/mach/devices.h |    8 ++++
 arch/mips/mach-xburst/serial.c               |   60 ++++++++++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 arch/mips/mach-xburst/include/mach/devices.h
 create mode 100644 arch/mips/mach-xburst/serial.c

diff --git a/arch/mips/mach-xburst/Makefile b/arch/mips/mach-xburst/Makefile
index e5634ba..3e0cd73 100644
--- a/arch/mips/mach-xburst/Makefile
+++ b/arch/mips/mach-xburst/Makefile
@@ -1 +1,2 @@
+obj-y += serial.o
 obj-$(CONFIG_CPU_JZ4755) += csrc-jz4750.o reset-jz4750.o
diff --git a/arch/mips/mach-xburst/include/mach/devices.h b/arch/mips/mach-xburst/include/mach/devices.h
new file mode 100644
index 0000000..931749d
--- /dev/null
+++ b/arch/mips/mach-xburst/include/mach/devices.h
@@ -0,0 +1,8 @@
+#ifndef __MACH_XBURST_DEVICES_H
+#define __MACH_XBURST_DEVICES_H
+
+#include <driver.h>
+
+struct device_d *jz_add_uart(int id, unsigned long base, unsigned int clock);
+
+#endif /* __MACH_XBURST_DEVICES_H */
diff --git a/arch/mips/mach-xburst/serial.c b/arch/mips/mach-xburst/serial.c
new file mode 100644
index 0000000..acf5648
--- /dev/null
+++ b/arch/mips/mach-xburst/serial.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2013 Antony Pavlov <antonynpavlov@gmail.com>
+ *
+ * Based on the linux kernel JZ4740 serial support:
+ * Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * This file is part of barebox.
+ * See file CREDITS for list of people who contributed to this project.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <common.h>
+#include <ns16550.h>
+#include <io.h>
+#include <mach/devices.h>
+
+#define JZ_UART_SHIFT	2
+
+#define ier		(1 << JZ_UART_SHIFT)
+#define fcr		(2 << JZ_UART_SHIFT)
+
+static void jz_serial_reg_write(unsigned int val, unsigned long base,
+	unsigned char reg_offset)
+{
+	switch (reg_offset) {
+	case fcr:
+		val |= 0x10; /* Enable uart module */
+		break;
+	case ier:
+		val |= (val & 0x4) << 2;
+		break;
+	default:
+		break;
+	}
+
+	writeb(val & 0xff, (void *)(base + reg_offset));
+}
+
+struct device_d *jz_add_uart(int id, unsigned long base, unsigned int clock)
+{
+	struct NS16550_plat *serial_plat;
+
+	serial_plat = xzalloc(sizeof(*serial_plat));
+
+	serial_plat->shift = JZ_UART_SHIFT;
+	serial_plat->reg_write = &jz_serial_reg_write;
+	serial_plat->clock = clock;
+
+	return add_ns16550_device(id, base, 8 << JZ_UART_SHIFT,
+			IORESOURCE_MEM_8BIT, serial_plat);
+}
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] MIPS: rzx50: switch to common mach-xburst serial code

[Antony Pavlov]

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/mips/boards/rzx50/serial.c |   37 ++-----------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

diff --git a/arch/mips/boards/rzx50/serial.c b/arch/mips/boards/rzx50/serial.c
index 5230aaa..129806d 100644
--- a/arch/mips/boards/rzx50/serial.c
+++ b/arch/mips/boards/rzx50/serial.c
@@ -16,47 +16,14 @@
  */
 
 #include <common.h>
-#include <types.h>
-#include <driver.h>
 #include <init.h>
-#include <ns16550.h>
+#include <mach/devices.h>
 #include <mach/jz4750d_regs.h>
-#include <io.h>
-#include <asm/common.h>
-
-#define JZ4750D_UART_SHIFT	2
-
-#define ier		(1 << JZ4750D_UART_SHIFT)
-#define fcr		(2 << JZ4750D_UART_SHIFT)
-
-static void jz4750d_serial_reg_write(unsigned int val, unsigned long base,
-	unsigned char reg_offset)
-{
-	switch (reg_offset) {
-	case fcr:
-		val |= 0x10; /* Enable uart module */
-		break;
-	case ier:
-		val |= (val & 0x4) << 2;
-		break;
-	default:
-		break;
-	}
-
-	writeb(val & 0xff, (void *)(base + reg_offset));
-}
-
-static struct NS16550_plat serial_plat = {
-	.clock = 12000000,
-	.shift = JZ4750D_UART_SHIFT,
-	.reg_write = &jz4750d_serial_reg_write,
-};
 
 static int rzx50_console_init(void)
 {
 	/* Register the serial port */
-	add_ns16550_device(DEVICE_ID_DYNAMIC, UART1_BASE, 8 << JZ4750D_UART_SHIFT,
-			IORESOURCE_MEM_8BIT, &serial_plat);
+	jz_add_uart(DEVICE_ID_DYNAMIC, UART1_BASE, 12000000);
 
 	return 0;
 }
-- 
1.7.10.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: MIPS: xburst: use common serial code

[Sascha Hauer]

On Tue, May 07, 2013 at 12:51:24PM +0400, Antony Pavlov wrote:
> This commit series moves the UART code for Ingenic SoCs
> from board level to machine level. So the code
> can be reused for different boards or even
> different Ingenic SoCs.
> 
> [PATCH 1/2] MIPS: xburst: use common serial code
> [PATCH 2/2] MIPS: rzx50: switch to common mach-xburst serial code

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox