Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9093067a authored by Martyn Welch's avatar Martyn Welch Committed by Kumar Gala
Browse files

powerpc/86xx: Support for NVRAM on GE Fanuc's SBC310



Add support for NVRAM on GE Fanuc's SBC310.

Signed-off-by: default avatarMartyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 0d81df87
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -115,6 +115,12 @@
			};
		};

		nvram@3,0 {
			device_type = "nvram";
			compatible = "simtek,stk14ca8";
			reg = <0x3 0x0 0x20000>;
		};

		fpga@4,0 {
			compatible = "gef,fpga-regs";
			reg = <0x4 0x0 0x40>;
+1 −1
Original line number Diff line number Diff line
@@ -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
+1 −0
Original line number Diff line number Diff line
@@ -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
+5 −0
Original line number Diff line number Diff line
@@ -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 */