summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven J. Hill <steven.hill@cavium.com>2016-08-26 14:02:04 -0500
committerRalf Baechle <ralf@linux-mips.org>2016-09-29 18:59:49 +0200
commit0a900553715c39cfb6170ccc9846b194a4c13ceb (patch)
tree72c992170a89d3a290fd449f45283e40ee65536a
parentca86c9ef2b322ebf24772009fdea037688cbdac1 (diff)
downloadlinux-stable-0a900553715c39cfb6170ccc9846b194a4c13ceb.tar.gz
linux-stable-0a900553715c39cfb6170ccc9846b194a4c13ceb.tar.bz2
linux-stable-0a900553715c39cfb6170ccc9846b194a4c13ceb.zip
MIPS: Octeon: mark GPIO controller node not populated after IRQ init.
We clear the OF_POPULATED flag for the GPIO controller node on Octeon processors. Otherwise, none of the devices hanging on the GPIO lines are probed. The 'gpio-leds' driver on OCTEON failed to probe in addition to other devices on Cavium 71xx and 78xx development boards. Fixes: 15cc2ed6dcf9 ("of/irq: Mark initialised interrupt controllers as populated") Signed-off-by: Steven J. Hill <steven.hill@cavium.com> Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Cc: David Daney <david.daney@cavium.com> Cc: Rob Herring <robh@kernel.org> Cc: linux-mips@linux-mips.org Cc: devicetree@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/14091/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/cavium-octeon/octeon-irq.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index 5a9b87b7993e..c1eb1ff7c800 100644
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -1619,6 +1619,12 @@ static int __init octeon_irq_init_gpio(
return -ENOMEM;
}
+ /*
+ * Clear the OF_POPULATED flag that was set by of_irq_init()
+ * so that all GPIO devices will be probed.
+ */
+ of_node_clear_flag(gpio_node, OF_POPULATED);
+
return 0;
}
/*