GCC4.6: Squash warnings in denali_spd_ddr2.c

[u-boot] / arch / powerpc / cpu / mpc85xx / portals.c

diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index c014163e3ceaec6fe53a3182faca1f4b7867224a..6199633541250e03ce4dd5e6ac1beac3c8f387bf 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -151,8 +151,10 @@ static int fdt_qportal(void *blob, int off, int id, char *name,
                        dev_handle = fdt_get_phandle(blob, dev_off);
                        if (dev_handle <= 0) {
                                dev_handle = fdt_alloc_phandle(blob);
-                               fdt_setprop_cell(blob, dev_off,
-                                       "linux,phandle", dev_handle);
+                               ret = fdt_set_phandle(blob, dev_off,
+                                                        dev_handle);
+                               if (ret < 0)
+                                       return ret;
                        }
 
                        ret = fdt_setprop(blob, childoff, "dev-handle",
@@ -196,7 +198,10 @@ void fdt_fixup_qportals(void *blob)
                u32 liodns[2];
 #endif
                const int *ci = fdt_getprop(blob, off, "cell-index", NULL);
-               int j, i = *ci;
+               int i = *ci;
+#ifdef CONFIG_SYS_DPAA_FMAN
+               int j;
+#endif
 
                err = fdt_setprop(blob, off, "compatible", compat, compat_len);
                if (err < 0)
@@ -240,6 +245,12 @@ void fdt_fixup_qportals(void *blob)
                                goto err;
                }
 #endif
+#ifdef CONFIG_SYS_DPAA_RMAN
+               err = fdt_qportal(blob, off, i, "rman@0",
+                                 FSL_HW_PORTAL_RMAN, 1);
+               if (err < 0)
+                       goto err;
+#endif
 
 err:
                if (err < 0) {