Skip to contentSkip to conversation

MIPS: xburst: use common serial code

PATCH New Antony Pavlov 2 participants 4 messages May 7, 2013 – May 8, 2013 MIPS

lore
Share & tools
lore
#0 lore raw

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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#1 lore raw

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

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.

---
 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
arch/mips/mach-xburst/Makefile +1 -0
index e5634ba..3e0cd73 100644
@@ -1 +1,2 @@
+obj-y += serial.o
 obj-$(CONFIG_CPU_JZ4755) += csrc-jz4750.o reset-jz4750.o
arch/mips/mach-xburst/include/mach/devices.h new file +8 -0
new file mode 100644
index 0000000..931749d
@@ -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 */
arch/mips/mach-xburst/serial.c new file +60 -0

60 lines not on this page · raw message

Signature · 7 lines
1.7.10.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw

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

In reply to Antony Pavlov
---
 arch/mips/boards/rzx50/serial.c |   37 ++-----------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)
arch/mips/boards/rzx50/serial.c +2 -35
index 5230aaa..129806d 100644
@@ -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;
 }
Signature · 7 lines
1.7.10.4


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#3 lore raw
In reply to Antony Pavlov
Quoted 7 lines · 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

Applied, thanks

Sascha

Signature · 9 lines
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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox