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

Merge tag 'samsung-soc-4.5' of... 

Merge tag 'samsung-soc-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung Exynos improvements for 4.5:
1. Switch from Exynos-specific restart/poweroff handler
   (mach-exynos/pmu.c) to generic syscon-reboot and syscon-poweroff
   drivers.
   This depends on adding syscon nodes to DTS to preserve
   bisectability.
2. Minor improvements.

* tag 'samsung-soc-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: EXYNOS: Remove redundant code from regs-pmu.h
  ARM: EXYNOS: Constify local exynos_pmu_data structure
  ARM: EXYNOS: Switch to syscon reboot and poweroff
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos5410
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos5
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos4
  ARM: dts: Add syscon-{reboot, poweroff} nodes for exynos3250

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 20f0c63c 8438aef0

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>;

arch/arm/mach-exynos/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ menuconfig ARCH_EXYNOS 
	select SRAM

	select THERMAL

	select MFD_SYSCON

	select POWER_RESET

	select POWER_RESET_SYSCON

	select POWER_RESET_SYSCON_POWEROFF

	help

	  Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)

CRA Git | Maintained and supported by SUSTech CRA and CCSE