diff options
| -rw-r--r-- | arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/exynos5422-odroidxu4.dts | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi index 03611d50c5a9..e84544b220b9 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | |||
| @@ -26,8 +26,7 @@ | |||
| 26 | "Speakers", "SPKL", | 26 | "Speakers", "SPKL", |
| 27 | "Speakers", "SPKR"; | 27 | "Speakers", "SPKR"; |
| 28 | 28 | ||
| 29 | assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>, | 29 | assigned-clocks = <&clock CLK_MOUT_EPLL>, |
| 30 | <&clock CLK_MOUT_EPLL>, | ||
| 31 | <&clock CLK_MOUT_MAU_EPLL>, | 30 | <&clock CLK_MOUT_MAU_EPLL>, |
| 32 | <&clock CLK_MOUT_USER_MAU_EPLL>, | 31 | <&clock CLK_MOUT_USER_MAU_EPLL>, |
| 33 | <&clock_audss EXYNOS_MOUT_AUDSS>, | 32 | <&clock_audss EXYNOS_MOUT_AUDSS>, |
| @@ -36,8 +35,7 @@ | |||
| 36 | <&clock_audss EXYNOS_DOUT_AUD_BUS>, | 35 | <&clock_audss EXYNOS_DOUT_AUD_BUS>, |
| 37 | <&clock_audss EXYNOS_DOUT_I2S>; | 36 | <&clock_audss EXYNOS_DOUT_I2S>; |
| 38 | 37 | ||
| 39 | assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>, | 38 | assigned-clock-parents = <&clock CLK_FOUT_EPLL>, |
| 40 | <&clock CLK_FOUT_EPLL>, | ||
| 41 | <&clock CLK_MOUT_EPLL>, | 39 | <&clock CLK_MOUT_EPLL>, |
| 42 | <&clock CLK_MOUT_MAU_EPLL>, | 40 | <&clock CLK_MOUT_MAU_EPLL>, |
| 43 | <&clock CLK_MAU_EPLL>, | 41 | <&clock CLK_MAU_EPLL>, |
| @@ -48,7 +46,6 @@ | |||
| 48 | <0>, | 46 | <0>, |
| 49 | <0>, | 47 | <0>, |
| 50 | <0>, | 48 | <0>, |
| 51 | <0>, | ||
| 52 | <196608001>, | 49 | <196608001>, |
| 53 | <(196608002 / 2)>, | 50 | <(196608002 / 2)>, |
| 54 | <196608000>; | 51 | <196608000>; |
| @@ -84,4 +81,6 @@ | |||
| 84 | 81 | ||
| 85 | &i2s0 { | 82 | &i2s0 { |
| 86 | status = "okay"; | 83 | status = "okay"; |
| 84 | assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>; | ||
| 85 | assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>; | ||
| 87 | }; | 86 | }; |
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu4.dts b/arch/arm/boot/dts/exynos5422-odroidxu4.dts index 4a30cc849b00..122174ea9e0a 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu4.dts +++ b/arch/arm/boot/dts/exynos5422-odroidxu4.dts | |||
| @@ -33,8 +33,7 @@ | |||
| 33 | compatible = "samsung,odroid-xu3-audio"; | 33 | compatible = "samsung,odroid-xu3-audio"; |
| 34 | model = "Odroid-XU4"; | 34 | model = "Odroid-XU4"; |
| 35 | 35 | ||
| 36 | assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>, | 36 | assigned-clocks = <&clock CLK_MOUT_EPLL>, |
| 37 | <&clock CLK_MOUT_EPLL>, | ||
| 38 | <&clock CLK_MOUT_MAU_EPLL>, | 37 | <&clock CLK_MOUT_MAU_EPLL>, |
| 39 | <&clock CLK_MOUT_USER_MAU_EPLL>, | 38 | <&clock CLK_MOUT_USER_MAU_EPLL>, |
| 40 | <&clock_audss EXYNOS_MOUT_AUDSS>, | 39 | <&clock_audss EXYNOS_MOUT_AUDSS>, |
| @@ -43,8 +42,7 @@ | |||
| 43 | <&clock_audss EXYNOS_DOUT_AUD_BUS>, | 42 | <&clock_audss EXYNOS_DOUT_AUD_BUS>, |
| 44 | <&clock_audss EXYNOS_DOUT_I2S>; | 43 | <&clock_audss EXYNOS_DOUT_I2S>; |
| 45 | 44 | ||
| 46 | assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>, | 45 | assigned-clock-parents = <&clock CLK_FOUT_EPLL>, |
| 47 | <&clock CLK_FOUT_EPLL>, | ||
| 48 | <&clock CLK_MOUT_EPLL>, | 46 | <&clock CLK_MOUT_EPLL>, |
| 49 | <&clock CLK_MOUT_MAU_EPLL>, | 47 | <&clock CLK_MOUT_MAU_EPLL>, |
| 50 | <&clock CLK_MAU_EPLL>, | 48 | <&clock CLK_MAU_EPLL>, |
| @@ -55,7 +53,6 @@ | |||
| 55 | <0>, | 53 | <0>, |
| 56 | <0>, | 54 | <0>, |
| 57 | <0>, | 55 | <0>, |
| 58 | <0>, | ||
| 59 | <196608001>, | 56 | <196608001>, |
| 60 | <(196608002 / 2)>, | 57 | <(196608002 / 2)>, |
| 61 | <196608000>; | 58 | <196608000>; |
| @@ -79,6 +76,8 @@ | |||
| 79 | 76 | ||
| 80 | &i2s0 { | 77 | &i2s0 { |
| 81 | status = "okay"; | 78 | status = "okay"; |
| 79 | assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>; | ||
| 80 | assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>; | ||
| 82 | }; | 81 | }; |
| 83 | 82 | ||
| 84 | &pwm { | 83 | &pwm { |
