Skip to content

Commit

Permalink
MIPS: AR7: Defer registration of GPIO
Browse files Browse the repository at this point in the history
When called from prom init code, ar7_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 ar7_gpio_init() to ar7_register_devices() (a device_initcall)
where kmalloc works.

Fixes: 14e85c0 ("gpio: remove gpio_descs global array")
Signed-off-by: Jonas Gorski <[email protected]>
Reviewed-by: Florian Fainelli <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Yoshihiro YUNOMAE <[email protected]>
Cc: Nicolas Schichan <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: <[email protected]> # 3.19+
Patchwork: https://patchwork.linux-mips.org/patch/17542/
Signed-off-by: James Hogan <[email protected]>
  • Loading branch information
KanjiMonster authored and amalon committed Nov 8, 2017
1 parent ea4b3af commit e6b03ab
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 4 additions & 0 deletions arch/mips/ar7/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,10 @@ static int __init ar7_register_devices(void)
u32 val;
int res;

res = ar7_gpio_init();
if (res)
pr_warn("unable to register gpios: %d\n", res);

res = ar7_register_uarts();
if (res)
pr_err("unable to setup uart(s): %d\n", res);
Expand Down
2 changes: 0 additions & 2 deletions arch/mips/ar7/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,6 @@ void __init prom_init(void)
ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
ar7_init_env((struct env_var *)fw_arg2);
console_config();

ar7_gpio_init();
}

#define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))
Expand Down

0 comments on commit e6b03ab

Please sign in to comment.