Commit dbe8a9df authored Mar 07, 2018 by Linus Walleij Committed by Arnd Bergmann Mar 07, 2018

ARM: ux500: Fix PMU IRQ regression



Commit 2b05f6ae ("ARM: ux500: remove PMU IRQ bouncer")
deleted some code to bounce and work around the weird PMU
IRQs in the DB8500 ASIC, but did a semantic mistake:
since the auxdata was now unused, the call to
of_platform_populate() was removed, but this does not
work: the default platform population will only kick in
if .init_machine() is assigned NULL, and since the U8540
was still using the callback that was not the case.

Fix this by reinstating the call to of_platform_populate(),
but pass NULL as auxdata.

Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Fixes: 2b05f6ae ("ARM: ux500: remove PMU IRQ bouncer")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parent 661e50bc

arch/arm/mach-ux500/cpu-db8500.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,9 @@ static void __init u8500_init_machine(void)
		if (of_machine_is_compatible("st-ericsson,u8540"))
		of_platform_populate(NULL, u8500_local_bus_nodes,
		u8540_auxdata_lookup, NULL);
		else
		of_platform_populate(NULL, u8500_local_bus_nodes,
		NULL, NULL);
		}

		static const char * stericsson_dt_platform_compat[] = {