summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorZhen Lei <thunder.leizhen@huawei.com>2015-08-25 12:08:22 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-17 22:11:50 -0700
commit56f2de81e020c537f7e35550d13840143cb765cd (patch)
tree7863e4bfe65656253a9f456bc704a1f4729c6a2c /drivers/of
parent6713e8fb541656d00249dca6627395b461c39ece (diff)
of: to support binding numa node to specified device in devicetree
For now, in function device_add, the new device will be forced to inherit the numa node of its parent. But this will override the device's numa node which configured in devicetree. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/device.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 8b91ea241b10..e5f47cec75f3 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -60,11 +60,12 @@ int of_device_add(struct platform_device *ofdev)
ofdev->name = dev_name(&ofdev->dev);
ofdev->id = -1;
- /* device_add will assume that this device is on the same node as
- * the parent. If there is no parent defined, set the node
- * explicitly */
- if (!ofdev->dev.parent)
- set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
+ /*
+ * If this device has not binding numa node in devicetree, that is
+ * of_node_to_nid returns NUMA_NO_NODE. device_add will assume that this
+ * device is on the same node as the parent.
+ */
+ set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
return device_add(&ofdev->dev);
}