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

Commit dd36d739 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog fixes from Wim Van Sebroeck:
 "This fixes:

   - module autoload for 3 OF platform drivers
   - poweroff behaviour on bcm2835 watchdog device
   - I2C dependencies for iTCO_wdt.c"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: iTCO: Fix dependencies on I2C
  watchdog: bcm2835: Fix poweroff behaviour
  watchdog: Fix module autoload for OF platform driver
parents d4e842be 3cef072d

drivers/watchdog/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -817,8 +817,9 @@ config ITCO_WDT 
	tristate "Intel TCO Timer/Watchdog"

	depends on (X86 || IA64) && PCI

	select WATCHDOG_CORE

	depends on I2C || I2C=n

	select LPC_ICH if !EXPERT

	select I2C_I801 if !EXPERT

	select I2C_I801 if !EXPERT && I2C

	---help---

	  Hardware driver for the intel TCO timer based watchdog devices.

	  These drivers are included in the Intel 82801 I/O Controller

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 */

drivers/watchdog/gef_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ static const struct of_device_id gef_wdt_ids[] = { 
	},

	{},

};

MODULE_DEVICE_TABLE(of, gef_wdt_ids);



static struct platform_driver gef_wdt_driver = {

	.driver = {

drivers/watchdog/mena21_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ static const struct of_device_id a21_wdt_ids[] = { 
	{ .compatible = "men,a021-wdt" },

	{ },

};

MODULE_DEVICE_TABLE(of, a21_wdt_ids);



static struct platform_driver a21_wdt_driver = {

	.probe = a21_wdt_probe,

drivers/watchdog/moxart_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ static const struct of_device_id moxart_watchdog_match[] = { 
	{ .compatible = "moxa,moxart-watchdog" },

	{ },

};

MODULE_DEVICE_TABLE(of, moxart_watchdog_match);



static struct platform_driver moxart_wdt_driver = {

	.probe      = moxart_wdt_probe,