Unverified Commit ace105dd authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: Fix dependency issues of SND_SOC" from Wei Li <liwei391@huawei.com>: 

Fix dependency issues of SND_SOC introduced by commit ea00d952
("ASoC: Use imply for SND_SOC_ALL_CODECS").

Wei Li (2):
  ASoC: wm89xx: Fix build errors caused by I2C dependency
  ASoC: Fix wrong dependency of da7210 and wm8983

 sound/soc/codecs/Kconfig | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--
2.17.1
parents 8ec7d604 c1c050ee

sound/soc/codecs/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ config SND_SOC_L3 


config SND_SOC_DA7210

	tristate

	depends on I2C

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_DA7213

	tristate "Dialog DA7213 CODEC"
@@ -1525,6 +1525,7 @@ config SND_SOC_WM8804_SPI 


config SND_SOC_WM8900

	tristate

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8903

	tristate "Wolfson Microelectronics WM8903 CODEC"
@@ -1568,7 +1569,7 @@ config SND_SOC_WM8978 


config SND_SOC_WM8983

	tristate

	depends on I2C

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8985

	tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver"
@@ -1576,6 +1577,7 @@ config SND_SOC_WM8985 


config SND_SOC_WM8988

	tristate

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8990

	tristate
@@ -1594,6 +1596,7 @@ config SND_SOC_WM8994 


config SND_SOC_WM8995

	tristate

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8996

	tristate

sound/soc/codecs/hdac_hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -142,14 +142,14 @@ static struct hdac_hdmi_pcm * 
hdac_hdmi_get_pcm_from_cvt(struct hdac_hdmi_priv *hdmi,

			   struct hdac_hdmi_cvt *cvt)

{

	struct hdac_hdmi_pcm *pcm = NULL;

	struct hdac_hdmi_pcm *pcm;



	list_for_each_entry(pcm, &hdmi->pcm_list, head) {

		if (pcm->cvt == cvt)

			break;

			return pcm;

	}



	return pcm;

	return NULL;

}



static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm,

sound/soc/meson/axg-card.c

+3 −1
Original line number Diff line number Diff line
@@ -338,8 +338,10 @@ static int axg_card_add_link(struct snd_soc_card *card, struct device_node *np, 


	if (axg_card_cpu_is_tdm_iface(dai_link->cpus->of_node))

		ret = axg_card_parse_tdm(card, np, index);

	else if (axg_card_cpu_is_codec(dai_link->cpus->of_node))

	else if (axg_card_cpu_is_codec(dai_link->cpus->of_node)) {

		dai_link->params = &codec_params;

		dai_link->no_pcm = 0; /* link is not a DPCM BE */

	}



	return ret;

}

sound/soc/meson/gx-card.c

+3 −1
Original line number Diff line number Diff line
@@ -108,8 +108,10 @@ static int gx_card_add_link(struct snd_soc_card *card, struct device_node *np, 
		ret = gx_card_parse_i2s(card, np, index);



	/* Or apply codec to codec params if necessary */

	else if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL"))

	else if (gx_card_cpu_identify(dai_link->cpus, "CODEC CTRL")) {

		dai_link->params = &codec_params;

		dai_link->no_pcm = 0; /* link is not a DPCM BE */

	}



	return ret;

}

sound/soc/sh/rcar/ssi.c

+10 −1
Original line number Diff line number Diff line
@@ -594,10 +594,16 @@ static int rsnd_ssi_stop(struct rsnd_mod *mod, 
	 * Capture:  It might not receave data. Do nothing

	 */

	if (rsnd_io_is_play(io)) {

		rsnd_mod_write(mod, SSICR, cr | EN);

		rsnd_mod_write(mod, SSICR, cr | ssi->cr_en);

		rsnd_ssi_status_check(mod, DIRQ);

	}



	/* In multi-SSI mode, stop is performed by setting ssi0129 in

	 * SSI_CONTROL to 0 (in rsnd_ssio_stop_gen2). Do nothing here.

	 */

	if (rsnd_ssi_multi_slaves_runtime(io))

		return 0;



	/*

	 * disable SSI,

	 * and, wait idle state
@@ -737,6 +743,9 @@ static void rsnd_ssi_parent_attach(struct rsnd_mod *mod, 
	if (!rsnd_rdai_is_clk_master(rdai))

		return;



	if (rsnd_ssi_is_multi_slave(mod, io))

		return;



	switch (rsnd_mod_id(mod)) {

	case 1:

	case 2: