[POWERPC] 85xx: Renamed MPC8568 MDS board code to match other boards

Renamed the MPC8568 MDS platform code to follow other 85xx boards.  There
isn't anything specific about the 8568 MDS code that wouldn't apply to another
85xx MDS system at this point.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

3 files changed, 19 insertions, 19 deletions

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 0efdd2f1babe..eb661ccf2dab 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -23,12 +23,12 @@ config MPC85xx_CDS
         help
           This option enables support for the MPC85xx CDS board
 
-config MPC8568_MDS
-        bool "Freescale MPC8568 MDS"
+config MPC85xx_MDS
+        bool "Freescale MPC85xx MDS"
         select DEFAULT_UIMAGE
 #       select QUICC_ENGINE
         help
-          This option enables support for the MPC8568 MDS board
+          This option enables support for the MPC85xx MDS board
 
 endchoice
 
@@ -47,7 +47,7 @@ config MPC85xx
         bool
         select PPC_UDBG_16550
         select PPC_INDIRECT_PCI
-        default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC8568_MDS
+        default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC85xx_MDS
 
 config PPC_INDIRECT_PCI_BE
         bool
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index e40e521816b8..4e63917ada9d 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -5,4 +5,4 @@ obj-$(CONFIG_PPC_85xx)	+= misc.o pci.o
 obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
-obj-$(CONFIG_MPC8568_MDS) += mpc8568_mds.o
+obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
diff --git a/arch/powerpc/platforms/85xx/mpc8568_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 0ba22a42f8df..81144d2ae455 100644
--- a/arch/powerpc/platforms/85xx/mpc8568_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -8,7 +8,7 @@
  *         Yin Olivia <Hong-hua.Yin@freescale.com>
  *
  * Description:
- * MPC8568E MDS PB board specific routines.
+ * MPC85xx MDS board specific routines.
  *
  * 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
@@ -69,13 +69,13 @@ unsigned long isa_mem_base = 0;
  * Setup the architecture
  *
  */
-static void __init mpc8568_mds_setup_arch(void)
+static void __init mpc85xx_mds_setup_arch(void)
 {
         struct device_node *np;
         static u8 *bcsr_regs = NULL;
 
         if (ppc_md.progress)
-                ppc_md.progress("mpc8568_mds_setup_arch()", 0);
+                ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
 
         np = of_find_node_by_type(NULL, "cpu");
         if (np != NULL) {
@@ -143,26 +143,26 @@ static void __init mpc8568_mds_setup_arch(void)
 #endif  /* CONFIG_QUICC_ENGINE */
 }
 
-static struct of_device_id mpc8568_ids[] = {
+static struct of_device_id mpc85xx_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         { .type = "qe", },
         {},
 };
 
-static int __init mpc8568_publish_devices(void)
+static int __init mpc85xx_publish_devices(void)
 {
-        if (!machine_is(mpc8568_mds))
+        if (!machine_is(mpc85xx_mds))
                 return 0;
 
         /* Publish the QE devices */
-        of_platform_bus_probe(NULL,mpc8568_ids,NULL);
+        of_platform_bus_probe(NULL,mpc85xx_ids,NULL);
 
         return 0;
 }
-device_initcall(mpc8568_publish_devices);
+device_initcall(mpc85xx_publish_devices);
 
-static void __init mpc8568_mds_pic_init(void)
+static void __init mpc85xx_mds_pic_init(void)
 {
         struct mpic *mpic;
         struct resource r;
@@ -215,18 +215,18 @@ static void __init mpc8568_mds_pic_init(void)
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
 
-static int __init mpc8568_mds_probe(void)
+static int __init mpc85xx_mds_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
 
         return of_flat_dt_is_compatible(root, "MPC85xxMDS");
 }
 
-define_machine(mpc8568_mds) {
+define_machine(mpc85xx_mds) {
         .name           = "MPC85xx MDS",
-        .probe          = mpc8568_mds_probe,
-        .setup_arch     = mpc8568_mds_setup_arch,
-        .init_IRQ       = mpc8568_mds_pic_init,
+        .probe          = mpc85xx_mds_probe,
+        .setup_arch     = mpc85xx_mds_setup_arch,
+        .init_IRQ       = mpc85xx_mds_pic_init,
         .get_irq        = mpic_get_irq,
         .restart        = mpc85xx_restart,
         .calibrate_decr = generic_calibrate_decr,