Commit 99765cc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator: return set_mode is same mode is requested
  Regulators: ab3100/bq24022: add a missing .owner field in regulator_desc
  twl6030: regulator: Remove vsel tables and use formula for calculation
  mc13783-regulator: fix vaild voltage range checking for mc13783_fixed_regulator_set_voltage
  regulator: use voltage number array in 88pm860x
  regulator: make 88pm860x sharing one driver structure
  regulator: simplify regulator_register() error handling
  regulator: fix unset_regulator_supplies() to remove all matches
  regulator: prevent registration of matching regulator consumer supplies
  regulator: Allow regulator-regulator supplies to be specified by name
parents 51e618c3 500b4ac9

drivers/mfd/88pm860x-core.c

+19 −17
Original line number Diff line number Diff line
@@ -173,33 +173,35 @@ static struct resource regulator_resources[] = { 
	PM8607_REG_RESOURCE(LDO9,  LDO9),

	PM8607_REG_RESOURCE(LDO10, LDO10),

	PM8607_REG_RESOURCE(LDO12, LDO12),

	PM8607_REG_RESOURCE(VIBRATOR_SET, VIBRATOR_SET),

	PM8607_REG_RESOURCE(LDO14, LDO14),

};



#define PM8607_REG_DEVS(_name, _id)					\

#define PM8607_REG_DEVS(_id)						\

{									\

	.name		= "88pm8607-" #_name,				\

	.name		= "88pm860x-regulator",				\

	.num_resources	= 1,						\

	.resources	= &regulator_resources[PM8607_ID_##_id],	\

	.id		= PM8607_ID_##_id,				\

}



static struct mfd_cell regulator_devs[] = {

	PM8607_REG_DEVS(buck1, BUCK1),

	PM8607_REG_DEVS(buck2, BUCK2),

	PM8607_REG_DEVS(buck3, BUCK3),

	PM8607_REG_DEVS(ldo1,  LDO1),

	PM8607_REG_DEVS(ldo2,  LDO2),

	PM8607_REG_DEVS(ldo3,  LDO3),

	PM8607_REG_DEVS(ldo4,  LDO4),

	PM8607_REG_DEVS(ldo5,  LDO5),

	PM8607_REG_DEVS(ldo6,  LDO6),

	PM8607_REG_DEVS(ldo7,  LDO7),

	PM8607_REG_DEVS(ldo8,  LDO8),

	PM8607_REG_DEVS(ldo9,  LDO9),

	PM8607_REG_DEVS(ldo10, LDO10),

	PM8607_REG_DEVS(ldo12, LDO12),

	PM8607_REG_DEVS(ldo14, LDO14),

	PM8607_REG_DEVS(BUCK1),

	PM8607_REG_DEVS(BUCK2),

	PM8607_REG_DEVS(BUCK3),

	PM8607_REG_DEVS(LDO1),

	PM8607_REG_DEVS(LDO2),

	PM8607_REG_DEVS(LDO3),

	PM8607_REG_DEVS(LDO4),

	PM8607_REG_DEVS(LDO5),

	PM8607_REG_DEVS(LDO6),

	PM8607_REG_DEVS(LDO7),

	PM8607_REG_DEVS(LDO8),

	PM8607_REG_DEVS(LDO9),

	PM8607_REG_DEVS(LDO10),

	PM8607_REG_DEVS(LDO12),

	PM8607_REG_DEVS(LDO13),

	PM8607_REG_DEVS(LDO14),

};



struct pm860x_irq_data {

drivers/regulator/88pm8607.c

+230 −303

File changed.

Preview size limit exceeded, changes collapsed.

drivers/regulator/ab3100.c

+10 −0
Original line number Diff line number Diff line
@@ -492,18 +492,21 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = { 
		.id   = AB3100_LDO_A,

		.ops  = &regulator_ops_fixed,

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

	{

		.name = "LDO_C",

		.id   = AB3100_LDO_C,

		.ops  = &regulator_ops_fixed,

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

	{

		.name = "LDO_D",

		.id   = AB3100_LDO_D,

		.ops  = &regulator_ops_fixed,

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

	{

		.name = "LDO_E",
@@ -511,6 +514,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = { 
		.ops  = &regulator_ops_variable_sleepable,

		.n_voltages = ARRAY_SIZE(ldo_e_buck_typ_voltages),

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

	{

		.name = "LDO_F",
@@ -518,6 +522,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = { 
		.ops  = &regulator_ops_variable,

		.n_voltages = ARRAY_SIZE(ldo_f_typ_voltages),

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

	{

		.name = "LDO_G",
@@ -525,6 +530,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = { 
		.ops  = &regulator_ops_variable,

		.n_voltages = ARRAY_SIZE(ldo_g_typ_voltages),

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

	{

		.name = "LDO_H",
@@ -532,6 +538,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = { 
		.ops  = &regulator_ops_variable,

		.n_voltages = ARRAY_SIZE(ldo_h_typ_voltages),

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

	{

		.name = "LDO_K",
@@ -539,12 +546,14 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = { 
		.ops  = &regulator_ops_variable,

		.n_voltages = ARRAY_SIZE(ldo_k_typ_voltages),

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

	{

		.name = "LDO_EXT",

		.id   = AB3100_LDO_EXT,

		.ops  = &regulator_ops_external,

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

	{

		.name = "BUCK",
@@ -552,6 +561,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = { 
		.ops  = &regulator_ops_variable_sleepable,

		.n_voltages = ARRAY_SIZE(ldo_e_buck_typ_voltages),

		.type = REGULATOR_VOLTAGE,

		.owner = THIS_MODULE,

	},

};

drivers/regulator/bq24022.c

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static struct regulator_desc bq24022_desc = { 
	.name  = "bq24022",

	.ops   = &bq24022_ops,

	.type  = REGULATOR_CURRENT,

	.owner = THIS_MODULE,

};



static int __init bq24022_probe(struct platform_device *pdev)

drivers/regulator/core.c

+51 −32

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE