UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: OMAP1: ams-delta: refactor late_init() 

Before the board level GPIO handling is converted from GPIO numbers to
GPIO descriptors, split late_init() into functional blocks and move
them to separate functions.

While being at it, drop machine type check from late_init() - the
function is now called from the board init_late callback so there is
no need for yet another applicability check.

Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Janusz Krzysztofik 2018-05-27 15:55:47 +02:00 committed by Tony Lindgren
parent 40dda8720b
commit 3e14de3bfb
1 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
arch/arm/mach-omap1/board-ams-delta.c
View File

@ -643,19 +643,19 @@ static struct platform_device ams_delta_modem_device = {
}, },
}; };
static int __init late_init(void) static int __init ams_delta_gpio_init(void)
{ {
int err; int err;
if (!machine_is_ams_delta())
return -ENODEV;
err = gpio_request_array(latch_gpios, ARRAY_SIZE(latch_gpios)); err = gpio_request_array(latch_gpios, ARRAY_SIZE(latch_gpios));
if (err) { if (err)
pr_err("Couldn't take over latch1/latch2 GPIO pins\n"); pr_err("Couldn't take over latch1/latch2 GPIO pins\n");
return err;
}
return err;
}
static void __init ams_delta_late_devices(void)
{
platform_add_devices(late_devices, ARRAY_SIZE(late_devices)); platform_add_devices(late_devices, ARRAY_SIZE(late_devices));
/* /*
@ -666,12 +666,23 @@ static int __init late_init(void)
ams_delta_nand_gpio_table.dev_id = dev_name(&ams_delta_nand_device.dev); ams_delta_nand_gpio_table.dev_id = dev_name(&ams_delta_nand_device.dev);
gpiod_add_lookup_tables(late_gpio_tables, ARRAY_SIZE(late_gpio_tables)); gpiod_add_lookup_tables(late_gpio_tables, ARRAY_SIZE(late_gpio_tables));
}
static int __init modem_nreset_init(void)
{
int err;
err = platform_device_register(&modem_nreset_device); err = platform_device_register(&modem_nreset_device);
if (err) { if (err)
pr_err("Couldn't register the modem regulator device\n"); pr_err("Couldn't register the modem regulator device\n");
return err; return err;
} }
static int __init ams_delta_modem_init(void)
{
int err;
omap_cfg_reg(M14_1510_GPIO2); omap_cfg_reg(M14_1510_GPIO2);
ams_delta_modem_ports[0].irq = ams_delta_modem_ports[0].irq =
@ -692,7 +703,28 @@ static int __init late_init(void)
err = platform_device_register(&ams_delta_modem_device); err = platform_device_register(&ams_delta_modem_device);
if (err) if (err)
goto gpio_free; gpio_free(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
return err;
}
static int __init late_init(void)
{
int err;
err = ams_delta_gpio_init();
if (err)
return err;
ams_delta_late_devices();
err = modem_nreset_init();
if (err)
return err;
err = ams_delta_modem_init();
if (err)
return err;
/* /*
* Once the modem device is registered, the modem_nreset * Once the modem device is registered, the modem_nreset
@ -708,7 +740,6 @@ static int __init late_init(void)
unregister: unregister:
platform_device_unregister(&ams_delta_modem_device); platform_device_unregister(&ams_delta_modem_device);
gpio_free:
gpio_free(AMS_DELTA_GPIO_PIN_MODEM_IRQ); gpio_free(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
return err; return err;
} }