evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sparc32,leon: always include leon_pmc in build

Browse source 
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>
This commit is contained in:
Sam Ravnborg 2012-05-26 04:43:27 +00:00 • committed by David S. Miller
parent 3732106a1a
commit 556626adf1
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc/kernel/Makefile
View file

@ -52,7 +52,7 @@ obj-y += of_device_$(BITS).o
obj-$(CONFIG_SPARC64) += prom_irqtrans.o obj-$(CONFIG_SPARC64) += prom_irqtrans.o
obj-$(CONFIG_SPARC32) += leon_kernel.o obj-$(CONFIG_SPARC32) += leon_kernel.o
obj-$(CONFIG_SPARC_LEON)+= leon_pmc.o obj-$(CONFIG_SPARC32) += leon_pmc.o
obj-$(CONFIG_SPARC64) += reboot.o obj-$(CONFIG_SPARC64) += reboot.o
obj-$(CONFIG_SPARC64) += sysfs.o obj-$(CONFIG_SPARC64) += sysfs.o

15
arch/sparc/kernel/leon_pmc.c
View file

@ -7,6 +7,7 @@
#include <linux/pm.h> #include <linux/pm.h>
#include <asm/leon_amba.h> #include <asm/leon_amba.h>
#include <asm/cpu_type.h>
#include <asm/leon.h> #include <asm/leon.h>
/* List of Systems that need fixup instructions around power-down instruction */ /* List of Systems that need fixup instructions around power-down instruction */
@ -65,13 +66,15 @@ void pmc_leon_idle(void)
/* Install LEON Power Down function */ /* Install LEON Power Down function */
static int __init leon_pmc_install(void) static int __init leon_pmc_install(void)
{ {
/* Assign power management IDLE handler */ if (sparc_cpu_model == sparc_leon) {
if (pmc_leon_need_fixup()) /* Assign power management IDLE handler */
pm_idle = pmc_leon_idle_fixup; if (pmc_leon_need_fixup())
else pm_idle = pmc_leon_idle_fixup;
pm_idle = pmc_leon_idle; else
pm_idle = pmc_leon_idle;
printk(KERN_INFO "leon: power management initialized\n"); printk(KERN_INFO "leon: power management initialized\n");
}
return 0; return 0;
} }