From: Jonathan Marek <jonathan@marek.ca>
To: linux-arm-msm@vger.kernel.org
Cc: Vinod Koul <vkoul@kernel.org>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Sanyog Kale <sanyog.r.kale@intel.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
alsa-devel@alsa-project.org (moderated list:SOUNDWIRE SUBSYSTEM),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 2/4] soundwire: qcom: avoid dependency on CONFIG_SLIMBUS
Date: Sat, 5 Sep 2020 13:39:03 -0400 [thread overview]
Message-ID: <20200905173905.16541-3-jonathan@marek.ca> (raw)
In-Reply-To: <20200905173905.16541-1-jonathan@marek.ca>
The driver may be used without slimbus, so don't depend on slimbus.
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
---
drivers/soundwire/Kconfig | 2 +-
drivers/soundwire/qcom.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig
index fa2b4ab92ed9..f83d02c9c60a 100644
--- a/drivers/soundwire/Kconfig
+++ b/drivers/soundwire/Kconfig
@@ -33,7 +33,7 @@ config SOUNDWIRE_INTEL
config SOUNDWIRE_QCOM
tristate "Qualcomm SoundWire Master driver"
- depends on SLIMBUS
+ imply SLIMBUS
depends on SND_SOC
help
SoundWire Qualcomm Master driver.
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index d1e33ef1afac..6401ad451eee 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -753,7 +753,11 @@ static int qcom_swrm_probe(struct platform_device *pdev)
if (!ctrl)
return -ENOMEM;
+#if IS_ENABLED(CONFIG_SLIBMUS)
if (dev->parent->bus == &slimbus_bus) {
+#else
+ if (false) {
+#endif
ctrl->reg_read = qcom_swrm_ahb_reg_read;
ctrl->reg_write = qcom_swrm_ahb_reg_write;
ctrl->regmap = dev_get_regmap(dev->parent, NULL);
--
2.26.1
next prev parent reply other threads:[~2020-09-05 17:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 17:39 [PATCH v2 0/4] soundwire: qcom: add support for mmio soundwire master Jonathan Marek
2020-09-05 17:39 ` [PATCH v2 1/4] soundwire: qcom: fix abh/ahb typo Jonathan Marek
2020-09-05 17:39 ` Jonathan Marek [this message]
2020-09-08 13:53 ` [PATCH v2 2/4] soundwire: qcom: avoid dependency on CONFIG_SLIMBUS Pierre-Louis Bossart
2020-09-05 17:39 ` [PATCH v2 3/4] soundwire: qcom: add support for mmio soundwire master devices Jonathan Marek
2020-09-08 13:56 ` Pierre-Louis Bossart
2020-09-08 13:57 ` Jonathan Marek
2020-09-05 17:39 ` [PATCH v2 4/4] soundwire: qcom: add v1.5.1 compatible Jonathan Marek
2020-09-07 8:17 ` [PATCH v2 0/4] soundwire: qcom: add support for mmio soundwire master Srinivas Kandagatla
2020-09-07 14:17 ` Vinod Koul
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=20200905173905.16541-3-jonathan@marek.ca \
--to=jonathan@marek.ca \
--cc=agross@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--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: 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).