summaryrefslogtreecommitdiff
path: root/drivers/soundwire
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2020-03-17 19:33:27 +0300
committerVinod Koul <vkoul@kernel.org>2020-03-19 10:13:04 +0300
commitb17350e4037257d25f1ca9772ba5daced9f1bf07 (patch)
treeea46c67fd926f4ff0fffa3f520cf31dbd9c34619 /drivers/soundwire
parentad473db4ec8d5502e35d78a034a92a520afb9964 (diff)
downloadlinux-b17350e4037257d25f1ca9772ba5daced9f1bf07.tar.xz
soundwire: cadence: commit changes in the exit_reset() sequence
Follow recommended flows, the BUS_RESET must be programmed before the UPDATE_CONFIG. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20200317163329.25501-16-pierre-louis.bossart@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/soundwire')
-rw-r--r--drivers/soundwire/cadence_master.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index c9fdd4deb4f5..55cf219cc908 100644
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -1074,7 +1074,6 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns)
int sdw_cdns_init(struct sdw_cdns *cdns)
{
u32 val;
- int ret;
cdns_init_clock_ctrl(cdns);
@@ -1113,8 +1112,8 @@ int sdw_cdns_init(struct sdw_cdns *cdns)
cdns_writel(cdns, CDNS_MCP_CONFIG, val);
- /* commit changes */
- return cdns_config_update(cdns);
+ /* changes will be committed later */
+ return 0;
}
EXPORT_SYMBOL(sdw_cdns_init);