OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 --- a/arch/mips/ralink/mt7621.c 1 --- a/arch/mips/ralink/mt7621.c
2 +++ b/arch/mips/ralink/mt7621.c 2 +++ b/arch/mips/ralink/mt7621.c
3 @@ -9,6 +9,7 @@ -  
4 -  
5 #include <linux/kernel.h> -  
6 #include <linux/init.h> -  
7 +#include <linux/jiffies.h> -  
8 -  
9 #include <asm/mipsregs.h> -  
10 #include <asm/smp-ops.h> -  
11 @@ -16,6 +17,7 @@ 3 @@ -16,6 +16,7 @@
12 #include <asm/mach-ralink/ralink_regs.h> 4 #include <asm/mach-ralink/ralink_regs.h>
13 #include <asm/mach-ralink/mt7621.h> 5 #include <asm/mach-ralink/mt7621.h>
14 #include <asm/mips-boards/launch.h> 6 #include <asm/mips-boards/launch.h>
15 +#include <asm/delay.h> 7 +#include <asm/delay.h>
Line 16... Line 8...
16 8
Line 17... Line 9...
17 #include <pinmux.h> 9 #include <pinmux.h>
18 10
19 @@ -177,6 +179,58 @@ bool plat_cpu_core_present(int core) 11 @@ -177,6 +178,58 @@ bool plat_cpu_core_present(int core)
Line 20... Line 12...
20 return true; 12 return true;
21 } 13 }
Line 75... Line 67...
75 void prom_soc_init(struct ralink_soc_info *soc_info) 67 void prom_soc_init(struct ralink_soc_info *soc_info)
76 { 68 {
77 void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE); 69 void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
78 --- a/arch/mips/ralink/Kconfig 70 --- a/arch/mips/ralink/Kconfig
79 +++ b/arch/mips/ralink/Kconfig 71 +++ b/arch/mips/ralink/Kconfig
80 @@ -59,6 +59,7 @@ choice 72 @@ -58,6 +58,7 @@ choice
81 select CLKSRC_MIPS_GIC 73 select CLKSRC_MIPS_GIC
82 select HW_HAS_PCI 74 select HW_HAS_PCI
83 select WEAK_REORDERING_BEYOND_LLSC 75 select WEAK_REORDERING_BEYOND_LLSC
84 + select GENERIC_CLOCKEVENTS_BROADCAST 76 + select GENERIC_CLOCKEVENTS_BROADCAST
85 endchoice 77 endchoice
Line 86... Line 78...
86 78
-   79 choice
-   80 --- a/arch/mips/ralink/timer-gic.c
-   81 +++ b/arch/mips/ralink/timer-gic.c
-   82 @@ -12,6 +12,7 @@
-   83 #include <linux/of.h>
-   84 #include <linux/clk-provider.h>
-   85 #include <linux/clocksource.h>
-   86 +#include <asm/time.h>
-   87
-   88 #include "common.h"
-   89
-   90 @@ -19,6 +20,8 @@ void __init plat_time_init(void)
-   91 {
-   92 ralink_of_remap();
-   93
-   94 + mips_hpt_frequency = 880000000 / 2;
-   95 +
-   96 of_clk_init(NULL);
-   97 timer_probe();