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

Commit b22f954b authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

OMAP4: Move common twl6030 configuration to twl-common 



Reduce the amount of duplicated code by moving the common
configuration for TWL6030 (on OMAP4 platform) to the
twl-common file.
Use the omap4_pmic_get_config function from board files to
properly configure the PMIC with the common fields.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parent a53b8e3b

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

+10 −131
Original line number Diff line number Diff line
@@ -302,14 +302,6 @@ static struct omap_musb_board_data musb_board_data = { 
	.power			= 100,

};



static struct twl4030_usb_data omap4_usbphy_data = {

	.phy_init	= omap4430_phy_init,

	.phy_exit	= omap4430_phy_exit,

	.phy_power	= omap4430_phy_power,

	.phy_set_clock	= omap4430_phy_set_clk,

	.phy_suspend	= omap4430_phy_suspend,

};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 2,
@@ -332,10 +324,6 @@ static struct regulator_consumer_supply sdp4430_vaux_supply[] = { 
	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),

};



static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int ret = 0;
@@ -394,61 +382,6 @@ static struct regulator_init_data sdp4430_vaux1 = { 
	.consumer_supplies      = sdp4430_vaux_supply,

};



static struct regulator_init_data sdp4430_vaux2 = {

	.constraints = {

		.min_uV			= 1200000,

		.max_uV			= 2800000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vaux3 = {

	.constraints = {

		.min_uV			= 1000000,

		.max_uV			= 3000000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



/* VMMC1 for MMC1 card */

static struct regulator_init_data sdp4430_vmmc = {

	.constraints = {

		.min_uV			= 1200000,

		.max_uV			= 3000000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = 1,

	.consumer_supplies      = sdp4430_vmmc_supply,

};



static struct regulator_init_data sdp4430_vpp = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 2500000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vusim = {

	.constraints = {

		.min_uV			= 1200000,
@@ -462,74 +395,10 @@ static struct regulator_init_data sdp4430_vusim = { 
	},

};



static struct regulator_init_data sdp4430_vana = {

	.constraints = {

		.min_uV			= 2100000,

		.max_uV			= 2100000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vcxio = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vdac = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_vusb = {

	.constraints = {

		.min_uV			= 3300000,

		.max_uV			= 3300000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 =	REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data sdp4430_clk32kg = {

	.constraints = {

		.valid_ops_mask		= REGULATOR_CHANGE_STATUS,

	},

};



static struct twl4030_platform_data sdp4430_twldata = {

	.irq_base	= TWL6030_IRQ_BASE,

	.irq_end	= TWL6030_IRQ_END,



	/* Regulators */

	.vmmc		= &sdp4430_vmmc,

	.vpp		= &sdp4430_vpp,

	.vusim		= &sdp4430_vusim,

	.vana		= &sdp4430_vana,

	.vcxio		= &sdp4430_vcxio,

	.vdac		= &sdp4430_vdac,

	.vusb		= &sdp4430_vusb,

	.vaux1		= &sdp4430_vaux1,

	.vaux2		= &sdp4430_vaux2,

	.vaux3		= &sdp4430_vaux3,

	.clk32kg	= &sdp4430_clk32kg,

	.usb		= &omap4_usbphy_data

};



static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = {
@@ -547,6 +416,16 @@ static struct i2c_board_info __initdata sdp4430_i2c_4_boardinfo[] = { 
};

static int __init omap4_i2c_init(void)

{

	omap4_pmic_get_config(&sdp4430_twldata, TWL_COMMON_PDATA_USB,

			TWL_COMMON_REGULATOR_VDAC |

			TWL_COMMON_REGULATOR_VAUX2 |

			TWL_COMMON_REGULATOR_VAUX3 |

			TWL_COMMON_REGULATOR_VMMC |

			TWL_COMMON_REGULATOR_VPP |

			TWL_COMMON_REGULATOR_VANA |

			TWL_COMMON_REGULATOR_VCXIO |

			TWL_COMMON_REGULATOR_VUSB |

			TWL_COMMON_REGULATOR_CLK32KG);

	omap4_pmic_init("twl6030", &sdp4430_twldata);

	omap_register_i2c_bus(2, 400, NULL, 0);

	omap_register_i2c_bus(3, 400, sdp4430_i2c_3_boardinfo,

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

+12 −134
Original line number Diff line number Diff line
@@ -154,14 +154,6 @@ static struct omap_musb_board_data musb_board_data = { 
	.power			= 100,

};



static struct twl4030_usb_data omap4_usbphy_data = {

	.phy_init	= omap4430_phy_init,

	.phy_exit	= omap4430_phy_exit,

	.phy_power	= omap4430_phy_power,

	.phy_set_clock	= omap4430_phy_set_clk,

	.phy_suspend	= omap4430_phy_suspend,

};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,
@@ -181,10 +173,6 @@ static struct omap2_hsmmc_info mmc[] = { 
	{}	/* Terminator */

};



static struct regulator_consumer_supply omap4_panda_vmmc_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



static struct regulator_consumer_supply omap4_panda_vmmc5_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.4"),

};
@@ -269,128 +257,8 @@ static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers) 
	return 0;

}



static struct regulator_init_data omap4_panda_vaux2 = {

	.constraints = {

		.min_uV			= 1200000,

		.max_uV			= 2800000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_panda_vaux3 = {

	.constraints = {

		.min_uV			= 1000000,

		.max_uV			= 3000000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



/* VMMC1 for MMC1 card */

static struct regulator_init_data omap4_panda_vmmc = {

	.constraints = {

		.min_uV			= 1200000,

		.max_uV			= 3000000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = ARRAY_SIZE(omap4_panda_vmmc_supply),

	.consumer_supplies      = omap4_panda_vmmc_supply,

};



static struct regulator_init_data omap4_panda_vpp = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 2500000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_panda_vana = {

	.constraints = {

		.min_uV			= 2100000,

		.max_uV			= 2100000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_panda_vcxio = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_panda_vdac = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 = REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_panda_vusb = {

	.constraints = {

		.min_uV			= 3300000,

		.max_uV			= 3300000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask	 =	REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_panda_clk32kg = {

	.constraints = {

		.valid_ops_mask		= REGULATOR_CHANGE_STATUS,

	},

};



static struct twl4030_platform_data omap4_panda_twldata = {

	.irq_base	= TWL6030_IRQ_BASE,

	.irq_end	= TWL6030_IRQ_END,



	/* Regulators */

	.vmmc		= &omap4_panda_vmmc,

	.vpp		= &omap4_panda_vpp,

	.vana		= &omap4_panda_vana,

	.vcxio		= &omap4_panda_vcxio,

	.vdac		= &omap4_panda_vdac,

	.vusb		= &omap4_panda_vusb,

	.vaux2		= &omap4_panda_vaux2,

	.vaux3		= &omap4_panda_vaux3,

	.clk32kg	= &omap4_panda_clk32kg,

	.usb		= &omap4_usbphy_data,

};

/* Panda board uses the common PMIC configuration */

static struct twl4030_platform_data omap4_panda_twldata;



/*

 * Display monitor features are burnt in their EEPROM as EDID data. The EEPROM
@@ -404,6 +272,16 @@ static struct i2c_board_info __initdata panda_i2c_eeprom[] = { 


static int __init omap4_panda_i2c_init(void)

{

	omap4_pmic_get_config(&omap4_panda_twldata, TWL_COMMON_PDATA_USB,

			TWL_COMMON_REGULATOR_VDAC |

			TWL_COMMON_REGULATOR_VAUX2 |

			TWL_COMMON_REGULATOR_VAUX3 |

			TWL_COMMON_REGULATOR_VMMC |

			TWL_COMMON_REGULATOR_VPP |

			TWL_COMMON_REGULATOR_VANA |

			TWL_COMMON_REGULATOR_VCXIO |

			TWL_COMMON_REGULATOR_VUSB |

			TWL_COMMON_REGULATOR_CLK32KG);

	omap4_pmic_init("twl6030", &omap4_panda_twldata);

	omap_register_i2c_bus(2, 400, NULL, 0);

	/*

arch/arm/mach-omap2/twl-common.c

+163 −0
Original line number Diff line number Diff line
@@ -23,8 +23,11 @@ 
#include <linux/i2c.h>

#include <linux/i2c/twl.h>

#include <linux/gpio.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>



#include <plat/i2c.h>

#include <plat/usb.h>



#include "twl-common.h"
@@ -44,3 +47,163 @@ void __init omap_pmic_init(int bus, u32 clkrate, 


	omap_register_i2c_bus(bus, clkrate, &pmic_i2c_board_info, 1);

}



static struct twl4030_usb_data omap4_usb_pdata = {

	.phy_init	= omap4430_phy_init,

	.phy_exit	= omap4430_phy_exit,

	.phy_power	= omap4430_phy_power,

	.phy_set_clock	= omap4430_phy_set_clk,

	.phy_suspend	= omap4430_phy_suspend,

};



static struct regulator_init_data omap4_vdac_idata = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_vaux2_idata = {

	.constraints = {

		.min_uV			= 1200000,

		.max_uV			= 2800000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_vaux3_idata = {

	.constraints = {

		.min_uV			= 1000000,

		.max_uV			= 3000000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_consumer_supply omap4_vmmc_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



/* VMMC1 for MMC1 card */

static struct regulator_init_data omap4_vmmc_idata = {

	.constraints = {

		.min_uV			= 1200000,

		.max_uV			= 3000000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = ARRAY_SIZE(omap4_vmmc_supply),

	.consumer_supplies      = omap4_vmmc_supply,

};



static struct regulator_init_data omap4_vpp_idata = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 2500000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE

					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_vana_idata = {

	.constraints = {

		.min_uV			= 2100000,

		.max_uV			= 2100000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_vcxio_idata = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_vusb_idata = {

	.constraints = {

		.min_uV			= 3300000,

		.max_uV			= 3300000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

};



static struct regulator_init_data omap4_clk32kg_idata = {

	.constraints = {

		.valid_ops_mask		= REGULATOR_CHANGE_STATUS,

	},

};



void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,

				  u32 pdata_flags, u32 regulators_flags)

{

	if (!pmic_data->irq_base)

		pmic_data->irq_base = TWL6030_IRQ_BASE;

	if (!pmic_data->irq_end)

		pmic_data->irq_end = TWL6030_IRQ_END;



	/* Common platform data configurations */

	if (pdata_flags & TWL_COMMON_PDATA_USB && !pmic_data->usb)

		pmic_data->usb = &omap4_usb_pdata;



	/* Common regulator configurations */

	if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac)

		pmic_data->vdac = &omap4_vdac_idata;



	if (regulators_flags & TWL_COMMON_REGULATOR_VAUX2 && !pmic_data->vaux2)

		pmic_data->vaux2 = &omap4_vaux2_idata;



	if (regulators_flags & TWL_COMMON_REGULATOR_VAUX3 && !pmic_data->vaux3)

		pmic_data->vaux3 = &omap4_vaux3_idata;



	if (regulators_flags & TWL_COMMON_REGULATOR_VMMC && !pmic_data->vmmc)

		pmic_data->vmmc = &omap4_vmmc_idata;



	if (regulators_flags & TWL_COMMON_REGULATOR_VPP && !pmic_data->vpp)

		pmic_data->vpp = &omap4_vpp_idata;



	if (regulators_flags & TWL_COMMON_REGULATOR_VANA && !pmic_data->vana)

		pmic_data->vana = &omap4_vana_idata;



	if (regulators_flags & TWL_COMMON_REGULATOR_VCXIO && !pmic_data->vcxio)

		pmic_data->vcxio = &omap4_vcxio_idata;



	if (regulators_flags & TWL_COMMON_REGULATOR_VUSB && !pmic_data->vusb)

		pmic_data->vusb = &omap4_vusb_idata;



	if (regulators_flags & TWL_COMMON_REGULATOR_CLK32KG &&

	    !pmic_data->clk32kg)

		pmic_data->clk32kg = &omap4_clk32kg_idata;

}

arch/arm/mach-omap2/twl-common.h

+20 −0
Original line number Diff line number Diff line 
#ifndef __OMAP_PMIC_COMMON__

#define __OMAP_PMIC_COMMON__



#define TWL_COMMON_PDATA_USB		(1 << 0)



/* Common LDO regulators for TWL4030/TWL6030 */

#define TWL_COMMON_REGULATOR_VDAC	(1 << 0)

#define TWL_COMMON_REGULATOR_VAUX1	(1 << 1)

#define TWL_COMMON_REGULATOR_VAUX2	(1 << 2)

#define TWL_COMMON_REGULATOR_VAUX3	(1 << 3)



/* TWL6030 LDO regulators */

#define TWL_COMMON_REGULATOR_VMMC	(1 << 4)

#define TWL_COMMON_REGULATOR_VPP	(1 << 5)

#define TWL_COMMON_REGULATOR_VUSIM	(1 << 6)

#define TWL_COMMON_REGULATOR_VANA	(1 << 7)

#define TWL_COMMON_REGULATOR_VCXIO	(1 << 8)

#define TWL_COMMON_REGULATOR_VUSB	(1 << 9)

#define TWL_COMMON_REGULATOR_CLK32KG	(1 << 10)



struct twl4030_platform_data;



void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq,
@@ -25,4 +42,7 @@ static inline void omap4_pmic_init(const char *pmic_type, 
	omap_pmic_init(1, 400, pmic_type, OMAP44XX_IRQ_SYS_1N, pmic_data);

}



void omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,

			   u32 pdata_flags, u32 regulators_flags);



#endif /* __OMAP_PMIC_COMMON__ */