summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov2011-06-17 05:10:06 +0200
committerBenjamin Herrenschmidt2011-06-29 09:48:20 +0200
commite48f7eb27f0e38e1a461fa4e43025d18100d250b (patch)
treede7c802a1ba2cfc0aef50b13c3affa1c0bfc4f11 /arch/powerpc
parentpowerpc: mem_init should call memblock_is_reserved with phys_addr_t (diff)
downloadkernel-qcow2-linux-e48f7eb27f0e38e1a461fa4e43025d18100d250b.tar.gz
kernel-qcow2-linux-e48f7eb27f0e38e1a461fa4e43025d18100d250b.tar.xz
kernel-qcow2-linux-e48f7eb27f0e38e1a461fa4e43025d18100d250b.zip
powerpc/maple: Enable scom access functions on Maple
Enable functions used to access SCOM if PPC_MAPLE is defined: they are used by cpufreq driver to control hardware. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/misc_64.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index e89df59cdc5a..616921ef1439 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -339,7 +339,7 @@ _GLOBAL(real_205_writeb)
#endif /* CONFIG_PPC_PASEMI */
-#ifdef CONFIG_CPU_FREQ_PMAC64
+#if defined(CONFIG_CPU_FREQ_PMAC64) || defined(CONFIG_CPU_FREQ_MAPLE)
/*
* SCOM access functions for 970 (FX only for now)
*
@@ -408,7 +408,7 @@ _GLOBAL(scom970_write)
/* restore interrupts */
mtmsrd r5,1
blr
-#endif /* CONFIG_CPU_FREQ_PMAC64 */
+#endif /* CONFIG_CPU_FREQ_PMAC64 || CONFIG_CPU_FREQ_MAPLE */
/*