IBM Currituck: Clean up board specific code before adding Akebono code

The IBM Akebono code uses the same initialisation functions as the
earlier Currituck board. Rather than create a copy of this code for
Akebono we will instead integrate support for it into the same file as
the Currituck code.

This patch just renames the board support file and updates the Makefile.

Signed-off-by: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index d03833abec092938ea15ea398e6e6536623f376c..f896b896b64e1275f25029ea3114f0e47f9b8743 100644 (file)
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -10,4 +10,4 @@ obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
 obj-$(CONFIG_XILINX_ML510) += virtex_ml510.o
 obj-$(CONFIG_ISS4xx)   += iss4xx.o
 obj-$(CONFIG_CANYONLANDS)+= canyonlands.o
-obj-$(CONFIG_CURRITUCK)        += currituck.o
+obj-$(CONFIG_CURRITUCK)        += ppc476.o

diff --git a/arch/powerpc/platforms/44x/currituck.c b/arch/powerpc/platforms/44x/ppc476.c
similarity index 96%
rename from arch/powerpc/platforms/44x/currituck.c
rename to arch/powerpc/platforms/44x/ppc476.c
index 7f1b71a01c6a4e936da38573b72654e6e6ef6163..c6c5a6f28ff5d3a0a47bf97e775cb67b48f18a68 100644 (file)
--- a/arch/powerpc/platforms/44x/currituck.c
+++ b/arch/powerpc/platforms/44x/ppc476.c
@@ -1,5 +1,5 @@
 /*
- * Currituck board specific routines
+ * PowerPC 476FPE board specific routines
  *
  * Copyright © 2011 Tony Breeds IBM Corporation
  *
@@ -36,7 +36,7 @@
 
 #include <linux/pci.h>
 
-static __initdata struct of_device_id ppc47x_of_bus[] = {
+static struct of_device_id ppc47x_of_bus[] __initdata = {
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,plb6", },
        { .compatible = "ibm,opb", },
@@ -157,7 +157,7 @@ static void __init ppc47x_setup_arch(void)
 {
 
        /* No need to check the DMA config as we /know/ our windows are all of
-        * RAM.  Lets hope that doesn't change */
+        * RAM.  Lets hope that doesn't change */
        swiotlb_detect_4g();
 
        ppc47x_smp_init();
@@ -208,7 +208,7 @@ machine_arch_initcall(ppc47x, ppc47x_get_board_rev);
 static void ppc47x_pci_irq_fixup(struct pci_dev *dev)
 {
        if (dev->vendor == 0x1033 && (dev->device == 0x0035 ||
-                                     dev->device == 0x00e0)) {
+                                     dev->device == 0x00e0)) {
                if (board_rev == 0) {
                        dev->irq = irq_create_mapping(NULL, 47);
                        pr_info("%s: Mapping irq %d\n", __func__, dev->irq);