UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Martyn Welch 2010-03-01 14:41:59 +00:00 committed by Kumar Gala
parent 6f3d395a5c
commit 948e78c3fc
9 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/boot/dts/gef_ppc9a.dts
View File

@ -1,7 +1,7 @@
/* /*
* 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 * 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 * under the terms of the GNU General Public License as published by the

4
arch/powerpc/boot/dts/gef_sbc310.dts
View File

@ -1,7 +1,7 @@
/* /*
* 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 * 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 * under the terms of the GNU General Public License as published by the

4
arch/powerpc/boot/dts/gef_sbc610.dts
View File

@ -1,7 +1,7 @@
/* /*
* 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 * 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 * under the terms of the GNU General Public License as published by the

12
arch/powerpc/platforms/86xx/Kconfig
View File

@ -33,32 +33,32 @@ config MPC8610_HPCD
This option enables support for the MPC8610 HPCD board. This option enables support for the MPC8610 HPCD board.
config GEF_PPC9A config GEF_PPC9A
bool "GE Fanuc PPC9A" bool "GE PPC9A"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select MMIO_NVRAM select MMIO_NVRAM
select GENERIC_GPIO select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
help help
This option enables support for GE Fanuc's PPC9A. This option enables support for the GE PPC9A.
config GEF_SBC310 config GEF_SBC310
bool "GE Fanuc SBC310" bool "GE SBC310"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select MMIO_NVRAM select MMIO_NVRAM
select GENERIC_GPIO select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
help help
This option enables support for GE Fanuc's SBC310. This option enables support for the GE SBC310.
config GEF_SBC610 config GEF_SBC610
bool "GE Fanuc SBC610" bool "GE SBC610"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select MMIO_NVRAM select MMIO_NVRAM
select GENERIC_GPIO select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select HAS_RAPIDIO select HAS_RAPIDIO
help help
This option enables support for GE Fanuc's SBC610. This option enables support for the GE SBC610.
endif endif

10
arch/powerpc/platforms/86xx/gef_gpio.c
View File

@ -1,9 +1,9 @@
/* /*
* 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 * 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 * 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); arch_initcall(gef_gpio_init);
MODULE_DESCRIPTION("GE Fanuc I/O FPGA GPIO driver"); MODULE_DESCRIPTION("GE I/O FPGA GPIO driver");
MODULE_AUTHOR("Martyn Welch <martyn.welch@gefanuc.com"); MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

6
arch/powerpc/platforms/86xx/gef_pic.c
View File

@ -1,9 +1,9 @@
/* /*
* Interrupt handling for GE Fanuc's FPGA based PIC * Interrupt handling for GE FPGA based PIC
* *
* 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 * 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 * version 2. This program is licensed "as is" without any warranty of any

12
arch/powerpc/platforms/86xx/gef_ppc9a.c
View File

@ -1,9 +1,9 @@
/* /*
* GE Fanuc PPC9A board support * GE PPC9A board support
* *
* Author: Martyn Welch <martyn.welch@gefanuc.com> * Author: Martyn Welch <martyn.welch@ge.com>
* *
* 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 * 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 * under the terms of the GNU General Public License as published by the
@ -82,7 +82,7 @@ static void __init gef_ppc9a_setup_arch(void)
} }
#endif #endif
printk(KERN_INFO "GE Fanuc Intelligent Platforms PPC9A 6U VME SBC\n"); printk(KERN_INFO "GE Intelligent Platforms PPC9A 6U VME SBC\n");
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
mpc86xx_smp_init(); mpc86xx_smp_init();
@ -151,7 +151,7 @@ static void gef_ppc9a_show_cpuinfo(struct seq_file *m)
{ {
uint svid = mfspr(SPRN_SVR); uint svid = mfspr(SPRN_SVR);
seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n"); seq_printf(m, "Vendor\t\t: GE Intelligent Platforms\n");
seq_printf(m, "Revision\t: %u%c\n", gef_ppc9a_get_pcb_rev(), seq_printf(m, "Revision\t: %u%c\n", gef_ppc9a_get_pcb_rev(),
('A' + gef_ppc9a_get_board_rev())); ('A' + gef_ppc9a_get_board_rev()));
@ -235,7 +235,7 @@ static int __init declare_of_platform_devices(void)
machine_device_initcall(gef_ppc9a, declare_of_platform_devices); machine_device_initcall(gef_ppc9a, declare_of_platform_devices);
define_machine(gef_ppc9a) { define_machine(gef_ppc9a) {
.name = "GE Fanuc PPC9A", .name = "GE PPC9A",
.probe = gef_ppc9a_probe, .probe = gef_ppc9a_probe,
.setup_arch = gef_ppc9a_setup_arch, .setup_arch = gef_ppc9a_setup_arch,
.init_IRQ = gef_ppc9a_init_irq, .init_IRQ = gef_ppc9a_init_irq,

12
arch/powerpc/platforms/86xx/gef_sbc310.c
View File

@ -1,9 +1,9 @@
/* /*
* GE Fanuc SBC310 board support * GE SBC310 board support
* *
* Author: Martyn Welch <martyn.welch@gefanuc.com> * Author: Martyn Welch <martyn.welch@ge.com>
* *
* 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 * 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 * under the terms of the GNU General Public License as published by the
@ -82,7 +82,7 @@ static void __init gef_sbc310_setup_arch(void)
} }
#endif #endif
printk(KERN_INFO "GE Fanuc Intelligent Platforms SBC310 6U VPX SBC\n"); printk(KERN_INFO "GE Intelligent Platforms SBC310 6U VPX SBC\n");
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
mpc86xx_smp_init(); mpc86xx_smp_init();
@ -142,7 +142,7 @@ static void gef_sbc310_show_cpuinfo(struct seq_file *m)
{ {
uint svid = mfspr(SPRN_SVR); uint svid = mfspr(SPRN_SVR);
seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n"); seq_printf(m, "Vendor\t\t: GE Intelligent Platforms\n");
seq_printf(m, "Board ID\t: 0x%2.2x\n", gef_sbc310_get_board_id()); seq_printf(m, "Board ID\t: 0x%2.2x\n", gef_sbc310_get_board_id());
seq_printf(m, "Revision\t: %u%c\n", gef_sbc310_get_pcb_rev(), seq_printf(m, "Revision\t: %u%c\n", gef_sbc310_get_pcb_rev(),
@ -223,7 +223,7 @@ static int __init declare_of_platform_devices(void)
machine_device_initcall(gef_sbc310, declare_of_platform_devices); machine_device_initcall(gef_sbc310, declare_of_platform_devices);
define_machine(gef_sbc310) { define_machine(gef_sbc310) {
.name = "GE Fanuc SBC310", .name = "GE SBC310",
.probe = gef_sbc310_probe, .probe = gef_sbc310_probe,
.setup_arch = gef_sbc310_setup_arch, .setup_arch = gef_sbc310_setup_arch,
.init_IRQ = gef_sbc310_init_irq, .init_IRQ = gef_sbc310_init_irq,

12
arch/powerpc/platforms/86xx/gef_sbc610.c
View File

@ -1,9 +1,9 @@
/* /*
* GE Fanuc SBC610 board support * GE SBC610 board support
* *
* Author: Martyn Welch <martyn.welch@gefanuc.com> * Author: Martyn Welch <martyn.welch@ge.com>
* *
* 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 * 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 * under the terms of the GNU General Public License as published by the
@ -82,7 +82,7 @@ static void __init gef_sbc610_setup_arch(void)
} }
#endif #endif
printk(KERN_INFO "GE Fanuc Intelligent Platforms SBC610 6U VPX SBC\n"); printk(KERN_INFO "GE Intelligent Platforms SBC610 6U VPX SBC\n");
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
mpc86xx_smp_init(); mpc86xx_smp_init();
@ -133,7 +133,7 @@ static void gef_sbc610_show_cpuinfo(struct seq_file *m)
{ {
uint svid = mfspr(SPRN_SVR); uint svid = mfspr(SPRN_SVR);
seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n"); seq_printf(m, "Vendor\t\t: GE Intelligent Platforms\n");
seq_printf(m, "Revision\t: %u%c\n", gef_sbc610_get_pcb_rev(), seq_printf(m, "Revision\t: %u%c\n", gef_sbc610_get_pcb_rev(),
('A' + gef_sbc610_get_board_rev() - 1)); ('A' + gef_sbc610_get_board_rev() - 1));
@ -212,7 +212,7 @@ static int __init declare_of_platform_devices(void)
machine_device_initcall(gef_sbc610, declare_of_platform_devices); machine_device_initcall(gef_sbc610, declare_of_platform_devices);
define_machine(gef_sbc610) { define_machine(gef_sbc610) {
.name = "GE Fanuc SBC610", .name = "GE SBC610",
.probe = gef_sbc610_probe, .probe = gef_sbc610_probe,
.setup_arch = gef_sbc610_setup_arch, .setup_arch = gef_sbc610_setup_arch,
.init_IRQ = gef_sbc610_init_irq, .init_IRQ = gef_sbc610_init_irq,