]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: video: rk_edp: add more rk3288 edp node options
authorJohan Jonker <jbx6244@gmail.com>
Sat, 16 Apr 2022 07:45:56 +0000 (09:45 +0200)
committerKever Yang <kever.yang@rock-chips.com>
Mon, 18 Apr 2022 03:25:13 +0000 (11:25 +0800)
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 <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
drivers/video/rockchip/rk_edp.c

index 0ddf5e02d697849fb0bdeea3572856396cfbcaf6..3697d582510a89cfaa3126642c207e50daec6a73 100644 (file)
@@ -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 },
        { }