Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-4
+1
-1
arch/arm/boot/dts/armada-xp.dtsi
+1
-1
arch/arm/boot/dts/armada-xp.dtsi
···
12
12
* License version 2. This program is licensed "as is" without any
13
13
* warranty of any kind, whether express or implied.
14
14
*
15
-
* Contains definitions specific to the Armada 370 SoC that are not
15
+
* Contains definitions specific to the Armada XP SoC that are not
16
16
* common to all Armada SoCs.
17
17
*/
18
18
+1
arch/arm/mach-mmp/gplugd.c
+1
arch/arm/mach-mmp/gplugd.c
+3
-3
arch/arm/mach-prima2/timer.c
+3
-3
arch/arm/mach-prima2/timer.c
···
132
132
{
133
133
int i;
134
134
135
-
for (i = 0; i < SIRFSOC_TIMER_REG_CNT; i++)
135
+
for (i = 0; i < SIRFSOC_TIMER_REG_CNT - 2; i++)
136
136
writel_relaxed(sirfsoc_timer_reg_val[i], sirfsoc_timer_base + sirfsoc_timer_reg_list[i]);
137
137
138
-
writel_relaxed(sirfsoc_timer_reg_val[i - 2], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_LO);
139
-
writel_relaxed(sirfsoc_timer_reg_val[i - 1], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_HI);
138
+
writel_relaxed(sirfsoc_timer_reg_val[SIRFSOC_TIMER_REG_CNT - 2], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_LO);
139
+
writel_relaxed(sirfsoc_timer_reg_val[SIRFSOC_TIMER_REG_CNT - 1], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_HI);
140
140
}
141
141
142
142
static struct clock_event_device sirfsoc_clockevent = {