GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-28 17:24:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

soundwire: qcom: avoid dependency on CONFIG_SLIMBUS

Browse source 
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>
This commit is contained in:
Jonathan Marek 2020-09-05 13:39:03 -04:00 • committed by Vinod Koul
parent d1df23fe68
commit 5bd773242f
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/soundwire/Kconfig
View file

@ -33,7 +33,7 @@ config SOUNDWIRE_INTEL
config SOUNDWIRE_QCOM config SOUNDWIRE_QCOM
tristate "Qualcomm SoundWire Master driver" tristate "Qualcomm SoundWire Master driver"
depends on SLIMBUS imply SLIMBUS
depends on SND_SOC depends on SND_SOC
help help
SoundWire Qualcomm Master driver. SoundWire Qualcomm Master driver.

4
drivers/soundwire/qcom.c
View file

@ -745,7 +745,11 @@ static int qcom_swrm_probe(struct platform_device *pdev)
if (!ctrl) if (!ctrl)
return -ENOMEM; return -ENOMEM;
#if IS_ENABLED(CONFIG_SLIBMUS)
if (dev->parent->bus == &slimbus_bus) { if (dev->parent->bus == &slimbus_bus) {
#else
if (false) {
#endif
ctrl->reg_read = qcom_swrm_ahb_reg_read; ctrl->reg_read = qcom_swrm_ahb_reg_read;
ctrl->reg_write = qcom_swrm_ahb_reg_write; ctrl->reg_write = qcom_swrm_ahb_reg_write;
ctrl->regmap = dev_get_regmap(dev->parent, NULL); ctrl->regmap = dev_get_regmap(dev->parent, NULL);