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

Commit 4a5c9946 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Allwinner core changes for 4.9" from Maxime Ripard:

Add support for big endian on the Allwinner A20, and the Nextthing GR8 SoC

* tag 'sunxi-core-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Support the Nextthing GR8
  ARM: sunxi: enable big-endian
parents be46f95b c1efda12

Documentation/arm/sunxi/README

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ SunXi family 
        + User Manual

          http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-01-08%29.pdf



      - Next Thing Co GR8 (sun5i)



    * Dual ARM Cortex-A7 based SoCs

      - Allwinner A20 (sun7i)

        + User Manual

Documentation/devicetree/bindings/arm/sunxi.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ using one of the following compatible strings: 
  allwinner,sun8i-a83t

  allwinner,sun8i-h3

  allwinner,sun9i-a80

  nextthing,gr8

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -991,6 +991,7 @@ M: Chen-Yu Tsai <wens@csie.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

N:	sun[x456789]i

F:	arch/arm/boot/dts/ntc-gr8*



ARM/Allwinner SoC Clock Support

M:	Emilio López <emilio@elopez.com.ar>

arch/arm/mach-sunxi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ config MACH_SUN7I 
	default ARCH_SUNXI

	select ARM_GIC

	select ARM_PSCI

	select ARCH_SUPPORTS_BIG_ENDIAN

	select HAVE_ARM_ARCH_TIMER

	select SUN5I_HSTIMER

arch/arm/mach-sunxi/sunxi.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ static const char * const sunxi_board_dt_compat[] = { 
	"allwinner,sun5i-a10s",

	"allwinner,sun5i-a13",

	"allwinner,sun5i-r8",

	"nextthing,gr8",

	NULL,

};