ARM: dts: exynos: Add support for HDMI audio on Exynos 5433 TM2 board

This patch updates the sound node of the exynos5433-tm2 board
and adds clock tree configuration in order to support HDMI sound.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index a77462da4a367c8caed7f2599fdf8f996f647ff5..b73c389e1a8bdb1e74e5ce6a78bdb925d21e7049 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -14,6 +14,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/sound/samsung-i2s.h>
 
 / {
        aliases {
@@ -112,8 +113,8 @@
 
        sound {
                compatible = "samsung,tm2-audio";
-               audio-codec = <&wm5110>;
-               i2s-controller = <&i2s0>;
+               audio-codec = <&wm5110>, <&hdmi>;
+               i2s-controller = <&i2s0 0>, <&i2s1 0>;
                audio-amplifier = <&max98504>;
                mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>;
                model = "wm5110";
@@ -217,8 +218,40 @@
 };
 
 &cmu_aud {
-       assigned-clocks = <&cmu_aud CLK_MOUT_AUD_PLL_USER>;
-       assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>;
+       assigned-clocks = <&cmu_aud CLK_MOUT_AUD_PLL_USER>,
+               <&cmu_aud CLK_MOUT_SCLK_AUD_I2S>,
+               <&cmu_aud CLK_MOUT_SCLK_AUD_PCM>,
+               <&cmu_top CLK_MOUT_AUD_PLL>,
+               <&cmu_top CLK_MOUT_AUD_PLL_USER_T>,
+               <&cmu_top CLK_MOUT_SCLK_AUDIO0>,
+               <&cmu_top CLK_MOUT_SCLK_AUDIO1>,
+               <&cmu_top CLK_MOUT_SCLK_SPDIF>,
+
+               <&cmu_aud CLK_DIV_AUD_CA5>,
+               <&cmu_aud CLK_DIV_ACLK_AUD>,
+               <&cmu_aud CLK_DIV_PCLK_DBG_AUD>,
+               <&cmu_aud CLK_DIV_SCLK_AUD_I2S>,
+               <&cmu_aud CLK_DIV_SCLK_AUD_PCM>,
+               <&cmu_aud CLK_DIV_SCLK_AUD_SLIMBUS>,
+               <&cmu_aud CLK_DIV_SCLK_AUD_UART>,
+               <&cmu_top CLK_DIV_SCLK_AUDIO0>,
+               <&cmu_top CLK_DIV_SCLK_AUDIO1>,
+               <&cmu_top CLK_DIV_SCLK_PCM1>,
+               <&cmu_top CLK_DIV_SCLK_I2S1>;
+
+       assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>,
+               <&cmu_aud CLK_MOUT_AUD_PLL_USER>,
+               <&cmu_aud CLK_MOUT_AUD_PLL_USER>,
+               <&cmu_top CLK_FOUT_AUD_PLL>,
+               <&cmu_top CLK_MOUT_AUD_PLL>,
+               <&cmu_top CLK_MOUT_AUD_PLL_USER_T>,
+               <&cmu_top CLK_MOUT_AUD_PLL_USER_T>,
+               <&cmu_top CLK_SCLK_AUDIO0>;
+
+       assigned-clock-rates = <0>, <0>, <0>, <0>, <0>, <0>, <0>, <0>,
+               <196608001>, <65536001>, <32768001>, <49152001>,
+               <2048001>, <24576001>, <196608001>,
+               <24576001>, <98304001>, <2048001>, <49152001>;
 };
 
 &cmu_fsys {
@@ -267,6 +300,11 @@
                                 <&cmu_top CLK_MOUT_BUS_PLL_USER>;
 };
 
+&cmu_top {
+       assigned-clocks = <&cmu_top CLK_FOUT_AUD_PLL>;
+       assigned-clock-rates = <196608001>;
+};
+
 &cpu0 {
        cpu-supply = <&buck3_reg>;
 };
@@ -838,6 +876,12 @@
        status = "okay";
 };
 
+&i2s1 {
+       assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>;
+       assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>;
+       status = "okay";
+};
+
 &mshc_0 {
        status = "okay";
        mmc-hs200-1_8v;

diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index 2b73bd86bc564ab0c5a637b58605836dd62654af..c0231d077fa61f83dd66a7d9cd5aeb7423c6f6ff 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
@@ -969,6 +969,7 @@
                        ddc = <&hsi2c_11>;
                        samsung,syscon-phandle = <&pmu_system_controller>;
                        samsung,sysreg-phandle = <&syscon_disp>;
+                       #sound-dai-cells = <0>;
                        status = "disabled";
                };