mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
6be0da90a1
Removed upstreamed/solved elsewhere upstream: - 0001-MIPS-ralink-Add-rt3352-SPI_CS1-pinmux.patch - 0002-MIPS-pci-rt2880-set-pci-controller-of_node.patch - 0004-MIPS-ralink-add-MT7621-pcie-driver.patch - 0009-PCI-MIPS-enable-PCIe-on-MT7688.patch - 0025-pinctrl-ralink-add-pinctrl-driver.patch - 0028-GPIO-ralink-add-mt7621-gpio-controller.patch - 0043-spi-add-mt7621-support.patch - 0045-i2c-add-mt7621-driver.patch - 0047-DMA-ralink-add-rt2880-dma-engine.patch - 0053-mtd-spi-nor-add-w25q256-3b-mode-switch.patch - 0054-mtd-spi-nor-w25q256-respect-default-mode.patch - 0099-pci-mt7620.patch - 304-spi-nor-enable-4B-opcodes-for-mx25l25635f.patch Removed because of the new NAND driver: - 0038-Revert-mtd-nand-Remove-unused-chip-write_page-hook.patch - 0039-mtd-add-mt7621-nand-support.patch - 0040-nand-hack.patch Remove patch that no longer applies (needs rework): - 0034-NET-multi-phy-support.patch Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
88 lines
1.9 KiB
Diff
88 lines
1.9 KiB
Diff
--- a/arch/mips/ralink/mt7621.c
|
|
+++ b/arch/mips/ralink/mt7621.c
|
|
@@ -7,6 +7,7 @@
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
+#include <linux/jiffies.h>
|
|
|
|
#include <asm/mipsregs.h>
|
|
#include <asm/smp-ops.h>
|
|
@@ -14,6 +15,7 @@
|
|
#include <asm/mach-ralink/ralink_regs.h>
|
|
#include <asm/mach-ralink/mt7621.h>
|
|
#include <asm/mips-boards/launch.h>
|
|
+#include <asm/delay.h>
|
|
|
|
#include <pinmux.h>
|
|
|
|
@@ -175,6 +177,58 @@ bool plat_cpu_core_present(int core)
|
|
return true;
|
|
}
|
|
|
|
+#define LPS_PREC 8
|
|
+/*
|
|
+* Re-calibration lpj(loop-per-jiffy).
|
|
+* (derived from kernel/calibrate.c)
|
|
+*/
|
|
+static int udelay_recal(void)
|
|
+{
|
|
+ unsigned int i, lpj = 0;
|
|
+ unsigned long ticks, loopbit;
|
|
+ int lps_precision = LPS_PREC;
|
|
+
|
|
+ lpj = (1<<12);
|
|
+
|
|
+ while ((lpj <<= 1) != 0) {
|
|
+ /* wait for "start of" clock tick */
|
|
+ ticks = jiffies;
|
|
+ while (ticks == jiffies)
|
|
+ /* nothing */;
|
|
+
|
|
+ /* Go .. */
|
|
+ ticks = jiffies;
|
|
+ __delay(lpj);
|
|
+ ticks = jiffies - ticks;
|
|
+ if (ticks)
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * Do a binary approximation to get lpj set to
|
|
+ * equal one clock (up to lps_precision bits)
|
|
+ */
|
|
+ lpj >>= 1;
|
|
+ loopbit = lpj;
|
|
+ while (lps_precision-- && (loopbit >>= 1)) {
|
|
+ lpj |= loopbit;
|
|
+ ticks = jiffies;
|
|
+ while (ticks == jiffies)
|
|
+ /* nothing */;
|
|
+ ticks = jiffies;
|
|
+ __delay(lpj);
|
|
+ if (jiffies != ticks) /* longer than 1 tick */
|
|
+ lpj &= ~loopbit;
|
|
+ }
|
|
+ printk(KERN_INFO "%d CPUs re-calibrate udelay(lpj = %d)\n", NR_CPUS, lpj);
|
|
+
|
|
+ for(i=0; i< NR_CPUS; i++)
|
|
+ cpu_data[i].udelay_val = lpj;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+device_initcall(udelay_recal);
|
|
+
|
|
void prom_soc_init(struct ralink_soc_info *soc_info)
|
|
{
|
|
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
|
|
select HAVE_PCI if PCI_MT7621
|
|
select WEAK_REORDERING_BEYOND_LLSC
|
|
+ select GENERIC_CLOCKEVENTS_BROADCAST
|
|
endchoice
|
|
|
|
choice
|