aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/chrp/setup.c
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2005-10-28 20:46:19 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-29 00:35:00 -0400
commit35e95e63995f3e52178db4b769120ce60deb6b54 (patch)
tree17e81624cd6af0cf645948a175160a62f29b07c8 /arch/powerpc/platforms/chrp/setup.c
parent8b150478aeb1a8edb9015c2f7ac4da637ff65c45 (diff)
[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.c11
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 @@
55#include <asm/rtas.h> 55#include <asm/rtas.h>
56#include <asm/xmon.h> 56#include <asm/xmon.h>
57 57
58void chrp_get_rtc_time(struct rtc_time *); 58#include "chrp.h"
59int chrp_set_rtc_time(struct rtc_time *);
60void chrp_calibrate_decr(void);
61long chrp_time_init(void);
62 59
63void chrp_find_bridges(void);
64void chrp_event_scan(void);
65void rtas_indicator_progress(char *, unsigned short); 60void rtas_indicator_progress(char *, unsigned short);
66void btext_progress(char *, unsigned short); 61void btext_progress(char *, unsigned short);
67 62
@@ -469,6 +464,10 @@ void __init chrp_init_IRQ(void)
469void __init 464void __init
470chrp_init2(void) 465chrp_init2(void)
471{ 466{
467#ifdef CONFIG_NVRAM
468 chrp_nvram_init();
469#endif
470
472 request_region(0x20,0x20,"pic1"); 471 request_region(0x20,0x20,"pic1");
473 request_region(0xa0,0x20,"pic2"); 472 request_region(0xa0,0x20,"pic2");
474 request_region(0x00,0x20,"dma1"); 473 request_region(0x00,0x20,"dma1");