]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'bcm/dt' into next/dt
authorOlof Johansson <olof@lixom.net>
Thu, 31 Oct 2013 17:32:55 +0000 (10:32 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 31 Oct 2013 17:32:55 +0000 (10:32 -0700)
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 <olof@lixom.net>
1  2 
arch/arm/boot/dts/Makefile

index b590bcebaa68ae5dd7d99315f0251a197090ac8e,b086aa28bd2083166158a06137b853c62678485f..5ba6e32f30167a2288385cc21f2503884fc5cdcc
@@@ -40,18 -40,15 +40,17 @@@ 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 \
        dove-cubox.dtb \
        dove-d2plug.dtb \
 +      dove-d3plug.dtb \
        dove-dove-db.dtb
  dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
@@@ -113,7 -110,6 +112,7 @@@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-
        armada-xp-axpwifiap.dtb \
        armada-xp-db.dtb \
        armada-xp-gp.dtb \
 +      armada-xp-matrix.dtb \
        armada-xp-openblocks-ax3-4.dtb
  dtb-$(CONFIG_ARCH_MXC) += \
        imx25-karo-tx25.dtb \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-sbc6x.dtb \
 +      imx6q-udoo.dtb \
        imx6q-wandboard.dtb \
        imx6sl-evk.dtb \
 +      vf610-cosmic.dtb \
        vf610-twr.dtb
  dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
        imx23-olinuxino.dtb \
        imx28-cfa10057.dtb \
        imx28-cfa10058.dtb \
        imx28-evk.dtb \
 +      imx28-m28cu3.dtb \
        imx28-m28evk.dtb \
        imx28-sps1.dtb \
        imx28-tx28.dtb
@@@ -177,15 -170,9 +176,15 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        omap3-devkit8000.dtb \
        omap3-beagle-xm.dtb \
        omap3-evm.dtb \
 +      omap3-evm-37xx.dtb \
 +      omap3-n900.dtb \
 +      omap3-n9.dtb \
 +      omap3-n950.dtb \
        omap3-tobi.dtb \
 +      omap3-gta04.dtb \
        omap3-igep0020.dtb \
        omap3-igep0030.dtb \
 +      omap3-zoom3.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
        omap4-panda-es.dtb \
        am335x-evmsk.dtb \
        am335x-bone.dtb \
        am335x-boneblack.dtb \
 +      am335x-nano.dtb \
 +      am335x-base0033.dtb \
        am3517-evm.dtb \
        am3517_mt_ventoux.dtb \
 -      am43x-epos-evm.dtb
 +      am43x-epos-evm.dtb \
 +      dra7-evm.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 -      ste-hrefprev60.dtb \
 -      ste-hrefv60plus.dtb \
 +      ste-hrefprev60-stuib.dtb \
 +      ste-hrefprev60-tvk.dtb \
 +      ste-hrefv60plus-stuib.dtb \
 +      ste-hrefv60plus-tvk.dtb \
        ste-ccu8540.dtb \
        ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 +dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
 +      s3c6410-smdk6410.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        emev2-kzm9d-reference.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a73a4-ape6evm-reference.dtb \
        sh7372-mackerel.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb
 -dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
 +dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
 +      socfpga_cyclone5_socdk.dtb \
 +      socfpga_cyclone5_sockit.dtb \
        socfpga_vt.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
@@@ -255,7 -233,6 +254,7 @@@ dtb-$(CONFIG_ARCH_SUNXI) += 
        sun5i-a13-olinuxino.dtb \
        sun6i-a31-colombus.dtb \
        sun7i-a20-cubieboard2.dtb \
 +      sun7i-a20-cubietruck.dtb \
        sun7i-a20-olinuxino-micro.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
        tegra30-beaver.dtb \
        tegra30-cardhu-a02.dtb \
        tegra30-cardhu-a04.dtb \
 -      tegra114-dalmore.dtb
 +      tegra114-dalmore.dtb \
 +      tegra124-venice2.dtb
  dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
        versatile-pb.dtb
  dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb