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

Commit d1494ba8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "A few fixes for merge window fallout, and a bugfix for timer resume on
  PRIMA2."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: mmp: add missing irqs.h
  arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs
  ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes
  ARM: mxc: Include missing irqs.h header
parents 0a276d16 bac6f615

arch/arm/boot/dts/armada-xp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 *

 * Contains definitions specific to the Armada 370 SoC that are not

 * Contains definitions specific to the Armada XP SoC that are not

 * common to all Armada SoCs.

 */

arch/arm/mach-mmp/gplugd.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/mach/arch.h>

#include <asm/mach-types.h>



#include <mach/irqs.h>

#include <mach/pxa168.h>

#include <mach/mfp-pxa168.h>

arch/arm/mach-prima2/timer.c

+3 −3
Original line number Diff line number Diff line
@@ -132,11 +132,11 @@ static void sirfsoc_clocksource_resume(struct clocksource *cs) 
{

	int i;



	for (i = 0; i < SIRFSOC_TIMER_REG_CNT; i++)

	for (i = 0; i < SIRFSOC_TIMER_REG_CNT - 2; i++)

		writel_relaxed(sirfsoc_timer_reg_val[i], sirfsoc_timer_base + sirfsoc_timer_reg_list[i]);



	writel_relaxed(sirfsoc_timer_reg_val[i - 2], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_LO);

	writel_relaxed(sirfsoc_timer_reg_val[i - 1], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_HI);

	writel_relaxed(sirfsoc_timer_reg_val[SIRFSOC_TIMER_REG_CNT - 2], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_LO);

	writel_relaxed(sirfsoc_timer_reg_val[SIRFSOC_TIMER_REG_CNT - 1], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_HI);

}



static struct clock_event_device sirfsoc_clockevent = {

arch/arm/plat-mxc/tzic.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/irqs.h>



#include "irq-common.h"