diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-08 16:13:31 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-08 16:13:31 -0800 |
| commit | 1ba5568c01b0ac52b5508f3b5f6de7f2c513722b (patch) | |
| tree | 710d7bcb03cf77dae2ac962055c032148a0e63b0 /arch/arm/boot/dts/Makefile | |
| parent | a0f3e826e8a5084bec73433a36670c386ed3aefe (diff) | |
| parent | 8872fc22c2670cde338ab92be4a8e9ebad8e53e6 (diff) | |
| download | op-kernel-dev-1ba5568c01b0ac52b5508f3b5f6de7f2c513722b.zip op-kernel-dev-1ba5568c01b0ac52b5508f3b5f6de7f2c513722b.tar.gz | |
Merge tag 'arm-soc/for-3.18/cygnus-dts-v9' of http://github.com/brcm/linux into next/dt
Merge "Broadcom Cygnus SoC Device Tree changes" from Florian Fianelli:
This patchset contains initial support for Broadcom's Cygnus SoC based on our
iProc architecture. Initial support is minimal and includes just the mach
platform code, clock driver, and a basic device tree configuration. Peripheral
drivers will be submitted soon, as will device tree configurations for other
Cygnus board variants.
These are the Device Tree changes
* tag 'arm-soc/for-3.18/cygnus-dts-v9' of http://github.com/brcm/linux:
ARM: dts: Enable Broadcom Cygnus SoC
dt-bindings: Document Broadcom Cygnus SoC and clocks
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 387b691..cfe973f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -54,6 +54,10 @@ dtb-$(CONFIG_ARCH_AT91) += at91-sama5d4ek.dtb dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb +dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ + bcm911360_entphn.dtb \ + bcm911360k.dtb \ + bcm958300k.dtb dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \ |
