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

Merge remote-tracking branches 'asoc/topic/wm8804', 'asoc/topic/wm8904',... 

Merge remote-tracking branches 'asoc/topic/wm8804', 'asoc/topic/wm8904', 'asoc/topic/wm8960', 'asoc/topic/wm8988' and 'asoc/topic/xtfpga' into asoc-next
parents 1525da06 27ad02f3 4d4f175a 75aa8868 b682d7ba 57b7068d

Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Bindings for I2S controller built into xtfpga Xtensa bitstreams.



Required properties:

- compatible: shall be "cdns,xtfpga-i2s".

- reg: memory region (address and length) with device registers.

- interrupts: interrupt for the device.

- clocks: phandle to the clk used as master clock. I2S bus clock

  is derived from it.



Examples:



	i2s0: xtfpga-i2s@0d080000 {

		#sound-dai-cells = <0>;

		compatible = "cdns,xtfpga-i2s";

		reg = <0x0d080000 0x40>;

		interrupts = <2 1>;

		clocks = <&cdce706 4>;

	};

Documentation/devicetree/bindings/sound/wm8904.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ WM8904 audio CODEC 
This device supports I2C only.



Required properties:

  - compatible: "wlf,wm8904"

  - compatible: "wlf,wm8904" or "wlf,wm8912"

  - reg: the I2C address of the device.

  - clock-names: "mclk"

  - clocks: reference to

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10669,6 +10669,7 @@ M: Max Filippov <jcmvbkbc@gmail.com> 
L:	linux-xtensa@linux-xtensa.org

S:	Maintained

F:	drivers/spi/spi-xtensa-xtfpga.c

F:	sound/soc/xtensa/xtfpga-i2s.c



YAM DRIVER FOR AX.25

M:	Jean-Paul Roubelat <jpr@f6fbb.org>

sound/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ source "sound/soc/spear/Kconfig" 
source "sound/soc/tegra/Kconfig"

source "sound/soc/txx9/Kconfig"

source "sound/soc/ux500/Kconfig"

source "sound/soc/xtensa/Kconfig"



# Supported codecs

source "sound/soc/codecs/Kconfig"

sound/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,3 +36,4 @@ obj-$(CONFIG_SND_SOC) += spear/ 
obj-$(CONFIG_SND_SOC)	+= tegra/

obj-$(CONFIG_SND_SOC)	+= txx9/

obj-$(CONFIG_SND_SOC)	+= ux500/

obj-$(CONFIG_SND_SOC)	+= xtensa/