raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk

Browse Source 
[ Upstream commit 4cb7df64c7 ]

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: Abel Vesa <abel.vesa@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Abel Vesa
2022-01-27 16:10:51 +02:00
committed by Greg Kroah-Hartman
parent c241cfd0a5
commit 14df2556a1
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/imx7-colibri.dtsi
View File

@@ -40,7 +40,7 @@
dailink_master: simple-audio-card,codec { dailink_master: simple-audio-card,codec {
sound-dai = <&codec>; sound-dai = <&codec>;
clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
}; };
}; };
}; };
@@ -293,7 +293,7 @@
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
reg = <0x0a>; reg = <0x0a>;
clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai1_mclk>; pinctrl-0 = <&pinctrl_sai1_mclk>;
VDDA-supply = <&reg_module_3v3_avdd>; VDDA-supply = <&reg_module_3v3_avdd>;

2
arch/arm/boot/dts/imx7-mba7.dtsi
View File

@@ -250,7 +250,7 @@
tlv320aic32x4: audio-codec@18 { tlv320aic32x4: audio-codec@18 {
compatible = "ti,tlv320aic32x4"; compatible = "ti,tlv320aic32x4";
reg = <0x18>; reg = <0x18>;
clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
clock-names = "mclk"; clock-names = "mclk";
ldoin-supply = <&reg_audio_3v3>; ldoin-supply = <&reg_audio_3v3>;
iov-supply = <&reg_audio_3v3>; iov-supply = <&reg_audio_3v3>;

2
arch/arm/boot/dts/imx7d-nitrogen7.dts
View File

@@ -288,7 +288,7 @@
codec: wm8960@1a { codec: wm8960@1a {
compatible = "wlf,wm8960"; compatible = "wlf,wm8960";
reg = <0x1a>; reg = <0x1a>;
clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
clock-names = "mclk"; clock-names = "mclk";
wlf,shared-lrclk; wlf,shared-lrclk;
}; };

4
arch/arm/boot/dts/imx7d-pico-hobbit.dts
View File

@@ -31,7 +31,7 @@
dailink_master: simple-audio-card,codec { dailink_master: simple-audio-card,codec {
sound-dai = <&sgtl5000>; 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>; #sound-dai-cells = <0>;
reg = <0x0a>; reg = <0x0a>;
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
VDDA-supply = <&reg_2p5v>; VDDA-supply = <&reg_2p5v>;
VDDIO-supply = <&reg_vref_1v8>; VDDIO-supply = <&reg_vref_1v8>;
}; };

4
arch/arm/boot/dts/imx7d-pico-pi.dts
View File

@@ -31,7 +31,7 @@
dailink_master: simple-audio-card,codec { dailink_master: simple-audio-card,codec {
sound-dai = <&sgtl5000>; 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>; #sound-dai-cells = <0>;
reg = <0x0a>; reg = <0x0a>;
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
VDDA-supply = <&reg_2p5v>; VDDA-supply = <&reg_2p5v>;
VDDIO-supply = <&reg_vref_1v8>; VDDIO-supply = <&reg_vref_1v8>;
}; };

4
arch/arm/boot/dts/imx7d-sdb.dts
View File

@@ -378,14 +378,14 @@
codec: wm8960@1a { codec: wm8960@1a {
compatible = "wlf,wm8960"; compatible = "wlf,wm8960";
reg = <0x1a>; reg = <0x1a>;
clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
clock-names = "mclk"; clock-names = "mclk";
wlf,shared-lrclk; wlf,shared-lrclk;
wlf,hp-cfg = <2 2 3>; wlf,hp-cfg = <2 2 3>;
wlf,gpio-cfg = <1 3>; wlf,gpio-cfg = <1 3>;
assigned-clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_SRC>, assigned-clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_SRC>,
<&clks IMX7D_PLL_AUDIO_POST_DIV>, <&clks IMX7D_PLL_AUDIO_POST_DIV>,
<&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>;
assigned-clock-rates = <0>, <884736000>, <12288000>; assigned-clock-rates = <0>, <884736000>, <12288000>;
}; };

4
arch/arm/boot/dts/imx7s-warp.dts
View File

@@ -75,7 +75,7 @@
dailink_master: simple-audio-card,codec { dailink_master: simple-audio-card,codec {
sound-dai = <&codec>; sound-dai = <&codec>;
clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
}; };
}; };
}; };
@@ -232,7 +232,7 @@
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
reg = <0x0a>; reg = <0x0a>;
compatible = "fsl,sgtl5000"; compatible = "fsl,sgtl5000";
clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai1_mclk>; pinctrl-0 = <&pinctrl_sai1_mclk>;
VDDA-supply = <&vgen4_reg>; VDDA-supply = <&vgen4_reg>;