097de3d38b
Upstreamed patches: - ar71xx/patches-4.9/821-serial-core-add-support-for-boot-console-with-arbitr.patch - ar71xx/patches-4.14/821-serial-core-add-support-for-boot-console-with-arbitr.patch - ath79/patches-4.14/921-serial-core-add-support-for-boot-console-with-arbitr.patch Manually rebased: - generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch - ipq806x/patches-4.14/0065-arm-override-compiler-flags.patch - ipq806x/patches-4.19/0065-arm-override-compiler-flags.patch Refreshed all patches. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
20 lines
613 B
Diff
20 lines
613 B
Diff
--- a/arch/mips/kernel/mips-cm.c
|
|
+++ b/arch/mips/kernel/mips-cm.c
|
|
@@ -236,6 +236,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);
|
|
@@ -243,7 +244,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();
|
|
|