From patchwork Sat Aug 13 09:45:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 9278379 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 895D560780 for ; Sat, 13 Aug 2016 09:48:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D8EC28ACB for ; Sat, 13 Aug 2016 09:48:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6032728AD3; Sat, 13 Aug 2016 09:48:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B76E628ACB for ; Sat, 13 Aug 2016 09:48:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bYVWJ-0002C5-PO; Sat, 13 Aug 2016 09:46:23 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bYVWF-0002Ao-29 for linux-arm-kernel@lists.infradead.org; Sat, 13 Aug 2016 09:46:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From; bh=zzltL8mEDk4pJTT53Ggr61lkury4se/SEhM8T8tnZAk=; b=dkz9GuQAdN+2ovFHr1/BmsCXZNzFjVgk9aLdmP9OIt71L1wsAAsSAJknkL7S/Y6QfEuGtkw3c9oTc+QD9gDwOATcEzZjkCs6omaoSnQV6QmoHoJMAj2wn9Md2h/TbcDcqARTkjMAPtxd8uOH5SAnmXONIcleHyNurPSFKcWGgkk=; Received: from e0022681537dd.dyn.armlinux.org.uk ([2001:4d48:ad52:3201:222:68ff:fe15:37dd]:40976 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1bYVVi-0005p7-Ak; Sat, 13 Aug 2016 10:45:46 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1bYVVh-0001eq-BI; Sat, 13 Aug 2016 10:45:45 +0100 From: Russell King To: Jon Hunter Subject: [PATCH RFC] Revert "of/irq: Mark initialised interrupt controllers as populated" MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Sat, 13 Aug 2016 10:45:45 +0100 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160813_024619_378520_C17DFFE1 X-CRM114-Status: GOOD ( 10.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Ulf Hansson , Marc Zyngier , Frank Rowand , "Rafael J. Wysocki" , Rob Herring , Philipp Zabel , Shawn Guo , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 15cc2ed6dcf91a8658e084be4e140147161819d7, which causes a regression with iMX6 power domains. iMX6 GPC contains both an interrupt controller and power domains. The iMX6 GPC code is setup to register an interrupt controller using IRQCHIP_DECLARE(), but then to register the power domains using the platform device. This commit prevents the platform device being created, thereby breaking iMX6 power domain support. Signed-off-by: Russell King --- Please argue amongst yourselves about how to fix this regression caused by this commit... Marc introduced the code which used OF_DECLARE_2()/IRQCHIP_DECLARE() in commit b923ff6af0d5a806a3996dac6d4393cd9792d0f4 Author: Marc Zyngier Date: Mon Feb 23 17:45:18 2015 +0000 while the PM domain code was introduced at around the same time by: commit 00eb60a8b4f7a4aa00fd8abd68c2dc7aec55df19 Author: Philipp Zabel Date: Mon Feb 23 18:40:12 2015 +0100 I guess distributed development is fun! drivers/of/irq.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 89a71c6074fc..7d3f93fdc4ad 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -559,8 +559,6 @@ void __init of_irq_init(const struct of_device_id *matches) * its children can get processed in a subsequent pass. */ list_add_tail(&desc->list, &intc_parent_list); - - of_node_set_flag(desc->dev, OF_POPULATED); } /* Get the next pending parent that might have children */