Skip to content

Commit 6a5348d

Browse files
lumaggregkh
authored andcommitted
drm/bridge: aux-hpd-bridge: fix assignment of the of_node
[ Upstream commit e8537ca ] Perform fix similar to the one in the commit 85e444a ("drm/bridge: Fix assignment of the of_node of the parent to aux bridge"). The assignment of the of_node to the aux HPD bridge needs to mark the of_node as reused, otherwise driver core will attempt to bind resources like pinctrl, which is going to fail as corresponding pins are already marked as used by the parent device. Fix that by using the device_set_of_node_from_dev() helper instead of assigning it directly. Fixes: e560518 ("drm/bridge: implement generic DP HPD bridge") Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sasha Levin <[email protected]>
1 parent 800a6bd commit 6a5348d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/bridge/aux-hpd-bridge.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ struct auxiliary_device *devm_drm_dp_hpd_bridge_alloc(struct device *parent, str
6464
adev->id = ret;
6565
adev->name = "dp_hpd_bridge";
6666
adev->dev.parent = parent;
67-
adev->dev.of_node = of_node_get(parent->of_node);
6867
adev->dev.release = drm_aux_hpd_bridge_release;
6968
adev->dev.platform_data = of_node_get(np);
7069

70+
device_set_of_node_from_dev(&adev->dev, parent);
71+
7172
ret = auxiliary_device_init(adev);
7273
if (ret) {
7374
of_node_put(adev->dev.platform_data);

0 commit comments

Comments
 (0)