From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 385BB3382C5 for ; Thu, 11 Jun 2026 03:39:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781149159; cv=none; b=Dcd1oDFkRdM4a/pqoWR2z46HehL5eYjP44iFLXJ/a9/AuDx5JXn/T11sVjMePodK+dekaNkAIleTZVP7s3749fe8gVpoVH149/JSFUVNp3iULL3uoC78wbDdVZVwvo6eqrzo9UYpr01MZUOQ7VOPCUtZevrP9vMjSP11m992Zm4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781149159; c=relaxed/simple; bh=jfKLiudhSeJ7Ij3548KPuavVXJyFeUm4cbLCLp5+oPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pOlNkXqQ+ly0t4rZYSQQtV30td9Az595dTEnro0cwYUtd39dFMh2Xde2VPihYndkDcRYt0fSlbxhwP631mvQn8Ot2WQ16lnxSPiuKrpxD2nTETtQIu5yb0E9YeFeviwStryCotpmC+dWkKb7dOv8fwJIuKigN6L1sPSjqW71Lmw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=K7CTj6f0; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="K7CTj6f0" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c85825bbc4fso4534089a12.2 for ; Wed, 10 Jun 2026 20:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781149156; x=1781753956; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m7DIsV2yYkeuv0vuZTHMuiTm55rfBmU9E0/9cM1N8Eo=; b=K7CTj6f0AJPub2ft3uOccR38CR4+c74ryDWgFaWzwirVROcm9ENEdeYOMR+2SyVmUD 3Ox6/6DS+MTQKGgWFf1M/KfeUg6qtuNTAMNSU+ajrysxWDRr4R66B+4KJeotxq3P0mgj FupSx1e1a8oRIwuZxPS6uM6qnUgo7W8z9irfhx+6eadV4G++SRyzLW13RjfeZHX/SBwL vTeMJH3SAWm0ARPCo4b361806tIPzPDWs8u9s0hJN/HxRSjYASWItUCp0v4+NCC6q0R5 R8ZYIBw77lgc7Afpg3shueDsky+vQF15qWKLlStUbEyM+CydZ96vZqODWomZTI7rlppy bNgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781149156; x=1781753956; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=m7DIsV2yYkeuv0vuZTHMuiTm55rfBmU9E0/9cM1N8Eo=; b=MhFXcAAYg7AVY6ZK/qCL9KwoUKuT//I6uoOWZfiyNGOgspg+ttNTOZRIHaM/HLUeY0 wyLmK9fNBdbSAvpAALWZSHmeOJdBAxk8BHOdHUKD9p08b6ry8CtbBbMBca1SsPN5av57 2/BVO2taDVoZ+bn/7z3JYqh5z+tL9YCJ/JFUkdI0GXvGNesIopvsL61bfErYi/q3D0wC ghSCJT6XyR8cINNcQi1R5sllR9H0EwtogXm44//yVMGGjgrx+BB9FurHcv8GnM8bpRIH mHQCfTi6Aldi0DIyyQaNxMGT7CQKPtemdrIF2ESMJBC5QhBi0GADrZ4BUaGh44LosxXo fexg== X-Forwarded-Encrypted: i=1; AFNElJ+m8RzyIrb4KgJXVqUsux+uHUBZ3lNeC1PgmsyrnYfoWIj6jhogH09cgQ+SBa6ih70jd4Wr4/1trcFBL6U=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7D8F0tIBlB2VFOoFqfS2N0RwrhEs/arIB+TGePTb+OY3FUjp+ NtCE65b+qOr0jim9MOpwJyXbakQoM+eIB1OIM3zzfUyRwn5fuSDYHlf9 X-Gm-Gg: Acq92OET4bXE8t6S2dl5y4ZxSoC7xn0Ka0f+cP/rqyU6Ww0gTOcEEkA5n1hSnUC70lm ohQVntqouPutYY7r3hj5s7xlv1MVybwaFz8dGhvDvte+uMxLPqoi8i1v//o/M8G++nes3SHEA2i GsP485w6fQWLjDSwd/BG+KCo+1Hk/eRfnDtwLEAOkTIeALkYGGOZsPVMn2gtk4xUu/4EIsu8/xB 0Wq9pt9tm8EPjPkFm2w9wxeUYBU8zT2fUbLWwXGv4j6yvZeLBLoOiM+gsImIikncOyw/cOxhY5X tFqyLsX4VD/RfGLVzo40SYXHW1ErcbuWzOIhgm02fTXz/zRzX9NtDjbTVY6lT5YRm8/zYWL1Be7 ivSd5hNlMnoEqu8lMJzBDxa0kfIvDeVmk8i05FcpPTmW3Xa/6LSPxYoeQFgSeJlrwRz1aG636wF WNN7GAR/RPtI0wSPCALPhruxmi5GaQM5QWXL6FGMw4Kjg3Zd56ztovnB5fYxPhlfg1r5gjuvsi8 7hWRdMbIR7QP6A7958Sjqwa7dtEUG60HMk0BZj3NeG79w== X-Received: by 2002:a05:6a00:1d90:b0:841:58b0:82bb with SMTP id d2e1a72fcca58-843367c711bmr978126b3a.9.1781149156549; Wed, 10 Jun 2026 20:39:16 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84337bb47eesm334548b3a.13.2026.06.10.20.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 20:39:16 -0700 (PDT) From: Rosen Penev To: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , linux-kernel@vger.kernel.org (open list:TTY LAYER AND SERIAL DRIVERS), imx@lists.linux.dev (open list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) Subject: [PATCHv3 2/6] serial: mxs-auart: rework clock handling in mxs_get_clks and probe Date: Wed, 10 Jun 2026 20:38:52 -0700 Message-ID: <20260611033856.6476-3-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260611033856.6476-1-rosenp@gmail.com> References: <20260611033856.6476-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use devm_clk_get_enabled for the AHB clock so its enable/disable lifetime is managed by the driver model. Move the mod clock (clk) prepare_enable out of mxs_get_clks and into probe so that clk_set_rate is called while the clock is still disabled, avoiding CLK_SET_RATE_GATE failures. Clean up the error labels accordingly. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/tty/serial/mxs-auart.c | 47 ++++++++++++---------------------- 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index de97c0f74e7d..aa59a48bfad7 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -1470,34 +1470,22 @@ static int mxs_get_clks(struct mxs_auart_port *s, return PTR_ERR(s->clk); } - s->clk_ahb = devm_clk_get(s->dev, "ahb"); + s->clk_ahb = devm_clk_get_enabled(s->dev, "ahb"); if (IS_ERR(s->clk_ahb)) { dev_err(s->dev, "Failed to get \"ahb\" clk\n"); return PTR_ERR(s->clk_ahb); } - err = clk_prepare_enable(s->clk_ahb); - if (err) { - dev_err(s->dev, "Failed to enable ahb_clk!\n"); - return err; - } - + /* + * Set mod clock rate while it is still disabled so + * CLK_SET_RATE_GATE does not cause clk_set_rate to fail. + * The mod clock will be enabled in mxs_auart_startup() + * and in probe after mxs_get_clks returns. + */ err = clk_set_rate(s->clk, clk_get_rate(s->clk_ahb)); - if (err) { + if (err) dev_err(s->dev, "Failed to set rate!\n"); - goto disable_clk_ahb; - } - err = clk_prepare_enable(s->clk); - if (err) { - dev_err(s->dev, "Failed to enable clk!\n"); - goto disable_clk_ahb; - } - - return 0; - -disable_clk_ahb: - clk_disable_unprepare(s->clk_ahb); return err; } @@ -1604,17 +1592,21 @@ static int mxs_auart_probe(struct platform_device *pdev) if (ret) return ret; + ret = clk_prepare_enable(s->clk); + if (ret) + return ret; + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!r) { ret = -ENXIO; - goto out_disable_clks; + goto out_disable_clk; } s->port.mapbase = r->start; s->port.membase = ioremap(r->start, resource_size(r)); if (!s->port.membase) { ret = -ENOMEM; - goto out_disable_clks; + goto out_disable_clk; } s->port.ops = &mxs_auart_ops; s->port.iotype = UPIO_MEM; @@ -1681,11 +1673,8 @@ static int mxs_auart_probe(struct platform_device *pdev) out_iounmap: iounmap(s->port.membase); -out_disable_clks: - if (is_asm9260_auart(s)) { - clk_disable_unprepare(s->clk); - clk_disable_unprepare(s->clk_ahb); - } +out_disable_clk: + clk_disable_unprepare(s->clk); return ret; } @@ -1697,10 +1686,8 @@ static void mxs_auart_remove(struct platform_device *pdev) auart_port[pdev->id] = NULL; mxs_auart_free_gpio_irq(s); iounmap(s->port.membase); - if (is_asm9260_auart(s)) { + if (is_asm9260_auart(s)) clk_disable_unprepare(s->clk); - clk_disable_unprepare(s->clk_ahb); - } } static struct platform_driver mxs_auart_driver = { -- 2.54.0