diff mbox

ARM: dts: imx6qdl: disable spdif "rxtx5" clock option

Message ID 1384614847-22905-1-git-send-email-shawn.guo@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Shawn Guo Nov. 16, 2013, 3:14 p.m. UTC
The spdif "rxtx5" clock option is being set to ipg clk (62) by mistake.
This causes an incorrect time keeping when spdif driver is running,
because ipg is ancestor clock for clocksource while spdif driver will
change the rate of this clock in certain circumstance.  Before the
correct clock for "rxtx5" option can be supplied, let's disable this
option for now by filling a dummy clock for it.

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/boot/dts/imx6qdl.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Russell King - ARM Linux Nov. 16, 2013, 3:13 p.m. UTC | #1
On Sat, Nov 16, 2013 at 11:14:07PM +0800, Shawn Guo wrote:
> The spdif "rxtx5" clock option is being set to ipg clk (62) by mistake.
> This causes an incorrect time keeping when spdif driver is running,
> because ipg is ancestor clock for clocksource while spdif driver will
> change the rate of this clock in certain circumstance.  Before the
> correct clock for "rxtx5" option can be supplied, let's disable this
> option for now by filling a dummy clock for it.

Strangely, this looks exactly like the change I made here :)

Thanks Shawn.
Shawn Guo Nov. 16, 2013, 3:28 p.m. UTC | #2
On Sat, Nov 16, 2013 at 03:13:31PM +0000, Russell King - ARM Linux wrote:
> On Sat, Nov 16, 2013 at 11:14:07PM +0800, Shawn Guo wrote:
> > The spdif "rxtx5" clock option is being set to ipg clk (62) by mistake.
> > This causes an incorrect time keeping when spdif driver is running,
> > because ipg is ancestor clock for clocksource while spdif driver will
> > change the rate of this clock in certain circumstance.  Before the
> > correct clock for "rxtx5" option can be supplied, let's disable this
> > option for now by filling a dummy clock for it.
> 
> Strangely, this looks exactly like the change I made here :)

Yeah, I tried very hard to find a different quick fix from the one in
your bug report, but failed :)  I should mention it's your change.

Shawn
diff mbox

Patch

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index dcab03b..056b46b 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -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",