Commit a6cf912c authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b76c8b19

arch/arm/mach-omap1/i2c.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-omap2/i2c.c

+5 −0
Original line number Diff line number Diff line
@@ -185,3 +185,8 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *i2c_pdata, 
	return PTR_RET(pdev);

}



static  int __init omap_i2c_cmdline(void)

{

	return omap_register_i2c_bus_cmdline();

}

omap_subsys_initcall(omap_i2c_cmdline);

arch/arm/plat-omap/i2c.c

+1 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ __setup("i2c_bus=", omap_i2c_bus_setup); 
 * Register busses defined in command line but that are not registered with

 * omap_register_i2c_bus from board initialization code.

 */

static int __init omap_register_i2c_bus_cmdline(void)

int __init omap_register_i2c_bus_cmdline(void)

{

	int i, err = 0;
@@ -83,7 +83,6 @@ static int __init omap_register_i2c_bus_cmdline(void) 
out:

	return err;

}

subsys_initcall(omap_register_i2c_bus_cmdline);



/**

 * omap_register_i2c_bus - register I2C bus with device descriptors

arch/arm/plat-omap/include/plat/i2c.h

+6 −0
Original line number Diff line number Diff line
@@ -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;