Commit 64086491 authored Sep 16, 2016 by Arnd Bergmann

Merge tag 'samsung-fixes-4.8-2' of...

Merge tag 'samsung-fixes-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes

Pull "ARM: exynos: Fixes for v4.8, secound round" from Krzysztof Kozłowski:

1. A recent change in populating irqchip devices from Device Tree
   broke Suspend to RAM on Exynos boards due to lack of probing of
   PMU (Power Management Unit) driver.  Multiple drivers attach to
   the PMU's DT node: irqchip, clock controller and PMU platform
   driver for handling suspend.  The new irqchip code marked the
   PMU's DT node as OF_POPULATED but we need to attach to this
   node also PMU platform driver.

2. Add Javier as additional reviewer for Exynos patches.

* tag 'samsung-fixes-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: EXYNOS: Clear OF_POPULATED flag from PMU node in IRQ init callback
  MAINTAINERS: Add myself as reviewer for Samsung Exynos support

parents a6805884 b0304852

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -1615,6 +1615,7 @@ N: rockchip
		ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
		M: Kukjin Kim <kgene@kernel.org>
		M: Krzysztof Kozlowski <krzk@kernel.org>
		R: Javier Martinez Canillas <javier@osg.samsung.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
		S: Maintained

arch/arm/mach-exynos/suspend.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,12 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
		return -ENOMEM;
		}

		/*
		* Clear the OF_POPULATED flag set in of_irq_init so that
		* later the Exynos PMU platform device won't be skipped.
		*/
		of_node_clear_flag(node, OF_POPULATED);

		return 0;
		}