diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 18:04:45 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 18:04:45 +0300 |
| commit | b4eebd88c2234a644132568eeaf7691d5b07c01a (patch) | |
| tree | 64382163ab87d1b2ddb45b8eab3367a911cee1ff /Documentation/devicetree/bindings/arm | |
| parent | d29d30782acd9266c0afed08cb8f40a95e4f2212 (diff) | |
| parent | 7f6a78fe34f041da317e46813254abab776d46f7 (diff) | |
| download | linux-b4eebd88c2234a644132568eeaf7691d5b07c01a.tar.xz | |
Merge tag 'actions-arm-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/dt
Pull "Actions Semi ARM based SoC DT for v4.15" from Andreas Färber:
This updates the Guitar board DT with a clock node for the debug UART
and adds a new DT for the CubieBoard6.
It also updates the S500 DT with CPU power domains.
* tag 'actions-arm-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
ARM: dts: owl-s500: Add CubieBoard6
dt-bindings: arm: actions: Add CubieBoard6
ARM: dts: owl-s500-guitar-bb-rev-b: Add fake uart3 clock
ARM: dts: owl-s500: Set power domains for CPU2 and CPU3
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/actions.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/actions.txt b/Documentation/devicetree/bindings/arm/actions.txt index 3bc7ea575564..ced764a8549e 100644 --- a/Documentation/devicetree/bindings/arm/actions.txt +++ b/Documentation/devicetree/bindings/arm/actions.txt @@ -21,6 +21,7 @@ Boards: Root node property compatible must contain, depending on board: + - Cubietech CubieBoard6: "cubietech,cubieboard6" - LeMaker Guitar Base Board rev. B: "lemaker,guitar-bb-rev-b", "lemaker,guitar" |