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

Merge tag 'actions-arm-soc-for-4.13' of... 

Merge tag 'actions-arm-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/soc

Pull "Actions Semi ARM SoC for v4.13" from Andreas Färber:

This adds a Kconfig symbol and mach-actions with board and SMP code,
plus a MAINTAINERS entry.

* tag 'actions-arm-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
  MAINTAINERS: Update Actions Semi section with SPS
  ARM: owl: Implement CPU enable-method for S500
  MAINTAINERS: Add Actions Semi Owl section
  ARM: Prepare Actions Semi S500
parents b1cb5e66 ba2694de

MAINTAINERS

+16 −0
Original line number Original line Diff line number Diff line
@@ -1036,6 +1036,22 @@ S: Maintained 
F:	drivers/amba/

F:	drivers/amba/

F:	include/linux/amba/bus.h

F:	include/linux/amba/bus.h





ARM/ACTIONS SEMI ARCHITECTURE

M:	Andreas Färber <afaerber@suse.de>

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

S:	Maintained

N:	owl

F:	arch/arm/mach-actions/

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

F:	arch/arm64/boot/dts/actions/

F:	drivers/clocksource/owl-*

F:	drivers/soc/actions/

F:	include/dt-bindings/power/owl-*

F:	include/linux/soc/actions/

F:	Documentation/devicetree/bindings/arm/actions.txt

F:	Documentation/devicetree/bindings/power/actions,owl-sps.txt

F:	Documentation/devicetree/bindings/timer/actions,owl-timer.txt



ARM/ADS SPHERE MACHINE SUPPORT

ARM/ADS SPHERE MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

M:	Lennert Buytenhek <kernel@wantstofly.org>

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

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

arch/arm/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -711,6 +711,8 @@ config ARCH_VIRT 
#

#

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

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





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



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

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





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

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

arch/arm/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -151,6 +151,7 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 




# Machine directory name.  This list is sorted alphanumerically

# Machine directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.

# by CONFIG_* macro name.

machine-$(CONFIG_ARCH_ACTIONS)		+= actions

machine-$(CONFIG_ARCH_ALPINE)		+= alpine

machine-$(CONFIG_ARCH_ALPINE)		+= alpine

machine-$(CONFIG_ARCH_ARTPEC)		+= artpec

machine-$(CONFIG_ARCH_ARTPEC)		+= artpec

machine-$(CONFIG_ARCH_AT91)		+= at91

machine-$(CONFIG_ARCH_AT91)		+= at91

arch/arm/mach-actions/Kconfig

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
menuconfig ARCH_ACTIONS

	bool "Actions Semi SoCs"

	depends on ARCH_MULTI_V7

	select ARM_AMBA

	select ARM_GIC

	select ARM_GLOBAL_TIMER

	select CACHE_L2X0

	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK

	select COMMON_CLK

	select GENERIC_IRQ_CHIP

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select OWL_TIMER

	help

	  This enables support for the Actions Semiconductor S500 SoC family.

arch/arm/mach-actions/Makefile

0 → 100644
+4 −0
Original line number Original line Diff line number Diff line 
obj-y += owl.o

obj-${CONFIG_SMP} += platsmp.o headsmp.o



AFLAGS_headsmp.o := -Wa,-march=armv7-a

CRA Git | Maintained and supported by SUSTech CRA and CCSE