aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-14 18:42:02 -0400
committerArnd Bergmann <arnd@arndb.de>2016-09-14 18:42:02 -0400
commit4a5c99462ab5cdc111007625b76e349076f18a29 (patch)
tree95bee3c310f4aedd6ccf05746c5ba7931d9cf801 /Documentation
parentbe46f95b54e00922a506d9b3ecf588cc8255d310 (diff)
parentc1efda1238be1efa8612e26ee98795298ffd6f95 (diff)
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/arm/sunxi/README2
-rw-r--r--Documentation/devicetree/bindings/arm/sunxi.txt1
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README
index e5a115f24471..77f57efbea83 100644
--- a/Documentation/arm/sunxi/README
+++ b/Documentation/arm/sunxi/README
@@ -31,6 +31,8 @@ SunXi family
31 + User Manual 31 + User Manual
32 http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-01-08%29.pdf 32 http://dl.linux-sunxi.org/A13/A13%20User%20Manual%20-%20v1.2%20%282013-01-08%29.pdf
33 33
34 - Next Thing Co GR8 (sun5i)
35
34 * Dual ARM Cortex-A7 based SoCs 36 * Dual ARM Cortex-A7 based SoCs
35 - Allwinner A20 (sun7i) 37 - Allwinner A20 (sun7i)
36 + User Manual 38 + User Manual
diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt
index 7e79fcc36b0d..3975d0a0e4c2 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.txt
+++ b/Documentation/devicetree/bindings/arm/sunxi.txt
@@ -14,3 +14,4 @@ using one of the following compatible strings:
14 allwinner,sun8i-a83t 14 allwinner,sun8i-a83t
15 allwinner,sun8i-h3 15 allwinner,sun8i-h3
16 allwinner,sun9i-a80 16 allwinner,sun9i-a80
17 nextthing,gr8