3 files changed, 22 insertions, 28 deletions

diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 1aea1e69ff31..713b31a16ce9 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -38,12 +38,12 @@ config MPC834x_ITX
           Be aware that PCI initialization is the bootloader's
           responsibility.
 
-config MPC8360E_PB
-        bool "Freescale MPC8360E PB"
+config MPC836x_MDS
+        bool "Freescale MPC836x MDS"
         select DEFAULT_UIMAGE
         select QUICC_ENGINE
         help
-          This option enables support for the MPC836x EMDS Processor Board.
+          This option enables support for the MPC836x MDS Processor Board.
 
 endchoice
 
@@ -69,6 +69,6 @@ config PPC_MPC836x
         bool
         select PPC_UDBG_16550
         select PPC_INDIRECT_PCI
-        default y if MPC8360E_PB
+        default y if MPC836x_MDS
 
 endmenu
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index 6c8199c4c382..dfc970d0df10 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -6,5 +6,5 @@ obj-$(CONFIG_PCI)		+= pci.o
 obj-$(CONFIG_MPC8313_RDB)       += mpc8313_rdb.o
 obj-$(CONFIG_MPC834x_MDS)       += mpc834x_mds.o
 obj-$(CONFIG_MPC834x_ITX)       += mpc834x_itx.o
-obj-$(CONFIG_MPC8360E_PB)       += mpc8360e_pb.o
+obj-$(CONFIG_MPC836x_MDS)       += mpc836x_mds.o
 obj-$(CONFIG_MPC832x_MDS)       += mpc832x_mds.o
diff --git a/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index b25e6a116233..526ed090a446 100644
--- a/arch/powerpc/platforms/83xx/mpc8360e_pb.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -5,12 +5,12 @@
  *         Yin Olivia <Hong-hua.Yin@freescale.com>
  *
  * Description:
- * MPC8360E MDS PB board specific routines.
+ * MPC8360E MDS board specific routines.
  *
  * Changelog:
  * Jun 21, 2006 Initial version
  *
- * 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
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
@@ -62,22 +62,17 @@ unsigned long isa_mem_base = 0;
 
 static u8 *bcsr_regs = NULL;
 
-u8 *get_bcsr(void)
-{
-        return bcsr_regs;
-}
-
 /* ************************************************************************
  *
  * Setup the architecture
  *
  */
-static void __init mpc8360_sys_setup_arch(void)
+static void __init mpc836x_mds_setup_arch(void)
 {
         struct device_node *np;
 
         if (ppc_md.progress)
-                ppc_md.progress("mpc8360_sys_setup_arch()", 0);
+                ppc_md.progress("mpc836x_mds_setup_arch()", 0);
 
         /* Map BCSR area */
         np = of_find_node_by_name(NULL, "bcsr");
@@ -128,7 +123,7 @@ static struct of_device_id mpc836x_ids[] = {
 
 static int __init mpc836x_declare_of_platform_devices(void)
 {
-        if (!machine_is(mpc8360_sys))
+        if (!machine_is(mpc836x_mds))
                 return 0;
 
         /* Publish the QE devices */
@@ -138,9 +133,8 @@ static int __init mpc836x_declare_of_platform_devices(void)
 }
 device_initcall(mpc836x_declare_of_platform_devices);
 
-static void __init mpc8360_sys_init_IRQ(void)
+static void __init mpc836x_mds_init_IRQ(void)
 {
-
         struct device_node *np;
 
         np = of_find_node_by_type(NULL, "ipic");
@@ -173,7 +167,7 @@ static int __init mpc8360_rtc_hookup(void)
 {
         struct timespec tv;
 
-        if (!machine_is(mpc8360_sys))
+        if (!machine_is(mpc836x_mds))
                 return 0;
 
         ppc_md.get_rtc_time = ds1374_get_rtc_time;
@@ -192,21 +186,21 @@ late_initcall(mpc8360_rtc_hookup);
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
-static int __init mpc8360_sys_probe(void)
+static int __init mpc836x_mds_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
 
         return of_flat_dt_is_compatible(root, "MPC836xMDS");
 }
 
-define_machine(mpc8360_sys) {
-        .name           = "MPC8360E PB",
-        .probe          = mpc8360_sys_probe,
-        .setup_arch     = mpc8360_sys_setup_arch,
-        .init_IRQ       = mpc8360_sys_init_IRQ,
-        .get_irq        = ipic_get_irq,
-        .restart        = mpc83xx_restart,
-        .time_init      = mpc83xx_time_init,
+define_machine(mpc836x_mds) {
+        .name           = "MPC836x MDS",
+        .probe          = mpc836x_mds_probe,
+        .setup_arch     = mpc836x_mds_setup_arch,
+        .init_IRQ       = mpc836x_mds_init_IRQ,
+        .get_irq        = ipic_get_irq,
+        .restart        = mpc83xx_restart,
+        .time_init      = mpc83xx_time_init,
         .calibrate_decr = generic_calibrate_decr,
-        .progress       = udbg_progress,
+        .progress       = udbg_progress,
 };