Unverified Commit 6ab18105 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: rt5682-sdw: make regmap cache-only in probe 



The RT5682 needs specific attention: there are two regmap in
rt5682_priv struct, one is sdw_regmap which is for IO transfer, and
the other is used for registers control.

We need to set both regmaps when we set cache only. Because if we set
rt5682->sdw_regmap only, rt5682->regmap won't set/get the right value
when it call regmap_write/read(rt5682->sdw_regmap, ...). If we set
rt5682->regmap only, regmap_write(rt5682->sdw_regmap, ...) is used
in rt5682_clock_config which will be called by the ..bus_config ops.

Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230802153629.53576-4-pierre-louis.bossart@linux.intel.com


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

sound/soc/codecs/rt5682-sdw.c

+10 −5
Original line number Diff line number Diff line
@@ -322,6 +322,9 @@ static int rt5682_sdw_init(struct device *dev, struct regmap *regmap, 
		return ret;

	}



	regcache_cache_only(rt5682->sdw_regmap, true);

	regcache_cache_only(rt5682->regmap, true);



	/*

	 * Mark hw_init to false

	 * HW init will be performed when device reports present
@@ -352,6 +355,11 @@ static int rt5682_io_init(struct device *dev, struct sdw_slave *slave) 
	if (rt5682->hw_init)

		return 0;



	regcache_cache_only(rt5682->sdw_regmap, false);

	regcache_cache_only(rt5682->regmap, false);

	if (rt5682->first_hw_init)

		regcache_cache_bypass(rt5682->regmap, true);



	/*

	 * PM runtime is only enabled when a Slave reports as Attached

	 */
@@ -371,11 +379,6 @@ static int rt5682_io_init(struct device *dev, struct sdw_slave *slave) 


	pm_runtime_get_noresume(&slave->dev);



	if (rt5682->first_hw_init) {

		regcache_cache_only(rt5682->regmap, false);

		regcache_cache_bypass(rt5682->regmap, true);

	}



	while (loop > 0) {

		regmap_read(rt5682->regmap, RT5682_DEVICE_ID, &val);

		if (val == DEVICE_ID)
@@ -705,6 +708,7 @@ static int __maybe_unused rt5682_dev_suspend(struct device *dev) 


	cancel_delayed_work_sync(&rt5682->jack_detect_work);



	regcache_cache_only(rt5682->sdw_regmap, true);

	regcache_cache_only(rt5682->regmap, true);

	regcache_mark_dirty(rt5682->regmap);
@@ -769,6 +773,7 @@ static int __maybe_unused rt5682_dev_resume(struct device *dev) 


regmap_sync:

	slave->unattach_request = 0;

	regcache_cache_only(rt5682->sdw_regmap, false);

	regcache_cache_only(rt5682->regmap, false);

	regcache_sync(rt5682->regmap);