Skip to content

Commit 0944e77

Browse files
Johan Jonkerkeveryang
authored andcommitted
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 <[email protected]> Reviewed-by: Kever Yang <[email protected]>
1 parent 8f47414 commit 0944e77

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/video/rockchip/rk_edp.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,8 +1070,11 @@ static int rk_edp_probe(struct udevice *dev)
10701070

10711071
ret = reset_get_by_name(dev, "dp", &dp_rst);
10721072
if (ret) {
1073-
dev_err(dev, "failed to get dp reset (ret=%d)\n", ret);
1074-
return ret;
1073+
ret = reset_get_by_name(dev, "edp", &dp_rst);
1074+
if (ret) {
1075+
dev_err(dev, "failed to get dp reset (ret=%d)\n", ret);
1076+
return ret;
1077+
}
10751078
}
10761079

10771080
ret = reset_assert(&dp_rst);
@@ -1156,6 +1159,7 @@ static const struct rockchip_dp_data rk3288_dp = {
11561159
};
11571160

11581161
static const struct udevice_id rockchip_dp_ids[] = {
1162+
{ .compatible = "rockchip,rk3288-dp", .data = (ulong)&rk3288_dp },
11591163
{ .compatible = "rockchip,rk3288-edp", .data = (ulong)&rk3288_dp },
11601164
{ .compatible = "rockchip,rk3399-edp", .data = (ulong)&rk3399_edp },
11611165
{ }

0 commit comments

Comments
 (0)