diff options
author | Eric Miao <eric.miao@marvell.com> | 2009-01-19 05:43:12 -0500 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:22:40 -0400 |
commit | 5438614509d80bc0b1981b749e9cb688f1769dfb (patch) | |
tree | ce2ae69972967da22a8f2245ba58cc3152b77455 /arch/arm/mach-pxa/include/mach | |
parent | b393c69652333be31ad7a8205761c0d5b7f3e167 (diff) |
[ARM] pxa: make lubbock specific debugging stuffs back into lubbock.c
This isn't perfect but at least solves the problem of pm.c's dependency
on register definitions in <mach/lubbock.h>, which doesn't make much
sense.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/lubbock.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pm.h | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h index 4cb24154a5a8..751b74811d0f 100644 --- a/arch/arm/mach-pxa/include/mach/lubbock.h +++ b/arch/arm/mach-pxa/include/mach/lubbock.h | |||
@@ -25,7 +25,6 @@ | |||
25 | 25 | ||
26 | /* FPGA register virtual addresses */ | 26 | /* FPGA register virtual addresses */ |
27 | #define LUB_WHOAMI __LUB_REG(LUBBOCK_FPGA_PHYS + 0x000) | 27 | #define LUB_WHOAMI __LUB_REG(LUBBOCK_FPGA_PHYS + 0x000) |
28 | #define LUB_HEXLED __LUB_REG(LUBBOCK_FPGA_PHYS + 0x010) | ||
29 | #define LUB_DISC_BLNK_LED __LUB_REG(LUBBOCK_FPGA_PHYS + 0x040) | 28 | #define LUB_DISC_BLNK_LED __LUB_REG(LUBBOCK_FPGA_PHYS + 0x040) |
30 | #define LUB_CONF_SWITCHES __LUB_REG(LUBBOCK_FPGA_PHYS + 0x050) | 29 | #define LUB_CONF_SWITCHES __LUB_REG(LUBBOCK_FPGA_PHYS + 0x050) |
31 | #define LUB_USER_SWITCHES __LUB_REG(LUBBOCK_FPGA_PHYS + 0x060) | 30 | #define LUB_USER_SWITCHES __LUB_REG(LUBBOCK_FPGA_PHYS + 0x060) |
diff --git a/arch/arm/mach-pxa/include/mach/pm.h b/arch/arm/mach-pxa/include/mach/pm.h index 83342469acac..a6eeef8a075f 100644 --- a/arch/arm/mach-pxa/include/mach/pm.h +++ b/arch/arm/mach-pxa/include/mach/pm.h | |||
@@ -27,3 +27,13 @@ extern void pxa27x_cpu_suspend(unsigned int); | |||
27 | extern void pxa_cpu_resume(void); | 27 | extern void pxa_cpu_resume(void); |
28 | 28 | ||
29 | extern int pxa_pm_enter(suspend_state_t state); | 29 | extern int pxa_pm_enter(suspend_state_t state); |
30 | |||
31 | /* NOTE: this is for PM debugging on Lubbock, it's really a big | ||
32 | * ugly, but let's keep the crap minimum here, instead of direct | ||
33 | * accessing the LUBBOCK CPLD registers in arch/arm/mach-pxa/pm.c | ||
34 | */ | ||
35 | #ifdef CONFIG_ARCH_LUBBOCK | ||
36 | extern void lubbock_set_hexled(uint32_t value); | ||
37 | #else | ||
38 | #define lubbock_set_hexled(x) | ||
39 | #endif | ||