From: Markus Pargmann <mpa@pengutronix.de>
Date: Thu, 7 Aug 2014 19:52:38 +0000 (+0200)
Subject: ARM: dts: imx25: remove imx35-sdma compatible
X-Git-Tag: v3.18-rc1~119^2~20^2~46
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0f4290579fe55fd471fb6aa39fd37a44538f7a97;p=~emulex%2Finfiniband.git

ARM: dts: imx25: remove imx35-sdma compatible

The preloaded script addresses on imx25 and imx35 are different, so
imx25 is not compatible with imx35-sdma unless a custom firmware is
loaded.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index c1740396b2c..4d40e550d70 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -453,7 +453,7 @@
 			};
 
 			sdma: sdma@53fd4000 {
-				compatible = "fsl,imx25-sdma", "fsl,imx35-sdma";
+				compatible = "fsl,imx25-sdma";
 				reg = <0x53fd4000 0x4000>;
 				clocks = <&clks 112>, <&clks 68>;
 				clock-names = "ipg", "ahb";