On Sat, Oct 21, 2023 at 11:15:30PM +0200, Hans de Goede wrote:
Add the standard intel board file quirk mechanism also used in many other intel board drivers and add a BYT_WM5102_SSP2 quirk setting for designs using SSP2 instead of SSP0.
This doesn't apply against current code, please check and resend:
diff --cc sound/soc/intel/boards/bytcr_wm5102.c index fd7d5fdfd3fd,51682137c4a8..000000000000 --- a/sound/soc/intel/boards/bytcr_wm5102.c +++ b/sound/soc/intel/boards/bytcr_wm5102.c @@@ -201,8 -227,9 +227,14 @@@ static int byt_wm5102_init(struct snd_s { struct snd_soc_card *card = runtime->card; struct byt_wm5102_private *priv = snd_soc_card_get_drvdata(card); ++<<<<<<< HEAD + struct snd_soc_component *component = snd_soc_rtd_to_codec(runtime, 0)->component; + int ret, jack_type; ++======= + struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component; + const struct snd_soc_dapm_route *custom_map = NULL; + int ret, jack_type, num_routes = 0; ++>>>>>>> ASoC: Intel: bytcr_wm5102: Add BYT_WM5102_SSP2 quirk
card->dapm.idle_bias_off = true;
@@@ -278,7 -323,7 +328,11 @@@ static int byt_wm5102_codec_fixup(struc return ret; }
++<<<<<<< HEAD + ret = snd_soc_dai_set_tdm_slot(snd_soc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, 16); ++======= + ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2, bits); ++>>>>>>> ASoC: Intel: bytcr_wm5102: Add BYT_WM5102_SSP2 quirk if (ret) { dev_err(rtd->dev, "Error setting I2S config: %d\n", ret); return ret;