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

Commit 39e596f0 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

ARM: dts: Move MCT node to exynos4x12.dtsi 



For MCT block compatible with "samsung,exynos4412-mct", that uses PPI
interrupts for local timers, only one local interrupt needs to be
specified, since it is a per-processor interrupt.

This allows moving MCT node of Exynos4x12 SoCs back to common
exynos4x12.dtsi, since they have the same set of interrupts to be
specified, which was the only difference.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 1b35bb80

arch/arm/boot/dts/exynos4212.dtsi

+0 −20
Original line number Diff line number Diff line
@@ -34,24 +34,4 @@ 
			     <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,

			     <0 107 0>, <0 108 0>;

	};



	mct@10050000 {

		compatible = "samsung,exynos4412-mct";

		reg = <0x10050000 0x800>;

		interrupt-parent = <&mct_map>;

		interrupts = <0 0>, <1 0>, <2 0>, <3 0>,

			     <4 0>, <5 0>;



		mct_map: mct-map {

			#interrupt-cells = <2>;

			#address-cells = <0>;

			#size-cells = <0>;

			interrupt-map = <0x0 0 &gic 0 57 0>,

					<0x1 0 &combiner 12 5>,

					<0x2 0 &combiner 12 6>,

					<0x3 0 &combiner 12 7>,

					<0x4 0 &gic 1 12 0>,

					<0x5 0 &gic 1 12 0>;

		};

	};

};

arch/arm/boot/dts/exynos4412.dtsi

+0 −24
Original line number Diff line number Diff line
@@ -35,28 +35,4 @@ 
			     <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;

	};



	mct@10050000 {

		compatible = "samsung,exynos4412-mct";

		reg = <0x10050000 0x800>;

		interrupt-parent = <&mct_map>;

		interrupts = <0 0>, <1 0>, <2 0>, <3 0>,

			     <4 0>, <5 0>, <6 0>, <7 0>;

		clocks = <&clock 3>, <&clock 344>;

		clock-names = "fin_pll", "mct";



		mct_map: mct-map {

			#interrupt-cells = <2>;

			#address-cells = <0>;

			#size-cells = <0>;

			interrupt-map = <0x0 0 &gic 0 57 0>,

					<0x1 0 &combiner 12 5>,

					<0x2 0 &combiner 12 6>,

					<0x3 0 &combiner 12 7>,

					<0x4 0 &gic 1 12 0>,

					<0x5 0 &gic 1 12 0>,

					<0x6 0 &gic 1 12 0>,

					<0x7 0 &gic 1 12 0>;

		};

	};



};

arch/arm/boot/dts/exynos4x12.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -42,6 +42,26 @@ 
		#clock-cells = <1>;

	};



	mct@10050000 {

		compatible = "samsung,exynos4412-mct";

		reg = <0x10050000 0x800>;

		interrupt-parent = <&mct_map>;

		interrupts = <0 0>, <1 0>, <2 0>, <3 0>, <4 0>;

		clocks = <&clock 3>, <&clock 344>;

		clock-names = "fin_pll", "mct";



		mct_map: mct-map {

			#interrupt-cells = <2>;

			#address-cells = <0>;

			#size-cells = <0>;

			interrupt-map = <0x0 0 &gic 0 57 0>,

					<0x1 0 &combiner 12 5>,

					<0x2 0 &combiner 12 6>,

					<0x3 0 &combiner 12 7>,

					<0x4 0 &gic 1 12 0>;

		};

	};



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,exynos4x12-pinctrl";

		reg = <0x11400000 0x1000>;