Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
  [POWERPC] Add memchr() to the bootwrapper
  [POWERPC] Implement logging of unhandled signals
  [POWERPC] Add legacy serial support for OPB with flattened device tree
  [POWERPC] Use 1TB segments
  [POWERPC] XilinxFB: Allow fixed framebuffer base address
  [POWERPC] XilinxFB: Add support for custom screen resolution
  [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
  [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
  [POWERPC] 4xx: Kilauea defconfig file
  [POWERPC] 4xx: Kilauea DTS
  [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
  [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
  [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
  [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
  [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
  [POWERPC] 85xx: Killed <asm/mpc85xx.h>
  [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
  [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
  [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
  [POWERPC] Make clockevents work on PPC601 processors
  ...

Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.

1 files changed, 176 insertions, 0 deletions

diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c
new file mode 100644
index 000000000000..c518b6cc5fab
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -0,0 +1,176 @@
+/*
+ * Platform setup for the Embedded Planet EP88xC board
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ * Copyright 2007 Freescale Semiconductor, 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/io.h>
+#include <asm/udbg.h>
+#include <asm/commproc.h>
+
+#include <sysdev/commproc.h>
+
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static struct cpm_pin ep88xc_pins[] = {
+        /* SMC1 */
+        {1, 24, CPM_PIN_INPUT}, /* RX */
+        {1, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
+
+        /* SCC2 */
+        {0, 12, CPM_PIN_INPUT}, /* TX */
+        {0, 13, CPM_PIN_INPUT}, /* RX */
+        {2, 8, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /* CD */
+        {2, 9, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /* CTS */
+        {2, 14, CPM_PIN_INPUT}, /* RTS */
+
+        /* MII1 */
+        {0, 0, CPM_PIN_INPUT},
+        {0, 1, CPM_PIN_INPUT},
+        {0, 2, CPM_PIN_INPUT},
+        {0, 3, CPM_PIN_INPUT},
+        {0, 4, CPM_PIN_OUTPUT},
+        {0, 10, CPM_PIN_OUTPUT},
+        {0, 11, CPM_PIN_OUTPUT},
+        {1, 19, CPM_PIN_INPUT},
+        {1, 31, CPM_PIN_INPUT},
+        {2, 12, CPM_PIN_INPUT},
+        {2, 13, CPM_PIN_INPUT},
+        {3, 8, CPM_PIN_INPUT},
+        {4, 30, CPM_PIN_OUTPUT},
+        {4, 31, CPM_PIN_OUTPUT},
+
+        /* MII2 */
+        {4, 14, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 15, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 16, CPM_PIN_OUTPUT},
+        {4, 17, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 18, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 19, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 20, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 21, CPM_PIN_OUTPUT},
+        {4, 22, CPM_PIN_OUTPUT},
+        {4, 23, CPM_PIN_OUTPUT},
+        {4, 24, CPM_PIN_OUTPUT},
+        {4, 25, CPM_PIN_OUTPUT},
+        {4, 26, CPM_PIN_OUTPUT},
+        {4, 27, CPM_PIN_OUTPUT},
+        {4, 28, CPM_PIN_OUTPUT},
+        {4, 29, CPM_PIN_OUTPUT},
+
+        /* USB */
+        {0, 6, CPM_PIN_INPUT},  /* CLK2 */
+        {0, 14, CPM_PIN_INPUT}, /* USBOE */
+        {0, 15, CPM_PIN_INPUT}, /* USBRXD */
+        {2, 6, CPM_PIN_OUTPUT}, /* USBTXN */
+        {2, 7, CPM_PIN_OUTPUT}, /* USBTXP */
+        {2, 10, CPM_PIN_INPUT}, /* USBRXN */
+        {2, 11, CPM_PIN_INPUT}, /* USBRXP */
+
+        /* Misc */
+        {1, 26, CPM_PIN_INPUT}, /* BRGO2 */
+        {1, 27, CPM_PIN_INPUT}, /* BRGO1 */
+};
+
+static void __init init_ioports(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(ep88xc_pins); i++) {
+                struct cpm_pin *pin = &ep88xc_pins[i];
+                cpm1_set_pin(pin->port, pin->pin, pin->flags);
+        }
+
+        cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);
+        cpm1_clk_setup(CPM_CLK_SCC1, CPM_CLK2, CPM_CLK_TX); /* USB */
+        cpm1_clk_setup(CPM_CLK_SCC1, CPM_CLK2, CPM_CLK_RX);
+        cpm1_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_TX);
+        cpm1_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_RX);
+}
+
+static u8 __iomem *ep88xc_bcsr;
+
+#define BCSR7_SCC2_ENABLE 0x10
+
+#define BCSR8_PHY1_ENABLE 0x80
+#define BCSR8_PHY1_POWER  0x40
+#define BCSR8_PHY2_ENABLE 0x20
+#define BCSR8_PHY2_POWER  0x10
+
+#define BCSR9_USB_ENABLE  0x80
+#define BCSR9_USB_POWER   0x40
+#define BCSR9_USB_HOST    0x20
+#define BCSR9_USB_FULL_SPEED_TARGET 0x10
+
+static void __init ep88xc_setup_arch(void)
+{
+        struct device_node *np;
+
+        cpm_reset();
+        init_ioports();
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,ep88xc-bcsr");
+        if (!np) {
+                printk(KERN_CRIT "Could not find fsl,ep88xc-bcsr node\n");
+                return;
+        }
+
+        ep88xc_bcsr = of_iomap(np, 0);
+        of_node_put(np);
+
+        if (!ep88xc_bcsr) {
+                printk(KERN_CRIT "Could not remap BCSR\n");
+                return;
+        }
+
+        setbits8(&ep88xc_bcsr[7], BCSR7_SCC2_ENABLE);
+        setbits8(&ep88xc_bcsr[8], BCSR8_PHY1_ENABLE | BCSR8_PHY1_POWER |
+                                  BCSR8_PHY2_ENABLE | BCSR8_PHY2_POWER);
+}
+
+static int __init ep88xc_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "fsl,ep88xc");
+}
+
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .name = "soc", },
+        { .name = "cpm", },
+        { .name = "localbus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        /* Publish the QE devices */
+        if (machine_is(ep88xc))
+                of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
+        return 0;
+}
+device_initcall(declare_of_platform_devices);
+
+define_machine(ep88xc) {
+        .name = "Embedded Planet EP88xC",
+        .probe = ep88xc_probe,
+        .setup_arch = ep88xc_setup_arch,
+        .init_IRQ = m8xx_pic_init,
+        .get_irq        = mpc8xx_get_irq,
+        .restart = mpc8xx_restart,
+        .calibrate_decr = mpc8xx_calibrate_decr,
+        .set_rtc_time = mpc8xx_set_rtc_time,
+        .get_rtc_time = mpc8xx_get_rtc_time,
+        .progress = udbg_progress,
+};