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

Commit 84d711ca authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

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

A bunch of patches for the sunxi documentation and mach-sunxi. The most
notable feature is the introduction of the R40 support.

* tag 'sunxi-core-for-4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: sunxi: add support for R40 SoC
  ARM: sunxi: fix the core number of V3s in sunxi README
  dt-bindings: add compatible string for Allwinner V3s SoC
parents ab63d1ef 14e25a03

Documentation/arm/sunxi/README

+9 −2
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ SunXi family 


      - Next Thing Co GR8 (sun5i)



    * Single ARM Cortex-A7 based SoCs

      - Allwinner V3s (sun8i)

        + Datasheet

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



    * Dual ARM Cortex-A7 based SoCs

      - Allwinner A20 (sun7i)

        + User Manual
@@ -71,9 +76,11 @@ SunXi family 
        + Datasheet

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



      - Allwinner V3s (sun8i)

      - Allwinner R40 (sun8i)

        + Datasheet

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

          https://github.com/tinalinux/docs/raw/r40-v1.y/R40_Datasheet_V1.0.pdf

        + User Manual

          https://github.com/tinalinux/docs/raw/r40-v1.y/Allwinner_R40_User_Manual_V1.0.pdf



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

      - Allwinner A80

Documentation/devicetree/bindings/arm/sunxi.txt

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ using one of the following compatible strings: 
  allwinner,sun8i-a83t

  allwinner,sun8i-h2-plus

  allwinner,sun8i-h3

  allwinner-sun8i-r40

  allwinner,sun8i-v3s

  allwinner,sun9i-a80

  allwinner,sun50i-a64

  nextthing,gr8

arch/arm/mach-sunxi/sunxi.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static const char * const sun8i_board_dt_compat[] = { 
	"allwinner,sun8i-a83t",

	"allwinner,sun8i-h2-plus",

	"allwinner,sun8i-h3",

	"allwinner,sun8i-r40",

	"allwinner,sun8i-v3s",

	NULL,

};