[POWERPC] 4xx: EP405 boards support for arch/powerpc

Brings EP405 support to arch/powerpc. The IRQ routing for the CPLD
comes from a device-tree property, PCI is working to the point where
I can see the video card, USB device, and south bridge.

This should work with both EP405 and EP405PC.

I've not totally figured out how IRQs are wired on this hardware
though, thus at this stage, expect only USB interrupts working,
pretty much the same as what arch/ppc did.

Also, the flash, nvram, rtc and temp control still have to be wired.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

7 files changed, 353 insertions, 52 deletions

diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c
index 3d0e4f921f1d..852992b146e3 100644
--- a/arch/powerpc/boot/4xx.c
+++ b/arch/powerpc/boot/4xx.c
@@ -179,13 +179,16 @@ void ibm40x_dbcr_reset(void)
 #define EMAC_RESET 0x20000000
 void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1)
 {
-        /* Quiesce the MAL and EMAC(s) since PIBS/OpenBIOS don't do this for us */
+        /* Quiesce the MAL and EMAC(s) since PIBS/OpenBIOS don't
+         * do this for us
+         */
         if (emac0)
                 *emac0 = EMAC_RESET;
         if (emac1)
                 *emac1 = EMAC_RESET;
 
         mtdcr(DCRN_MAL0_CFG, MAL_RESET);
+        while (mfdcr(DCRN_MAL0_CFG) & MAL_RESET) {};
 }
 
 /* Read 4xx EBC bus bridge registers to get mappings of the peripheral
@@ -298,3 +301,53 @@ void ibm440ep_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
         dt_fixup_clock("/plb/opb/serial@ef600500", uart0);
         dt_fixup_clock("/plb/opb/serial@ef600600", uart0);
 }
+
+void ibm405gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
+{
+        u32 pllmr = mfdcr(DCRN_CPC0_PLLMR);
+        u32 cpc0_cr0 = mfdcr(DCRN_405_CPC0_CR0);
+        u32 cpc0_cr1 = mfdcr(DCRN_405_CPC0_CR1);
+        u32 cpu, plb, opb, ebc, tb, uart0, uart1, m;
+        u32 fwdv, fbdv, cbdv, opdv, epdv, udiv;
+
+        fwdv = (8 - ((pllmr & 0xe0000000) >> 29));
+        fbdv = (pllmr & 0x1e000000) >> 25;
+        cbdv = ((pllmr & 0x00060000) >> 17) + 1;
+        opdv = ((pllmr & 0x00018000) >> 15) + 1;
+        epdv = ((pllmr & 0x00001800) >> 13) + 2;
+        udiv = ((cpc0_cr0 & 0x3e) >> 1) + 1;
+
+        m = fwdv * fbdv * cbdv;
+
+        cpu = sysclk * m / fwdv;
+        plb = cpu / cbdv;
+        opb = plb / opdv;
+        ebc = plb / epdv;
+
+        if (cpc0_cr0 & 0x80) {
+                /* uart0 uses the external clock */
+                uart0 = ser_clk;
+        } else {
+                uart0 = cpu / udiv;
+        }
+
+        if (cpc0_cr0 & 0x40) {
+                /* uart1 uses the external clock */
+                uart1 = ser_clk;
+        } else {
+                uart1 = cpu / udiv;
+        }
+
+        /* setup the timebase clock to tick at the cpu frequency */
+        cpc0_cr1 = cpc0_cr1 & ~0x00800000;
+        mtdcr(DCRN_405_CPC0_CR1, cpc0_cr1);
+        tb = cpu;
+
+        dt_fixup_cpu_clocks(cpu, tb, 0);
+        dt_fixup_clock("/plb", plb);
+        dt_fixup_clock("/plb/opb", opb);
+        dt_fixup_clock("/plb/ebc", ebc);
+        dt_fixup_clock("/plb/opb/serial@ef600300", uart0);
+        dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
+}
+
diff --git a/arch/powerpc/boot/4xx.h b/arch/powerpc/boot/4xx.h
index adba6a599a93..6af14a01c7f0 100644
--- a/arch/powerpc/boot/4xx.h
+++ b/arch/powerpc/boot/4xx.h
@@ -18,5 +18,6 @@ void ibm40x_dbcr_reset(void);
 void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1);
 void ibm4xx_fixup_ebc_ranges(const char *ebc);
 void ibm440ep_fixup_clocks(unsigned int sysclk, unsigned int ser_clk);
+void ibm405gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk);
 
 #endif /* _POWERPC_BOOT_4XX_H_ */
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 9149bb8ed03c..8e5bdd35fd48 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -58,7 +58,7 @@ src-plat := of.c cuboot-52xx.c cuboot-83xx.c cuboot-85xx.c holly.c \
                 cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
                 ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
                 cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c \
-                fixed-head.S ep88xc.c cuboot-hpc2.c
+                fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -189,6 +189,7 @@ image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage
 ifneq ($(CONFIG_DEVICE_TREE),"")
 image-$(CONFIG_PPC_8xx)                 += cuImage.8xx
 image-$(CONFIG_PPC_EP88XC)              += zImage.ep88xc
+image-$(CONFIG_EP405)                   += zImage.ep405
 image-$(CONFIG_8260)                    += cuImage.pq2
 image-$(CONFIG_PPC_MPC52xx)             += cuImage.52xx
 image-$(CONFIG_PPC_83xx)                += cuImage.83xx
diff --git a/arch/powerpc/boot/dts/ep405.dts b/arch/powerpc/boot/dts/ep405.dts
new file mode 100644
index 000000000000..007f3c24d3f2
--- /dev/null
+++ b/arch/powerpc/boot/dts/ep405.dts
@@ -0,0 +1,221 @@
+/*
+ * Device Tree Source for EP405
+ *
+ * Copyright 2007 IBM Corp.
+ * Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ *
+ * 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.
+ */
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        model = "ep405";
+        compatible = "ep405";
+        dcr-parent = <&/cpus/PowerPC,405GP@0>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,405GP@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        clock-frequency = <bebc200>; /* Filled in by zImage */
+                        timebase-frequency = <0>; /* Filled in by zImage */
+                        i-cache-line-size = <20>;
+                        d-cache-line-size = <20>;
+                        i-cache-size = <4000>;
+                        d-cache-size = <4000>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>; /* Filled in by zImage */
+        };
+
+        UIC0: interrupt-controller {
+                compatible = "ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 9>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        plb {
+                compatible = "ibm,plb3";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by zImage */
+
+                SDRAM0: memory-controller {
+                        compatible = "ibm,sdram-405gp";
+                        dcr-reg = <010 2>;
+                };
+
+                MAL: mcmal {
+                        compatible = "ibm,mcmal-405gp", "ibm,mcmal";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <1>;
+                        num-rx-chans = <1>;
+                        interrupt-parent = <&UIC0>;
+                        interrupts = <
+                                b 4 /* TXEOB */
+                                c 4 /* RXEOB */
+                                a 4 /* SERR */
+                                d 4 /* TXDE */
+                                e 4 /* RXDE */>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-405gp", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <ef600000 ef600000 a00000>;
+                        dcr-reg = <0a0 5>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <2580>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+
+                        UART1: serial@ef600400 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600400 8>;
+                                virtual-reg = <ef600400>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <2580>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        IIC: i2c@ef600500 {
+                                compatible = "ibm,iic-405gp", "ibm,iic";
+                                reg = <ef600500 11>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        GPIO: gpio@ef600700 {
+                                compatible = "ibm,gpio-405gp";
+                                reg = <ef600700 20>;
+                        };
+
+                        EMAC: ethernet@ef600800 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-405gp", "ibm,emac";
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <
+                                        f 4 /* Ethernet */
+                                        9 4 /* Ethernet Wake Up */>;
+                                local-mac-address = [000000000000]; /* Filled in by zImage */
+                                reg = <ef600800 70>;
+                                mal-device = <&MAL>;
+                                mal-tx-channel = <0>;
+                                mal-rx-channel = <0>;
+                                cell-index = <0>;
+                                max-frame-size = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rmii";
+                                phy-map = <00000000>;
+                        };
+
+                };
+
+                EBC0: ebc {
+                        compatible = "ibm,ebc-405gp", "ibm,ebc";
+                        dcr-reg = <012 2>;
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+
+
+                        /* The ranges property is supplied by the bootwrapper
+                         * and is based on the firmware's configuration of the
+                         * EBC bridge
+                         */
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        /* NVRAM and RTC */
+                        nvrtc@4,200000 {
+                                compatible = "ds1742";
+                                reg = <4 200000 0>; /* size fixed up by zImage */
+                        };
+
+                        /* "BCSR" CPLD contains a PCI irq controller */
+                        bcsr@4,0 {
+                                compatible = "ep405-bcsr";
+                                reg = <4 0 10>;
+                                interrupt-controller;
+                                /* Routing table */
+                                irq-routing = [ 00      /* SYSERR */
+                                                01      /* STTM */
+                                                01      /* RTC */
+                                                01      /* FENET */
+                                                02      /* NB PCIIRQ mux ? */
+                                                03      /* SB Winbond 8259 ? */
+                                                04      /* Serial Ring */
+                                                05      /* USB (ep405pc) */
+                                                06      /* XIRQ 0 */
+                                                06      /* XIRQ 1 */
+                                                06      /* XIRQ 2 */
+                                                06      /* XIRQ 3 */
+                                                06      /* XIRQ 4 */
+                                                06      /* XIRQ 5 */
+                                                06      /* XIRQ 6 */
+                                                07];    /* Reserved */
+                        };
+                };
+
+                PCI0: pci@ec000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb405gp-pci", "ibm,plb-pci";
+                        primary;
+                        reg = <eec00000 8       /* Config space access */
+                               eed80000 4       /* IACK */
+                               eed80000 4       /* Special cycle */
+                               ef480000 40>;    /* Internal registers */
+
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed. Chip supports a second
+                         * IO range but we don't use it for now
+                         */
+                        ranges = <02000000 0 80000000 80000000 0 20000000
+                                  01000000 0 00000000 e8000000 0 00010000>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 80000000>;
+
+                        /* That's all I know about IRQs on that thing ... */
+                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map = <
+                                /* USB */
+                                7000 0 0 0 &UIC0 1e 8 /* IRQ5 */
+                        >;
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@ef600300";
+        };
+};
diff --git a/arch/powerpc/boot/ep405.c b/arch/powerpc/boot/ep405.c
new file mode 100644
index 000000000000..2d08a862cbea
--- /dev/null
+++ b/arch/powerpc/boot/ep405.c
@@ -0,0 +1,74 @@
+/*
+ * Embedded Planet EP405 with PlanetCore firmware
+ *
+ * (c) Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp,\
+ *
+ * Based on ep88xc.c by
+ *
+ * Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "planetcore.h"
+#include "dcr.h"
+#include "4xx.h"
+#include "io.h"
+
+static char *table;
+static u64 mem_size;
+
+static void platform_fixups(void)
+{
+        u64 val;
+        void *nvrtc;
+
+        dt_fixup_memory(0, mem_size);
+        planetcore_set_mac_addrs(table);
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_CRYSTAL_HZ, &val)) {
+                printf("No PlanetCore crystal frequency key.\r\n");
+                return;
+        }
+        ibm405gp_fixup_clocks(val, 0xa8c000);
+        ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
+        ibm4xx_fixup_ebc_ranges("/plb/ebc");
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_KB_NVRAM, &val)) {
+                printf("No PlanetCore NVRAM size key.\r\n");
+                return;
+        }
+        nvrtc = finddevice("/plb/ebc/nvrtc@4,200000");
+        if (nvrtc != NULL) {
+                u32 reg[3] = { 4, 0x200000, 0};
+                getprop(nvrtc, "reg", reg, 3);
+                reg[2] = (val << 10) & 0xffffffff;
+                setprop(nvrtc, "reg", reg, 3);
+        }
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        table = (char *)r3;
+        planetcore_prepare_table(table);
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_MB_RAM, &mem_size))
+                return;
+
+        mem_size *= 1024 * 1024;
+        simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
+
+        fdt_init(_dtb_start);
+
+        planetcore_set_stdout_path(table);
+
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/treeboot-walnut.c b/arch/powerpc/boot/treeboot-walnut.c
index 70ffce343c0a..330485f47825 100644
--- a/arch/powerpc/boot/treeboot-walnut.c
+++ b/arch/powerpc/boot/treeboot-walnut.c
@@ -20,55 +20,6 @@
 
 BSS_STACK(4096);
 
-void ibm405gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
-{
-        u32 pllmr = mfdcr(DCRN_CPC0_PLLMR);
-        u32 cpc0_cr0 = mfdcr(DCRN_405_CPC0_CR0);
-        u32 cpc0_cr1 = mfdcr(DCRN_405_CPC0_CR1);
-        u32 cpu, plb, opb, ebc, tb, uart0, uart1, m;
-        u32 fwdv, fbdv, cbdv, opdv, epdv, udiv;
-
-        fwdv = (8 - ((pllmr & 0xe0000000) >> 29));
-        fbdv = (pllmr & 0x1e000000) >> 25;
-        cbdv = ((pllmr & 0x00060000) >> 17) + 1;
-        opdv = ((pllmr & 0x00018000) >> 15) + 1;
-        epdv = ((pllmr & 0x00001800) >> 13) + 2;
-        udiv = ((cpc0_cr0 & 0x3e) >> 1) + 1;
-
-        m = fwdv * fbdv * cbdv;
-
-        cpu = sysclk * m / fwdv;
-        plb = cpu / cbdv;
-        opb = plb / opdv;
-        ebc = plb / epdv;
-
-        if (cpc0_cr0 & 0x80) {
-                /* uart0 uses the external clock */
-                uart0 = ser_clk;
-        } else {
-                uart0 = cpu / udiv;
-        }
-
-        if (cpc0_cr0 & 0x40) {
-                /* uart1 uses the external clock */
-                uart1 = ser_clk;
-        } else {
-                uart1 = cpu / udiv;
-        }
-
-        /* setup the timebase clock to tick at the cpu frequency */
-        cpc0_cr1 = cpc0_cr1 & ~0x00800000;
-        mtdcr(DCRN_405_CPC0_CR1, cpc0_cr1);
-        tb = cpu;
-
-        dt_fixup_cpu_clocks(cpu, tb, 0);
-        dt_fixup_clock("/plb", plb);
-        dt_fixup_clock("/plb/opb", opb);
-        dt_fixup_clock("/plb/ebc", ebc);
-        dt_fixup_clock("/plb/opb/serial@ef600300", uart0);
-        dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
-}
-
 static void walnut_flashsel_fixup(void)
 {
         void *devp, *sram;
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index f961cdeb97a2..154df055aad2 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -168,7 +168,7 @@ ps3)
     ksection=.kernel:vmlinux.bin
     isection=.kernel:initrd
     ;;
-ep88xc)
+ep88xc|ep405)
     platformo="$object/fixed-head.o $object/$platform.o"
     binary=y
     ;;