]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge tag 'realview-base-armsoc-2-tag' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 23:04:26 +0000 (00:04 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 15 Dec 2015 23:04:26 +0000 (00:04 +0100)
Merge "Realview DT files" from Linus Walleij:

The device tree changes for the continued RealView DT
support.

* tag 'realview-base-armsoc-2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: add device tree for PB11MPCore
  clk: add ARM syscon ICST device tree bindings
  ARM: add DT bindings for the ARM11MPCore CPU cluster

1  2 
arch/arm/boot/dts/Makefile

index d6bdf1ff12f171a63c08f779feab03fc74469d05,e66743bb3bff4145ad82bf3ae155f3e5554e5fa8..ceb3c559b78a3f20b57d1dd0f46ae582a509b3c4
@@@ -519,9 -510,9 +519,10 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-sony-xperia-honami.dtb
  dtb-$(CONFIG_ARCH_REALVIEW) += \
-       arm-realview-pb1176.dtb
+       arm-realview-pb1176.dtb \
+       arm-realview-pb11mp.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 +      rk3036-evb.dtb \
        rk3066a-bqcurie2.dtb \
        rk3066a-marsboard.dtb \
        rk3066a-rayeager.dtb \