[PATCH 1/4] ARM: ks-8695: merge the timer header into the timer driver
Subsystems:
arm port , the rest
5079d
5 messages,
4 authors,
2012-09-08 · open the first message on its own page
This <mach/regs-timer.h> is broadcasted in the entire kernel for
no good reason, since it's only used by the timer driver. Merge
it into the driver.
Signed-off-by: Linus Walleij <redacted>
---
arch/arm/mach-ks8695/include/mach/regs-timer.h | 40 ------------------------
arch/arm/mach-ks8695/time.c | 21 ++++++++++++-
2 files changed, 20 insertions(+), 41 deletions(-)
delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-timer.h
diff --git a/arch/arm/mach-ks8695/include/mach/regs-timer.h b/arch/arm/mach-ks8695/include/mach/regs-timer.h
deleted file mode 100644
index e620cda..0000000
--- a/arch/arm/mach-ks8695/include/mach/regs-timer.h
+++ /dev/null @@ -1,40 +0,0 @@
- /*- * arch/arm/mach-ks8695/include/mach/regs-timer.h- *- * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>- * Copyright (C) 2006 Simtec Electronics- *- * KS8695 - Timer registers and bit definitions.- *- * This file is licensed under the terms of the GNU General Public- * License version 2. This program is licensed "as is" without any- * warranty of any kind, whether express or implied.- */- - #ifndef KS8695_TIMER_H- #define KS8695_TIMER_H- - #define KS8695_TMR_OFFSET (0xF0000 + 0xE400)- #define KS8695_TMR_VA (KS8695_IO_VA + KS8695_TMR_OFFSET)- #define KS8695_TMR_PA (KS8695_IO_PA + KS8695_TMR_OFFSET)- - - /*- * Timer registers- */- #define KS8695_TMCON (0x00) /* Timer Control Register */- #define KS8695_T1TC (0x04) /* Timer 1 Timeout Count Register */- #define KS8695_T0TC (0x08) /* Timer 0 Timeout Count Register */- #define KS8695_T1PD (0x0C) /* Timer 1 Pulse Count Register */- #define KS8695_T0PD (0x10) /* Timer 0 Pulse Count Register */- - - /* Timer Control Register */- #define TMCON_T1EN (1 << 1) /* Timer 1 Enable */- #define TMCON_T0EN (1 << 0) /* Timer 0 Enable */- - /* Timer0 Timeout Counter Register */- #define T0TC_WATCHDOG (0xff) /* Enable watchdog mode */- - - #endifdiff --git a/arch/arm/mach-ks8695/time.c b/arch/arm/mach-ks8695/time.c
index ec783a3..6427b7c 100644
--- a/arch/arm/mach-ks8695/time.c
+++ b/arch/arm/mach-ks8695/time.c @@ -29,11 +29,30 @@
#include <asm/mach/time.h>
#include <asm/system_misc.h>
- #include <mach/regs-timer.h> #include <mach/regs-irq.h>
#include "generic.h"
+ #define KS8695_TMR_OFFSET (0xF0000 + 0xE400) + #define KS8695_TMR_VA (KS8695_IO_VA + KS8695_TMR_OFFSET) + #define KS8695_TMR_PA (KS8695_IO_PA + KS8695_TMR_OFFSET) + + /* + * Timer registers + */ + #define KS8695_TMCON (0x00) /* Timer Control Register */ + #define KS8695_T1TC (0x04) /* Timer 1 Timeout Count Register */ + #define KS8695_T0TC (0x08) /* Timer 0 Timeout Count Register */ + #define KS8695_T1PD (0x0C) /* Timer 1 Pulse Count Register */ + #define KS8695_T0PD (0x10) /* Timer 0 Pulse Count Register */ + + /* Timer Control Register */ + #define TMCON_T1EN (1 << 1) /* Timer 1 Enable */ + #define TMCON_T0EN (1 << 0) /* Timer 0 Enable */ + + /* Timer0 Timeout Counter Register */ + #define T0TC_WATCHDOG (0xff) /* Enable watchdog mode */ + /*
* Returns number of ms since last clock interrupt . Note that interrupts
* will have been disabled by do_gettimeoffset () --
1.7.7.6
On 08/30/2012 04:26 AM, Linus Walleij wrote: This <mach/regs-timer.h> is broadcasted in the entire kernel for
no good reason, since it's only used by the timer driver. Merge
it into the driver.
Signed-off-by: Linus Walleij <redacted>
Tested-by: Greg Ungerer <redacted>
quoted hunk ---
arch/arm/mach-ks8695/include/mach/regs-timer.h | 40 ------------------------
arch/arm/mach-ks8695/time.c | 21 ++++++++++++-
2 files changed, 20 insertions(+), 41 deletions(-)
delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-timer.h
diff --git a/arch/arm/mach-ks8695/include/mach/regs-timer.h b/arch/arm/mach-ks8695/include/mach/regs-timer.h
deleted file mode 100644
index e620cda..0000000
--- a/arch/arm/mach-ks8695/include/mach/regs-timer.h
+++ /dev/null @@ -1,40 +0,0 @@
- /*- * arch/arm/mach-ks8695/include/mach/regs-timer.h- *- * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>- * Copyright (C) 2006 Simtec Electronics- *- * KS8695 - Timer registers and bit definitions.- *- * This file is licensed under the terms of the GNU General Public- * License version 2. This program is licensed "as is" without any- * warranty of any kind, whether express or implied.- */- - #ifndef KS8695_TIMER_H- #define KS8695_TIMER_H- - #define KS8695_TMR_OFFSET (0xF0000 + 0xE400)- #define KS8695_TMR_VA (KS8695_IO_VA + KS8695_TMR_OFFSET)- #define KS8695_TMR_PA (KS8695_IO_PA + KS8695_TMR_OFFSET)- - - /*- * Timer registers- */- #define KS8695_TMCON (0x00) /* Timer Control Register */- #define KS8695_T1TC (0x04) /* Timer 1 Timeout Count Register */- #define KS8695_T0TC (0x08) /* Timer 0 Timeout Count Register */- #define KS8695_T1PD (0x0C) /* Timer 1 Pulse Count Register */- #define KS8695_T0PD (0x10) /* Timer 0 Pulse Count Register */- - - /* Timer Control Register */- #define TMCON_T1EN (1 << 1) /* Timer 1 Enable */- #define TMCON_T0EN (1 << 0) /* Timer 0 Enable */- - /* Timer0 Timeout Counter Register */- #define T0TC_WATCHDOG (0xff) /* Enable watchdog mode */- - - #endifdiff --git a/arch/arm/mach-ks8695/time.c b/arch/arm/mach-ks8695/time.c
index ec783a3..6427b7c 100644
--- a/arch/arm/mach-ks8695/time.c
+++ b/arch/arm/mach-ks8695/time.c @@ -29,11 +29,30 @@
#include <asm/mach/time.h>
#include <asm/system_misc.h>
- #include <mach/regs-timer.h> #include <mach/regs-irq.h>
#include "generic.h"
+ #define KS8695_TMR_OFFSET (0xF0000 + 0xE400) + #define KS8695_TMR_VA (KS8695_IO_VA + KS8695_TMR_OFFSET) + #define KS8695_TMR_PA (KS8695_IO_PA + KS8695_TMR_OFFSET) + + /* + * Timer registers + */ + #define KS8695_TMCON (0x00) /* Timer Control Register */ + #define KS8695_T1TC (0x04) /* Timer 1 Timeout Count Register */ + #define KS8695_T0TC (0x08) /* Timer 0 Timeout Count Register */ + #define KS8695_T1PD (0x0C) /* Timer 1 Pulse Count Register */ + #define KS8695_T0PD (0x10) /* Timer 0 Pulse Count Register */ + + /* Timer Control Register */ + #define TMCON_T1EN (1 << 1) /* Timer 1 Enable */ + #define TMCON_T0EN (1 << 0) /* Timer 0 Enable */ + + /* Timer0 Timeout Counter Register */ + #define T0TC_WATCHDOG (0xff) /* Enable watchdog mode */ + /*
* Returns number of ms since last clock interrupt . Note that interrupts
* will have been disabled by do_gettimeoffset ()
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg at snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close, FAX: +61 7 3891 3630
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
On Wednesday 29 August 2012, Linus Walleij wrote: +#define KS8695_TMR_OFFSET (0xF0000 + 0xE400)
+#define KS8695_TMR_VA (KS8695_IO_VA + KS8695_TMR_OFFSET)
+#define KS8695_TMR_PA (KS8695_IO_PA + KS8695_TMR_OFFSET)
I'm not too happy about KS8695_TMR_VA moving into a device driver, but aside
from that the patch looks ok to me. Apparently, the gpio, ethernet, serial
and watchdog drivers for this platform already do it like this anyway.
ARnd
On Wed, Aug 29, 2012 at 11:26 AM, Linus Walleij
[off-list ref] wrote: This <mach/regs-timer.h> is broadcasted in the entire kernel for
no good reason, since it's only used by the timer driver. Merge
it into the driver.
Signed-off-by: Linus Walleij <redacted>
Actually, it's also included in the watchdog timer that is only
enabled on the acs5k defconfigs today, not on the main ks8695 one :(
drivers/watchdog/ks8695_wdt.c:27:29: fatal error: mach/regs-timer.h:
No such file or directory
-Olof
On Sat, Sep 8, 2012 at 5:34 AM, Olof Johansson [off-list ref] wrote:
quoted This <mach/regs-timer.h> is broadcasted in the entire kernel for
no good reason, since it's only used by the timer driver. Merge
it into the driver.
Signed-off-by: Linus Walleij <redacted>
Actually, it's also included in the watchdog timer that is only
enabled on the acs5k defconfigs today, not on the main ks8695 one :(
drivers/watchdog/ks8695_wdt.c:27:29: fatal error: mach/regs-timer.h:
No such file or directory
OK I'll fix pronto.
Yours,
Linus Walleij