Merge tag 'atlas7-init-dts-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel...

Merge "CSR atlas7 init dts for 3.20" from Barry Song:

Drop Marco and add init dts stuff for Atlas7

CSR Marco SoC has never shipped to customers that could be interested
in mainline support. and new Atlas7 is a replacement SoC that is in
development.

So we drop Marco dts stuff, and add dts stuff for Atlas7.

* tag 'atlas7-init-dts-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
  ARM: dts: add init dts file for CSR atlas7 SoC
  ARM: dts: drop MARCO platform DT stuff

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/boot/dts/Makefile
index 43ae1918c1f58509bc0ac0d5d9ba48cc1d71f4c8,0048cb16370f69953ce29b06a382a590d9079f7e..311691b4a846aa1fc87cb48569ff3d13f9036d90
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -51,13 -51,11 +51,15 @@@ dtb-$(CONFIG_ARCH_AT91)    += sama5d36ek.d
  # sama5d4
  dtb-$(CONFIG_ARCH_AT91)       += at91-sama5d4ek.dtb
  
 -dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
 -dtb-$(CONFIG_ARCH_ATLAS7) += atlas7-evb.dtb
 -dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b-plus.dtb
 +dtb-$(CONFIG_ARCH_ATLAS6) += \
 +      atlas6-evb.dtb
++dtb-$(CONFIG_ARCH_ATLAS7) += \
++      atlas7-evb.dtb
 +dtb-$(CONFIG_ARCH_AXXIA) += \
 +      axm5516-amarillo.dtb
 +dtb-$(CONFIG_ARCH_BCM2835) += \
 +      bcm2835-rpi-b.dtb \
 +      bcm2835-rpi-b-plus.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-buffalo-wzr-1750dhp.dtb \
        bcm4708-netgear-r6250.dtb \
@@@ -193,22 -175,15 +195,20 @@@ dtb-$(CONFIG_MACH_KIRKWOOD) += 
        kirkwood-ts219-6282.dtb \
        kirkwood-ts419-6281.dtb \
        kirkwood-ts419-6282.dtb
 -dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
 -dtb-$(CONFIG_MACH_MESON6) += meson6-atv1200.dtb
 -dtb-$(CONFIG_ARCH_MMP) += pxa168-aspenite.dtb \
 +dtb-$(CONFIG_ARCH_LPC32XX) += \
 +      ea3250.dtb phy3250.dtb
- dtb-$(CONFIG_ARCH_MARCO) += \
-       marco-evb.dtb
 +dtb-$(CONFIG_MACH_MESON6) += \
 +      meson6-atv1200.dtb
 +dtb-$(CONFIG_ARCH_MMP) += \
 +      pxa168-aspenite.dtb \
        pxa910-dkb.dtb \
        mmp2-brownstone.dtb
 -dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
 -dtb-$(CONFIG_ARCH_MXC) += \
 +dtb-$(CONFIG_ARCH_MOXART) += \
 +      moxart-uc7112lx.dtb
 +dtb-$(CONFIG_SOC_IMX1) += \
        imx1-ads.dtb \
 -      imx1-apf9328.dtb \
 +      imx1-apf9328.dtb
 +dtb-$(CONFIG_SOC_IMX25) += \
        imx25-eukrea-mbimxsd25-baseboard.dtb \
        imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dtb \
        imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dtb \