Unverified Commit 6486cae8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/si476x',... 

Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/si476x', 'asoc/topic/simple', 'asoc/topic/spdif' and 'asoc/topic/stm32' into asoc-next
parents 8c7014c6 f4a2be1c 3047ec50 ef42e355 eb733366 512d1bb4

Documentation/devicetree/bindings/sound/simple-card.txt

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ sound { 
	simple-audio-card,name = "Cubox Audio";



	simple-audio-card,dai-link@0 {		/* I2S - HDMI */

		reg = <0>;

		format = "i2s";

		cpu {

			sound-dai = <&audio1 0>;
@@ -150,6 +151,7 @@ sound { 
	};



	simple-audio-card,dai-link@1 {		/* S/PDIF - HDMI */

		reg = <1>;

		cpu {

			sound-dai = <&audio1 1>;

		};
@@ -159,6 +161,7 @@ sound { 
	};



	simple-audio-card,dai-link@2 {		/* S/PDIF - S/PDIF */

		reg = <2>;

		cpu {

			sound-dai = <&audio1 1>;

		};

Documentation/devicetree/bindings/sound/st,stm32-sai.txt

+7 −5
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ Required properties: 


Optional properties:

  - resets: Reference to a reset controller asserting the SAI

  - st,sync: specify synchronization mode.

	By default SAI sub-block is in asynchronous mode.

	This property sets SAI sub-block as slave of another SAI sub-block.

	Must contain the phandle and index of the sai sub-block providing

	the synchronization.



SAI subnodes:

Two subnodes corresponding to SAI sub-block instances A et B can be defined.
@@ -44,6 +39,13 @@ SAI subnodes required properties: 
  - pinctrl-names: should contain only value "default"

  - pinctrl-0: see Documentation/devicetree/bindings/pinctrl/pinctrl-stm32.txt



SAI subnodes Optional properties:

  - st,sync: specify synchronization mode.

	By default SAI sub-block is in asynchronous mode.

	This property sets SAI sub-block as slave of another SAI sub-block.

	Must contain the phandle and index of the sai sub-block providing

	the synchronization.



The device node should contain one 'port' child node with one child 'endpoint'

node, according to the bindings defined in Documentation/devicetree/bindings/

graph.txt.

sound/soc/codecs/si476x.c

+6 −3
Original line number Diff line number Diff line
@@ -231,14 +231,17 @@ static struct snd_soc_dai_driver si476x_dai = { 
	.ops		= &si476x_dai_ops,

};



static struct regmap *si476x_get_regmap(struct device *dev)

static int si476x_probe(struct snd_soc_component *component)

{

	return dev_get_regmap(dev->parent, NULL);

	snd_soc_component_init_regmap(component,

				dev_get_regmap(component->dev->parent, NULL));



	return 0;

}



static const struct snd_soc_codec_driver soc_codec_dev_si476x = {

	.get_regmap = si476x_get_regmap,

	.component_driver = {

		.probe			= si476x_probe,

		.dapm_widgets		= si476x_dapm_widgets,

		.num_dapm_widgets	= ARRAY_SIZE(si476x_dapm_widgets),

		.dapm_routes		= si476x_dapm_routes,

sound/soc/codecs/spdif_receiver.c

+3 −2
Original line number Diff line number Diff line
@@ -35,9 +35,10 @@ static const struct snd_soc_dapm_route dir_routes[] = { 
#define STUB_FORMATS	(SNDRV_PCM_FMTBIT_S16_LE | \

			SNDRV_PCM_FMTBIT_S20_3LE | \

			SNDRV_PCM_FMTBIT_S24_LE  | \

			SNDRV_PCM_FMTBIT_S32_LE | \

			SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)



static const struct snd_soc_codec_driver soc_codec_spdif_dir = {

static struct snd_soc_codec_driver soc_codec_spdif_dir = {

	.component_driver = {

		.dapm_widgets		= dir_widgets,

		.num_dapm_widgets	= ARRAY_SIZE(dir_widgets),

sound/soc/codecs/spdif_transmitter.c

+3 −2
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ 
#define STUB_RATES	SNDRV_PCM_RATE_8000_192000

#define STUB_FORMATS	(SNDRV_PCM_FMTBIT_S16_LE | \

			SNDRV_PCM_FMTBIT_S20_3LE | \

			SNDRV_PCM_FMTBIT_S24_LE)

			SNDRV_PCM_FMTBIT_S24_LE  | \

			SNDRV_PCM_FMTBIT_S32_LE)



static const struct snd_soc_dapm_widget dit_widgets[] = {

	SND_SOC_DAPM_OUTPUT("spdif-out"),
@@ -37,7 +38,7 @@ static const struct snd_soc_dapm_route dit_routes[] = { 
	{ "spdif-out", NULL, "Playback" },

};



static const struct snd_soc_codec_driver soc_codec_spdif_dit = {

static struct snd_soc_codec_driver soc_codec_spdif_dit = {

	.component_driver = {

		.dapm_widgets		= dit_widgets,

		.num_dapm_widgets	= ARRAY_SIZE(dit_widgets),