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

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

Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom',... 

Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom', 'asoc/topic/rcar' and 'asoc/topic/rockchip' into asoc-next
parents 9abbe73e baafd373 89857295 462c30bc 9d705947

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

+7 −0
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ Required properties: 
- compatible			: "renesas,rcar_sound-<soctype>", fallbacks

				  "renesas,rcar_sound-gen1" if generation1, and

				  "renesas,rcar_sound-gen2" if generation2

				  "renesas,rcar_sound-gen3" if generation3

				  Examples with soctypes are:

				    - "renesas,rcar_sound-r8a7778" (R-Car M1A)

				    - "renesas,rcar_sound-r8a7790" (R-Car H2)

				    - "renesas,rcar_sound-r8a7791" (R-Car M2-W)

				    - "renesas,rcar_sound-r8a7795" (R-Car H3)

- reg				: Should contain the register physical address.

				  required register is

				   SRU/ADG/SSI      if generation1
@@ -30,6 +32,11 @@ Required properties: 
- rcar_sound,dai		: DAI contents.

				  The number of DAI subnode should be same as HW.

				  see below for detail.

- #sound-dai-cells		: it must be 0 if your system is using single DAI

				  it must be 1 if your system is using multi  DAI

- #clock-cells			: it must be 0 if your system has audio_clkout

				  it must be 1 if your system has audio_clkout0/1/2/3

- clock-frequency		: for all audio_clkout0/1/2/3



SSI subnode properties:

- interrupts			: Should contain SSI interrupt for PIO transfer

include/sound/rcar_snd.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#ifndef RCAR_SND_H

#define RCAR_SND_H



#include <linux/sh_clk.h>



#define RSND_GEN1_SRU	0

#define RSND_GEN1_ADG	1

sound/soc/pxa/brownstone.c

+1 −8
Original line number Diff line number Diff line
@@ -116,26 +116,19 @@ static int brownstone_probe(struct platform_device *pdev) 
	int ret;



	brownstone.dev = &pdev->dev;

	ret = snd_soc_register_card(&brownstone);

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

	if (ret)

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

				ret);

	return ret;

}



static int brownstone_remove(struct platform_device *pdev)

{

	snd_soc_unregister_card(&brownstone);

	return 0;

}



static struct platform_driver mmp_driver = {

	.driver		= {

		.name	= "brownstone-audio",

		.pm     = &snd_soc_pm_ops,

	},

	.probe		= brownstone_probe,

	.remove		= brownstone_remove,

};



module_platform_driver(mmp_driver);

sound/soc/pxa/corgi.c

+1 −10
Original line number Diff line number Diff line
@@ -295,28 +295,19 @@ static int corgi_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, "snd_soc_register_card() failed: %d\n",

			ret);

	return ret;

}



static int corgi_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);

	return 0;

}



static struct platform_driver corgi_driver = {

	.driver		= {

		.name	= "corgi-audio",

		.pm     = &snd_soc_pm_ops,

	},

	.probe		= corgi_probe,

	.remove		= corgi_remove,

};



module_platform_driver(corgi_driver);

sound/soc/pxa/e740_wm9705.c

+1 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int e740_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, "snd_soc_register_card() failed: %d\n",

			ret);
@@ -149,10 +149,7 @@ static int e740_probe(struct platform_device *pdev) 


static int e740_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	gpio_free_array(e740_audio_gpios, ARRAY_SIZE(e740_audio_gpios));

	snd_soc_unregister_card(card);

	return 0;

}