Commit 7b5991c8 authored Mar 12, 2015 by Nicolas Schichan Committed by Sasha Levin May 17, 2015

MIPS: BCM63xx: Move bcm63xx_gpio_init() to bcm63xx_register_devices().



[ Upstream commit 2ec459f2a77b808c1e5a3616c88b613d3f720c8d ]

When called from prom init code, bcm63xx_gpio_init() will fail as it
will call gpiochip_add() which relies on a working kmalloc() to alloc
the gpio_desc array and kmalloc is not useable yet at prom init time.

Move bcm63xx_gpio_init() to bcm63xx_register_devices() (an
arch_initcall) where kmalloc works.

Fixes: 14e85c0e69d5 ("gpio: remove gpio_descs global array")

Signed-off-by: Nicolas Schichan <nschichan@freebox.fr>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Alexandre Courbot <acourbot@nvidia.com>
Patchwork: https://patchwork.linux-mips.org/patch/9530/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 2611e241

arch/mips/bcm63xx/prom.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#include <bcm63xx_cpu.h>
		#include <bcm63xx_io.h>
		#include <bcm63xx_regs.h>
		#include <bcm63xx_gpio.h>

		void __init prom_init(void)
		{
		@@ -53,9 +52,6 @@ void __init prom_init(void)
		reg &= ~mask;
		bcm_perf_writel(reg, PERF_CKCTL_REG);

		/* register gpiochip */
		bcm63xx_gpio_init();

		/* do low level board init */
		board_prom_init();

arch/mips/bcm63xx/setup.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <bcm63xx_cpu.h>
		#include <bcm63xx_regs.h>
		#include <bcm63xx_io.h>
		#include <bcm63xx_gpio.h>

		void bcm63xx_machine_halt(void)
		{
		@@ -160,6 +161,9 @@ void __init plat_mem_setup(void)

		int __init bcm63xx_register_devices(void)
		{
		/* register gpiochip */
		bcm63xx_gpio_init();

		return board_register_devices();
		}