diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:20:59 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 17:20:59 +0100 |
commit | f2f456e720351028bdd84f02abb5a58ceacbdcaa (patch) | |
tree | dcfe4676dd5490d62e928e37282018957995536a /Documentation | |
parent | Merge tag 'v3.19-rockchip-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc (diff) | |
parent | clocksource: meson6: Select CLKSRC_MMIO (diff) | |
download | linux-dev-f2f456e720351028bdd84f02abb5a58ceacbdcaa.tar.xz linux-dev-f2f456e720351028bdd84f02abb5a58ceacbdcaa.zip |
Merge tag 'v3.19-meson-soc' of https://github.com/carlocaione/linux-meson into next/soc
Pull "ARM: meson: SOC related changes" from Carlo Caione:
This is the pull request for the SoC related changes for the 3.19.
The support for Meson8 is added together with L2 cache management.
* tag 'v3.19-meson-soc' of https://github.com/carlocaione/linux-meson:
clocksource: meson6: Select CLKSRC_MMIO
ARM: meson: enable L2 cache
ARM: meson: document meson8 compatible properties
ARM: meson: add meson8 support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index 7eece72b1a35..8fe815046140 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -2,7 +2,9 @@ Amlogic MesonX device tree bindings ------------------------------------------- Boards with the Amlogic Meson6 SoC shall have the following properties: + Required root node property: + compatible: "amlogic,meson6" -Required root node property: - -compatible = "amlogic,meson6"; +Boards with the Amlogic Meson8 SoC shall have the following properties: + Required root node property: + compatible: "amlogic,meson8"; |