mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-19 05:24:11 +00:00
ARM: SoC fixes for 3.10-rc
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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUcR9uWCrR//JCVInAQJPOQ/7BQfqxNbQn+DkHK3I3HBYDzFgaVr4Up9N JXgQnjrSjdGL0B0IaBaCTx95wv7DW9vsQk0sz6Hb38OFYpI5vn/77am35AEAmOtX 0OpFsTWM6iPiJMW0js4xWtDMDICNaFpnUWHMmO3dKMQJztvyHnzhsoWfWqlIZImV ml2HLeCYnFfM6vYUwTV5AHyCXMa4n7ODyIMouptCPlzIdPyTROUCBbP3obREW3AO RTnoOXsZnPkIrAySPtuCflGaUCKQzorvHQiQd+ye3KBbpgwwMHyl8SDKZws6Aes1 f4P539YnuIrm7Sh418MOsKx7/Vo4c+8GxONKSX4fduX6bSlkAba7zBQUcS2FGF8C RzVeF4lfBCv3F/QcnDWzI0qMvbUgvYXbMH9HUv5BiNed412oUXAaPbZ7/3TpLSq+ nsip8SY+HTo10e+k2dunBgSYk6EyP6aGoNEgS3STOlO5PAQVoy7urK7CjwLUmBrM IYaX/lmNWJjoWqMJtLYBVvr/n59420WO2VkmBh6OM/jKVE/ZO323AsIorGmlNmoY p2jtQ2q/x7rJ7PVlDgqUf18siiqyada4RwmvapmZkQwbMYppX4GPbF0KjylQO+g5 9EH1xH9NK5GOr6JxqyMoDyl0EPOtfveie0xKPhnNVxmi6cgnmlu04HymYO9V5c7K 1A47eYCn1pc= =+4ED -----END PGP SIGNATURE----- Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 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:
commit
f3c15b0a12
3 changed files with 4 additions and 4 deletions
|
@ -763,7 +763,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
pinctrl@03680000 {
|
pinctrl@03860000 {
|
||||||
gpz: gpz {
|
gpz: gpz {
|
||||||
gpio-controller;
|
gpio-controller;
|
||||||
#gpio-cells = <2>;
|
#gpio-cells = <2>;
|
||||||
|
|
|
@ -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>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue