Index: a10_gpio.c
===================================================================
--- a10_gpio.c	(revision 299472)
+++ a10_gpio.c	(working copy)
@@ -526,8 +526,8 @@
 	}
 
  out:
-	free(pinlist, M_OFWPROP);
-	free(pin_function, M_OFWPROP);
+	OF_prop_free(pinlist);
+	OF_prop_free(pin_function);
 	return (ret);
 }
 
Index: clk/aw_cpuclk.c
===================================================================
--- clk/aw_cpuclk.c	(revision 299472)
+++ clk/aw_cpuclk.c	(working copy)
@@ -128,8 +128,8 @@
 		goto fail;
 	}
 
-	free(__DECONST(char *, def.clkdef.parent_names), M_OFWPROP);
-	free(__DECONST(char *, def.clkdef.name), M_OFWPROP);
+	OF_prop_free(__DECONST(char *, def.clkdef.parent_names));
+	OF_prop_free(__DECONST(char *, def.clkdef.name));
 
 	if (bootverbose)
 		clkdom_dump(clkdom);
@@ -137,7 +137,7 @@
 	return (0);
 
 fail:
-	free(__DECONST(char *, def.clkdef.name), M_OFWPROP);
+	OF_prop_free(__DECONST(char *, def.clkdef.name));
 	return (error);
 }
 
Index: clk/aw_lcdclk.c
===================================================================
--- clk/aw_lcdclk.c	(revision 299472)
+++ clk/aw_lcdclk.c	(working copy)
@@ -529,11 +529,11 @@
 	if (sc->type == AW_LCD_CH0)
 		hwreset_register_ofw_provider(dev);
 
-	free(parent_names, M_OFWPROP);
+	OF_prop_free(parent_names);
 	return (0);
 
 fail:
-	free(parent_names, M_OFWPROP);
+	OF_prop_free(parent_names);
 	return (error);
 }
 
Index: clk/aw_oscclk.c
===================================================================
--- clk/aw_oscclk.c	(revision 299472)
+++ clk/aw_oscclk.c	(working copy)
@@ -103,12 +103,12 @@
 	if (bootverbose)
 		clkdom_dump(clkdom);
 
-	free(__DECONST(char *, def.clkdef.name), M_OFWPROP);
+	OF_prop_free(__DECONST(char *, def.clkdef.name));
 
 	return (0);
 
 fail:
-	free(__DECONST(char *, def.clkdef.name), M_OFWPROP);
+	OF_prop_free(__DECONST(char *, def.clkdef.name));
 	return (error);
 }
 
Index: clk/aw_pll.c
===================================================================
--- clk/aw_pll.c	(revision 299472)
+++ clk/aw_pll.c	(working copy)
@@ -692,7 +692,7 @@
 
 	clknode_register(clkdom, clk);
 
-	free(__DECONST(char *, clkdef.parent_names), M_OFWPROP);
+	OF_prop_free(__DECONST(char *, clkdef.parent_names));
 
 	return (0);
 }
Index: if_awg.c
===================================================================
--- if_awg.c	(revision 299472)
+++ if_awg.c	(working copy)
@@ -951,7 +951,7 @@
 			tx_parent_name = "emac_int_tx";
 		else
 			tx_parent_name = "mii_phy_tx";
-		free(phy_type, M_OFWPROP);
+		OF_prop_free(phy_type);
 
 		/* Get the TX clock */
 		error = clk_get_by_ofw_name(dev, "tx", &clk_tx);
@@ -1034,7 +1034,7 @@
 	return (0);
 
 fail:
-	free(phy_type, M_OFWPROP);
+	OF_prop_free(phy_type);
 
 	if (reg != NULL)
 		regulator_release(reg);