From patchwork Mon Sep 23 16:14:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11157277 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B3D1E1747 for ; Mon, 23 Sep 2019 16:15:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 904EC2168B for ; Mon, 23 Sep 2019 16:15:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569255301; bh=055AApEoZHnhqgk+jRGaMDM2ewIZ2IZaWqUX6PpZBOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zxviC4qHaOsa4vWxxeu2sqxYTcqGSD7J8yoxMj99pcJKVFZWekn8saI8YV+9u0xZg AGV3hCXmup9U9EOfq0e7RjiDKYB2wjjFOTxFcuYXEMFrGBiPPwQWwN7Zq8E7ec7Mkr LwYL3G42pSKDmsOFsoV8uEFpqwi+stqIQljEX2j8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395510AbfIWQOx (ORCPT ); Mon, 23 Sep 2019 12:14:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:59134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395236AbfIWQOw (ORCPT ); Mon, 23 Sep 2019 12:14:52 -0400 Received: from localhost.localdomain (unknown [194.230.155.145]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9B95021BE5; Mon, 23 Sep 2019 16:14:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569255291; bh=055AApEoZHnhqgk+jRGaMDM2ewIZ2IZaWqUX6PpZBOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=080ytc1/zsczrnAZzkk/jf+vyHuy1mflRjgCtER/h6Ys3Ydv1bhSixWAn+HLLDF5f fXj2G5bKxZYkwqKEmrIhd8NE2wUw106stvVZm3hSJu/CDv+5kT0WAyysLz/KgI2KUR XEyVj5JdthFCujY/OeJbz5nMHC9pM1t57MKCanVo= From: Krzysztof Kozlowski To: Daniel Lezcano , Thomas Gleixner , Rob Herring , Mark Rutland , Kukjin Kim , Krzysztof Kozlowski , Marek Szyprowski , Andrzej Hajda , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Sylwester Nawrocki Subject: [PATCH v4 7/8] ARM: dts: exynos: Remove MCT subnode for interrupt map on Exynos54xx Date: Mon, 23 Sep 2019 18:14:10 +0200 Message-Id: <20190923161411.9236-7-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190923161411.9236-1-krzk@kernel.org> References: <20190923161411.9236-1-krzk@kernel.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.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 --- Changes since v3: 1. Use interrupts-extended instead of interrupts-map. --- arch/arm/boot/dts/exynos54xx.dtsi | 33 +++++++++++-------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/exynos54xx.dtsi b/arch/arm/boot/dts/exynos54xx.dtsi index 247d23872384..aca1b4831e38 100644 --- a/arch/arm/boot/dts/exynos54xx.dtsi +++ b/arch/arm/boot/dts/exynos54xx.dtsi @@ -67,27 +67,18 @@ mct: timer@101c0000 { compatible = "samsung,exynos4210-mct"; reg = <0x101c0000 0xb00>; - interrupt-parent = <&mct_map>; - 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>; - }; + interrupts-extended = <&combiner 23 3>, + <&combiner 23 4>, + <&combiner 25 2>, + <&combiner 25 3>, + <&gic 0 120 IRQ_TYPE_LEVEL_HIGH>, + <&gic 0 121 IRQ_TYPE_LEVEL_HIGH>, + <&gic 0 122 IRQ_TYPE_LEVEL_HIGH>, + <&gic 0 123 IRQ_TYPE_LEVEL_HIGH>, + <&gic 0 128 IRQ_TYPE_LEVEL_HIGH>, + <&gic 0 129 IRQ_TYPE_LEVEL_HIGH>, + <&gic 0 130 IRQ_TYPE_LEVEL_HIGH>, + <&gic 0 131 IRQ_TYPE_LEVEL_HIGH>; }; watchdog: watchdog@101d0000 {