]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
arm64: renesas: salvator-common: avoid audio_clkout naming conflict
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 2 Aug 2017 10:26:58 +0000 (10:26 +0000)
committerSimon Horman <horms+renesas@verge.net.au>
Mon, 7 Aug 2017 07:50:10 +0000 (09:50 +0200)
clock name of "audio_clkout" is used by Renesas sound driver.
This duplicated naming breaks its clock registering/unregistering.
Especially, when unbind/bind it can't handle clkout correctly.
This patch renames "audio_clkout" to "audio-clkout" to avoid
naming conflict.

Fixes: 8a8f181d2cfd ("arm64: renesas: salvator-x: use CS2000 as AUDIO_CLK_B")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm64/boot/dts/renesas/salvator-common.dtsi

index a451996f590a5173a3e9dbe56831a623e3c0639a..f903957da504a9e02fa910243b60388dc85ec959 100644 (file)
@@ -45,7 +45,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       audio_clkout: audio_clkout {
+       audio_clkout: audio-clkout {
                /*
                 * This is same as <&rcar_sound 0>
                 * but needed to avoid cs2000/rcar_sound probe dead-lock