ARM: dts: exynos: Remove MCT subnode for interrupt map on Exynos4412 (55125ae9) · Commits · 戴 / test

Multi Core Timer node has interrupts routed to two different parents - GIC and combiner. This was modeled with a interrupt-map within a subnode but can be expressed in an easier and more common way, directly in the node itself. Tested on Odroid U3 (Exynos4412). Signed-off-by:

Krzysztof Kozlowski <krzk@kernel.org> Tested-by:

Marek Szyprowski <m.szyprowski@samsung.com>

arch/arm/boot/dts/exynos4412.dtsi

+5 −14

Original line number	Diff line number	Diff line
		@@ -246,22 +246,13 @@
		timer@10050000 {
		compatible = "samsung,exynos4412-mct";
		reg = <0x10050000 0x800>;
		interrupt-parent = <&mct_map>;
		interrupts = <0>, <1>, <2>, <3>, <4>;
		clocks = <&clock CLK_FIN_PLL>, <&clock CLK_MCT>;
		clock-names = "fin_pll", "mct";

		mct_map: mct-map {
		#interrupt-cells = <1>;
		#address-cells = <0>;
		#size-cells = <0>;
		interrupt-map =
		<0 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>,
		<1 &combiner 12 5>,
		<2 &combiner 12 6>,
		<3 &combiner 12 7>,
		<4 &gic 1 12 IRQ_TYPE_LEVEL_HIGH>;
		};
		interrupts-extended = <&gic 0 57 IRQ_TYPE_LEVEL_HIGH>,
		<&combiner 12 5>,
		<&combiner 12 6>,
		<&combiner 12 7>,
		<&gic 1 12 IRQ_TYPE_LEVEL_HIGH>;
		};

		watchdog: watchdog@10060000 {

Admin message