From: Stephen Warren Date: Mon, 9 Dec 2013 22:06:47 +0000 (-0700) Subject: mfd: Always assign of_node in mfd_add_device() X-Git-Tag: Ubuntu-5.2.0-15.16~14192^2~25 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a7c42b25455d589ae6e13fc636a6d83632c3d39f;p=mirror_ubuntu-eoan-kernel.git mfd: Always assign of_node in mfd_add_device() mfd_add_device() assigns .of_node in the device objects it creates only if the mfd_cell for the device has the .of_compatible field set and the DT node for the top-level MFD device contains a child whose compatible property matches the cell's .of_compatible field. This leaves .of_node unset in many cases. When this happens, entries in the DT /aliases property which refer to the top-level MFD DT node will never match the MFD child devices, hence causing the requested alias not to be honored. Solve this by setting each MFD child device's .of_node equal to the top- level MFD device's .of_node field in the cases where it would otherwise remain unset. The first use-case for this will be aliases for the TPS6586x's RTC device. Signed-off-by: Stephen Warren Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 267649244737..32e8d47d9002 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -117,6 +117,8 @@ static int mfd_add_device(struct device *parent, int id, } } } + if (!pdev->dev.of_node) + pdev->dev.of_node = parent->of_node; if (cell->pdata_size) { ret = platform_device_add_data(pdev,