ENGR00306443-2 dts:Add QoS description in imx6sx dts

(cherry-pick from f9759787e60ad3422d2119f9f25ac320ca58f5df)

confilict: arch/arm/boot/dts/imx6sx.dtsi
The dts file arch has changed in 3.14. Add QoS description in
imx6sx dts manually and solve the conflict.

Date Feb 2, 2015

Signed-off-by: Shawn Xiao <b49994@freescale.com>

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index c8559c0afb209352595e2604c2a4902486b8b7ba..2a05307b03334275620c0b2d5d58a3bd6d405ad0 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1224,6 +1224,11 @@
                                clocks = <&clks IMX6SX_CLK_I2C4>;
                                status = "disabled";
                        };
+
+                       qosc: qosc@021fc000 {
+                               compatible = "fsl,imx6sx-qosc";
+                               reg = <0x021fc000 0x4000>;
+                       };
                };
 
                aips3: aips-bus@02200000 {