X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/18a076fccdba90cd7bea1dd4cff1b6b0559b75f0..505d82b643b326b3a63484cdce6fc07e7aa28277:/target/linux/lantiq/patches/250-watchdog.patch

diff --git a/target/linux/lantiq/patches/250-watchdog.patch b/target/linux/lantiq/patches/250-watchdog.patch
index f86ff7186..96875db2d 100644
--- a/target/linux/lantiq/patches/250-watchdog.patch
+++ b/target/linux/lantiq/patches/250-watchdog.patch
@@ -1,8 +1,8 @@
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -840,6 +840,12 @@ config TXX9_WDT
- 	help
- 	  Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
+@@ -930,6 +930,12 @@
+ 	  To compile this driver as a loadable module, choose M here.
+ 	  The module will be called bcm63xx_wdt.
  
 +config LANTIQ_WDT
 +	bool "Lantiq SoC watchdog"
@@ -15,10 +15,10 @@
  # POWERPC Architecture
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile
-@@ -112,6 +112,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
+@@ -119,6 +119,7 @@
  obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
+ obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
+ octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
 +obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o
  
  # PARISC Architecture
@@ -49,8 +49,8 @@
 +#define LQ_WDT_PW1			0x00BE0000
 +#define LQ_WDT_PW2			0x00DC0000
 +
-+#define LQ_BIU_WDT_CR		0x3F0
-+#define LQ_BIU_WDT_SR		0x3F8
++#define LQ_BIU_WDT_CR		0x0
++#define LQ_BIU_WDT_SR		0x8
 +
 +#ifndef CONFIG_WATCHDOG_NOWAYOUT
 +static int wdt_ok_to_close;
@@ -117,7 +117,7 @@
 +};
 +
 +static int
-+lq_wdt_ioctl(struct inode *inode, struct file *file,
++lq_wdt_ioctl(struct file *file,
 +		unsigned int cmd, unsigned long arg)
 +{
 +	int ret = -ENOTTY;
@@ -167,7 +167,7 @@
 +static const struct file_operations lq_wdt_fops = {
 +	.owner		= THIS_MODULE,
 +	.write		= lq_wdt_write,
-+	.ioctl		= lq_wdt_ioctl,
++	.unlocked_ioctl	= lq_wdt_ioctl,
 +	.open		= lq_wdt_open,
 +	.release	= lq_wdt_release,
 +};