* [PATCH 2/5] ks8695_wdt: explicitly define the SoC timer tick base rate
@ 2010-10-20 4:51 Lennert Buytenhek
2010-10-20 9:11 ` Yegor Yefremov
0 siblings, 1 reply; 3+ messages in thread
From: Lennert Buytenhek @ 2010-10-20 4:51 UTC (permalink / raw)
To: linux-arm-kernel
..instead of including mach/timex.h, as the latter is going away.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
---
drivers/watchdog/ks8695_wdt.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index 2852bb2..0060519 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -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 */
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/5] ks8695_wdt: explicitly define the SoC timer tick base rate
2010-10-20 4:51 [PATCH 2/5] ks8695_wdt: explicitly define the SoC timer tick base rate Lennert Buytenhek
@ 2010-10-20 9:11 ` Yegor Yefremov
2010-10-20 9:26 ` Lennert Buytenhek
0 siblings, 1 reply; 3+ messages in thread
From: Yegor Yefremov @ 2010-10-20 9:11 UTC (permalink / raw)
To: linux-arm-kernel
Am 20.10.2010 06:51, schrieb Lennert Buytenhek:
> ..instead of including mach/timex.h, as the latter is going away.
>
> Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
> ---
> drivers/watchdog/ks8695_wdt.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
> index 2852bb2..0060519 100644
> --- a/drivers/watchdog/ks8695_wdt.c
> +++ b/drivers/watchdog/ks8695_wdt.c
> @@ -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
> #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.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
drivers/watchdog/ks8695_wdt.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Index: b/drivers/watchdog/ks8695_wdt.c
===================================================================
--- a/drivers/watchdog/ks8695_wdt.c 2010-08-27 01:47:12.000000000 +0200
+++ b/drivers/watchdog/ks8695_wdt.c 2010-10-20 10:47:14.000000000 +0200
@@ -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 */
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/5] ks8695_wdt: explicitly define the SoC timer tick base rate
2010-10-20 9:11 ` Yegor Yefremov
@ 2010-10-20 9:26 ` Lennert Buytenhek
0 siblings, 0 replies; 3+ messages in thread
From: Lennert Buytenhek @ 2010-10-20 9:26 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 20, 2010 at 11:11:24AM +0200, Yegor Yefremov wrote:
> > ..instead of including mach/timex.h, as the latter is going away.
> >
> > Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
> > ---
> > drivers/watchdog/ks8695_wdt.c | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
> > index 2852bb2..0060519 100644
> > --- a/drivers/watchdog/ks8695_wdt.c
> > +++ b/drivers/watchdog/ks8695_wdt.c
> > @@ -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
>
> > #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 <yegorslists@googlemail.com>
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.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index 2852bb2..8114719 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ 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 */
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-20 9:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-20 4:51 [PATCH 2/5] ks8695_wdt: explicitly define the SoC timer tick base rate Lennert Buytenhek
2010-10-20 9:11 ` Yegor Yefremov
2010-10-20 9:26 ` Lennert Buytenhek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).