Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6f9fa88 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt-4.21-2' of... 

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

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 https://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
  ARM: dts: exynos: remove display-port node from Arndale
  ARM: dts: exynos: Add opp-suspend to DMC and leftbus devfreq OPPs on Exynos4
  ARM: dts: s5pv210: Add s5p-jpeg codec node.
  ARM: dts: exynos: Use Samsung SoC specific compatible for DWC2 module
  ARM: dts: exynos: Add all CPUs in cooling maps
  ARM: dts: exynos: Clarify comment explaining purpose of Odroid XU3 DTSI
  ARM: dts: exynos: Add pin configuration for SD write protect on Odroid XU3/XU4/HC1
  ARM: dts: exynos: Update maximum frequency for eMMC to 200MHz on Odroid XU3/XU4
  ARM: dts: exynos: Update maximum frequency for SD card to 200MHz on Odroid XU3/XU4/HC1
  ARM: dts: exynos: Fix LDO13 min values on Odroid XU3/XU4/HC1
  ARM: dts: exynos: Add UHS-I bus speed support to Odroid XU3/XU4/HC1
  ARM: dts: exynos: Add missing clocks to RTC node for Arndale board
  ARM: dts: exynos: Add compatible for s5m8767 clocks node on Itop Core
  ARM: dts: exynos: Add compatible for s2mps11 clocks node on Exynos542x

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a684afa7 8ac686d7

arch/arm/boot/dts/exynos3250-artik5.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -36,11 +36,13 @@ 
			cooling-maps {

				map0 {

					/* Corresponds to 500MHz */

					cooling-device = <&cpu0 5 5>;

					cooling-device = <&cpu0 5 5>,

							 <&cpu1 5 5>;

				};

				map1 {

					/* Corresponds to 200MHz */

					cooling-device = <&cpu0 8 8>;

					cooling-device = <&cpu0 8 8>,

							 <&cpu1 8 8>;

				};

			};

		};

arch/arm/boot/dts/exynos3250-monk.dts

+4 −2
Original line number Diff line number Diff line
@@ -121,11 +121,13 @@ 
			cooling-maps {

				map0 {

					/* Correspond to 500MHz at freq_table */

					cooling-device = <&cpu0 5 5>;

					cooling-device = <&cpu0 5 5>,

							 <&cpu1 5 5>;

				};

				map1 {

					/* Correspond to 200MHz at freq_table */

					cooling-device = <&cpu0 8 8>;

					cooling-device = <&cpu0 8 8>,

							 <&cpu1 8 8>;

				};

			};

		};

arch/arm/boot/dts/exynos3250-rinato.dts

+4 −2
Original line number Diff line number Diff line
@@ -116,11 +116,13 @@ 
			cooling-maps {

				map0 {

					/* Corresponds to 500MHz */

					cooling-device = <&cpu0 5 5>;

					cooling-device = <&cpu0 5 5>,

							 <&cpu1 5 5>;

				};

				map1 {

					/* Corresponds to 200MHz */

					cooling-device = <&cpu0 8 8>;

					cooling-device = <&cpu0 8 8>,

							 <&cpu1 8 8>;

				};

			};

		};

arch/arm/boot/dts/exynos3250.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ 
		};



		hsotg: hsotg@12480000 {

			compatible = "snps,dwc2";

			compatible = "samsung,s3c6400-hsotg", "snps,dwc2";

			reg = <0x12480000 0x20000>;

			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_USBOTG>;

arch/arm/boot/dts/exynos4210-trats.dts

+2 −2
Original line number Diff line number Diff line
@@ -138,11 +138,11 @@ 
			cooling-maps {

				map0 {

				     /* Corresponds to 800MHz at freq_table */

				     cooling-device = <&cpu0 2 2>;

				     cooling-device = <&cpu0 2 2>, <&cpu1 2 2>;

				};

				map1 {

				     /* Corresponds to 200MHz at freq_table */

				     cooling-device = <&cpu0 4 4>;

				     cooling-device = <&cpu0 4 4>, <&cpu1 4 4>;

			       };

		       };

		};