Commit f7eb147d authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Vinod Koul

phy: ti: j721e-wiz: Invoke wiz_init() before of_platform_device_create()

Invoke wiz_init() before configuring anything else in Sierra/Torrent
(invoked as part of of_platform_device_create()). wiz_init() resets the
SERDES device and any configuration done in the probe() of
Sierra/Torrent will be lost. In order to prevent SERDES configuration
from getting reset, invoke wiz_init() immediately before invoking
of_platform_device_create().

Fixes: 091876cc ("phy: ti: j721e-wiz: Add support for WIZ module present in TI J721E SoC")
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Reviewed-by: default avatarSwapnil Jakhade <sjakhade@cadence.com>
Cc: <stable@vger.kernel.org> # v5.10
Link: https://lore.kernel.org/r/20210319124128.13308-3-kishon@ti.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 5b4f5757
...@@ -1264,27 +1264,24 @@ static int wiz_probe(struct platform_device *pdev) ...@@ -1264,27 +1264,24 @@ static int wiz_probe(struct platform_device *pdev)
goto err_get_sync; goto err_get_sync;
} }
ret = wiz_init(wiz);
if (ret) {
dev_err(dev, "WIZ initialization failed\n");
goto err_wiz_init;
}
serdes_pdev = of_platform_device_create(child_node, NULL, dev); serdes_pdev = of_platform_device_create(child_node, NULL, dev);
if (!serdes_pdev) { if (!serdes_pdev) {
dev_WARN(dev, "Unable to create SERDES platform device\n"); dev_WARN(dev, "Unable to create SERDES platform device\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_pdev_create;
}
wiz->serdes_pdev = serdes_pdev;
ret = wiz_init(wiz);
if (ret) {
dev_err(dev, "WIZ initialization failed\n");
goto err_wiz_init; goto err_wiz_init;
} }
wiz->serdes_pdev = serdes_pdev;
of_node_put(child_node); of_node_put(child_node);
return 0; return 0;
err_wiz_init: err_wiz_init:
of_platform_device_destroy(&serdes_pdev->dev, NULL);
err_pdev_create:
wiz_clock_cleanup(wiz, node); wiz_clock_cleanup(wiz, node);
err_get_sync: err_get_sync:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment