ARM: dts: exynos: Move audio clocks configuration to odroidxu3-audio.dtsi

Audio subsystem clocks configuration is a part of audio block,
so there it should be moved to exynos5422-odroidxu3-audio.dtsi
to avoid it on Odroid XU4, which has no audio codec.

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

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
index c0b85981c6bf741dadd6d9fd6e91ddd79e808c2f..da3141a307d5ea1dd3ab576b726d1ef5227bb48b 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
@@ -11,6 +11,8 @@
  * published by the Free Software Foundation.
 */
 
+#include <dt-bindings/sound/samsung-i2s.h>
+
 / {
        sound: sound {
                compatible = "simple-audio-card";
@@ -43,6 +45,17 @@
        };
 };
 
+&clock_audss {
+       assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
+                       <&clock_audss EXYNOS_MOUT_I2S>,
+                       <&clock_audss EXYNOS_DOUT_AUD_BUS>;
+       assigned-clock-parents = <&clock CLK_FIN_PLL>,
+                       <&clock_audss EXYNOS_MOUT_AUDSS>;
+       assigned-clock-rates = <0>,
+                       <0>,
+                       <19200000>;
+};
+
 &hsi2c_5 {
        status = "okay";
        max98090: max98090@10 {

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 305c2a2b728c712f704d145d14f926a0cb63ecb2..4478a089353a992c6b280fe39c2987888052616a 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -16,7 +16,6 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/sound/samsung-i2s.h>
 #include "exynos5800.dtsi"
 #include "exynos5422-cpus.dtsi"
 
@@ -455,17 +454,6 @@
        status = "okay";
 };
 
-&clock_audss {
-       assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
-                       <&clock_audss EXYNOS_MOUT_I2S>,
-                       <&clock_audss EXYNOS_DOUT_AUD_BUS>;
-       assigned-clock-parents = <&clock CLK_FIN_PLL>,
-                       <&clock_audss EXYNOS_MOUT_AUDSS>;
-       assigned-clock-rates = <0>,
-                       <0>,
-                       <19200000>;
-};
-
 &cpu0 {
        cpu-supply = <&buck6_reg>;
 };