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

Commit 6979380d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next

parents 3aba9527 d6c7e113

Documentation/devicetree/bindings/regulator/max8660.txt

0 → 100644
+47 −0
Original line number Diff line number Diff line 
Maxim MAX8660 voltage regulator



Required properties:

- compatible: must be one of "maxim,max8660", "maxim,max8661"

- reg: I2C slave address, usually 0x34

- any required generic properties defined in regulator.txt



Example:



	i2c_master {

		max8660@34 {

			compatible = "maxim,max8660";

			reg = <0x34>;



			regulators {

				regulator@0 {

					regulator-compatible= "V3(DCDC)";

					regulator-min-microvolt = <725000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@1 {

					regulator-compatible= "V4(DCDC)";

					regulator-min-microvolt = <725000>;

					regulator-max-microvolt = <1800000>;

				};



				regulator@2 {

					regulator-compatible= "V5(LDO)";

					regulator-min-microvolt = <1700000>;

					regulator-max-microvolt = <2000000>;

				};



				regulator@3 {

					regulator-compatible= "V6(LDO)";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3300000>;

				};



				regulator@4 {

					regulator-compatible= "V7(LDO)";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <3300000>;

				};

			};

		};

	};

drivers/regulator/88pm800.c

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int pm800_regulator_dt_init(struct platform_device *pdev) 
static int pm800_regulator_probe(struct platform_device *pdev)

{

	struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);

	struct pm80x_platform_data *pdata = pdev->dev.parent->platform_data;

	struct pm80x_platform_data *pdata = dev_get_platdata(pdev->dev.parent);

	struct pm800_regulators *pm800_data;

	struct pm800_regulator_info *info;

	struct regulator_config config = { };

drivers/regulator/88pm8607.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int pm8607_regulator_probe(struct platform_device *pdev) 
{

	struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);

	struct pm8607_regulator_info *info = NULL;

	struct regulator_init_data *pdata = pdev->dev.platform_data;

	struct regulator_init_data *pdata = dev_get_platdata(&pdev->dev);

	struct regulator_config config = { };

	struct resource *res;

	int i;

drivers/regulator/aat2870-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev) 


	config.dev = &pdev->dev;

	config.driver_data = ri;

	config.init_data = pdev->dev.platform_data;

	config.init_data = dev_get_platdata(&pdev->dev);



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

	if (IS_ERR(rdev)) {

drivers/regulator/ab3100.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np) 


static int ab3100_regulators_probe(struct platform_device *pdev)

{

	struct ab3100_platform_data *plfdata = pdev->dev.platform_data;

	struct ab3100_platform_data *plfdata = dev_get_platdata(&pdev->dev);

	struct device_node *np = pdev->dev.of_node;

	int err = 0;

	u8 data;