From patchwork Tue Jan 18 00:54:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meador Inge X-Patchwork-Id: 79242 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 7C4C9B7678 for ; Tue, 18 Jan 2011 11:54:15 +1100 (EST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "relay1.mentorg.com", Issuer "Entrust Certification Authority - L1B" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 77C8DB7136; Tue, 18 Jan 2011 11:54:07 +1100 (EST) Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1Pezpl-0003jB-6s from meador_inge@mentor.com ; Mon, 17 Jan 2011 16:54:05 -0800 Received: from na2-mail.mgc.mentorg.com ([134.86.114.213]) by svr-orw-fem-01.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 17 Jan 2011 16:54:05 -0800 Received: from [172.30.88.32] ([172.30.88.32]) by na2-mail.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 17 Jan 2011 17:54:03 -0700 Message-ID: <4D34E4A9.4080807@mentor.com> Date: Mon, 17 Jan 2011 18:54:01 -0600 From: Meador Inge User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9pre) Gecko/20100217 Shredder/3.0.3pre MIME-Version: 1.0 To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/2] powerpc: make MPIC honor the 'no-reset' device tree property X-OriginalArrivalTime: 18 Jan 2011 00:54:04.0102 (UTC) FILETIME=[33DD2E60:01CBB6AA] Cc: Meador Inge , devicetree-discuss@lists.ozlabs.org, "Blanchard, Hollis" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org This property, defined in the MPIC binding, tells the kernel not to use the reset bit in the global configuration register. Signed-off-by: Meador Inge CC: Hollis Blanchard --- arch/powerpc/sysdev/mpic.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) mpic_read(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0)) | MPIC_GREG_GCONF_RESET); -- 1.6.3.3 diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 30c44e6..44aa2c3 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -1157,7 +1157,9 @@ struct mpic * __init mpic_alloc(struct device_node *node, mpic_map(mpic, node, paddr, &mpic->tmregs, MPIC_INFO(TIMER_BASE), 0x1000); /* Reset */ - if (flags & MPIC_WANTS_RESET) { + if ((flags & MPIC_WANTS_RESET) && + !of_find_property(node, "no-reset", NULL)) { + printk(KERN_DEBUG "mpic: Resetting\n"); mpic_write(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0),