Merge tag 'devicetree-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree updates from Rob Herring: "There's a few orphans in the conversion to %pOF printf specifiers included here that no one else picked up. Summary: - Convert more DT code to use of_property_read_* API. - Improve DT overlay support when adding multiple overlays - Convert printk's to %pOF format specifiers. Most went via subsystem trees, but picked up the remaining orphans - Correct unittests to use preferred "okay" for "status" property value - Add a KASLR seed property - Vendor prefixes for Mellanox, Theobroma System, Adaptrum, Moxa - Fix modalias buffer handling - Clean-up of include paths for building dtbs - Add bindings for amc6821, isl1208, tsl2x7x, srf02, and srf10 devices - Add nvmem bindings for MediaTek MT7623 and MT7622 SoC - Add compatible string for Allwinner H5 Mali-450 GPU - Fix links to old OpenFirmware docs with new mirror on devicetree.org - Remove status property from binding doc examples" * tag 'devicetree-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (45 commits) devicetree: Adjust status "ok" -> "okay" under drivers/of/ dt-bindings: Remove "status" from examples dt-bindings: pinctrl: sh-pfc: Use generic node name dt-bindings: Add vendor Mellanox dt-binding: net/phy: fix interrupts description virt: Convert to using %pOF instead of full_name macintosh: Convert to using %pOF instead of full_name ide: pmac: Convert to using %pOF instead of full_name microblaze: Convert to using %pOF instead of full_name dt-bindings: usb: musb: Grammar s/the/to/, s/is/are/ of: Use PLATFORM_DEVID_NONE definition of/device: Fix of_device_get_modalias() buffer handling of/device: Prevent buffer overflow in of_device_modalias() dt-bindings: add amc6821, isl1208 trivial bindings dt-bindings: add vendor prefix for Theobroma Systems of: search scripts/dtc/include-prefixes path for both CPP and DTC of: remove arch/$(SRCARCH)/boot/dts from include search path for CPP of: remove drivers/of/testcase-data from include search path for CPP of: return of_get_cpu_node from of_cpu_device_node_get if CPUs are not registered iio: srf08: add device tree binding for srf02 and srf10 ...
This commit is contained in:
@@ -55,8 +55,8 @@ int of_property_count_elems_of_size(const struct device_node *np,
|
||||
return -ENODATA;
|
||||
|
||||
if (prop->length % elem_size != 0) {
|
||||
pr_err("size of %s in node %s is not a multiple of %d\n",
|
||||
propname, np->full_name, elem_size);
|
||||
pr_err("size of %s in node %pOF is not a multiple of %d\n",
|
||||
propname, np, elem_size);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -537,8 +537,8 @@ int of_graph_parse_endpoint(const struct device_node *node,
|
||||
{
|
||||
struct device_node *port_node = of_get_parent(node);
|
||||
|
||||
WARN_ONCE(!port_node, "%s(): endpoint %s has no parent node\n",
|
||||
__func__, node->full_name);
|
||||
WARN_ONCE(!port_node, "%s(): endpoint %pOF has no parent node\n",
|
||||
__func__, node);
|
||||
|
||||
memset(endpoint, 0, sizeof(*endpoint));
|
||||
|
||||
@@ -621,14 +621,13 @@ struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
|
||||
of_node_put(node);
|
||||
|
||||
if (!port) {
|
||||
pr_err("graph: no port node found in %s\n",
|
||||
parent->full_name);
|
||||
pr_err("graph: no port node found in %pOF\n", parent);
|
||||
return NULL;
|
||||
}
|
||||
} else {
|
||||
port = of_get_parent(prev);
|
||||
if (WARN_ONCE(!port, "%s(): endpoint %s has no parent node\n",
|
||||
__func__, prev->full_name))
|
||||
if (WARN_ONCE(!port, "%s(): endpoint %pOF has no parent node\n",
|
||||
__func__, prev))
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -797,8 +796,8 @@ struct device_node *of_graph_get_remote_node(const struct device_node *node,
|
||||
|
||||
endpoint_node = of_graph_get_endpoint_by_regs(node, port, endpoint);
|
||||
if (!endpoint_node) {
|
||||
pr_debug("no valid endpoint (%d, %d) for node %s\n",
|
||||
port, endpoint, node->full_name);
|
||||
pr_debug("no valid endpoint (%d, %d) for node %pOF\n",
|
||||
port, endpoint, node);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -945,8 +944,8 @@ of_fwnode_graph_get_next_endpoint(const struct fwnode_handle *fwnode,
|
||||
static struct fwnode_handle *
|
||||
of_fwnode_graph_get_remote_endpoint(const struct fwnode_handle *fwnode)
|
||||
{
|
||||
return of_fwnode_handle(of_parse_phandle(to_of_node(fwnode),
|
||||
"remote-endpoint", 0));
|
||||
return of_fwnode_handle(
|
||||
of_graph_get_remote_endpoint(to_of_node(fwnode)));
|
||||
}
|
||||
|
||||
static struct fwnode_handle *
|
||||
|
Reference in New Issue
Block a user