Skip to content

Commit 18ccc23

Browse files
AngeloGioacchino Del RegnoChun-Kuang Hu
authored andcommitted
drm/mediatek: dp: Move PHY registration to new function
In preparation for adding support for eDP, move the PHY registration code to a new mtk_dp_register_phy() function for better readability. This commit brings no functional changes. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Tested-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Reviewed-by: CK Hu <ck.hu@mediatek.com> Link: https://patchwork.kernel.org/project/dri-devel/patch/20230725073234.55892-9-angelogioacchino.delregno@collabora.com/ Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
1 parent 848bc59 commit 18ccc23

File tree

1 file changed

+26
-17
lines changed

1 file changed

+26
-17
lines changed

drivers/gpu/drm/mediatek/mtk_dp.c

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2478,6 +2478,29 @@ static int mtk_dp_register_audio_driver(struct device *dev)
24782478
return PTR_ERR_OR_ZERO(mtk_dp->audio_pdev);
24792479
}
24802480

2481+
static int mtk_dp_register_phy(struct mtk_dp *mtk_dp)
2482+
{
2483+
struct device *dev = mtk_dp->dev;
2484+
2485+
mtk_dp->phy_dev = platform_device_register_data(dev, "mediatek-dp-phy",
2486+
PLATFORM_DEVID_AUTO,
2487+
&mtk_dp->regs,
2488+
sizeof(struct regmap *));
2489+
if (IS_ERR(mtk_dp->phy_dev))
2490+
return dev_err_probe(dev, PTR_ERR(mtk_dp->phy_dev),
2491+
"Failed to create device mediatek-dp-phy\n");
2492+
2493+
mtk_dp_get_calibration_data(mtk_dp);
2494+
2495+
mtk_dp->phy = devm_phy_get(&mtk_dp->phy_dev->dev, "dp");
2496+
if (IS_ERR(mtk_dp->phy)) {
2497+
platform_device_unregister(mtk_dp->phy_dev);
2498+
return dev_err_probe(dev, PTR_ERR(mtk_dp->phy), "Failed to get phy\n");
2499+
}
2500+
2501+
return 0;
2502+
}
2503+
24812504
static int mtk_dp_probe(struct platform_device *pdev)
24822505
{
24832506
struct mtk_dp *mtk_dp;
@@ -2536,23 +2559,9 @@ static int mtk_dp_probe(struct platform_device *pdev)
25362559
}
25372560
}
25382561

2539-
mtk_dp->phy_dev = platform_device_register_data(dev, "mediatek-dp-phy",
2540-
PLATFORM_DEVID_AUTO,
2541-
&mtk_dp->regs,
2542-
sizeof(struct regmap *));
2543-
if (IS_ERR(mtk_dp->phy_dev))
2544-
return dev_err_probe(dev, PTR_ERR(mtk_dp->phy_dev),
2545-
"Failed to create device mediatek-dp-phy\n");
2546-
2547-
mtk_dp_get_calibration_data(mtk_dp);
2548-
2549-
mtk_dp->phy = devm_phy_get(&mtk_dp->phy_dev->dev, "dp");
2550-
2551-
if (IS_ERR(mtk_dp->phy)) {
2552-
platform_device_unregister(mtk_dp->phy_dev);
2553-
return dev_err_probe(dev, PTR_ERR(mtk_dp->phy),
2554-
"Failed to get phy\n");
2555-
}
2562+
ret = mtk_dp_register_phy(mtk_dp);
2563+
if (ret)
2564+
return ret;
25562565

25572566
mtk_dp->bridge.funcs = &mtk_dp_bridge_funcs;
25582567
mtk_dp->bridge.of_node = dev->of_node;

0 commit comments

Comments
 (0)