aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Marek <jonathan@marek.ca>2020-06-08 16:43:45 -0400
committerVinod Koul <vkoul@kernel.org>2020-07-13 09:45:45 +0530
commit8b6a27703b7d00317b160efb93583d496bf02632 (patch)
tree2b03111a5842ce3f035fd6f66d9a8e97a6d412c2
parent2fe8e5886b7b246e0540d3c380b0390a81fd1d3e (diff)
downloadkernel-8b6a27703b7d00317b160efb93583d496bf02632.tar.gz
soundwire: qcom: avoid dependency on CONFIG_SLIMBUS
The driver may be used without slimbus, so don't depend on slimbus. Signed-off-by: Jonathan Marek <jonathan@marek.ca> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-rw-r--r--drivers/soundwire/Kconfig1
-rw-r--r--drivers/soundwire/qcom.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig
index fa2b4ab92ed9..d121cf739090 100644
--- a/drivers/soundwire/Kconfig
+++ b/drivers/soundwire/Kconfig
@@ -33,7 +33,6 @@ config SOUNDWIRE_INTEL
config SOUNDWIRE_QCOM
tristate "Qualcomm SoundWire Master driver"
- depends on SLIMBUS
depends on SND_SOC
help
SoundWire Qualcomm Master driver.
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index 14334442615f..ac81c64768ea 100644
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -769,13 +769,18 @@ static int qcom_swrm_probe(struct platform_device *pdev)
if (!ctrl)
return -ENOMEM;
+#ifdef CONFIG_SLIMBUS
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);
if (!ctrl->regmap)
return -EINVAL;
} else {
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
ctrl->reg_read = qcom_swrm_cpu_reg_read;