[PATCH v2 06/13] MIPS: ath25: add UART support

[Sergey Ryazanov <ryazanov.s.a@xxxxxxxxx>]

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@xxxxxxxxx>
---

Changes since RFC:
  - register UART during arch initialization

Changes since v1:
  - rename MIPS machine ar231x -> ath25

 arch/mips/ath25/ar2315.c  |  6 ++++++
 arch/mips/ath25/ar2315.h  |  2 ++
 arch/mips/ath25/ar5312.c  |  6 ++++++
 arch/mips/ath25/ar5312.h  |  2 ++
 arch/mips/ath25/devices.c | 28 ++++++++++++++++++++++++++++
 arch/mips/ath25/devices.h |  2 ++
 6 files changed, 46 insertions(+)

diff --git a/arch/mips/ath25/ar2315.c b/arch/mips/ath25/ar2315.c
index e1a338b..897f538 100644
--- a/arch/mips/ath25/ar2315.c
+++ b/arch/mips/ath25/ar2315.c
@@ -233,3 +233,9 @@ void __init ar2315_prom_init(void)
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
 
+void __init ar2315_arch_init(void)
+{
+	ath25_serial_setup(AR2315_UART0, ar2315_misc_irq_base +
+			   AR2315_MISC_IRQ_UART0, ar2315_apb_frequency());
+}
+
diff --git a/arch/mips/ath25/ar2315.h b/arch/mips/ath25/ar2315.h
index 2a57858..9af22db 100644
--- a/arch/mips/ath25/ar2315.h
+++ b/arch/mips/ath25/ar2315.h
@@ -7,6 +7,7 @@ void ar2315_arch_init_irq(void);
 void ar2315_plat_time_init(void);
 void ar2315_plat_mem_setup(void);
 void ar2315_prom_init(void);
+void ar2315_arch_init(void);
 
 #else
 
@@ -14,6 +15,7 @@ static inline void ar2315_arch_init_irq(void) {}
 static inline void ar2315_plat_time_init(void) {}
 static inline void ar2315_plat_mem_setup(void) {}
 static inline void ar2315_prom_init(void) {}
+static inline void ar2315_arch_init(void) {}
 
 #endif
 
diff --git a/arch/mips/ath25/ar5312.c b/arch/mips/ath25/ar5312.c
index e9c7f71..ad36aab 100644
--- a/arch/mips/ath25/ar5312.c
+++ b/arch/mips/ath25/ar5312.c
@@ -235,3 +235,9 @@ void __init ar5312_prom_init(void)
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
 
+void __init ar5312_arch_init(void)
+{
+	ath25_serial_setup(AR5312_UART0, ar5312_misc_irq_base +
+			   AR5312_MISC_IRQ_UART0, ar5312_sys_frequency());
+}
+
diff --git a/arch/mips/ath25/ar5312.h b/arch/mips/ath25/ar5312.h
index b60ad38..d04a33d 100644
--- a/arch/mips/ath25/ar5312.h
+++ b/arch/mips/ath25/ar5312.h
@@ -7,6 +7,7 @@ void ar5312_arch_init_irq(void);
 void ar5312_plat_time_init(void);
 void ar5312_plat_mem_setup(void);
 void ar5312_prom_init(void);
+void ar5312_arch_init(void);
 
 #else
 
@@ -14,6 +15,7 @@ static inline void ar5312_arch_init_irq(void) {}
 static inline void ar5312_plat_time_init(void) {}
 static inline void ar5312_plat_mem_setup(void) {}
 static inline void ar5312_prom_init(void) {}
+static inline void ar5312_arch_init(void) {}
 
 #endif
 
diff --git a/arch/mips/ath25/devices.c b/arch/mips/ath25/devices.c
index e30afbc..0416cd2 100644
--- a/arch/mips/ath25/devices.c
+++ b/arch/mips/ath25/devices.c
@@ -1,5 +1,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/serial_8250.h>
 #include <asm/bootinfo.h>
 
 #include "devices.h"
@@ -9,3 +10,30 @@ const char *get_system_type(void)
 	return "Atheros (unknown)";
 }
 
+void __init ath25_serial_setup(u32 mapbase, int irq, unsigned int uartclk)
+{
+	struct uart_port s;
+
+	memset(&s, 0, sizeof(s));
+
+	s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP;
+	s.iotype = UPIO_MEM32;
+	s.irq = irq;
+	s.regshift = 2;
+	s.mapbase = mapbase;
+	s.uartclk = uartclk;
+
+	early_serial_setup(&s);
+}
+
+static int __init ath25_arch_init(void)
+{
+	if (is_ar5312())
+		ar5312_arch_init();
+	else
+		ar2315_arch_init();
+
+	return 0;
+}
+
+arch_initcall(ath25_arch_init);
diff --git a/arch/mips/ath25/devices.h b/arch/mips/ath25/devices.h
index bbf2988..54fafd3 100644
--- a/arch/mips/ath25/devices.h
+++ b/arch/mips/ath25/devices.h
@@ -5,6 +5,8 @@
 
 extern void (*ath25_irq_dispatch)(void);
 
+void ath25_serial_setup(u32 mapbase, int irq, unsigned int uartclk);
+
 static inline bool is_ar2315(void)
 {
 	return (current_cpu_data.cputype == CPU_4KEC);
-- 
1.8.5.5