Patched in Tegra support.

10 files changed, 134 insertions, 50 deletions

diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 5a8f50a9afa..524d971a147 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -87,6 +87,10 @@ config MV64X60
 config MPC10X_OPENPIC
         bool
 
+config MPC10X_STORE_GATHERING
+        bool "Enable MPC10x store gathering"
+        depends on MPC10X_BRIDGE
+
 config GAMECUBE_COMMON
         bool
 
diff --git a/arch/powerpc/platforms/embedded6xx/c2k.c b/arch/powerpc/platforms/embedded6xx/c2k.c
index ebd3963fdf9..8cab5731850 100644
--- a/arch/powerpc/platforms/embedded6xx/c2k.c
+++ b/arch/powerpc/platforms/embedded6xx/c2k.c
@@ -23,6 +23,7 @@
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
+#include <asm/system.h>
 #include <asm/time.h>
 
 #include <mm/mmu_decl.h>
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
index 53d6eee0196..f61a2dd96b9 100644
--- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -96,9 +96,9 @@ static struct irq_chip flipper_pic = {
  *
  */
 
-static struct irq_domain *flipper_irq_host;
+static struct irq_host *flipper_irq_host;
 
-static int flipper_pic_map(struct irq_domain *h, unsigned int virq,
+static int flipper_pic_map(struct irq_host *h, unsigned int virq,
                            irq_hw_number_t hwirq)
 {
         irq_set_chip_data(virq, h->host_data);
@@ -107,13 +107,13 @@ static int flipper_pic_map(struct irq_domain *h, unsigned int virq,
         return 0;
 }
 
-static int flipper_pic_match(struct irq_domain *h, struct device_node *np)
+static int flipper_pic_match(struct irq_host *h, struct device_node *np)
 {
         return 1;
 }
 
 
-static const struct irq_domain_ops flipper_irq_domain_ops = {
+static struct irq_host_ops flipper_irq_host_ops = {
         .map = flipper_pic_map,
         .match = flipper_pic_match,
 };
@@ -130,10 +130,10 @@ static void __flipper_quiesce(void __iomem *io_base)
         out_be32(io_base + FLIPPER_ICR, 0xffffffff);
 }
 
-struct irq_domain * __init flipper_pic_init(struct device_node *np)
+struct irq_host * __init flipper_pic_init(struct device_node *np)
 {
         struct device_node *pi;
-        struct irq_domain *irq_domain = NULL;
+        struct irq_host *irq_host = NULL;
         struct resource res;
         void __iomem *io_base;
         int retval;
@@ -159,15 +159,17 @@ struct irq_domain * __init flipper_pic_init(struct device_node *np)
 
         __flipper_quiesce(io_base);
 
-        irq_domain = irq_domain_add_linear(np, FLIPPER_NR_IRQS,
-                                  &flipper_irq_domain_ops, io_base);
-        if (!irq_domain) {
-                pr_err("failed to allocate irq_domain\n");
+        irq_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, FLIPPER_NR_IRQS,
+                                  &flipper_irq_host_ops, -1);
+        if (!irq_host) {
+                pr_err("failed to allocate irq_host\n");
                 return NULL;
         }
 
+        irq_host->host_data = io_base;
+
 out:
-        return irq_domain;
+        return irq_host;
 }
 
 unsigned int flipper_pic_get_irq(void)
diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
index 3006b5117ec..e4919170c6b 100644
--- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
@@ -89,9 +89,9 @@ static struct irq_chip hlwd_pic = {
  *
  */
 
-static struct irq_domain *hlwd_irq_host;
+static struct irq_host *hlwd_irq_host;
 
-static int hlwd_pic_map(struct irq_domain *h, unsigned int virq,
+static int hlwd_pic_map(struct irq_host *h, unsigned int virq,
                            irq_hw_number_t hwirq)
 {
         irq_set_chip_data(virq, h->host_data);
@@ -100,11 +100,11 @@ static int hlwd_pic_map(struct irq_domain *h, unsigned int virq,
         return 0;
 }
 
-static const struct irq_domain_ops hlwd_irq_domain_ops = {
+static struct irq_host_ops hlwd_irq_host_ops = {
         .map = hlwd_pic_map,
 };
 
-static unsigned int __hlwd_pic_get_irq(struct irq_domain *h)
+static unsigned int __hlwd_pic_get_irq(struct irq_host *h)
 {
         void __iomem *io_base = h->host_data;
         int irq;
@@ -123,14 +123,14 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
                                       struct irq_desc *desc)
 {
         struct irq_chip *chip = irq_desc_get_chip(desc);
-        struct irq_domain *irq_domain = irq_get_handler_data(cascade_virq);
+        struct irq_host *irq_host = irq_get_handler_data(cascade_virq);
         unsigned int virq;
 
         raw_spin_lock(&desc->lock);
         chip->irq_mask(&desc->irq_data); /* IRQ_LEVEL */
         raw_spin_unlock(&desc->lock);
 
-        virq = __hlwd_pic_get_irq(irq_domain);
+        virq = __hlwd_pic_get_irq(irq_host);
         if (virq != NO_IRQ)
                 generic_handle_irq(virq);
         else
@@ -155,9 +155,9 @@ static void __hlwd_quiesce(void __iomem *io_base)
         out_be32(io_base + HW_BROADWAY_ICR, 0xffffffff);
 }
 
-struct irq_domain *hlwd_pic_init(struct device_node *np)
+struct irq_host *hlwd_pic_init(struct device_node *np)
 {
-        struct irq_domain *irq_domain;
+        struct irq_host *irq_host;
         struct resource res;
         void __iomem *io_base;
         int retval;
@@ -177,14 +177,15 @@ struct irq_domain *hlwd_pic_init(struct device_node *np)
 
         __hlwd_quiesce(io_base);
 
-        irq_domain = irq_domain_add_linear(np, HLWD_NR_IRQS,
-                                           &hlwd_irq_domain_ops, io_base);
-        if (!irq_domain) {
-                pr_err("failed to allocate irq_domain\n");
+        irq_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, HLWD_NR_IRQS,
+                                  &hlwd_irq_host_ops, -1);
+        if (!irq_host) {
+                pr_err("failed to allocate irq_host\n");
                 return NULL;
         }
+        irq_host->host_data = io_base;
 
-        return irq_domain;
+        return irq_host;
 }
 
 unsigned int hlwd_pic_get_irq(void)
@@ -199,7 +200,7 @@ unsigned int hlwd_pic_get_irq(void)
 
 void hlwd_pic_probe(void)
 {
-        struct irq_domain *host;
+        struct irq_host *host;
         struct device_node *np;
         const u32 *interrupts;
         int cascade_virq;
diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c
index 8c305c7c897..487bda0d18d 100644
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -26,8 +26,8 @@
 #include <linux/tty.h>
 #include <linux/serial_core.h>
 #include <linux/of_platform.h>
-#include <linux/module.h>
 
+#include <asm/system.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -147,20 +147,38 @@ static void __init holly_setup_arch(void)
 static void __init holly_init_IRQ(void)
 {
         struct mpic *mpic;
+        phys_addr_t mpic_paddr = 0;
+        struct device_node *tsi_pic;
 #ifdef CONFIG_PCI
         unsigned int cascade_pci_irq;
         struct device_node *tsi_pci;
         struct device_node *cascade_node = NULL;
 #endif
 
-        mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
+        tsi_pic = of_find_node_by_type(NULL, "open-pic");
+        if (tsi_pic) {
+                unsigned int size;
+                const void *prop = of_get_property(tsi_pic, "reg", &size);
+                mpic_paddr = of_translate_address(tsi_pic, prop);
+        }
+
+        if (mpic_paddr == 0) {
+                printk(KERN_ERR "%s: No tsi108 PIC found !\n", __func__);
+                return;
+        }
+
+        pr_debug("%s: tsi108 pic phys_addr = 0x%x\n", __func__, (u32) mpic_paddr);
+
+        mpic = mpic_alloc(tsi_pic, mpic_paddr,
+                        MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |
                         MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,
-                        24, 0,
+                        24,
+                        NR_IRQS-4, /* num_sources used */
                         "Tsi108_PIC");
 
         BUG_ON(mpic == NULL);
 
-        mpic_assign_isu(mpic, 0, mpic->paddr + 0x100);
+        mpic_assign_isu(mpic, 0, mpic_paddr + 0x100);
 
         mpic_init(mpic);
 
@@ -185,6 +203,7 @@ static void __init holly_init_IRQ(void)
 #endif
         /* Configure MPIC outputs to CPU0 */
         tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
+        of_node_put(tsi_pic);
 }
 
 void holly_show_cpuinfo(struct seq_file *m)
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index 455e7c08742..244f997de79 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -81,18 +81,29 @@ static void __init linkstation_setup_arch(void)
 static void __init linkstation_init_IRQ(void)
 {
         struct mpic *mpic;
+        struct device_node *dnp;
+        const u32 *prop;
+        int size;
+        phys_addr_t paddr;
 
-        mpic = mpic_alloc(NULL, 0, 0, 4, 0, " EPIC     ");
+        dnp = of_find_node_by_type(NULL, "open-pic");
+        if (dnp == NULL)
+                return;
+
+        prop = of_get_property(dnp, "reg", &size);
+        paddr = (phys_addr_t)of_translate_address(dnp, prop);
+
+        mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET, 4, 32, " EPIC     ");
         BUG_ON(mpic == NULL);
 
         /* PCI IRQs */
-        mpic_assign_isu(mpic, 0, mpic->paddr + 0x10200);
+        mpic_assign_isu(mpic, 0, paddr + 0x10200);
 
         /* I2C */
-        mpic_assign_isu(mpic, 1, mpic->paddr + 0x11000);
+        mpic_assign_isu(mpic, 1, paddr + 0x11000);
 
         /* ttyS0, ttyS1 */
-        mpic_assign_isu(mpic, 2, mpic->paddr + 0x11100);
+        mpic_assign_isu(mpic, 2, paddr + 0x11100);
 
         mpic_init(mpic);
 }
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index beeaf4a173e..1cb907c9435 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -23,7 +23,6 @@
 #include <linux/pci.h>
 #include <linux/kdev_t.h>
 #include <linux/console.h>
-#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/seq_file.h>
@@ -32,6 +31,7 @@
 #include <linux/tty.h>
 #include <linux/serial_core.h>
 
+#include <asm/system.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -101,20 +101,39 @@ static void __init mpc7448_hpc2_setup_arch(void)
 static void __init mpc7448_hpc2_init_IRQ(void)
 {
         struct mpic *mpic;
+        phys_addr_t mpic_paddr = 0;
+        struct device_node *tsi_pic;
 #ifdef CONFIG_PCI
         unsigned int cascade_pci_irq;
         struct device_node *tsi_pci;
         struct device_node *cascade_node = NULL;
 #endif
 
-        mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
+        tsi_pic = of_find_node_by_type(NULL, "open-pic");
+        if (tsi_pic) {
+                unsigned int size;
+                const void *prop = of_get_property(tsi_pic, "reg", &size);
+                mpic_paddr = of_translate_address(tsi_pic, prop);
+        }
+
+        if (mpic_paddr == 0) {
+                printk("%s: No tsi108 PIC found !\n", __func__);
+                return;
+        }
+
+        DBG("%s: tsi108 pic phys_addr = 0x%x\n", __func__,
+            (u32) mpic_paddr);
+
+        mpic = mpic_alloc(tsi_pic, mpic_paddr,
+                        MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |
                         MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,
-                        24, 0,
+                        24,
+                        NR_IRQS-4, /* num_sources used */
                         "Tsi108_PIC");
 
         BUG_ON(mpic == NULL);
 
-        mpic_assign_isu(mpic, 0, mpic->paddr + 0x100);
+        mpic_assign_isu(mpic, 0, mpic_paddr + 0x100);
 
         mpic_init(mpic);
 
@@ -139,6 +158,7 @@ static void __init mpc7448_hpc2_init_IRQ(void)
 #endif
         /* Configure MPIC outputs to CPU0 */
         tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
+        of_node_put(tsi_pic);
 }
 
 void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)
diff --git a/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
index d455f08bea5..670035f49a6 100644
--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
@@ -17,6 +17,7 @@
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
+#include <asm/system.h>
 #include <asm/time.h>
 
 #include <mm/mmu_decl.h>
diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
index c458b60d14c..613070e9ddb 100644
--- a/arch/powerpc/platforms/embedded6xx/storcenter.c
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -16,6 +16,7 @@
 #include <linux/initrd.h>
 #include <linux/of_platform.h>
 
+#include <asm/system.h>
 #include <asm/time.h>
 #include <asm/prom.h>
 #include <asm/mpic.h>
@@ -76,22 +77,41 @@ static void __init storcenter_setup_arch(void)
 }
 
 /*
- * Interrupt setup and service.  Interrupts on the turbostation come
+ * Interrupt setup and service.  Interrrupts on the turbostation come
  * from the four PCI slots plus onboard 8241 devices: I2C, DUART.
  */
 static void __init storcenter_init_IRQ(void)
 {
         struct mpic *mpic;
+        struct device_node *dnp;
+        const void *prop;
+        int size;
+        phys_addr_t paddr;
+
+        dnp = of_find_node_by_type(NULL, "open-pic");
+        if (dnp == NULL)
+                return;
+
+        prop = of_get_property(dnp, "reg", &size);
+        if (prop == NULL) {
+                of_node_put(dnp);
+                return;
+        }
+
+        paddr = (phys_addr_t)of_translate_address(dnp, prop);
+        mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET,
+                        16, 32, " OpenPIC  ");
+
+        of_node_put(dnp);
 
-        mpic = mpic_alloc(NULL, 0, 0, 16, 0, " OpenPIC  ");
         BUG_ON(mpic == NULL);
 
         /*
          * 16 Serial Interrupts followed by 16 Internal Interrupts.
          * I2C is the second internal, so it is at 17, 0x11020.
          */
-        mpic_assign_isu(mpic, 0, mpic->paddr + 0x10200);
-        mpic_assign_isu(mpic, 1, mpic->paddr + 0x11000);
+        mpic_assign_isu(mpic, 0, paddr + 0x10200);
+        mpic_assign_isu(mpic, 1, paddr + 0x11000);
 
         mpic_init(mpic);
 }
diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 6d8dadf19f0..1b5dc1a2e14 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -79,18 +79,23 @@ void __init wii_memory_fixups(void)
         BUG_ON(memblock.memory.cnt != 2);
         BUG_ON(!page_aligned(p[0].base) || !page_aligned(p[1].base));
 
-        /* trim unaligned tail */
-        memblock_remove(ALIGN(p[1].base + p[1].size, PAGE_SIZE),
-                        (phys_addr_t)ULLONG_MAX);
+        p[0].size = _ALIGN_DOWN(p[0].size, PAGE_SIZE);
+        p[1].size = _ALIGN_DOWN(p[1].size, PAGE_SIZE);
 
-        /* determine hole, add & reserve them */
-        wii_hole_start = ALIGN(p[0].base + p[0].size, PAGE_SIZE);
+        wii_hole_start = p[0].base + p[0].size;
         wii_hole_size = p[1].base - wii_hole_start;
-        memblock_add(wii_hole_start, wii_hole_size);
-        memblock_reserve(wii_hole_start, wii_hole_size);
 
-        BUG_ON(memblock.memory.cnt != 1);
-        __memblock_dump_all();
+        pr_info("MEM1: <%08llx %08llx>\n", p[0].base, p[0].size);
+        pr_info("HOLE: <%08lx %08lx>\n", wii_hole_start, wii_hole_size);
+        pr_info("MEM2: <%08llx %08llx>\n", p[1].base, p[1].size);
+
+        p[0].size += wii_hole_size + p[1].size;
+
+        memblock.memory.cnt = 1;
+        memblock_analyze();
+
+        /* reserve the hole */
+        memblock_reserve(wii_hole_start, wii_hole_size);
 
         /* allow ioremapping the address space in the hole */
         __allow_ioremap_reserved = 1;