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

Unverified Commit 5e1b9447 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/max98926', 'asoc/topic/max98927',... 

Merge remote-tracking branches 'asoc/topic/max98926', 'asoc/topic/max98927', 'asoc/topic/mc13783', 'asoc/topic/msm8916' and 'asoc/topic/mt8173' into asoc-next
parents 92730ec7 866b9c81 68fea7cd 33953d85 42e193cd d6e2c4ff

sound/soc/codecs/max98926.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int max98926_probe(struct snd_soc_codec *codec) 
	struct max98926_priv *max98926 = snd_soc_codec_get_drvdata(codec);



	max98926->codec = codec;

	codec->control_data = max98926->regmap;



	/* Hi-Z all the slots */

	regmap_write(max98926->regmap, MAX98926_DOUT_HIZ_CFG4, 0xF0);

	return 0;

sound/soc/codecs/max98927.c

+0 −1
Original line number Diff line number Diff line
@@ -682,7 +682,6 @@ static int max98927_probe(struct snd_soc_codec *codec) 
	struct max98927_priv *max98927 = snd_soc_codec_get_drvdata(codec);



	max98927->codec = codec;

	codec->control_data = max98927->regmap;



	/* Software Reset */

	regmap_write(max98927->regmap,

sound/soc/codecs/mc13783.c

+3 −6
Original line number Diff line number Diff line
@@ -610,6 +610,9 @@ static int mc13783_probe(struct snd_soc_codec *codec) 
{

	struct mc13783_priv *priv = snd_soc_codec_get_drvdata(codec);



	snd_soc_codec_init_regmap(codec,

				  dev_get_regmap(codec->dev->parent, NULL));



	/* these are the reset values */

	mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX0, 0x25893);

	mc13xxx_reg_write(priv->mc13xxx, MC13783_AUDIO_RX1, 0x00d35A);
@@ -728,15 +731,9 @@ static struct snd_soc_dai_driver mc13783_dai_sync[] = { 
	}

};



static struct regmap *mc13783_get_regmap(struct device *dev)

{

	return dev_get_regmap(dev->parent, NULL);

}



static const struct snd_soc_codec_driver soc_codec_dev_mc13783 = {

	.probe		= mc13783_probe,

	.remove		= mc13783_remove,

	.get_regmap	= mc13783_get_regmap,

	.component_driver = {

		.controls		= mc13783_control_list,

		.num_controls		= ARRAY_SIZE(mc13783_control_list),

sound/soc/codecs/msm8916-wcd-analog.c

+2 −6
Original line number Diff line number Diff line
@@ -712,6 +712,8 @@ static int pm8916_wcd_analog_probe(struct snd_soc_codec *codec) 
		return err;

	}



	snd_soc_codec_init_regmap(codec,

				  dev_get_regmap(codec->dev->parent, NULL));

	snd_soc_codec_set_drvdata(codec, priv);

	priv->pmic_rev = snd_soc_read(codec, CDC_D_REVISION1);

	priv->codec_version = snd_soc_read(codec, CDC_D_PERPH_SUBTYPE);
@@ -943,11 +945,6 @@ static int pm8916_wcd_analog_set_jack(struct snd_soc_codec *codec, 
	return 0;

}



static struct regmap *pm8916_get_regmap(struct device *dev)

{

	return dev_get_regmap(dev->parent, NULL);

}



static irqreturn_t mbhc_btn_release_irq_handler(int irq, void *arg)

{

	struct pm8916_wcd_analog_priv *priv = arg;
@@ -1082,7 +1079,6 @@ static const struct snd_soc_codec_driver pm8916_wcd_analog = { 
	.probe = pm8916_wcd_analog_probe,

	.remove = pm8916_wcd_analog_remove,

	.set_jack = pm8916_wcd_analog_set_jack,

	.get_regmap = pm8916_get_regmap,

	.component_driver = {

		.controls = pm8916_wcd_analog_snd_controls,

		.num_controls = ARRAY_SIZE(pm8916_wcd_analog_snd_controls),

sound/soc/mediatek/mt8173/mt8173-afe-pcm.c

+3 −3
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ static int mt8173_afe_init_audio_clk(struct mtk_base_afe *afe) 
static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)

{

	int ret, i;

	unsigned int irq_id;

	int irq_id;

	struct mtk_base_afe *afe;

	struct mt8173_afe_private *afe_priv;

	struct resource *res;
@@ -1105,9 +1105,9 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) 
	afe->dev = &pdev->dev;



	irq_id = platform_get_irq(pdev, 0);

	if (!irq_id) {

	if (irq_id <= 0) {

		dev_err(afe->dev, "np %s no irq\n", afe->dev->of_node->name);

		return -ENXIO;

		return irq_id < 0 ? irq_id : -ENXIO;

	}

	ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler,

			       0, "Afe_ISR_Handle", (void *)afe);