Unverified Commit cc5c9788 authored by Derek Fang's avatar Derek Fang Committed by Mark Brown
Browse files

ASoC: rt5682: Register wclk with its parent_hws instead of parent_data 



The mclk might not be registered as a fixed clk name "mclk" on some
platforms.
In those platforms, if the mclk needed to be controlled by codec driver
and acquired by a fixed name, it would be a problem.

This patch to fix the issue that wclk becomes an orphan due to the fixed
mclk's name.

Signed-off-by: default avatarDerek Fang <derek.fang@realtek.com>
Link: https://lore.kernel.org/r/20211227055446.27563-1-derek.fang@realtek.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c5ab93e2

sound/soc/codecs/rt5682.c

+2 −5
Original line number Diff line number Diff line
@@ -2858,7 +2858,6 @@ int rt5682_register_dai_clks(struct rt5682_priv *rt5682) 


	for (i = 0; i < RT5682_DAI_NUM_CLKS; ++i) {

		struct clk_init_data init = { };

		struct clk_parent_data parent_data;

		const struct clk_hw *parent;



		dai_clk_hw = &rt5682->dai_clks_hw[i];
@@ -2867,10 +2866,8 @@ int rt5682_register_dai_clks(struct rt5682_priv *rt5682) 
		case RT5682_DAI_WCLK_IDX:

			/* Make MCLK the parent of WCLK */

			if (rt5682->mclk) {

				parent_data = (struct clk_parent_data){

					.fw_name = "mclk",

				};

				init.parent_data = &parent_data;

				parent = __clk_get_hw(rt5682->mclk);

				init.parent_hws = &parent;

				init.num_parents = 1;

			}

			break;