From cabb9735d1b8df523b209e5e72bbe74635d1badc Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Thu, 30 May 2019 14:34:59 +0800 Subject: [PATCH] drm/rockchip: dw_hdmi: Compatible with two inno hdmi phy names 4.4 kernel inno hdmi phy name is "hdmi_phy". 4.19 kernel inno hdmi phy name is "hdmi". Change-Id: Ie87aa205c89154b417887a84703ce7bd9ffb2c7f Signed-off-by: Algea Cao --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 4dc8026253a7..372dc1ecb573 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -633,10 +633,13 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, hdmi->phy = devm_phy_optional_get(dev, "hdmi"); if (IS_ERR(hdmi->phy)) { - ret = PTR_ERR(hdmi->phy); - if (ret != -EPROBE_DEFER) - DRM_DEV_ERROR(hdmi->dev, "failed to get phy\n"); - return ret; + hdmi->phy = devm_phy_optional_get(dev, "hdmi_phy"); + if (IS_ERR(hdmi->phy)) { + ret = PTR_ERR(hdmi->phy); + if (ret != -EPROBE_DEFER) + DRM_DEV_ERROR(hdmi->dev, "failed to get phy\n"); + return ret; + } } drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);