Re: [PATCH v2 2/4] soundwire: qcom: avoid dependency on CONFIG_SLIMBUS

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





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@xxxxxxxx>
---
  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);




[Index of Archives]     [ALSA User]     [Linux Audio Users]     [Pulse Audio]     [Kernel Archive]     [Asterisk PBX]     [Photo Sharing]     [Linux Sound]     [Video 4 Linux]     [Gimp]     [Yosemite News]

  Powered by Linux