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

Commit a2a2be63 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/db8500',... 

Merge remote-tracking branches 'regulator/topic/db8500', 'regulator/topic/gpio', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/max14577', 'regulator/topic/max77693', 'regulator/topic/mc13892', 'regulator/topic/pcf50633' and 'regulator/topic/pfuze100' into regulator-linus
parents 849e1517 92dfbdbc 9eb9d315 56dde80a 93227c80 9f45a3dd 52f48bf3 c6a21f24 561427f5 62b38916

drivers/mfd/pcf50633-core.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int pcf50633_probe(struct i2c_client *client, 
	for (i = 0; i < PCF50633_NUM_REGULATORS; i++) {

		struct platform_device *pdev;



		pdev = platform_device_alloc("pcf50633-regltr", i);

		pdev = platform_device_alloc("pcf50633-regulator", i);

		if (!pdev) {

			dev_err(pcf->dev, "Cannot create regulator %d\n", i);

			continue;

drivers/regulator/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -257,6 +257,13 @@ config REGULATOR_LP8788 
	help

	  This driver supports LP8788 voltage regulator chip.



config REGULATOR_MAX14577

	tristate "Maxim 14577 regulator"

	depends on MFD_MAX14577

	help

	  This driver controls a Maxim 14577 regulator via I2C bus.

	  The regulators include safeout LDO and current regulator 'CHARGER'.



config REGULATOR_MAX1586

	tristate "Maxim 1586/1587 voltage regulator"

	depends on I2C
@@ -392,7 +399,7 @@ config REGULATOR_PCF50633 
	 on PCF50633



config REGULATOR_PFUZE100

	tristate "Support regulators on Freescale PFUZE100 PMIC"

	tristate "Freescale PFUZE100 regulator driver"

	depends on I2C

	select REGMAP_I2C

	help

drivers/regulator/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o 
obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o

obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o

obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o

obj-$(CONFIG_REGULATOR_MAX14577) += max14577.o

obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o

obj-$(CONFIG_REGULATOR_MAX8649)	+= max8649.o

obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o

drivers/regulator/db8500-prcmu.c

+1 −19
Original line number Diff line number Diff line
@@ -431,17 +431,11 @@ static int db8500_regulator_register(struct platform_device *pdev, 
	config.of_node = np;



	/* register with the regulator framework */

	info->rdev = regulator_register(&info->desc, &config);

	info->rdev = devm_regulator_register(&pdev->dev, &info->desc, &config);

	if (IS_ERR(info->rdev)) {

		err = PTR_ERR(info->rdev);

		dev_err(&pdev->dev, "failed to register %s: err %i\n",

			info->desc.name, err);



		/* if failing, unregister all earlier regulators */

		while (--id >= 0) {

			info = &dbx500_regulator_info[id];

			regulator_unregister(info->rdev);

		}

		return err;

	}
@@ -530,20 +524,8 @@ static int db8500_regulator_probe(struct platform_device *pdev) 


static int db8500_regulator_remove(struct platform_device *pdev)

{

	int i;



	ux500_regulator_debug_exit();



	for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) {

		struct dbx500_regulator_info *info;

		info = &dbx500_regulator_info[i];



		dev_vdbg(rdev_get_dev(info->rdev),

			"regulator-%s-remove\n", info->desc.name);



		regulator_unregister(info->rdev);

	}



	return 0;

}

drivers/regulator/gpio-regulator.c

+9 −8
Original line number Diff line number Diff line
@@ -203,16 +203,17 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np) 
	}

	config->nr_states = i;



	config->type = REGULATOR_VOLTAGE;

	ret = of_property_read_string(np, "regulator-type", &regtype);

	if (ret < 0) {

		dev_err(dev, "Missing 'regulator-type' property\n");

		return ERR_PTR(-EINVAL);

	}



	if (ret >= 0) {

		if (!strncmp("voltage", regtype, 7))

			config->type = REGULATOR_VOLTAGE;

		else if (!strncmp("current", regtype, 7))

			config->type = REGULATOR_CURRENT;

		else

			dev_warn(dev, "Unknown regulator-type '%s'\n",

				 regtype);

	}



	return config;

}