]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'tegra/dt' into next/dt
authorKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 23:02:36 +0000 (16:02 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 23:02:51 +0000 (16:02 -0700)
From Stephen Warren:
* tegra/dt:
  ARM: tegra: Use symbolic names for gr3d clocks
  ARM: tegra: Mark Tegra30 display controller compatible with Tegra20
  ARM: tegra: add GPIO controller to tegra124.dtsi
  ARM: tegra: enable LP1 suspend mode for Venice2
  ARM: tegra: enable Tegra RTC as default for Tegra124
  ARM: tegra: add Venice2 board support
  ARM: tegra: Add initial device tree for Tegra124
  ARM: tegra: add vcc supply for nct1008 to Cardhu
  ARM: tegra: add DT entry for nct1008 to Dalmore
  ARM: tegra: use dt-binding header for key code
  ARM: tegra: add palmas pincontrol to Dalmore device tree

Signed-off-by: Kevin Hilman <khilman@linaro.org>
1  2 
arch/arm/boot/dts/Makefile

index 56c7d82e5b8d254060997c0bf48e17576a25c60f,817638b6707041fe03235af2d3e31bb13b768274..e1f8d9840a48a9c21afdae513fe84bf9c5c956ac
@@@ -41,8 -41,6 +41,8 @@@ dtb-$(CONFIG_ARCH_AT91)       += sama5d33ek.d
  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 \
        bcm28155-ap.dtb
@@@ -51,7 -49,6 +51,7 @@@ dtb-$(CONFIG_ARCH_DAVINCI) += da850-enb
  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 +113,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 \
@@@ -174,9 -170,7 +174,9 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        omap3-devkit8000.dtb \
        omap3-beagle-xm.dtb \
        omap3-evm.dtb \
 +      omap3-n900.dtb \
        omap3-tobi.dtb \
 +      omap3-gta04.dtb \
        omap3-igep0020.dtb \
        omap3-igep0030.dtb \
        omap4-panda.dtb \
        am335x-evm.dtb \
        am335x-evmsk.dtb \
        am335x-bone.dtb \
 +      am335x-boneblack.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
@@@ -261,7 -246,8 +261,8 @@@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-har
        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