diff options
| author | Shawn Xiao <b49994@freescale.com> | 2015-02-02 15:39:51 +0800 |
|---|---|---|
| committer | Octavian Purdila <octavian.purdila@nxp.com> | 2017-02-23 14:21:42 +0200 |
| commit | 446385977bbf9c9981b36700a33ac8c2feebc747 (patch) | |
| tree | 50bc011895aa734a3c3bcacd32ed25b1ce2e68f2 /arch/arm/boot/dts/imx6sx.dtsi | |
| parent | c55b455a5bdc34dfe0e889d01cd10152e0ea05d3 (diff) | |
MGS-1276 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>
Diffstat (limited to 'arch/arm/boot/dts/imx6sx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 9585ae40cb55..833dc5a06cc1 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -1241,6 +1241,11 @@ clocks = <&clks IMX6SX_CLK_I2C4>; status = "disabled"; }; + + qosc: qosc@021fc000 { + compatible = "fsl,imx6sx-qosc"; + reg = <0x021fc000 0x4000>; + }; }; aips3: aips-bus@02200000 { |