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

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

ASoC: Add simplfied device registration for Atmel SSC devices 



Since the SSC is already being registered as a device under arch and
the DMA and SSC hardware are pretty much the same provide a simplified
device registration function for the Atmel SSC which will add the
ASoC-specific devices within the ASoC code, parenting the SSC device
off the actual SSC device. Also use it in the sam9g20-ek driver.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent dad965f0

sound/soc/atmel/atmel_ssc_dai.c

+54 −3
Original line number Diff line number Diff line
@@ -789,13 +789,14 @@ static struct snd_soc_dai_driver atmel_ssc_dai[NUM_SSC_DEVICES] = { 


static __devinit int asoc_ssc_probe(struct platform_device *pdev)

{

	return snd_soc_register_dais(&pdev->dev, atmel_ssc_dai,

			ARRAY_SIZE(atmel_ssc_dai));

	BUG_ON(pdev->id < 0);

	BUG_ON(pdev->id >= ARRAY_SIZE(atmel_ssc_dai));

	return snd_soc_register_dai(&pdev->dev, &atmel_ssc_dai[pdev->id]);

}



static int __devexit asoc_ssc_remove(struct platform_device *pdev)

{

	snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(atmel_ssc_dai));

	snd_soc_unregister_dai(&pdev->dev);

	return 0;

}
@@ -809,6 +810,56 @@ static struct platform_driver asoc_ssc_driver = { 
	.remove = __devexit_p(asoc_ssc_remove),

};



/**

 * atmel_ssc_set_audio - Allocate the specified SSC for audio use.

 */

int atmel_ssc_set_audio(int ssc_id)

{

	struct ssc_device *ssc;

	static struct platform_device *dma_pdev;

	struct platform_device *ssc_pdev;

	int ret;



	if (ssc_id < 0 || ssc_id >= ARRAY_SIZE(atmel_ssc_dai))

		return -EINVAL;



	/* Allocate a dummy device for DMA if we don't have one already */

	if (!dma_pdev) {

		dma_pdev = platform_device_alloc("atmel-pcm-audio", -1);

		if (!dma_pdev)

			return -ENOMEM;



		ret = platform_device_add(dma_pdev);

		if (ret < 0) {

			platform_device_put(dma_pdev);

			dma_pdev = NULL;

			return ret;

		}

	}



	ssc_pdev = platform_device_alloc("atmel-ssc-dai", ssc_id);

	if (!ssc_pdev) {

		ssc_free(ssc);

		return -ENOMEM;

	}



	/* If we can grab the SSC briefly to parent the DAI device off it */

	ssc = ssc_request(ssc_id);

	if (IS_ERR(ssc))

		pr_warn("Unable to parent ASoC SSC DAI on SSC: %ld\n",

			PTR_ERR(ssc));

	else

		ssc_pdev->dev.parent = &(ssc->pdev->dev);

	ssc_free(ssc);



	ret = platform_device_add(ssc_pdev);

	if (ret < 0)

		platform_device_put(ssc_pdev);



	return ret;

}

EXPORT_SYMBOL_GPL(atmel_ssc_set_audio);



static int __init snd_atmel_ssc_init(void)

{

	return platform_driver_register(&asoc_ssc_driver);

sound/soc/atmel/atmel_ssc_dai.h

+2 −0
Original line number Diff line number Diff line
@@ -117,4 +117,6 @@ struct atmel_ssc_info { 
	struct atmel_ssc_state ssc_state;

};



int atmel_ssc_set_audio(int ssc);



#endif /* _AT91_SSC_DAI_H */

sound/soc/atmel/sam9g20_wm8731.c

+6 −0
Original line number Diff line number Diff line
@@ -205,6 +205,12 @@ static int __init at91sam9g20ek_init(void) 
	if (!(machine_is_at91sam9g20ek() || machine_is_at91sam9g20ek_2mmc()))

		return -ENODEV;



	ret = atmel_ssc_set_audio(0);

	if (ret != 0) {

		pr_err("Failed to set SSC 0 for audio: %d\n", ret);

		return ret;

	}



	/*

	 * Codec MCLK is supplied by PCK0 - set it up.

	 */