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

Commit 3112013b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt64-4.18' of... 

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

Samsung DTS ARM64 changes for v4.18

1. Fix DTC warnings.
2. Add mem-2-mem Scaler devices.

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

:
  arm64: dts: exynos: Add mem-2-mem Scaler devices
  arm64: dts: exynos: Remove unneeded address space mapping for soc node
  arm64: dts: exynos: Move syscon poweroff and restart nodes under the PMU

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

arch/arm64/boot/dts/exynos/exynos5433.dtsi

+56 −10
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 


/ {

	compatible = "samsung,exynos5433";

	#address-cells = <2>;

	#size-cells = <2>;

	#address-cells = <1>;

	#size-cells = <1>;



	interrupt-parent = <&gic>;
@@ -231,18 +231,11 @@ 
		cpu_on = <0xC4000003>;

	};



	reboot: syscon-reboot {

		compatible = "syscon-reboot";

		regmap = <&pmu_system_controller>;

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

		mask = <0x1>;

	};



	soc: soc {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x0 0x18000000>;

		ranges;



		arm_a53_pmu {

			compatible = "arm,cortex-a53-pmu", "arm,armv8-pmuv3";
@@ -799,6 +792,13 @@ 
			#clock-cells = <1>;

			clock-names = "clkout16";

			clocks = <&xxti>;



			reboot: syscon-reboot {

				compatible = "syscon-reboot";

				regmap = <&pmu_system_controller>;

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

				mask = <0x1>;

			};

		};



		gic: interrupt-controller@11001000 {
@@ -1034,6 +1034,30 @@ 
			power-domains = <&pd_gscl>;

		};



		scaler_0: scaler@15000000 {

			compatible = "samsung,exynos5433-scaler";

			reg = <0x15000000 0x1294>;

			interrupts = <0 402 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "pclk", "aclk", "aclk_xiu";

			clocks = <&cmu_mscl CLK_PCLK_M2MSCALER0>,

				 <&cmu_mscl CLK_ACLK_M2MSCALER0>,

				 <&cmu_mscl CLK_ACLK_XIU_MSCLX>;

			iommus = <&sysmmu_scaler_0>;

			power-domains = <&pd_mscl>;

		};



		scaler_1: scaler@15010000 {

			compatible = "samsung,exynos5433-scaler";

			reg = <0x15010000 0x1294>;

			interrupts = <0 403 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "pclk", "aclk", "aclk_xiu";

			clocks = <&cmu_mscl CLK_PCLK_M2MSCALER1>,

				 <&cmu_mscl CLK_ACLK_M2MSCALER1>,

				 <&cmu_mscl CLK_ACLK_XIU_MSCLX>;

			iommus = <&sysmmu_scaler_1>;

			power-domains = <&pd_mscl>;

		};



		jpeg: codec@15020000 {

			compatible = "samsung,exynos5433-jpeg";

			reg = <0x15020000 0x10000>;
@@ -1137,6 +1161,28 @@ 
			power-domains = <&pd_gscl>;

		};



		sysmmu_scaler_0: sysmmu@0x15040000 {

			compatible = "samsung,exynos-sysmmu";

			reg = <0x15040000 0x1000>;

			interrupts = <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "pclk", "aclk";

			clocks = <&cmu_mscl CLK_PCLK_SMMU_M2MSCALER0>,

				 <&cmu_mscl CLK_ACLK_SMMU_M2MSCALER0>;

			#iommu-cells = <0>;

			power-domains = <&pd_mscl>;

		};



		sysmmu_scaler_1: sysmmu@0x15050000 {

			compatible = "samsung,exynos-sysmmu";

			reg = <0x15050000 0x1000>;

			interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "pclk", "aclk";

			clocks = <&cmu_mscl CLK_PCLK_SMMU_M2MSCALER1>,

				 <&cmu_mscl CLK_ACLK_SMMU_M2MSCALER1>;

			#iommu-cells = <0>;

			power-domains = <&pd_mscl>;

		};



		sysmmu_jpeg: sysmmu@15060000 {

			compatible = "samsung,exynos-sysmmu";

			reg = <0x15060000 0x1000>;

arch/arm64/boot/dts/exynos/exynos7.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
/ {

	compatible = "samsung,exynos7";

	interrupt-parent = <&gic>;

	#address-cells = <2>;

	#size-cells = <2>;

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		pinctrl0 = &pinctrl_alive;
@@ -70,7 +70,7 @@ 
		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0 0 0x18000000>;

		ranges;



		chipid@10000000 {

			compatible = "samsung,exynos4210-chipid";
@@ -494,7 +494,6 @@ 
		pmu_system_controller: system-controller@105c0000 {

			compatible = "samsung,exynos7-pmu", "syscon";

			reg = <0x105c0000 0x5000>;

		};



			reboot: syscon-reboot {

				compatible = "syscon-reboot";
@@ -502,6 +501,7 @@ 
				offset = <0x0400>;

				mask = <0x1>;

			};

		};



		rtc: rtc@10590000 {

			compatible = "samsung,s3c6410-rtc";