5 files changed, 20 insertions, 45 deletions

diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 46883c5136ac..1aea1e69ff31 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -3,7 +3,7 @@ menu "Platform support"
 
 choice
         prompt "Machine Type"
-        default MPC834x_SYS
+        default MPC834x_MDS
 
 config MPC8313_RDB
         bool "Freescale MPC8313 RDB"
@@ -18,13 +18,13 @@ config MPC832x_MDS
         help
           This option enables support for the MPC832x MDS evaluation board.
 
-config MPC834x_SYS
-        bool "Freescale MPC834x SYS"
+config MPC834x_MDS
+        bool "Freescale MPC834x MDS"
         select DEFAULT_UIMAGE
         help
-          This option enables support for the MPC 834x SYS evaluation board.
+          This option enables support for the MPC 834x MDS evaluation board.
 
-          Be aware that PCI buses can only function when SYS board is plugged
+          Be aware that PCI buses can only function when MDS board is plugged
           into the PIB (Platform IO Board) board from Freescale which provide
           3 PCI slots.  The PIBs PCI initialization is the bootloader's
           responsibility.
@@ -63,7 +63,7 @@ config MPC834x
         bool
         select PPC_UDBG_16550
         select PPC_INDIRECT_PCI
-        default y if MPC834x_SYS || MPC834x_ITX
+        default y if MPC834x_MDS || MPC834x_ITX
 
 config PPC_MPC836x
         bool
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index 0b732a79c0a8..6c8199c4c382 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -4,7 +4,7 @@
 obj-y                           := misc.o
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_MPC8313_RDB)       += mpc8313_rdb.o
-obj-$(CONFIG_MPC834x_SYS)       += mpc834x_sys.o
+obj-$(CONFIG_MPC834x_MDS)       += mpc834x_mds.o
 obj-$(CONFIG_MPC834x_ITX)       += mpc834x_itx.o
 obj-$(CONFIG_MPC8360E_PB)       += mpc8360e_pb.o
 obj-$(CONFIG_MPC832x_MDS)       += mpc832x_mds.o
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 2446dea9407e..443a3172f370 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -38,8 +38,6 @@
 
 #include "mpc83xx.h"
 
-#include <platforms/83xx/mpc834x_sys.h>
-
 #ifndef CONFIG_PCI
 unsigned long isa_io_base = 0;
 unsigned long isa_mem_base = 0;
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 873ec543c361..d2736da76c46 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_sys.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -1,7 +1,7 @@
 /*
- * arch/powerpc/platforms/83xx/mpc834x_sys.c
+ * arch/powerpc/platforms/83xx/mpc834x_mds.c
  *
- * MPC834x SYS board specific routines
+ * MPC834x MDS board specific routines
  *
  * Maintainer: Kumar Gala <galak@kernel.crashing.org>
  *
@@ -103,8 +103,8 @@ static int mpc834x_usb_cfg(void)
                 return -1;
 
         /*
-         * if SYS board is plug into PIB board,
-         * force to use the PHY on SYS board
+         * if MDS board is plug into PIB board,
+         * force to use the PHY on MDS board
          */
         bcsr5 = in_8(bcsr_regs + 5);
         if (!(bcsr5 & BCSR5_INT_USB))
@@ -118,12 +118,12 @@ static int mpc834x_usb_cfg(void)
  * Setup the architecture
  *
  */
-static void __init mpc834x_sys_setup_arch(void)
+static void __init mpc834x_mds_setup_arch(void)
 {
         struct device_node *np;
 
         if (ppc_md.progress)
-                ppc_md.progress("mpc834x_sys_setup_arch()", 0);
+                ppc_md.progress("mpc834x_mds_setup_arch()", 0);
 
         np = of_find_node_by_type(NULL, "cpu");
         if (np != 0) {
@@ -152,7 +152,7 @@ static void __init mpc834x_sys_setup_arch(void)
 #endif
 }
 
-static void __init mpc834x_sys_init_IRQ(void)
+static void __init mpc834x_mds_init_IRQ(void)
 {
         struct device_node *np;
 
@@ -192,7 +192,7 @@ late_initcall(mpc834x_rtc_hookup);
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
-static int __init mpc834x_sys_probe(void)
+static int __init mpc834x_mds_probe(void)
 {
         /* We always match for now, eventually we should look at the flat
            dev tree to ensure this is the board we are suppose to run on
@@ -200,11 +200,11 @@ static int __init mpc834x_sys_probe(void)
         return 1;
 }
 
-define_machine(mpc834x_sys) {
-        .name                   = "MPC834x SYS",
-        .probe                  = mpc834x_sys_probe,
-        .setup_arch             = mpc834x_sys_setup_arch,
-        .init_IRQ               = mpc834x_sys_init_IRQ,
+define_machine(mpc834x_mds) {
+        .name                   = "MPC834x MDS",
+        .probe                  = mpc834x_mds_probe,
+        .setup_arch             = mpc834x_mds_setup_arch,
+        .init_IRQ               = mpc834x_mds_init_IRQ,
         .get_irq                = ipic_get_irq,
         .restart                = mpc83xx_restart,
         .time_init              = mpc83xx_time_init,
diff --git a/arch/powerpc/platforms/83xx/mpc834x_sys.h b/arch/powerpc/platforms/83xx/mpc834x_sys.h
deleted file mode 100644
index 7d5bbef084e7..000000000000
--- a/arch/powerpc/platforms/83xx/mpc834x_sys.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * arch/powerpc/platforms/83xx/mpc834x_sys.h
- *
- * MPC834X SYS common board definitions
- *
- * Maintainer: Kumar Gala <galak@kernel.crashing.org>
- *
- * 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
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC83XX_SYS_H__
-#define __MACH_MPC83XX_SYS_H__
-
-#define PIRQA   MPC83xx_IRQ_EXT4
-#define PIRQB   MPC83xx_IRQ_EXT5
-#define PIRQC   MPC83xx_IRQ_EXT6
-#define PIRQD   MPC83xx_IRQ_EXT7
-
-#endif                          /* __MACH_MPC83XX_SYS_H__ */