Commit 5bd77324 authored by Jonathan Marek's avatar Jonathan Marek Committed by Vinod Koul
Browse files

soundwire: qcom: avoid dependency on CONFIG_SLIMBUS 



The driver may be used without slimbus, so don't depend on slimbus.

Signed-off-by: default avatarJonathan Marek <jonathan@marek.ca>
Tested-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200905173905.16541-3-jonathan@marek.ca


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent d1df23fe

drivers/soundwire/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/soundwire/qcom.c

+4 −0
Original line number Diff line number Diff line
@@ -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);