Commit abd488c0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-core-for-4.21' of... 

Merge tag 'sunxi-core-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/soc

Allwinner core changes for 4.21

A few patches to enable a new Allwinner SoC based on an armv5 CPU.

* tag 'sunxi-core-for-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  dt-bindings: watchdog: Add Allwinner ARMv5 F1C100s wdt
  ARM: sunxi: add Allwinner ARMv5 SoCs
  dt-bindings: arm: Add new Allwinner ARMv5 F1C100s SoC
  ARM: Check ARCH_MULTI_V7 to differentiate ARMv5/v7 Allwinner SoCs

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 767ae017 dabfc836

Documentation/devicetree/bindings/arm/sunxi.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,4 +18,5 @@ using one of the following compatible strings: 
  allwinner,sun8i-v3s

  allwinner,sun9i-a80

  allwinner,sun50i-a64

  allwinner,suniv-f1c100s

  nextthing,gr8

Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	"allwinner,sun4i-a10-wdt"

	"allwinner,sun6i-a31-wdt"

	"allwinner,sun50i-a64-wdt","allwinner,sun6i-a31-wdt"

	"allwinner,suniv-f1c100s-wdt", "allwinner,sun4i-a10-wdt"

- reg : Specifies base physical address and size of the registers.



Optional properties:

arch/arm/mach-sunxi/Kconfig

+18 −1
Original line number Diff line number Diff line 
menuconfig ARCH_SUNXI

	bool "Allwinner SoCs"

	depends on ARCH_MULTI_V7

	depends on ARCH_MULTI_V5 || ARCH_MULTI_V7

	select ARCH_HAS_RESET_CONTROLLER

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP
@@ -9,9 +9,13 @@ menuconfig ARCH_SUNXI 
	select PM_OPP

	select SUN4I_TIMER

	select RESET_CONTROLLER

	help

	  Support for Allwinner ARM-based family of processors



if ARCH_SUNXI



if ARCH_MULTI_V7



config MACH_SUN4I

	bool "Allwinner A10 (sun4i) SoCs support"

	default ARCH_SUNXI
@@ -56,3 +60,16 @@ config ARCH_SUNXI_MC_SMP 
	select ARM_CPU_SUSPEND



endif



if ARCH_MULTI_V5



config MACH_SUNIV

	bool "Allwinner ARMv5 F-series (suniv) SoCs support"

	default ARCH_SUNXI

	help

	  Support for Allwinner suniv ARMv5 SoCs.

	  (F1C100A, F1C100s, F1C200s, F1C500, F1C600)



endif



endif

arch/arm/mach-sunxi/sunxi.c

+9 −0
Original line number Diff line number Diff line
@@ -101,3 +101,12 @@ static const char * const sun9i_board_dt_compat[] = { 
DT_MACHINE_START(SUN9I_DT, "Allwinner sun9i Family")

	.dt_compat	= sun9i_board_dt_compat,

MACHINE_END



static const char * const suniv_board_dt_compat[] = {

	"allwinner,suniv-f1c100s",

	NULL,

};



DT_MACHINE_START(SUNIV_DT, "Allwinner suniv Family")

	.dt_compat	= suniv_board_dt_compat,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE