diff options
| author | Shawn Xiao <b49994@freescale.com> | 2015-02-02 15:39:51 +0800 |
|---|---|---|
| committer | Shawn Xiao <b49994@freescale.com> | 2015-02-02 15:57:01 +0800 |
| commit | 3a4ac722a1b6755cda43dba778cfd59497842ed2 (patch) | |
| tree | b11ebf33ec16f9413147e42928acf57b4ffb4369 /arch/arm/boot/dts | |
| parent | 476522a115f56ab9ea6a4755c488bbf0e3721ed2 (diff) | |
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')
| -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 c8559c0afb20..2a05307b0333 100644 --- 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 { |