git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-arm
/
arch-ixp2000
/
ixp2000-regs.h
diff --git
a/include/asm-arm/arch-ixp2000/ixp2000-regs.h
b/include/asm-arm/arch-ixp2000/ixp2000-regs.h
index
9c8b21d
..
99dd524
100644
(file)
--- a/
include/asm-arm/arch-ixp2000/ixp2000-regs.h
+++ b/
include/asm-arm/arch-ixp2000/ixp2000-regs.h
@@
-98,6
+98,7
@@
#define WDT_ENABLE 0x00000001
#define TIMER_DIVIDER_256 0x00000008
#define TIMER_ENABLE 0x00000080
#define WDT_ENABLE 0x00000001
#define TIMER_DIVIDER_256 0x00000008
#define TIMER_ENABLE 0x00000080
+#define IRQ_MASK_TIMER1 (1 << 4)
/*
* Interrupt controller registers
/*
* Interrupt controller registers
@@
-115,7
+116,7
@@
/*
* Mask of valid IRQs in the 32-bit IRQ register. We use
/*
* Mask of valid IRQs in the 32-bit IRQ register. We use
- * this to mark certain IRQs as being in
-
valid.
+ * this to mark certain IRQs as being invalid.
*/
#define IXP2000_VALID_IRQ_MASK 0x0f0fffff
*/
#define IXP2000_VALID_IRQ_MASK 0x0f0fffff
@@
-251,7
+252,7
@@
#define SLOWPORT_CCR_DIV_30 0x0f
/*
#define SLOWPORT_CCR_DIV_30 0x0f
/*
- * PCR values. PCR configure the mode of the interfac
3
+ * PCR values. PCR configure the mode of the interfac
e.
*/
#define SLOWPORT_MODE_FLASH 0x00
#define SLOWPORT_MODE_LUCENT 0x01
*/
#define SLOWPORT_MODE_FLASH 0x00
#define SLOWPORT_MODE_LUCENT 0x01
@@
-260,7
+261,7
@@
#define SLOWPORT_MODE_MOTOROLA_UP 0x04
/*
#define SLOWPORT_MODE_MOTOROLA_UP 0x04
/*
- * ADC values. Defines data and address bus widths
+ * ADC values. Defines data and address bus widths
.
*/
#define SLOWPORT_ADDR_WIDTH_8 0x00
#define SLOWPORT_ADDR_WIDTH_16 0x01
*/
#define SLOWPORT_ADDR_WIDTH_8 0x00
#define SLOWPORT_ADDR_WIDTH_16 0x01
@@
-272,7
+273,7
@@
#define SLOWPORT_DATA_WIDTH_32 0x30
/*
#define SLOWPORT_DATA_WIDTH_32 0x30
/*
- * Masks and shifts for various fields in the WTC and RTC registers
+ * Masks and shifts for various fields in the WTC and RTC registers
.
*/
#define SLOWPORT_WRTC_MASK_HD 0x0003
#define SLOWPORT_WRTC_MASK_SU 0x003c
*/
#define SLOWPORT_WRTC_MASK_HD 0x0003
#define SLOWPORT_WRTC_MASK_SU 0x003c
@@
-284,7
+285,7
@@
/*
/*
- * GPIO registers & GPIO interface
+ * GPIO registers & GPIO interface
.
*/
#define IXP2000_GPIO_REG(x) ((volatile unsigned long*)(IXP2000_GPIO_VIRT_BASE+(x)))
#define IXP2000_GPIO_PLR IXP2000_GPIO_REG(0x00)
*/
#define IXP2000_GPIO_REG(x) ((volatile unsigned long*)(IXP2000_GPIO_VIRT_BASE+(x)))
#define IXP2000_GPIO_PLR IXP2000_GPIO_REG(0x00)