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

Commit 7b8685d9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Merge "Allwinner core changes for 4.6" from Maxime Ripard:

Just introduce the A83T support.

* tag 'sunxi-core-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Introduce Allwinner for A83T support
parents 16d574a5 1425ec0f

Documentation/arm/sunxi/README

+0 −1
Original line number Diff line number Diff line
@@ -72,6 +72,5 @@ SunXi family 


    * Octa ARM Cortex-A7 based SoCs

      - Allwinner A83T

        + Not Supported

        + Datasheet

          http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf

Documentation/devicetree/bindings/arm/sunxi.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ using one of the following compatible strings: 
  allwinner,sun7i-a20

  allwinner,sun8i-a23

  allwinner,sun8i-a33

  allwinner,sun8i-a83t

  allwinner,sun8i-h3

  allwinner,sun9i-a80

arch/arm/mach-sunxi/sunxi.c

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ MACHINE_END 
static const char * const sun8i_board_dt_compat[] = {

	"allwinner,sun8i-a23",

	"allwinner,sun8i-a33",

	"allwinner,sun8i-a83t",

	"allwinner,sun8i-h3",

	NULL,

};