summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx/common.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-03-24 10:26:10 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-03-24 10:26:10 +1100
commitcd427485357c0c4b99f69719251baacf25946e11 (patch)
treeca1ff7eb2277dec42f1e20adc0b98c3c215ecfbe /arch/powerpc/platforms/85xx/common.c
parentd410ae2126481a74bc5be4a6242c4a232c19a984 (diff)
parent48b16180d0d91324e5d2423c6d53d97bbe3dcc14 (diff)
Merge remote-tracking branch 'scott/next' into next
Freescale updates from Scott. Mostly support for critical and machine check exceptions on 64-bit BookE, some new PCI suspend/resume work and misc bits.
Diffstat (limited to 'arch/powerpc/platforms/85xx/common.c')
-rw-r--r--arch/powerpc/platforms/85xx/common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/common.c b/arch/powerpc/platforms/85xx/common.c
index 3b085c7ee53..b564b5e23f7 100644
--- a/arch/powerpc/platforms/85xx/common.c
+++ b/arch/powerpc/platforms/85xx/common.c
@@ -107,6 +107,12 @@ void __init mpc85xx_qe_init(void)
qe_reset();
of_node_put(np);
+}
+
+void __init mpc85xx_qe_par_io_init(void)
+{
+ struct device_node *np;
+
np = of_find_node_by_name(NULL, "par_io");
if (np) {
struct device_node *ucc;