Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd8071c authored by Mike Rapoport's avatar Mike Rapoport Committed by Tony Lindgren
Browse files

omap: use common initialization for PMIC i2c bus 



Introduce omap_pmic_init that registers i2c bus and PMIC device on that
bus and add omap2/3/4 wrappers for common cases.

Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 96974a24

arch/arm/mach-omap2/board-2430sdp.c

+2 −11
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


#include "mux.h"

#include "hsmmc.h"

#include "common-board-devices.h"



#define SDP2430_CS0_BASE	0x04000000

#define SECONDARY_LCD_GPIO		147
@@ -180,15 +181,6 @@ static struct twl4030_platform_data sdp2430_twldata = { 
	.vmmc1		= &sdp2430_vmmc1,

};



static struct i2c_board_info __initdata sdp2430_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl4030", 0x48),

		.flags = I2C_CLIENT_WAKE,

		.irq = INT_24XX_SYS_NIRQ,

		.platform_data = &sdp2430_twldata,

	},

};



static struct i2c_board_info __initdata sdp2430_i2c1_boardinfo[] = {

	{

		I2C_BOARD_INFO("isp1301_omap", 0x2D),
@@ -201,8 +193,7 @@ static int __init omap2430_i2c_init(void) 
{

	omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,

			ARRAY_SIZE(sdp2430_i2c1_boardinfo));

	omap_register_i2c_bus(2, 2600, sdp2430_i2c_boardinfo,

			ARRAY_SIZE(sdp2430_i2c_boardinfo));

	omap2_pmic_init("twl4030", &sdp2430_twldata);

	return 0;

}

arch/arm/mach-omap2/board-3430sdp.c

+1 −11
Original line number Diff line number Diff line
@@ -528,20 +528,10 @@ static struct twl4030_platform_data sdp3430_twldata = { 
	.vpll2		= &sdp3430_vpll2,

};



static struct i2c_board_info __initdata sdp3430_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl4030", 0x48),

		.flags = I2C_CLIENT_WAKE,

		.irq = INT_34XX_SYS_NIRQ,

		.platform_data = &sdp3430_twldata,

	},

};



static int __init omap3430_i2c_init(void)

{

	/* i2c1 for PMIC only */

	omap_register_i2c_bus(1, 2600, sdp3430_i2c_boardinfo,

			ARRAY_SIZE(sdp3430_i2c_boardinfo));

	omap3_pmic_init("twl4030", &sdp3430_twldata);

	/* i2c2 on camera connector (for sensor control) and optional isp1301 */

	omap_register_i2c_bus(2, 400, NULL, 0);

	/* i2c3 on display connector (for DVI, tfp410) */

arch/arm/mach-omap2/board-4430sdp.c

+2 −14
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "hsmmc.h"

#include "timer-gp.h"

#include "control.h"

#include "common-board-devices.h"



#define ETH_KS8851_IRQ			34

#define ETH_KS8851_POWER_ON		48
@@ -575,14 +576,6 @@ static struct twl4030_platform_data sdp4430_twldata = { 
	.usb		= &omap4_usbphy_data

};



static struct i2c_board_info __initdata sdp4430_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("twl6030", 0x48),

		.flags = I2C_CLIENT_WAKE,

		.irq = OMAP44XX_IRQ_SYS_1N,

		.platform_data = &sdp4430_twldata,

	},

};

static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = {

	{

		I2C_BOARD_INFO("tmp105", 0x48),
@@ -598,12 +591,7 @@ static struct i2c_board_info __initdata sdp4430_i2c_4_boardinfo[] = { 
};

static int __init omap4_i2c_init(void)

{

	/*

	 * Phoenix Audio IC needs I2C1 to

	 * start with 400 KHz or less

	 */

	omap_register_i2c_bus(1, 400, sdp4430_i2c_boardinfo,

			ARRAY_SIZE(sdp4430_i2c_boardinfo));

	omap4_pmic_init("twl6030", &sdp4430_twldata);

	omap_register_i2c_bus(2, 400, NULL, 0);

	omap_register_i2c_bus(3, 400, sdp4430_i2c_3_boardinfo,

				ARRAY_SIZE(sdp4430_i2c_3_boardinfo));

arch/arm/mach-omap2/board-cm-t35.c

+1 −11
Original line number Diff line number Diff line
@@ -541,19 +541,9 @@ static struct twl4030_platform_data cm_t35_twldata = { 
	.vpll2		= &cm_t35_vpll2,

};



static struct i2c_board_info __initdata cm_t35_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("tps65930", 0x48),

		.flags		= I2C_CLIENT_WAKE,

		.irq		= INT_34XX_SYS_NIRQ,

		.platform_data	= &cm_t35_twldata,

	},

};



static void __init cm_t35_init_i2c(void)

{

	omap_register_i2c_bus(1, 2600, cm_t35_i2c_boardinfo,

			      ARRAY_SIZE(cm_t35_i2c_boardinfo));

	omap3_pmic_init("tps65930", &cm_t35_twldata);

}



static void __init cm_t35_init_early(void)

arch/arm/mach-omap2/board-devkit8000.c

+1 −11
Original line number Diff line number Diff line
@@ -366,19 +366,9 @@ static struct twl4030_platform_data devkit8000_twldata = { 
	.keypad		= &devkit8000_kp_data,

};



static struct i2c_board_info __initdata devkit8000_i2c_boardinfo[] = {

	{

		I2C_BOARD_INFO("tps65930", 0x48),

		.flags = I2C_CLIENT_WAKE,

		.irq = INT_34XX_SYS_NIRQ,

		.platform_data = &devkit8000_twldata,

	},

};



static int __init devkit8000_i2c_init(void)

{

	omap_register_i2c_bus(1, 2600, devkit8000_i2c_boardinfo,

			ARRAY_SIZE(devkit8000_i2c_boardinfo));

	omap3_pmic_init("tps65930", &devkit8000_twldata);

	/* Bus 3 is attached to the DVI port where devices like the pico DLP

	 * projector don't work reliably with 400kHz */

	omap_register_i2c_bus(3, 400, NULL, 0);