Merge commit 'jwb/jwb-next'

5 files changed, 189 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index a9260e21451e..65730275e012 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -14,6 +14,15 @@
 #       help
 #         This option enables support for the CPCI405 board.
 
+config ACADIA
+        bool "Acadia"
+        depends on 40x
+        default n
+        select PPC40x_SIMPLE
+        select 405EZ
+        help
+          This option enables support for the AMCC 405EZ Acadia evaluation board.
+
 config EP405
         bool "EP405/EP405PC"
         depends on 40x
@@ -23,6 +32,14 @@ config EP405
         help
           This option enables support for the EP405/EP405PC boards.
 
+config HCU4
+        bool "Hcu4"
+        depends on 40x
+        default y
+        select 405GPR
+        help
+          This option enables support for the Nestal Maschinen HCU4 board.
+
 config KILAUEA
         bool "Kilauea"
         depends on 40x
@@ -93,6 +110,13 @@ config XILINX_VIRTEX_GENERIC_BOARD
           Most Virtex designs should use this unless it needs to do some
           special configuration at board probe time.
 
+config PPC40x_SIMPLE
+        bool "Simple PowerPC 40x board support"
+        depends on 40x
+        default n
+        help
+          This option enables the simple PowerPC 40x platform support.
+
 # 40x specific CPU modules, selected based on the board above.
 config NP405H
         bool
@@ -118,6 +142,12 @@ config 405EX
         select IBM_NEW_EMAC_EMAC4
         select IBM_NEW_EMAC_RGMII
 
+config 405EZ
+        bool
+        select IBM_NEW_EMAC_NO_FLOW_CTRL
+        select IBM_NEW_EMAC_MAL_CLR_ICINTSTAT
+        select IBM_NEW_EMAC_MAL_COMMON_ERR
+
 config 405GPR
         bool
 
@@ -139,6 +169,14 @@ config STB03xxx
         select IBM405_ERR77
         select IBM405_ERR51
 
+config PPC4xx_GPIO
+        bool "PPC4xx GPIO support"
+        depends on 40x
+        select ARCH_REQUIRE_GPIOLIB
+        select GENERIC_GPIO
+        help
+          Enable gpiolib support for ppc40x based boards
+
 # 40x errata/workaround config symbols, selected by the CPU models above
 
 # All 405-based cores up until the 405GPR and 405EP have this errata.
diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile
index 5533a5c8ce4e..9bab76a652a6 100644
--- a/arch/powerpc/platforms/40x/Makefile
+++ b/arch/powerpc/platforms/40x/Makefile
@@ -1,5 +1,7 @@
 obj-$(CONFIG_KILAUEA)                           += kilauea.o
+obj-$(CONFIG_HCU4)                              += hcu4.o
 obj-$(CONFIG_MAKALU)                            += makalu.o
 obj-$(CONFIG_WALNUT)                            += walnut.o
 obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)       += virtex.o
 obj-$(CONFIG_EP405)                             += ep405.o
+obj-$(CONFIG_PPC40x_SIMPLE)             += ppc40x_simple.o
diff --git a/arch/powerpc/platforms/40x/hcu4.c b/arch/powerpc/platforms/40x/hcu4.c
new file mode 100644
index 000000000000..60b2afecab75
--- /dev/null
+++ b/arch/powerpc/platforms/40x/hcu4.c
@@ -0,0 +1,61 @@
+/*
+ * Architecture- / platform-specific boot-time initialization code for
+ * IBM PowerPC 4xx based boards. Adapted from original
+ * code by Gary Thomas, Cort Dougan <cort@fsmlabs.com>, and Dan Malek
+ * <dan@net4x.com>.
+ *
+ * Copyright(c) 1999-2000 Grant Erickson <grant@lcse.umn.edu>
+ *
+ * Rewritten and ported to the merged powerpc tree:
+ * Copyright 2007 IBM Corporation
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/time.h>
+#include <asm/uic.h>
+#include <asm/ppc4xx.h>
+
+static __initdata struct of_device_id hcu4_of_bus[] = {
+        { .compatible = "ibm,plb3", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        {},
+};
+
+static int __init hcu4_device_probe(void)
+{
+        of_platform_bus_probe(NULL, hcu4_of_bus, NULL);
+        return 0;
+}
+machine_device_initcall(hcu4, hcu4_device_probe);
+
+static int __init hcu4_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "netstal,hcu4"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(hcu4) {
+        .name                   = "HCU4",
+        .probe                  = hcu4_probe,
+        .progress               = udbg_progress,
+        .init_IRQ               = uic_init_tree,
+        .get_irq                = uic_get_irq,
+        .restart                = ppc4xx_reset_system,
+        .calibrate_decr         = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
new file mode 100644
index 000000000000..4498a86b46c3
--- /dev/null
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -0,0 +1,80 @@
+/*
+ * Generic PowerPC 40x platform support
+ *
+ * Copyright 2008 IBM Corporation
+ *
+ * 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; version 2 of the License.
+ *
+ * This implements simple platform support for PowerPC 44x chips.  This is
+ * mostly used for eval boards or other simple and "generic" 44x boards.  If
+ * your board has custom functions or hardware, then you will likely want to
+ * implement your own board.c file to accommodate it.
+ */
+
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+#include <asm/udbg.h>
+#include <asm/uic.h>
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+
+static __initdata struct of_device_id ppc40x_of_bus[] = {
+        { .compatible = "ibm,plb3", },
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init ppc40x_device_probe(void)
+{
+        of_platform_bus_probe(NULL, ppc40x_of_bus, NULL);
+
+        return 0;
+}
+machine_device_initcall(ppc40x_simple, ppc40x_device_probe);
+
+/* This is the list of boards that can be supported by this simple
+ * platform code.  This does _not_ mean the boards are compatible,
+ * as they most certainly are not from a device tree perspective.
+ * However, their differences are handled by the device tree and the
+ * drivers and therefore they don't need custom board support files.
+ *
+ * Again, if your board needs to do things differently then create a
+ * board.c file for it rather than adding it to this list.
+ */
+static char *board[] __initdata = {
+        "amcc,acadia"
+};
+
+static int __init ppc40x_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        int i = 0;
+
+        for (i = 0; i < ARRAY_SIZE(board); i++) {
+                if (of_flat_dt_is_compatible(root, board[i])) {
+                        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
+define_machine(ppc40x_simple) {
+        .name = "PowerPC 40x Platform",
+        .probe = ppc40x_probe,
+        .progress = udbg_progress,
+        .init_IRQ = uic_init_tree,
+        .get_irq = uic_get_irq,
+        .restart = ppc4xx_reset_system,
+        .calibrate_decr = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 79c1154f88d4..3496bc05058e 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -167,6 +167,14 @@ config PPC44x_SIMPLE
         help
           This option enables the simple PowerPC 44x platform support.
 
+config PPC4xx_GPIO
+        bool "PPC4xx GPIO support"
+        depends on 44x
+        select ARCH_REQUIRE_GPIOLIB
+        select GENERIC_GPIO
+        help
+          Enable gpiolib support for ppc440 based boards
+
 # 44x specific CPU modules, selected based on the board above.
 config 440EP
         bool