aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2007-08-31 18:18:28 -0400
committerKumar Gala <galak@kernel.crashing.org>2007-10-03 21:36:35 -0400
commita94b89a4813bddf85c052f8d04021688c5dfe0d7 (patch)
tree0878295ae42178976f50371ff32c7082bad11bb0 /arch/powerpc/boot
parentbbc6fac387f09e46a372e4aadbc935cba5a6b463 (diff)
[POWERPC] bootwrapper: Use fsl_get_immr() in cuboot-pq2.c.
Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/cuboot-pq2.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/boot/cuboot-pq2.c b/arch/powerpc/boot/cuboot-pq2.c
index d3d3388d552f..470ffacb8373 100644
--- a/arch/powerpc/boot/cuboot-pq2.c
+++ b/arch/powerpc/boot/cuboot-pq2.c
@@ -15,6 +15,7 @@
15#include "stdio.h" 15#include "stdio.h"
16#include "cuboot.h" 16#include "cuboot.h"
17#include "io.h" 17#include "io.h"
18#include "fsl-soc.h"
18 19
19#define TARGET_CPM2 20#define TARGET_CPM2
20#define TARGET_HAS_ETH1 21#define TARGET_HAS_ETH1
@@ -139,23 +140,20 @@ static void fixup_pci(void)
139 u32 *pci_regs[3]; 140 u32 *pci_regs[3];
140 u8 *soc_regs; 141 u8 *soc_regs;
141 int i, len; 142 int i, len;
142 void *node, *parent_node, *soc_node; 143 void *node, *parent_node;
143 u32 naddr, nsize, mem_log2; 144 u32 naddr, nsize, mem_log2;
144 145
145 node = finddevice("/pci"); 146 node = finddevice("/pci");
146 if (!node || !dt_is_compatible(node, "fsl,pq2-pci")) 147 if (!node || !dt_is_compatible(node, "fsl,pq2-pci"))
147 return; 148 return;
148 149
149 soc_node = finddevice("/soc");
150 if (!soc_node || !dt_is_compatible(soc_node, "fsl,pq2-soc"))
151 goto err;
152
153 for (i = 0; i < 3; i++) 150 for (i = 0; i < 3; i++)
154 if (!dt_xlate_reg(node, i, 151 if (!dt_xlate_reg(node, i,
155 (unsigned long *)&pci_regs[i], NULL)) 152 (unsigned long *)&pci_regs[i], NULL))
156 goto err; 153 goto err;
157 154
158 if (!dt_xlate_reg(soc_node, 0, (unsigned long *)&soc_regs, NULL)) 155 soc_regs = (u8 *)fsl_get_immr();
156 if (!soc_regs)
159 goto err; 157 goto err;
160 158
161 dt_get_reg_format(node, &naddr, &nsize); 159 dt_get_reg_format(node, &naddr, &nsize);