mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-05 16:34:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'samsung-dt-4.18-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Browse Source 
Samsung DTS ARM changes for v4.18, part 2

1. Add support for audio over HDMI for Odroid X/X2/U3.

* tag 'samsung-dt-4.18-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add support for audio over HDMI for Odroid X/X2/U3

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2018-05-25 14:57:41 -07:00
parent c70ceb7973 6860510146
commit da91a61df4
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View File

@@ -37,20 +37,14 @@ power_key {
};
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 @@ &camera {
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>;
<&clock_audss EXYNOS_MOUT_AUDSS>;
assigned-clock-rates = <0>, <0>,
<196608001>,
<(196608001 / 2)>,
<(196608001 / 8)>;
};
&cpu0 {
@@ -498,6 +503,8 @@ &i2s0 {
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 {

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

@@ -113,11 +113,11 @@ port@2 {
};
&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",

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

@@ -97,12 +97,12 @@ &serial_3 {
};
&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",