Commit d927dc93 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'samsung-dt-syscon-restart-4.5' into next/soc 

Device Tree changes adding necessary nodes for syscon reboot/poweroff
handlers on Exynos boards. The mach-exynos changes must base on top
of this to retain the bisectability of not loosing reboot/poweroff
features.
parents 8005c49d 35135f4b

arch/arm/boot/dts/exynos3250.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -152,6 +152,20 @@ 
			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

+14 −0
Original line number Diff line number Diff line
@@ -158,6 +158,20 @@ 
		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

+14 −0
Original line number Diff line number Diff line
@@ -88,6 +88,20 @@ 
		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

+14 −0
Original line number Diff line number Diff line
@@ -102,6 +102,20 @@ 
			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>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE