LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> To: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org, vkoul@kernel.org, gregkh@linuxfoundation.org, jank@cadence.com, srinivas.kandagatla@linaro.org, slawomir.blauciak@intel.com, Bard liao <yung-chuan.liao@linux.intel.com>, Rander Wang <rander.wang@linux.intel.com>, Ranjani Sridharan <ranjani.sridharan@linux.intel.com>, Hui Wang <hui.wang@canonical.com>, Rander Wang <rander.wang@intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Sanyog Kale <sanyog.r.kale@intel.com> Subject: [PATCH 02/16] soundwire: cadence: simplifiy cdns_init() Date: Wed, 11 Mar 2020 13:41:14 -0500 [thread overview] Message-ID: <20200311184128.4212-3-pierre-louis.bossart@linux.intel.com> (raw) In-Reply-To: <20200311184128.4212-1-pierre-louis.bossart@linux.intel.com> From: Rander Wang <rander.wang@intel.com> There is no need for the clock_stop_exit argument with the latest implementation Signed-off-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- drivers/soundwire/cadence_master.c | 12 +----------- drivers/soundwire/cadence_master.h | 2 +- drivers/soundwire/intel.c | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index a1a889d1d7dc..941809ea00a8 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -1018,22 +1018,12 @@ static u32 cdns_set_initial_frame_shape(int n_rows, int n_cols) * sdw_cdns_init() - Cadence initialization * @cdns: Cadence instance */ -int sdw_cdns_init(struct sdw_cdns *cdns, bool clock_stop_exit) +int sdw_cdns_init(struct sdw_cdns *cdns) { struct sdw_bus *bus = &cdns->bus; struct sdw_master_prop *prop = &bus->prop; u32 val; int divider; - int ret; - - if (clock_stop_exit) { - ret = cdns_clear_bit(cdns, CDNS_MCP_CONTROL, - CDNS_MCP_CONTROL_CLK_STOP_CLR); - if (ret < 0) { - dev_err(cdns->dev, "Couldn't exit from clock stop\n"); - return ret; - } - } /* Set clock divider */ divider = (prop->mclk_freq / prop->max_clk_freq) - 1; diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h index 2de1b2493ffc..44e802bba702 100644 --- a/drivers/soundwire/cadence_master.h +++ b/drivers/soundwire/cadence_master.h @@ -138,7 +138,7 @@ extern struct sdw_master_ops sdw_cdns_master_ops; irqreturn_t sdw_cdns_irq(int irq, void *dev_id); irqreturn_t sdw_cdns_thread(int irq, void *dev_id); -int sdw_cdns_init(struct sdw_cdns *cdns, bool clock_stop_exit); +int sdw_cdns_init(struct sdw_cdns *cdns); int sdw_cdns_pdi_init(struct sdw_cdns *cdns, struct sdw_cdns_stream_config config); int sdw_cdns_exit_reset(struct sdw_cdns *cdns); diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index a327669c757b..3c83e76c6bf9 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -1077,7 +1077,7 @@ static int intel_init(struct sdw_intel *sdw) intel_link_power_up(sdw); intel_shim_init(sdw); - return sdw_cdns_init(&sdw->cdns, false); + return sdw_cdns_init(&sdw->cdns); } /* -- 2.20.1
next prev parent reply other threads:[~2020-03-11 18:41 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-11 18:41 [PATCH 00/16] SoundWire: cadence: add clock stop and fix programming sequences Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 01/16] soundwire: cadence: s/update_config/config_update Pierre-Louis Bossart 2020-03-11 18:41 ` Pierre-Louis Bossart [this message] 2020-03-11 18:41 ` [PATCH 03/16] soundwire: cadence: add interface to check clock status Pierre-Louis Bossart 2020-03-13 12:06 ` Vinod Koul 2020-03-13 16:31 ` Pierre-Louis Bossart 2020-03-14 9:50 ` Vinod Koul 2020-03-11 18:41 ` [PATCH 04/16] soundwire: cadence: handle error cases with CONFIG_UPDATE Pierre-Louis Bossart 2020-03-13 12:08 ` Vinod Koul 2020-03-13 17:09 ` Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 05/16] soundwire: cadence: add clock_stop/restart routines Pierre-Louis Bossart 2020-03-13 12:21 ` Vinod Koul 2020-03-13 17:07 ` Pierre-Louis Bossart 2020-03-14 9:52 ` Vinod Koul 2020-03-11 18:41 ` [PATCH 06/16] soundwire: cadence: fix a io timeout issue in S3 test Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 07/16] soundwire: cadence: mask Slave interrupt before stopping clock Pierre-Louis Bossart 2020-03-13 12:24 ` Vinod Koul 2020-03-13 16:33 ` Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 08/16] soundwire: cadence: merge routines to clear/set bits Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 09/16] soundwire: cadence: move clock/SSP related inits to dedicated function Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 10/16] soundwire: cadence: make SSP interval programmable Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 11/16] soundwire: cadence: reorder MCP_CONFIG settings Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 12/16] soundwire: cadence: enable NORMAL operation in cdns_init() Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 13/16] soundwire: cadence: remove PREQ_DELAY assignment Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 14/16] soundwire: cadence: remove automatic command retries Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 15/16] soundwire: cadence: commit changes in the exit_reset() sequence Pierre-Louis Bossart 2020-03-11 18:41 ` [PATCH 16/16] soundwire: cadence: multi-link support Pierre-Louis Bossart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200311184128.4212-3-pierre-louis.bossart@linux.intel.com \ --to=pierre-louis.bossart@linux.intel.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=hui.wang@canonical.com \ --cc=jank@cadence.com \ --cc=linux-kernel@vger.kernel.org \ --cc=rander.wang@intel.com \ --cc=rander.wang@linux.intel.com \ --cc=ranjani.sridharan@linux.intel.com \ --cc=sanyog.r.kale@intel.com \ --cc=slawomir.blauciak@intel.com \ --cc=srinivas.kandagatla@linaro.org \ --cc=tiwai@suse.de \ --cc=vkoul@kernel.org \ --cc=yung-chuan.liao@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).