diff options
author | Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> | 2011-12-20 22:54:18 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-12-21 10:47:01 -0800 |
commit | f7519d8c8290765a9408a52db4ba4a368ff72ca5 (patch) | |
tree | 2942b23d36d15a87588e1a1660b0f552c02eedae /sound/soc | |
parent | c116abc43df9ce3ebe5fbf2fbd6ae2edd6a9bd87 (diff) | |
download | linux-stable-f7519d8c8290765a9408a52db4ba4a368ff72ca5.tar.gz linux-stable-f7519d8c8290765a9408a52db4ba4a368ff72ca5.tar.bz2 linux-stable-f7519d8c8290765a9408a52db4ba4a368ff72ca5.zip |
ARM: OMAP1: ams-delta: register latch dependent devices later
In preparation to converting Amstrad Delta on-board latches to
basic_mmio_gpio devices, registration of platform devices which depend
on latches and will require initialization of their GPIO pins first,
should be moved out of .machine_init down to late_initcall level, as the
gpio-generic driver is not available until device_initcall time. The
latch reset operation, which will be replaced with GPIO initialization,
must also be moved to late_initcall for the same reason.
Since there was already another, separate arch_initcall function for
setting up one of those latch dependent devices, the on-board modem
device, reuse that function, i.e., rename it to a name that matches the
new purpose, extend with other device setup relocated from
.machine_init, and move down to the late_initcall level.
While being at it, add missing gpio_free() in case the modem platform
device registration fails.
Thanks to Tony Lindgren <tony@atomide.com> who suggested this approach
instead of shifting up the gpio-generic driver initialization.
In addition, defer registration of the Amstrad Delta ASoC and serio
devices, done from their device driver files, until late_initcall time,
as those drivers will depend on their GPIO pins already requested from
the board late_init() function until updated to register their GPIO pins
themselves.
Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/omap/ams-delta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index ccb8a6aa1817..be81bc791b11 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@ -636,7 +636,7 @@ err: platform_device_put(ams_delta_audio_platform_device); return ret; } -module_init(ams_delta_module_init); +late_initcall(ams_delta_module_init); static void __exit ams_delta_module_exit(void) { |