public inbox for linux-arm-kernel@lists.infradead.org 
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzk@kernel•org>
To: Daniel Lezcano <daniel.lezcano@linaro•org>,
	Thomas Gleixner <tglx@linutronix•de>,
	Rob Herring <robh+dt@kernel•org>,
	Mark Rutland <mark.rutland@arm•com>,
	Kukjin Kim <kgene@kernel•org>,
	Krzysztof Kozlowski <krzk@kernel•org>,
	linux-kernel@vger•kernel.org, devicetree@vger•kernel.org,
	linux-arm-kernel@lists•infradead.org,
	linux-samsung-soc@vger•kernel.org
Cc: Sylwester Nawrocki <snawrocki@kernel•org>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung•com>,
	Marek Szyprowski <m.szyprowski@samsung•com>
Subject: [RFT v3 7/8] ARM: dts: exynos: Remove MCT subnode for interrupt map on Exynos54xx
Date: Sat, 21 Sep 2019 19:01:51 +0200	[thread overview]
Message-ID: <20190921170152.5033-7-krzk@kernel.org> (raw)
In-Reply-To: <20190921170152.5033-1-krzk@kernel.org>

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 XU (Exynos5410), Odroid HC1 (Exynos5422) and Arndale
Octa (Exynos5420).

Signed-off-by: Krzysztof Kozlowski <krzk@kernel•org>
---
 arch/arm/boot/dts/exynos54xx.dtsi | 37 ++++++++++++++-----------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi
index 247d23872384..a1c10a9a86f8 100644
--- a/arch/arm/boot/dts/exynos54xx.dtsi
+++ b/arch/arm/boot/dts/exynos54xx.dtsi
@@ -67,27 +67,24 @@
 		mct: timer@101c0000 {
 			compatible = "samsung,exynos4210-mct";
 			reg = <0x101c0000 0xb00>;
-			interrupt-parent = <&mct_map>;
+			#address-cells = <0>;
+			#size-cells = <0>;
+			#interrupt-cells = <1>;
+			interrupt-parent = <&mct>;
 			interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>,
-					<8>, <9>, <10>, <11>;
-
-			mct_map: mct-map {
-				#interrupt-cells = <1>;
-				#address-cells = <0>;
-				#size-cells = <0>;
-				interrupt-map = <0 &combiner 23 3>,
-						<1 &combiner 23 4>,
-						<2 &combiner 25 2>,
-						<3 &combiner 25 3>,
-						<4 &gic 0 120 IRQ_TYPE_LEVEL_HIGH>,
-						<5 &gic 0 121 IRQ_TYPE_LEVEL_HIGH>,
-						<6 &gic 0 122 IRQ_TYPE_LEVEL_HIGH>,
-						<7 &gic 0 123 IRQ_TYPE_LEVEL_HIGH>,
-						<8 &gic 0 128 IRQ_TYPE_LEVEL_HIGH>,
-						<9 &gic 0 129 IRQ_TYPE_LEVEL_HIGH>,
-						<10 &gic 0 130 IRQ_TYPE_LEVEL_HIGH>,
-						<11 &gic 0 131 IRQ_TYPE_LEVEL_HIGH>;
-			};
+				     <8>, <9>, <10>, <11>;
+			interrupt-map = <0 &combiner 23 3>,
+					<1 &combiner 23 4>,
+					<2 &combiner 25 2>,
+					<3 &combiner 25 3>,
+					<4 &gic 0 120 IRQ_TYPE_LEVEL_HIGH>,
+					<5 &gic 0 121 IRQ_TYPE_LEVEL_HIGH>,
+					<6 &gic 0 122 IRQ_TYPE_LEVEL_HIGH>,
+					<7 &gic 0 123 IRQ_TYPE_LEVEL_HIGH>,
+					<8 &gic 0 128 IRQ_TYPE_LEVEL_HIGH>,
+					<9 &gic 0 129 IRQ_TYPE_LEVEL_HIGH>,
+					<10 &gic 0 130 IRQ_TYPE_LEVEL_HIGH>,
+					<11 &gic 0 131 IRQ_TYPE_LEVEL_HIGH>;
 		};
 
 		watchdog: watchdog@101d0000 {
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-09-21 17:04 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-21 17:01 [PATCH v3 1/8] dt-bindings: timer: Convert Exynos MCT bindings to json-schema Krzysztof Kozlowski
2019-09-21 17:01 ` [PATCH v3 2/8] ARM: dts: exynos: Rename Multi Core Timer node to "timer" Krzysztof Kozlowski
2019-09-21 17:01 ` [PATCH v3 3/8] arm64: " Krzysztof Kozlowski
2019-09-21 17:01 ` [RFT v3 4/8] ARM: dts: exynos: Remove MCT subnode for interrupt map on Exynos4210 Krzysztof Kozlowski
2019-09-23  6:56   ` Marek Szyprowski
2019-09-23  7:13     ` Krzysztof Kozlowski
2019-09-21 17:01 ` [RFT v3 5/8] ARM: dts: exynos: Remove MCT subnode for interrupt map on Exynos4412 Krzysztof Kozlowski
2019-09-21 17:01 ` [RFT v3 6/8] ARM: dts: exynos: Remove MCT subnode for interrupt map on Exynos5250 Krzysztof Kozlowski
2019-09-21 17:01 ` Krzysztof Kozlowski [this message]
2019-09-21 17:01 ` [PATCH v3 8/8] ARM: dts: exynos: Use defines for MCT interrupt GIC SPI/PPI specifier Krzysztof Kozlowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190921170152.5033-7-krzk@kernel.org \
    --to=krzk@kernel$(echo .)org \
    --cc=b.zolnierkie@samsung$(echo .)com \
    --cc=daniel.lezcano@linaro$(echo .)org \
    --cc=devicetree@vger$(echo .)kernel.org \
    --cc=kgene@kernel$(echo .)org \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-samsung-soc@vger$(echo .)kernel.org \
    --cc=m.szyprowski@samsung$(echo .)com \
    --cc=mark.rutland@arm$(echo .)com \
    --cc=robh+dt@kernel$(echo .)org \
    --cc=snawrocki@kernel$(echo .)org \
    --cc=tglx@linutronix$(echo .)de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox