diff options
| author | John Audia <graysky@archlinux.us> | 2021-11-27 14:56:33 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-28 16:32:45 +0100 |
| commit | bbdc13b15b383b8b8d5492575e0a83cbe2af139b (patch) | |
| tree | e874ca367d12c68d8cdb5392f829bd53c37563a0 /target/linux/ramips/patches-5.4/0098-disable_cm.patch | |
| parent | 26a7a385bbe2c8a258b9b845122e48935c8738c9 (diff) | |
| download | upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.gz upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.bz2 upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.zip | |
kernel: bump 5.4 to 5.4.161
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>
Diffstat (limited to 'target/linux/ramips/patches-5.4/0098-disable_cm.patch')
| -rw-r--r-- | target/linux/ramips/patches-5.4/0098-disable_cm.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-5.4/0098-disable_cm.patch b/target/linux/ramips/patches-5.4/0098-disable_cm.patch index 9b280aef99..1f3367568f 100644 --- a/target/linux/ramips/patches-5.4/0098-disable_cm.patch +++ b/target/linux/ramips/patches-5.4/0098-disable_cm.patch @@ -1,6 +1,6 @@ --- a/arch/mips/kernel/mips-cm.c +++ b/arch/mips/kernel/mips-cm.c -@@ -233,6 +233,7 @@ int mips_cm_probe(void) +@@ -232,6 +232,7 @@ int mips_cm_probe(void) /* disable CM regions */ write_gcr_reg0_base(CM_GCR_REGn_BASE_BASEADDR); @@ -8,7 +8,7 @@ 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) +@@ -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); |