diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-27 11:00:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-27 11:00:37 -0800 |
| commit | 983542434e6beef911d5ae4488c49080a177e5e4 (patch) | |
| tree | e2888861742eb22a66ea0f873d12c101f906d055 | |
| parent | Merge tag 'for-linus-20190127' of git://git.kernel.dk/linux-block (diff) | |
| parent | EDAC, altera: Fix S10 persistent register offset (diff) | |
| download | wireguard-linux-983542434e6beef911d5ae4488c49080a177e5e4.tar.xz wireguard-linux-983542434e6beef911d5ae4488c49080a177e5e4.zip | |
Merge tag 'edac_fix_for_5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC fix from Borislav Petkov:
"Fix persistent register offsets of altera_edac, from Thor Thayer"
* tag 'edac_fix_for_5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
EDAC, altera: Fix S10 persistent register offset
| -rw-r--r-- | drivers/edac/altera_edac.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/edac/altera_edac.h b/drivers/edac/altera_edac.h index 4213cb0bb2a7..f8664bac9fa8 100644 --- a/drivers/edac/altera_edac.h +++ b/drivers/edac/altera_edac.h @@ -295,8 +295,8 @@ struct altr_sdram_mc_data { #define S10_SYSMGR_ECC_INTSTAT_DERR_OFST 0xA0 /* Sticky registers for Uncorrected Errors */ -#define S10_SYSMGR_UE_VAL_OFST 0x120 -#define S10_SYSMGR_UE_ADDR_OFST 0x124 +#define S10_SYSMGR_UE_VAL_OFST 0x220 +#define S10_SYSMGR_UE_ADDR_OFST 0x224 #define S10_DDR0_IRQ_MASK BIT(16) |