Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45ff6fa1 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

parents 22d38323 15394cad

arch/arm/mach-mx5/clock-mx51-mx53.c

+2 −0
Original line number Diff line number Diff line
@@ -1634,6 +1634,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc, 
	return 0;

}



#ifdef CONFIG_OF

static void __init clk_get_freq_dt(unsigned long *ckil, unsigned long *osc,

				   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);

	return mx53_clocks_init(ckil, osc, ckih1, ckih2);

}

#endif

arch/arm/plat-mxc/avic.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/io.h>

#include <mach/common.h>

#include <asm/mach/irq.h>

#include <asm/exception.h>

#include <mach/hardware.h>



#include "irq-common.h"

arch/arm/plat-mxc/gic.c

+2 −9
Original line number Diff line number Diff line
@@ -28,21 +28,14 @@ asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) 
		if (irqnr == 1023)

			break;



		if (irqnr > 29 && irqnr < 1021)

		if (irqnr > 15 && irqnr < 1021)

			handle_IRQ(irqnr, regs);

#ifdef CONFIG_SMP

		else if (irqnr < 16) {

		else {

			writel_relaxed(irqstat, gic_cpu_base_addr +

						GIC_CPU_EOI);

			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

	} while (1);

}

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

+0 −3
Original line number Diff line number Diff line
@@ -25,6 +25,3 @@ 


	.macro test_for_ipi, irqnr, irqstat, base, tmp

	.endm
 


	.macro test_for_ltirq, irqnr, irqstat, base, tmp

	.endm

arch/arm/plat-mxc/tzic.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/io.h>



#include <asm/mach/irq.h>

#include <asm/exception.h>



#include <mach/hardware.h>

#include <mach/common.h>