diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 22:04:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 22:04:54 +0200 |
| commit | 73e601ea57020c42d989120061dfc83ce9c85360 (patch) | |
| tree | f4434c82500ae6d519255f16de9a9bf938b40665 /Documentation/devicetree/bindings/arm | |
| parent | 3d00d04f60b7b0859d877c6a4d728d84db4c5914 (diff) | |
| parent | 7917d14129a5a7241289f06d2c5299c5d03ed529 (diff) | |
Merge tag 'sunxi-core-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc
Merge "Allwinner core additions for 4.2" from Maxime Ripard:
This pull request contains only the changes needed to support the SMP on
the Allwinner A23.
* tag 'sunxi-core-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: sun8i: Add SMP support for the Allwinner A23
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/cpus.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt index 6aa331d11c5e..d6b794cef0b8 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt @@ -188,6 +188,7 @@ nodes to be present and contain the properties described below. # On ARM 32-bit systems this property is optional and can be one of: "allwinner,sun6i-a31" + "allwinner,sun8i-a23" "arm,psci" "brcm,brahma-b15" "marvell,armada-375-smp" |