Index: aml8726/aml8726_ccm.c
===================================================================
--- aml8726/aml8726_ccm.c	(revision 299472)
+++ aml8726/aml8726_ccm.c	(working copy)
@@ -141,7 +141,7 @@
 		AML_CCM_UNLOCK(sc);
 	}
 
-	free(functions, M_OFWPROP);
+	OF_prop_free(functions);
 
 	return (0);
 }
Index: aml8726/aml8726_mmc.c
===================================================================
--- aml8726/aml8726_mmc.c	(revision 299472)
+++ aml8726/aml8726_mmc.c	(working copy)
@@ -605,11 +605,11 @@
 	else {
 		device_printf(dev, "unknown function attribute %.*s in FDT\n",
 		    len, function_name);
-		free(function_name, M_OFWPROP);
+		OF_prop_free(function_name);
 		return (ENXIO);
 	}
 
-	free(function_name, M_OFWPROP);
+	OF_prop_free(function_name);
 
 	sc->pwr_en.dev = NULL;
 
@@ -661,7 +661,7 @@
 			device_printf(dev,
 			    "unknown voltage attribute %.*s in FDT\n",
 			    len, voltage);
-			free(voltages, M_OFWPROP);
+			OF_prop_free(voltages);
 			return (ENXIO);
 		}
 
@@ -678,7 +678,7 @@
 		}
 	}
 
-	free(voltages, M_OFWPROP);
+	OF_prop_free(voltages);
 
 	sc->vselect.dev = NULL;
 
Index: aml8726/aml8726_pinctrl.c
===================================================================
--- aml8726/aml8726_pinctrl.c	(revision 299472)
+++ aml8726/aml8726_pinctrl.c	(working copy)
@@ -210,11 +210,11 @@
 	if (f->name == NULL) {
 		device_printf(dev, "unknown function attribute %.*s in FDT\n",
 		    len, function_name);
-		free(function_name, M_OFWPROP);
+		OF_prop_free(function_name);
 		return (ENXIO);
 	}
 
-	free(function_name, M_OFWPROP);
+	OF_prop_free(function_name);
 
 	len = OF_getprop_alloc(node, "amlogic,pull",
 	    sizeof(char), (void **)&pull);
@@ -234,12 +234,12 @@
 			device_printf(dev,
 			    "unknown pull attribute %.*s in FDT\n",
 			    len, pull);
-			free(pull, M_OFWPROP);
+			OF_prop_free(pull);
 			return (ENXIO);
 		}
 	}
 
-	free(pull, M_OFWPROP);
+	OF_prop_free(pull);
 
 	/*
 	 * Setting the pull direction isn't supported on all SoC.
@@ -403,7 +403,7 @@
 		AML_PINCTRL_UNLOCK(sc);
 	}
 
-	free(pins, M_OFWPROP);
+	OF_prop_free(pins);
 
 	return (0);
 }
Index: aml8726/aml8726_sdxc-m8.c
===================================================================
--- aml8726/aml8726_sdxc-m8.c	(revision 299472)
+++ aml8726/aml8726_sdxc-m8.c	(working copy)
@@ -821,7 +821,7 @@
 			device_printf(dev,
 			    "unknown voltage attribute %.*s in FDT\n",
 			    len, voltage);
-			free(voltages, M_OFWPROP);
+			OF_prop_free(voltages);
 			return (ENXIO);
 		}
 
@@ -838,7 +838,7 @@
 		}
 	}
 
-	free(voltages, M_OFWPROP);
+	OF_prop_free(voltages);
 
 	sc->vselect.dev = NULL;
 
Index: aml8726/aml8726_usb_phy-m3.c
===================================================================
--- aml8726/aml8726_usb_phy-m3.c	(revision 299472)
+++ aml8726/aml8726_usb_phy-m3.c	(working copy)
@@ -139,7 +139,7 @@
 		    AML_USB_PHY_MISC_ID_OVERIDE_DEVICE;
 	}
 
-	free(usb_mode, M_OFWPROP);
+	OF_prop_free(usb_mode);
 
 	return (0);
 }
@@ -214,7 +214,7 @@
 		}
 	}
 
-	free(prop, M_OFWPROP);
+	OF_prop_free(prop);
 
 	if (err) {
 		device_printf(dev, "unable to parse gpio\n");
Index: aml8726/aml8726_usb_phy-m6.c
===================================================================
--- aml8726/aml8726_usb_phy-m6.c	(revision 299472)
+++ aml8726/aml8726_usb_phy-m6.c	(working copy)
@@ -164,7 +164,7 @@
 			sc->force_aca = TRUE;
 	}
 
-	free(force_aca, M_OFWPROP);
+	OF_prop_free(force_aca);
 
 	err = 0;
 
@@ -187,7 +187,7 @@
 		}
 	}
 
-	free(prop, M_OFWPROP);
+	OF_prop_free(prop);
 
 	len = OF_getencprop_alloc(node, "usb-hub-rst",
 	    3 * sizeof(pcell_t), (void **)&prop);
@@ -200,7 +200,7 @@
 			err = 1;
 	}
 
-	free(prop, M_OFWPROP);
+	OF_prop_free(prop);
 
 	if (err) {
 		device_printf(dev, "unable to parse gpio\n");