diff options
| author | Olaf Hering <olh@suse.de> | 2005-10-28 17:46:19 -0700 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-29 14:35:00 +1000 |
| commit | 35e95e63995f3e52178db4b769120ce60deb6b54 (patch) | |
| tree | 17e81624cd6af0cf645948a175160a62f29b07c8 /arch/powerpc/platforms/chrp/setup.c | |
| parent | 8b150478aeb1a8edb9015c2f7ac4da637ff65c45 (diff) | |
| download | linux-stable-35e95e63995f3e52178db4b769120ce60deb6b54.tar.gz linux-stable-35e95e63995f3e52178db4b769120ce60deb6b54.tar.bz2 linux-stable-35e95e63995f3e52178db4b769120ce60deb6b54.zip | |
[PATCH] ppc32: nvram driver for chrp
This implements a nvram acccess method, similar to
arch/ppc64/kernel/pSeries_nvram.c tested on CHRP B50.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/chrp/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/chrp/setup.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index 5145990e6a01..ecd32d5d85f4 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c @@ -55,13 +55,8 @@ #include <asm/rtas.h> #include <asm/xmon.h> -void chrp_get_rtc_time(struct rtc_time *); -int chrp_set_rtc_time(struct rtc_time *); -void chrp_calibrate_decr(void); -long chrp_time_init(void); +#include "chrp.h" -void chrp_find_bridges(void); -void chrp_event_scan(void); void rtas_indicator_progress(char *, unsigned short); void btext_progress(char *, unsigned short); @@ -469,6 +464,10 @@ void __init chrp_init_IRQ(void) void __init chrp_init2(void) { +#ifdef CONFIG_NVRAM + chrp_nvram_init(); +#endif + request_region(0x20,0x20,"pic1"); request_region(0xa0,0x20,"pic2"); request_region(0x00,0x20,"dma1"); |