You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.4 KiB
46 lines
1.4 KiB
7 years ago
|
From 3a8d54573f9d187779d36d6b45e8e0288b82c31a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
||
|
|
Date: Thu, 26 Oct 2017 23:25:44 +0200
|
||
|
|
Subject: [PATCH 1/3] MIPS: AR7: defer registration of GPIO
|
||
|
|
|
||
|
|
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: 14e85c0e69d5 ("gpio: remove gpio_descs global array")
|
||
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
||
|
|
---
|
||
|
|
Text shamelessy stolen from commit 2ec459f2a77b8.
|
||
|
|
|
||
|
|
arch/mips/ar7/platform.c | 4 ++++
|
||
|
|
arch/mips/ar7/prom.c | 2 --
|
||
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/mips/ar7/platform.c
|
||
|
|
+++ b/arch/mips/ar7/platform.c
|
||
|
|
@@ -655,6 +655,10 @@ static int __init ar7_register_devices(v
|
||
|
|
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);
|
||
|
|
--- a/arch/mips/ar7/prom.c
|
||
|
|
+++ b/arch/mips/ar7/prom.c
|
||
|
|
@@ -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)))
|