[RESENDx2] sound: qcom: Kconfig: Tweak dependencies on SND_SOC_SDM845
diff mbox series

Message ID 20200616063417.110263-1-john.stultz@linaro.org
State New
Headers show
Series
  • [RESENDx2] sound: qcom: Kconfig: Tweak dependencies on SND_SOC_SDM845
Related show

Commit Message

John Stultz June 16, 2020, 6:34 a.m. UTC
CROS_EC isn't strictly required for audio to work
on other SDM845 platforms (like the Dragonboard 845c).

So lets remove the dependency and select the related
CROS_EC options if CROS_EC is already enabled.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Rohit kumar <rohitkr@codeaurora.org>
Cc: Patrick Lai <plai@codeaurora.org>
Cc: Banajit Goswami <bgoswami@codeaurora.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 sound/soc/qcom/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Srinivas Kandagatla June 16, 2020, 8:25 a.m. UTC | #1
On 16/06/2020 07:34, John Stultz wrote:
> CROS_EC isn't strictly required for audio to work
> on other SDM845 platforms (like the Dragonboard 845c).
> 
> So lets remove the dependency and select the related
> CROS_EC options if CROS_EC is already enabled.

Sorry John, totally missed this one out!

> 
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Cc: Rohit kumar <rohitkr@codeaurora.org>
> Cc: Patrick Lai <plai@codeaurora.org>
> Cc: Banajit Goswami <bgoswami@codeaurora.org>
> Cc: Liam Girdwood <lgirdwood@gmail.com>
> Cc: Mark Brown <broonie@kernel.org>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.com>
> Cc: alsa-devel@alsa-project.org
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
>   sound/soc/qcom/Kconfig | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
> index f51b28d1b94d..0434f2c7d746 100644
> --- a/sound/soc/qcom/Kconfig
> +++ b/sound/soc/qcom/Kconfig
> @@ -99,12 +99,12 @@ config SND_SOC_MSM8996
>   
>   config SND_SOC_SDM845
>   	tristate "SoC Machine driver for SDM845 boards"
> -	depends on QCOM_APR && CROS_EC && I2C && SOUNDWIRE
> +	depends on QCOM_APR && I2C && SOUNDWIRE
>   	select SND_SOC_QDSP6
>   	select SND_SOC_QCOM_COMMON
>   	select SND_SOC_RT5663
>   	select SND_SOC_MAX98927
> -	select SND_SOC_CROS_EC_CODEC
> +	select SND_SOC_CROS_EC_CODEC if CROS_EC

Isn't "imply SND_SOC_CROS_EC_CODEC" better option here?

--srini

>   	help
>   	  To add support for audio on Qualcomm Technologies Inc.
>   	  SDM845 SoC-based systems.
>
Mark Brown June 16, 2020, 8:40 a.m. UTC | #2
On Tue, Jun 16, 2020 at 06:34:17AM +0000, John Stultz wrote:
> CROS_EC isn't strictly required for audio to work
> on other SDM845 platforms (like the Dragonboard 845c).

Please submit patches using subject lines reflecting the style for the
subsystem, this makes it easier for people to identify relevant patches.
Look at what existing commits in the area you're changing are doing and
make sure your subject lines visually resemble what they're doing.
There's no need to resubmit to fix this alone.
John Stultz June 16, 2020, 6:01 p.m. UTC | #3
On Tue, Jun 16, 2020 at 1:25 AM Srinivas Kandagatla
<srinivas.kandagatla@linaro.org> wrote:
> On 16/06/2020 07:34, John Stultz wrote:
> > CROS_EC isn't strictly required for audio to work
> > on other SDM845 platforms (like the Dragonboard 845c).
> >
> > So lets remove the dependency and select the related
> > CROS_EC options if CROS_EC is already enabled.
>
> Sorry John, totally missed this one out!

No worries!

> > diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
> > index f51b28d1b94d..0434f2c7d746 100644
> > --- a/sound/soc/qcom/Kconfig
> > +++ b/sound/soc/qcom/Kconfig
> > @@ -99,12 +99,12 @@ config SND_SOC_MSM8996
> >
> >   config SND_SOC_SDM845
> >       tristate "SoC Machine driver for SDM845 boards"
> > -     depends on QCOM_APR && CROS_EC && I2C && SOUNDWIRE
> > +     depends on QCOM_APR && I2C && SOUNDWIRE
> >       select SND_SOC_QDSP6
> >       select SND_SOC_QCOM_COMMON
> >       select SND_SOC_RT5663
> >       select SND_SOC_MAX98927
> > -     select SND_SOC_CROS_EC_CODEC
> > +     select SND_SOC_CROS_EC_CODEC if CROS_EC
>
> Isn't "imply SND_SOC_CROS_EC_CODEC" better option here?

I've honestly not gotten my head around "imply", so I'll have to take
a closer look.
What I have in this patch least is easier to compare and match with
the existing code. :)

Thanks for the feedback!
-john
Mark Brown June 16, 2020, 6:33 p.m. UTC | #4
On Tue, Jun 16, 2020 at 11:01:02AM -0700, John Stultz wrote:
> On Tue, Jun 16, 2020 at 1:25 AM Srinivas Kandagatla

> > > +     select SND_SOC_CROS_EC_CODEC if CROS_EC

> > Isn't "imply SND_SOC_CROS_EC_CODEC" better option here?

> I've honestly not gotten my head around "imply", so I'll have to take
> a closer look.
> What I have in this patch least is easier to compare and match with
> the existing code. :)

It's a conditional select which enables a Kconfig symbol if its
dependencies are enabled rather than forcing it on regardless of them,
avoiding most of the errors that select tends to introduce with missing
dependencies.

Patch
diff mbox series

diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
index f51b28d1b94d..0434f2c7d746 100644
--- a/sound/soc/qcom/Kconfig
+++ b/sound/soc/qcom/Kconfig
@@ -99,12 +99,12 @@  config SND_SOC_MSM8996
 
 config SND_SOC_SDM845
 	tristate "SoC Machine driver for SDM845 boards"
-	depends on QCOM_APR && CROS_EC && I2C && SOUNDWIRE
+	depends on QCOM_APR && I2C && SOUNDWIRE
 	select SND_SOC_QDSP6
 	select SND_SOC_QCOM_COMMON
 	select SND_SOC_RT5663
 	select SND_SOC_MAX98927
-	select SND_SOC_CROS_EC_CODEC
+	select SND_SOC_CROS_EC_CODEC if CROS_EC
 	help
 	  To add support for audio on Qualcomm Technologies Inc.
 	  SDM845 SoC-based systems.