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

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
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ struct pm8607_regulator_info { 
	struct regulator_dev	*regulator;

	struct i2c_client	*i2c;



	int	min_uV;

	int	max_uV;

	int	step_uV;

	unsigned int	*vol_table;

	unsigned int	*vol_suspend;



	int	vol_reg;

	int	vol_shift;

	int	vol_nbits;
@@ -36,83 +36,189 @@ struct pm8607_regulator_info { 
	int	slope_double;

};



static inline int check_range(struct pm8607_regulator_info *info,

				int min_uV, int max_uV)

{

	if (max_uV < info->min_uV || min_uV > info->max_uV || min_uV > max_uV)

		return -EINVAL;

static const unsigned int BUCK1_table[] = {

	 725000,  750000,  775000,  800000,  825000,  850000,  875000,  900000,

	 925000,  950000,  975000, 1000000, 1025000, 1050000, 1075000, 1100000,

	1125000, 1150000, 1175000, 1200000, 1225000, 1250000, 1275000, 1300000,

	1325000, 1350000, 1375000, 1400000, 1425000, 1450000, 1475000, 1500000,

	      0,   25000,   50000,   75000,  100000,  125000,  150000,  175000,

	 200000,  225000,  250000,  275000,  300000,  325000,  350000,  375000,

	 400000,  425000,  450000,  475000,  500000,  525000,  550000,  575000,

	 600000,  625000,  650000,  675000,  700000,  725000,  750000,  775000,

};



	return 0;

}

static const unsigned int BUCK1_suspend_table[] = {

	      0,   25000,   50000,   75000,  100000,  125000,  150000,  175000,

	 200000,  225000,  250000,  275000,  300000,  325000,  350000,  375000,

	 400000,  425000,  450000,  475000,  500000,  525000,  550000,  575000,

	 600000,  625000,  650000,  675000,  700000,  725000,  750000,  775000,

	 800000,  825000,  850000,  875000,  900000,  925000,  950000,  975000,

	1000000, 1025000, 1050000, 1075000, 1100000, 1125000, 1150000, 1175000,

	1200000, 1225000, 1250000, 1275000, 1300000, 1325000, 1350000, 1375000,

	1400000, 1425000, 1450000, 1475000, 1500000, 1500000, 1500000, 1500000,

};



static const unsigned int BUCK2_table[] = {

	      0,   50000,  100000,  150000,  200000,  250000,  300000,  350000,

	 400000,  450000,  500000,  550000,  600000,  650000,  700000,  750000,

	 800000,  850000,  900000,  950000, 1000000, 1050000, 1100000, 1150000,

	1200000, 1250000, 1300000, 1350000, 1400000, 1450000, 1500000, 1550000,

	1600000, 1650000, 1700000, 1750000, 1800000, 1850000, 1900000, 1950000,

	2000000, 2050000, 2100000, 2150000, 2200000, 2250000, 2300000, 2350000,

	2400000, 2450000, 2500000, 2550000, 2600000, 2650000, 2700000, 2750000,

	2800000, 2850000, 2900000, 2950000, 3000000, 3000000, 3000000, 3000000,

};



static const unsigned int BUCK2_suspend_table[] = {

	      0,   50000,  100000,  150000,  200000,  250000,  300000,  350000,

	 400000,  450000,  500000,  550000,  600000,  650000,  700000,  750000,

	 800000,  850000,  900000,  950000, 1000000, 1050000, 1100000, 1150000,

	1200000, 1250000, 1300000, 1350000, 1400000, 1450000, 1500000, 1550000,

	1600000, 1650000, 1700000, 1750000, 1800000, 1850000, 1900000, 1950000,

	2000000, 2050000, 2100000, 2150000, 2200000, 2250000, 2300000, 2350000,

	2400000, 2450000, 2500000, 2550000, 2600000, 2650000, 2700000, 2750000,

	2800000, 2850000, 2900000, 2950000, 3000000, 3000000, 3000000, 3000000,

};



static const unsigned int BUCK3_table[] = {

              0,   25000,   50000,   75000,  100000,  125000,  150000,  175000,

	 200000,  225000,  250000,  275000,  300000,  325000,  350000,  375000,

	 400000,  425000,  450000,  475000,  500000,  525000,  550000,  575000,

	 600000,  625000,  650000,  675000,  700000,  725000,  750000,  775000,

	 800000,  825000,  850000,  875000,  900000,  925000,  950000,  975000,

	1000000, 1025000, 1050000, 1075000, 1100000, 1125000, 1150000, 1175000,

	1200000, 1225000, 1250000, 1275000, 1300000, 1325000, 1350000, 1375000,

	1400000, 1425000, 1450000, 1475000, 1500000, 1500000, 1500000, 1500000,

};



static const unsigned int BUCK3_suspend_table[] = {

              0,   25000,   50000,   75000,  100000,  125000,  150000,  175000,

	 200000,  225000,  250000,  275000,  300000,  325000,  350000,  375000,

	 400000,  425000,  450000,  475000,  500000,  525000,  550000,  575000,

	 600000,  625000,  650000,  675000,  700000,  725000,  750000,  775000,

	 800000,  825000,  850000,  875000,  900000,  925000,  950000,  975000,

	1000000, 1025000, 1050000, 1075000, 1100000, 1125000, 1150000, 1175000,

	1200000, 1225000, 1250000, 1275000, 1300000, 1325000, 1350000, 1375000,

	1400000, 1425000, 1450000, 1475000, 1500000, 1500000, 1500000, 1500000,

};



static const unsigned int LDO1_table[] = {

	1800000, 1200000, 2800000, 0,

};



static const unsigned int LDO1_suspend_table[] = {

	1800000, 1200000, 0, 0,

};



static const unsigned int LDO2_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 3300000,

};



static const unsigned int LDO2_suspend_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 2900000,

};



static const unsigned int LDO3_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 3300000,

};



static const unsigned int LDO3_suspend_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 2900000,

};



static const unsigned int LDO4_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2900000, 3300000,

};



static const unsigned int LDO4_suspend_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2900000, 2900000,

};



static const unsigned int LDO5_table[] = {

	2900000, 3000000, 3100000, 3300000,

};



static const unsigned int LDO5_suspend_table[] = {

	2900000, 0, 0, 0,

};



static const unsigned int LDO6_table[] = {

	1800000, 1850000, 2600000, 2650000, 2700000, 2750000, 2800000, 3300000,

};



static const unsigned int LDO6_suspend_table[] = {

	1800000, 1850000, 2600000, 2650000, 2700000, 2750000, 2800000, 2900000,

};



static const unsigned int LDO7_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 2900000,

};



static const unsigned int LDO7_suspend_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 2900000,

};



static const unsigned int LDO8_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 2900000,

};



static const unsigned int LDO8_suspend_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 2900000,

};



static const unsigned int LDO9_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 3300000,

};



static const unsigned int LDO9_suspend_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 2900000,

};



static const unsigned int LDO10_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 3300000,

	1200000, 1200000, 1200000, 1200000, 1200000, 1200000, 1200000, 1200000,

};



static const unsigned int LDO10_suspend_table[] = {

	1800000, 1850000, 1900000, 2700000, 2750000, 2800000, 2850000, 2900000,

	1200000, 1200000, 1200000, 1200000, 1200000, 1200000, 1200000, 1200000,

};



static const unsigned int LDO12_table[] = {

	1800000, 1900000, 2700000, 2800000, 2900000, 3000000, 3100000, 3300000,

	1200000, 1200000, 1200000, 1200000, 1200000, 1200000, 1200000, 1200000,

};



static const unsigned int LDO12_suspend_table[] = {

	1800000, 1900000, 2700000, 2800000, 2900000, 2900000, 2900000, 2900000,

	1200000, 1200000, 1200000, 1200000, 1200000, 1200000, 1200000, 1200000,

};



static const unsigned int LDO13_table[] = {

	1300000, 1800000, 2000000, 2500000, 2800000, 3000000, 0, 0,

};



static const unsigned int LDO13_suspend_table[] = {

	0,

};



static const unsigned int LDO14_table[] = {

	1800000, 1850000, 2700000, 2750000, 2800000, 2850000, 2900000, 3300000,

};



static const unsigned int LDO14_suspend_table[] = {

	1800000, 1850000, 2700000, 2750000, 2800000, 2850000, 2900000, 2900000,

};



static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index)

{

	struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);

	int ret = -EINVAL;



	switch (info->desc.id) {

	case PM8607_ID_BUCK1:

		ret = (index < 0x1d) ? (index * 25000 + 800000) :

			((index < 0x20) ? 1500000 :

			((index < 0x40) ? ((index - 0x20) * 25000) :

			-EINVAL));

		break;

	case PM8607_ID_BUCK3:

		ret = (index < 0x3d) ? (index * 25000) :

			((index < 0x40) ? 1500000 : -EINVAL);

		if (ret < 0)

			break;

	if (info->vol_table && (index < (2 << info->vol_nbits))) {

		ret = info->vol_table[index];

		if (info->slope_double)

			ret <<= 1;

		break;

	case PM8607_ID_LDO1:

		ret = (index == 0) ? 1800000 :

			((index == 1) ? 1200000 :

			((index == 2) ? 2800000 : -EINVAL));

		break;

	case PM8607_ID_LDO5:

		ret = (index == 0) ? 2900000 :

			((index == 1) ? 3000000 :

			((index == 2) ? 3100000 : 3300000));

		break;

	case PM8607_ID_LDO7:

	case PM8607_ID_LDO8:

		ret = (index < 3) ? (index * 50000 + 1800000) :

			((index < 8) ? (index * 50000 + 2550000) :

			 -EINVAL);

		break;

	case PM8607_ID_LDO12:

		ret = (index < 2) ? (index * 100000 + 1800000) :

			((index < 7) ? (index * 100000 + 2500000) :

			((index == 7) ? 3300000 : 1200000));

		break;

	case PM8607_ID_LDO2:

	case PM8607_ID_LDO3:

	case PM8607_ID_LDO9:

		ret = (index < 3) ? (index * 50000 + 1800000) :

			((index < 7) ? (index * 50000 + 2550000) :

			3300000);

		break;

	case PM8607_ID_LDO4:

		ret = (index < 3) ? (index * 50000 + 1800000) :

			((index < 6) ? (index * 50000 + 2550000) :

			((index == 6) ? 2900000 : 3300000));

		break;

	case PM8607_ID_LDO6:

		ret = (index < 2) ? (index * 50000 + 1800000) :

			((index < 7) ? (index * 50000 + 2500000) :

			3300000);

		break;

	case PM8607_ID_LDO10:

		ret = (index < 3) ? (index * 50000 + 1800000) :

			((index < 7) ? (index * 50000 + 2550000) :

			((index == 7) ? 3300000 : 1200000));

		break;

	case PM8607_ID_LDO14:

		ret = (index < 2) ? (index * 50000 + 1800000) :

			((index < 7) ? (index * 50000 + 2600000) :

			3300000);

		break;

	}

	return ret;

}
@@ -120,174 +226,26 @@ static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index) 
static int choose_voltage(struct regulator_dev *rdev, int min_uV, int max_uV)

{

	struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);

	int val = -ENOENT;

	int ret;

	int i, ret = -ENOENT;



	switch (info->desc.id) {

	case PM8607_ID_BUCK1:

		if (min_uV >= 800000) 		/* 800mV ~ 1500mV / 25mV */

			val = (min_uV - 775001) / 25000;

		else {				/* 25mV ~ 775mV / 25mV */

			val = (min_uV + 249999) / 25000;

			val += 32;

		}

		break;

	case PM8607_ID_BUCK3:

		if (info->slope_double)

	if (info->slope_double) {

		min_uV = min_uV >> 1;

		val = (min_uV + 249999) / 25000; /* 0mV ~ 1500mV / 25mV */



		break;

	case PM8607_ID_LDO1:

		if (min_uV > 1800000)

			val = 2;

		else if (min_uV > 1200000)

			val = 0;

		else

			val = 1;

		break;

	case PM8607_ID_LDO5:

		if (min_uV > 3100000)

			val = 3;

		else				/* 2900mV ~ 3100mV / 100mV */

			val = (min_uV - 2800001) / 100000;

		break;

	case PM8607_ID_LDO7:

	case PM8607_ID_LDO8:

		if (min_uV < 2700000) {	/* 1800mV ~ 1900mV / 50mV */

			if (min_uV <= 1800000)

				val = 0;	/* 1800mv */

			else if (min_uV <= 1900000)

				val = (min_uV - 1750001) / 50000;

			else

				val = 3;	/* 2700mV */

		} else {		 /* 2700mV ~ 2900mV / 50mV */

			if (min_uV <= 2900000) {

				val = (min_uV - 2650001) / 50000;

				val += 3;

			} else

				val = -EINVAL;

		max_uV = max_uV >> 1;

	}

	if (info->vol_table) {

		for (i = 0; i < (2 << info->vol_nbits); i++) {

			if (!info->vol_table[i])

				break;

	case PM8607_ID_LDO10:

		if (min_uV > 2850000)

			val = 7;

		else if (min_uV <= 1200000)

			val = 8;

		else if (min_uV < 2700000)	/* 1800mV ~ 1900mV / 50mV */

			val = (min_uV - 1750001) / 50000;

		else {				/* 2700mV ~ 2850mV / 50mV */

			val = (min_uV - 2650001) / 50000;

			val += 3;

		}

		break;

	case PM8607_ID_LDO12:

		if (min_uV < 2700000) {		/* 1800mV ~ 1900mV / 100mV */

			if (min_uV <= 1200000)

				val = 8;	/* 1200mV */

			else if (min_uV <= 1800000)

				val = 0;	/* 1800mV */

			else if (min_uV <= 1900000)

				val = (min_uV - 1700001) / 100000;

			else

				val = 2;	/* 2700mV */

		} else {			/* 2700mV ~ 3100mV / 100mV */

			if (min_uV <= 3100000) {

				val = (min_uV - 2600001) / 100000;

				val += 2;

			} else if (min_uV <= 3300000)

				val = 7;

			else

				val = -EINVAL;

		}

			if ((min_uV <= info->vol_table[i])

				&& (max_uV >= info->vol_table[i])) {

				ret = i;

				break;

	case PM8607_ID_LDO2:

	case PM8607_ID_LDO3:

	case PM8607_ID_LDO9:

		if (min_uV < 2700000) {	/* 1800mV ~ 1900mV / 50mV */

			if (min_uV <= 1800000)

				val = 0;

			else if (min_uV <= 1900000)

				val = (min_uV - 1750001) / 50000;

			else

				val = 3;	/* 2700mV */

		} else {		 /* 2700mV ~ 2850mV / 50mV */

			if (min_uV <= 2850000) {

				val = (min_uV - 2650001) / 50000;

				val += 3;

			} else if (min_uV <= 3300000)

				val = 7;

			else

				val = -EINVAL;

			}

		break;

	case PM8607_ID_LDO4:

		if (min_uV < 2700000) {	/* 1800mV ~ 1900mV / 50mV */

			if (min_uV <= 1800000)

				val = 0;

			else if (min_uV <= 1900000)

				val = (min_uV - 1750001) / 50000;

			else

				val = 3;	/* 2700mV */

		} else {		 /* 2700mV ~ 2800mV / 50mV */

			if (min_uV <= 2850000) {

				val = (min_uV - 2650001) / 50000;

				val += 3;

			} else if (min_uV <= 2900000)

				val = 6;

			else if (min_uV <= 3300000)

				val = 7;

			else

				val = -EINVAL;

		}

		break;

	case PM8607_ID_LDO6:

		if (min_uV < 2600000) {	/* 1800mV ~ 1850mV / 50mV */

			if (min_uV <= 1800000)

				val = 0;

			else if (min_uV <= 1850000)

				val = (min_uV - 1750001) / 50000;

			else

				val = 2;	/* 2600mV */

		} else {		/* 2600mV ~ 2800mV / 50mV */

			if (min_uV <= 2800000) {

				val = (min_uV - 2550001) / 50000;

				val += 2;

			} else if (min_uV <= 3300000)

				val = 7;

			else

				val = -EINVAL;

		}

		break;

	case PM8607_ID_LDO14:

		if (min_uV < 2700000) {	/* 1800mV ~ 1850mV / 50mV */

			if (min_uV <= 1800000)

				val = 0;

			else if (min_uV <= 1850000)

				val = (min_uV - 1750001) / 50000;

			else

				val = 2;	/* 2700mV */

		} else {		 /* 2700mV ~ 2900mV / 50mV */

			if (min_uV <= 2900000) {

				val = (min_uV - 2650001) / 50000;

				val += 2;

			} else if (min_uV <= 3300000)

				val = 7;

			else

				val = -EINVAL;

	}

		break;

	}

	if (val >= 0) {

		ret = pm8607_list_voltage(rdev, val);

		if (ret > max_uV) {

			pr_err("exceed voltage range (%d %d) uV",

				min_uV, max_uV);

			return -EINVAL;

		}

	} else

		pr_err("invalid voltage range (%d %d) uV", min_uV, max_uV);

	return val;

	if (ret < 0)

		pr_err("invalid voltage range (%d %d) uV\n", min_uV, max_uV);

	return ret;

}



static int pm8607_set_voltage(struct regulator_dev *rdev,
@@ -297,7 +255,7 @@ static int pm8607_set_voltage(struct regulator_dev *rdev, 
	uint8_t val, mask;

	int ret;



	if (check_range(info, min_uV, max_uV)) {

	if (min_uV > max_uV) {

		pr_err("invalid voltage range (%d, %d) uV\n", min_uV, max_uV);

		return -EINVAL;

	}
@@ -375,18 +333,15 @@ static struct regulator_ops pm8607_regulator_ops = { 
	.is_enabled	= pm8607_is_enabled,

};



#define PM8607_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \

#define PM8607_DVC(vreg, nbits, ureg, ubit, ereg, ebit)			\

{									\

	.desc	= {							\

		.name	= "BUCK" #_id,					\

		.name	= #vreg,					\

		.ops	= &pm8607_regulator_ops,			\

		.type	= REGULATOR_VOLTAGE,				\

		.id	= PM8607_ID_BUCK##_id,				\

		.id	= PM8607_ID_##vreg,				\

		.owner	= THIS_MODULE,					\

	},								\

	.min_uV		= (min) * 1000,					\

	.max_uV		= (max) * 1000,					\

	.step_uV	= (step) * 1000,				\

	.vol_reg	= PM8607_##vreg,				\

	.vol_shift	= (0),						\

	.vol_nbits	= (nbits),					\
@@ -395,9 +350,11 @@ static struct regulator_ops pm8607_regulator_ops = { 
	.enable_reg	= PM8607_##ereg,				\

	.enable_bit	= (ebit),					\

	.slope_double	= (0),						\

	.vol_table	= (unsigned int *)&vreg##_table,		\

	.vol_suspend	= (unsigned int *)&vreg##_suspend_table,	\

}



#define PM8607_LDO(_id, min, max, step, vreg, shift, nbits, ereg, ebit)	\

#define PM8607_LDO(_id, vreg, shift, nbits, ereg, ebit)			\

{									\

	.desc	= {							\

		.name	= "LDO" #_id,					\
@@ -406,33 +363,34 @@ static struct regulator_ops pm8607_regulator_ops = { 
		.id	= PM8607_ID_LDO##_id,				\

		.owner	= THIS_MODULE,					\

	},								\

	.min_uV		= (min) * 1000,					\

	.max_uV		= (max) * 1000,					\

	.step_uV	= (step) * 1000,				\

	.vol_reg	= PM8607_##vreg,				\

	.vol_shift	= (shift),					\

	.vol_nbits	= (nbits),					\

	.enable_reg	= PM8607_##ereg,				\

	.enable_bit	= (ebit),					\

	.slope_double	= (0),						\

	.vol_table	= (unsigned int *)&LDO##_id##_table,		\

	.vol_suspend	= (unsigned int *)&LDO##_id##_suspend_table,	\

}



static struct pm8607_regulator_info pm8607_regulator_info[] = {

	PM8607_DVC(1, 0, 1500, 25, BUCK1, 6, GO, 0, SUPPLIES_EN11, 0),

	PM8607_DVC(3, 0, 1500, 25, BUCK3, 6, GO, 2, SUPPLIES_EN11, 2),



	PM8607_LDO(1 , 1200, 2800, 0, LDO1 , 0, 2, SUPPLIES_EN11, 3),

	PM8607_LDO(2 , 1800, 3300, 0, LDO2 , 0, 3, SUPPLIES_EN11, 4),

	PM8607_LDO(3 , 1800, 3300, 0, LDO3 , 0, 3, SUPPLIES_EN11, 5),

	PM8607_LDO(4 , 1800, 3300, 0, LDO4 , 0, 3, SUPPLIES_EN11, 6),

	PM8607_LDO(5 , 2900, 3300, 0, LDO5 , 0, 2, SUPPLIES_EN11, 7),

	PM8607_LDO(6 , 1800, 3300, 0, LDO6 , 0, 3, SUPPLIES_EN12, 0),

	PM8607_LDO(7 , 1800, 2900, 0, LDO7 , 0, 3, SUPPLIES_EN12, 1),

	PM8607_LDO(8 , 1800, 2900, 0, LDO8 , 0, 3, SUPPLIES_EN12, 2),

	PM8607_LDO(9 , 1800, 3300, 0, LDO9 , 0, 3, SUPPLIES_EN12, 3),

	PM8607_LDO(10, 1200, 3300, 0, LDO10, 0, 4, SUPPLIES_EN11, 4),

	PM8607_LDO(12, 1200, 3300, 0, LDO12, 0, 4, SUPPLIES_EN11, 5),

	PM8607_LDO(14, 1800, 3300, 0, LDO14, 0, 3, SUPPLIES_EN11, 6),

	PM8607_DVC(BUCK1, 6, GO, 0, SUPPLIES_EN11, 0),

	PM8607_DVC(BUCK2, 6, GO, 1, SUPPLIES_EN11, 1),

	PM8607_DVC(BUCK3, 6, GO, 2, SUPPLIES_EN11, 2),



	PM8607_LDO( 1,         LDO1, 0, 2, SUPPLIES_EN11, 3),

	PM8607_LDO( 2,         LDO2, 0, 3, SUPPLIES_EN11, 4),

	PM8607_LDO( 3,         LDO3, 0, 3, SUPPLIES_EN11, 5),

	PM8607_LDO( 4,         LDO4, 0, 3, SUPPLIES_EN11, 6),

	PM8607_LDO( 5,         LDO5, 0, 2, SUPPLIES_EN11, 7),

	PM8607_LDO( 6,         LDO6, 0, 3, SUPPLIES_EN12, 0),

	PM8607_LDO( 7,         LDO7, 0, 3, SUPPLIES_EN12, 1),

	PM8607_LDO( 8,         LDO8, 0, 3, SUPPLIES_EN12, 2),

	PM8607_LDO( 9,         LDO9, 0, 3, SUPPLIES_EN12, 3),

	PM8607_LDO(10,        LDO10, 0, 3, SUPPLIES_EN12, 4),

	PM8607_LDO(12,        LDO12, 0, 4, SUPPLIES_EN12, 5),

	PM8607_LDO(13, VIBRATOR_SET, 1, 3,  VIBRATOR_SET, 0),

	PM8607_LDO(14,        LDO14, 0, 4, SUPPLIES_EN12, 6),

};



static inline struct pm8607_regulator_info *find_regulator_info(int id)
@@ -484,60 +442,29 @@ static int __devexit pm8607_regulator_remove(struct platform_device *pdev) 
{

	struct pm8607_regulator_info *info = platform_get_drvdata(pdev);



	platform_set_drvdata(pdev, NULL);

	regulator_unregister(info->regulator);

	return 0;

}



#define PM8607_REGULATOR_DRIVER(_name)				\

{								\

	.driver		= {					\

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

		.owner	= THIS_MODULE,				\

	},							\

	.probe		= pm8607_regulator_probe,		\

	.remove		= __devexit_p(pm8607_regulator_remove),	\

}



static struct platform_driver pm8607_regulator_driver[] = {

	PM8607_REGULATOR_DRIVER(buck1),

	PM8607_REGULATOR_DRIVER(buck2),

	PM8607_REGULATOR_DRIVER(buck3),

	PM8607_REGULATOR_DRIVER(ldo1),

	PM8607_REGULATOR_DRIVER(ldo2),

	PM8607_REGULATOR_DRIVER(ldo3),

	PM8607_REGULATOR_DRIVER(ldo4),

	PM8607_REGULATOR_DRIVER(ldo5),

	PM8607_REGULATOR_DRIVER(ldo6),

	PM8607_REGULATOR_DRIVER(ldo7),

	PM8607_REGULATOR_DRIVER(ldo8),

	PM8607_REGULATOR_DRIVER(ldo9),

	PM8607_REGULATOR_DRIVER(ldo10),

	PM8607_REGULATOR_DRIVER(ldo12),

	PM8607_REGULATOR_DRIVER(ldo14),

static struct platform_driver pm8607_regulator_driver = {

	.driver		= {

		.name	= "88pm860x-regulator",

		.owner	= THIS_MODULE,

	},

	.probe		= pm8607_regulator_probe,

	.remove		= __devexit_p(pm8607_regulator_remove),

};



static int __init pm8607_regulator_init(void)

{

	int i, count, ret;



	count = ARRAY_SIZE(pm8607_regulator_driver);

	for (i = 0; i < count; i++) {

		ret = platform_driver_register(&pm8607_regulator_driver[i]);

		if (ret != 0)

			pr_err("Failed to register regulator driver: %d\n",

				ret);

	}

	return 0;

	return platform_driver_register(&pm8607_regulator_driver);

}

subsys_initcall(pm8607_regulator_init);



static void __exit pm8607_regulator_exit(void)

{

	int i, count;



	count = ARRAY_SIZE(pm8607_regulator_driver);

	for (i = 0; i < count; i++)

		platform_driver_unregister(&pm8607_regulator_driver[i]);

	platform_driver_unregister(&pm8607_regulator_driver);

}

module_exit(pm8607_regulator_exit);

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)