diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:19:23 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:19:23 +0100 |
| commit | 22261b22f425cb79e0a70cfc13b7baec07daee94 (patch) | |
| tree | 8e090c577757c432eea1016691c7dadd2314e8dc /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt (diff) | |
| parent | ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot (diff) | |
| download | linux-dev-22261b22f425cb79e0a70cfc13b7baec07daee94.tar.xz linux-dev-22261b22f425cb79e0a70cfc13b7baec07daee94.zip | |
Merge tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm into next/dt
Merge "ARM: mach-bcm: dt updates for 3.15 - part 2" from Matt Porter:
- BCM21664 SoC support
- BCM59056 PMU support
- BCM281xx reboot fix
* tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm:
ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
ARM: dts: bcm21664: Add device tree files.
ARM: DT: bcm21664: Device tree bindings
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index abd9100482d3..4780ca1c8885 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -47,7 +47,8 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d36ek.dtb dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb -dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb +dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ + bcm21664-garnet.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb dtb-$(CONFIG_ARCH_BERLIN) += \ |