From: Olof Johansson Date: Thu, 31 Oct 2013 17:32:55 +0000 (-0700) Subject: Merge branch 'bcm/dt' into next/dt X-Git-Tag: v3.13-rc1~156^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed76956f7089e34052a475fd13a903d2b69e381b;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'bcm/dt' into next/dt A handful of DT updates from Christian Daudt for the broadcom mobile platforms, including their rename of the platform to BCM_MOBILE to keep BCM for the vendor-level options. * bcm/dt: ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx) ARM: dts: bcm281xx: Add card detect GPIO ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt) ARM: bcm281xx: Add device node for the GPIO controller Signed-off-by: Olof Johansson --- ed76956f7089e34052a475fd13a903d2b69e381b diff --cc arch/arm/boot/dts/Makefile index b590bce,b086aa2..5ba6e32 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -40,12 -40,10 +40,11 @@@ dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.d dtb-$(CONFIG_ARCH_AT91) += sama5d33ek.dtb dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb -- +dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb - +dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb - dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \ + dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \ bcm28155-ap.dtb + dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ da850-evm.dtb dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \