From patchwork Thu Aug 28 15:31:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 4805571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2AC939F2A9 for ; Thu, 28 Aug 2014 15:35:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0686A20123 for ; Thu, 28 Aug 2014 15:35:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C0906200EC for ; Thu, 28 Aug 2014 15:35:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XN1g3-00025s-7s; Thu, 28 Aug 2014 15:31:55 +0000 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XN1fw-00020h-Ka for linux-arm-kernel@lists.infradead.org; Thu, 28 Aug 2014 15:31:49 +0000 Received: by mail-wi0-f178.google.com with SMTP id r20so1089295wiv.11 for ; Thu, 28 Aug 2014 08:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m+bXqBjoPXGtf++70+qlG/SL8P9J1xwduig+XTAoI3w=; b=Ca75IjKrWL19yVeJZFxo00vdRinFpck6PI+8DONaVNK37Fpv3ZPAeqfUhGSbsCe2m/ aUhOkuf/wEplFrGa82r0E/wQRk40tJZdRwZyhEC5as2fD2bmx2Q0G45k5tsm1K5G67R/ RtNxuoOMfdHKbMe3rBhMdFovkhHjLHziwO8W5KPerI4tTXulWR69vU7mtL+o+jQMDvdo SMCyScgZONgSinrF6VoCqLDJxZGgcsOupB8CclyEoWvTnHj/zEeuLLfh+VbQSWDMroqo i8t6lk/4ZNyeOYJjRFlzxz1RwS8HoiPIzCFH2O6mJpFzAjFgaUjoX02Kq5WeauU5lk6E MpZQ== X-Received: by 10.194.84.69 with SMTP id w5mr6545221wjy.0.1409239885793; Thu, 28 Aug 2014 08:31:25 -0700 (PDT) Received: from localhost (port-14388.pppoe.wtnet.de. [84.46.56.108]) by mx.google.com with ESMTPSA id ot5sm10728163wjc.42.2014.08.28.08.31.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Aug 2014 08:31:25 -0700 (PDT) From: Thierry Reding To: Stephen Warren Subject: [PATCH v4 2/5] ARM: tegra: Add legacy interrupt controller nodes Date: Thu, 28 Aug 2014 17:31:16 +0200 Message-Id: <1409239879-12376-2-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1409239879-12376-1-git-send-email-thierry.reding@gmail.com> References: <1409239879-12376-1-git-send-email-thierry.reding@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140828_083148_825116_7094C3E1 X-CRM114-Status: GOOD ( 10.31 ) X-Spam-Score: -0.1 (/) Cc: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding Add device tree nodes for the legacy interrupt controller so that the driver can get the register ranges from device tree rather than hard- coding them. Signed-off-by: Thierry Reding --- Changes in v3: - bracket individual tuples in the "reg" property Changes in v2: - add chip-specific compatible string - drop quinary controller on Tegra20 arch/arm/boot/dts/tegra114.dtsi | 9 +++++++++ arch/arm/boot/dts/tegra124.dtsi | 9 +++++++++ arch/arm/boot/dts/tegra20.dtsi | 8 ++++++++ arch/arm/boot/dts/tegra30.dtsi | 9 +++++++++ 4 files changed, 35 insertions(+) diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index a147fa2bfdd2..9bfab8bb765a 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -141,6 +141,15 @@ (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; + interrupt-controller@60004000 { + compatible = "nvidia,tegra114-ictlr", "nvidia,tegra30-ictlr"; + reg = <0x60004000 0x40>, /* primary controller */ + <0x60004100 0x40>, /* secondary controller */ + <0x60004200 0x40>, /* tertiary controller */ + <0x60004300 0x40>, /* quaternary controller */ + <0x60004400 0x40>; /* quinary controller */ + }; + timer@60005000 { compatible = "nvidia,tegra114-timer", "nvidia,tegra20-timer"; reg = <0x60005000 0x400>; diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index 82dc48b530e6..8c7523225fd9 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -190,6 +190,15 @@ status = "disabled"; }; + interrupt-controller@0,60004000 { + compatible = "nvidia,tegra124-ictlr", "nvidia,tegra30-ictlr"; + reg = <0x0 0x60004000 0x0 0x40>, /* primary controller */ + <0x0 0x60004100 0x0 0x40>, /* secondary controller */ + <0x0 0x60004200 0x0 0x40>, /* tertiary controller */ + <0x0 0x60004300 0x0 0x40>, /* quaternary controller */ + <0x0 0x60004400 0x0 0x40>; /* quinary controller */ + }; + timer@0,60005000 { compatible = "nvidia,tegra124-timer", "nvidia,tegra20-timer"; reg = <0x0 0x60005000 0x0 0x400>; diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index c6a2d078bdf4..fe2f57d19438 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -183,6 +183,14 @@ cache-level = <2>; }; + interrupt-controller@60004000 { + compatible = "nvidia,tegra20-ictlr"; + reg = <0x60004000 0x40>, /* primary controller */ + <0x60004100 0x40>, /* secondary controller */ + <0x60004200 0x40>, /* tertiary controller */ + <0x60004300 0x40>; /* quaternary controller */ + }; + timer@60005000 { compatible = "nvidia,tegra20-timer"; reg = <0x60005000 0x60>; diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index f4693c9c070e..e5da2d252220 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -262,6 +262,15 @@ cache-level = <2>; }; + interrupt-controller@60004000 { + compatible = "nvidia,tegra30-ictlr"; + reg = <0x60004000 0x40>, /* primary controller */ + <0x60004100 0x40>, /* secondary controller */ + <0x60004200 0x40>, /* tertiary controller */ + <0x60004300 0x40>, /* quaternary controller */ + <0x60004400 0x40>; /* quinary controller */ + }; + timer@60005000 { compatible = "nvidia,tegra30-timer", "nvidia,tegra20-timer"; reg = <0x60005000 0x400>;