Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 796ff73a authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/hisi', 'asoc/topic/img',... 

Merge remote-tracking branches 'asoc/topic/hisi', 'asoc/topic/img', 'asoc/topic/jack' and 'asoc/topic/jz4740' into asoc-next
parents 7d630ce4 94372fce 3a4e1b93 f3f7df76 eae37345

sound/soc/fsl/imx-es8328.c

+0 −3
Original line number Diff line number Diff line
@@ -203,9 +203,6 @@ static int imx_es8328_remove(struct platform_device *pdev) 
{

	struct imx_es8328_data *data = platform_get_drvdata(pdev);



	snd_soc_jack_free_gpios(&headset_jack, ARRAY_SIZE(headset_jack_gpios),

				headset_jack_gpios);



	snd_soc_unregister_card(&data->card);



	return 0;

sound/soc/generic/simple-card.c

+0 −10
Original line number Diff line number Diff line
@@ -104,12 +104,6 @@ static int asoc_simple_card_init_jack(struct snd_soc_card *card, 
	return 0;

}



static void asoc_simple_card_remove_jack(struct asoc_simple_jack *sjack)

{

	if (gpio_is_valid(sjack->gpio.gpio))

		snd_soc_jack_free_gpios(&sjack->jack, 1, &sjack->gpio);

}



static int asoc_simple_card_startup(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -493,10 +487,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
static int asoc_simple_card_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);

	struct simple_card_data *priv = snd_soc_card_get_drvdata(card);



	asoc_simple_card_remove_jack(&priv->hp_jack);

	asoc_simple_card_remove_jack(&priv->mic_jack);



	return asoc_simple_card_clean_reference(card);

}

sound/soc/hisilicon/hi6210-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static int hi6210_i2s_dai_probe(struct snd_soc_dai *dai) 
}





static struct snd_soc_dai_ops hi6210_i2s_dai_ops = {

static const struct snd_soc_dai_ops hi6210_i2s_dai_ops = {

	.trigger	= hi6210_i2s_trigger,

	.hw_params	= hi6210_i2s_hw_params,

	.set_fmt	= hi6210_i2s_set_fmt,

sound/soc/img/img-i2s-in.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static int img_i2s_in_probe(struct platform_device *pdev) 
		SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE;

	i2s->dai_driver.ops = &img_i2s_in_dai_ops;



	rst = devm_reset_control_get(dev, "rst");

	rst = devm_reset_control_get_exclusive(dev, "rst");

	if (IS_ERR(rst)) {

		if (PTR_ERR(rst) == -EPROBE_DEFER) {

			ret = -EPROBE_DEFER;

sound/soc/img/img-i2s-out.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int img_i2s_out_probe(struct platform_device *pdev) 


	i2s->channel_base = base + (max_i2s_chan_pow_2 * 0x20);



	i2s->rst = devm_reset_control_get(&pdev->dev, "rst");

	i2s->rst = devm_reset_control_get_exclusive(&pdev->dev, "rst");

	if (IS_ERR(i2s->rst)) {

		if (PTR_ERR(i2s->rst) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "No top level reset found\n");