Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a94b89a4813bddf85c052f8d04021688c5dfe0d7
Commit:     a94b89a4813bddf85c052f8d04021688c5dfe0d7
Parent:     bbc6fac387f09e46a372e4aadbc935cba5a6b463
Author:     Scott Wood <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 31 17:18:28 2007 -0500
Committer:  Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Wed Oct 3 20:36:35 2007 -0500

    [POWERPC] bootwrapper: Use fsl_get_immr() in cuboot-pq2.c.
    
    Signed-off-by: Scott Wood <[EMAIL PROTECTED]>
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
---
 arch/powerpc/boot/cuboot-pq2.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/boot/cuboot-pq2.c b/arch/powerpc/boot/cuboot-pq2.c
index d3d3388..470ffac 100644
--- 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
@@ -139,23 +140,20 @@ static void fixup_pci(void)
        u32 *pci_regs[3];
        u8 *soc_regs;
        int i, len;
-       void *node, *parent_node, *soc_node;
+       void *node, *parent_node;
        u32 naddr, nsize, mem_log2;
 
        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(node, i,
                                  (unsigned long *)&pci_regs[i], NULL))
                        goto err;
 
-       if (!dt_xlate_reg(soc_node, 0, (unsigned long *)&soc_regs, NULL))
+       soc_regs = (u8 *)fsl_get_immr();
+       if (!soc_regs)
                goto err;
 
        dt_get_reg_format(node, &naddr, &nsize);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to