diff --git a/drivers/misc/rk628/rk628.c b/drivers/misc/rk628/rk628.c
index 4cbba8aa6cda..ac3387c5437c 100644
--- a/drivers/misc/rk628/rk628.c
+++ b/drivers/misc/rk628/rk628.c
@@ -723,40 +723,50 @@ static int rk628_display_route_info_parse(struct rk628 *rk628)
 	int ret = 0;
 	u32 val;
 
-	if (of_property_read_bool(rk628->dev->of_node, "rk628,hdmi-in")) {
+	if (of_property_read_bool(rk628->dev->of_node, "rk628-hdmi-in") ||
+	    of_property_read_bool(rk628->dev->of_node, "rk628,hdmi-in")) {
 		rk628->input_mode = BIT(INPUT_MODE_HDMI);
-	} else if (of_property_read_bool(rk628->dev->of_node, "rk628,rgb-in")) {
+	} else if (of_property_read_bool(rk628->dev->of_node, "rk628-rgb-in") ||
+		   of_property_read_bool(rk628->dev->of_node, "rk628,rgb-in")) {
 		rk628->input_mode = BIT(INPUT_MODE_RGB);
 		ret = rk628_rgb_parse(rk628, NULL);
-	} else if (of_property_read_bool(rk628->dev->of_node, "rk628,bt1120-in")) {
+	} else if (of_property_read_bool(rk628->dev->of_node, "rk628-bt1120-in") ||
+		   of_property_read_bool(rk628->dev->of_node, "rk628,bt1120-in")) {
 		rk628->input_mode = BIT(INPUT_MODE_BT1120);
 		ret = rk628_rgb_parse(rk628, NULL);
 	} else {
 		rk628->input_mode = BIT(INPUT_MODE_RGB);
 	}
 
-	if ((np = of_get_child_by_name(rk628->dev->of_node, "rk628-gvi"))) {
+	if ((np = of_get_child_by_name(rk628->dev->of_node, "rk628-gvi-out")) ||
+	    (np = of_get_child_by_name(rk628->dev->of_node, "rk628-gvi"))) {
 		rk628->output_mode |= BIT(OUTPUT_MODE_GVI);
 		ret = rk628_gvi_parse(rk628, np);
-	} else if ((np = of_get_child_by_name(rk628->dev->of_node, "rk628-lvds"))) {
+	} else if ((np = of_get_child_by_name(rk628->dev->of_node, "rk628-lvds-out")) ||
+		   (np = of_get_child_by_name(rk628->dev->of_node, "rk628-lvds"))) {
 		rk628->output_mode |= BIT(OUTPUT_MODE_LVDS);
 		ret = rk628_lvds_parse(rk628, np);
-	} else if ((np = of_get_child_by_name(rk628->dev->of_node, "rk628-dsi"))) {
+	} else if ((np = of_get_child_by_name(rk628->dev->of_node, "rk628-dsi-out")) ||
+		   (np = of_get_child_by_name(rk628->dev->of_node, "rk628-dsi"))) {
 		rk628->output_mode |= BIT(OUTPUT_MODE_DSI);
 		ret = rk628_dsi_parse(rk628, np);
-	} else if (of_property_read_bool(rk628->dev->of_node, "rk628,csi-out")) {
+	} else if (of_property_read_bool(rk628->dev->of_node, "rk628-csi-out") ||
+		   of_property_read_bool(rk628->dev->of_node, "rk628,csi-out")) {
 		rk628->output_mode |= BIT(OUTPUT_MODE_CSI);
 	}
 	if (np)
 		of_node_put(np);
 
-	if (of_property_read_bool(rk628->dev->of_node, "rk628,hdmi-out"))
+	if (of_property_read_bool(rk628->dev->of_node, "rk628-hdmi-out") ||
+	    of_property_read_bool(rk628->dev->of_node, "rk628,hdmi-out"))
 		rk628->output_mode |= BIT(OUTPUT_MODE_HDMI);
 
-	if (of_property_read_bool(rk628->dev->of_node, "rk628-rgb")) {
+	if (of_property_read_bool(rk628->dev->of_node, "rk628-rgb-out") ||
+	    of_property_read_bool(rk628->dev->of_node, "rk628-rgb")) {
 		rk628->output_mode |= BIT(OUTPUT_MODE_RGB);
 		ret = rk628_rgb_parse(rk628, NULL);
-	} else if (of_property_read_bool(rk628->dev->of_node, "rk628-bt1120")) {
+	} else if (of_property_read_bool(rk628->dev->of_node, "rk628-bt1120-out") ||
+		   of_property_read_bool(rk628->dev->of_node, "rk628-bt1120")) {
 		rk628->output_mode |= BIT(OUTPUT_MODE_BT1120);
 		ret = rk628_rgb_parse(rk628, NULL);
 	}
diff --git a/drivers/misc/rk628/rk628_dsi.c b/drivers/misc/rk628/rk628_dsi.c
index 9f93bfe35ffe..6a49ed10e783 100644
--- a/drivers/misc/rk628/rk628_dsi.c
+++ b/drivers/misc/rk628/rk628_dsi.c
@@ -830,7 +830,10 @@ static u32 rk628_dsi_get_lane_rate(const struct rk628_dsi *dsi)
 	u32 max_lane_rate = 1500;
 	u8 bpp, lanes;
 
-	dsi_np = of_find_node_by_name(dsi->rk628->dev->of_node, "rk628-dsi");
+	dsi_np = of_find_node_by_name(dsi->rk628->dev->of_node, "rk628-dsi-out");
+	if (!dsi_np)
+		dsi_np = of_find_node_by_name(dsi->rk628->dev->of_node,
+					      "rk628-dsi");
 	if (dsi_np && !of_property_read_u32(dsi_np, "rockchip,lane-mbps", &value)) {
 		lane_rate = value;
 	} else {