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

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

Merge remote-tracking branches 'asoc/topic/dpcm', 'asoc/topic/dt',... 

Merge remote-tracking branches 'asoc/topic/dpcm', 'asoc/topic/dt', 'asoc/topic/dwc' and 'asoc/topic/fsl' into asoc-next
parents 3ceeda1c 09464974 add3873e 57072ae1 121a0152

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

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ Required properties: 
   one for receive.

 - dma-names : "tx" for the transmit channel, "rx" for the receive channel.



Optional properties:

 - interrupts: The interrupt line number for the I2S controller. Add this

   parameter if the I2S controller that you are using does not support DMA.



For more details on the 'dma', 'dma-names', 'clock' and 'clock-names'

properties please check:

	* resource-names.txt

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ Required properties: 
			   * DMIC (stands for Digital Microphone Jack)



			  Note: The "Mic Jack" and "AMIC" are redundant while

			        coexsiting in order to support the old bindings

			        coexisting in order to support the old bindings

				of wm8962 and sgtl5000.



Optional properties:

Documentation/sound/alsa/soc/machine.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ ASoC Machine Driver 


The ASoC machine (or board) driver is the code that glues together all the

component drivers (e.g. codecs, platforms and DAIs). It also describes the

relationships between each componnent which include audio paths, GPIOs,

relationships between each component which include audio paths, GPIOs,

interrupts, clocking, jacks and voltage regulators.



The machine driver can contain codec and platform specific code. It registers

include/sound/soc-dapm.h

+4 −1
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ struct snd_soc_dapm_context; 
struct regulator;

struct snd_soc_dapm_widget_list;

struct snd_soc_dapm_update;

enum snd_soc_dapm_direction;



int dapm_regulator_event(struct snd_soc_dapm_widget *w,

			 struct snd_kcontrol *kcontrol, int event);
@@ -454,7 +455,9 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card); 


/* dapm path query */

int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

	struct snd_soc_dapm_widget_list **list);

	struct snd_soc_dapm_widget_list **list,

	bool (*custom_stop_condition)(struct snd_soc_dapm_widget *,

				      enum snd_soc_dapm_direction));



struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(

	struct snd_kcontrol *kcontrol);

sound/soc/dwc/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -7,4 +7,13 @@ config SND_DESIGNWARE_I2S 
	 Synopsys desigwnware I2S device. The device supports upto

	 maximum of 8 channels each for play and record.



config SND_DESIGNWARE_PCM

	tristate "PCM PIO extension for I2S driver"

	depends on SND_DESIGNWARE_I2S

	help

	 Say Y, M or N if you want to add a custom ALSA extension that registers

	 a PCM and uses PIO to transfer data.



	 This functionality is specially suited for I2S devices that don't have

	 DMA support.