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

Commit 948e78c3 authored by Martyn Welch's avatar Martyn Welch Committed by Kumar Gala
Browse files

powerpc/86xx: Renaming following split of GE Fanuc joint venture 



This patch renames GE Fanuc boards following the split-up of the GE Fanuc
joint venture. These boards are now made by GE Intelligent platorms.

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

arch/powerpc/boot/dts/gef_ppc9a.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * GE Fanuc PPC9A Device Tree Source

 * GE PPC9A Device Tree Source

 *

 * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc.

 * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc.

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

arch/powerpc/boot/dts/gef_sbc310.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * GE Fanuc SBC310 Device Tree Source

 * GE SBC310 Device Tree Source

 *

 * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc.

 * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc.

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

arch/powerpc/boot/dts/gef_sbc610.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * GE Fanuc SBC610 Device Tree Source

 * GE SBC610 Device Tree Source

 *

 * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, Inc.

 * Copyright 2008 GE Intelligent Platforms Embedded Systems, Inc.

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

arch/powerpc/platforms/86xx/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -33,32 +33,32 @@ config MPC8610_HPCD 
	  This option enables support for the MPC8610 HPCD board.



config GEF_PPC9A

	bool "GE Fanuc PPC9A"

	bool "GE PPC9A"

	select DEFAULT_UIMAGE

	select MMIO_NVRAM

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  This option enables support for GE Fanuc's PPC9A.

	  This option enables support for the GE PPC9A.



config GEF_SBC310

	bool "GE Fanuc SBC310"

	bool "GE SBC310"

	select DEFAULT_UIMAGE

	select MMIO_NVRAM

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	help

	  This option enables support for GE Fanuc's SBC310.

	  This option enables support for the GE SBC310.



config GEF_SBC610

	bool "GE Fanuc SBC610"

	bool "GE SBC610"

	select DEFAULT_UIMAGE

	select MMIO_NVRAM

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select HAS_RAPIDIO

	help

	  This option enables support for GE Fanuc's SBC610.

	  This option enables support for the GE SBC610.



endif

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

+5 −5
Original line number Diff line number Diff line 
/*

 * Driver for GE Fanuc's FPGA based GPIO pins

 * Driver for GE FPGA based GPIO

 *

 * Author: Martyn Welch <martyn.welch@gefanuc.com>

 * Author: Martyn Welch <martyn.welch@ge.com>

 *

 * 2008 (c) GE Fanuc Intelligent Platforms Embedded Systems, Inc.

 * 2008 (c) GE Intelligent Platforms Embedded Systems, Inc.

 *

 * This file is licensed under the terms of the GNU General Public License

 * version 2.  This program is licensed "as is" without any warranty of any
@@ -164,6 +164,6 @@ static int __init gef_gpio_init(void) 
};

arch_initcall(gef_gpio_init);



MODULE_DESCRIPTION("GE Fanuc I/O FPGA GPIO driver");

MODULE_AUTHOR("Martyn Welch <martyn.welch@gefanuc.com");

MODULE_DESCRIPTION("GE I/O FPGA GPIO driver");

MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com");

MODULE_LICENSE("GPL");