mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
bbdc13b15b
Removed upstreamed:
ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch[1]
Manually rebased:
layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
All other patches automatically rebased.
1. Private email exchange with patch author, Hauke Mehrtens
Signed-off-by: John Audia <graysky@archlinux.us>
20 lines
613 B
Diff
20 lines
613 B
Diff
--- a/arch/mips/kernel/mips-cm.c
|
|
+++ b/arch/mips/kernel/mips-cm.c
|
|
@@ -232,6 +232,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);
|
|
@@ -239,7 +240,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();
|
|
|