powerpc/86xx: Support for NVRAM on GE Fanuc's SBC310
authorMartyn Welch <martyn.welch@gefanuc.com>
Thu, 2 Jul 2009 16:12:37 +0000 (17:12 +0100)
committerKumar Gala <galak@kernel.crashing.org>
Fri, 20 Nov 2009 22:45:36 +0000 (16:45 -0600)
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>
arch/powerpc/boot/dts/gef_sbc310.dts
arch/powerpc/configs/86xx/gef_sbc310_defconfig
arch/powerpc/platforms/86xx/Kconfig
arch/powerpc/platforms/86xx/gef_sbc310.c

index 2107d3c7cfe1d61bb6632c9445cee03a301fcbb5..820c2b355ab1fddacf2cf8d059f4a0d729c2acb8 100644 (file)
                        };
                };
 
+               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 e199d1cacbafdc89ab9928f1a160dd91da5cc5d2..a6a3768f73041e614089d960b49aa308d2889117 100644 (file)
@@ -218,7 +218,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
index 9d02dea19bd8300ac7fe3ed26eaa198d523f4943..6012022dcf7934c4698d61e68a82696fc049124f 100644 (file)
@@ -43,6 +43,7 @@ config GEF_PPC9A
 config GEF_SBC310
        bool "GE Fanuc SBC310"
        select DEFAULT_UIMAGE
+       select MMIO_NVRAM
        select GENERIC_GPIO
        select ARCH_REQUIRE_GPIOLIB
        help
index 90754e752bd827bafeb0680526cb6be41c55bee6..6a1a613836c27293c1c438e051252ba8bf122182 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_sbc310_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 */