[PATCH v5 03/14] ARM: OMAP2+: gpmc: driver migration helper
flat view
STALE5231d
SUPERSEDED
From: Afzal Mohammed <hidden>
Date: 2012-06-11 14:26:32
Also in:
linux-omap
Subsystem:
arm port, omap general purpose memory controller support, omap power management support, omap2+ support, the rest · Maintainers:
Russell King, Roger Quadros, Tony Lindgren, Kevin Hilman, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Linus Torvalds
Revision v5 of 14 in this series.
Revisions (14)
A driver is being created out of GPMC code. This is being attempted to acheive by not breaking existing interface, necessitating requirement of GPMC peripherals being able to work with as well as without the help of driver. To not break existing, initcall is required as in old interface GPMC is configured at arch initcall and GPMC should be ready to handle old interface by that time Signed-off-by: Afzal Mohammed <redacted> --- arch/arm/mach-omap2/gpmc.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index b471c2f..6dbddb9 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c@@ -902,7 +902,7 @@ postcore_initcall(gpmc_init); __init int omap_gpmc_init(struct gpmc_pdata *pdata) { struct omap_hwmod *oh; - struct platform_device *pdev; + static struct platform_device *pdev; char *name = "omap-gpmc"; char *oh_name = "gpmc";
@@ -912,6 +912,12 @@ __init int omap_gpmc_init(struct gpmc_pdata *pdata) return -ENODEV; } + if (pdev != NULL) { + clk_put(gpmc_l3_clk); + omap_device_delete(pdev->archdata.od); + platform_device_unregister(pdev); + } + pdev = omap_device_build(name, -1, oh, pdata, sizeof(*pdata), NULL, 0, 0); if (IS_ERR(pdev)) {
@@ -929,6 +935,17 @@ __init int omap_gpmc_init(struct gpmc_pdata *pdata) return 0; } +static int __init gpmc_pre_init(void) +{ + static struct gpmc_device_pdata *gpmc_device_data[1]; + struct gpmc_pdata gpmc_data = { + .device_pdata = gpmc_device_data, + }; + + return omap_gpmc_init(&gpmc_data); +} +postcore_initcall(gpmc_pre_init); + static irqreturn_t gpmc_handle_irq(int irq, void *dev) { int i;
--
1.7.10.2