diff options
| author | Olof Johansson | 2015-10-23 19:19:36 +0200 |
|---|---|---|
| committer | Olof Johansson | 2015-10-23 19:19:36 +0200 |
| commit | fc1f61f1c0b71a1c21123502c99712ad5b7d8e79 (patch) | |
| tree | 7e64ddc156c1cf34e95b667ffc6277378f758c32 /Documentation | |
| parent | Merge tag 'berlin-soc-for-4.4-2' of git://git.infradead.org/users/hesselba/li... (diff) | |
| parent | ARM: sunxi: Add R8 support (diff) | |
| download | kernel-qcow2-linux-fc1f61f1c0b71a1c21123502c99712ad5b7d8e79.tar.gz kernel-qcow2-linux-fc1f61f1c0b71a1c21123502c99712ad5b7d8e79.tar.xz kernel-qcow2-linux-fc1f61f1c0b71a1c21123502c99712ad5b7d8e79.zip | |
Merge tag 'sunxi-core-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc
Allwinner core changes for 4.4
Add support for the Allwinner R8 SoC used in the CHIP.
* tag 'sunxi-core-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sunxi: Add R8 support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/arm/sunxi/README | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/arm/sunxi.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README index 5e38e1582f95..430d279a8df3 100644 --- a/Documentation/arm/sunxi/README +++ b/Documentation/arm/sunxi/README @@ -25,7 +25,7 @@ SunXi family + Datasheet http://dl.linux-sunxi.org/A10s/A10s%20Datasheet%20-%20v1.20%20%282012-03-27%29.pdf - - Allwinner A13 (sun5i) + - Allwinner A13 / R8 (sun5i) + Datasheet http://dl.linux-sunxi.org/A13/A13%20Datasheet%20-%20v1.12%20%282012-03-29%29.pdf + User Manual diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt index 67da20539540..bb9b0faa919d 100644 --- a/Documentation/devicetree/bindings/arm/sunxi.txt +++ b/Documentation/devicetree/bindings/arm/sunxi.txt @@ -6,6 +6,7 @@ using one of the following compatible strings: allwinner,sun4i-a10 allwinner,sun5i-a10s allwinner,sun5i-a13 + allwinner,sun5i-r8 allwinner,sun6i-a31 allwinner,sun7i-a20 allwinner,sun8i-a23 |