From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-de.keymile.com (mail-de.keymile.com [195.8.104.1]) by ozlabs.org (Postfix) with SMTP id 256CD2C0131 for ; Sat, 8 Dec 2012 02:20:36 +1100 (EST) From: Holger Brunck To: linuxppc-dev@ozlabs.org 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 Message-Id: <1354892956-14623-4-git-send-email-holger.brunck@keymile.com> In-Reply-To: <1354892956-14623-1-git-send-email-holger.brunck@keymile.com> References: <1354892956-14623-1-git-send-email-holger.brunck@keymile.com> Cc: Holger Brunck , Gerlando Falauto List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Gerlando Falauto There is no point in applying this quirk when par_io is not present. Signed-off-by: Gerlando Falauto Signed-off-by: Holger Brunck cc: Kumar Gala --- 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