LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw21/26: mask unwanted wakeup event by default 

If events are not masked they lead to an immeditate
restart of the PMIC from powerdown().
This commit is contained in:
Rene Straub 2021-03-19 17:32:19 +01:00
parent a39cba028a
commit 3a9ef955c2
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
board/nm/common/da9063.h
View File

@ -31,6 +31,11 @@
#define PMIC_REG_EVENT_B 0x07 #define PMIC_REG_EVENT_B 0x07
#define PMIC_REG_EVENT_COMP1V2_MASK 0x04 #define PMIC_REG_EVENT_COMP1V2_MASK 0x04
#define PMIC_REG_IRQ_MASK_A 0x0A
#define PMIC_REG_IRQ_MASK_B 0x0B
#define PMIC_REG_IRQ_MASK_C 0x0C
#define PMIC_REG_IRQ_MASK_D 0x0D
#define PMIC_REG_CONTROL_A 0x0E /* Control register for power states */ #define PMIC_REG_CONTROL_A 0x0E /* Control register for power states */
#define PMIC_REG_CONTROL_D 0x11 /* Control register for blink/watchdog */ #define PMIC_REG_CONTROL_D 0x11 /* Control register for blink/watchdog */
#define PMIC_REG_GPIO14_15 0x1C /* Configuration of GPIO14/15 (mode, wake) */ #define PMIC_REG_GPIO14_15 0x1C /* Configuration of GPIO14/15 (mode, wake) */

21
board/nm/nmhw21/board.c
View File

@ -452,6 +452,15 @@ static void init_pmic_spl(void)
(void)da9063_set_reg(PMIC_REG_TRIM_CLDR, 0); (void)da9063_set_reg(PMIC_REG_TRIM_CLDR, 0);
} }
/* Mask unwanted IRQs to avoid accidental wakeup */
const uint8_t mask_a = PMIC_REG_EVENT_ONKEY_MASK |
PMIC_REG_EVENT_RTC_ALARM_MASK |
PMIC_REG_EVENT_RTC_TICK_MASK;
(void)da9063_set_reg(PMIC_REG_IRQ_MASK_A, ~(mask_a) & 0x1F);
(void)da9063_set_reg(PMIC_REG_IRQ_MASK_B, ~PMIC_REG_EVENT_COMP1V2_MASK);
(void)da9063_set_reg(PMIC_REG_IRQ_MASK_C, ~0x00);
(void)da9063_set_reg(PMIC_REG_IRQ_MASK_D, ~0x00);
da9063_release_i2c_bus(bus); da9063_release_i2c_bus(bus);
} }
@ -556,7 +565,7 @@ static void check_reset_reason(unsigned int reset_reason_shm_location)
start_reason |= SR_WAKEUP; start_reason |= SR_WAKEUP;
} }
else { else {
printf("unknown reset reason\n"); /* Unknown reset reason */
} }
} }
@ -582,7 +591,7 @@ static void check_reset_reason(unsigned int reset_reason_shm_location)
reset_reason = reset_regs->rr_value; reset_reason = reset_regs->rr_value;
} }
else { else {
puts("Unknown start reason\n"); /* Unknown start reason, assume reboot */
start_reason = SR_REBOOT; start_reason = SR_REBOOT;
reset_reason = reset_regs->rr_value; reset_reason = reset_regs->rr_value;
} }
@ -637,7 +646,7 @@ static void powerdown(void)
bus = da9063_claim_i2c_bus(); bus = da9063_claim_i2c_bus();
/* Final call, will not return */ /* Final call, will not return */
da9063_set_reg(PMIC_REG_CONTROL_A, 0x00); (void)da9063_set_reg(PMIC_REG_CONTROL_A, 0x00);
da9063_release_i2c_bus(bus); da9063_release_i2c_bus(bus);
@ -737,6 +746,9 @@ void am33xx_spl_board_init(void)
/* Switch on ignition gate so we can read state later */ /* Switch on ignition gate so we can read state later */
pmic_ignition_gate_on(); pmic_ignition_gate_on();
/* Setup PMIC */
init_pmic_spl();
/* /*
* If this is a power-on start, see if ignition is active. * If this is a power-on start, see if ignition is active.
* If not, power down as this is considered an unwanted system start. * If not, power down as this is considered an unwanted system start.
@ -745,9 +757,6 @@ void am33xx_spl_board_init(void)
stop_if_ignition_is_off(); stop_if_ignition_is_off();
} }
/* Setup PMIC */
init_pmic_spl();
init_leds(); init_leds();
set_status_led(1, 0); /* Red */ set_status_led(1, 0); /* Red */
set_indicator_led(1, 0); /* Red */ set_indicator_led(1, 0); /* Red */