Skip to contentSkip to conversation

rockchip: video: rk_edp: add more rk3288 edp node options

PATCH In review Johan Jonker 2 participants 2 messages Apr 16, 2022 – Apr 18, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

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(-)
drivers/video/rockchip/rk_edp.c +6 -2
index 0ddf5e02..3697d582 100644
@@ -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 },
 	{ }
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Johan Jonker

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.

Thanks,
- Kever

Quoted 34 lines

---

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(-)
drivers/video/rockchip/rk_edp.c +6 -2
index 0ddf5e02..3697d582 100644
@@ -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 },
  	{ }