Commit af19d645 authored by Matthias Brugger's avatar Matthias Brugger Committed by Matthias Brugger

drm/mediatek: Omit warning on probe defers

It can happen that the mmsys clock drivers aren't probed before the
platform driver gets invoked. The platform driver used to print a warning
that the driver failed to get the clocks. Omit this error on
the defered probe path.
Signed-off-by: default avatarMatthias Brugger <mbrugger@suse.com>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent 8f3d9f35
...@@ -119,7 +119,10 @@ static int mtk_disp_color_probe(struct platform_device *pdev) ...@@ -119,7 +119,10 @@ static int mtk_disp_color_probe(struct platform_device *pdev)
ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id, ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,
&mtk_disp_color_funcs); &mtk_disp_color_funcs);
if (ret) { if (ret) {
dev_err(dev, "Failed to initialize component: %d\n", ret); if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to initialize component: %d\n",
ret);
return ret; return ret;
} }
......
...@@ -386,7 +386,10 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) ...@@ -386,7 +386,10 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev)
ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id, ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,
&mtk_disp_ovl_funcs); &mtk_disp_ovl_funcs);
if (ret) { if (ret) {
dev_err(dev, "Failed to initialize component: %d\n", ret); if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to initialize component: %d\n",
ret);
return ret; return ret;
} }
......
...@@ -294,7 +294,10 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev) ...@@ -294,7 +294,10 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev)
ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id, ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,
&mtk_disp_rdma_funcs); &mtk_disp_rdma_funcs);
if (ret) { if (ret) {
dev_err(dev, "Failed to initialize component: %d\n", ret); if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to initialize component: %d\n",
ret);
return ret; return ret;
} }
......
...@@ -716,21 +716,27 @@ static int mtk_dpi_probe(struct platform_device *pdev) ...@@ -716,21 +716,27 @@ static int mtk_dpi_probe(struct platform_device *pdev)
dpi->engine_clk = devm_clk_get(dev, "engine"); dpi->engine_clk = devm_clk_get(dev, "engine");
if (IS_ERR(dpi->engine_clk)) { if (IS_ERR(dpi->engine_clk)) {
ret = PTR_ERR(dpi->engine_clk); ret = PTR_ERR(dpi->engine_clk);
dev_err(dev, "Failed to get engine clock: %d\n", ret); if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get engine clock: %d\n", ret);
return ret; return ret;
} }
dpi->pixel_clk = devm_clk_get(dev, "pixel"); dpi->pixel_clk = devm_clk_get(dev, "pixel");
if (IS_ERR(dpi->pixel_clk)) { if (IS_ERR(dpi->pixel_clk)) {
ret = PTR_ERR(dpi->pixel_clk); ret = PTR_ERR(dpi->pixel_clk);
dev_err(dev, "Failed to get pixel clock: %d\n", ret); if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get pixel clock: %d\n", ret);
return ret; return ret;
} }
dpi->tvd_clk = devm_clk_get(dev, "pll"); dpi->tvd_clk = devm_clk_get(dev, "pll");
if (IS_ERR(dpi->tvd_clk)) { if (IS_ERR(dpi->tvd_clk)) {
ret = PTR_ERR(dpi->tvd_clk); ret = PTR_ERR(dpi->tvd_clk);
dev_err(dev, "Failed to get tvdpll clock: %d\n", ret); if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get tvdpll clock: %d\n", ret);
return ret; return ret;
} }
......
...@@ -628,7 +628,8 @@ static int mtk_ddp_probe(struct platform_device *pdev) ...@@ -628,7 +628,8 @@ static int mtk_ddp_probe(struct platform_device *pdev)
if (!ddp->data->no_clk) { if (!ddp->data->no_clk) {
ddp->clk = devm_clk_get(dev, NULL); ddp->clk = devm_clk_get(dev, NULL);
if (IS_ERR(ddp->clk)) { if (IS_ERR(ddp->clk)) {
dev_err(dev, "Failed to get clock\n"); if (PTR_ERR(ddp->clk) != -EPROBE_DEFER)
dev_err(dev, "Failed to get clock\n");
return PTR_ERR(ddp->clk); return PTR_ERR(ddp->clk);
} }
} }
......
...@@ -1194,14 +1194,18 @@ static int mtk_dsi_probe(struct platform_device *pdev) ...@@ -1194,14 +1194,18 @@ static int mtk_dsi_probe(struct platform_device *pdev)
dsi->engine_clk = devm_clk_get(dev, "engine"); dsi->engine_clk = devm_clk_get(dev, "engine");
if (IS_ERR(dsi->engine_clk)) { if (IS_ERR(dsi->engine_clk)) {
ret = PTR_ERR(dsi->engine_clk); ret = PTR_ERR(dsi->engine_clk);
dev_err(dev, "Failed to get engine clock: %d\n", ret);
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get engine clock: %d\n", ret);
goto err_unregister_host; goto err_unregister_host;
} }
dsi->digital_clk = devm_clk_get(dev, "digital"); dsi->digital_clk = devm_clk_get(dev, "digital");
if (IS_ERR(dsi->digital_clk)) { if (IS_ERR(dsi->digital_clk)) {
ret = PTR_ERR(dsi->digital_clk); ret = PTR_ERR(dsi->digital_clk);
dev_err(dev, "Failed to get digital clock: %d\n", ret);
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get digital clock: %d\n", ret);
goto err_unregister_host; goto err_unregister_host;
} }
......
...@@ -1474,7 +1474,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, ...@@ -1474,7 +1474,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
ret = mtk_hdmi_get_all_clk(hdmi, np); ret = mtk_hdmi_get_all_clk(hdmi, np);
if (ret) { if (ret) {
dev_err(dev, "Failed to get clocks: %d\n", ret); if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get clocks: %d\n", ret);
return ret; return ret;
} }
......
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