Merge tag '4.21-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5422-odroidxu3-audio.dtsi

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
index 03611d50c5a9ea218eb9ae69491c43def82788d3..e84544b220b9e2fd8ad7771c5a9700a2ba8828c8 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
@@ -26,8 +26,7 @@
                        "Speakers", "SPKL",
                        "Speakers", "SPKR";
 
-               assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>,
-                               <&clock CLK_MOUT_EPLL>,
+               assigned-clocks = <&clock CLK_MOUT_EPLL>,
                                <&clock CLK_MOUT_MAU_EPLL>,
                                <&clock CLK_MOUT_USER_MAU_EPLL>,
                                <&clock_audss EXYNOS_MOUT_AUDSS>,
@@ -36,8 +35,7 @@
                                <&clock_audss EXYNOS_DOUT_AUD_BUS>,
                                <&clock_audss EXYNOS_DOUT_I2S>;
 
-               assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>,
-                               <&clock CLK_FOUT_EPLL>,
+               assigned-clock-parents = <&clock CLK_FOUT_EPLL>,
                                <&clock CLK_MOUT_EPLL>,
                                <&clock CLK_MOUT_MAU_EPLL>,
                                <&clock CLK_MAU_EPLL>,
@@ -48,7 +46,6 @@
                                <0>,
                                <0>,
                                <0>,
-                               <0>,
                                <196608001>,
                                <(196608002 / 2)>,
                                <196608000>;
@@ -84,4 +81,6 @@
 
 &i2s0 {
        status = "okay";
+       assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
+       assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;
 };