From nobody Mon Feb 9 01:45:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0B64187346; Sun, 26 Oct 2025 12:22:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761481324; cv=none; b=Mqvexy8BOhcoGAHh8MOrfe8ktigEbwdjcQ9axNTl8g5Y7i4dbfKgIMnWwAbaSmtfKqwdIGHJV1in2+FtgZazAch3DZcdBLZcUiBDQchrE5KEtPPm/l/L0JweJRI0SBq4agVi6KJMv8fI4nq++zdBUs3JLFWhBbbI1UTdFMriO5U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761481324; c=relaxed/simple; bh=GXuFAtgP+oHMIwv1faVRiehyLAz3rr8xYHnrw+m3qak=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=kAxb+szLyFgtl5uCnnWhBzYWSPuY8Pms72FpNhkyANoz/Dv7jbpA9LWBOU6gWoDTso9JA8+/tB2OfOyFKsKkzkbHvmbBw4lQtSgUWWO4N5iNNKenejx1Fd808N56n/EHqWVTErjjitV2GSozT7skyrz3XwLKvhweCtQOaUZ5spg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=k111yPkR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="k111yPkR" Received: by smtp.kernel.org (Postfix) with ESMTPS id 17B8EC4CEE7; Sun, 26 Oct 2025 12:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1761481324; bh=GXuFAtgP+oHMIwv1faVRiehyLAz3rr8xYHnrw+m3qak=; h=From:Date:Subject:To:Cc:From; b=k111yPkR1SAqFi0Qba1jO49IqFj+0ci+6K7rGAXWe2l3L63nptArnw0a7XPQChgHR L1k9/OBZgmJbPGHphEAWKjiriogr1wqe9tnBb2oT64hx671BPFyeHmXygcFKGDbRSj BAqI3kmZDK1L4cxknhg41JIRYWlwSGLmN2D5AdNgEoxiLjmTc6UN7rkn+FpN7HmRH3 YjpUUnWkWEkIDL96CdtejGKVdzEKU2yQv7FTdwzxdYth5i2NyYmwNq9o6/nhWSR+2i hNNc8rKcaochTKbh11fhFEE2gxhguvKvr4vjPw/8FTyrebj1djI0+/Llmeq2G30CPj qcyoXv7EX1EVg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03F25CCD1A5; Sun, 26 Oct 2025 12:22:03 +0000 (UTC) From: Sven Peter Date: Sun, 26 Oct 2025 12:21:36 +0000 Subject: [PATCH usb-next] usb: dwc3: apple: Only support a single reset controller Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251026-b4-dwc3-apple-reset-array-fix-v1-1-ccdbacd63f78@kernel.org> X-B4-Tracking: v=1; b=H4sIAE8S/mgC/x3MwQrCMAyA4VcZORtY6xzoq4iHtIkakFqSTSdj7 77i8fsP/woupuJw6VYw+ajruzSEQwf5SeUhqNwMsY+n0MeIaUD+5iNSrS9BE5cJyYx+eNcFaQy Z4zkxhxHao5q0/P9fYfaERZYJbtu2A+uoLQR5AAAA X-Change-ID: 20251022-b4-dwc3-apple-reset-array-fix-a61cd29bdd16 To: Janne Grunau , Neal Gompa , Thinh Nguyen , Greg Kroah-Hartman , Philipp Zabel Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Sven Peter X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4079; i=sven@kernel.org; h=from:subject:message-id; bh=GXuFAtgP+oHMIwv1faVRiehyLAz3rr8xYHnrw+m3qak=; b=owGbwMvMwCHmIlirolUq95LxtFoSQ8Y/oczj+5zfLeI4+Srj5LntiU/C5kyIN8tijz08dwpPo /fJPW97OkpZGMQ4GGTFFFm277c3ffLwjeDSTZfew8xhZQIZwsDFKQATeb+V4Q9X33uZNcet++6y fNy4Xd/3zs3K5ODcbb3i8/jVGU68DOBmZHi73a7h0vMvfZyFhxc+/ZWo/6i06uZ3VQ/XnakbNkl cusEBAA== X-Developer-Key: i=sven@kernel.org; a=openpgp; fpr=A1E3E34A2B3C820DBC4955E5993B08092F131F93 X-Endpoint-Received: by B4 Relay for sven@kernel.org/default with auth_id=407 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 Closes: https://lore.kernel.org/asahi/47112ace39ea096242e68659d67a401e931ab= f3a.camel@pengutronix.de/ Fixes: 0ec946d32ef7 ("usb: dwc3: Add Apple Silicon DWC3 glue layer driver") Signed-off-by: Sven Peter --- I was planning to submit a v3 with this fixed but didn't find the time before v2 was picked up. --- drivers/usb/dwc3/dwc3-apple.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-apple.c b/drivers/usb/dwc3/dwc3-apple.c index 6e41bd0e34f461b0c3db9b8a646116458ff816b6..cc47cad232e397ac4498b09165d= fdb5bd215ded7 100644 --- a/drivers/usb/dwc3/dwc3-apple.c +++ b/drivers/usb/dwc3/dwc3-apple.c @@ -81,7 +81,7 @@ enum dwc3_apple_state { * @dev: Pointer to the device structure * @mmio_resource: Resource to be passed to dwc3_core_probe * @apple_regs: Apple-specific DWC3 registers - * @resets: Reset control + * @reset: Reset control * @role_sw: USB role switch * @lock: Mutex for synchronizing access * @state: Current state of the controller, see documentation for the enum= for details @@ -93,7 +93,7 @@ struct dwc3_apple { struct resource *mmio_resource; void __iomem *apple_regs; =20 - struct reset_control *resets; + struct reset_control *reset; struct usb_role_switch *role_sw; =20 struct mutex lock; @@ -237,9 +237,9 @@ static int dwc3_apple_init(struct dwc3_apple *appledwc,= enum dwc3_apple_state st =20 lockdep_assert_held(&appledwc->lock); =20 - ret =3D reset_control_deassert(appledwc->resets); + ret =3D reset_control_deassert(appledwc->reset); if (ret) { - dev_err(appledwc->dev, "Failed to deassert resets, err=3D%d\n", ret); + dev_err(appledwc->dev, "Failed to deassert reset, err=3D%d\n", ret); return ret; } =20 @@ -288,9 +288,9 @@ static int dwc3_apple_init(struct dwc3_apple *appledwc,= enum dwc3_apple_state st core_exit: dwc3_core_exit(&appledwc->dwc); reset_assert: - ret_reset =3D reset_control_assert(appledwc->resets); + ret_reset =3D reset_control_assert(appledwc->reset); if (ret_reset) - dev_warn(appledwc->dev, "Failed to assert resets, err=3D%d\n", ret_reset= ); + dev_warn(appledwc->dev, "Failed to assert reset, err=3D%d\n", ret_reset); =20 return ret; } @@ -323,9 +323,9 @@ static int dwc3_apple_exit(struct dwc3_apple *appledwc) dwc3_core_exit(&appledwc->dwc); appledwc->state =3D DWC3_APPLE_NO_CABLE; =20 - ret =3D reset_control_assert(appledwc->resets); + ret =3D reset_control_assert(appledwc->reset); if (ret) { - dev_err(appledwc->dev, "Failed to assert resets, err=3D%d\n", ret); + dev_err(appledwc->dev, "Failed to assert reset, err=3D%d\n", ret); return ret; } =20 @@ -411,14 +411,14 @@ static int dwc3_apple_probe(struct platform_device *p= dev) appledwc->dev =3D &pdev->dev; mutex_init(&appledwc->lock); =20 - appledwc->resets =3D devm_reset_control_array_get_exclusive(dev); - if (IS_ERR(appledwc->resets)) - return dev_err_probe(&pdev->dev, PTR_ERR(appledwc->resets), - "Failed to get resets\n"); + appledwc->reset =3D devm_reset_control_get_exclusive(dev, NULL); + if (IS_ERR(appledwc->reset)) + return dev_err_probe(&pdev->dev, PTR_ERR(appledwc->reset), + "Failed to get reset control\n"); =20 - ret =3D reset_control_assert(appledwc->resets); + ret =3D reset_control_assert(appledwc->reset); if (ret) { - dev_err(&pdev->dev, "Failed to assert resets, err=3D%d\n", ret); + dev_err(&pdev->dev, "Failed to assert reset, err=3D%d\n", ret); return ret; } =20 --- base-commit: be83d83664e9f6fa035e96fb9187f9e7898659e4 change-id: 20251022-b4-dwc3-apple-reset-array-fix-a61cd29bdd16 Best regards, --=20 Sven Peter