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

Commit 060f38b1 authored by Abel Vesa's avatar Abel Vesa Committed by Greg Kroah-Hartman
Browse files

ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk 



commit 4cb7df64c732b2b9918424095c11660c2a8c4a33 upstream.

The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790),
but according to the reference manual, there is no such gate. Moreover,
the consumer driver of the mentioned clock might gate it and leave
the ECSPI2 (the true owner of that gate) hanging. So lets use the
audio_mclk_post_div, which is the parent.

Signed-off-by: default avatarAbel Vesa <abel.vesa@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
[ps: backport to 5.4]
Signed-off-by: default avatarPhilippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b38cf3cb

arch/arm/boot/dts/imx7-colibri.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 


		dailink_master: simple-audio-card,codec {

			sound-dai = <&codec>;

			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;

			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;

		};

	};

};
@@ -152,7 +152,7 @@ 
		compatible = "fsl,sgtl5000";

		#sound-dai-cells = <0>;

		reg = <0x0a>;

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_sai1_mclk>;

		VDDA-supply = <&reg_module_3v3_avdd>;

arch/arm/boot/dts/imx7-mba7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ 
	tlv320aic32x4: audio-codec@18 {

		compatible = "ti,tlv320aic32x4";

		reg = <0x18>;

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;

		clock-names = "mclk";

		ldoin-supply = <&reg_audio_3v3>;

		iov-supply = <&reg_audio_3v3>;

arch/arm/boot/dts/imx7d-nitrogen7.dts

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ 
	codec: wm8960@1a {

		compatible = "wlf,wm8960";

		reg = <0x1a>;

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;

		clock-names = "mclk";

		wlf,shared-lrclk;

	};

arch/arm/boot/dts/imx7d-pico-hobbit.dts

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


		dailink_master: simple-audio-card,codec {

			sound-dai = <&sgtl5000>;

			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;

			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;

		};

	};

};
@@ -41,7 +41,7 @@ 
		#sound-dai-cells = <0>;

		reg = <0x0a>;

		compatible = "fsl,sgtl5000";

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_vref_1v8>;

	};

arch/arm/boot/dts/imx7d-pico-pi.dts

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


		dailink_master: simple-audio-card,codec {

			sound-dai = <&sgtl5000>;

			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;

			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;

		};

	};

};
@@ -41,7 +41,7 @@ 
		#sound-dai-cells = <0>;

		reg = <0x0a>;

		compatible = "fsl,sgtl5000";

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;

		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_vref_1v8>;

	};