Commit 4c84b4dd authored by Lee Jones's avatar Lee Jones Committed by Mark Brown
Browse files

regulator: ab8500: Update vdmic, vamic[1|2] parameters for AB8540 



Add voltage setting for vdmic; add LP mode setting for vamic1,2.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3fe52289

drivers/regulator/ab8500.c

+40 −5
Original line number Diff line number Diff line
@@ -212,9 +212,18 @@ static const unsigned int ldo_vaudio_voltages[] = { 
	2600000,	/* Duplicated in Vaudio and IsoUicc Control register. */

};



static const unsigned int ldo_vdmic_voltages[] = {

	1800000,

	1900000,

	2000000,

	2850000,

};



static DEFINE_MUTEX(shared_mode_mutex);

static struct ab8500_shared_mode ldo_anamic1_shared;

static struct ab8500_shared_mode ldo_anamic2_shared;

static struct ab8500_shared_mode ab8540_ldo_anamic1_shared;

static struct ab8500_shared_mode ab8540_ldo_anamic2_shared;



static int ab8500_regulator_enable(struct regulator_dev *rdev)

{
@@ -1624,46 +1633,64 @@ static struct ab8500_regulator_info 
	[AB8540_LDO_ANAMIC1] = {

		.desc = {

			.name		= "LDO-ANAMIC1",

			.ops		= &ab8500_regulator_ops,

			.ops		= &ab8500_regulator_anamic_mode_ops,

			.type		= REGULATOR_VOLTAGE,

			.id		= AB8540_LDO_ANAMIC1,

			.owner		= THIS_MODULE,

			.n_voltages	= 1,

			.volt_table	= fixed_2050000_voltage,

		},

		.shared_mode		= &ab8540_ldo_anamic1_shared,

		.update_bank		= 0x03,

		.update_reg		= 0x83,

		.update_mask		= 0x08,

		.update_val		= 0x08,

		.mode_bank		= 0x03,

		.mode_reg		= 0x83,

		.mode_mask		= 0x20,

		.mode_val_idle		= 0x20,

		.mode_val_normal	= 0x00,

	},

	[AB8540_LDO_ANAMIC2] = {

		.desc = {

			.name		= "LDO-ANAMIC2",

			.ops		= &ab8500_regulator_ops,

			.ops		= &ab8500_regulator_anamic_mode_ops,

			.type		= REGULATOR_VOLTAGE,

			.id		= AB8540_LDO_ANAMIC2,

			.owner		= THIS_MODULE,

			.n_voltages	= 1,

			.volt_table	= fixed_2050000_voltage,

		},

		.shared_mode		= &ab8540_ldo_anamic2_shared,

		.update_bank		= 0x03,

		.update_reg		= 0x83,

		.update_mask		= 0x10,

		.update_val		= 0x10,

		.mode_bank		= 0x03,

		.mode_reg		= 0x83,

		.mode_mask		= 0x20,

		.mode_val_idle		= 0x20,

		.mode_val_normal	= 0x00,

	},

	[AB8540_LDO_DMIC] = {

		.desc = {

			.name		= "LDO-DMIC",

			.ops		= &ab8500_regulator_ops,

			.ops		= &ab8500_regulator_volt_mode_ops,

			.type		= REGULATOR_VOLTAGE,

			.id		= AB8540_LDO_DMIC,

			.owner		= THIS_MODULE,

			.n_voltages	= 1,

			.n_voltages	= ARRAY_SIZE(ldo_vdmic_voltages),

		},

		.load_lp_uA		= 1000,

		.update_bank		= 0x03,

		.update_reg		= 0x83,

		.update_mask		= 0x04,

		.update_val		= 0x04,

		.voltage_bank		= 0x03,

		.voltage_reg		= 0x83,

		.voltage_mask		= 0xc0,

		.voltages		= ldo_vdmic_voltages,

		.voltages_len		= ARRAY_SIZE(ldo_vdmic_voltages),

	},



	/*
@@ -1718,6 +1745,14 @@ static struct ab8500_shared_mode ldo_anamic2_shared = { 
	.shared_regulator = &ab8505_regulator_info[AB8505_LDO_ANAMIC1],

};



static struct ab8500_shared_mode ab8540_ldo_anamic1_shared = {

	.shared_regulator = &ab8540_regulator_info[AB8540_LDO_ANAMIC2],

};



static struct ab8500_shared_mode ab8540_ldo_anamic2_shared = {

	.shared_regulator = &ab8540_regulator_info[AB8540_LDO_ANAMIC1],

};



struct ab8500_reg_init {

	u8 bank;

	u8 addr;