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

Commit abb2c53a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-for-4.7-arch' of https://github.com/shenki/linux into next/soc 

Merge "aspeed arch tag for 4.7" from Joel Stanley <joel@jms.id.au>:

This is the initial pull request for the Aspeed BMC SoCs.

I put 4.7 in the subject for this and the subsequent requests but if it's a bit
late in the cycle then I understand.

Following review I got rid of the board file by pushing the functionality out
to a watchdog and clock driver, so it's just the Kconfig bits. I've also added
myself to maintainers for the Aspeed arch and drivers as I intend on looking
after them.

* tag 'aspeed-for-4.7-arch' of https://github.com/shenki/linux:
  arm: Add Aspeed machine
parents 6683d91c 8c2ed9bc

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -978,6 +978,13 @@ F: arch/arm/mach-artpec 
F:	arch/arm/boot/dts/artpec6*

F:	drivers/clk/clk-artpec6.c



ARM/ASPEED MACHINE SUPPORT

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

S:	Maintained

F:	arch/arm/mach-aspeed/

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

F:	drivers/*/*aspeed*



ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Alexandre Belloni <alexandre.belloni@free-electrons.com>

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -775,6 +775,8 @@ source "arch/arm/mach-meson/Kconfig" 


source "arch/arm/mach-moxart/Kconfig"



source "arch/arm/mach-aspeed/Kconfig"



source "arch/arm/mach-mv78xx0/Kconfig"



source "arch/arm/mach-imx/Kconfig"

arch/arm/mach-aspeed/Kconfig

0 → 100644
+30 −0
Original line number Diff line number Diff line 
menuconfig ARCH_ASPEED

	bool "Aspeed BMC architectures"

	depends on ARCH_MULTI_V5 || ARCH_MULTI_V6

	select SRAM

	select WATCHDOG

	select ASPEED_WATCHDOG

	select MOXART_TIMER

	help

	  Say Y here if you want to run your kernel on an ASpeed BMC SoC.



if ARCH_ASPEED



config MACH_ASPEED_G4

	bool "Aspeed SoC 4th Generation"

	depends on ARCH_MULTI_V5

	select CPU_ARM926T

	help

	 Say yes if you intend to run on an Aspeed ast2400 or similar

	 fourth generation BMCs, such as those used by OpenPower Power8

	 systems.



config MACH_ASPEED_G5

	bool "Aspeed SoC 5th Generation"

	depends on ARCH_MULTI_V6

	select CPU_V6

	help

	 Say yes if you intend to run on an Aspeed ast2500 or similar

	 fifth generation Aspeed BMCs.



endif