Commit 192b4bcb authored by Kevin Hilman's avatar Kevin Hilman Committed by Olof Johansson

Merge tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

The imx fixes for 3.13, part 2:
 - Disable S/PDIF "rxtx5" clock option to fix the clocksource breakage
   introduced by S/PDIF driver

* tag 'imx-fixes-3.13-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: imx6qdl: disable spdif "rxtx5" clock option
Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c61248af 793b4b10
...@@ -161,7 +161,7 @@ spdif: spdif@02004000 { ...@@ -161,7 +161,7 @@ spdif: spdif@02004000 {
clocks = <&clks 197>, <&clks 3>, clocks = <&clks 197>, <&clks 3>,
<&clks 197>, <&clks 107>, <&clks 197>, <&clks 107>,
<&clks 0>, <&clks 118>, <&clks 0>, <&clks 118>,
<&clks 62>, <&clks 139>, <&clks 0>, <&clks 139>,
<&clks 0>; <&clks 0>;
clock-names = "core", "rxtx0", clock-names = "core", "rxtx0",
"rxtx1", "rxtx2", "rxtx1", "rxtx2",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment