diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-01-11 11:24:19 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-01-11 11:24:19 -0800 |
| commit | a6cf912c6047077a6eb860ed8dbfa342376ee395 (patch) | |
| tree | 23054ab4c83865400ffde599dd0bb3dd34664fe6 /arch/arm/plat-omap/include | |
| parent | b76c8b19b082c3fc84725de0d3ba5ee1f571c0ae (diff) | |
| download | linux-3.10-a6cf912c6047077a6eb860ed8dbfa342376ee395.tar.gz linux-3.10-a6cf912c6047077a6eb860ed8dbfa342376ee395.tar.bz2 linux-3.10-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/plat-omap/include')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/i2c.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h index 7a9028cb5a7..810629d7966 100644 --- a/arch/arm/plat-omap/include/plat/i2c.h +++ b/arch/arm/plat-omap/include/plat/i2c.h @@ -32,6 +32,7 @@ int omap_i2c_add_bus(struct omap_i2c_bus_platform_data *i2c_pdata, extern int omap_register_i2c_bus(int bus_id, u32 clkrate, struct i2c_board_info const *info, unsigned len); +extern int omap_register_i2c_bus_cmdline(void); #else static inline int omap_register_i2c_bus(int bus_id, u32 clkrate, struct i2c_board_info const *info, @@ -39,6 +40,11 @@ static inline int omap_register_i2c_bus(int bus_id, u32 clkrate, { return 0; } + +static inline int omap_register_i2c_bus_cmdline(void) +{ + return 0; +} #endif struct omap_hwmod; |