diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts index e90995b4b6d7..9030088ca411 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301.dts @@ -1144,8 +1144,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1>; clock-names = "gate", @@ -1242,7 +1242,7 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_TOVAD - &clkc CLKID_FCLK_DIV5 + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_VAD>; clock-names = "gate", "pll", "clk"; @@ -1278,8 +1278,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1 &clkc CLKID_MPLL0 @@ -1333,8 +1333,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1 &clkc CLKID_MPLL0 diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts index ee1978c645ee..39e7bc0e78e4 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts @@ -1709,8 +1709,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1>; clock-names = "gate", @@ -1813,7 +1813,7 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_TOVAD - &clkc CLKID_FCLK_DIV5 + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_VAD>; clock-names = "gate", "pll", "clk"; @@ -1849,8 +1849,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1 &clkc CLKID_MPLL0 @@ -1904,8 +1904,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1 &clkc CLKID_MPLL0 diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts index d4e0a5de7726..d60b0c062c46 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts @@ -1517,8 +1517,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1>; clock-names = "gate", @@ -1621,7 +1621,7 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_TOVAD - &clkc CLKID_FCLK_DIV5 + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_VAD>; clock-names = "gate", "pll", "clk"; @@ -1657,8 +1657,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1 &clkc CLKID_MPLL0 @@ -1712,8 +1712,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1 &clkc CLKID_MPLL0 diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts index fdf8be5c06df..aaa2caffcafc 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts @@ -1511,8 +1511,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1>; clock-names = "gate", @@ -1616,7 +1616,7 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_TOVAD - &clkc CLKID_FCLK_DIV5 + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_VAD>; clock-names = "gate", "pll", "clk"; @@ -1652,8 +1652,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1 &clkc CLKID_MPLL0 @@ -1707,8 +1707,8 @@ #sound-dai-cells = <0>; clocks = <&clkaudio CLKID_AUDIO_GATE_PDM - &clkc CLKID_FCLK_DIV3 - &clkc CLKID_MPLL3 + &clkc CLKID_HIFI_PLL + &clkc CLKID_HIFI_PLL &clkaudio CLKID_AUDIO_PDMIN0 &clkaudio CLKID_AUDIO_PDMIN1 &clkc CLKID_MPLL0 diff --git a/sound/soc/amlogic/auge/vad.c b/sound/soc/amlogic/auge/vad.c index 2ec98d714711..85c0338be771 100644 --- a/sound/soc/amlogic/auge/vad.c +++ b/sound/soc/amlogic/auge/vad.c @@ -433,6 +433,7 @@ static int vad_set_clks(struct vad *p_vad, bool enable) /* enable clock gate */ ret = clk_prepare_enable(p_vad->gate); + clk_set_rate(p_vad->pll, 25000000); /* enable clock */ ret = clk_prepare_enable(p_vad->pll); if (ret) {