From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 13 Mar 2025 10:22:02 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tselP-00DVdH-1V for lore@lore.pengutronix.de; Thu, 13 Mar 2025 10:22:02 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tselO-0007Bi-96 for lore@pengutronix.de; Thu, 13 Mar 2025 10:22:02 +0100 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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=L8E8L5JgNPu1moliOaNA++EOxpTSzvXnz3smwppLC8Q=; b=oHTlVK3KkgpVisMWM8StDj55JP 8bkpihPmtYSJL4Voo9BM72s3NG00bS6EPnYe5RxAzPuHISB6wKAqZhhnA9H/U7HaMgApZ2ltYR+Ku uDJLrzAtRDbFyxOXusKDrgVLYbDJ+vEsP4uQVVoeT9E5IvfTCtl2fEHhhsMTtft8Juu5miOjn2po8 K0NMtV1C9/MVDI00wEqOMzoU9ImZydYtT0mS981OEuEvXVUMYGna2h2YoAkdmoiRr/d5YQgkSKJsn zX111c8HU6kPnPly16z9sLhemOPeChzXFmHJhlXar/VxFBPT8YGMpw4ESMrJlhtP+oz6BOEC6wWDC ehjHaVMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsekv-0000000AiQT-47xl; Thu, 13 Mar 2025 09:21:33 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tseks-0000000AiOm-0jrw for barebox@lists.infradead.org; Thu, 13 Mar 2025 09:21:32 +0000 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tsekp-00070K-Jf; Thu, 13 Mar 2025 10:21:27 +0100 From: Jonas Rebmann Date: Thu, 13 Mar 2025 10:21:18 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250313-pca9450-wdog-v2-1-28e97e7da480@pengutronix.de> References: <20250313-pca9450-wdog-v2-0-28e97e7da480@pengutronix.de> In-Reply-To: <20250313-pca9450-wdog-v2-0-28e97e7da480@pengutronix.de> To: Sascha Hauer , BAREBOX Cc: Jonas Rebmann X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2336; i=jre@pengutronix.de; h=from:subject:message-id; bh=LT5t0gwk0vuyN6uQOffFQQKals1G+pQUdFe/q2GP0zI=; b=owGbwMvMwCF2ZcYT3onnbjcwnlZLYki/tHjajvxmS/4JV5feSuzqDOg9nbBypoW7t/iZf/nM7 zNKZovEd5SyMIhxMMiKKbLEqskpCBn7XzertIuFmcPKBDKEgYtTACaSzMrI8IrjWFXF/flqTt3K G/6uaQ084vxsMucM30v/MhabXOL+Y8TIsOH9ii7zfWkLmnreOFn8KVr9uNX+y+/tTWn5l7at5+5 UZwEA X-Developer-Key: i=jre@pengutronix.de; a=openpgp; fpr=0B7B750D5D3CD21B3B130DE8B61515E135CD49B5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250313_022130_219389_51D906F9 X-CRM114-Status: GOOD ( 11.10 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.3 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 1/2] mfd: pca9450: configure pmic reset behavior X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Currently, boards using the pca9450 pmic driver initialize the RESET_CTRL register either in lowlevel.c or board.c explicitly to 0xA1 to enable the watchdog for Cold Reset with all voltage regulators recycled except LDO1/ LDO2 in addition to the default configuration of 0x11 where the WDOG_B watchdog input is disabled. Instead, enable the watchdog in the driver for Cold Reset with all voltage regulators recycled except LDO1/ LDO2. When nxp,wdog_b-warm-reset is set, the watchdog is instead enabled for Warm Reset. This is identical to U-Boot's behaviour since commit 910c7a881f5 ("pmic: pca9450: Make warm reset on WDOG_B assertion") and Linux's since commit 2364a64d0673f ("regulator: pca9450: Make warm reset on WDOG_B assertion"). Signed-off-by: Jonas Rebmann --- drivers/mfd/pca9450.c | 10 ++++++++++ include/mfd/pca9450.h | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/drivers/mfd/pca9450.c b/drivers/mfd/pca9450.c index 2511e662c3dfb5dfedbc461357ffa82d1812166f..5d5d3d8e017232a45676efad390a503500dd2156 100644 --- a/drivers/mfd/pca9450.c +++ b/drivers/mfd/pca9450.c @@ -103,6 +103,16 @@ static int __init pca9450_probe(struct device *dev) /* Chip ID defined in bits [7:4] */ dev_info(dev, "PMIC Chip ID: 0x%x\n", (reg >> 4)); + /* Enable WDOG_B, for cold reset by default */ + if (of_property_read_bool(dev->of_node, "nxp,wdog_b-warm-reset")) + regmap_update_bits(regmap, PCA9450_RESET_CTRL, + PCA9450_PMIC_RESET_WDOG_B_CFG_MASK, + PCA9450_PMIC_RESET_WDOG_B_CFG_WARM); + else + regmap_update_bits(regmap, PCA9450_RESET_CTRL, + PCA9450_PMIC_RESET_WDOG_B_CFG_MASK, + PCA9450_PMIC_RESET_WDOG_B_CFG_COLD_LDO12); + if (pca9450_init_callback) pca9450_init_callback(regmap); pca9450_map = regmap; diff --git a/include/mfd/pca9450.h b/include/mfd/pca9450.h index 7071c3a9da6c5adc26dbd6149fec5fa96f3365bf..af10e409855ff6c3585c7f63098a16e8ec33dee2 100644 --- a/include/mfd/pca9450.h +++ b/include/mfd/pca9450.h @@ -66,4 +66,8 @@ static inline int pca9450_register_init_callback(void(*callback)(struct regmap * } #endif +#define PCA9450_PMIC_RESET_WDOG_B_CFG_MASK 0xc0 +#define PCA9450_PMIC_RESET_WDOG_B_CFG_WARM 0x40 +#define PCA9450_PMIC_RESET_WDOG_B_CFG_COLD_LDO12 0x80 + #endif -- 2.39.5