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

Commit 7c003136 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/davinci',... 

Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/davinci-vcif', 'asoc/topic/doc' and 'asoc/topic/dpcm' into asoc-next
parents 39996223 508a43fd 553de19a 628536ea c5b8540d

Documentation/DocBook/alsa-driver-api.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
     <sect1><title>ASoC Core API</title>

!Iinclude/sound/soc.h

!Esound/soc/soc-core.c

!Esound/soc/soc-cache.c

<!-- !Esound/soc/soc-cache.c no docbook comments here -->

!Esound/soc/soc-devres.c

!Esound/soc/soc-io.c

!Esound/soc/soc-pcm.c

include/sound/soc.h

+7 −4
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ int snd_soc_put_strobe(struct snd_kcontrol *kcontrol, 
 * @pin:    name of the pin to update

 * @mask:   bits to check for in reported jack status

 * @invert: if non-zero then pin is enabled when status is not reported

 * @list:   internal list entry

 */

struct snd_soc_jack_pin {

	struct list_head list;
@@ -636,7 +637,7 @@ struct snd_soc_jack_pin { 
 * @jack_type: type of jack that is expected for this voltage

 * @debounce_time: debounce_time for jack, codec driver should wait for this

 *		duration before reading the adc for voltages

 * @:list: list container

 * @list:   internal list entry

 */

struct snd_soc_jack_zone {

	unsigned int min_mv;
@@ -652,12 +653,12 @@ struct snd_soc_jack_zone { 
 * @gpio:         legacy gpio number

 * @idx:          gpio descriptor index within the function of the GPIO

 *                consumer device

 * @gpiod_dev     GPIO consumer device

 * @gpiod_dev:    GPIO consumer device

 * @name:         gpio name. Also as connection ID for the GPIO consumer

 *                device function name lookup

 * @report:       value to report when jack detected

 * @invert:       report presence in low state

 * @debouce_time: debouce time in ms

 * @debounce_time: debounce time in ms

 * @wake:	  enable as wake source

 * @jack_status_check: callback function which overrides the detection

 *		       to provide more complex checks (eg, reading an
@@ -673,11 +674,13 @@ struct snd_soc_jack_gpio { 
	int debounce_time;

	bool wake;



	/* private: */

	struct snd_soc_jack *jack;

	struct delayed_work work;

	struct gpio_desc *desc;



	void *data;

	/* public: */

	int (*jack_status_check)(void *data);

};
@@ -1315,7 +1318,7 @@ static inline struct snd_soc_dapm_context *snd_soc_codec_get_dapm( 


/**

 * snd_soc_dapm_init_bias_level() - Initialize CODEC DAPM bias level

 * @dapm: The CODEC for which to initialize the DAPM bias level

 * @codec: The CODEC for which to initialize the DAPM bias level

 * @level: The DAPM level to initialize to

 *

 * Initializes the CODEC DAPM bias level. See snd_soc_dapm_init_bias_level().

sound/soc/davinci/davinci-i2s.c

+6 −19
Original line number Diff line number Diff line
@@ -651,23 +651,15 @@ static const struct snd_soc_component_driver davinci_i2s_component = { 
static int davinci_i2s_probe(struct platform_device *pdev)

{

	struct davinci_mcbsp_dev *dev;

	struct resource *mem, *ioarea, *res;

	struct resource *mem, *res;

	void __iomem *io_base;

	int *dma;

	int ret;



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!mem) {

		dev_err(&pdev->dev, "no mem resource?\n");

		return -ENODEV;

	}



	ioarea = devm_request_mem_region(&pdev->dev, mem->start,

					 resource_size(mem),

					 pdev->name);

	if (!ioarea) {

		dev_err(&pdev->dev, "McBSP region already claimed\n");

		return -EBUSY;

	}

	io_base = devm_ioremap_resource(&pdev->dev, mem);

	if (IS_ERR(io_base))

		return PTR_ERR(io_base);



	dev = devm_kzalloc(&pdev->dev, sizeof(struct davinci_mcbsp_dev),

			   GFP_KERNEL);
@@ -679,12 +671,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) 
		return -ENODEV;

	clk_enable(dev->clk);



	dev->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));

	if (!dev->base) {

		dev_err(&pdev->dev, "ioremap failed\n");

		ret = -ENOMEM;

		goto err_release_clk;

	}

	dev->base = io_base;



	dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr =

	    (dma_addr_t)(mem->start + DAVINCI_MCBSP_DXR_REG);

sound/soc/davinci/davinci-mcasp.c

+4 −14
Original line number Diff line number Diff line
@@ -1613,7 +1613,7 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp) 
static int davinci_mcasp_probe(struct platform_device *pdev)

{

	struct snd_dmaengine_dai_dma_data *dma_data;

	struct resource *mem, *ioarea, *res, *dat;

	struct resource *mem, *res, *dat;

	struct davinci_mcasp_pdata *pdata;

	struct davinci_mcasp *mcasp;

	char *irq_name;
@@ -1648,22 +1648,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev) 
		}

	}



	ioarea = devm_request_mem_region(&pdev->dev, mem->start,

			resource_size(mem), pdev->name);

	if (!ioarea) {

		dev_err(&pdev->dev, "Audio region already claimed\n");

		return -EBUSY;

	}

	mcasp->base = devm_ioremap_resource(&pdev->dev, mem);

	if (IS_ERR(mcasp->base))

		return PTR_ERR(mcasp->base);



	pm_runtime_enable(&pdev->dev);



	mcasp->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));

	if (!mcasp->base) {

		dev_err(&pdev->dev, "ioremap failed\n");

		ret = -ENOMEM;

		goto err;

	}



	mcasp->op_mode = pdata->op_mode;

	/* sanity check for tdm slots parameter */

	if (mcasp->op_mode == DAVINCI_MCASP_IIS_MODE) {

sound/soc/davinci/davinci-vcif.c

+3 −11
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ static int davinci_vcif_probe(struct platform_device *pdev) 


	dev_set_drvdata(&pdev->dev, davinci_vcif_dev);



	ret = snd_soc_register_component(&pdev->dev, &davinci_vcif_component,

	ret = devm_snd_soc_register_component(&pdev->dev,

					      &davinci_vcif_component,

					      &davinci_vcif_dai, 1);

	if (ret != 0) {

		dev_err(&pdev->dev, "could not register dai\n");
@@ -241,23 +242,14 @@ static int davinci_vcif_probe(struct platform_device *pdev) 
	ret = edma_pcm_platform_register(&pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "register PCM failed: %d\n", ret);

		snd_soc_unregister_component(&pdev->dev);

		return ret;

	}



	return 0;

}



static int davinci_vcif_remove(struct platform_device *pdev)

{

	snd_soc_unregister_component(&pdev->dev);



	return 0;

}



static struct platform_driver davinci_vcif_driver = {

	.probe		= davinci_vcif_probe,

	.remove		= davinci_vcif_remove,

	.driver		= {

		.name	= "davinci-vcif",

	},