Re: [PATCH 0/4] Kconfig updates for DMIC and SOF HDMI support

[Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>]

On 5/15/20 11:14 AM, Ranjani Sridharan wrote:
> On Mon, 2020-04-27 at 09:52 -0700, Ranjani Sridharan wrote:
>> This series provides the following updtes to the Intel machine driver
>> Kconfig:
>>
>> 1. The first patch adds the explicit dependency on GPIOLIB when
>> SND_SOC_DMIC is selected.
>>
>> 2. SND_SOC_SOF_HDA_AUDIO_CODEC is required for using the legacy
>> HDA codec driver for HDMI support in SOF. The last 3 three patches
>> make the required changes to account for this.
>>
>> Libin Yang (3):
>>    ASoC: intel: add depends on SND_SOC_SOF_HDA_AUDIO_CODEC for common
>>      hdmi
>>    ASoC: sof-sdw: remove CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC condition
>>    ASoC: sof_pcm512x: remove CONFIG_SND_HDA_CODEC_HDMI condition
>>
>> Pierre-Louis Bossart (1):
>>    ASoC: Intel: boards: add explicit dependency on GPIOLIB when DMIC
>> is
>>      used
> Hi Mark,
> 
> I see that you applied the series in your merge commit below but your
> for-next branch only has the first patch in the series and the
> remaining 3 are missing. Just wanted to check with you if I should
> resend them.
> 
> commit eda12425b266b85a8c4b8f4f25ca8afc7e36070f
> Merge: 433f9cba54fa 4262ddc2ad63
> Author: Mark Brown <broonie@kernel.org>
> Date:   Tue Apr 28 16:40:38 2020 +0100
> 
>      Merge series "Kconfig updates for DMIC and SOF HDMI support" from
> Ranjani Sridharan <ranjani.sridharan@linux.intel.com>:


Mark, is there any issue with this patchset? This series posted last 
month will conflict with Arnd's RT5682 cleanups (just tried, see below). 
I don't mind re-sending the patches on top of Arnd's, please let us know 
what's easiest for you. Thanks!

diff --cc sound/soc/intel/boards/Kconfig
index dce3e7eacef4,46073c04364a..000000000000
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@@ -432,8 -429,8 +432,13 @@@ config SND_SOC_INTEL_GLK_RT5682_MAX9835
         tristate "GLK with RT5682 and MAX98357A in I2S Mode"
         depends on I2C && ACPI && GPIOLIB
         depends on MFD_INTEL_LPSS || COMPILE_TEST
++<<<<<<< HEAD
  +      depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
  +      select SND_SOC_RT5682
++=======
+       depends on SND_HDA_CODEC_HDMI
+       select SND_SOC_RT5682_I2C
++>>>>>>> ASoC: rt5682: split i2c driver into separate module