niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Sylwester Nawrocki 2018-05-14 10:01:48 +02:00 • committed by Krzysztof Kozlowski
parent 83cb529b2e
commit 6860510146
3 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View file

@ -37,20 +37,14 @@
}; };
sound: sound { sound: sound {
compatible = "simple-audio-card"; compatible = "hardkernel,odroid-xu4-audio";
simple-audio-card,format = "i2s"; cpu {
simple-audio-card,bitclock-master = <&link0_codec>;
simple-audio-card,frame-master = <&link0_codec>;
simple-audio-card,cpu {
sound-dai = <&i2s0 0>; sound-dai = <&i2s0 0>;
system-clock-frequency = <19200000>;
}; };
link0_codec: simple-audio-card,codec { codec {
sound-dai = <&max98090>; sound-dai = <&hdmi>, <&max98090>;
clocks = <&i2s0 CLK_I2S_CDCLK>;
}; };
}; };
@ -142,14 +136,25 @@
pinctrl-0 = <>; pinctrl-0 = <>;
}; };
&clock {
assigned-clocks = <&clock CLK_FOUT_EPLL>;
assigned-clock-rates = <45158401>;
};
&clock_audss { &clock_audss {
assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>, assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
<&clock_audss EXYNOS_MOUT_I2S>, <&clock_audss EXYNOS_MOUT_I2S>,
<&clock_audss EXYNOS_DOUT_SRP>, <&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>, assigned-clock-parents = <&clock CLK_FOUT_EPLL>,
<&clock_audss EXYNOS_MOUT_AUDSS>; <&clock_audss EXYNOS_MOUT_AUDSS>;
assigned-clock-rates = <0>, <0>, <192000000>, <19200000>;
assigned-clock-rates = <0>, <0>,
<196608001>,
<(196608001 / 2)>,
<(196608001 / 8)>;
}; };
&cpu0 { &cpu0 {
@ -498,6 +503,8 @@
pinctrl-0 = <&i2s0_bus>; pinctrl-0 = <&i2s0_bus>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;
}; };
&mixer { &mixer {

6
arch/arm/boot/dts/exynos4412-odroidu3.dts
View file

@ -113,11 +113,11 @@
}; };
&sound { &sound {
simple-audio-card,name = "Odroid-U3"; model = "Odroid-U3";
simple-audio-card,widgets = samsung,audio-widgets =
"Headphone", "Headphone Jack", "Headphone", "Headphone Jack",
"Speakers", "Speakers"; "Speakers", "Speakers";
simple-audio-card,routing = samsung,audio-routing =
"Headphone Jack", "HPL", "Headphone Jack", "HPL",
"Headphone Jack", "HPR", "Headphone Jack", "HPR",
"Headphone Jack", "MICBIAS", "Headphone Jack", "MICBIAS",

6
arch/arm/boot/dts/exynos4412-odroidx.dts
View file

@ -97,12 +97,12 @@
}; };
&sound { &sound {
simple-audio-card,name = "Odroid-X"; model = "Odroid-X";
simple-audio-card,widgets = samsung,audio-widgets =
"Headphone", "Headphone Jack", "Headphone", "Headphone Jack",
"Microphone", "Mic Jack", "Microphone", "Mic Jack",
"Microphone", "DMIC"; "Microphone", "DMIC";
simple-audio-card,routing = samsung,audio-routing =
"Headphone Jack", "HPL", "Headphone Jack", "HPL",
"Headphone Jack", "HPR", "Headphone Jack", "HPR",
"IN1", "Mic Jack", "IN1", "Mic Jack",