On 2022/4/16 15:45, Johan Jonker wrote:
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 <jbx6...@gmail.com>
Reviewed-by: Kever Yang <kever.y...@rock-chips.com>

Thanks,
- Kever
---

Fix for rk3288.dtsi sync from Linux.
Not tested with hardware.
---
  drivers/video/rockchip/rk_edp.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
index 0ddf5e02..3697d582 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 },
        { }

Reply via email to