Skip to content

Commit a798f2f

Browse files
mszyprowkrzk
authored andcommitted
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 <[email protected]> Reviewed-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent 3bf689f commit a798f2f

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
* published by the Free Software Foundation.
1212
*/
1313

14+
#include <dt-bindings/sound/samsung-i2s.h>
15+
1416
/ {
1517
sound: sound {
1618
compatible = "simple-audio-card";
@@ -43,6 +45,17 @@
4345
};
4446
};
4547

48+
&clock_audss {
49+
assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
50+
<&clock_audss EXYNOS_MOUT_I2S>,
51+
<&clock_audss EXYNOS_DOUT_AUD_BUS>;
52+
assigned-clock-parents = <&clock CLK_FIN_PLL>,
53+
<&clock_audss EXYNOS_MOUT_AUDSS>;
54+
assigned-clock-rates = <0>,
55+
<0>,
56+
<19200000>;
57+
};
58+
4659
&hsi2c_5 {
4760
status = "okay";
4861
max98090: max98090@10 {

arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <dt-bindings/input/input.h>
1717
#include <dt-bindings/interrupt-controller/irq.h>
1818
#include <dt-bindings/gpio/gpio.h>
19-
#include <dt-bindings/sound/samsung-i2s.h>
2019
#include "exynos5800.dtsi"
2120
#include "exynos5422-cpus.dtsi"
2221

@@ -455,17 +454,6 @@
455454
status = "okay";
456455
};
457456

458-
&clock_audss {
459-
assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>,
460-
<&clock_audss EXYNOS_MOUT_I2S>,
461-
<&clock_audss EXYNOS_DOUT_AUD_BUS>;
462-
assigned-clock-parents = <&clock CLK_FIN_PLL>,
463-
<&clock_audss EXYNOS_MOUT_AUDSS>;
464-
assigned-clock-rates = <0>,
465-
<0>,
466-
<19200000>;
467-
};
468-
469457
&cpu0 {
470458
cpu-supply = <&buck6_reg>;
471459
};

0 commit comments

Comments
 (0)