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

Commit 68605101 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Krzysztof Kozlowski
Browse files

ARM: dts: exynos: Add support for audio over HDMI for Odroid X/X2/U3 



This patch switches Odroid X/X2/U3 to use dedicated Odroid audio subsystem
DT bindings instead of the simple-card in order to add support for audio
over HDMI.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 83cb529b

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

+20 −13
Original line number Diff line number Diff line
@@ -37,20 +37,14 @@ 
	};



	sound: sound {

		compatible = "simple-audio-card";

		compatible = "hardkernel,odroid-xu4-audio";



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

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

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



		simple-audio-card,cpu {

		cpu {

			sound-dai = <&i2s0 0>;

			system-clock-frequency = <19200000>;

		};



		link0_codec: simple-audio-card,codec {

			sound-dai = <&max98090>;

			clocks = <&i2s0 CLK_I2S_CDCLK>;

		codec {

			sound-dai = <&hdmi>, <&max98090>;

		};

	};
@@ -142,14 +136,25 @@ 
	pinctrl-0 = <>;

};



&clock {

	assigned-clocks = <&clock CLK_FOUT_EPLL>;

	assigned-clock-rates = <45158401>;

};



&clock_audss {

	assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,

			<&clock_audss EXYNOS_MOUT_I2S>,

			<&clock_audss EXYNOS_DOUT_SRP>,

			<&clock_audss EXYNOS_DOUT_AUD_BUS>;

			<&clock_audss EXYNOS_DOUT_AUD_BUS>,

			<&clock_audss EXYNOS_DOUT_I2S>;



	assigned-clock-parents = <&clock CLK_FOUT_EPLL>,

			  <&clock_audss EXYNOS_MOUT_AUDSS>;

	assigned-clock-rates = <0>, <0>, <192000000>, <19200000>;



	assigned-clock-rates = <0>, <0>,

			<196608001>,

			<(196608001 / 2)>,

			<(196608001 / 8)>;

};



&cpu0 {
@@ -498,6 +503,8 @@ 
	pinctrl-0 = <&i2s0_bus>;

	pinctrl-names = "default";

	status = "okay";

	assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;

	assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;

};



&mixer {

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

+3 −3
Original line number Diff line number Diff line
@@ -113,11 +113,11 @@ 
};



&sound {

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

	simple-audio-card,widgets =

	model = "Odroid-U3";

	samsung,audio-widgets =

		"Headphone", "Headphone Jack",

		"Speakers", "Speakers";

	simple-audio-card,routing =

	samsung,audio-routing =

		"Headphone Jack", "HPL",

		"Headphone Jack", "HPR",

		"Headphone Jack", "MICBIAS",

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

+3 −3
Original line number Diff line number Diff line
@@ -97,12 +97,12 @@ 
};



&sound {

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

	simple-audio-card,widgets =

	model = "Odroid-X";

	samsung,audio-widgets =

		"Headphone", "Headphone Jack",

		"Microphone", "Mic Jack",

		"Microphone", "DMIC";

	simple-audio-card,routing =

	samsung,audio-routing =

		"Headphone Jack", "HPL",

		"Headphone Jack", "HPR",

		"IN1", "Mic Jack",