diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 02:30:48 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 02:30:48 +0300 |
| commit | dd270f24fb52d88cf6bfceb36266ad42e3d77ce9 (patch) | |
| tree | 12e25a7a0fe9fea67b4c51c5fcee3a2dfbfa03dd /arch/arm/boot/dts/Makefile | |
| parent | 5d362a31a7d3b70b7822805621a277b137b37af1 (diff) | |
| parent | 4c945e8556ec7ea5b19d4f8721b212f468656e0d (diff) | |
| download | linux-dd270f24fb52d88cf6bfceb36266ad42e3d77ce9.tar.xz | |
Merge tag 'mvebu-dt-4.5-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt for 4.5 (part 2)" from Gregory CLEMENT:
- Fix Armada 388 GP dts
- Add clock related to PMU for Dove
- Add SolidRun Armada 388 Clearfog A1 dts
* tag 'mvebu-dt-4.5-2' of git://git.infradead.org/linux-mvebu:
ARM: dts: Add SolidRun Armada 388 Clearfog A1 DT file
dt-bindings: add Marvell PMU documentation
ARM: dts: dove: add Dove divider clocks
dt-bindings: add Marvell core PLL and clock divider PMU documentation
ARM: mvebu: remove duplicated regulator definition in Armada 388 GP
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 52e816a69d82..7558b412ee50 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -750,6 +750,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ armada-385-db-ap.dtb \ armada-385-linksys-caiman.dtb \ armada-385-linksys-cobra.dtb \ + armada-388-clearfog.dtb \ armada-388-db.dtb \ armada-388-gp.dtb \ armada-388-rd.dtb |