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

Commit f6ccdc44 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'fix/omap' of... 

Merge branch 'fix/omap' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap
parents 4e85e777 a8719670

Documentation/devicetree/bindings/sound/omap-mcpdm.txt

+0 −10
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ Required properties: 
- interrupts: Interrupt number for McPDM

- interrupt-parent: The parent interrupt controller

- ti,hwmods: Name of the hwmod associated to the McPDM

- clocks:  phandle for the pdmclk provider, likely <&twl6040>

- clock-names: Must be "pdmclk"



Example:
@@ -21,11 +19,3 @@ mcpdm: mcpdm@40132000 { 
	interrupt-parent = <&gic>;

	ti,hwmods = "mcpdm";

};
 


In board DTS file the pdmclk needs to be added:



&mcpdm {

	clocks = <&twl6040>;

	clock-names = "pdmclk";

	status = "okay";

};

sound/soc/omap/omap-abe-twl6040.c

+32 −29
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ 
struct abe_twl6040 {

	int	jack_detection;	/* board can detect jack events */

	int	mclk_freq;	/* MCLK frequency speed for twl6040 */

};



struct platform_device *dmic_codec_dev;

};



static int omap_abe_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params)
@@ -258,8 +258,6 @@ static int omap_abe_probe(struct platform_device *pdev) 
	if (priv == NULL)

		return -ENOMEM;



	priv->dmic_codec_dev = ERR_PTR(-EINVAL);



	if (snd_soc_of_parse_card_name(card, "ti,model")) {

		dev_err(&pdev->dev, "Card name is not provided\n");

		return -ENODEV;
@@ -284,13 +282,6 @@ static int omap_abe_probe(struct platform_device *pdev) 
		num_links = 2;

		abe_twl6040_dai_links[1].cpu_of_node = dai_node;

		abe_twl6040_dai_links[1].platform_of_node = dai_node;



		priv->dmic_codec_dev = platform_device_register_simple(

						"dmic-codec", -1, NULL, 0);

		if (IS_ERR(priv->dmic_codec_dev)) {

			dev_err(&pdev->dev, "Can't instantiate dmic-codec\n");

			return PTR_ERR(priv->dmic_codec_dev);

		}

	} else {

		num_links = 1;

	}
@@ -299,16 +290,14 @@ static int omap_abe_probe(struct platform_device *pdev) 
	of_property_read_u32(node, "ti,mclk-freq", &priv->mclk_freq);

	if (!priv->mclk_freq) {

		dev_err(&pdev->dev, "MCLK frequency not provided\n");

		ret = -EINVAL;

		goto err_unregister;

		return -EINVAL;

	}



	card->fully_routed = 1;



	if (!priv->mclk_freq) {

		dev_err(&pdev->dev, "MCLK frequency missing\n");

		ret = -ENODEV;

		goto err_unregister;

		return -ENODEV;

	}



	card->dai_link = abe_twl6040_dai_links;
@@ -317,17 +306,9 @@ static int omap_abe_probe(struct platform_device *pdev) 
	snd_soc_card_set_drvdata(card, priv);



	ret = snd_soc_register_card(card);

	if (ret) {

	if (ret)

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

			ret);

		goto err_unregister;

	}



	return 0;



err_unregister:

	if (!IS_ERR(priv->dmic_codec_dev))

		platform_device_unregister(priv->dmic_codec_dev);



	return ret;

}
@@ -335,13 +316,9 @@ static int omap_abe_probe(struct platform_device *pdev) 
static int omap_abe_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);

	struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);



	snd_soc_unregister_card(card);



	if (!IS_ERR(priv->dmic_codec_dev))

		platform_device_unregister(priv->dmic_codec_dev);



	return 0;

}
@@ -361,7 +338,33 @@ static struct platform_driver omap_abe_driver = { 
	.remove = omap_abe_remove,

};



module_platform_driver(omap_abe_driver);

static int __init omap_abe_init(void)

{

	int ret;



	dmic_codec_dev = platform_device_register_simple("dmic-codec", -1, NULL,

							 0);

	if (IS_ERR(dmic_codec_dev)) {

		pr_err("%s: dmic-codec device registration failed\n", __func__);

		return PTR_ERR(dmic_codec_dev);

	}



	ret = platform_driver_register(&omap_abe_driver);

	if (ret) {

		pr_err("%s: platform driver registration failed\n", __func__);

		platform_device_unregister(dmic_codec_dev);

	}



	return ret;

}

module_init(omap_abe_init);



static void __exit omap_abe_exit(void)

{

	platform_driver_unregister(&omap_abe_driver);

	platform_device_unregister(dmic_codec_dev);

}

module_exit(omap_abe_exit);



MODULE_AUTHOR("Misael Lopez Cruz <misael.lopez@ti.com>");

MODULE_DESCRIPTION("ALSA SoC for OMAP boards with ABE and twl6040 codec");

sound/soc/omap/omap-mcpdm.c

+3 −19
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/err.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/clk.h>

#include <linux/slab.h>

#include <linux/pm_runtime.h>

#include <linux/of_device.h>
@@ -55,7 +54,6 @@ struct omap_mcpdm { 
	unsigned long phys_base;

	void __iomem *io_base;

	int irq;

	struct clk *pdmclk;



	struct mutex mutex;
@@ -390,15 +388,14 @@ static int omap_mcpdm_probe(struct snd_soc_dai *dai) 
	struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);

	int ret;



	clk_prepare_enable(mcpdm->pdmclk);

	pm_runtime_enable(mcpdm->dev);



	/* Disable lines while request is ongoing */

	pm_runtime_get_sync(mcpdm->dev);

	omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, 0x00);



	ret = devm_request_irq(mcpdm->dev, mcpdm->irq, omap_mcpdm_irq_handler,

				0, "McPDM", (void *)mcpdm);

	ret = request_irq(mcpdm->irq, omap_mcpdm_irq_handler, 0, "McPDM",

			  (void *)mcpdm);



	pm_runtime_put_sync(mcpdm->dev);
@@ -423,9 +420,9 @@ static int omap_mcpdm_remove(struct snd_soc_dai *dai) 
{

	struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);



	free_irq(mcpdm->irq, (void *)mcpdm);

	pm_runtime_disable(mcpdm->dev);



	clk_disable_unprepare(mcpdm->pdmclk);

	return 0;

}
@@ -445,8 +442,6 @@ static int omap_mcpdm_suspend(struct snd_soc_dai *dai) 
		mcpdm->pm_active_count++;

	}



	clk_disable_unprepare(mcpdm->pdmclk);



	return 0;

}
@@ -454,8 +449,6 @@ static int omap_mcpdm_resume(struct snd_soc_dai *dai) 
{

	struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);



	clk_prepare_enable(mcpdm->pdmclk);



	if (mcpdm->pm_active_count) {

		while (mcpdm->pm_active_count--)

			pm_runtime_get_sync(mcpdm->dev);
@@ -549,15 +542,6 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) 


	mcpdm->dev = &pdev->dev;



	mcpdm->pdmclk = devm_clk_get(&pdev->dev, "pdmclk");

	if (IS_ERR(mcpdm->pdmclk)) {

		if (PTR_ERR(mcpdm->pdmclk) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		dev_warn(&pdev->dev, "Error getting pdmclk (%ld)!\n",

			 PTR_ERR(mcpdm->pdmclk));

		mcpdm->pdmclk = NULL;

	}



	ret =  devm_snd_soc_register_component(&pdev->dev,

					       &omap_mcpdm_component,

					       &omap_mcpdm_dai, 1);