summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-07-10 00:08:44 +0200
committerKevin Hilman <khilman@linaro.org>2015-07-10 00:08:44 +0200
commitd024bae2c45956bf76f375ee532305dbfb3a6ba4 (patch)
tree6562dce9de75bab0d0c63271aa39cd95cb909712 /Documentation/devicetree/bindings
parentarm64: dts: add device tree for ARM SMM-A53x2 on LogicTile Express 20MG (diff)
parentARM: sunxi: Enable simplefb in the defconfig (diff)
downloadlinux-d024bae2c45956bf76f375ee532305dbfb3a6ba4.tar.xz
linux-d024bae2c45956bf76f375ee532305dbfb3a6ba4.zip
Merge tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
Merge "Allwinner late changes for 4.2" from Maxime Ripard: Allwinner late changes for 4.2 A bunch of defconfig changes, and some patches to make the Allwinner H3 and A33 boot properly. * tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: sunxi: Enable simplefb in the defconfig ARM: Remove deprecated symbol from defconfig files ARM: sunxi: Add Machine support for A33 ARM: sunxi: Introduce Allwinner H3 support Documentation: sunxi: Update Allwinner SoC documentation
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r--Documentation/devicetree/bindings/arm/sunxi.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt
index 42941fdefb11..67da20539540 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.txt
+++ b/Documentation/devicetree/bindings/arm/sunxi.txt
@@ -9,4 +9,6 @@ using one of the following compatible strings:
allwinner,sun6i-a31
allwinner,sun7i-a20
allwinner,sun8i-a23
+ allwinner,sun8i-a33
+ allwinner,sun8i-h3
allwinner,sun9i-a80