diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:04:45 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:04:45 +0100 |
commit | b4eebd88c2234a644132568eeaf7691d5b07c01a (patch) | |
tree | 64382163ab87d1b2ddb45b8eab3367a911cee1ff /arch/arm/boot/dts/Makefile | |
parent | d29d30782acd9266c0afed08cb8f40a95e4f2212 (diff) | |
parent | 7f6a78fe34f041da317e46813254abab776d46f7 (diff) | |
download | linux-stable-b4eebd88c2234a644132568eeaf7691d5b07c01a.tar.gz linux-stable-b4eebd88c2234a644132568eeaf7691d5b07c01a.tar.bz2 linux-stable-b4eebd88c2234a644132568eeaf7691d5b07c01a.zip |
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 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 50acc79fadf7..78f39e78143d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -705,6 +705,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ orion5x-netgear-wnr854t.dtb \ orion5x-rd88f5182-nas.dtb dtb-$(CONFIG_ARCH_ACTIONS) += \ + owl-s500-cubieboard6.dtb \ owl-s500-guitar-bb-rev-b.dtb dtb-$(CONFIG_ARCH_PRIMA2) += \ prima2-evb.dtb |