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

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

Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

parents 0b1107b2 f813175a

Documentation/devicetree/bindings/misc/atmel-ssc.txt

+22 −1
Original line number Diff line number Diff line
@@ -7,9 +7,30 @@ Required properties: 
- reg: Should contain SSC registers location and length

- interrupts: Should contain SSC interrupt



Example:



Required properties for devices compatible with "atmel,at91sam9g45-ssc":

- dmas: DMA specifier, consisting of a phandle to DMA controller node,

  the memory interface and SSC DMA channel ID (for tx and rx).

  See Documentation/devicetree/bindings/dma/atmel-dma.txt for details.

- dma-names: Must be "tx", "rx".



Examples:

- PDC transfer:

ssc0: ssc@fffbc000 {

	compatible = "atmel,at91rm9200-ssc";

	reg = <0xfffbc000 0x4000>;

	interrupts = <14 4 5>;

};



- DMA transfer:

ssc0: ssc@f0010000 {

      compatible = "atmel,at91sam9g45-ssc";

      reg = <0xf0010000 0x4000>;

      interrupts = <28 4 5>;

      dmas = <&dma0 1 13>,

	     <&dma0 1 14>;

      dma-names = "tx", "rx";

      pinctrl-names = "default";

      pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;

      status = "disabled";

};

Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
* Atmel at91sam9x5ek wm8731 audio complex



Required properties:

  - compatible: "atmel,sam9x5-wm8731-audio"

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

  - atmel,ssc-controller: The phandle of the SSC controller

  - atmel,audio-codec: The phandle of the WM8731 audio codec

  - atmel,audio-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.



Available audio endpoints for the audio-routing table:



Board connectors:

 * Headphone Jack

 * Line In Jack



wm8731 pins:

cf Documentation/devicetree/bindings/sound/wm8731.txt



Example:

sound {

	compatible = "atmel,sam9x5-wm8731-audio";



	atmel,model = "wm8731 @ AT91SAM9X5EK";



	atmel,audio-routing =

		"Headphone Jack", "RHPOUT",

		"Headphone Jack", "LHPOUT",

		"LLINEIN", "Line In Jack",

		"RLINEIN", "Line In Jack";



	atmel,ssc-controller = <&ssc0>;

	atmel,audio-codec = <&wm8731>;

};

Documentation/devicetree/bindings/sound/atmel-wm8904.txt

0 → 100644
+55 −0
Original line number Diff line number Diff line 
Atmel ASoC driver with wm8904 audio codec complex



Required properties:

  - compatible: "atmel,asoc-wm8904"

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

  - atmel,audio-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 and

    sinks are the WM8904's pins, and the jacks on the board:



    WM8904 pins:



    * IN1L

    * IN1R

    * IN2L

    * IN2R

    * IN3L

    * IN3R

    * HPOUTL

    * HPOUTR

    * LINEOUTL

    * LINEOUTR

    * MICBIAS



    Board connectors:



    * Headphone Jack

    * Line In Jack

    * Mic



  - atmel,ssc-controller: The phandle of the SSC controller

  - atmel,audio-codec: The phandle of the WM8904 audio codec



Optional properties:

  - pinctrl-names, pinctrl-0: Please refer to pinctrl-bindings.txt



Example:

sound {

	compatible = "atmel,asoc-wm8904";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_pck0_as_mck>;



	atmel,model = "wm8904 @ AT91SAM9N12EK";



	atmel,audio-routing =

		"Headphone Jack", "HPOUTL",

		"Headphone Jack", "HPOUTR",

		"IN2L", "Line In Jack",

		"IN2R", "Line In Jack",

		"Mic", "MICBIAS",

		"IN1L", "Mic";



	atmel,ssc-controller = <&ssc0>;

	atmel,audio-codec = <&wm8904>;

};

Documentation/devicetree/bindings/sound/wm8731.txt

+9 −0
Original line number Diff line number Diff line
@@ -16,3 +16,12 @@ codec: wm8731@1a { 
	compatible = "wlf,wm8731";

	reg = <0x1a>;

};



Available audio endpoints for an audio-routing table:

 * LOUT: Left Channel Line Output

 * ROUT: Right Channel Line Output

 * LHPOUT: Left Channel Headphone Output

 * RHPOUT: Right Channel Headphone Output

 * LLINEIN: Left Channel Line Input

 * RLINEIN: Right Channel Line Input

 * MICIN: Microphone Input

include/linux/atmel-ssc.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ struct atmel_ssc_platform_data { 


struct ssc_device {

	struct list_head	list;

	resource_size_t		phybase;

	dma_addr_t		phybase;

	void __iomem		*regs;

	struct platform_device	*pdev;

	struct atmel_ssc_platform_data *pdata;