From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3211C433DF for ; Mon, 8 Jun 2020 21:45:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7EAE52068D for ; Mon, 8 Jun 2020 21:45:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726723AbgFHVpM (ORCPT ); Mon, 8 Jun 2020 17:45:12 -0400 Received: from mga18.intel.com ([134.134.136.126]:58551 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726612AbgFHVpL (ORCPT ); Mon, 8 Jun 2020 17:45:11 -0400 IronPort-SDR: Kjr0fvbO4wMKbHsCuV3IbVzWbLK5n9NTj1WIwuUe/mcu7sQ52tWzmndKwyxRNB6Y4LJPw65GtV NC9fg5NAU5wQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jun 2020 14:45:11 -0700 IronPort-SDR: DU8R5tImE9vZHiPtIilv5iHBhl5CA8wcR6ayCC7WH33b+u2Avrt89QbWBRmW4gjEd5SLowwSa9 wtm8NtaPcy7g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,489,1583222400"; d="scan'208";a="446893866" Received: from skarmaka-mobl2.amr.corp.intel.com (HELO [10.254.104.56]) ([10.254.104.56]) by orsmga005.jf.intel.com with ESMTP; 08 Jun 2020 14:45:10 -0700 Subject: Re: [PATCH 4/5] soundwire: qcom: avoid dependency on CONFIG_SLIMBUS To: Jonathan Marek , alsa-devel@alsa-project.org Cc: Vinod Koul , Sanyog Kale , Andy Gross , Bjorn Andersson , open list , "open list:ARM/QUALCOMM SUPPORT" References: <20200608204347.19685-1-jonathan@marek.ca> <20200608204347.19685-5-jonathan@marek.ca> From: Pierre-Louis Bossart Message-ID: <33017798-9546-12dc-b857-493f56c3d557@linux.intel.com> Date: Mon, 8 Jun 2020 16:20:54 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200608204347.19685-5-jonathan@marek.ca> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 6/8/20 3:43 PM, Jonathan Marek wrote: > The driver may be used without slimbus, so don't depend on slimbus. > > Signed-off-by: Jonathan Marek > --- > drivers/soundwire/Kconfig | 1 - > drivers/soundwire/qcom.c | 5 +++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/soundwire/Kconfig b/drivers/soundwire/Kconfig > index fa2b4ab92ed9..d121cf739090 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 14334442615f..ac81c64768ea 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 maybe: if (IS_ENABLED(CONFIG_SLIMBUS) && dev->parent->bus == &slimbus_bus) > 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; >