From: Johan Jonker Date: Sat, 16 Apr 2022 07:45:56 +0000 (+0200) Subject: rockchip: video: rk_edp: add more rk3288 edp node options X-Git-Tag: v2022.07~97^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0944e77fde179de28db9a2ad7e6b975b8fedfc19;p=platform%2Fkernel%2Fu-boot.git rockchip: video: rk_edp: add more rk3288 edp node options The rk3288 DT synced from Linux contains some different properties in the edp node then origanal used in U-boot. Allow both options to be backwards compatible and to be able to handle recent rk3288.dtsi files. Signed-off-by: Johan Jonker Reviewed-by: Kever Yang --- diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index 0ddf5e0..3697d58 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -1070,8 +1070,11 @@ static int rk_edp_probe(struct udevice *dev) ret = reset_get_by_name(dev, "dp", &dp_rst); if (ret) { - dev_err(dev, "failed to get dp reset (ret=%d)\n", ret); - return ret; + ret = reset_get_by_name(dev, "edp", &dp_rst); + if (ret) { + dev_err(dev, "failed to get dp reset (ret=%d)\n", ret); + return ret; + } } ret = reset_assert(&dp_rst); @@ -1156,6 +1159,7 @@ static const struct rockchip_dp_data rk3288_dp = { }; static const struct udevice_id rockchip_dp_ids[] = { + { .compatible = "rockchip,rk3288-dp", .data = (ulong)&rk3288_dp }, { .compatible = "rockchip,rk3288-edp", .data = (ulong)&rk3288_dp }, { .compatible = "rockchip,rk3399-edp", .data = (ulong)&rk3399_edp }, { }