diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 16:12:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-11 16:12:21 -0700 |
| commit | 45df60cd2cbe2a8c32fd34e474b62b2b41bacf69 (patch) | |
| tree | a0f38f6d02ad1d64ca65470a85ad9ccfe28c8b4e /arch | |
| parent | b82b6813ff8fd741c3061c4a754ded898b69ab28 (diff) | |
| parent | cb799267bb65676277fb718cfb42239fe5c6e4fb (diff) | |
| download | linux-45df60cd2cbe2a8c32fd34e474b62b2b41bacf69.tar.bz2 | |
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"Here is a very small set of fixes for inclusion in linux-4.17-rc1: Two
changes for the maintainer file, and one more fix for the newly added
npcm platform, to enable the level 2 cache controller"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
MAINTAINERS: Update ASPEED entry with details
MAINTAINERS: Migrate oxnas list to groups.io
arm: npcm: enable L2 cache in NPCM7xx architecture
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-npcm/npcm7xx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-npcm/npcm7xx.c b/arch/arm/mach-npcm/npcm7xx.c index 5f7cd88103ef..c5f77d854c4f 100644 --- a/arch/arm/mach-npcm/npcm7xx.c +++ b/arch/arm/mach-npcm/npcm7xx.c @@ -17,4 +17,6 @@ static const char *const npcm7xx_dt_match[] = { DT_MACHINE_START(NPCM7XX_DT, "NPCM7XX Chip family") .atag_offset = 0x100, .dt_compat = npcm7xx_dt_match, + .l2c_aux_val = 0x0, + .l2c_aux_mask = ~0x0, MACHINE_END |