Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

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

diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c
index 60f561e307a99090b423bc3e02e90891e9d51b48..a7e21a35c03af6a7bd584cccf6b140f85157d7cf 100644 (file)
--- a/arch/powerpc/boot/devtree.c
+++ b/arch/powerpc/boot/devtree.c
@@ -213,7 +213,7 @@ static int find_range(u32 *reg, u32 *ranges, int nregaddr,
                u32 range_addr[MAX_ADDR_CELLS];
                u32 range_size[MAX_ADDR_CELLS];
 
-               copy_val(range_addr, ranges + i, naddr);
+               copy_val(range_addr, ranges + i, nregaddr);
                copy_val(range_size, ranges + i + nregaddr + naddr, nsize);
 
                if (compare_reg(reg, range_addr, range_size))
@@ -350,3 +350,23 @@ int dt_is_compatible(void *node, const char *compat)
 
        return 0;
 }
+
+int dt_get_virtual_reg(void *node, void **addr, int nres)
+{
+       unsigned long xaddr;
+       int n;
+
+       n = getprop(node, "virtual-reg", addr, nres * 4);
+       if (n > 0)
+               return n / 4;
+
+       for (n = 0; n < nres; n++) {
+               if (!dt_xlate_reg(node, n, &xaddr, NULL))
+                       break;
+
+               addr[n] = (void *)xaddr;
+       }
+
+       return n;
+}
+