diff options
author | Martyn Welch <martyn.welch@gefanuc.com> | 2009-07-02 12:12:37 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2009-11-20 17:45:36 -0500 |
commit | 9093067ad11b22c967b0cbf5532ecb25b0d7d983 (patch) | |
tree | 0e9df4139b243d8e8fdaf1dca77600e269ae9850 /arch/powerpc/platforms | |
parent | 0d81df8701d0972117008911bf00ebb1eef1471f (diff) |
powerpc/86xx: Support for NVRAM on GE Fanuc's SBC310
Add support for NVRAM on GE Fanuc's SBC310.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/86xx/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/86xx/gef_sbc310.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index 9d02dea19bd8..6012022dcf79 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig | |||
@@ -43,6 +43,7 @@ config GEF_PPC9A | |||
43 | config GEF_SBC310 | 43 | config GEF_SBC310 |
44 | bool "GE Fanuc SBC310" | 44 | bool "GE Fanuc SBC310" |
45 | select DEFAULT_UIMAGE | 45 | select DEFAULT_UIMAGE |
46 | select MMIO_NVRAM | ||
46 | select GENERIC_GPIO | 47 | select GENERIC_GPIO |
47 | select ARCH_REQUIRE_GPIOLIB | 48 | select ARCH_REQUIRE_GPIOLIB |
48 | help | 49 | help |
diff --git a/arch/powerpc/platforms/86xx/gef_sbc310.c b/arch/powerpc/platforms/86xx/gef_sbc310.c index 90754e752bd8..6a1a613836c2 100644 --- a/arch/powerpc/platforms/86xx/gef_sbc310.c +++ b/arch/powerpc/platforms/86xx/gef_sbc310.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <asm/udbg.h> | 33 | #include <asm/udbg.h> |
34 | 34 | ||
35 | #include <asm/mpic.h> | 35 | #include <asm/mpic.h> |
36 | #include <asm/nvram.h> | ||
36 | 37 | ||
37 | #include <sysdev/fsl_pci.h> | 38 | #include <sysdev/fsl_pci.h> |
38 | #include <sysdev/fsl_soc.h> | 39 | #include <sysdev/fsl_soc.h> |
@@ -95,6 +96,10 @@ static void __init gef_sbc310_setup_arch(void) | |||
95 | printk(KERN_WARNING "Unable to map board registers\n"); | 96 | printk(KERN_WARNING "Unable to map board registers\n"); |
96 | of_node_put(regs); | 97 | of_node_put(regs); |
97 | } | 98 | } |
99 | |||
100 | #if defined(CONFIG_MMIO_NVRAM) | ||
101 | mmio_nvram_init(); | ||
102 | #endif | ||
98 | } | 103 | } |
99 | 104 | ||
100 | /* Return the PCB revision */ | 105 | /* Return the PCB revision */ |