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

Commit 0d81df87 authored by Martyn Welch's avatar Martyn Welch Committed by Kumar Gala
Browse files

powerpc/86xx: Enable NVRAM on GE Fanuc's SBC610 



This patch enables the NVRAM found on the GE Fanuc SBC610

Signed-off-by: default avatarMartyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent a3f62bd2

arch/powerpc/boot/dts/gef_sbc610.dts

+6 −0
Original line number Diff line number Diff line
@@ -84,6 +84,12 @@ 
			  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>;

arch/powerpc/configs/86xx/gef_sbc610_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/86xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/platforms/86xx/gef_sbc610.c

+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_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 */