From 258519868737ec8481a5f6bd202e0a645dffc07f Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Wed, 24 May 2023 10:07:49 +0800 Subject: [PATCH] drm/rockchip: dw_hdmi: regulator avdd-0v9 and avdd-1v8 is optional Fixes: daf27963218f ("Merge commit '52f971ee6e023d89d24f9e3cd145d86d707e459c'") Signed-off-by: Sandy Huang Change-Id: Ib4034fac08e43801b1c15c63159ac871150a232f --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index fec8ed36ffa5..b238bdbe58d7 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -1489,12 +1489,20 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi) } hdmi->avdd_0v9 = devm_regulator_get_optional(hdmi->dev, "avdd-0v9"); - if (IS_ERR(hdmi->avdd_0v9)) - return PTR_ERR(hdmi->avdd_0v9); + if (IS_ERR(hdmi->avdd_0v9)) { + if (PTR_ERR(hdmi->avdd_0v9) != -ENODEV) + return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->avdd_0v9), + "failed to get regulator: avdd-0v9\n"); + hdmi->avdd_0v9 = NULL; + } hdmi->avdd_1v8 = devm_regulator_get_optional(hdmi->dev, "avdd-1v8"); - if (IS_ERR(hdmi->avdd_1v8)) - return PTR_ERR(hdmi->avdd_1v8); + if (IS_ERR(hdmi->avdd_1v8)) { + if (PTR_ERR(hdmi->avdd_1v8) != -ENODEV) + return dev_err_probe(hdmi->dev, PTR_ERR(hdmi->avdd_1v8), + "failed to get regulator: avdd-1v8\n"); + hdmi->avdd_1v8 = NULL; + } hdmi->skip_check_420_mode = of_property_read_bool(np, "skip-check-420-mode");