write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/usb/chipidea/ci_hdrc_msm.c
..
..
@@ -114,7 +114,7 @@
114
114
 			hw_write_id_reg(ci, HS_PHY_GENCONFIG_2,
115
115
 					HS_PHY_ULPI_TX_PKT_EN_CLR_FIX, 0);
116
116
 
117
-		if (!IS_ERR(ci->platdata->vbus_extcon.edev)) {
117
+		if (!IS_ERR(ci->platdata->vbus_extcon.edev) || ci->role_switch) {
118
118
 			hw_write_id_reg(ci, HS_PHY_GENCONFIG_2,
119
119
 					HS_PHY_SESS_VLD_CTRL_EN,
120
120
 					HS_PHY_SESS_VLD_CTRL_EN);
..
..
@@ -175,7 +175,6 @@
175
175
 	struct platform_device *plat_ci;
176
176
 	struct clk *clk;
177
177
 	struct reset_control *reset;
178
-	struct resource *res;
179
178
 	int ret;
180
179
 	struct device_node *ulpi_node, *phy_node;
181
180
 
..
..
@@ -205,15 +204,11 @@
205
204
 	if (IS_ERR(clk))
206
205
 		return PTR_ERR(clk);
207
206
 
208
-	ci->fs_clk = clk = devm_clk_get(&pdev->dev, "fs");
209
-	if (IS_ERR(clk)) {
210
-		if (PTR_ERR(clk) == -EPROBE_DEFER)
211
-			return -EPROBE_DEFER;
212
-		ci->fs_clk = NULL;
213
-	}
207
+	ci->fs_clk = clk = devm_clk_get_optional(&pdev->dev, "fs");
208
+	if (IS_ERR(clk))
209
+		return PTR_ERR(clk);
214
210
 
215
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
216
-	ci->base = devm_ioremap_resource(&pdev->dev, res);
211
+	ci->base = devm_platform_ioremap_resource(pdev, 1);
217
212
 	if (IS_ERR(ci->base))
218
213
 		return PTR_ERR(ci->base);
219
214
 
..
..
@@ -221,13 +216,13 @@
221
216
 	ci->rcdev.ops = &ci_hdrc_msm_reset_ops;
222
217
 	ci->rcdev.of_node = pdev->dev.of_node;
223
218
 	ci->rcdev.nr_resets = 2;
224
-	ret = reset_controller_register(&ci->rcdev);
219
+	ret = devm_reset_controller_register(&pdev->dev, &ci->rcdev);
225
220
 	if (ret)
226
221
 		return ret;
227
222
 
228
223
 	ret = clk_prepare_enable(ci->fs_clk);
229
224
 	if (ret)
230
-		goto err_fs;
225
+		return ret;
231
226
 
232
227
 	reset_control_assert(reset);
233
228
 	usleep_range(10000, 12000);
..
..
@@ -237,7 +232,7 @@
237
232
 
238
233
 	ret = clk_prepare_enable(ci->core_clk);
239
234
 	if (ret)
240
-		goto err_fs;
235
+		return ret;
241
236
 
242
237
 	ret = clk_prepare_enable(ci->iface_clk);
243
238
 	if (ret)
..
..
@@ -276,8 +271,6 @@
276
271
 	clk_disable_unprepare(ci->iface_clk);
277
272
 err_iface:
278
273
 	clk_disable_unprepare(ci->core_clk);
279
-err_fs:
280
-	reset_controller_unregister(&ci->rcdev);
281
274
 	return ret;
282
275
 }
283
276
 
..
..
@@ -289,7 +282,6 @@
289
282
 	ci_hdrc_remove_device(ci->ci);
290
283
 	clk_disable_unprepare(ci->iface_clk);
291
284
 	clk_disable_unprepare(ci->core_clk);
292
-	reset_controller_unregister(&ci->rcdev);
293
285
 
294
286
 	return 0;
295
287
 }