summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-01-11 11:24:19 -0800
committerTony Lindgren <tony@atomide.com>2013-01-11 11:24:19 -0800
commita6cf912c6047077a6eb860ed8dbfa342376ee395 (patch)
tree23054ab4c83865400ffde599dd0bb3dd34664fe6 /arch/arm/mach-omap1
parentb76c8b19b082c3fc84725de0d3ba5ee1f571c0ae (diff)
downloadblackbird-op-linux-a6cf912c6047077a6eb860ed8dbfa342376ee395.tar.gz
blackbird-op-linux-a6cf912c6047077a6eb860ed8dbfa342376ee395.zip
ARM: OMAP: Fix i2c cmdline initcall for multiplatform
We only want this initcall to run when the kernel is booted on omap SoCs. Fix the issue by initializing the the initcall from separately for omap1 and omap2+. This fixes the issue for omap2+ multiplatform configs as we are using omap_subsys_initcall there. Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/i2c.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c
index faca808cb3d9..7f5761cffd2e 100644
--- a/arch/arm/mach-omap1/i2c.c
+++ b/arch/arm/mach-omap1/i2c.c
@@ -91,3 +91,9 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *pdata,
return platform_device_register(pdev);
}
+
+static int __init omap_i2c_cmdline(void)
+{
+ return omap_register_i2c_bus_cmdline();
+}
+subsys_initcall(omap_i2c_cmdline);
OpenPOWER on IntegriCloud