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>
20 lines
613 B
Diff
20 lines
613 B
Diff
--- a/arch/mips/kernel/mips-cm.c
|
|
+++ b/arch/mips/kernel/mips-cm.c
|
|
@@ -233,6 +233,7 @@ int mips_cm_probe(void)
|
|
|
|
/* disable CM regions */
|
|
write_gcr_reg0_base(CM_GCR_REGn_BASE_BASEADDR);
|
|
+ /*
|
|
write_gcr_reg0_mask(CM_GCR_REGn_MASK_ADDRMASK);
|
|
write_gcr_reg1_base(CM_GCR_REGn_BASE_BASEADDR);
|
|
write_gcr_reg1_mask(CM_GCR_REGn_MASK_ADDRMASK);
|
|
@@ -240,7 +241,7 @@ int mips_cm_probe(void)
|
|
write_gcr_reg2_mask(CM_GCR_REGn_MASK_ADDRMASK);
|
|
write_gcr_reg3_base(CM_GCR_REGn_BASE_BASEADDR);
|
|
write_gcr_reg3_mask(CM_GCR_REGn_MASK_ADDRMASK);
|
|
-
|
|
+*/
|
|
/* probe for an L2-only sync region */
|
|
mips_cm_probe_l2sync();
|
|
|