nvram driver for chrp

PATCH New Olaf Hering 1 participant 2 messages Feb 6, 2005 – Oct 10, 2005

lore

Share & tools

lore

Olaf Hering

author

2005-02-06 13:44 UTC #0 lore raw

PATCH 1/1 nvram driver for chrp

(resend with the correct mail address)

This implements a nvram acccess method, similar to arch/ppc64/kernel/pSeries_nvram.c
tested on CHRP B50.

Signed-off-by Olaf Hering <[email protected]>

arch/ppc/platforms/Makefile renamed from linux-2.6.11-rc3.orig/arch/ppc/platforms/Makefile +3 -0

diff -purNx tags ../linux-2.6.11-rc3.orig/arch/ppc/platforms/Makefile ./arch/ppc/platforms/Makefile
@@ -13,6 +13,9 @@ obj-$(CONFIG_PPC_PMAC)		+= pmac_pic.o pm
 					pmac_feature.o pmac_pci.o pmac_sleep.o \
 					pmac_low_i2c.o pmac_cache.o
 obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o
+ifeq ($(CONFIG_PPC_CHRP),y)
+obj-$(CONFIG_NVRAM)		+= chrp_nvram.o
+endif
 obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o
 ifeq ($(CONFIG_PPC_PMAC),y)
 obj-$(CONFIG_NVRAM)		+= pmac_nvram.o

arch/ppc/platforms/chrp_nvram.c renamed from linux-2.6.11-rc3.orig/arch/ppc/platforms/chrp_nvram.c +83 -0

83 lines not on this page · raw message

arch/ppc/platforms/chrp_setup.c renamed from linux-2.6.11-rc3.orig/arch/ppc/platforms/chrp_setup.c +1 -2

diff -purNx tags ../linux-2.6.11-rc3.orig/arch/ppc/platforms/chrp_setup.c ./arch/ppc/platforms/chrp_setup.c
@@ -465,8 +465,7 @@ void __init
 chrp_init2(void)
 {
 #ifdef CONFIG_NVRAM
-// XX replace this in a more saner way
-//	pmac_nvram_init();
+	chrp_nvram_init();
 #endif
 
 	request_region(0x20,0x20,"pic1");

include/asm-ppc/system.h renamed from linux-2.6.11-rc3.orig/include/asm-ppc/system.h +1 -0

diff -purNx tags ../linux-2.6.11-rc3.orig/include/asm-ppc/system.h ./include/asm-ppc/system.h
@@ -70,6 +70,7 @@ extern void _set_L3CR(unsigned long);
 #endif
 extern void via_cuda_init(void);
 extern void pmac_nvram_init(void);
+extern void chrp_nvram_init(void);
 extern void read_rtc_time(void);
 extern void pmac_find_display(void);
 extern void giveup_fpu(struct task_struct *);