From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 23177CA5FA5 for ; Tue, 29 Sep 2026 14:07:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OvmhxSjVHj+d9pk6ymL8DlmUjvcSTE0G8stIvyswo2I=; b=vyi0M+MgM6ByzshVXxAPST9vG0 06sEygyJ/R2lbfVcdRo4YxH57X00zNuII+BODiCg4f1KACSvOAt56u5BryTaQ6nfXFPhXSU0qrM5a 1n4ecCmA6VuH05FL4TFyWaoDzEvHAxOwPYXugxc3tkXgmcTdFgomL3zHWDA7zDVP7G8dVT1Hg0ZdP 3NOZrqjdfbuEDyGF4hQoTLPzAHFfRjYziTF+O7zX9HILlJ8Fi8XD22Nu8U7Qk8Loc/WcP+odSmO3D 0Ew+IGHwTZBVYqfZiZqG4MTxKGU7TIsga4qPkkb5aTCyUfD71iuZaVsBCUzTLj1OQB+SnlPJFP+y/ k9gq059A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xBYUJ-00000003kP8-2180; Tue, 29 Sep 2026 14:07:19 +0000 Received: from mail-pz2-x10.google.com ([2607:f8b0:4864:3b::10]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xBYUE-00000003kNH-3rXM for linux-arm-kernel@lists.infradead.org; Tue, 29 Sep 2026 14:07:16 +0000 Received: by mail-pz2-x10.google.com with SMTP id 41be03b00d2f7-cc4c08393b0so1817932a12.0 for ; Tue, 29 Sep 2026 07:07:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790690834; x=1791295634; darn=lists.infradead.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:content-type; bh=OvmhxSjVHj+d9pk6ymL8DlmUjvcSTE0G8stIvyswo2I=; b=S+Yuv7eSTteqT7xWZJrk72xhebZxXQ0HaotjemlgtODoj+Ab23ExR3dRmVnQeMuevU cnHAKWRqiBCbfF17mSx5hQWrrhgb8eeZ6aFRRabqk0Ja25MnmONOS75bMR6q6RVb7Ijt bVGYbVENvARilrpSJF271SyfIO/iuTsIo593FCL4Ft6TdMOdUKlTv2CDivNjD3S6ZAhp /SiR7GL92AEKBWN67l513PXuAgCu5JxtM7HDPfvU3q+FFDrcrdHL4hCDrz4h3yV74eqB 4Ik3Q5HgQy5Rf274RwR+jS0Kxm4r9lQlYXNmkiW5SY5AiJNQzVjIBAj5Bd1qw6rhTKAe Sjvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790690834; x=1791295634; 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:content-type; bh=OvmhxSjVHj+d9pk6ymL8DlmUjvcSTE0G8stIvyswo2I=; b=OuT/vnqJ5ktGbOKxlu8PghF5f1vVmvlKWIQiN8HygalJfY/8FsMlPeRZuZxgy7dQzU Q514R9mmN2GN05uYJQHz1lXED615JZ/fr+V12nT1q5U7fTORJFlPF0eqIqRzSQ4R1CSh fc4d1Vx3SPYXd4cMOaCeN0J39N92lNlIoXgq5g/j/S60iTVQOYyn0gh3YNfx0kaFzmu7 4cFfAZ3+uG09gf4Qtbkif7f9wQQVkPAhHNi5Fckkm7W5X9cElQ/5z82fCvMy9QCacsUq 5W0wp95UVkf+1neV5ftw3TdmTXfL1bXBPWf81rQVx0iZ4S8RDmnoJDzejPTxFnnQLG80 44Cg== X-Forwarded-Encrypted: i=1; AKwUvBzRck+PAcKBeUITBEqszUUj4Nly4j8nGURlhWfRnBAR++WpJJHDH+1nKCZOnH/pQM8gTchKahODm3Z45WenesJ0@lists.infradead.org X-Gm-Message-State: AFq9FYJMiXAOhdLRBnaFnDqASx9Kvc309lvGxjWPwHg1jc+suJ9NYtgj 2Ehb4IlftjA50Iw1ew9+MpWyd7DshBjlWvwY0iEL/etrMFNTyFOqmq7s X-Gm-Gg: AYBFou3ZZ0UGQR5tWpVLZOla2Lms+6E4i3hSvid2zcQ1HtbVjO4j/O6mcx7M/hzHA+F 9EHazAawHJtF4W3cHqwerZBNESbI74WkOYiAHT2yJjVO5OhR+dDYAUA1Ak2MLDFiv1XUDIGtVQu Q5xDatKkI0G68gCre5hN4W74sUKJs0zHeAXDFYur9ME+y0ML3APrfTNnMFGKSZ2fi/0i6w6vSa2 OAUftk2yM+/Gmp8maavyKGvj2Kkk0AvHN2S8rsQkul1XritGt4ytYjVJdqwH/xadwEuHQpqcYoY OXHcuxaCOJTegedaCU6nPoXupoEh4tlRy4YtyOLEfgKo9hChYcU7s3CMGO06AaBd17MZoEFMChZ lfvnRZbaDPuN35EZlrtrDmQQuX6clp1OLVC+suK+NjiX/2PVEaFpS9jC5NmNsCzU15y2Er+C1Gp mrOJNn3W78481+ZkiVsVUXsMYufVgSjOJlJZu6HFM6xe8hJPPQ3m3yTKdl2h4Tu20ghrpI1Jeyx /kKbFa/vRE= X-Received: by 2002:a17:90b:1a84:b0:39e:6c69:34d3 with SMTP id 98e67ed59e1d1-3a098e8814emr14918272a91.55.1790690833528; Tue, 29 Sep 2026 07:07:13 -0700 (PDT) Received: from Aaron-M6 ([188.253.120.162]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cc7b0f4ab05sm3526989a12.29.2026.09.29.07.07.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2026 07:07:12 -0700 (PDT) From: Yaozhong Li To: Lee Jones Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Chris Zhong , Zhang Qing , mfd@lists.linux.dev, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Yaozhong Li Subject: [RFC PATCH v3 2/3] mfd: rk8xx: Release the power hold GPIOs before powering off Date: Tue, 29 Sep 2026 22:06:47 +0800 Message-ID: <20260929140649.55-3-yaozhonguwl@gmail.com> X-Mailer: git-send-email 2.55.0.windows.3 In-Reply-To: <20260929140649.55-1-yaozhonguwl@gmail.com> References: <20260929140649.55-1-yaozhonguwl@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260929_070714_972328_61D32A1E X-CRM114-Status: GOOD ( 22.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org rk808_power_off() writes the PMIC's shutdown bit directly. On boards where lines driven by the SoC gate the PMIC's power-off path, a shutdown performed this way does not stick: the rails drop and immediately come back up, so the board restarts instead of staying off. U-Boot reports the result as a power-on reset. Take those lines as an optional GPIO array, hold them asserted while the system runs and release them - waiting power-hold-delay-ms - before writing the shutdown bit. Device trees without the property retain the existing behaviour. The array is claimed before any child device is registered, so that a -EPROBE_DEFER from the GPIO provider does not tear down the regulators, RTC and clocks that devm_mfd_add_devices() has already registered. On a Firefly-RK3399 the shutdown stuck when such a line went from high to low before the shutdown bit was written, and did not when the line was never driven. Assisted-by: LLM Signed-off-by: Yaozhong Li --- drivers/mfd/rk8xx-core.c | 49 +++++++++++++++++++++++++++++++++++++-- include/linux/mfd/rk808.h | 3 +++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c index 3dcf6ab..137ab20 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c @@ -11,6 +11,8 @@ */ #include +#include +#include #include #include #include @@ -703,6 +705,22 @@ static int rk808_power_off(struct sys_off_data *data) default: return NOTIFY_DONE; } + + /* + * Some boards route "power hold" lines from the SoC into the board's + * power circuitry. They have to be held asserted while the system is + * running and released before the PMIC shutdown request is written, + * otherwise the rails can drop and come back up instead of staying + * off. Releasing them here rather than from a separate handler keeps + * the ordering against the I2C write explicit. + */ + if (rk808->power_hold_gpios) { + for (unsigned int line = 0; line < rk808->power_hold_gpios->ndescs; line++) + gpiod_set_value_cansleep(rk808->power_hold_gpios->desc[line], 0); + + msleep(rk808->power_hold_delay_ms); + } + ret = regmap_update_bits(rk808->regmap, reg, bit, bit); if (ret) dev_err(rk808->dev, "Failed to shutdown device!\n"); @@ -766,6 +784,7 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap struct rk808 *rk808; const struct rk808_reg_data *pre_init_reg; const struct mfd_cell *cells; + bool system_power_controller; int dual_support = 0; int nr_pre_init_regs; u32 rst_fun = 0; @@ -851,6 +870,33 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap if (!irq) return dev_err_probe(dev, -EINVAL, "No interrupt support, no core IRQ\n"); + system_power_controller = + device_property_read_bool(dev, "system-power-controller") || + device_property_read_bool(dev, "rockchip,system-power-controller"); + + /* + * Claim the optional power hold GPIOs before any child device is + * registered. A -EPROBE_DEFER from the GPIO provider at this point + * costs nothing, whereas deferring after devm_mfd_add_devices() + * would tear the freshly registered children down again on every + * retry. + */ + if (system_power_controller) { + rk808->power_hold_gpios = devm_gpiod_get_array_optional(dev, "power-hold", + GPIOD_OUT_HIGH); + if (IS_ERR(rk808->power_hold_gpios)) + return dev_err_probe(dev, PTR_ERR(rk808->power_hold_gpios), + "Failed to get power hold GPIOs\n"); + + /* + * The settle time is optional. rk808 is zero initialised and + * the binding documents 0 as the default, so an absent property + * means the shutdown request follows the release with no wait. + */ + device_property_read_u32(dev, "power-hold-delay-ms", + &rk808->power_hold_delay_ms); + } + ret = devm_regmap_add_irq_chip(dev, rk808->regmap, irq, IRQF_ONESHOT | dual_support, -1, rk808->regmap_irq_chip, &rk808->irq_data); @@ -872,8 +918,7 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap if (ret) return dev_err_probe(dev, ret, "failed to add MFD devices\n"); - if (device_property_read_bool(dev, "system-power-controller") || - device_property_read_bool(dev, "rockchip,system-power-controller")) { + if (system_power_controller) { ret = devm_register_sys_off_handler(dev, SYS_OFF_MODE_POWER_OFF_PREPARE, SYS_OFF_PRIO_HIGH, &rk808_power_off, rk808); diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h index 7ffc904..e56d595 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -15,6 +15,7 @@ #ifndef __LINUX_REGULATOR_RK808_H #define __LINUX_REGULATOR_RK808_H +#include #include #include @@ -1466,6 +1467,8 @@ struct rk808 { long variant; const struct regmap_config *regmap_cfg; const struct regmap_irq_chip *regmap_irq_chip; + struct gpio_descs *power_hold_gpios; + u32 power_hold_delay_ms; }; void rk8xx_shutdown(struct device *dev); -- 2.55.0.windows.3