diff options
| author | Jonathan Marek <jonathan@marek.ca> | 2020-06-08 12:38:00 -0400 |
|---|---|---|
| committer | Jonathan Marek <jonathan@marek.ca> | 2020-06-11 23:36:28 -0400 |
| commit | d15ba06efaaa1dde48318c1803a46d46dc9a45f9 (patch) | |
| tree | 433f5f9d3c9f7e2f29e6e055373a461bd2e4ee1b | |
| parent | 5ccebd564ee9aa344cfe21c65d62391c36dd3f0c (diff) | |
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>
| -rw-r--r-- | drivers/soundwire/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/soundwire/qcom.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig index fa2b4ab92ed9e..d121cf739090b 100644 --- a/drivers/soundwire/Kconfig +++ b/drivers/soundwire/Kconfig @@ -33,7 +33,6 @@ config SOUNDWIRE_INTEL config SOUNDWIRE_QCOM tristate "Qualcomm SoundWire Master driver" - depends on SLIMBUS depends on SND_SOC help SoundWire Qualcomm Master driver. diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 14334442615f1..ac81c64768ea9 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -769,13 +769,18 @@ static int qcom_swrm_probe(struct platform_device *pdev) if (!ctrl) return -ENOMEM; +#ifdef CONFIG_SLIMBUS 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); if (!ctrl->regmap) return -EINVAL; } else { + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); ctrl->reg_read = qcom_swrm_cpu_reg_read; |