From: Olof Johansson <olof@lixom.net>
Date: Mon, 26 Nov 2012 07:26:53 +0000 (-0800)
Subject: Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
X-Git-Tag: firefly_0821_release~3680^2~1479^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8d2282a77bf0977e7033d8ea5970f369bc28f0f0;p=firefly-linux-kernel-4.4.55.git

Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

From Shawn Guo:
They are a few mxs dts updates coming a little bit late.  I'm sending
them as the second mxs/dt pull request for 3.8.  Please consider to
pull.

* tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: mxs: add oled support for the cfa-10036
  ARM: mxs: Add SchulerControl SPS1 DTS file
  ARM: imx23-olinuxino: Add spi support
---

8d2282a77bf0977e7033d8ea5970f369bc28f0f0
diff --cc arch/arm/boot/dts/Makefile
index e1e2a6d119f2,73f0a61a8d1c..83faa72dc176
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -67,9 -61,9 +67,10 @@@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dt
  	imx28-cfa10049.dtb \
  	imx28-evk.dtb \
  	imx28-m28evk.dtb \
+ 	imx28-sps1.dtb \
  	imx28-tx28.dtb
  dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 +	omap3-beagle.dtb \
  	omap3-beagle-xm.dtb \
  	omap3-evm.dtb \
  	omap3-tobi.dtb \