Commit 48997b9c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bcm2835',... 

Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bcm2835', 'asoc/topic/blackfin' and 'asoc/topic/card' into asoc-next
parents 21af1094 fd63542f 054bc835 c4d2ab0d 54d8697f

Documentation/devicetree/bindings/sound/rockchip-max98090.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
ROCKCHIP with MAX98090 CODEC



Required properties:

- compatible: "rockchip,rockchip-audio-max98090"

- rockchip,model: The user-visible name of this sound complex

- rockchip,i2s-controller: The phandle of the Rockchip I2S controller that's

  connected to the CODEC

- rockchip,audio-codec: The phandle of the MAX98090 audio codec

- rockchip,headset-codec: The phandle of Ext chip for jack detection



Example:



sound {

	compatible = "rockchip,rockchip-audio-max98090";

	rockchip,model = "ROCKCHIP-I2S";

	rockchip,i2s-controller = <&i2s>;

	rockchip,audio-codec = <&max98090>;

	rockchip,headset-codec = <&headsetcodec>;

};

Documentation/devicetree/bindings/sound/rockchip-rt5645.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
ROCKCHIP with RT5645/RT5650 CODECS



Required properties:

- compatible: "rockchip,rockchip-audio-rt5645"

- rockchip,model: The user-visible name of this sound complex

- rockchip,i2s-controller: The phandle of the Rockchip I2S controller that's

  connected to the CODEC

- rockchip,audio-codec: The phandle of the RT5645/RT5650 audio codec



Example:



sound {

	compatible = "rockchip,rockchip-audio-rt5645";

	rockchip,model = "ROCKCHIP-I2S";

	rockchip,i2s-controller = <&i2s>;

	rockchip,audio-codec = <&rt5645>;

};

sound/soc/au1x/dbdma2.c

+2 −9
Original line number Diff line number Diff line
@@ -344,14 +344,8 @@ static int au1xpsc_pcm_drvprobe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, dmadata);



	return snd_soc_register_platform(&pdev->dev, &au1xpsc_soc_platform);

}



static int au1xpsc_pcm_drvremove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);



	return 0;

	return devm_snd_soc_register_platform(&pdev->dev,

					      &au1xpsc_soc_platform);

}



static struct platform_driver au1xpsc_pcm_driver = {
@@ -359,7 +353,6 @@ static struct platform_driver au1xpsc_pcm_driver = { 
		.name	= "au1xpsc-pcm",

	},

	.probe		= au1xpsc_pcm_drvprobe,

	.remove		= au1xpsc_pcm_drvremove,

};



module_platform_driver(au1xpsc_pcm_driver);

sound/soc/au1x/dma.c

+2 −9
Original line number Diff line number Diff line
@@ -312,14 +312,8 @@ static int alchemy_pcm_drvprobe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, ctx);



	return snd_soc_register_platform(&pdev->dev, &alchemy_pcm_soc_platform);

}



static int alchemy_pcm_drvremove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);



	return 0;

	return devm_snd_soc_register_platform(&pdev->dev,

					      &alchemy_pcm_soc_platform);

}



static struct platform_driver alchemy_pcmdma_driver = {
@@ -327,7 +321,6 @@ static struct platform_driver alchemy_pcmdma_driver = { 
		.name	= "alchemy-pcm-dma",

	},

	.probe		= alchemy_pcm_drvprobe,

	.remove		= alchemy_pcm_drvremove,

};



module_platform_driver(alchemy_pcmdma_driver);

sound/soc/au1x/psc-i2s.c

+3 −13
Original line number Diff line number Diff line
@@ -305,19 +305,9 @@ static int au1xpsc_i2s_drvprobe(struct platform_device *pdev) 
		return -ENOMEM;



	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!iores)

		return -ENODEV;



	ret = -EBUSY;

	if (!devm_request_mem_region(&pdev->dev, iores->start,

				     resource_size(iores),

				     pdev->name))

		return -EBUSY;



	wd->mmio = devm_ioremap(&pdev->dev, iores->start,

				resource_size(iores));

	if (!wd->mmio)

		return -EBUSY;

	wd->mmio = devm_ioremap_resource(&pdev->dev, iores);

	if (IS_ERR(wd->mmio))

		return PTR_ERR(wd->mmio);



	dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0);

	if (!dmares)