diff options
| author | Jonathan Marek <jonathan@marek.ca> | 2020-09-05 13:39:03 -0400 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-09-07 19:47:13 +0530 |
| commit | 5bd773242f75da3b25750a2ccee88d97599aa757 (patch) | |
| tree | e888fbf77f9ad50275c42acd57afc6f9419499da /drivers/soundwire | |
| parent | d1df23fe688b58e0577cf9a7df793a9559b53baa (diff) | |
| download | linux-stable-5bd773242f75da3b25750a2ccee88d97599aa757.tar.gz linux-stable-5bd773242f75da3b25750a2ccee88d97599aa757.tar.bz2 linux-stable-5bd773242f75da3b25750a2ccee88d97599aa757.zip | |
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>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200905173905.16541-3-jonathan@marek.ca
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/soundwire')
| -rw-r--r-- | drivers/soundwire/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/soundwire/qcom.c | 4 |
2 files changed, 5 insertions, 1 deletions
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 d7e141b7bf78..35517d1a7765 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -745,7 +745,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); |