diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-06-25 22:39:39 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-06-25 22:39:39 +0000 |
commit | 16967b41f18cef2529eaae67e04cdedd8cf0ebbb (patch) | |
tree | 3da18fa9d9dc8fa3c854ac0ecb844bab16f27ae4 /target/linux/orion/patches/006-add_a_separate_BRIDGE_INT_TIMER1_CLR_define.patch | |
parent | 4add77fb4b448e556f10f593c3e773e545b3dc26 (diff) | |
download | upstream-16967b41f18cef2529eaae67e04cdedd8cf0ebbb.tar.gz upstream-16967b41f18cef2529eaae67e04cdedd8cf0ebbb.tar.bz2 upstream-16967b41f18cef2529eaae67e04cdedd8cf0ebbb.zip |
sync with the orion git tree
SVN-Revision: 11575
Diffstat (limited to 'target/linux/orion/patches/006-add_a_separate_BRIDGE_INT_TIMER1_CLR_define.patch')
-rw-r--r-- | target/linux/orion/patches/006-add_a_separate_BRIDGE_INT_TIMER1_CLR_define.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/orion/patches/006-add_a_separate_BRIDGE_INT_TIMER1_CLR_define.patch b/target/linux/orion/patches/006-add_a_separate_BRIDGE_INT_TIMER1_CLR_define.patch deleted file mode 100644 index 75daedd84c..0000000000 --- a/target/linux/orion/patches/006-add_a_separate_BRIDGE_INT_TIMER1_CLR_define.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Ke Wei <kewei@marvell.com> - -Some Feroceon-based SoCs have an MBUS bridge interrupt controller -that requires writing a one instead of a zero to clear edge -interrupt sources such as timer expiry. - -This patch adds a new BRIDGE_INT_TIMER1_CLR define, which platform -code can set to either ~BRIDGE_INT_TIMER1 (write-zero-to-clear) or -BRIDGE_INT_TIMER1 (write-one-to-clear) depending on the platform. - -Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> ---- - arch/arm/plat-orion/time.c | 2 +- - include/asm-arm/arch-orion5x/orion5x.h | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - ---- a/arch/arm/plat-orion/time.c -+++ b/arch/arm/plat-orion/time.c -@@ -74,7 +74,7 @@ - /* - * Clear and enable clockevent timer interrupt. - */ -- writel(~BRIDGE_INT_TIMER1, BRIDGE_CAUSE); -+ writel(BRIDGE_INT_TIMER1_CLR, BRIDGE_CAUSE); - - u = readl(BRIDGE_MASK); - u |= BRIDGE_INT_TIMER1; ---- a/include/asm-arm/arch-orion5x/orion5x.h -+++ b/include/asm-arm/arch-orion5x/orion5x.h -@@ -152,6 +152,7 @@ - #define BRIDGE_MASK ORION5X_BRIDGE_REG(0x114) - #define BRIDGE_INT_TIMER0 0x0002 - #define BRIDGE_INT_TIMER1 0x0004 -+#define BRIDGE_INT_TIMER1_CLR ~0x0004 - #define MAIN_IRQ_CAUSE ORION5X_BRIDGE_REG(0x200) - #define MAIN_IRQ_MASK ORION5X_BRIDGE_REG(0x204) - |