write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/usb/mtu3/mtu3_plat.c
..
..
@@ -16,6 +16,7 @@
16
16
 
17
17
 #include "mtu3.h"
18
18
 #include "mtu3_dr.h"
19
+#include "mtu3_debug.h"
19
20
 
20
21
 /* u2-port0 should be powered on and enabled; */
21
22
 int ssusb_check_clocks(struct ssusb_mtk *ssusb, u32 ex_clks)
..
..
@@ -200,19 +201,14 @@
200
201
 	mtu3_setbits(ssusb->ippc_base, U3D_SSUSB_IP_PW_CTRL0, SSUSB_IP_SW_RST);
201
202
 	udelay(1);
202
203
 	mtu3_clrbits(ssusb->ippc_base, U3D_SSUSB_IP_PW_CTRL0, SSUSB_IP_SW_RST);
203
-}
204
204
 
205
-/* ignore the error if the clock does not exist */
206
-static struct clk *get_optional_clk(struct device *dev, const char *id)
207
-{
208
-	struct clk *opt_clk;
209
-
210
-	opt_clk = devm_clk_get(dev, id);
211
-	/* ignore error number except EPROBE_DEFER */
212
-	if (IS_ERR(opt_clk) && (PTR_ERR(opt_clk) != -EPROBE_DEFER))
213
-		opt_clk = NULL;
214
-
215
-	return opt_clk;
205
+	/*
206
+	 * device ip may be powered on in firmware/BROM stage before entering
207
+	 * kernel stage;
208
+	 * power down device ip, otherwise ip-sleep will fail when working as
209
+	 * host only mode
210
+	 */
211
+	mtu3_setbits(ssusb->ippc_base, U3D_SSUSB_IP_PW_CTRL2, SSUSB_IP_DEV_PDN);
216
212
 }
217
213
 
218
214
 static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
..
..
@@ -220,12 +216,10 @@
220
216
 	struct device_node *node = pdev->dev.of_node;
221
217
 	struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
222
218
 	struct device *dev = &pdev->dev;
223
-	struct regulator *vbus;
224
-	struct resource *res;
225
219
 	int i;
226
220
 	int ret;
227
221
 
228
-	ssusb->vusb33 = devm_regulator_get(&pdev->dev, "vusb33");
222
+	ssusb->vusb33 = devm_regulator_get(dev, "vusb33");
229
223
 	if (IS_ERR(ssusb->vusb33)) {
230
224
 		dev_err(dev, "failed to get vusb33\n");
231
225
 		return PTR_ERR(ssusb->vusb33);
..
..
@@ -237,15 +231,15 @@
237
231
 		return PTR_ERR(ssusb->sys_clk);
238
232
 	}
239
233
 
240
-	ssusb->ref_clk = get_optional_clk(dev, "ref_ck");
234
+	ssusb->ref_clk = devm_clk_get_optional(dev, "ref_ck");
241
235
 	if (IS_ERR(ssusb->ref_clk))
242
236
 		return PTR_ERR(ssusb->ref_clk);
243
237
 
244
-	ssusb->mcu_clk = get_optional_clk(dev, "mcu_ck");
238
+	ssusb->mcu_clk = devm_clk_get_optional(dev, "mcu_ck");
245
239
 	if (IS_ERR(ssusb->mcu_clk))
246
240
 		return PTR_ERR(ssusb->mcu_clk);
247
241
 
248
-	ssusb->dma_clk = get_optional_clk(dev, "dma_ck");
242
+	ssusb->dma_clk = devm_clk_get_optional(dev, "dma_ck");
249
243
 	if (IS_ERR(ssusb->dma_clk))
250
244
 		return PTR_ERR(ssusb->dma_clk);
251
245
 
..
..
@@ -268,8 +262,7 @@
268
262
 		}
269
263
 	}
270
264
 
271
-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ippc");
272
-	ssusb->ippc_base = devm_ioremap_resource(dev, res);
265
+	ssusb->ippc_base = devm_platform_ioremap_resource_byname(pdev, "ippc");
273
266
 	if (IS_ERR(ssusb->ippc_base))
274
267
 		return PTR_ERR(ssusb->ippc_base);
275
268
 
..
..
@@ -278,7 +271,7 @@
278
271
 		ssusb->dr_mode = USB_DR_MODE_OTG;
279
272
 
280
273
 	if (ssusb->dr_mode == USB_DR_MODE_PERIPHERAL)
281
-		return 0;
274
+		goto out;
282
275
 
283
276
 	/* if host role is supported */
284
277
 	ret = ssusb_wakeup_of_property_parse(ssusb, node);
..
..
@@ -291,22 +284,22 @@
291
284
 	of_property_read_u32(node, "mediatek,u3p-dis-msk",
292
285
 			     &ssusb->u3p_dis_msk);
293
286
 
294
-	vbus = devm_regulator_get(&pdev->dev, "vbus");
295
-	if (IS_ERR(vbus)) {
287
+	otg_sx->vbus = devm_regulator_get(dev, "vbus");
288
+	if (IS_ERR(otg_sx->vbus)) {
296
289
 		dev_err(dev, "failed to get vbus\n");
297
-		return PTR_ERR(vbus);
290
+		return PTR_ERR(otg_sx->vbus);
298
291
 	}
299
-	otg_sx->vbus = vbus;
300
292
 
301
293
 	if (ssusb->dr_mode == USB_DR_MODE_HOST)
302
-		return 0;
294
+		goto out;
303
295
 
304
296
 	/* if dual-role mode is supported */
305
297
 	otg_sx->is_u3_drd = of_property_read_bool(node, "mediatek,usb3-drd");
306
298
 	otg_sx->manual_drd_enabled =
307
299
 		of_property_read_bool(node, "enable-manual-drd");
300
+	otg_sx->role_sw_used = of_property_read_bool(node, "usb-role-switch");
308
301
 
309
-	if (of_property_read_bool(node, "extcon")) {
302
+	if (!otg_sx->role_sw_used && of_property_read_bool(node, "extcon")) {
310
303
 		otg_sx->edev = extcon_get_edev_by_phandle(ssusb->dev, 0);
311
304
 		if (IS_ERR(otg_sx->edev)) {
312
305
 			dev_err(ssusb->dev, "couldn't get extcon device\n");
..
..
@@ -314,6 +307,7 @@
314
307
 		}
315
308
 	}
316
309
 
310
+out:
317
311
 	dev_info(dev, "dr_mode: %d, is_u3_dr: %d, u3p_dis_msk: %x, drd: %s\n",
318
312
 		ssusb->dr_mode, otg_sx->is_u3_drd, ssusb->u3p_dis_msk,
319
313
 		otg_sx->manual_drd_enabled ? "manual" : "auto");
..
..
@@ -345,6 +339,8 @@
345
339
 	ret = get_ssusb_rscs(pdev, ssusb);
346
340
 	if (ret)
347
341
 		return ret;
342
+
343
+	ssusb_debugfs_create_root(ssusb);
348
344
 
349
345
 	/* enable power domain */
350
346
 	pm_runtime_enable(dev);
..
..
@@ -393,7 +389,11 @@
393
389
 			goto gadget_exit;
394
390
 		}
395
391
 
396
-		ssusb_otg_switch_init(ssusb);
392
+		ret = ssusb_otg_switch_init(ssusb);
393
+		if (ret) {
394
+			dev_err(dev, "failed to initialize switch\n");
395
+			goto host_exit;
396
+		}
397
397
 		break;
398
398
 	default:
399
399
 		dev_err(dev, "unsupported mode: %d\n", ssusb->dr_mode);
..
..
@@ -403,6 +403,8 @@
403
403
 
404
404
 	return 0;
405
405
 
406
+host_exit:
407
+	ssusb_host_exit(ssusb);
406
408
 gadget_exit:
407
409
 	ssusb_gadget_exit(ssusb);
408
410
 comm_exit:
..
..
@@ -410,6 +412,7 @@
410
412
 comm_init_err:
411
413
 	pm_runtime_put_sync(dev);
412
414
 	pm_runtime_disable(dev);
415
+	ssusb_debugfs_remove_root(ssusb);
413
416
 
414
417
 	return ret;
415
418
 }
..
..
@@ -437,6 +440,7 @@
437
440
 	ssusb_rscs_exit(ssusb);
438
441
 	pm_runtime_put_sync(&pdev->dev);
439
442
 	pm_runtime_disable(&pdev->dev);
443
+	ssusb_debugfs_remove_root(ssusb);
440
444
 
441
445
 	return 0;
442
446
 }