[PATCH 4/5] ARM: scu: Move register defines to header file

[Santosh Shilimkar]

> -----Original Message-----
> From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]
> Sent: Monday, February 07, 2011 3:48 PM
> To: Santosh Shilimkar
> Cc: catalin.marinas at arm.com; linus.ml.walleij at gmail.com; linux-
> omap at vger.kernel.org; linux-arm-kernel at lists.infradead.org;
> ccross at android.com
> Subject: Re: [PATCH 4/5] ARM: scu: Move register defines to header
> file
>
[....]

> > > 8<------
> > > Subject: [PATCH] ARM: smp: add function to set WFI low-power
> mode
> > > for SMP CPUs
> > >
> > > Add a function to set the SCU low-power mode for SMP CPUs.  This
> > > centralizes this functionality rather than having to expose the
> > > SCU register definitions to each platform.
> > >
> > > Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
> > > ---
> > >  arch/arm/include/asm/smp_scu.h |    5 +++++
> > >  arch/arm/kernel/smp_scu.c      |   24 ++++++++++++++++++++++++
> > >  2 files changed, 29 insertions(+), 0 deletions(-)
> > >
[...]

> > > +int scu_power_mode(void __iomem *scu_base, unsigned int mode)
> > > +{
> > > +	unsigned int val;
> > > +	int cpu = smp_processor_id();
> > > +	int shift;
> > shift is unused with this version now so I am removing it.
>
> Yes, I noticed that - it's gone in the version I merged into my
> tree.

This patch will need below update so that the smp_scu.h
header can be included from assembly files. Will you
fold this into your patch or you want me to
send below as separate patch ?

diff --git a/arch/arm/include/asm/smp_scu.h
b/arch/arm/include/asm/smp_scu.h
index 800860d..8895c6c 100644
--- a/arch/arm/include/asm/smp_scu.h
+++ b/arch/arm/include/asm/smp_scu.h
@@ -5,8 +5,11 @@
 #define SCU_PM_DORMANT	2
 #define SCU_PM_POWEROFF	3

+#ifndef __ASSEMBLER__
+
 unsigned int scu_get_core_count(void __iomem *);
 void scu_enable(void __iomem *);
 int scu_power_mode(void __iomem *, unsigned int);

 #endif
+#endif