From patchwork Mon Jun 10 14:59:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1945924 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=fbJn2kgY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VyZjX6wgvz20Py for ; Tue, 11 Jun 2024 01:00:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DA2FD885DD; Mon, 10 Jun 2024 16:59:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="fbJn2kgY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 16405885DD; Mon, 10 Jun 2024 16:59:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F3CFA885AD for ; Mon, 10 Jun 2024 16:59:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-3758fdbd2daso10163095ab.3 for ; Mon, 10 Jun 2024 07:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1718031581; x=1718636381; darn=lists.denx.de; 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=bJXFsCW6LCl1bXkmZ8sKbXEiUPqgjCbPoT+lGmHDHLY=; b=fbJn2kgYTAoqb9MBoJy31yt3F1auJaWpVXmiE+0WxzsXDxCt16v3E6k1+i9Yp4ajhp vu/kfXcSiMo/L32mipsSOZAG/+u/t17KDYhp9NPUCaLnFrp6F5aAICn5fOyKUv/XIOMF I28kcFf53yhe3OwAzL0pf9YYP4ebNfcO0k4Go= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718031581; x=1718636381; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bJXFsCW6LCl1bXkmZ8sKbXEiUPqgjCbPoT+lGmHDHLY=; b=HNMaxBBxpE1DTyyF4Jn66ugJFiBrgH9LmU+7SmjVarhEzwwIDGCE32Re4+pd5vkCHS WUKrtVlMeEfxOT7pq/9VLtYq8AM65QvnWL85vGMgqjENDSGshP6rE/e+YJo+jfXnCz8m Omb4Aut8fhsiCrvH74rzHt1/CyhP3PvFY2GISvJRZ1kuvKz7q4X9CopUy3Nl4Ht/VpAk 06NujGfzzAyrIhN7c/KsSoJAaElJC/gbFT7IaKn5ngfZadrnj/0ycXfCHvrIcR5EjFZz TErp9y/VsZzqsp05U7ZQFy/lg3DClD7hbYdJlC55kZy01fbsEvtbDbU3opYrV7nTtavl 24yw== X-Gm-Message-State: AOJu0Yz7pODd1xOeupsSmcnZyWqKzaJbvloP1wm73lPyDRCk8LgDzx0a w0Ib+G14ukCRHdA/jxHX06z8pFPmv5u7cNkiHHSj0J6K9kK/8ftyb+rk3YAWT0WQih5hfwNQfX4 sLQ== X-Google-Smtp-Source: AGHT+IGUsgoY+z28GkxfRfoezDXJ0ZLbqdsxdYK0VwmZjT62XqJ+QbeQg/WdAswW2NuHD085S8JAWQ== X-Received: by 2002:a92:c54e:0:b0:375:92ed:254a with SMTP id e9e14a558f8ab-37592ed4917mr71237755ab.18.1718031580656; Mon, 10 Jun 2024 07:59:40 -0700 (PDT) Received: from chromium.org (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-375ac6104dasm2526885ab.4.2024.06.10.07.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jun 2024 07:59:40 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jonas Karlman , Quentin Schulz , Eugen Hristev , Jaehoon Chung , Kever Yang , Lukasz Majewski , Patrice Chotard Subject: [PATCH v2 4/9] power: regulator: Handle autoset in regulators_enable_boot_on() Date: Mon, 10 Jun 2024 08:59:15 -0600 Message-Id: <20240610145920.3302001-5-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240610145920.3302001-1-sjg@chromium.org> References: <20240610145920.3302001-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean With a recent change, regulators_enable_boot_on() returns an error if a regulator is already set. Check for and handle this situation. Fixes: d99fb64a98a power: regulator: Only run autoset once for each regulator Reviewed-by: Jonas Karlman Reviewed-by: Quentin Schulz Signed-off-by: Simon Glass --- (no changes since v1) drivers/power/regulator/regulator-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 77d101f262e..d9e1fb68295 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -518,7 +518,7 @@ int regulators_enable_boot_on(bool verbose) dev; uclass_next_device(&dev)) { ret = regulator_autoset(dev); - if (ret == -EMEDIUMTYPE) { + if (ret == -EMEDIUMTYPE || ret == -EALREADY) { ret = 0; continue; }