Skip to content

Commit 04a093d

Browse files
svenpeter42jannau
authored andcommitted
usb: dwc3: apple: Only support a single reset controller
As pointed out by Philipp, Apple's dwc3 controller only uses a single reset line and there's thus no need to use reset controller array functions. The only functional change here is replacing devm_reset_control_array_get_exclusive with devm_reset_control_get_exclusive. The rest are only cosmetic changes to replace "resets" with "reset". Reported-by: Philipp Zabel <p.zabel@pengutronix.de> Closes: https://lore.kernel.org/asahi/47112ace39ea096242e68659d67a401e931abf3a.camel@pengutronix.de/ Fixes: 0ec946d ("usb: dwc3: Add Apple Silicon DWC3 glue layer driver") Signed-off-by: Sven Peter <sven@kernel.org> Link: https://patch.msgid.link/20251026-b4-dwc3-apple-reset-array-fix-v1-1-ccdbacd63f78@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a02b5ed commit 04a093d

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

drivers/usb/dwc3/dwc3-apple.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ enum dwc3_apple_state {
8181
* @dev: Pointer to the device structure
8282
* @mmio_resource: Resource to be passed to dwc3_core_probe
8383
* @apple_regs: Apple-specific DWC3 registers
84-
* @resets: Reset control
84+
* @reset: Reset control
8585
* @role_sw: USB role switch
8686
* @lock: Mutex for synchronizing access
8787
* @state: Current state of the controller, see documentation for the enum for details
@@ -93,7 +93,7 @@ struct dwc3_apple {
9393
struct resource *mmio_resource;
9494
void __iomem *apple_regs;
9595

96-
struct reset_control *resets;
96+
struct reset_control *reset;
9797
struct usb_role_switch *role_sw;
9898

9999
struct mutex lock;
@@ -237,9 +237,9 @@ static int dwc3_apple_init(struct dwc3_apple *appledwc, enum dwc3_apple_state st
237237

238238
lockdep_assert_held(&appledwc->lock);
239239

240-
ret = reset_control_deassert(appledwc->resets);
240+
ret = reset_control_deassert(appledwc->reset);
241241
if (ret) {
242-
dev_err(appledwc->dev, "Failed to deassert resets, err=%d\n", ret);
242+
dev_err(appledwc->dev, "Failed to deassert reset, err=%d\n", ret);
243243
return ret;
244244
}
245245

@@ -288,9 +288,9 @@ static int dwc3_apple_init(struct dwc3_apple *appledwc, enum dwc3_apple_state st
288288
core_exit:
289289
dwc3_core_exit(&appledwc->dwc);
290290
reset_assert:
291-
ret_reset = reset_control_assert(appledwc->resets);
291+
ret_reset = reset_control_assert(appledwc->reset);
292292
if (ret_reset)
293-
dev_warn(appledwc->dev, "Failed to assert resets, err=%d\n", ret_reset);
293+
dev_warn(appledwc->dev, "Failed to assert reset, err=%d\n", ret_reset);
294294

295295
return ret;
296296
}
@@ -323,9 +323,9 @@ static int dwc3_apple_exit(struct dwc3_apple *appledwc)
323323
dwc3_core_exit(&appledwc->dwc);
324324
appledwc->state = DWC3_APPLE_NO_CABLE;
325325

326-
ret = reset_control_assert(appledwc->resets);
326+
ret = reset_control_assert(appledwc->reset);
327327
if (ret) {
328-
dev_err(appledwc->dev, "Failed to assert resets, err=%d\n", ret);
328+
dev_err(appledwc->dev, "Failed to assert reset, err=%d\n", ret);
329329
return ret;
330330
}
331331

@@ -411,14 +411,14 @@ static int dwc3_apple_probe(struct platform_device *pdev)
411411
appledwc->dev = &pdev->dev;
412412
mutex_init(&appledwc->lock);
413413

414-
appledwc->resets = devm_reset_control_array_get_exclusive(dev);
415-
if (IS_ERR(appledwc->resets))
416-
return dev_err_probe(&pdev->dev, PTR_ERR(appledwc->resets),
417-
"Failed to get resets\n");
414+
appledwc->reset = devm_reset_control_get_exclusive(dev, NULL);
415+
if (IS_ERR(appledwc->reset))
416+
return dev_err_probe(&pdev->dev, PTR_ERR(appledwc->reset),
417+
"Failed to get reset control\n");
418418

419-
ret = reset_control_assert(appledwc->resets);
419+
ret = reset_control_assert(appledwc->reset);
420420
if (ret) {
421-
dev_err(&pdev->dev, "Failed to assert resets, err=%d\n", ret);
421+
dev_err(&pdev->dev, "Failed to assert reset, err=%d\n", ret);
422422
return ret;
423423
}
424424

0 commit comments

Comments
 (0)