summaryrefslogtreecommitdiffstats
path: root/drivers/soundwire/cadence_master.c
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2020-03-17 17:33:13 +0100
committerVinod Koul <vkoul@kernel.org>2020-03-19 08:13:03 +0100
commitce1acf019fe192d735db8af4013d83d106e7938f (patch)
treed4fe646a8b64dc0966af1c5efe484776e2154133 /drivers/soundwire/cadence_master.c
parentsoundwire: stream: use sdw_write instead of update (diff)
downloadlinux-ce1acf019fe192d735db8af4013d83d106e7938f.tar.xz
linux-ce1acf019fe192d735db8af4013d83d106e7938f.zip
soundwire: cadence: s/update_config/config_update
Somehow we inverted the two, align with register definition to avoid further confusion. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20200317163329.25501-2-pierre-louis.bossart@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/soundwire/cadence_master.c')
-rw-r--r--drivers/soundwire/cadence_master.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index 9bec270d0fa4..a1a889d1d7dc 100644
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -235,7 +235,7 @@ static int cdns_clear_bit(struct sdw_cdns *cdns, int offset, u32 value)
* all changes to the MCP_CONFIG, MCP_CONTROL, MCP_CMDCTRL and MCP_PHYCTRL
* need to be confirmed with a write to MCP_CONFIG_UPDATE
*/
-static int cdns_update_config(struct sdw_cdns *cdns)
+static int cdns_config_update(struct sdw_cdns *cdns)
{
int ret;
@@ -838,7 +838,7 @@ int sdw_cdns_exit_reset(struct sdw_cdns *cdns)
CDNS_MCP_CONFIG_OP_NORMAL);
/* commit changes */
- return cdns_update_config(cdns);
+ return cdns_config_update(cdns);
}
EXPORT_SYMBOL(sdw_cdns_exit_reset);
@@ -1084,7 +1084,7 @@ int sdw_cdns_init(struct sdw_cdns *cdns, bool clock_stop_exit)
cdns_writel(cdns, CDNS_MCP_CONFIG, val);
/* commit changes */
- return cdns_update_config(cdns);
+ return cdns_config_update(cdns);
}
EXPORT_SYMBOL(sdw_cdns_init);