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

Commit 4055da97 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/88pm8607',... 

Merge remote-tracking branches 'regulator/topic/88pm8607', 'regulator/topic/arizona', 'regulator/topic/cleanup' and 'regulator/topic/da9062' into regulator-next
parents 4ccb09f6 0cfeddbd 9a6c2feb 7cf225b9 050d0f2d

drivers/regulator/88pm8607.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static int pm8607_regulator_probe(struct platform_device *pdev) 
	return 0;

}



static struct platform_device_id pm8607_regulator_driver_ids[] = {

static const struct platform_device_id pm8607_regulator_driver_ids[] = {

	{

		.name	= "88pm860x-regulator",

		.driver_data	= 0,

drivers/regulator/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -178,6 +178,16 @@ config REGULATOR_DA9055 
	  This driver can also be built as a module. If so, the module

	  will be called da9055-regulator.



config REGULATOR_DA9062

	tristate "Dialog Semiconductor DA9062 regulators"

	depends on MFD_DA9062

	help

	  Say y here to support the BUCKs and LDOs regulators found on

	  DA9062 PMICs.



	  This driver can also be built as a module. If so, the module

	  will be called da9062-regulator.



config REGULATOR_DA9063

	tristate "Dialog Semiconductor DA9063 regulators"

	depends on MFD_DA9063

drivers/regulator/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ obj-$(CONFIG_REGULATOR_BCM590XX) += bcm590xx-regulator.o 
obj-$(CONFIG_REGULATOR_DA903X)	+= da903x.o

obj-$(CONFIG_REGULATOR_DA9052)	+= da9052-regulator.o

obj-$(CONFIG_REGULATOR_DA9055)	+= da9055-regulator.o

obj-$(CONFIG_REGULATOR_DA9062)	+= da9062-regulator.o

obj-$(CONFIG_REGULATOR_DA9063)	+= da9063-regulator.o

obj-$(CONFIG_REGULATOR_DA9210) += da9210-regulator.o

obj-$(CONFIG_REGULATOR_DA9211) += da9211-regulator.o

drivers/regulator/arizona-ldo1.c

+15 −0
Original line number Diff line number Diff line
@@ -178,6 +178,16 @@ static const struct regulator_init_data arizona_ldo1_default = { 
	.num_consumer_supplies = 1,

};



static const struct regulator_init_data arizona_ldo1_wm5110 = {

	.constraints = {

		.min_uV = 1175000,

		.max_uV = 1200000,

		.valid_ops_mask = REGULATOR_CHANGE_STATUS |

				  REGULATOR_CHANGE_VOLTAGE,

	},

	.num_consumer_supplies = 1,

};



static int arizona_ldo1_of_get_pdata(struct arizona *arizona,

				     struct regulator_config *config,

				     const struct regulator_desc *desc)
@@ -243,6 +253,11 @@ static int arizona_ldo1_probe(struct platform_device *pdev) 
		desc = &arizona_ldo1_hc;

		ldo1->init_data = arizona_ldo1_dvfs;

		break;

	case WM5110:

	case WM8280:

		desc = &arizona_ldo1;

		ldo1->init_data = arizona_ldo1_wm5110;

		break;

	default:

		desc = &arizona_ldo1;

		ldo1->init_data = arizona_ldo1_default;

drivers/regulator/da9062-regulator.c

0 → 100644
+842 −0

File added.

Preview size limit exceeded, changes collapsed.