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

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

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

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

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

Some patches to support two new SoCs: the H2+ and the V3s.

* tag 'sunxi-core-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  arm: sunxi: add support for V3s SoC
  ARM: sunxi: add support for H2+ SoC
parents 5172d5a5 b074fede

Documentation/arm/sunxi/README

+8 −0
Original line number Diff line number Diff line
@@ -63,10 +63,18 @@ SunXi family 
        + User Manual

          http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf



      - Allwinner H2+ (sun8i)

        + No document available now, but is known to be working properly with

          H3 drivers and memory map.



      - Allwinner H3 (sun8i)

        + Datasheet

          http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf



      - Allwinner V3s (sun8i)

        + Datasheet

          http://linux-sunxi.org/File:Allwinner_V3s_Datasheet_V1.0.pdf



    * Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs

      - Allwinner A80

        + Datasheet

Documentation/devicetree/bindings/arm/sunxi.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ using one of the following compatible strings: 
  allwinner,sun8i-a23

  allwinner,sun8i-a33

  allwinner,sun8i-a83t

  allwinner,sun8i-h2-plus

  allwinner,sun8i-h3

  allwinner,sun9i-a80

  allwinner,sun50i-a64

arch/arm/mach-sunxi/sunxi.c

+2 −0
Original line number Diff line number Diff line
@@ -63,7 +63,9 @@ static const char * const sun8i_board_dt_compat[] = { 
	"allwinner,sun8i-a23",

	"allwinner,sun8i-a33",

	"allwinner,sun8i-a83t",

	"allwinner,sun8i-h2-plus",

	"allwinner,sun8i-h3",

	"allwinner,sun8i-v3s",

	NULL,

};