update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/mfd/rkx110_x120/rkx110.c
..
..
@@ -15,21 +15,30 @@
15
15
 		.base = RKX110_PATTERN_GEN_DSI0_BASE,
16
16
 		.link_src_reg = SER_GRF_SOC_CON4,
17
17
 		.link_src_offset = 12,
18
+		.type = RK_SERDES_DSI_RX0,
18
19
 	}, {
19
20
 		.name = "dsi1",
20
21
 		.base = RKX110_PATTERN_GEN_DSI1_BASE,
21
22
 		.link_src_reg = SER_GRF_SOC_CON4,
22
23
 		.link_src_offset = 13,
24
+		.type = RK_SERDES_DSI_RX1,
25
+	}, {
26
+		.name = "dual-lvds",
27
+		.link_src_reg = SER_GRF_SOC_CON1,
28
+		.link_src_offset = 14,
29
+		.type = RK_SERDES_DUAL_LVDS_RX,
23
30
 	}, {
24
31
 		.name = "lvds0",
25
32
 		.base = RKX110_PATTERN_GEN_LVDS0_BASE,
26
33
 		.link_src_reg = SER_GRF_SOC_CON4,
27
34
 		.link_src_offset = 14,
35
+		.type = RK_SERDES_LVDS_RX0,
28
36
 	}, {
29
37
 		.name = "lvds1",
30
38
 		.base = RKX110_PATTERN_GEN_LVDS1_BASE,
31
39
 		.link_src_reg = SER_GRF_SOC_CON4,
32
40
 		.link_src_offset = 15,
41
+		.type = RK_SERDES_LVDS_RX1,
33
42
 	},
34
43
 	{ /* sentinel */ }
35
44
 };
..
..
@@ -295,9 +304,11 @@
295
304
 
296
305
 int rkx110_lvds_rx_enable(struct rk_serdes *serdes, struct rk_serdes_route *route, int id)
297
306
 {
298
-	rkx110_combrxphy_set_mode(serdes, COMBRX_PHY_MODE_VIDEO_LVDS);
307
+	struct rk_serdes_panel *sd_panel = container_of(route, struct rk_serdes_panel, route);
308
+	struct rkx110_combrxphy *combrxphy = &sd_panel->combrxphy;
299
309
 
300
-	rkx110_combrxphy_power_on(serdes, id ? COMBPHY_1 : COMBPHY_0);
310
+	rkx110_combrxphy_set_mode(combrxphy, COMBRX_PHY_MODE_VIDEO_LVDS);
311
+	rkx110_combrxphy_power_on(serdes, combrxphy, DEVICE_LOCAL, id ? COMBPHY_1 : COMBPHY_0);
301
312
 
302
313
 	return 0;
303
314
 }