p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Samsung DTS ARM changes for v4.21, part 2 

1. Add missing CPUs in cooling maps for Odroid X2 (missed in previous
    round of fixups).
 2. Fix clock configuration in audio subsystem on Odroid XU3/XU4.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAlwZT90QHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD1+TxD/9eHjeon87f2f61FlO+u9+gN+kSwn1hwSj+
 bsz6GG0CuG5WWX5Lr8K5Uu+wtxEOfN4d1VoMH7rFiznkGxE5YpZc0hiK1qwsKtos
 E8IAAFjC+C4DpH8q1mojF9pSnLVpn+BFXsfR1JI4hgxrfwTKWJ8BJaNFdWOfFsyG
 1UduKVXgftnSF+iSVeX5vTRsQpBKPlm/5/ULhPyvJ+la9LzE6ZJ0E8hW3EgLtzQx
 T5BPyZlrd48EJHinO5imBy+h5z5Ca7Hg23twtBJC4ei0Zbc7KHXY6xxpKab7qLcs
 Zzs29R3PyNuOg1RTzZsIA+RxiytbRNjHhuPaP8XQa0i9WxkMgRRG7ITn2L4hLYvb
 ufME4mnQ4K8hCooV96gJvfzy9T5NYrNnmcKKnNLeAkcWHV/nXEyPVGXUYVMwTdev
 Zs9FWfn1E2fjCGu0sHp+PMQZXarEI0uC7tOnGROOHHKIxaH2Pf2OltVfJhGg29yu
 4+JCVJju/G328RfYgjb/GDoU1WHl+5mhs0NQxjxdG6cV83K7sNeUMMv+2se5NlRD
 xZYEAovzGogcOrOc1NlNzOQBwZlXdtFVz45em6qRFPomURgtLQuMZWSpPscRvajH
 Pn0FPK2ah80n8rSeHWx3nNuuUZcGT1g1muM3zxshNy+jOHwHzyM8Gp5fjrNQzZ4Q
 93jGdUPmMw==
 =dIrg
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Samsung DTS ARM changes for v4.21, part 2

1. Add missing CPUs in cooling maps for Odroid X2 (missed in previous
   round of fixups).
2. Fix clock configuration in audio subsystem on Odroid XU3/XU4.

* tag 'samsung-dt-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Specify I2S assigned clocks in proper node
  ARM: dts: exynos: Add missing CPUs in cooling maps for Odroid X2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2018-12-20 16:59:42 +01:00
parent bda090cfeb 8ac686d7df
commit 3f47de2c6b
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/exynos4412-prime.dtsi
View File

@ -30,9 +30,11 @@ opp-1704000000 {
};
&cooling_map0 {
cooling-device = <&cpu0 9 9>;
cooling-device = <&cpu0 9 9>, <&cpu1 9 9>,
<&cpu2 9 9>, <&cpu3 9 9>;
};
&cooling_map1 {
cooling-device = <&cpu0 15 15>;
cooling-device = <&cpu0 15 15>, <&cpu1 15 15>,
<&cpu2 15 15>, <&cpu3 15 15>;
};

9
arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
View File

@ -26,8 +26,7 @@ sound: sound {
"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 @@ sound: sound {
<&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 @@ sound: sound {
<0>,
<0>,
<0>,
<0>,
<196608001>,
<(196608002 / 2)>,
<196608000>;
@ -84,4 +81,6 @@ max98090: max98090@10 {
&i2s0 {
status = "okay";
assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;
};

9
arch/arm/boot/dts/exynos5422-odroidxu4.dts
View File

@ -33,8 +33,7 @@ sound: sound {
compatible = "samsung,odroid-xu3-audio";
model = "Odroid-XU4";
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>,
@ -43,8 +42,7 @@ sound: sound {
<&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>,
@ -55,7 +53,6 @@ sound: sound {
<0>,
<0>,
<0>,
<0>,
<196608001>,
<(196608002 / 2)>,
<196608000>;
@ -79,6 +76,8 @@ &clock_audss {
&i2s0 {
status = "okay";
assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>;
assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>;
};
&pwm {