From patchwork Sat Feb 22 18:32:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 3702321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 06D27BF13A for ; Sat, 22 Feb 2014 18:32:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3388F20172 for ; Sat, 22 Feb 2014 18:32:47 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 1DD2E2015A for ; Sat, 22 Feb 2014 18:32:46 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHHNR-0003d4-1K; Sat, 22 Feb 2014 18:32:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHHNO-0002Q3-TY; Sat, 22 Feb 2014 18:32:38 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WHHNL-0002P7-RN for linux-arm-kernel@lists.infradead.org; Sat, 22 Feb 2014 18:32:36 +0000 Received: from pool-108-39-110-144.nrflva.fios.verizon.net ([108.39.110.144] helo=titan) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1WHHN0-0001bF-L6; Sat, 22 Feb 2014 18:32:14 +0000 Received: from triton.localdomain (triton.lakedaemon.net [10.16.5.78]) by titan (Postfix) with ESMTP id BB0C6530A44; Sat, 22 Feb 2014 13:32:11 -0500 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/ntgppzbPeS5sjQXbLPpIGPx/Dtz0la28= X-DKIM: OpenDKIM Filter v2.0.1 titan BB0C6530A44 From: Jason Cooper To: Andrew Lunn , Sebastian Hesselbarth , Gregory CLEMENT Subject: [PATCH] Revert "ARM: dove: dt: revert PMU interrupt controller node" Date: Sat, 22 Feb 2014 18:32:06 +0000 Message-Id: <1393093926-16591-1-git-send-email-jason@lakedaemon.net> X-Mailer: git-send-email 1.9.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140222_133235_929839_FB38F7D1 X-CRM114-Status: UNSURE ( 7.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Jason Cooper , Linux ARM Kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 This reverts commit ae10f8329f9b22d650aa12307b260eba2bc0c571. The driver for this node didn't make it into v3.14, but will be in v3.15. So we can add the node back. Despite what ae10f8329f9b says, the node without the driver generated a WARN_ON, but the affected systems still booted. Signed-off-by: Jason Cooper --- RESEND: Apparently I don't learn from previous mistakes. Fixed Andrew's email address so lakml will accept it. arch/arm/boot/dts/dove.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 644b1f40cb30..a88ed73c1c86 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -387,6 +387,15 @@ #clock-cells = <1>; }; + pmu_intc: pmu-interrupt-ctrl@d0050 { + compatible = "marvell,dove-pmu-intc"; + interrupt-controller; + #interrupt-cells = <1>; + reg = <0xd0050 0x8>; + interrupts = <33>; + marvell,#interrupts = <7>; + }; + pinctrl: pin-ctrl@d0200 { compatible = "marvell,dove-pinctrl"; reg = <0xd0200 0x10>; @@ -609,6 +618,8 @@ rtc: real-time-clock@d8500 { compatible = "marvell,orion-rtc"; reg = <0xd8500 0x20>; + interrupt-parent = <&pmu_intc>; + interrupts = <5>; }; gpio2: gpio-ctrl@e8400 {