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

Commit a7d13576 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Merge "ARM: EXYNOS: dts for 4.6, 2nd pull" from Krzysztof Kozlowski:

Samsung DeviceTree updates and improvements for v4.6, second round:
1. Split common reboot/poweroff node to separate DTSI.
2. Don't overheat Odroid XU3 by cooling CPU with cpufreq.

* tag 'samsung-dt-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Don't overheat the Odroid XU3-Lite on high load
  ARM: dts: exynos: Add cooling levels for Exynos5422/5800 CPUs
  ARM: dts: exynos: Add cooling levels for Exynos5420 CPUs
  ARM: dts: exynos: Move syscon reboot/poweroff to common dtsi
parents 953a400a 52e8e592

arch/arm/boot/dts/exynos-syscon-restart.dtsi

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Samsung's Exynos SoC syscon reboot/poweroff nodes common definition.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



/ {

	soc {

		compatible = "simple-bus";



		poweroff: syscon-poweroff {

			compatible = "syscon-poweroff";

			regmap = <&pmu_system_controller>;

			offset = <0x330C>; /* PS_HOLD_CONTROL */

			mask = <0x5200>; /* reset value */

		};



		reboot: syscon-reboot {

			compatible = "syscon-reboot";

			regmap = <&pmu_system_controller>;

			offset = <0x0400>; /* SWRESET */

			mask = <0x1>;

		};

	};

};

arch/arm/boot/dts/exynos3250.dtsi

+1 −14
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include "skeleton.dtsi"

#include "exynos4-cpu-thermal.dtsi"

#include "exynos-syscon-restart.dtsi"

#include <dt-bindings/clock/exynos3250.h>



/ {
@@ -152,20 +153,6 @@ 
			interrupt-parent = <&gic>;

		};



		poweroff: syscon-poweroff {

			compatible = "syscon-poweroff";

			regmap = <&pmu_system_controller>;

			offset = <0x330C>; /* PS_HOLD_CONTROL */

			mask = <0x5200>; /* Reset value */

		};



		reboot: syscon-reboot {

			compatible = "syscon-reboot";

			regmap = <&pmu_system_controller>;

			offset = <0x0400>; /* SWRESET */

			mask = <0x1>;

		};



		mipi_phy: video-phy@10020710 {

			compatible = "samsung,s5pv210-mipi-video-phy";

			#phy-cells = <1>;

arch/arm/boot/dts/exynos4.dtsi

+1 −14
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <dt-bindings/clock/exynos4.h>

#include <dt-bindings/clock/exynos-audss-clk.h>

#include "skeleton.dtsi"

#include "exynos-syscon-restart.dtsi"



/ {

	interrupt-parent = <&gic>;
@@ -163,20 +164,6 @@ 
		interrupt-parent = <&gic>;

	};



	poweroff: syscon-poweroff {

		compatible = "syscon-poweroff";

		regmap = <&pmu_system_controller>;

		offset = <0x330C>; /* PS_HOLD_CONTROL */

		mask = <0x5200>; /* reset value */

	};



	reboot: syscon-reboot {

		compatible = "syscon-reboot";

		regmap = <&pmu_system_controller>;

		offset = <0x0400>; /* SWRESET */

		mask = <0x1>;

	};



	dsi_0: dsi@11C80000 {

		compatible = "samsung,exynos4210-mipi-dsi";

		reg = <0x11C80000 0x10000>;

arch/arm/boot/dts/exynos5.dtsi

+1 −14
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */



#include "skeleton.dtsi"

#include "exynos-syscon-restart.dtsi"



/ {

	interrupt-parent = <&gic>;
@@ -93,20 +94,6 @@ 
		status = "disabled";

	};



	poweroff: syscon-poweroff {

		compatible = "syscon-poweroff";

		regmap = <&pmu_system_controller>;

		offset = <0x330C>; /* PS_HOLD_CONTROL */

		mask = <0x5200>; /* reset value */

	};



	reboot: syscon-reboot {

		compatible = "syscon-reboot";

		regmap = <&pmu_system_controller>;

		offset = <0x0400>; /* SWRESET */

		mask = <0x1>;

	};



	fimd: fimd@14400000 {

		compatible = "samsung,exynos5250-fimd";

		interrupt-parent = <&combiner>;

arch/arm/boot/dts/exynos5410.dtsi

+1 −14
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */



#include "skeleton.dtsi"

#include "exynos-syscon-restart.dtsi"

#include <dt-bindings/clock/exynos5410.h>



/ {
@@ -117,20 +118,6 @@ 
			reg = <0x10040000 0x5000>;

		};



		poweroff: syscon-poweroff {

			compatible = "syscon-poweroff";

			regmap = <&pmu_system_controller>;

			offset = <0x330C>; /* PS_HOLD_CONTROL */

			mask = <0x5200>; /* reset value */

		};



		reboot: syscon-reboot {

			compatible = "syscon-reboot";

			regmap = <&pmu_system_controller>;

			offset = <0x0400>; /* SWRESET */

			mask = <0x1>;

		};



		mct: mct@101C0000 {

			compatible = "samsung,exynos4210-mct";

			reg = <0x101C0000 0xB00>;