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

Commit 9abbe73e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood',... 

Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc/topic/mtk', 'asoc/topic/multi' and 'asoc/topic/mxs' into asoc-next
parents f7b93159 27fcf913 30953a80 887e83e3 cde79035 5b73de19

sound/soc/jz4740/jz4740-i2s.c

+1 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ static const struct of_device_id jz4740_of_matches[] = { 
	{ .compatible = "ingenic,jz4780-i2s", .data = (void *)JZ_I2S_JZ4780 },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, jz4740_of_matches);

#endif



static int jz4740_i2s_dev_probe(struct platform_device *pdev)

sound/soc/kirkwood/armada-370-db.c

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ static const struct of_device_id a370db_dt_ids[] = { 
	{ .compatible = "marvell,a370db-audio" },

	{ },

};

MODULE_DEVICE_TABLE(of, a370db_dt_ids);



static struct platform_driver a370db_driver = {

	.driver		= {

sound/soc/mediatek/mt8173-max98090.c

+1 −10
Original line number Diff line number Diff line
@@ -179,21 +179,13 @@ static int mt8173_max98090_dev_probe(struct platform_device *pdev) 
	}

	card->dev = &pdev->dev;



	ret = snd_soc_register_card(card);

	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret)

		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);

	return ret;

}



static int mt8173_max98090_dev_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);

	return 0;

}



static const struct of_device_id mt8173_max98090_dt_match[] = {

	{ .compatible = "mediatek,mt8173-max98090", },

	{ }
@@ -209,7 +201,6 @@ static struct platform_driver mt8173_max98090_driver = { 
#endif

	},

	.probe = mt8173_max98090_dev_probe,

	.remove = mt8173_max98090_dev_remove,

};



module_platform_driver(mt8173_max98090_driver);

sound/soc/mediatek/mt8173-rt5650-rt5676.c

+1 −10
Original line number Diff line number Diff line
@@ -246,21 +246,13 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;

	platform_set_drvdata(pdev, card);



	ret = snd_soc_register_card(card);

	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret)

		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);

	return ret;

}



static int mt8173_rt5650_rt5676_dev_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);

	return 0;

}



static const struct of_device_id mt8173_rt5650_rt5676_dt_match[] = {

	{ .compatible = "mediatek,mt8173-rt5650-rt5676", },

	{ }
@@ -276,7 +268,6 @@ static struct platform_driver mt8173_rt5650_rt5676_driver = { 
#endif

	},

	.probe = mt8173_rt5650_rt5676_dev_probe,

	.remove = mt8173_rt5650_rt5676_dev_remove,

};



module_platform_driver(mt8173_rt5650_rt5676_driver);

sound/soc/mxs/mxs-sgtl5000.c

+1 −5
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;

	platform_set_drvdata(pdev, card);



	ret = snd_soc_register_card(card);

	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",

			ret);
@@ -154,12 +154,8 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) 


static int mxs_sgtl5000_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	mxs_saif_put_mclk(0);



	snd_soc_unregister_card(card);



	return 0;

}