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

Commit 45df60cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b82b6813 cb799267

MAINTAINERS

+8 −3
Original line number Diff line number Diff line
@@ -1232,10 +1232,15 @@ F: Documentation/devicetree/bindings/i2c/i2c-aspeed.txt 


ARM/ASPEED MACHINE SUPPORT

M:	Joel Stanley <joel@jms.id.au>

S:	Maintained

R:	Andrew Jeffery <andrew@aj.id.au>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)

Q:	https://patchwork.ozlabs.org/project/linux-aspeed/list/

S:	Supported

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git

F:	arch/arm/mach-aspeed/

F:	arch/arm/boot/dts/aspeed-*

F:	drivers/*/*aspeed*

N:	aspeed



ARM/ATMEL AT91 Clock Support

M:	Boris Brezillon <boris.brezillon@bootlin.com>
@@ -1743,7 +1748,7 @@ F: arch/arm/mach-orion5x/ts78xx-* 
ARM/OXNAS platform support

M:	Neil Armstrong <narmstrong@baylibre.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)

L:	linux-oxnas@groups.io (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-oxnas/

F:	arch/arm/boot/dts/ox8*.dts*

arch/arm/mach-npcm/npcm7xx.c

+2 −0
Original line number Diff line number Diff line
@@ -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