diff options
| author | Daniel Mack <zonque@gmail.com> | 2012-12-14 11:36:40 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-01-14 09:42:29 -0800 |
| commit | 2f98ca895198c1c6f5c9f418e1bbf84660d9ba4f (patch) | |
| tree | e710bdf79a208627a26075ed099385a89686a1e4 /arch/arm/mach-omap2/gpmc.c | |
| parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
| download | lwn-2f98ca895198c1c6f5c9f418e1bbf84660d9ba4f.tar.gz lwn-2f98ca895198c1c6f5c9f418e1bbf84660d9ba4f.zip | |
ARM: OMAP: gpmc: don't create devices from initcall on DT
On DT driven boards, the gpmc node will match the driver. Hence, there's
no need to do that unconditionally from the initcall.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 8033cb747c86..1f0ec79aabf1 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -1214,6 +1214,13 @@ static int __init omap_gpmc_init(void) struct platform_device *pdev; char *oh_name = "gpmc"; + /* + * if the board boots up with a populated DT, do not + * manually add the device from this initcall + */ + if (of_have_populated_dt()) + return -ENODEV; + oh = omap_hwmod_lookup(oh_name); if (!oh) { pr_err("Could not look up %s\n", oh_name); |