powerpc/86xx: Enable NVRAM on GE Fanuc's SBC610
authorMartyn Welch <martyn.welch@gefanuc.com>
Thu, 2 Jul 2009 16:12:31 +0000 (17:12 +0100)
committerKumar Gala <galak@kernel.crashing.org>
Fri, 20 Nov 2009 22:45:35 +0000 (16:45 -0600)
This patch enables the NVRAM found on the GE Fanuc SBC610

Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/boot/dts/gef_sbc610.dts
arch/powerpc/configs/86xx/gef_sbc610_defconfig
arch/powerpc/platforms/86xx/Kconfig
arch/powerpc/platforms/86xx/gef_sbc610.c

index 35a63183eeccbac072b9b4c58801340bd3f7f755..30911adefc8ebe361b467bfc2b5ecc0ce74d6426 100644 (file)
                          6 0 0xfd000000 0x00800000     // IO FPGA (8-bit)
                          7 0 0xfd800000 0x00800000>;   // IO FPGA (32-bit)
 
+               nvram@3,0 {
+                       device_type = "nvram";
+                       compatible = "simtek,stk14ca8";
+                       reg = <0x3 0x0 0x20000>;
+               };
+
                fpga@4,0 {
                        compatible = "gef,fpga-regs";
                        reg = <0x4 0x0 0x40>;
index 3b0fbfb28efd008816d8585ca20e298617e013ad..1975d41e07632ee093ff437141f3e0406bd71beb 100644 (file)
@@ -219,7 +219,7 @@ CONFIG_MPIC=y
 # CONFIG_MPIC_WEIRD is not set
 # CONFIG_PPC_I8259 is not set
 # CONFIG_PPC_RTAS is not set
-# CONFIG_MMIO_NVRAM is not set
+CONFIG_MMIO_NVRAM=y
 # CONFIG_PPC_MPC106 is not set
 # CONFIG_PPC_970_NAP is not set
 # CONFIG_PPC_INDIRECT_IO is not set
@@ -1124,7 +1124,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_NVRAM is not set
+CONFIG_NVRAM=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_RAW_DRIVER is not set
index 9c7b64a3402b69fc90c87c9f9a958b70092f6116..9d02dea19bd8300ac7fe3ed26eaa198d523f4943 100644 (file)
@@ -51,6 +51,7 @@ config GEF_SBC310
 config GEF_SBC610
        bool "GE Fanuc SBC610"
        select DEFAULT_UIMAGE
+       select MMIO_NVRAM
        select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
        select HAS_RAPIDIO
index 72b31a6010a0dd9a302662d562e8106e97c2cd69..e10688a0fc4eb9cb839142d81ea2558363db9b0a 100644 (file)
@@ -33,6 +33,7 @@
 #include <asm/udbg.h>
 
 #include <asm/mpic.h>
+#include <asm/nvram.h>
 
 #include <sysdev/fsl_pci.h>
 #include <sysdev/fsl_soc.h>
@@ -95,6 +96,10 @@ static void __init gef_sbc610_setup_arch(void)
                        printk(KERN_WARNING "Unable to map board registers\n");
                of_node_put(regs);
        }
+
+#if defined(CONFIG_MMIO_NVRAM)
+       mmio_nvram_init();
+#endif
 }
 
 /* Return the PCB revision */