[PATCH v5 02/14] ARM: OMAP2+: gpmc: Adapt to HWMOD
flat view
STALE5240d
SUPERSEDED
From: Afzal Mohammed <hidden>
Date: 2012-06-11 14:26:24
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
Status: Superseded by v9 (posted 2012-09-11). [go to v9]
Revision v5 (5 revisions archived).
Revisions (5)
Create API for platforms to adapt gpmc to HWMOD Signed-off-by: Afzal Mohammed <redacted> --- arch/arm/mach-omap2/gpmc.c | 31 +++++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/gpmc.h | 2 ++ 2 files changed, 33 insertions(+)
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 517953f..b471c2f 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c@@ -27,6 +27,7 @@ #include <asm/mach-types.h> #include <plat/gpmc.h> +#include <plat/omap_device.h> #include <plat/sdrc.h>
@@ -898,6 +899,36 @@ static int __init gpmc_init(void) } postcore_initcall(gpmc_init); +__init int omap_gpmc_init(struct gpmc_pdata *pdata) +{ + struct omap_hwmod *oh; + struct platform_device *pdev; + char *name = "omap-gpmc"; + char *oh_name = "gpmc"; + + oh = omap_hwmod_lookup(oh_name); + if (!oh) { + pr_err("Could not look up %s\n", oh_name); + return -ENODEV; + } + + pdev = omap_device_build(name, -1, oh, pdata, + sizeof(*pdata), NULL, 0, 0); + if (IS_ERR(pdev)) { + WARN(1, "Can't build omap_device for %s:%s.\n", + name, oh->name); + return PTR_ERR(pdev); + } + + gpmc_l3_clk = clk_get(NULL, oh->main_clk); + if (IS_ERR(gpmc_l3_clk)) { + pr_err("Could not get GPMC clock\n"); + return PTR_ERR(gpmc_l3_clk); + } + + return 0; +} + static irqreturn_t gpmc_handle_irq(int irq, void *dev) { int i;
diff --git a/arch/arm/plat-omap/include/plat/gpmc.h b/arch/arm/plat-omap/include/plat/gpmc.h
index 21a8cce..698fa33 100644
--- a/arch/arm/plat-omap/include/plat/gpmc.h
+++ b/arch/arm/plat-omap/include/plat/gpmc.h@@ -207,6 +207,8 @@ struct gpmc_nand_regs { extern void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs); extern int gpmc_get_client_irq(unsigned irq_config); +extern int omap_gpmc_init(struct gpmc_pdata *pdata); + extern unsigned int gpmc_ns_to_ticks(unsigned int time_ns); extern unsigned int gpmc_ps_to_ticks(unsigned int time_ps); extern unsigned int gpmc_ticks_to_ns(unsigned int ticks);
--
1.7.10.2