| Message ID | 20090702161231.31202.87763.stgit@ES-J7S4D2J.amer.consind.ge.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 0d81df8701d0972117008911bf00ebb1eef1471f |
| Delegated to: | Kumar Gala |
| Headers | show |
On Jul 2, 2009, at 11:12 AM, Martyn Welch wrote: > This patch enables the NVRAM found on the GE Fanuc SBC610 > > Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> > --- > > arch/powerpc/boot/dts/gef_sbc610.dts | 6 ++++++ > arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 ++-- > arch/powerpc/platforms/86xx/Kconfig | 1 + > arch/powerpc/platforms/86xx/gef_sbc610.c | 5 +++++ > 4 files changed, 14 insertions(+), 2 deletions(-) I assume these still work w/the updates to the other patches? - k
Kumar Gala wrote: > > On Jul 2, 2009, at 11:12 AM, Martyn Welch wrote: > >> This patch enables the NVRAM found on the GE Fanuc SBC610 >> >> Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> >> --- >> >> arch/powerpc/boot/dts/gef_sbc610.dts | 6 ++++++ >> arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 ++-- >> arch/powerpc/platforms/86xx/Kconfig | 1 + >> arch/powerpc/platforms/86xx/gef_sbc610.c | 5 +++++ >> 4 files changed, 14 insertions(+), 2 deletions(-) > > I assume these still work w/the updates to the other patches? > > - k I'm just updating your tree to ensure that the patches still apply (and compile) cleanly. I'm fairly confident that they will. Martyn
On Nov 5, 2009, at 8:23 AM, Martyn Welch wrote: > Kumar Gala wrote: >> >> On Jul 2, 2009, at 11:12 AM, Martyn Welch wrote: >> >>> This patch enables the NVRAM found on the GE Fanuc SBC610 >>> >>> Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> >>> --- >>> >>> arch/powerpc/boot/dts/gef_sbc610.dts | 6 ++++++ >>> arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 ++-- >>> arch/powerpc/platforms/86xx/Kconfig | 1 + >>> arch/powerpc/platforms/86xx/gef_sbc610.c | 5 +++++ >>> 4 files changed, 14 insertions(+), 2 deletions(-) >> >> I assume these still work w/the updates to the other patches? >> >> - k > I'm just updating your tree to ensure that the patches still apply > (and compile) cleanly. I'm fairly confident that they will. looks like I'm getting some defconfig merge conflicts. I'll deal with them but will apply these after defconfig updates make it into benh's next tree. - k
Kumar Gala wrote: > > On Nov 5, 2009, at 8:23 AM, Martyn Welch wrote: > >> Kumar Gala wrote: >>> >>> On Jul 2, 2009, at 11:12 AM, Martyn Welch wrote: >>> >>>> This patch enables the NVRAM found on the GE Fanuc SBC610 >>>> >>>> Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> >>>> --- >>>> >>>> arch/powerpc/boot/dts/gef_sbc610.dts | 6 ++++++ >>>> arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 ++-- >>>> arch/powerpc/platforms/86xx/Kconfig | 1 + >>>> arch/powerpc/platforms/86xx/gef_sbc610.c | 5 +++++ >>>> 4 files changed, 14 insertions(+), 2 deletions(-) >>> >>> I assume these still work w/the updates to the other patches? >>> >>> - k >> I'm just updating your tree to ensure that the patches still apply >> (and compile) cleanly. I'm fairly confident that they will. > > looks like I'm getting some defconfig merge conflicts. I'll deal with > them but will apply these after defconfig updates make it into benh's > next tree. > > - k The patches are sitting in stgit here - I noticed the offset of the defconfig changes was different, but didn't notice anything else different. I can resend if that's easier? Martyn
On Jul 2, 2009, at 11:12 AM, Martyn Welch wrote: > This patch enables the NVRAM found on the GE Fanuc SBC610 > > Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> > --- > > arch/powerpc/boot/dts/gef_sbc610.dts | 6 ++++++ > arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 ++-- > arch/powerpc/platforms/86xx/Kconfig | 1 + > arch/powerpc/platforms/86xx/gef_sbc610.c | 5 +++++ > 4 files changed, 14 insertions(+), 2 deletions(-) applied to next - k
diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts index 35a6318..30911ad 100644 --- a/arch/powerpc/boot/dts/gef_sbc610.dts +++ b/arch/powerpc/boot/dts/gef_sbc610.dts @@ -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>; diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig index c6a7fc8..b4a7c03 100644 --- a/arch/powerpc/configs/86xx/gef_sbc610_defconfig +++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig @@ -201,7 +201,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 @@ -1083,7 +1083,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 diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index 9c7b64a..9d02dea 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig @@ -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 diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c index 72b31a6..e10688a 100644 --- a/arch/powerpc/platforms/86xx/gef_sbc610.c +++ b/arch/powerpc/platforms/86xx/gef_sbc610.c @@ -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 */
This patch enables the NVRAM found on the GE Fanuc SBC610 Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> --- arch/powerpc/boot/dts/gef_sbc610.dts | 6 ++++++ arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 ++-- arch/powerpc/platforms/86xx/Kconfig | 1 + arch/powerpc/platforms/86xx/gef_sbc610.c | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-)