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

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

Merge tag 'asoc-v3.20-3' of... 

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

ASoC: Final updates for v3.20

A few more updates for v3.20 that have accumilated over the second half
of last week.  One new (relatively simple) driver for the Maxim
max98357a and some other driver specific fixes and enhancements.  I did
apply a few patches that haven't been in -next just now before sending
this, all fixes except for one simple device ID addition patch.
parents d34890cf f4c2e9bc

Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Ingenic JZ4740 I2S controller



Required properties:

- compatible : "ingenic,jz4740-i2s"

- reg : I2S registers location and length

- clocks : AIC and I2S PLL clock specifiers.

- clock-names: "aic" and "i2s"

- dmas: DMA controller phandle and DMA request line for I2S Tx and Rx channels

- dma-names: Must be "tx" and "rx"



Example:



i2s: i2s@10020000 {

	compatible = "ingenic,jz4740-i2s";

	reg = <0x10020000 0x94>;



	clocks = <&cgu JZ4740_CLK_AIC>, <&cgu JZ4740_CLK_I2SPLL>;

	clock-names = "aic", "i2s";



	dmas = <&dma 2>, <&dma 3>;

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



};

Documentation/devicetree/bindings/sound/max98357a.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
Maxim MAX98357A audio DAC



This node models the Maxim MAX98357A DAC.



Required properties:

- compatible   : "maxim,max98357a"

- sdmode-gpios : GPIO specifier for the GPIO -> DAC SDMODE pin



Example:



max98357a {

	compatible = "maxim,max98357a";

	sdmode-gpios = <&qcom_pinmux 25 0>;

};

arch/arm/boot/dts/exynos4.dtsi

+11 −2
Original line number Diff line number Diff line
@@ -61,9 +61,12 @@ 
		reg = <0x03830000 0x100>;

		clocks = <&clock_audss EXYNOS_I2S_BUS>;

		clock-names = "iis";

		#clock-cells = <1>;

		clock-output-names = "i2s_cdclk0";

		dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;

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

		samsung,idma-addr = <0x03000000>;

		#sound-dai-cells = <1>;

		status = "disabled";

	};
@@ -368,22 +371,28 @@ 
	};



	i2s1: i2s@13960000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13960000 0x100>;

		clocks = <&clock CLK_I2S1>;

		clock-names = "iis";

		#clock-cells = <1>;

		clock-output-names = "i2s_cdclk1";

		dmas = <&pdma1 12>, <&pdma1 11>;

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

		#sound-dai-cells = <1>;

		status = "disabled";

	};



	i2s2: i2s@13970000 {

		compatible = "samsung,s5pv210-i2s";

		compatible = "samsung,s3c6410-i2s";

		reg = <0x13970000 0x100>;

		clocks = <&clock CLK_I2S2>;

		clock-names = "iis";

		#clock-cells = <1>;

		clock-output-names = "i2s_cdclk2";

		dmas = <&pdma0 14>, <&pdma0 13>;

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

		#sound-dai-cells = <1>;

		status = "disabled";

	};

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+22 −5
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * published by the Free Software Foundation.

*/



#include <dt-bindings/sound/samsung-i2s.h>

#include <dt-bindings/input/input.h>

#include "exynos4412.dtsi"
@@ -37,14 +38,13 @@ 
		pinctrl-names = "default";

		status = "okay";

		clocks = <&clock_audss EXYNOS_I2S_BUS>,

			 <&clock_audss EXYNOS_DOUT_AUD_BUS>;

		clock-names = "iis", "i2s_opclk0";

			 <&clock_audss EXYNOS_DOUT_AUD_BUS>,

			 <&clock_audss EXYNOS_SCLK_I2S>;

		clock-names = "iis", "i2s_opclk0", "i2s_opclk1";

	};



	sound: sound {

		compatible = "samsung,odroidx2-audio";

		samsung,i2s-controller = <&i2s0>;

		samsung,audio-codec = <&max98090>;

		compatible = "simple-audio-card";

		assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,

				<&clock_audss EXYNOS_MOUT_I2S>,

				<&clock_audss EXYNOS_DOUT_SRP>,
@@ -55,6 +55,20 @@ 
				<0>,

				<192000000>,

				<19200000>;



		simple-audio-card,format = "i2s";

		simple-audio-card,bitclock-master = <&link0_codec>;

		simple-audio-card,frame-master = <&link0_codec>;



		simple-audio-card,cpu {

			sound-dai = <&i2s0 0>;

			system-clock-frequency = <19200000>;

		};



		link0_codec: simple-audio-card,codec {

			sound-dai = <&max98090>;

			clocks = <&i2s0 CLK_I2S_CDCLK>;

		};

	};



	mmc@12550000 {
@@ -373,6 +387,9 @@ 
			reg = <0x10>;

			interrupt-parent = <&gpx0>;

			interrupts = <0 0>;

			clocks = <&i2s0 CLK_I2S_CDCLK>;

			clock-names = "mclk";

			#sound-dai-cells = <0>;

		};

	};

arch/arm/boot/dts/exynos4412-odroidu3.dts

+5 −3
Original line number Diff line number Diff line
@@ -49,9 +49,11 @@ 
};



&sound {

	compatible = "samsung,odroidu3-audio";

	samsung,model = "Odroid-U3";

	samsung,audio-routing =

	simple-audio-card,name = "Odroid-U3";

	simple-audio-card,widgets =

		"Headphone", "Headphone Jack",

		"Speakers", "Speakers";

	simple-audio-card,routing =

		"Headphone Jack", "HPL",

		"Headphone Jack", "HPR",

		"Headphone Jack", "MICBIAS",