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

Commit eb10149d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.8

Very quiet release for ASoC really:

- Standardisation of the logging.
- DT and dmaengine support for Atmel.
- Support for Wolfson ADSP cores.
- New drivers for Freescale/iVeia P1022 and Maxim MAX98090.
parents dda415d4 854ea639
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -1823,6 +1823,11 @@ S: Kattreinstr 38
S: D-64295
S: Germany

N: Avi Kivity
E: avi.kivity@gmail.com
D: Kernel-based Virtual Machine (KVM)
S: Ra'annana, Israel

N: Andi Kleen
E: andi@firstfloor.org
U: http://www.halobates.de
+15 −0
Original line number Diff line number Diff line
* Atmel SSC driver.

Required properties:
- compatible: "atmel,at91rm9200-ssc" or "atmel,at91sam9g45-ssc"
	- atmel,at91rm9200-ssc: support pdc transfer
	- atmel,at91sam9g45-ssc: support dma transfer
- reg: Should contain SSC registers location and length
- interrupts: Should contain SSC interrupt

Example:
ssc0: ssc@fffbc000 {
	compatible = "atmel,at91rm9200-ssc";
	reg = <0xfffbc000 0x4000>;
	interrupts = <14 4 5>;
};
+8 −1
Original line number Diff line number Diff line
@@ -8,9 +8,16 @@ gpios property as described in section VIII.1 in the following order:

MDC, MDIO.

Note: Each gpio-mdio bus should have an alias correctly numbered in "aliases"
node.

Example:

mdio {
aliases {
	mdio-gpio0 = <&mdio0>;
};

mdio0: mdio {
	compatible = "virtual,mdio-gpio";
	#address-cells = <1>;
	#size-cells = <0>;
+22 −0
Original line number Diff line number Diff line
AK4104 S/PDIF transmitter

This device supports SPI mode only.

Required properties:

  - compatible : "asahi-kasei,ak4104"

  - reg : The chip select number on the SPI bus

Optional properties:

  - reset-gpio : a GPIO spec for the reset pin. If specified, it will be
		 deasserted before communication to the device starts.

Example:

spdif: ak4104@0 {
	compatible = "asahi-kasei,ak4104";
	reg = <0>;
	spi-max-frequency = <5000000>;
};
+26 −0
Original line number Diff line number Diff line
* Atmel at91sam9g20ek wm8731 audio complex

Required properties:
  - compatible: "atmel,at91sam9g20ek-wm8731-audio"
  - atmel,model: The user-visible name of this sound complex.
  - atmel,audio-routing: A list of the connections between audio components.
  - atmel,ssc-controller: The phandle of the SSC controller
  - atmel,audio-codec: The phandle of the WM8731 audio codec
Optional properties:
  - pinctrl-names, pinctrl-0: Please refer to pinctrl-bindings.txt

Example:
sound {
	compatible = "atmel,at91sam9g20ek-wm8731-audio";
	pinctrl-names = "default";
	pinctrl-0 = <&pinctrl_pck0_as_mck>;

	atmel,model = "wm8731 @ AT91SAMG20EK";

	atmel,audio-routing =
		"Ext Spk", "LHPOUT",
		"Int MIC", "MICIN";

	atmel,ssc-controller = <&ssc0>;
	atmel,audio-codec = <&wm8731>;
};
Loading