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>

diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig
index fa2b4ab92ed9eee5f5ce09a9a851ac8734a19517..f83d02c9c60a977a346979f11db525fa9151116c 100644 (file)
--- 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 d7e141b7bf786f926e4d9a143c694778797cc5e1..35517d1a7765fbd445ef704544bf4269364facec 100644 (file)
--- 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);