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,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Sanyog Kale <sanyog.r.kale@intel.com>
Subject: [PATCH 3/6] soundwire: intel: add helper for initialization
Date: Tue, 13 Aug 2019 16:32:23 -0500 [thread overview]
Message-ID: <20190813213227.5163-4-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190813213227.5163-1-pierre-louis.bossart@linux.intel.com>
Move code to helper for reuse in power management routines
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
drivers/soundwire/intel.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 5f14c6acce80..3d22c9023a9b 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -993,6 +993,15 @@ static struct sdw_master_ops sdw_intel_ops = {
.post_bank_switch = intel_post_bank_switch,
};
+static int intel_init(struct sdw_intel *sdw)
+{
+ /* Initialize shim and controller */
+ intel_link_power_up(sdw);
+ intel_shim_init(sdw);
+
+ return sdw_cdns_init(&sdw->cdns);
+}
+
/*
* probe and init
*/
@@ -1035,11 +1044,8 @@ static int intel_probe(struct platform_device *pdev)
return 0;
}
- /* Initialize shim and controller */
- intel_link_power_up(sdw);
- intel_shim_init(sdw);
-
- ret = sdw_cdns_init(&sdw->cdns);
+ /* Initialize shim, controller and Cadence IP */
+ ret = intel_init(sdw);
if (ret)
goto err_init;
--
2.20.1
next prev parent reply other threads:[~2019-08-13 21:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 21:32 [PATCH 0/6] soundwire: inits and PM additions for 5.4 Pierre-Louis Bossart
2019-08-13 21:32 ` [PATCH 1/6] soundwire: fix startup sequence for Intel/Cadence Pierre-Louis Bossart
2019-09-04 7:11 ` [alsa-devel] " Vinod Koul
2019-09-04 13:16 ` Pierre-Louis Bossart
2019-09-16 18:14 ` Pierre-Louis Bossart
2019-08-13 21:32 ` [PATCH 2/6] soundwire: cadence_master: add hw_reset capability in debugfs Pierre-Louis Bossart
2019-09-04 7:13 ` [alsa-devel] " Vinod Koul
2019-09-04 13:18 ` Pierre-Louis Bossart
2019-09-04 16:49 ` Vinod Koul
2019-09-04 17:43 ` Pierre-Louis Bossart
2019-08-13 21:32 ` Pierre-Louis Bossart [this message]
2019-08-13 21:32 ` [PATCH 4/6] soundwire: intel: Add basic power management support Pierre-Louis Bossart
2019-08-13 21:32 ` [PATCH 5/6] soundwire: cadence_master: make clock stop exit configurable on init Pierre-Louis Bossart
2019-08-13 21:32 ` [PATCH 6/6] soundwire: intel: add pm_runtime support Pierre-Louis Bossart
2019-08-21 19:23 ` [alsa-devel] [PATCH 0/6] soundwire: inits and PM additions for 5.4 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=20190813213227.5163-4-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=jank@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sanyog.r.kale@intel.com \
--cc=slawomir.blauciak@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.de \
--cc=vkoul@kernel.org \
/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: link
Be 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).