Pull cpuidle into release branch

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / cuboot-pq2.c

diff --git a/arch/powerpc/boot/cuboot-pq2.c b/arch/powerpc/boot/cuboot-pq2.c
index b150bd4f1b73ea27209f43166e8c07d1f58e5c51..61574f3272ddb9f8429f30b6c533e91e5c408de0 100644 (file)
--- a/arch/powerpc/boot/cuboot-pq2.c
+++ b/arch/powerpc/boot/cuboot-pq2.c
@@ -15,6 +15,7 @@
 #include "stdio.h"
 #include "cuboot.h"
 #include "io.h"
+#include "fsl-soc.h"
 
 #define TARGET_CPM2
 #define TARGET_HAS_ETH1
@@ -43,22 +44,21 @@ struct pci_range pci_ranges_buf[MAX_PROP_LEN / sizeof(struct pci_range)];
  * some don't set up the PCI PIC at all, so we assume the device tree is
  * sane and update the BRx registers appropriately.
  *
- * For any node defined as compatible with fsl,pq2-chipselect,
- * #address/#size must be 2/1 for chipselect bus, 1/1 for parent bus,
- * and ranges must be for whole chip selects.
+ * For any node defined as compatible with fsl,pq2-localbus,
+ * #address/#size must be 2/1 for the localbus, and 1/1 for the parent bus.
+ * Ranges must be for whole chip selects.
  */
 static void update_cs_ranges(void)
 {
-       u32 ctrl_ph;
-       void *ctrl_node, *bus_node, *parent_node;
+       void *bus_node, *parent_node;
        u32 *ctrl_addr;
        unsigned long ctrl_size;
        u32 naddr, nsize;
        int len;
        int i;
 
-       bus_node = finddevice("/chipselect");
-       if (!bus_node || !dt_is_compatible(bus_node, "fsl,pq2-chipselect"))
+       bus_node = finddevice("/localbus");
+       if (!bus_node || !dt_is_compatible(bus_node, "fsl,pq2-localbus"))
                return;
 
        dt_get_reg_format(bus_node, &naddr, &nsize);
@@ -73,19 +73,7 @@ static void update_cs_ranges(void)
        if (naddr != 1 || nsize != 1)
                goto err;
 
-       len = getprop(bus_node, "fsl,ctrl", &ctrl_ph, 4);
-       if (len != 4)
-               goto err;
-
-       ctrl_node = find_node_by_prop_value(NULL, "linux,phandle",
-                                           (char *)&ctrl_ph, 4);
-       if (!ctrl_node)
-               goto err;
-
-       if (!dt_is_compatible(ctrl_node, "fsl,pq2-chipselect-ctrl"))
-               goto err;
-
-       if (!dt_xlate_reg(ctrl_node, 0, (unsigned long *)&ctrl_addr,
+       if (!dt_xlate_reg(bus_node, 0, (unsigned long *)&ctrl_addr,
                          &ctrl_size))
                goto err;
 
@@ -122,7 +110,7 @@ static void update_cs_ranges(void)
        return;
 
 err:
-       printf("Bad /chipselect or fsl,pq2-chipselect-ctrl node\r\n");
+       printf("Bad /localbus node\r\n");
 }
 
 /* Older u-boots don't set PCI up properly.  Update the hardware to match
@@ -139,39 +127,27 @@ static void fixup_pci(void)
        u32 *pci_regs[3];
        u8 *soc_regs;
        int i, len;
-       void *ctrl_node, *bus_node, *parent_node, *soc_node;
-       u32 naddr, nsize, bus_ph, mem_log2;
+       void *node, *parent_node;
+       u32 naddr, nsize, mem_log2;
 
-       ctrl_node = finddevice("/soc/pci");
-       if (!ctrl_node || !dt_is_compatible(ctrl_node, "fsl,pq2-pci"))
+       node = finddevice("/pci");
+       if (!node || !dt_is_compatible(node, "fsl,pq2-pci"))
                return;
 
-       soc_node = finddevice("/soc");
-       if (!soc_node || !dt_is_compatible(soc_node, "fsl,pq2-soc"))
-               goto err;
-
        for (i = 0; i < 3; i++)
-               if (!dt_xlate_reg(ctrl_node, i,
+               if (!dt_xlate_reg(node, i,
                                  (unsigned long *)&pci_regs[i], NULL))
                        goto err;
 
-       if (!dt_xlate_reg(soc_node, 0, (unsigned long *)&soc_regs, NULL))
-               goto err;
-
-       len = getprop(ctrl_node, "fsl,bus", &bus_ph, 4);
-       if (len != 4)
+       soc_regs = (u8 *)fsl_get_immr();
+       if (!soc_regs)
                goto err;
 
-       bus_node = find_node_by_prop_value(NULL, "linux,phandle",
-                                          (char *)&bus_ph, 4);
-       if (!bus_node)
-               goto err;
-
-       dt_get_reg_format(bus_node, &naddr, &nsize);
+       dt_get_reg_format(node, &naddr, &nsize);
        if (naddr != 3 || nsize != 2)
                goto err;
 
-       parent_node = get_parent(bus_node);
+       parent_node = get_parent(node);
        if (!parent_node)
                goto err;
 
@@ -179,7 +155,7 @@ static void fixup_pci(void)
        if (naddr != 1 || nsize != 1)
                goto err;
 
-       len = getprop(bus_node, "ranges", pci_ranges_buf,
+       len = getprop(node, "ranges", pci_ranges_buf,
                      sizeof(pci_ranges_buf));
 
        for (i = 0; i < len / sizeof(struct pci_range); i++) {