Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 898e6861 authored by Noralf Trønnes's avatar Noralf Trønnes Committed by Wim Van Sebroeck
Browse files

watchdog: bcm2835: Fix poweroff behaviour 



Currently poweroff/halt results in a reboot on the Raspberry Pi.
The firmware uses the RSTS register to know which partiton to
boot from. The partiton value is spread into bits
0, 2, 4, 6, 8, 10. Partiton 63 is a special partition used by
the firmware to indicate halt.

The firmware made this change in 19 Aug 2013 and was matched
by the downstream commit:
Changes for new NOOBS multi partition booting from gsh

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Tested-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent c73318f4

drivers/watchdog/bcm2835_wdt.c

+8 −2
Original line number Diff line number Diff line
@@ -36,6 +36,13 @@ 
#define PM_RSTC_WRCFG_FULL_RESET	0x00000020

#define PM_RSTC_RESET			0x00000102



/*

 * The Raspberry Pi firmware uses the RSTS register to know which partiton

 * to boot from. The partiton value is spread into bits 0, 2, 4, 6, 8, 10.

 * Partiton 63 is a special partition used by the firmware to indicate halt.

 */

#define PM_RSTS_RASPBERRYPI_HALT	0x555



#define SECS_TO_WDOG_TICKS(x) ((x) << 16)

#define WDOG_TICKS_TO_SECS(x) ((x) >> 16)
@@ -151,8 +158,7 @@ static void bcm2835_power_off(void) 
	 * hard reset.

	 */

	val = readl_relaxed(wdt->base + PM_RSTS);

	val &= PM_RSTC_WRCFG_CLR;

	val |= PM_PASSWORD | PM_RSTS_HADWRH_SET;

	val |= PM_PASSWORD | PM_RSTS_RASPBERRYPI_HALT;

	writel_relaxed(val, wdt->base + PM_RSTS);



	/* Continue with normal reset mechanism */