Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98354243 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 419967d5 245b6c65

drivers/edac/altera_edac.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -295,8 +295,8 @@ struct altr_sdram_mc_data { 
#define S10_SYSMGR_ECC_INTSTAT_DERR_OFST  0xA0

#define S10_SYSMGR_ECC_INTSTAT_DERR_OFST  0xA0





/* Sticky registers for Uncorrected Errors */

/* Sticky registers for Uncorrected Errors */

#define S10_SYSMGR_UE_VAL_OFST            0x120

#define S10_SYSMGR_UE_VAL_OFST            0x220

#define S10_SYSMGR_UE_ADDR_OFST           0x124

#define S10_SYSMGR_UE_ADDR_OFST           0x224





#define S10_DDR0_IRQ_MASK                 BIT(16)

#define S10_DDR0_IRQ_MASK                 BIT(16)