openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci 

* 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
  davinci: fix compile warning: <mach/da8xx.h>: #include <linux/platform_device.h>
  davinci: DM365: fix duplicate default IRQ priorities
  davinci: edma: clear events in edma_start()
  davinci: da8xx/omap-l1: fix build error when CONFIG_DAVINCI_MUX is undefined
  davinci: timers: don't enable timer until clocksource is initialized
This commit is contained in:
Linus Torvalds 2010-04-07 11:03:06 -07:00
parent fb1ae63577 75392dd304
commit 63634c8636
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-davinci/dm365.c
View File

@ -758,7 +758,6 @@ static u8 dm365_default_priorities[DAVINCI_N_AINTC_IRQ] = {
[IRQ_MMCINT] = 7, [IRQ_MMCINT] = 7,
[IRQ_DM365_MMCINT1] = 7, [IRQ_DM365_MMCINT1] = 7,
[IRQ_DM365_PWMINT3] = 7, [IRQ_DM365_PWMINT3] = 7,
[IRQ_DDRINT] = 4,
[IRQ_AEMIFINT] = 2, [IRQ_AEMIFINT] = 2,
[IRQ_DM365_SDIOINT1] = 2, [IRQ_DM365_SDIOINT1] = 2,
[IRQ_TINT0_TINT12] = 7, [IRQ_TINT0_TINT12] = 7,

3
arch/arm/mach-davinci/dma.c
View File

@ -1267,7 +1267,8 @@ int edma_start(unsigned channel)
/* EDMA channel with event association */ /* EDMA channel with event association */
pr_debug("EDMA: ER%d %08x\n", j, pr_debug("EDMA: ER%d %08x\n", j,
edma_shadow0_read_array(ctlr, SH_ER, j)); edma_shadow0_read_array(ctlr, SH_ER, j));
/* Clear any pending error */ /* Clear any pending event or error */
edma_write_array(ctlr, EDMA_ECR, j, mask);
edma_write_array(ctlr, EDMA_EMCR, j, mask); edma_write_array(ctlr, EDMA_EMCR, j, mask);
/* Clear any SER */ /* Clear any SER */
edma_shadow0_write_array(ctlr, SH_SECR, j, mask); edma_shadow0_write_array(ctlr, SH_SECR, j, mask);

8
arch/arm/mach-davinci/include/mach/da8xx.h
View File

@ -3,7 +3,7 @@
* *
* Author: Mark A. Greer <mgreer@mvista.com> * Author: Mark A. Greer <mgreer@mvista.com>
* *
* 2007, 2009 (c) MontaVista Software, Inc. This file is licensed under * 2007, 2009-2010 (c) MontaVista Software, Inc. This file is licensed under
* the terms of the GNU General Public License version 2. This program * the terms of the GNU General Public License version 2. This program
* is licensed "as is" without any warranty of any kind, whether express * is licensed "as is" without any warranty of any kind, whether express
* or implied. * or implied.
@ -13,7 +13,9 @@
#include <video/da8xx-fb.h> #include <video/da8xx-fb.h>
#include <linux/platform_device.h>
#include <linux/davinci_emac.h> #include <linux/davinci_emac.h>
#include <mach/serial.h> #include <mach/serial.h>
#include <mach/edma.h> #include <mach/edma.h>
#include <mach/i2c.h> #include <mach/i2c.h>
@ -144,6 +146,10 @@ extern const short da850_mmcsd0_pins[];
extern const short da850_nand_pins[]; extern const short da850_nand_pins[];
extern const short da850_nor_pins[]; extern const short da850_nor_pins[];
#ifdef CONFIG_DAVINCI_MUX
int da8xx_pinmux_setup(const short pins[]); int da8xx_pinmux_setup(const short pins[]);
#else
static inline int da8xx_pinmux_setup(const short pins[]) { return 0; }
#endif
#endif /* __ASM_ARCH_DAVINCI_DA8XX_H */ #endif /* __ASM_ARCH_DAVINCI_DA8XX_H */

6
arch/arm/mach-davinci/time.c
View File

@ -253,8 +253,6 @@ static void __init timer_init(void)
irq = USING_COMPARE(t) ? dtip[i].cmp_irq : irq; irq = USING_COMPARE(t) ? dtip[i].cmp_irq : irq;
setup_irq(irq, &t->irqaction); setup_irq(irq, &t->irqaction);
} }
timer32_config(&timers[i]);
} }
} }
@ -331,6 +329,7 @@ static void __init davinci_timer_init(void)
unsigned int clocksource_id; unsigned int clocksource_id;
static char err[] __initdata = KERN_ERR static char err[] __initdata = KERN_ERR
"%s: can't register clocksource!\n"; "%s: can't register clocksource!\n";
int i;
clockevent_id = soc_info->timer_info->clockevent_id; clockevent_id = soc_info->timer_info->clockevent_id;
clocksource_id = soc_info->timer_info->clocksource_id; clocksource_id = soc_info->timer_info->clocksource_id;
@ -389,6 +388,9 @@ static void __init davinci_timer_init(void)
clockevent_davinci.cpumask = cpumask_of(0); clockevent_davinci.cpumask = cpumask_of(0);
clockevents_register_device(&clockevent_davinci); clockevents_register_device(&clockevent_davinci);
for (i=0; i< ARRAY_SIZE(timers); i++)
timer32_config(&timers[i]);
} }
struct sys_timer davinci_timer = { struct sys_timer davinci_timer = {