diff options
| author |   Olof Johansson <olof@lixom.net> | 2015-08-13 11:59:56 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-13 11:59:56 +0200 |
| commit | 85ef6b26d1abc01101cd7a6c8094787990b95c1c (patch) | |
| tree | c19fd916a381e858fe181bcd6c0b48fc53cab8d8 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'at91-ab-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt (diff) | |
| parent | ARM: dts: Convert Linkstation Mini to Device Tree (diff) | |
| download | linux-dev-85ef6b26d1abc01101cd7a6c8094787990b95c1c.tar.xz linux-dev-85ef6b26d1abc01101cd7a6c8094787990b95c1c.zip | |
Merge tag 'mvebu-dt-4.3-3' of git://git.infradead.org/linux-mvebu into next/dt
mvebu dt changes for v4.3 (part #3)
- device tree part of the Dove PMU series
- converting a new orion5x based platform to dt: Linkstation Mini
* tag 'mvebu-dt-4.3-3' of git://git.infradead.org/linux-mvebu:
ARM: dts: Convert Linkstation Mini to Device Tree
ARM: dt: dove: add GPU power domain description
ARM: dt: dove: add video decoder power domain description
ARM: dt: dove: wire up RTC interrupt
ARM: dt: Add PMU node, making PMU child devices childs of this node
Signed-off-by: Olof Johansson <olof@lixom.net>
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 620aeb06c775..793329335c3c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -478,6 +478,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ orion5x-lacie-d2-network.dtb \ orion5x-lacie-ethernet-disk-mini-v2.dtb \ orion5x-linkstation-lswtgl.dtb \ + orion5x-lswsgl.dtb \ orion5x-maxtor-shared-storage-2.dtb \ orion5x-rd88f5182-nas.dtb dtb-$(CONFIG_ARCH_PRIMA2) += \ |