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

Commit f3c15b0a 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 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
parents e10e5771 8b6fd652

arch/arm/boot/dts/exynos5250-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ 
		};

	};



	pinctrl@03680000 {

	pinctrl@03860000 {

		gpz: gpz {

			gpio-controller;

			#gpio-cells = <2>;

arch/arm/boot/dts/exynos5250.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -161,9 +161,9 @@ 
		interrupts = <0 50 0>;

	};



	pinctrl_3: pinctrl@03680000 {

	pinctrl_3: pinctrl@03860000 {

		compatible = "samsung,exynos5250-pinctrl";

		reg = <0x0368000 0x1000>;

		reg = <0x03860000 0x1000>;

		interrupts = <0 47 0>;

	};

drivers/irqchip/irq-gic.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static int gic_irq_domain_xlate(struct irq_domain *d, 
static int __cpuinit gic_secondary_init(struct notifier_block *nfb,

					unsigned long action, void *hcpu)

{

	if (action == CPU_STARTING)

	if (action == CPU_STARTING || action == CPU_STARTING_FROZEN)

		gic_cpu_init(&gic_data[0]);

	return NOTIFY_OK;

}