svn commit: r233822 - projects/armv6/sys/dev/fdt

[Jakub Wojciech Klama]

Author: jceel
Date: Tue Apr  3 02:16:21 2012
New Revision: 233822
URL: http://svn.freebsd.org/changeset/base/233822

Log:
  Remove useless and wrong piece of code in fdt_get_range() which overwrites
  passed phandle_t node. Modify debug printf in fdt_reg_to_rl() to be
  consistent (that is, print start and end *virtual* addresses).

Modified:
  projects/armv6/sys/dev/fdt/fdt_common.c

Modified: projects/armv6/sys/dev/fdt/fdt_common.c
==============================================================================
--- projects/armv6/sys/dev/fdt/fdt_common.c	Mon Apr  2 22:54:31 2012	(r233821)
+++ projects/armv6/sys/dev/fdt/fdt_common.c	Tue Apr  3 02:16:21 2012	(r233822)
@@ -70,22 +70,6 @@ fdt_get_range(phandle_t node, int range_
 	pcell_t addr_cells, size_cells, par_addr_cells;
 	int len, tuple_size, tuples;
 
-	/*
-	 * Try to access the SOC node directly i.e. through /aliases/.
-	 */
-	if ((node = OF_finddevice("soc")) != -1)
-		if (fdt_is_compatible_strict(node, "simple-bus"))
-			goto moveon;
-	/*
-	 * Find the node the long way.
-	 */
-	if ((node = OF_finddevice("/")) == -1)
-		return (ENXIO);
-
-	if ((node = fdt_find_compatible(node, "simple-bus", 1)) == 0)
-		return (ENXIO);
-
-moveon:
 	if ((fdt_addrsize_cells(node, &addr_cells, &size_cells)) != 0)
 		return (ENXIO);
 	/*
@@ -474,7 +458,7 @@ fdt_reg_to_rl(phandle_t node, struct res
 			panic("Couldn't map the device memory");
 		end = vaddr + count - 1;
 
-		debugf("reg addr start = %lx, end = %lx, count = %lx\n", start,
+		debugf("reg addr start = %lx, end = %lx, count = %lx\n", vaddr,
 		    end, count);
 
 		resource_list_add(rl, SYS_RES_MEMORY, i, vaddr, end,