Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=519fd80da9e3020d9fd21fa5c496e499156cd9d6
Commit:     519fd80da9e3020d9fd21fa5c496e499156cd9d6
Parent:     f3a2b29d932fbf92e133d814c4873fd15be51abc
Author:     Kim Phillips <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 24 20:45:51 2008 -0600
Committer:  Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 08:32:59 2008 -0600

    [POWERPC] 83xx: fold the mpc8313 platform into the mpc831x platform
    
    prepare for adding support for the mpc8315 rdb, since they are
    identical wrt platform code.
    
    Signed-off-by: Kim Phillips <[EMAIL PROTECTED]>
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
---
 arch/powerpc/configs/mpc8313_rdb_defconfig |    2 +-
 arch/powerpc/platforms/83xx/Kconfig        |    6 +-
 arch/powerpc/platforms/83xx/Makefile       |    2 +-
 arch/powerpc/platforms/83xx/mpc8313_rdb.c  |  101 ----------------------------
 arch/powerpc/platforms/83xx/mpc831x_rdb.c  |   92 +++++++++++++++++++++++++
 5 files changed, 97 insertions(+), 106 deletions(-)

diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig 
b/arch/powerpc/configs/mpc8313_rdb_defconfig
index db08e73..3b29ac5 100644
--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8313_rdb_defconfig
@@ -138,7 +138,7 @@ CONFIG_PPC_83xx=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PQ2ADS is not set
-CONFIG_MPC8313_RDB=y
+CONFIG_MPC831x_RDB=y
 # CONFIG_MPC832x_MDS is not set
 # CONFIG_MPC832x_RDB is not set
 # CONFIG_MPC834x_MDS is not set
diff --git a/arch/powerpc/platforms/83xx/Kconfig 
b/arch/powerpc/platforms/83xx/Kconfig
index 782bff0..10a665f 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -3,8 +3,8 @@ choice
        depends on PPC_83xx
        default MPC834x_MDS
 
-config MPC8313_RDB
-       bool "Freescale MPC8313 RDB"
+config MPC831x_RDB
+       bool "Freescale MPC831x RDB"
        select DEFAULT_UIMAGE
        help
          This option enables support for the MPC8313 RDB board.
@@ -68,7 +68,7 @@ config PPC_MPC831x
        bool
        select PPC_UDBG_16550
        select PPC_INDIRECT_PCI
-       default y if MPC8313_RDB
+       default y if MPC831x_RDB
 
 config PPC_MPC832x
        bool
diff --git a/arch/powerpc/platforms/83xx/Makefile 
b/arch/powerpc/platforms/83xx/Makefile
index 3a35242..2d3cbab 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -3,7 +3,7 @@
 #
 obj-y                          := misc.o usb.o
 obj-$(CONFIG_PCI)              += pci.o
-obj-$(CONFIG_MPC8313_RDB)      += mpc8313_rdb.o
+obj-$(CONFIG_MPC831x_RDB)      += mpc831x_rdb.o
 obj-$(CONFIG_MPC832x_RDB)      += mpc832x_rdb.o
 obj-$(CONFIG_MPC834x_MDS)      += mpc834x_mds.o
 obj-$(CONFIG_MPC834x_ITX)      += mpc834x_itx.o
diff --git a/arch/powerpc/platforms/83xx/mpc8313_rdb.c 
b/arch/powerpc/platforms/83xx/mpc8313_rdb.c
deleted file mode 100644
index 4996b7d..0000000
--- a/arch/powerpc/platforms/83xx/mpc8313_rdb.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * arch/powerpc/platforms/83xx/mpc8313_rdb.c
- *
- * Description: MPC8313x RDB board specific routines.
- * This file is based on mpc834x_sys.c
- * Author: Lo Wlison <[EMAIL PROTECTED]>
- *
- * Copyright (C) Freescale Semiconductor, Inc. 2006. All rights reserved.
- *
- * 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.
- */
-
-#include <linux/pci.h>
-#include <linux/of_platform.h>
-
-#include <asm/time.h>
-#include <asm/ipic.h>
-#include <asm/udbg.h>
-
-#include "mpc83xx.h"
-
-#undef DEBUG
-#ifdef DEBUG
-#define DBG(fmt...) udbg_printf(fmt)
-#else
-#define DBG(fmt...)
-#endif
-
-/* ************************************************************************
- *
- * Setup the architecture
- *
- */
-static void __init mpc8313_rdb_setup_arch(void)
-{
-#ifdef CONFIG_PCI
-       struct device_node *np;
-#endif
-
-       if (ppc_md.progress)
-               ppc_md.progress("mpc8313_rdb_setup_arch()", 0);
-
-#ifdef CONFIG_PCI
-       for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
-               mpc83xx_add_bridge(np);
-#endif
-       mpc831x_usb_cfg();
-}
-
-void __init mpc8313_rdb_init_IRQ(void)
-{
-       struct device_node *np;
-
-       np = of_find_node_by_type(NULL, "ipic");
-       if (!np)
-               return;
-
-       ipic_init(np, 0);
-
-       /* Initialize the default interrupt mapping priorities,
-        * in case the boot rom changed something on us.
-        */
-       ipic_set_default_priority();
-}
-
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init mpc8313_rdb_probe(void)
-{
-       unsigned long root = of_get_flat_dt_root();
-
-       return of_flat_dt_is_compatible(root, "MPC8313ERDB");
-}
-
-static struct of_device_id __initdata of_bus_ids[] = {
-       { .compatible = "simple-bus" },
-       {},
-};
-
-static int __init declare_of_platform_devices(void)
-{
-       of_platform_bus_probe(NULL, of_bus_ids, NULL);
-       return 0;
-}
-machine_device_initcall(mpc8313_rdb, declare_of_platform_devices);
-
-define_machine(mpc8313_rdb) {
-       .name                   = "MPC8313 RDB",
-       .probe                  = mpc8313_rdb_probe,
-       .setup_arch             = mpc8313_rdb_setup_arch,
-       .init_IRQ               = mpc8313_rdb_init_IRQ,
-       .get_irq                = ipic_get_irq,
-       .restart                = mpc83xx_restart,
-       .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
-       .progress               = udbg_progress,
-};
diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c 
b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
new file mode 100644
index 0000000..b484b2b
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -0,0 +1,92 @@
+/*
+ * arch/powerpc/platforms/83xx/mpc831x_rdb.c
+ *
+ * Description: MPC831x RDB board specific routines.
+ * This file is based on mpc834x_sys.c
+ * Author: Lo Wlison <[EMAIL PROTECTED]>
+ *
+ * Copyright (C) Freescale Semiconductor, Inc. 2006. All rights reserved.
+ *
+ * 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.
+ */
+
+#include <linux/pci.h>
+#include <linux/of_platform.h>
+
+#include <asm/time.h>
+#include <asm/ipic.h>
+#include <asm/udbg.h>
+
+#include "mpc83xx.h"
+
+/*
+ * Setup the architecture
+ */
+static void __init mpc831x_rdb_setup_arch(void)
+{
+#ifdef CONFIG_PCI
+       struct device_node *np;
+#endif
+
+       if (ppc_md.progress)
+               ppc_md.progress("mpc831x_rdb_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+       for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
+               mpc83xx_add_bridge(np);
+#endif
+       mpc831x_usb_cfg();
+}
+
+void __init mpc831x_rdb_init_IRQ(void)
+{
+       struct device_node *np;
+
+       np = of_find_node_by_type(NULL, "ipic");
+       if (!np)
+               return;
+
+       ipic_init(np, 0);
+
+       /* Initialize the default interrupt mapping priorities,
+        * in case the boot rom changed something on us.
+        */
+       ipic_set_default_priority();
+}
+
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened
+ */
+static int __init mpc831x_rdb_probe(void)
+{
+       unsigned long root = of_get_flat_dt_root();
+
+       return of_flat_dt_is_compatible(root, "MPC8313ERDB");
+}
+
+static struct of_device_id __initdata of_bus_ids[] = {
+       { .compatible = "simple-bus" },
+       {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+       of_platform_bus_probe(NULL, of_bus_ids, NULL);
+       return 0;
+}
+machine_device_initcall(mpc831x_rdb, declare_of_platform_devices);
+
+define_machine(mpc831x_rdb) {
+       .name                   = "MPC831x RDB",
+       .probe                  = mpc831x_rdb_probe,
+       .setup_arch             = mpc831x_rdb_setup_arch,
+       .init_IRQ               = mpc831x_rdb_init_IRQ,
+       .get_irq                = ipic_get_irq,
+       .restart                = mpc83xx_restart,
+       .time_init              = mpc83xx_time_init,
+       .calibrate_decr         = generic_calibrate_decr,
+       .progress               = udbg_progress,
+};
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to