5 files changed, 79 insertions, 42 deletions

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 0d83a6a0397d..90e3192611a4 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -156,7 +156,7 @@ config YOSEMITE
 #         This option enables support for the IBM PPC440GX evaluation board.
 
 config XILINX_VIRTEX440_GENERIC_BOARD
-        bool "Generic Xilinx Virtex 440 board"
+        bool "Generic Xilinx Virtex 5 FXT board support"
         depends on 44x
         default n
         select XILINX_VIRTEX_5_FXT
@@ -171,6 +171,17 @@ config XILINX_VIRTEX440_GENERIC_BOARD
           Most Virtex 5 designs should use this unless it needs to do some
           special configuration at board probe time.
 
+config XILINX_ML510
+        bool "Xilinx ML510 extra support"
+        depends on XILINX_VIRTEX440_GENERIC_BOARD
+        select PPC_PCI_CHOICE
+        select XILINX_PCI if PCI
+        select PPC_INDIRECT_PCI if PCI
+        select PPC_I8259 if PCI
+        help
+          This option enables extra support for features on the Xilinx ML510
+          board.  The ML510 has a PCI bus with ALI south bridge.
+
 config PPC44x_SIMPLE
         bool "Simple PowerPC 44x board support"
         depends on 44x
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 01f51daace13..ee6185aeaa3b 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -4,3 +4,4 @@ obj-$(CONFIG_EBONY)	+= ebony.o
 obj-$(CONFIG_SAM440EP)  += sam440ep.o
 obj-$(CONFIG_WARP)      += warp.o
 obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
+obj-$(CONFIG_XILINX_ML510) += virtex_ml510.o
diff --git a/arch/powerpc/platforms/44x/virtex.c b/arch/powerpc/platforms/44x/virtex.c
index 68637faf70ae..cf96ccaa760c 100644
--- a/arch/powerpc/platforms/44x/virtex.c
+++ b/arch/powerpc/platforms/44x/virtex.c
@@ -16,6 +16,7 @@
 #include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/xilinx_intc.h>
+#include <asm/xilinx_pci.h>
 #include <asm/reg.h>
 #include <asm/ppc4xx.h>
 #include "44x.h"
@@ -53,6 +54,7 @@ static int __init virtex_probe(void)
 define_machine(virtex) {
         .name                   = "Xilinx Virtex440",
         .probe                  = virtex_probe,
+        .setup_arch             = xilinx_pci_init,
         .init_IRQ               = xilinx_intc_init_tree,
         .get_irq                = xilinx_intc_get_irq,
         .calibrate_decr         = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/44x/virtex_ml510.c b/arch/powerpc/platforms/44x/virtex_ml510.c
new file mode 100644
index 000000000000..ba4a6e388a46
--- /dev/null
+++ b/arch/powerpc/platforms/44x/virtex_ml510.c
@@ -0,0 +1,29 @@
+#include <asm/i8259.h>
+#include <linux/pci.h>
+#include "44x.h"
+
+/**
+ * ml510_ail_quirk
+ */
+static void __devinit ml510_ali_quirk(struct pci_dev *dev)
+{
+        /* Enable the IDE controller */
+        pci_write_config_byte(dev, 0x58, 0x4c);
+        /* Assign irq 14 to the primary ide channel */
+        pci_write_config_byte(dev, 0x44, 0x0d);
+        /* Assign irq 15 to the secondary ide channel */
+        pci_write_config_byte(dev, 0x75, 0x0f);
+        /* Set the ide controller in native mode */
+        pci_write_config_byte(dev, 0x09, 0xff);
+
+        /* INTB = disabled, INTA = disabled */
+        pci_write_config_byte(dev, 0x48, 0x00);
+        /* INTD = disabled, INTC = disabled */
+        pci_write_config_byte(dev, 0x4a, 0x00);
+        /* Audio = INT7, Modem = disabled. */
+        pci_write_config_byte(dev, 0x4b, 0x60);
+        /* USB = INT7 */
+        pci_write_config_byte(dev, 0x74, 0x06);
+}
+DECLARE_PCI_FIXUP_EARLY(0x10b9, 0x1533, ml510_ali_quirk);
+
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index 960edf89be51..c5118802a281 100644
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -1,7 +1,7 @@
 /*
  * PIKA Warp(tm) board specific routines
  *
- * Copyright (c) 2008 PIKA Technologies
+ * Copyright (c) 2008-2009 PIKA Technologies
  *   Sean MacLennan <smaclennan@pikatech.com>
  *
  * This program is free software; you can redistribute  it and/or modify it
@@ -15,6 +15,7 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/of_gpio.h>
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -23,6 +24,7 @@
 #include <asm/uic.h>
 #include <asm/ppc4xx.h>
 
+
 static __initdata struct of_device_id warp_of_bus[] = {
         { .compatible = "ibm,plb4", },
         { .compatible = "ibm,opb", },
@@ -55,6 +57,8 @@ define_machine(warp) {
 };
 
 
+static u32 post_info;
+
 /* I am not sure this is the best place for this... */
 static int __init warp_post_info(void)
 {
@@ -77,21 +81,21 @@ static int __init warp_post_info(void)
 
         iounmap(fpga);
 
-        if (post1 || post2)
+        if (post1 || post2) {
                 printk(KERN_INFO "Warp POST %08x %08x\n", post1, post2);
-        else
+                post_info = 1;
+        } else
                 printk(KERN_INFO "Warp POST OK\n");
 
         return 0;
 }
-machine_late_initcall(warp, warp_post_info);
 
 
 #ifdef CONFIG_SENSORS_AD7414
 
 static LIST_HEAD(dtm_shutdown_list);
 static void __iomem *dtm_fpga;
-static void __iomem *gpio_base;
+static unsigned green_led, red_led;
 
 
 struct dtm_shutdown {
@@ -134,14 +138,17 @@ int pika_dtm_unregister_shutdown(void (*func)(void *arg), void *arg)
 static irqreturn_t temp_isr(int irq, void *context)
 {
         struct dtm_shutdown *shutdown;
+        int value = 1;
 
         local_irq_disable();
 
+        gpio_set_value(green_led, 0);
+
         /* Run through the shutdown list. */
         list_for_each_entry(shutdown, &dtm_shutdown_list, list)
                 shutdown->func(shutdown->arg);
 
-        printk(KERN_EMERG "\n\nCritical Temperature Shutdown\n");
+        printk(KERN_EMERG "\n\nCritical Temperature Shutdown\n\n");
 
         while (1) {
                 if (dtm_fpga) {
@@ -149,52 +156,34 @@ static irqreturn_t temp_isr(int irq, void *context)
                         out_be32(dtm_fpga + 0x14, reset);
                 }
 
-                if (gpio_base) {
-                        unsigned leds = in_be32(gpio_base);
-
-                        /* green off, red toggle */
-                        leds &= ~0x80000000;
-                        leds ^=  0x40000000;
-
-                        out_be32(gpio_base, leds);
-                }
-
+                gpio_set_value(red_led, value);
+                value ^= 1;
                 mdelay(500);
         }
 }
 
 static int pika_setup_leds(void)
 {
-        struct device_node *np;
-        const u32 *gpios;
-        int len;
+        struct device_node *np, *child;
 
-        np = of_find_compatible_node(NULL, NULL, "linux,gpio-led");
+        np = of_find_compatible_node(NULL, NULL, "gpio-leds");
         if (!np) {
-                printk(KERN_ERR __FILE__ ": Unable to find gpio-led\n");
-                return -ENOENT;
-        }
-
-        gpios = of_get_property(np, "gpios", &len);
-        of_node_put(np);
-        if (!gpios || len < 4) {
-                printk(KERN_ERR __FILE__
-                       ": Unable to get gpios property (%d)\n", len);
+                printk(KERN_ERR __FILE__ ": Unable to find leds\n");
                 return -ENOENT;
         }
 
-        np = of_find_node_by_phandle(gpios[0]);
-        if (!np) {
-                printk(KERN_ERR __FILE__ ": Unable to find gpio\n");
-                return -ENOENT;
-        }
+        for_each_child_of_node(np, child)
+                if (strcmp(child->name, "green") == 0) {
+                        green_led = of_get_gpio(child, 0);
+                        /* Turn back on the green LED */
+                        gpio_set_value(green_led, 1);
+                } else if (strcmp(child->name, "red") == 0) {
+                        red_led = of_get_gpio(child, 0);
+                        /* Set based on post */
+                        gpio_set_value(red_led, post_info);
+                }
 
-        gpio_base = of_iomap(np, 0);
         of_node_put(np);
-        if (!gpio_base) {
-                printk(KERN_ERR __FILE__ ": Unable to map gpio");
-                return -ENOMEM;
-        }
 
         return 0;
 }
@@ -270,10 +259,10 @@ static int pika_dtm_thread(void __iomem *fpga)
         }
 
 found_it:
-        i2c_put_adapter(adap);
-
         pika_setup_critical_temp(client);
 
+        i2c_put_adapter(adap);
+
         printk(KERN_INFO "PIKA DTM thread running.\n");
 
         while (!kthread_should_stop()) {
@@ -311,6 +300,9 @@ static int __init pika_dtm_start(void)
         if (dtm_fpga == NULL)
                 return -ENOENT;
 
+        /* Must get post info before thread starts. */
+        warp_post_info();
+
         dtm_thread = kthread_run(pika_dtm_thread, dtm_fpga, "pika-dtm");
         if (IS_ERR(dtm_thread)) {
                 iounmap(dtm_fpga);
@@ -333,6 +325,8 @@ int pika_dtm_unregister_shutdown(void (*func)(void *arg), void *arg)
         return 0;
 }
 
+machine_late_initcall(warp, warp_post_info);
+
 #endif
 
 EXPORT_SYMBOL(pika_dtm_register_shutdown);