ramips: 5.10: port and refresh patches, ralink drv

[openwrt/staging/mkresin.git] / target / linux / ramips / patches-5.10 / 321-mt7621-timer.patch

diff --git a/target/linux/ramips/patches-5.10/321-mt7621-timer.patch b/target/linux/ramips/patches-5.10/321-mt7621-timer.patch
index 8528b71c8845e05fcdbc62c4340d06e5db935df0..91e14ad63b8a8e5287c0769cfb4c211082ada232 100644 (file)
--- a/target/linux/ramips/patches-5.10/321-mt7621-timer.patch
+++ b/target/linux/ramips/patches-5.10/321-mt7621-timer.patch
@@ -1,14 +1,14 @@
 --- a/arch/mips/ralink/mt7621.c
 +++ b/arch/mips/ralink/mt7621.c
-@@ -7,6 +7,7 @@
- 
- #include <linux/kernel.h>
+@@ -9,6 +9,7 @@
  #include <linux/init.h>
+ #include <linux/slab.h>
+ #include <linux/sys_soc.h>
 +#include <linux/jiffies.h>
  
  #include <asm/mipsregs.h>
  #include <asm/smp-ops.h>
-@@ -14,6 +15,7 @@
+@@ -16,6 +17,7 @@
  #include <asm/mach-ralink/ralink_regs.h>
  #include <asm/mach-ralink/mt7621.h>
  #include <asm/mips-boards/launch.h>
@@ -16,7 +16,7 @@
  
  #include <pinmux.h>
  
-@@ -175,6 +177,58 @@ bool plat_cpu_core_present(int core)
+@@ -161,6 +163,58 @@ bool plat_cpu_core_present(int core)
        return true;
  }
  
@@ -77,9 +77,9 @@
        void __iomem *sysc = (void __iomem *) KSEG1ADDR(MT7621_SYSC_BASE);
 --- a/arch/mips/ralink/Kconfig
 +++ b/arch/mips/ralink/Kconfig
-@@ -58,6 +58,7 @@ choice
-               select CLKSRC_MIPS_GIC
+@@ -63,6 +63,7 @@ choice
                select HAVE_PCI if PCI_MT7621
+               select SOC_BUS
                select WEAK_REORDERING_BEYOND_LLSC
 +              select GENERIC_CLOCKEVENTS_BROADCAST
  endchoice