diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2018-03-09 12:22:48 -0500 |
---|---|---|
committer | Krzysztof Kozlowski <krzk@kernel.org> | 2018-03-11 13:41:30 -0400 |
commit | 6ab569936d609b7aecfa33ef3c2d60ebdef6dc2b (patch) | |
tree | d5aa4358c7f4729563dd1f22653f5fa0aed28f22 | |
parent | e9eefc3f8ce09eb2262d7d817980816132158196 (diff) |
ARM: dts: exynos: Enable HDMI audio on Snow Chromebook
This patch adds new cpu, codec subnodes according to the updated
"google,snow-audio-max98095" DT bindings and the I2S clock tree
configuration so sound on the HDMI interface can also be supported.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
-rw-r--r-- | arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5250-snow.dts | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi index bdf59dd3654b..fd9226d3b207 100644 --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <dt-bindings/clock/maxim,max77686.h> | 9 | #include <dt-bindings/clock/maxim,max77686.h> |
10 | #include <dt-bindings/interrupt-controller/irq.h> | 10 | #include <dt-bindings/interrupt-controller/irq.h> |
11 | #include <dt-bindings/input/input.h> | 11 | #include <dt-bindings/input/input.h> |
12 | #include <dt-bindings/sound/samsung-i2s.h> | ||
12 | #include "exynos5250.dtsi" | 13 | #include "exynos5250.dtsi" |
13 | 14 | ||
14 | / { | 15 | / { |
@@ -523,6 +524,8 @@ | |||
523 | }; | 524 | }; |
524 | 525 | ||
525 | &i2s0 { | 526 | &i2s0 { |
527 | assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>; | ||
528 | assigned-clock-parents = <&clock_audss EXYNOS_I2S_BUS>; | ||
526 | status = "okay"; | 529 | status = "okay"; |
527 | }; | 530 | }; |
528 | 531 | ||
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 16e37c337a3f..75fdc5e6d423 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts | |||
@@ -18,6 +18,14 @@ | |||
18 | 18 | ||
19 | samsung,model = "Snow-I2S-MAX98095"; | 19 | samsung,model = "Snow-I2S-MAX98095"; |
20 | samsung,audio-codec = <&max98095>; | 20 | samsung,audio-codec = <&max98095>; |
21 | |||
22 | cpu { | ||
23 | sound-dai = <&i2s0 0>; | ||
24 | }; | ||
25 | |||
26 | codec { | ||
27 | sound-dai = <&max98095 0>, <&hdmi>; | ||
28 | }; | ||
21 | }; | 29 | }; |
22 | }; | 30 | }; |
23 | 31 | ||
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 93f45a71439b..ebc79114b0ce 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -498,6 +498,7 @@ | |||
498 | pinctrl-names = "default"; | 498 | pinctrl-names = "default"; |
499 | pinctrl-0 = <&i2s0_bus>; | 499 | pinctrl-0 = <&i2s0_bus>; |
500 | power-domains = <&pd_mau>; | 500 | power-domains = <&pd_mau>; |
501 | #clock-cells = <1>; | ||
501 | }; | 502 | }; |
502 | 503 | ||
503 | i2s1: i2s@12d60000 { | 504 | i2s1: i2s@12d60000 { |