From: Jonathan Marek Date: Sat, 5 Sep 2020 17:39:03 +0000 (-0400) Subject: soundwire: qcom: avoid dependency on CONFIG_SLIMBUS X-Git-Tag: v5.10.7~1418^2~82^2~23 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bd773242f75da3b25750a2ccee88d97599aa757;p=platform%2Fkernel%2Flinux-rpi.git 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 Tested-by: Srinivas Kandagatla Reviewed-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20200905173905.16541-3-jonathan@marek.ca Signed-off-by: Vinod Koul --- diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig index fa2b4ab..f83d02c 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 d7e141b..35517d1 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);