X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/789ea10d57657ce479bbdf3d0e2dd9264510faaa..446ad267cb4f93ec7b724cea974f3ee90aa7a569:/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c
index ac945b8be..19f340bd4 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/serial_8250.h>
 
 #include <asm/mips_machine.h>
 #include <asm/reboot.h>
@@ -23,10 +22,6 @@
 #include <asm/mach-ralink/rt305x.h>
 #include <asm/mach-ralink/rt305x_regs.h>
 
-#include "machine.h"
-
-enum rt305x_mach_type rt305x_mach;
-
 static void rt305x_restart(char *command)
 {
 	rt305x_sysc_wr(RT305X_RESET_SYSTEM, SYSC_REG_RESET_CTRL);
@@ -42,39 +37,6 @@ static void rt305x_halt(void)
 			cpu_wait();
 }
 
-static void __init rt305x_early_serial_setup(void)
-{
-	struct uart_port p;
-	int err;
-
-	memset(&p, 0, sizeof(p));
-	p.flags		= UPF_SKIP_TEST;
-	p.iotype	= UPIO_AU;
-	p.uartclk	= rt305x_sys_freq;
-	p.regshift	= 2;
-	p.type		= PORT_16550A;
-
-	p.mapbase	= RT305X_UART0_BASE;
-	p.membase	= ioremap_nocache(p.mapbase, RT305X_UART0_SIZE);
-	p.line		= 0;
-	p.irq		= RT305X_INTC_IRQ_UART0;
-
-	err = early_serial_setup(&p);
-	if (err)
-		printk(KERN_ERR "RT305x: early UART0 registration failed %d\n",
-			err);
-
-	p.mapbase	= RT305X_UART1_BASE;
-	p.membase	= ioremap_nocache(p.mapbase, RT305X_UART1_SIZE);
-	p.line		= 1;
-	p.irq		= RT305X_INTC_IRQ_UART1;
-
-	err = early_serial_setup(&p);
-	if (err)
-		printk(KERN_ERR "RT305x: early UART1 registration failed %d\n",
-			err);
-}
-
 unsigned int __cpuinit get_c0_compare_irq(void)
 {
 	return CP0_LEGACY_COMPARE_IRQ;
@@ -96,19 +58,13 @@ void __init ramips_soc_setup(void)
 	_machine_halt = rt305x_halt;
 	pm_power_off = rt305x_halt;
 
-	rt305x_early_serial_setup();
+	ramips_early_serial_setup(0, RT305X_UART0_BASE, rt305x_sys_freq,
+				  RT305X_INTC_IRQ_UART0);
+	ramips_early_serial_setup(1, RT305X_UART1_BASE, rt305x_sys_freq,
+				  RT305X_INTC_IRQ_UART1);
 }
 
 void __init plat_time_init(void)
 {
 	mips_hpt_frequency = rt305x_cpu_freq / 2;
 }
-
-static int __init rt305x_machine_setup(void)
-{
-	mips_machine_setup(rt305x_mach);
-
-	return 0;
-}
-
-arch_initcall(rt305x_machine_setup);