Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/boot/dts/imx6qdl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 
					clocks = <&clks 197>, <&clks 3>,

						 <&clks 197>, <&clks 107>,

						 <&clks 0>,   <&clks 118>,

						 <&clks 62>,  <&clks 139>,

						 <&clks 0>,  <&clks 139>,

						 <&clks 0>;

					clock-names = "core",  "rxtx0",

						      "rxtx1", "rxtx2",