Merge branch 'dtc-update' into dt/next

2018-03-08 09:21:07 -06:00
parent bdb7013df9 4fd98e374f
commit c679fa6e3a
713 changed files with 7591 additions and 9318 deletions
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -977,11 +977,11 @@ static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
 	return 0;
 }

-static void *
+static const void *
 of_fwnode_device_get_match_data(const struct fwnode_handle *fwnode,
 				const struct device *dev)
 {
-	return (void *)of_device_get_match_data(dev);
+	return of_device_get_match_data(dev);
 }

 const struct fwnode_operations of_fwnode_ops = {