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

Commit 16696337 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mark Brown
Browse files

ARM: dts: Switch Odroid X2/U2 to simple-audio-card 



Now when the CDCLK I2S output clock can be handled through the clock
API the Odroid X2/U3 can be switched to the simple-audio-card DT binding.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3635acef

arch/arm/boot/dts/exynos4.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
		dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>;

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

		samsung,idma-addr = <0x03000000>;

		#sound-dai-cells = <1>;

		status = "disabled";

	};
@@ -378,6 +379,7 @@ 
		clock-output-names = "i2s_cdclk1";

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

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

		#sound-dai-cells = <1>;

		status = "disabled";

	};
@@ -390,6 +392,7 @@ 
		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

+16 −3
Original line number Diff line number Diff line
@@ -44,9 +44,7 @@ 
	};



	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>,
@@ -57,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 {
@@ -377,6 +389,7 @@ 
			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",

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

+6 −2
Original line number Diff line number Diff line
@@ -23,8 +23,12 @@ 
};



&sound {

	samsung,model = "Odroid-X2";

	samsung,audio-routing =

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

	simple-audio-card,widgets =

		"Headphone", "Headphone Jack",

		"Microphone", "Mic Jack",

		"Microphone", "DMIC";

	simple-audio-card,routing =

		"Headphone Jack", "HPL",

		"Headphone Jack", "HPR",

		"IN1", "Mic Jack",