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

Commit 2e9ac12a authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spear',... 

Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic/sta32x', 'asoc/topic/stm32' and 'asoc/topic/sunxi' into asoc-next
parents 55eafeb5 a728f560 a1150d40 c5efe232 635eac1e 7d299381

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

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ Optional CPU/CODEC subnodes properties: 
					  in dai startup() and disabled with

					  clk_disable_unprepare() in dai

					  shutdown().

- system-clock-direction-out		: specifies clock direction as 'out' on

					  initialization. It is useful for some aCPUs with

					  fixed clocks.



Example 1 - single DAI link:

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

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Optional subnode properties: 
- simple-audio-card,convert-rate	: platform specified sampling rate convert

- simple-audio-card,convert-channels	: platform specified converted channel size (2 - 8 ch)

- simple-audio-card,prefix		: see routing

- simple-audio-card,widgets		: Please refer to widgets.txt.

- simple-audio-card,routing		: A list of the connections between audio components.

					  Each entry is a pair of strings, the first being the connection's sink,

					  the second being the connection's source. Valid names for sources.

Documentation/devicetree/bindings/sound/sun4i-i2s.txt

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
- compatible: should be one of the following:

   - "allwinner,sun4i-a10-i2s"

   - "allwinner,sun6i-a31-i2s"

   - "allwinner,sun8i-h3-i2s"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: should contain the I2S interrupt.
@@ -22,6 +23,7 @@ Required properties: 


Required properties for the following compatibles:

	- "allwinner,sun6i-a31-i2s"

	- "allwinner,sun8i-h3-i2s"

- resets: phandle to the reset line for this codec



Example:

include/sound/simple_card_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
struct asoc_simple_dai {

	const char *name;

	unsigned int sysclk;

	int clk_direction;

	int slots;

	int slot_width;

	unsigned int tx_slot_mask;

sound/soc/codecs/sta32x.c

+1 −2
Original line number Diff line number Diff line
@@ -847,7 +847,6 @@ static int sta32x_set_bias_level(struct snd_soc_codec *codec, 
		msleep(300);

		sta32x_watchdog_stop(sta32x);



		if (sta32x->gpiod_nreset)

		gpiod_set_value(sta32x->gpiod_nreset, 0);



		regulator_bulk_disable(ARRAY_SIZE(sta32x->supplies),