All of lore.kernel.org
 help / color / mirror / Atom feed
From: Meador Inge <meador_inge-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>
To: linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Cc: Meador Inge <meador_inge-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>,
	devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org,
	"Blanchard,
	Hollis"
	<Hollis_Blanchard-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>
Subject: [PATCH 2/2] powerpc: make MPIC honor the 'no-reset' device tree property
Date: Mon, 17 Jan 2011 18:54:01 -0600	[thread overview]
Message-ID: <4D34E4A9.4080807@mentor.com> (raw)

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 <meador_inge-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>
CC: Hollis Blanchard <hollis_blanchard-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>
---
  arch/powerpc/sysdev/mpic.c |    4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)

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),
  			   mpic_read(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0))
  			   | MPIC_GREG_GCONF_RESET);
-- 1.6.3.3

WARNING: multiple messages have this Message-ID (diff)
From: Meador Inge <meador_inge@mentor.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Meador Inge <meador_inge@mentor.com>,
	devicetree-discuss@lists.ozlabs.org, "Blanchard,
	Hollis" <Hollis_Blanchard@mentor.com>
Subject: [PATCH 2/2] powerpc: make MPIC honor the 'no-reset' device tree property
Date: Mon, 17 Jan 2011 18:54:01 -0600	[thread overview]
Message-ID: <4D34E4A9.4080807@mentor.com> (raw)

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 <meador_inge@mentor.com>
CC: Hollis Blanchard <hollis_blanchard@mentor.com>
---
  arch/powerpc/sysdev/mpic.c |    4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)

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),
  			   mpic_read(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0))
  			   | MPIC_GREG_GCONF_RESET);
-- 1.6.3.3

             reply	other threads:[~2011-01-18  0:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-18  0:54 Meador Inge [this message]
2011-01-18  0:54 ` [PATCH 2/2] powerpc: make MPIC honor the 'no-reset' device tree property Meador Inge

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4D34E4A9.4080807@mentor.com \
    --to=meador_inge-nmggyn9qbj3qt0dzr+alfa@public.gmane.org \
    --cc=Hollis_Blanchard-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org \
    --cc=devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
    --cc=linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.