lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Pull ARM SoC fixes from Arnd Bergmann:
 "These are two fixes that came in this week, one for a regression we
  introduced in 3.10 in the GIC interrupt code, and the other one fixes
  a typo in newly introduced code"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  irqchip: gic: call gic_cpu_init() as well in CPU_STARTING_FROZEN case
  ARM: dts: Correct the base address of pinctrl_3 on Exynos5250
This commit is contained in:
Linus Torvalds
2013-06-22 09:44:45 -10:00
parent e10e577185 8b6fd65264
commit f3c15b0a12
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/exynos5250-pinctrl.dtsi
View File

@@ -763,7 +763,7 @@
}; };
}; };
pinctrl@03680000 { pinctrl@03860000 {
gpz: gpz { gpz: gpz {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;

4
arch/arm/boot/dts/exynos5250.dtsi
View File

@@ -161,9 +161,9 @@
interrupts = <0 50 0>; interrupts = <0 50 0>;
}; };
pinctrl_3: pinctrl@03680000 { pinctrl_3: pinctrl@03860000 {
compatible = "samsung,exynos5250-pinctrl"; compatible = "samsung,exynos5250-pinctrl";
reg = <0x0368000 0x1000>; reg = <0x03860000 0x1000>;
interrupts = <0 47 0>; interrupts = <0 47 0>;
}; };

2
drivers/irqchip/irq-gic.c
View File

@@ -705,7 +705,7 @@ static int gic_irq_domain_xlate(struct irq_domain *d,
static int __cpuinit gic_secondary_init(struct notifier_block *nfb, static int __cpuinit gic_secondary_init(struct notifier_block *nfb,
unsigned long action, void *hcpu) unsigned long action, void *hcpu)
{ {
if (action == CPU_STARTING) if (action == CPU_STARTING || action == CPU_STARTING_FROZEN)
gic_cpu_init(&gic_data[0]); gic_cpu_init(&gic_data[0]);
return NOTIFY_OK; return NOTIFY_OK;
} }