From 6cc285809d7d5a11bbd9328370c1036bea1add48 Mon Sep 17 00:00:00 2001 From: Marc Mattmueller Date: Wed, 8 Sep 2021 09:29:46 +0200 Subject: [PATCH] hw21: clear register completely instead of masking watchdog timeout With the introduction of the SSF watchdog feature a get and then a set of the PMIC's CONTROL_D register leads to an activation of the watchdog and causes a watchdog reset at the time the kernel is being decompressed. Currently we disable the watchdog from the bootloader and activate it only in user space. BugzID: 74659 Signed-off-by: Marc Mattmueller --- board/nm/nmhw21/board.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/board/nm/nmhw21/board.c b/board/nm/nmhw21/board.c index 49e58af00f..678195e315 100644 --- a/board/nm/nmhw21/board.c +++ b/board/nm/nmhw21/board.c @@ -622,9 +622,7 @@ static void pmic_ignition_gate_on(void) val |= 0xC0; (void)da9063_set_reg(PMIC_REG_CONFIG_L, val); - (void)da9063_get_reg(PMIC_REG_CONTROL_D, &val); /* No blinking, state selected by GPIOxx_MODE */ - val &= ~0xF8; - (void)da9063_set_reg(PMIC_REG_CONTROL_D, val); + (void)da9063_set_reg(PMIC_REG_CONTROL_D, 0x00); /* No blinking, state selected by GPIOxx_MODE */ (void)da9063_get_reg(PMIC_REG_GPIO_MODE8_15, &val); /* Set to GPIO14,15 to high */ val |= 0xC0;