Skip to contentSkip to conversation

ks8695_wdt: explicitly define the SoC timer tick base rate

PATCH New Lennert Buytenhek 2 participants 3 messages Oct 20, 2010 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

PATCH 2/5 ks8695_wdt: explicitly define the SoC timer tick base rate

..instead of including mach/timex.h, as the latter is going away.

---
 drivers/watchdog/ks8695_wdt.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/watchdog/ks8695_wdt.c +2 -1
index 2852bb2..0060519 100644
@@ -21,9 +21,10 @@
 #include <linux/watchdog.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <mach/timex.h>
 #include <mach/regs-timer.h>
 
+#define KS8695_CLOCK_RATE	25000000
+
 #define WDT_DEFAULT_TIME	5	/* seconds */
 #define WDT_MAX_TIME		171	/* seconds */
 
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 2/5 ks8695_wdt: explicitly define the SoC timer tick base rate

Am 20.10.2010 06:51, schrieb Lennert Buytenhek:

Quoted 12 lines

..instead of including mach/timex.h, as the latter is going away.

---
 drivers/watchdog/ks8695_wdt.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/watchdog/ks8695_wdt.c +0 -0
index 2852bb2..0060519 100644

drivers/watchdog/ks8695_wdt.c line 27

Quoted 8 lines
drivers/watchdog/ks8695_wdt.c +2 -1
@@ -21,9 +21,10 @@
 #include <linux/watchdog.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <mach/timex.h>
 #include <mach/regs-timer.h>
 
+#define KS8695_CLOCK_RATE	25000000
+

In this way KS8695_CLOCK_RATE will be defined twice: here and in /arch/arm/mach-ks8695/include/mach/hardware.h

drivers/watchdog/ks8695_wdt.c line 29

Quoted 2 lines
drivers/watchdog/ks8695_wdt.c +0 -0
 #define WDT_DEFAULT_TIME	5	/* seconds */
 #define WDT_MAX_TIME		171	/* seconds */

I tried without redefining the macro and it compiles without errors.

Regards,
Yegor

..instead of including mach/timex.h, as the latter is going away.

---
 drivers/watchdog/ks8695_wdt.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/watchdog/ks8695_wdt.c +1 -1
Index: b/drivers/watchdog/ks8695_wdt.c
===================================================================
@@ -21,7 +21,7 @@
 #include <linux/watchdog.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <mach/timex.h>
+#include <mach/hardware.h>
 #include <mach/regs-timer.h>
 
 #define WDT_DEFAULT_TIME	5	/* seconds */
#2 lore raw

PATCH 2/5 ks8695_wdt: explicitly define the SoC timer tick base rate

Quoted 23 lines · Yegor Yefremov
Quoted 12 lines

..instead of including mach/timex.h, as the latter is going away.

---
 drivers/watchdog/ks8695_wdt.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/watchdog/ks8695_wdt.c +0 -0
index 2852bb2..0060519 100644

drivers/watchdog/ks8695_wdt.c line 27

Quoted 8 lines
drivers/watchdog/ks8695_wdt.c +2 -1
@@ -21,9 +21,10 @@
 #include <linux/watchdog.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <mach/timex.h>
 #include <mach/regs-timer.h>
 
+#define KS8695_CLOCK_RATE	25000000
+

In this way KS8695_CLOCK_RATE will be defined twice: here and in /arch/arm/mach-ks8695/include/mach/hardware.h

Quoted 4 lines

drivers/watchdog/ks8695_wdt.c line 29

Quoted 2 lines
drivers/watchdog/ks8695_wdt.c +0 -0
 #define WDT_DEFAULT_TIME	5	/* seconds */
 #define WDT_MAX_TIME		171	/* seconds */

I tried without redefining the macro and it compiles without errors.

Alright, I've replaced this patch by the one below.

Thanks!

From: Yegor Yefremov <[email protected]>

ks8695_wdt: include mach/hardware.h instead of mach/timex.h

ks8695_wdt needs KS8695_CLOCK_RATE, which is defined in mach/hardware.h, which is pulled in by the include of mach/timex.h, but the latter is going away, so just include mach/hardware.h directly.

drivers/watchdog/ks8695_wdt.c +1 -1
index 2852bb2..8114719 100644
@@ -21,7 +21,7 @@
 #include <linux/watchdog.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
-#include <mach/timex.h>
+#include <mach/hardware.h>
 #include <mach/regs-timer.h>
 
 #define WDT_DEFAULT_TIME       5       /* seconds */