Merge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8996' and... (11e68886) · Commits · 戴 / test

Documentation/devicetree/bindings/sound/zte,zx-i2s.txt

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		ZTE ZX296702 I2S controller

		Required properties:
		- compatible : Must be "zte,zx296702-i2s"
		- reg : Must contain I2S core's registers location and length
		- clocks : Pairs of phandle and specifier referencing the controller's clocks.
		- clock-names: "tx" for the clock to the I2S interface.
		- dmas: Pairs of phandle and specifier for the DMA channel that is used by
		the core. The core expects two dma channels for transmit.
		- dma-names : Must be "tx" and "rx"

		For more details on the 'dma', 'dma-names', 'clock' and 'clock-names' properties
		please check:
		* resource-names.txt
		* clock/clock-bindings.txt
		* dma/dma.txt

		Example:
		i2s0: i2s0@0b005000 {
		#sound-dai-cells = <0>;
		compatible = "zte,zx296702-i2s";
		reg = <0x0b005000 0x1000>;
		clocks = <&lsp0clk ZX296702_I2S0_DIV>;
		clock-names = "tx";
		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&dma 5>, <&dma 6>;
		dma-names = "tx", "rx";
		status = "okay";
		};

		sound {
		compatible = "simple-audio-card";
		simple-audio-card,name = "zx296702_snd";
		simple-audio-card,format = "left_j";
		simple-audio-card,bitclock-master = <&sndcodec>;
		simple-audio-card,frame-master = <&sndcodec>;
		sndcpu: simple-audio-card,cpu {
		sound-dai = <&i2s0>;
		};

		sndcodec: simple-audio-card,codec {
		sound-dai = <&acodec>;
		};
		};

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		ZTE ZX296702 SPDIF controller

		Required properties:
		- compatible : Must be "zte,zx296702-spdif"
		- reg : Must contain SPDIF core's registers location and length
		- clocks : Pairs of phandle and specifier referencing the controller's clocks.
		- clock-names: "tx" for the clock to the SPDIF interface.
		- dmas: Pairs of phandle and specifier for the DMA channel that is used by
		the core. The core expects one dma channel for transmit.
		- dma-names : Must be "tx"

		For more details on the 'dma', 'dma-names', 'clock' and 'clock-names' properties
		please check:
		* resource-names.txt
		* clock/clock-bindings.txt
		* dma/dma.txt

		Example:
		spdif0: spdif0@0b004000 {
		compatible = "zte,zx296702-spdif";
		reg = <0x0b004000 0x1000>;
		clocks = <&lsp0clk ZX296702_SPDIF0_DIV>;
		clock-names = "tx";
		interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&dma 4>;
		dma-names = "tx";
		status = "okay";
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ source "sound/soc/tegra/Kconfig"
		source "sound/soc/txx9/Kconfig"
		source "sound/soc/ux500/Kconfig"
		source "sound/soc/xtensa/Kconfig"
		source "sound/soc/zte/Kconfig"

		# Supported codecs
		source "sound/soc/codecs/Kconfig"

+1 −0

+4 −2

Original line number	Diff line number	Diff line
		@@ -4084,7 +4084,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
		if (wm8994->micdet_irq)
		ret = request_threaded_irq(wm8994->micdet_irq, NULL,
		wm8994_mic_irq,
		IRQF_TRIGGER_RISING,
		IRQF_TRIGGER_RISING \|
		IRQF_ONESHOT,
		"Mic1 detect",
		wm8994);
		else
		@@ -4132,7 +4133,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
		if (wm8994->micdet_irq) {
		ret = request_threaded_irq(wm8994->micdet_irq, NULL,
		wm8958_mic_irq,
		IRQF_TRIGGER_RISING,
		IRQF_TRIGGER_RISING \|
		IRQF_ONESHOT,
		"Mic detect",
		wm8994);
		if (ret != 0)