summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGerlando Falauto <gerlando.falauto@keymile.com>2012-12-07 16:09:15 +0100
committerKumar Gala <galak@kernel.crashing.org>2013-02-13 07:49:07 -0600
commit9c2f451e0db90d257c745df1d967c8010f14f0dd (patch)
tree454ce59765b7f6c378bceb6f97ed207c93c92f72 /arch
parent14f40f31e8ffd639c2e3e0cd90ec6dd8b536144b (diff)
downloadlinux-9c2f451e0db90d257c745df1d967c8010f14f0dd.tar.gz
linux-9c2f451e0db90d257c745df1d967c8010f14f0dd.tar.bz2
linux-9c2f451e0db90d257c745df1d967c8010f14f0dd.zip
powerpc/83xx: apply mpc8360e quirk for kmeter1 only when par_io is present
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> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/83xx/km83xx.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
index 88b1af04661b..bf4c4473abb9 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 */
}