]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
soundwire: cadence_master: remove config update for interrupt setting
authorRander Wang <rander.wang@intel.com>
Fri, 10 Jan 2020 21:57:29 +0000 (15:57 -0600)
committerVinod Koul <vkoul@kernel.org>
Tue, 14 Jan 2020 06:23:12 +0000 (11:53 +0530)
Config only needs to be updated when setting MCP_Config, MCP_Control
and MCP_CmdCtrl to make these register setting effective. When updating
config in master, master will communicate with slave to update status.
Communication will be failed when masters and slaves are in clock stop
state, and this unnecessary config update makes interrupt setting failed.

Tested on Comet Lake with soundwire enabled

Signed-off-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200110215731.30747-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/soundwire/cadence_master.c

index 6ef2f759310d41f00a5e27a7db2d456fc3f48b44..19b4862e8cceeed047bdbd8f158e953d3a698617 100644 (file)
@@ -820,7 +820,7 @@ int sdw_cdns_exit_reset(struct sdw_cdns *cdns)
 EXPORT_SYMBOL(sdw_cdns_exit_reset);
 
 /**
- * sdw_cdns_enable_interrupt() - Enable SDW interrupts and update config
+ * sdw_cdns_enable_interrupt() - Enable SDW interrupts
  * @cdns: Cadence instance
  */
 int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns, bool state)
@@ -871,8 +871,7 @@ update_masks:
        cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK1, slave_intmask1);
        cdns_writel(cdns, CDNS_MCP_INTMASK, mask);
 
-       /* commit changes */
-       return cdns_update_config(cdns);
+       return 0;
 }
 EXPORT_SYMBOL(sdw_cdns_enable_interrupt);