hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'imx/compile-fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

This commit is contained in:
Olof Johansson 2011-11-09 08:59:30 -08:00
parent 22d3832373 15394cad27
commit 45ff6fa1ad
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-mx5/clock-mx51-mx53.c
View File

@ -1634,6 +1634,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc,
return 0; return 0;
} }
#ifdef CONFIG_OF
static void __init clk_get_freq_dt(unsigned long *ckil, unsigned long *osc, static void __init clk_get_freq_dt(unsigned long *ckil, unsigned long *osc,
unsigned long *ckih1, unsigned long *ckih2) unsigned long *ckih1, unsigned long *ckih2)
{ {
@ -1671,3 +1672,4 @@ int __init mx53_clocks_init_dt(void)
clk_get_freq_dt(&ckil, &osc, &ckih1, &ckih2); clk_get_freq_dt(&ckil, &osc, &ckih1, &ckih2);
return mx53_clocks_init(ckil, osc, ckih1, ckih2); return mx53_clocks_init(ckil, osc, ckih1, ckih2);
} }
#endif

1
arch/arm/plat-mxc/avic.c
View File

@ -22,6 +22,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <mach/common.h> #include <mach/common.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/exception.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include "irq-common.h" #include "irq-common.h"

11
arch/arm/plat-mxc/gic.c
View File

@ -28,21 +28,14 @@ asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
if (irqnr == 1023) if (irqnr == 1023)
break; break;
if (irqnr > 29 && irqnr < 1021) if (irqnr > 15 && irqnr < 1021)
handle_IRQ(irqnr, regs); handle_IRQ(irqnr, regs);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
else if (irqnr < 16) { else {
writel_relaxed(irqstat, gic_cpu_base_addr + writel_relaxed(irqstat, gic_cpu_base_addr +
GIC_CPU_EOI); GIC_CPU_EOI);
handle_IPI(irqnr, regs); handle_IPI(irqnr, regs);
} }
#endif
#ifdef CONFIG_LOCAL_TIMERS
else if (irqnr == 29) {
writel_relaxed(irqstat, gic_cpu_base_addr +
GIC_CPU_EOI);
handle_local_timer(regs);
}
#endif #endif
} while (1); } while (1);
} }

3
arch/arm/plat-mxc/include/mach/entry-macro.S
View File

@ -25,6 +25,3 @@
.macro test_for_ipi, irqnr, irqstat, base, tmp .macro test_for_ipi, irqnr, irqstat, base, tmp
.endm .endm
.macro test_for_ltirq, irqnr, irqstat, base, tmp
.endm

1
arch/arm/plat-mxc/tzic.c
View File

@ -17,6 +17,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/exception.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/common.h> #include <mach/common.h>