update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/mfd/rkx110_x120/rkx120_combtxphy.c
..
..
@@ -111,9 +111,10 @@
111
111
 #define GRF_MIPI_STATUS		0x0080
112
112
 #define PHYLOCK			BIT(0)
113
113
 
114
-static void rkx120_combtxphy_dsi_timing_init(struct rk_serdes *des, u8 remote_id)
114
+static void rkx120_combtxphy_dsi_timing_init(struct rk_serdes *des,
115
+					     struct rkx120_combtxphy *combtxphy,
116
+					     u8 dev_id)
115
117
 {
116
-	struct rkx120_combtxphy *combtxphy = &des->combtxphy;
117
118
 	const struct configure_opts_combphy cfg = combtxphy->mipi_dphy_cfg;
118
119
 	u32 byte_clk = DIV_ROUND_CLOSEST_ULL(combtxphy->rate, 8);
119
120
 	u32 esc_div = DIV_ROUND_UP(byte_clk, 20 * USEC_PER_SEC);
..
..
@@ -123,30 +124,30 @@
123
124
 	u32 t_tago, t_tasure, t_taget;
124
125
 	u32 base = RKX120_MIPI_LVDS_TX_PHY0_BASE;
125
126
 
126
-	serdes_combphy_write(des, remote_id, base + INTERFACE_PARA,
127
+	serdes_combphy_write(des, dev_id, base + INTERFACE_PARA,
127
128
 			     TXREADYESC_VLD(esc_div - 2) |
128
129
 			     RXVALIDESC_VLD(esc_div - 2));
129
-	serdes_combphy_write(des, remote_id, base + COMMON_PARA0, esc_div);
130
-	serdes_combphy_update_bits(des, remote_id, base + TEST_PARA0, FSET_EN, FSET_EN);
130
+	serdes_combphy_write(des, dev_id, base + COMMON_PARA0, esc_div);
131
+	serdes_combphy_update_bits(des, dev_id, base + TEST_PARA0, FSET_EN, FSET_EN);
131
132
 
132
133
 	t_init = DIV_ROUND_UP(cfg.init, t_byte_clk) - 1;
133
-	serdes_combphy_write(des, remote_id, base + CLANE_PARA1, T_INITTIME_C(t_init));
134
-	serdes_combphy_write(des, remote_id, base + DLANE0_PARA1, T_INITTIME_D(t_init));
135
-	serdes_combphy_write(des, remote_id, base + DLANE_PARA1(1), T_INITTIME_D(t_init));
136
-	serdes_combphy_write(des, remote_id, base + DLANE_PARA1(2), T_INITTIME_D(t_init));
137
-	serdes_combphy_write(des, remote_id, base + DLANE_PARA1(3), T_INITTIME_D(t_init));
134
+	serdes_combphy_write(des, dev_id, base + CLANE_PARA1, T_INITTIME_C(t_init));
135
+	serdes_combphy_write(des, dev_id, base + DLANE0_PARA1, T_INITTIME_D(t_init));
136
+	serdes_combphy_write(des, dev_id, base + DLANE_PARA1(1), T_INITTIME_D(t_init));
137
+	serdes_combphy_write(des, dev_id, base + DLANE_PARA1(2), T_INITTIME_D(t_init));
138
+	serdes_combphy_write(des, dev_id, base + DLANE_PARA1(3), T_INITTIME_D(t_init));
138
139
 
139
140
 	t_clkprepare = DIV_ROUND_UP(cfg.clk_prepare, t_byte_clk) - 1;
140
141
 	t_clkzero = DIV_ROUND_UP(cfg.clk_zero, t_byte_clk) - 1;
141
142
 	t_clkpre = DIV_ROUND_UP(cfg.clk_pre, t_byte_clk) - 1;
142
-	serdes_combphy_write(des, remote_id, base + CLANE_PARA2,
143
+	serdes_combphy_write(des, dev_id, base + CLANE_PARA2,
143
144
 			     T_CLKPREPARE_C(t_clkprepare) |
144
145
 			     T_CLKZERO_C(t_clkzero) | T_CLKPRE_C(t_clkpre));
145
146
 
146
147
 	t_clkpost = DIV_ROUND_UP(cfg.clk_post, t_byte_clk) - 1;
147
148
 	t_clktrail = DIV_ROUND_UP(cfg.clk_trail, t_byte_clk) - 1;
148
149
 	t_hsexit = DIV_ROUND_UP(cfg.hs_exit, t_byte_clk) - 1;
149
-	serdes_combphy_write(des, remote_id, base + CLANE_PARA3,
150
+	serdes_combphy_write(des, dev_id, base + CLANE_PARA3,
150
151
 			     T_CLKPOST_C(t_clkpost) |
151
152
 			     T_CLKTRAIL_C(t_clktrail) |
152
153
 			     T_HSEXIT_C(t_hsexit));
..
..
@@ -154,62 +155,63 @@
154
155
 	t_hsprepare = DIV_ROUND_UP(cfg.hs_prepare, t_byte_clk) - 1;
155
156
 	t_hszero = DIV_ROUND_UP(cfg.hs_zero, t_byte_clk) - 1;
156
157
 	t_hstrail = DIV_ROUND_UP(cfg.hs_trail, t_byte_clk) - 1;
157
-	serdes_combphy_write(des, remote_id, base + DLANE0_PARA2,
158
+	serdes_combphy_write(des, dev_id, base + DLANE0_PARA2,
158
159
 			     T_HSPREPARE_D(t_hsprepare) |
159
160
 			     T_HSZERO_D(t_hszero) |
160
161
 			     T_HSTRAIL_D(t_hstrail) |
161
162
 			     T_HSEXIT_D(t_hsexit));
162
163
 
163
-	serdes_combphy_write(des, remote_id, base + DLANE_PARA2(1),
164
+	serdes_combphy_write(des, dev_id, base + DLANE_PARA2(1),
164
165
 			     T_HSPREPARE_D(t_hsprepare) |
165
166
 			     T_HSZERO_D(t_hszero) |
166
167
 			     T_HSTRAIL_D(t_hstrail) |
167
168
 			     T_HSEXIT_D(t_hsexit));
168
169
 
169
-	serdes_combphy_write(des, remote_id, base + DLANE_PARA2(2),
170
+	serdes_combphy_write(des, dev_id, base + DLANE_PARA2(2),
170
171
 			     T_HSPREPARE_D(t_hsprepare) |
171
172
 			     T_HSZERO_D(t_hszero) |
172
173
 			     T_HSTRAIL_D(t_hstrail) |
173
174
 			     T_HSEXIT_D(t_hsexit));
174
175
 
175
-	serdes_combphy_write(des, remote_id, base + DLANE_PARA2(3),
176
+	serdes_combphy_write(des, dev_id, base + DLANE_PARA2(3),
176
177
 			     T_HSPREPARE_D(t_hsprepare) |
177
178
 			     T_HSZERO_D(t_hszero) |
178
179
 			     T_HSTRAIL_D(t_hstrail) |
179
180
 			     T_HSEXIT_D(t_hsexit));
180
181
 
181
182
 	t_wakeup = DIV_ROUND_UP(cfg.wakeup, t_byte_clk) - 1;
182
-	serdes_combphy_write(des, remote_id, base + DLANE0_PARA3, T_WAKEUP_D(t_wakeup));
183
-	serdes_combphy_write(des, remote_id, base + DLANE_PARA3(1), T_WAKEUP_D(t_wakeup));
184
-	serdes_combphy_write(des, remote_id, base + DLANE_PARA3(2), T_WAKEUP_D(t_wakeup));
185
-	serdes_combphy_write(des, remote_id, base + DLANE_PARA3(3), T_WAKEUP_D(t_wakeup));
186
-	serdes_combphy_write(des, remote_id, base + CLANE_PARA4, T_WAKEUP_D(t_wakeup));
183
+	serdes_combphy_write(des, dev_id, base + DLANE0_PARA3, T_WAKEUP_D(t_wakeup));
184
+	serdes_combphy_write(des, dev_id, base + DLANE_PARA3(1), T_WAKEUP_D(t_wakeup));
185
+	serdes_combphy_write(des, dev_id, base + DLANE_PARA3(2), T_WAKEUP_D(t_wakeup));
186
+	serdes_combphy_write(des, dev_id, base + DLANE_PARA3(3), T_WAKEUP_D(t_wakeup));
187
+	serdes_combphy_write(des, dev_id, base + CLANE_PARA4, T_WAKEUP_D(t_wakeup));
187
188
 
188
189
 	t_tago = DIV_ROUND_UP(cfg.ta_go, t_byte_clk) - 1;
189
190
 	t_tasure = DIV_ROUND_UP(cfg.ta_sure, t_byte_clk) - 1;
190
191
 	t_taget = DIV_ROUND_UP(cfg.ta_get, t_byte_clk) - 1;
191
-	serdes_combphy_write(des, remote_id, base + DLANE0_PARA4,
192
+	serdes_combphy_write(des, dev_id, base + DLANE0_PARA4,
192
193
 			     T_TAGO_D0(t_tago) |
193
194
 			     T_TASURE_D0(t_tasure) |
194
195
 			     T_TAGET_D0(t_taget));
195
196
 }
196
197
 
197
-static void rkx120_combtxphy_dsi_pll_set(struct rk_serdes *des, u8 remote_id)
198
+static void rkx120_combtxphy_dsi_pll_set(struct rk_serdes *des,
199
+					 struct rkx120_combtxphy *combtxphy, u8 dev_id)
198
200
 {
199
-	struct rkx120_combtxphy *combtxphy = &des->combtxphy;
200
201
 	u32 base = RKX120_MIPI_LVDS_TX_PHY0_BASE;
201
202
 
202
-	serdes_combphy_update_bits(des, remote_id, base + PLL_CTRL_PARA0,
203
+	serdes_combphy_update_bits(des, dev_id, base + PLL_CTRL_PARA0,
203
204
 				   RATE_MASK | REFCLK_DIV_MASK | PLL_DIV_MASK,
204
205
 				   RATE(combtxphy->rate_factor) |
205
206
 				   REFCLK_DIV(combtxphy->ref_div - 1) |
206
207
 				   PLL_DIV(combtxphy->fb_div));
207
208
 }
208
209
 
209
-static void rkx120_combtxphy_dsi_power_on(struct rk_serdes *des, u8 remote_id)
210
+static void rkx120_combtxphy_dsi_power_on(struct rk_serdes *des,
211
+					  struct rkx120_combtxphy *combtxphy,
212
+					  u8 dev_id)
210
213
 {
211
-	struct rkx120_combtxphy *combtxphy = &des->combtxphy;
212
-	struct i2c_client *client = des->chip[remote_id].client;
214
+	struct i2c_client *client = des->chip[dev_id].client;
213
215
 	u32 grf_base = RKX120_GRF_MIPI0_BASE;
214
216
 	u32 val;
215
217
 	int ret;
..
..
@@ -218,8 +220,8 @@
218
220
 			   PHY_MODE(COMBTX_PHY_MODE_VIDEO_MIPI));
219
221
 
220
222
 	serdes_combphy_get_default_config(combtxphy->rate, &combtxphy->mipi_dphy_cfg);
221
-	rkx120_combtxphy_dsi_timing_init(des, remote_id);
222
-	rkx120_combtxphy_dsi_pll_set(des, remote_id);
223
+	rkx120_combtxphy_dsi_timing_init(des, combtxphy, dev_id);
224
+	rkx120_combtxphy_dsi_pll_set(des, combtxphy, dev_id);
223
225
 
224
226
 	des->i2c_write_reg(client, grf_base + GRF_MIPITX_CON0, PHYSHUTDWN(1));
225
227
 	des->i2c_write_reg(client, grf_base + GRF_MIPITX_CON1, PWON_PLL(1));
..
..
@@ -233,19 +235,20 @@
233
235
 		dev_err(des->dev, "PLL is not locked\n");
234
236
 }
235
237
 
236
-static void rkx120_combtxphy_dsi_power_off(struct rk_serdes *des, u8 remote_id)
238
+static void rkx120_combtxphy_dsi_power_off(struct rk_serdes *des, u8 dev_id)
237
239
 {
238
-	struct i2c_client *client = des->chip[remote_id].client;
240
+	struct i2c_client *client = des->chip[dev_id].client;
239
241
 	u32 grf_base = RKX120_GRF_MIPI0_BASE;
240
242
 
241
243
 	des->i2c_write_reg(client, grf_base + GRF_MIPITX_CON0, PHYSHUTDWN(0));
242
244
 	des->i2c_write_reg(client, grf_base + GRF_MIPITX_CON1, PWON_PLL(0));
243
245
 }
244
246
 
245
-static void rkx120_combtxphy_lvds_power_on(struct rk_serdes *des, u8 remote_id, u8 phy_id)
247
+static void rkx120_combtxphy_lvds_power_on(struct rk_serdes *des,
248
+					   struct rkx120_combtxphy *combtxphy,
249
+					   u8 dev_id, u8 phy_id)
246
250
 {
247
-	struct rkx120_combtxphy *combtxphy = &des->combtxphy;
248
-	struct i2c_client *client = des->chip[remote_id].client;
251
+	struct i2c_client *client = des->chip[dev_id].client;
249
252
 	u32 grf_base = (phy_id == 0) ?
250
253
 			RKX120_GRF_MIPI0_BASE : RKX120_GRF_MIPI1_BASE;
251
254
 	const struct {
..
..
@@ -304,29 +307,27 @@
304
307
 	des->i2c_write_reg(client, grf_base + GRF_MIPITX_CON13, TX_IDLE(0));
305
308
 }
306
309
 
307
-void rkx120_combtxphy_power_on(struct rk_serdes *des, u8 remote_id, u8 phy_id)
310
+void rkx120_combtxphy_power_on(struct rk_serdes *des, struct rkx120_combtxphy *combtxphy,
311
+			       u8 dev_id, u8 phy_id)
308
312
 {
309
-	struct rkx120_combtxphy *combtxphy = &des->combtxphy;
310
-
311
313
 	switch (combtxphy->mode) {
312
314
 	case COMBTX_PHY_MODE_VIDEO_MIPI:
313
-		rkx120_combtxphy_dsi_power_on(des, remote_id);
315
+		rkx120_combtxphy_dsi_power_on(des, combtxphy, dev_id);
314
316
 		break;
315
317
 	case COMBTX_PHY_MODE_VIDEO_LVDS:
316
-		rkx120_combtxphy_lvds_power_on(des, remote_id, phy_id);
318
+		rkx120_combtxphy_lvds_power_on(des, combtxphy, dev_id, phy_id);
317
319
 		break;
318
320
 	default:
319
321
 		break;
320
322
 	}
321
323
 }
322
324
 
323
-void rkx120_combtxphy_power_off(struct rk_serdes *des, u8 remote_id)
325
+void rkx120_combtxphy_power_off(struct rk_serdes *des, struct rkx120_combtxphy *combtxphy,
326
+				u8 dev_id, u8 phy_id)
324
327
 {
325
-	struct rkx120_combtxphy *combtxphy = &des->combtxphy;
326
-
327
328
 	switch (combtxphy->mode) {
328
329
 	case COMBTX_PHY_MODE_VIDEO_MIPI:
329
-		rkx120_combtxphy_dsi_power_off(des, remote_id);
330
+		rkx120_combtxphy_dsi_power_off(des, dev_id);
330
331
 		break;
331
332
 	case COMBTX_PHY_MODE_VIDEO_LVDS:
332
333
 		break;
..
..
@@ -385,10 +386,8 @@
385
386
 {
386
387
 }
387
388
 
388
-void rkx120_combtxphy_set_rate(struct rk_serdes *des, u64 rate)
389
+void rkx120_combtxphy_set_rate(struct rkx120_combtxphy *combtxphy, u64 rate)
389
390
 {
390
-	struct rkx120_combtxphy *combtxphy = &des->combtxphy;
391
-
392
391
 	switch (combtxphy->mode) {
393
392
 	case COMBTX_PHY_MODE_VIDEO_MIPI:
394
393
 		rkx120_combtxphy_dsi_pll_calc_rate(combtxphy, rate);
..
..
@@ -403,14 +402,12 @@
403
402
 	combtxphy->rate = rate;
404
403
 }
405
404
 
406
-u64 rkx120_combtxphy_get_rate(struct rk_serdes *des)
405
+u64 rkx120_combtxphy_get_rate(struct rkx120_combtxphy *combtxphy)
407
406
 {
408
-	return des->combtxphy.rate;
407
+	return combtxphy->rate;
409
408
 }
410
409
 
411
-void rkx120_combtxphy_set_mode(struct rk_serdes *des, enum combtx_phy_mode mode)
410
+void rkx120_combtxphy_set_mode(struct rkx120_combtxphy *combtxphy, enum combtx_phy_mode mode)
412
411
 {
413
-	struct rkx120_combtxphy *combtxphy = &des->combtxphy;
414
-
415
412
 	combtxphy->mode = mode;
416
413
 }