KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

atheros: pass UART IRQ number via function argument

Browse source 
UART IRQ number could be different for different SoCs, so make them
configurable.

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

SVN-Revision: 41691
This commit is contained in:
Felix Fietkau 2014-07-17 16:36:23 +00:00
parent e819113e2e
commit 5c030111a9
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
target/linux/atheros/patches-3.10/100-board.patch
View file

@ -1550,7 +1550,7 @@
+ +
--- /dev/null --- /dev/null
+++ b/arch/mips/ar231x/ar5312.c +++ b/arch/mips/ar231x/ar5312.c
@@ -0,0 +1,600 @@ @@ -0,0 +1,601 @@
+/* +/*
+ * This file is subject to the terms and conditions of the GNU General Public + * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive + * License. See the file "COPYING" in the main directory of this archive
@ -2148,12 +2148,13 @@
+ ar231x_write_reg(AR531X_WD_CTRL, AR531X_WD_CTRL_IGNORE_EXPIRATION); + ar231x_write_reg(AR531X_WD_CTRL, AR531X_WD_CTRL_IGNORE_EXPIRATION);
+ +
+ _machine_restart = ar5312_restart; + _machine_restart = ar5312_restart;
+ ar231x_serial_setup(KSEG1ADDR(AR531X_UART0), ar5312_sys_frequency()); + ar231x_serial_setup(KSEG1ADDR(AR531X_UART0), AR531X_MISC_IRQ_UART0,
+ ar5312_sys_frequency());
+} +}
+ +
--- /dev/null --- /dev/null
+++ b/arch/mips/ar231x/ar2315.c +++ b/arch/mips/ar231x/ar2315.c
@@ -0,0 +1,655 @@ @@ -0,0 +1,656 @@
+/* +/*
+ * This file is subject to the terms and conditions of the GNU General Public + * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive + * License. See the file "COPYING" in the main directory of this archive
@ -2807,7 +2808,8 @@
+ ar231x_write_reg(AR2315_WDC, AR2315_WDC_IGNORE_EXPIRATION); + ar231x_write_reg(AR2315_WDC, AR2315_WDC_IGNORE_EXPIRATION);
+ +
+ _machine_restart = ar2315_restart; + _machine_restart = ar2315_restart;
+ ar231x_serial_setup(KSEG1ADDR(AR2315_UART0), ar2315_apb_frequency()); + ar231x_serial_setup(KSEG1ADDR(AR2315_UART0), AR531X_MISC_IRQ_UART0,
+ ar2315_apb_frequency());
+} +}
--- /dev/null --- /dev/null
+++ b/arch/mips/ar231x/ar2315.h +++ b/arch/mips/ar231x/ar2315.h
@ -2976,7 +2978,7 @@
+extern asmlinkage void (*ar231x_irq_dispatch)(void); +extern asmlinkage void (*ar231x_irq_dispatch)(void);
+ +
+extern int ar231x_find_config(u8 *flash_limit); +extern int ar231x_find_config(u8 *flash_limit);
+extern void ar231x_serial_setup(u32 mapbase, unsigned int uartclk); +extern void ar231x_serial_setup(u32 mapbase, int irq, unsigned int uartclk);
+extern int ar231x_add_wmac(int nr, u32 base, int irq); +extern int ar231x_add_wmac(int nr, u32 base, int irq);
+extern int ar231x_add_ethernet(int nr, u32 base, int irq, void *pdata); +extern int ar231x_add_ethernet(int nr, u32 base, int irq, void *pdata);
+ +
@ -3125,7 +3127,7 @@
+} +}
+ +
+void __init +void __init
+ar231x_serial_setup(u32 mapbase, unsigned int uartclk) +ar231x_serial_setup(u32 mapbase, int irq, unsigned int uartclk)
+{ +{
+ struct uart_port s; + struct uart_port s;
+ +
@ -3133,7 +3135,7 @@
+ +
+ s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; + s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
+ s.iotype = UPIO_MEM; + s.iotype = UPIO_MEM;
+ s.irq = AR531X_MISC_IRQ_UART0; + s.irq = irq;
+ s.regshift = 2; + s.regshift = 2;
+ s.mapbase = mapbase; + s.mapbase = mapbase;
+ s.uartclk = uartclk; + s.uartclk = uartclk;