LinuxPPC-Dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Holger Brunck <holger.brunck@keymile.com>
To: linuxppc-dev@ozlabs.org
Cc: Holger Brunck <holger.brunck@keymile.com>,
	Gerlando Falauto <gerlando.falauto@keymile.com>
Subject: [PATCH 4/5] powerpc/83xx: apply mpc8360e quirk for kmeter1 only when par_io is present
Date: Fri,  7 Dec 2012 16:09:15 +0100	[thread overview]
Message-ID: <1354892956-14623-4-git-send-email-holger.brunck@keymile.com> (raw)
In-Reply-To: <1354892956-14623-1-git-send-email-holger.brunck@keymile.com>

From: Gerlando Falauto <gerlando.falauto@keymile.com>

There is no point in applying this quirk when par_io is not present.

Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/platforms/83xx/km83xx.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
index 88b1af0..bf4c447 100644
--- a/arch/powerpc/platforms/83xx/km83xx.c
+++ b/arch/powerpc/platforms/83xx/km83xx.c
@@ -148,11 +148,13 @@ static void __init mpc83xx_km_setup_arch(void)
 
 		for_each_node_by_name(np, "ucc")
 			par_io_of_config(np);
-	}
-	np = of_find_compatible_node(NULL, "network", "ucc_geth");
-	if (np != NULL) {
-		quirk_mpc8360e_qe_enet10();
-		of_node_put(np);
+
+		/* Only apply this quirk when par_io is available */
+		np = of_find_compatible_node(NULL, "network", "ucc_geth");
+		if (np != NULL) {
+			quirk_mpc8360e_qe_enet10();
+			of_node_put(np);
+		}
 	}
 #endif	/* CONFIG_QUICC_ENGINE */
 }
-- 
1.7.1

  parent reply	other threads:[~2012-12-07 15:20 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-07 15:09 [PATCH 1/5] powerpc/82xx: fix checkpatch warnings for km82xx.c Holger Brunck
2012-12-07 15:09 ` [PATCH 2/5] powerpc/83xx: fix checkpatch warnings for km83xx.c Holger Brunck
2012-12-07 15:09 ` [PATCH 3/5] powerpc/83xx: refactor mpc8360e quirk for kmeter1 Holger Brunck
2012-12-07 15:09 ` Holger Brunck [this message]
2012-12-07 15:09 ` [PATCH 5/5] powerpc/83xx: update kmeter1_defconfig Holger Brunck
2013-02-12 20:00 ` [PATCH 1/5] powerpc/82xx: fix checkpatch warnings for km82xx.c Kumar Gala

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=1354892956-14623-4-git-send-email-holger.brunck@keymile.com \
    --to=holger.brunck@keymile.com \
    --cc=gerlando.falauto@keymile.com \
    --cc=linuxppc-dev@ozlabs.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox