regulators: Updated ab8500 variable names, macro names and comments (e1159e6d) · Commits · e / devices / android_kernel_teracube_mt6765

drivers/regulator/ab8500.c

+82 −79

Original line number	Original line	Diff line number	Diff line
	@@ -3,18 +3,13 @@
	*		*
	* License Terms: GNU General Public License v2		* License Terms: GNU General Public License v2
	*		*
	* Author: Sundar Iyer <sundar.iyer@stericsson.com> for ST-Ericsson		* Authors: Sundar Iyer <sundar.iyer@stericsson.com> for ST-Ericsson
			* Bengt Jonsson <bengt.g.jonsson@stericsson.com> for ST-Ericsson
	*		*
	* AB8500 peripheral regulators		* AB8500 peripheral regulators
	*		*
	* AB8500 supports the following regulators,		* AB8500 supports the following regulators:
	* LDOs - VAUDIO, VANAMIC2/2, VDIGMIC, VINTCORE12, VTVOUT,		* VAUX1/2/3, VINTCORE, VTVOUT, VAUDIO, VAMIC1/2, VDMIC, VANA
	* VAUX1/2/3, VANA
	*
	* for DB8500 cut 1.0 and previous versions of the silicon, all accesses
	* to registers are through the DB8500 SPI. In cut 1.1 onwards, these
	* accesses are through the DB8500 PRCMU I2C
	*
	*/		*/
	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	@@ -28,6 +23,7 @@

	/**		/**
	* struct ab8500_regulator_info - ab8500 regulator information		* struct ab8500_regulator_info - ab8500 regulator information
			* @dev: device pointer
	* @desc: regulator description		* @desc: regulator description
	* @regulator_dev: regulator device		* @regulator_dev: regulator device
	* @max_uV: maximum voltage (for variable voltage supplies)		* @max_uV: maximum voltage (for variable voltage supplies)
	@@ -35,12 +31,12 @@
	* @fixed_uV: typical voltage (for fixed voltage supplies)		* @fixed_uV: typical voltage (for fixed voltage supplies)
	* @update_bank: bank to control on/off		* @update_bank: bank to control on/off
	* @update_reg: register to control on/off		* @update_reg: register to control on/off
	* @mask: mask to enable/disable regulator		* @update_mask: mask to enable/disable regulator
	* @enable: bits to enable the regulator in normal(high power) mode		* @update_val_enable: bits to enable the regulator in normal (high power) mode
	* @voltage_bank: bank to control regulator voltage		* @voltage_bank: bank to control regulator voltage
	* @voltage_reg: register to control regulator voltage		* @voltage_reg: register to control regulator voltage
	* @voltage_mask: mask to control regulator voltage		* @voltage_mask: mask to control regulator voltage
	* @supported_voltages: supported voltage table		* @voltages: supported voltage table
	* @voltages_len: number of supported voltages for the regulator		* @voltages_len: number of supported voltages for the regulator
	*/		*/
	struct ab8500_regulator_info {		struct ab8500_regulator_info {
	@@ -52,12 +48,12 @@ struct ab8500_regulator_info {
	int fixed_uV;		int fixed_uV;
	u8 update_bank;		u8 update_bank;
	u8 update_reg;		u8 update_reg;
	u8 mask;		u8 update_mask;
	u8 enable;		u8 update_val_enable;
	u8 voltage_bank;		u8 voltage_bank;
	u8 voltage_reg;		u8 voltage_reg;
	u8 voltage_mask;		u8 voltage_mask;
	int const *supported_voltages;		int const *voltages;
	int voltages_len;		int voltages_len;
	};		};

	@@ -112,7 +108,8 @@ static int ab8500_regulator_enable(struct regulator_dev *rdev)
	return -EINVAL;		return -EINVAL;

	ret = abx500_mask_and_set_register_interruptible(info->dev,		ret = abx500_mask_and_set_register_interruptible(info->dev,
	info->update_bank, info->update_reg, info->mask, info->enable);		info->update_bank, info->update_reg,
			info->update_mask, info->update_val_enable);
	if (ret < 0)		if (ret < 0)
	dev_err(rdev_get_dev(rdev),		dev_err(rdev_get_dev(rdev),
	"couldn't set enable bits for regulator\n");		"couldn't set enable bits for regulator\n");
	@@ -129,7 +126,8 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)
	return -EINVAL;		return -EINVAL;

	ret = abx500_mask_and_set_register_interruptible(info->dev,		ret = abx500_mask_and_set_register_interruptible(info->dev,
	info->update_bank, info->update_reg, info->mask, 0x0);		info->update_bank, info->update_reg,
			info->update_mask, 0x0);
	if (ret < 0)		if (ret < 0)
	dev_err(rdev_get_dev(rdev),		dev_err(rdev_get_dev(rdev),
	"couldn't set disable bits for regulator\n");		"couldn't set disable bits for regulator\n");
	@@ -154,7 +152,7 @@ static int ab8500_regulator_is_enabled(struct regulator_dev *rdev)
	return ret;		return ret;
	}		}

	if (value & info->mask)		if (value & info->update_mask)
	return true;		return true;
	else		else
	return false;		return false;
	@@ -176,7 +174,7 @@ static int ab8500_list_voltage(struct regulator_dev *rdev, unsigned selector)
	if (selector >= info->voltages_len)		if (selector >= info->voltages_len)
	return -EINVAL;		return -EINVAL;

	return info->supported_voltages[selector];		return info->voltages[selector];
	}		}

	static int ab8500_regulator_get_voltage(struct regulator_dev *rdev)		static int ab8500_regulator_get_voltage(struct regulator_dev *rdev)
	@@ -200,9 +198,9 @@ static int ab8500_regulator_get_voltage(struct regulator_dev *rdev)
	/* vintcore has a different layout */		/* vintcore has a different layout */
	value &= info->voltage_mask;		value &= info->voltage_mask;
	if (regulator_id == AB8500_LDO_INTCORE)		if (regulator_id == AB8500_LDO_INTCORE)
	ret = info->supported_voltages[value >> 0x3];		ret = info->voltages[value >> 0x3];
	else		else
	ret = info->supported_voltages[value];		ret = info->voltages[value];

	return ret;		return ret;
	}		}
	@@ -215,8 +213,8 @@ static int ab8500_get_best_voltage_index(struct regulator_dev *rdev,

	/* check the supported voltage */		/* check the supported voltage */
	for (i = 0; i < info->voltages_len; i++) {		for (i = 0; i < info->voltages_len; i++) {
	if ((info->supported_voltages[i] >= min_uV) &&		if ((info->voltages[i] >= min_uV) &&
	(info->supported_voltages[i] <= max_uV))		(info->voltages[i] <= max_uV))
	return i;		return i;
	}		}

	@@ -284,10 +282,10 @@ static struct regulator_ops ab8500_ldo_fixed_ops = {
	.list_voltage = ab8500_list_voltage,		.list_voltage = ab8500_list_voltage,
	};		};

	#define AB8500_LDO(_id, min, max, bank, reg, reg_mask, \		#define AB8500_LDO(_id, _min_mV, _max_mV, \
	reg_enable, volt_bank, volt_reg, volt_mask, \		_u_bank, _u_reg, _u_mask, _u_val_enable, \
	voltages, len_volts) \		_v_bank, _v_reg, _v_mask, _v_table, _v_table_len) \
	{ \		[AB8500_LDO_##_id] = { \
	.desc = { \		.desc = { \
	.name = "LDO-" #_id, \		.name = "LDO-" #_id, \
	.ops = &ab8500_regulator_ops, \		.ops = &ab8500_regulator_ops, \
	@@ -295,23 +293,23 @@ static struct regulator_ops ab8500_ldo_fixed_ops = {
	.id = AB8500_LDO_##_id, \		.id = AB8500_LDO_##_id, \
	.owner = THIS_MODULE, \		.owner = THIS_MODULE, \
	}, \		}, \
	.min_uV = (min) * 1000, \		.min_uV = (_min_mV) * 1000, \
	.max_uV = (max) * 1000, \		.max_uV = (_max_mV) * 1000, \
	.update_bank = bank, \		.update_bank = _u_bank, \
	.update_reg = reg, \		.update_reg = _u_reg, \
	.mask = reg_mask, \		.update_mask = _u_mask, \
	.enable = reg_enable, \		.update_val_enable = _u_val_enable, \
	.voltage_bank = volt_bank, \		.voltage_bank = _v_bank, \
	.voltage_reg = volt_reg, \		.voltage_reg = _v_reg, \
	.voltage_mask = volt_mask, \		.voltage_mask = _v_mask, \
	.supported_voltages = voltages, \		.voltages = _v_table, \
	.voltages_len = len_volts, \		.voltages_len = _v_table_len, \
	.fixed_uV = 0, \		.fixed_uV = 0, \
	}		}

	#define AB8500_FIXED_LDO(_id, fixed, bank, reg, \		#define AB8500_FIXED_LDO(_id, _fixed_mV, \
	reg_mask, reg_enable) \		_u_bank, _u_reg, _u_mask, _u_val_enable) \
	{ \		[AB8500_LDO_##_id] = { \
	.desc = { \		.desc = { \
	.name = "LDO-" #_id, \		.name = "LDO-" #_id, \
	.ops = &ab8500_ldo_fixed_ops, \		.ops = &ab8500_ldo_fixed_ops, \
	@@ -319,39 +317,44 @@ static struct regulator_ops ab8500_ldo_fixed_ops = {
	.id = AB8500_LDO_##_id, \		.id = AB8500_LDO_##_id, \
	.owner = THIS_MODULE, \		.owner = THIS_MODULE, \
	}, \		}, \
	.fixed_uV = fixed * 1000, \		.fixed_uV = (_fixed_mV) * 1000, \
	.update_bank = bank, \		.update_bank = _u_bank, \
	.update_reg = reg, \		.update_reg = _u_reg, \
	.mask = reg_mask, \		.update_mask = _u_mask, \
	.enable = reg_enable, \		.update_val_enable = _u_val_enable, \
	}		}

	static struct ab8500_regulator_info ab8500_regulator_info[] = {		static struct ab8500_regulator_info ab8500_regulator_info[] = {
	/*		/*
	* Variable Voltage LDOs		* Variable Voltage Regulators
	* name, min uV, max uV, ctrl bank, ctrl reg, reg mask, enable mask,		* name, min mV, max mV,
	* volt ctrl bank, volt ctrl reg, volt ctrl mask, volt table,		* update bank, reg, mask, enable val
	* num supported volts		* volt bank, reg, mask, table, table length
	*/		*/
	AB8500_LDO(AUX1, 1100, 3300, 0x04, 0x09, 0x3, 0x1, 0x04, 0x1f, 0xf,		AB8500_LDO(AUX1, 1100, 3300,
			0x04, 0x09, 0x03, 0x01, 0x04, 0x1f, 0x0f,
	ldo_vauxn_voltages, ARRAY_SIZE(ldo_vauxn_voltages)),		ldo_vauxn_voltages, ARRAY_SIZE(ldo_vauxn_voltages)),
	AB8500_LDO(AUX2, 1100, 3300, 0x04, 0x09, 0xc, 0x4, 0x04, 0x20, 0xf,		AB8500_LDO(AUX2, 1100, 3300,
			0x04, 0x09, 0x0c, 0x04, 0x04, 0x20, 0x0f,
	ldo_vauxn_voltages, ARRAY_SIZE(ldo_vauxn_voltages)),		ldo_vauxn_voltages, ARRAY_SIZE(ldo_vauxn_voltages)),
	AB8500_LDO(AUX3, 1100, 3300, 0x04, 0x0a, 0x3, 0x1, 0x04, 0x21, 0x7,		AB8500_LDO(AUX3, 1100, 3300,
			0x04, 0x0a, 0x03, 0x01, 0x04, 0x21, 0x07,
	ldo_vaux3_voltages, ARRAY_SIZE(ldo_vaux3_voltages)),		ldo_vaux3_voltages, ARRAY_SIZE(ldo_vaux3_voltages)),
	AB8500_LDO(INTCORE, 1100, 3300, 0x03, 0x80, 0x44, 0x4, 0x03, 0x80, 0x38,		AB8500_LDO(INTCORE, 1100, 3300,
			0x03, 0x80, 0x44, 0x04, 0x03, 0x80, 0x38,
	ldo_vintcore_voltages, ARRAY_SIZE(ldo_vintcore_voltages)),		ldo_vintcore_voltages, ARRAY_SIZE(ldo_vintcore_voltages)),

	/*		/*
	* Fixed Voltage LDOs		* Fixed Voltage Regulators
	* name, o/p uV, ctrl bank, ctrl reg, enable, disable		* name, fixed mV,
			* update bank, reg, mask, enable val
	*/		*/
	AB8500_FIXED_LDO(TVOUT, 2000, 0x03, 0x80, 0x82, 0x2),		AB8500_FIXED_LDO(TVOUT, 2000, 0x03, 0x80, 0x82, 0x02),
	AB8500_FIXED_LDO(AUDIO, 2000, 0x03, 0x83, 0x2, 0x2),		AB8500_FIXED_LDO(AUDIO, 2000, 0x03, 0x83, 0x02, 0x02),
	AB8500_FIXED_LDO(ANAMIC1, 2050, 0x03, 0x83, 0x08, 0x08),		AB8500_FIXED_LDO(ANAMIC1, 2050, 0x03, 0x83, 0x08, 0x08),
	AB8500_FIXED_LDO(ANAMIC2, 2050, 0x03, 0x83, 0x10, 0x10),		AB8500_FIXED_LDO(ANAMIC2, 2050, 0x03, 0x83, 0x10, 0x10),
	AB8500_FIXED_LDO(DMIC, 1800, 0x03, 0x83, 0x04, 0x04),		AB8500_FIXED_LDO(DMIC, 1800, 0x03, 0x83, 0x04, 0x04),
	AB8500_FIXED_LDO(ANA, 1200, 0x04, 0x06, 0xc, 0x4),		AB8500_FIXED_LDO(ANA, 1200, 0x04, 0x06, 0x0c, 0x04),
	};		};

	static __devinit int ab8500_regulator_probe(struct platform_device *pdev)		static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
	@@ -385,7 +388,7 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
	if (info->desc.id == AB8500_LDO_AUX3) {		if (info->desc.id == AB8500_LDO_AUX3) {
	info->desc.n_voltages =		info->desc.n_voltages =
	ARRAY_SIZE(ldo_vauxn_voltages);		ARRAY_SIZE(ldo_vauxn_voltages);
	info->supported_voltages = ldo_vauxn_voltages;		info->voltages = ldo_vauxn_voltages;
	info->voltages_len =		info->voltages_len =
	ARRAY_SIZE(ldo_vauxn_voltages);		ARRAY_SIZE(ldo_vauxn_voltages);
	info->voltage_mask = 0xf;		info->voltage_mask = 0xf;