diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-29 23:12:17 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-29 23:12:17 (GMT) |
| commit | 7b8685d99e3104b2a6a68ef8576336c5516ee26b (patch) | |
| tree | 33b6a26e5c7d199dc075553d69e7bfbed08c7f1f | |
| parent | 16d574a5d996adc6962a83041b9c10d1670924e7 (diff) | |
| parent | 1425ec0f1ce46c95838c797a721bf9c6e0be14e2 (diff) | |
| download | linux-7b8685d99e3104b2a6a68ef8576336c5516ee26b.tar.xz | |
Merge tag 'sunxi-core-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc
Merge "Allwinner core changes for 4.6" from Maxime Ripard:
Just introduce the A83T support.
* tag 'sunxi-core-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sunxi: Introduce Allwinner for A83T support
| -rw-r--r-- | Documentation/arm/sunxi/README | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/arm/sunxi.txt | 1 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/arm/sunxi/README b/Documentation/arm/sunxi/README index 430d279..e5a115f 100644 --- a/Documentation/arm/sunxi/README +++ b/Documentation/arm/sunxi/README @@ -72,6 +72,5 @@ SunXi family * Octa ARM Cortex-A7 based SoCs - Allwinner A83T - + Not Supported + Datasheet http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf diff --git a/Documentation/devicetree/bindings/arm/sunxi.txt b/Documentation/devicetree/bindings/arm/sunxi.txt index bb9b0faa..7e79fcc 100644 --- a/Documentation/devicetree/bindings/arm/sunxi.txt +++ b/Documentation/devicetree/bindings/arm/sunxi.txt @@ -11,5 +11,6 @@ using one of the following compatible strings: allwinner,sun7i-a20 allwinner,sun8i-a23 allwinner,sun8i-a33 + allwinner,sun8i-a83t allwinner,sun8i-h3 allwinner,sun9i-a80 diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index c2be98f..3c15619 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -69,6 +69,7 @@ MACHINE_END static const char * const sun8i_board_dt_compat[] = { "allwinner,sun8i-a23", "allwinner,sun8i-a33", + "allwinner,sun8i-a83t", "allwinner,sun8i-h3", NULL, }; |