| Message ID | 20200905173905.16541-3-jonathan@marek.ca (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5bd773242f75da3b25750a2ccee88d97599aa757 |
| Headers | show |
| Series | soundwire: qcom: add support for mmio soundwire master | expand |
On 9/5/20 12:39 PM, Jonathan Marek wrote: > The driver may be used without slimbus, so don't depend on slimbus. > > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > drivers/soundwire/Kconfig | 2 +- > drivers/soundwire/qcom.c | 4 ++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig > index fa2b4ab92ed9..f83d02c9c60a 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 d1e33ef1afac..6401ad451eee 100644 > --- a/drivers/soundwire/qcom.c > +++ b/drivers/soundwire/qcom.c > @@ -753,7 +753,11 @@ static int qcom_swrm_probe(struct platform_device *pdev) > if (!ctrl) > return -ENOMEM; > > +#if IS_ENABLED(CONFIG_SLIBMUS) typo: 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); >
diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig index fa2b4ab92ed9..f83d02c9c60a 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 d1e33ef1afac..6401ad451eee 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -753,7 +753,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);
The driver may be used without slimbus, so don't depend on slimbus. Signed-off-by: Jonathan Marek <jonathan@marek.ca> --- drivers/soundwire/Kconfig | 2 +- drivers/soundwire/qcom.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)