diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-09-19 23:49:58 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-19 23:49:58 +0000 |
| commit | 7cd4968d0efaa0a7ac739c4ec8b7498840b309de (patch) | |
| tree | e1c4ffe3636f15aa88f6ace999a2b1916a492fc4 /target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch | |
| parent | 2f39fa872a6816b7331467e978bd23db2b2bd021 (diff) | |
| download | upstream-7cd4968d0efaa0a7ac739c4ec8b7498840b309de.tar.gz upstream-7cd4968d0efaa0a7ac739c4ec8b7498840b309de.tar.bz2 upstream-7cd4968d0efaa0a7ac739c4ec8b7498840b309de.zip | |
cns3xxx: move virtual io addresses to vmalloc space to fix kernel BUG() calls
SVN-Revision: 33485
Diffstat (limited to 'target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch')
| -rw-r--r-- | target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch b/target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch index 281f61f414..f10d5ece6d 100644 --- a/target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch +++ b/target/linux/cns3xxx/patches-3.3/102-cns3xxx_timers.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c -@@ -125,12 +125,13 @@ static void cns3xxx_timer_set_mode(enum +@@ -115,12 +115,13 @@ static void cns3xxx_timer_set_mode(enum switch (mode) { case CLOCK_EVT_MODE_PERIODIC: @@ -15,7 +15,7 @@ ctrl |= (1 << 2) | (1 << 9); break; case CLOCK_EVT_MODE_UNUSED: -@@ -155,11 +156,11 @@ static int cns3xxx_timer_set_next_event( +@@ -145,11 +146,11 @@ static int cns3xxx_timer_set_next_event( static struct clock_event_device cns3xxx_tmr1_clockevent = { .name = "cns3xxx timer1", @@ -29,7 +29,7 @@ .cpumask = cpu_all_mask, }; -@@ -201,6 +202,35 @@ static struct irqaction cns3xxx_timer_ir +@@ -191,6 +192,35 @@ static struct irqaction cns3xxx_timer_ir .handler = cns3xxx_timer_interrupt, }; @@ -65,7 +65,7 @@ /* * Set up the clock source and clock events devices */ -@@ -218,13 +248,12 @@ static void __init __cns3xxx_timer_init( +@@ -208,13 +238,12 @@ static void __init __cns3xxx_timer_init( /* stop free running timer3 */ writel(0, cns3xxx_tmr1 + TIMER_FREERUN_CONTROL_OFFSET); @@ -82,7 +82,7 @@ /* mask irq, non-mask timer1 overflow */ irq_mask = readl(cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET); irq_mask &= ~(1 << 2); -@@ -236,23 +265,9 @@ static void __init __cns3xxx_timer_init( +@@ -226,23 +255,9 @@ static void __init __cns3xxx_timer_init( val |= (1 << 9); writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); |