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

Commit 4a8c475f authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

regulator: arizona-ldo1: Move setup processing from arizona-core 



It is more idiomatic to process things relating to the regulator in its
driver. This patch moves both processing of device tree relating to the
regulator and checking if the regulator is external from arizona-core
into the regulator driver.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 36bcdf1b

drivers/mfd/arizona-core.c

+3 −9
Original line number Diff line number Diff line
@@ -533,7 +533,6 @@ static int arizona_of_get_core_pdata(struct arizona *arizona) 
	int ret, i;



	pdata->reset = arizona_of_get_named_gpio(arizona, "wlf,reset", true);

	pdata->ldoena = arizona_of_get_named_gpio(arizona, "wlf,ldoena", true);



	ret = of_property_read_u32_array(arizona->dev->of_node,

					 "wlf,gpio-defaults",
@@ -665,6 +664,9 @@ int arizona_dev_init(struct arizona *arizona) 
		return -EINVAL;

	}



	/* Mark DCVDD as external, LDO1 driver will clear if internal */

	arizona->external_dcvdd = true;



	ret = mfd_add_devices(arizona->dev, -1, early_devs,

			      ARRAY_SIZE(early_devs), NULL, 0, NULL);

	if (ret != 0) {
@@ -864,14 +866,6 @@ int arizona_dev_init(struct arizona *arizona) 
			     arizona->pdata.gpio_defaults[i]);

	}



	/*

	 * LDO1 can only be used to supply DCVDD so if it has no

	 * consumers then DCVDD is supplied externally.

	 */

	if (arizona->pdata.ldo1 &&

	    arizona->pdata.ldo1->num_consumer_supplies == 0)

		arizona->external_dcvdd = true;



	pm_runtime_set_autosuspend_delay(arizona->dev, 100);

	pm_runtime_use_autosuspend(arizona->dev);

	pm_runtime_enable(arizona->dev);

drivers/regulator/arizona-ldo1.c

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

};



static int arizona_ldo1_of_get_pdata(struct arizona *arizona)

{

	struct arizona_pdata *pdata = &arizona->pdata;



	pdata->ldoena = arizona_of_get_named_gpio(arizona, "wlf,ldoena", true);



	return 0;

}



static int arizona_ldo1_probe(struct platform_device *pdev)

{

	struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
@@ -186,6 +195,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev) 
	struct arizona_ldo1 *ldo1;

	int ret;



	arizona->external_dcvdd = false;



	ldo1 = devm_kzalloc(&pdev->dev, sizeof(*ldo1), GFP_KERNEL);

	if (!ldo1)

		return -ENOMEM;
@@ -216,6 +227,15 @@ static int arizona_ldo1_probe(struct platform_device *pdev) 
	config.dev = arizona->dev;

	config.driver_data = ldo1;

	config.regmap = arizona->regmap;



	if (IS_ENABLED(CONFIG_OF)) {

		if (!dev_get_platdata(arizona->dev)) {

			ret = arizona_ldo1_of_get_pdata(arizona);

			if (ret < 0)

				return ret;

		}

	}



	config.ena_gpio = arizona->pdata.ldoena;



	if (arizona->pdata.ldo1)
@@ -223,6 +243,13 @@ static int arizona_ldo1_probe(struct platform_device *pdev) 
	else

		config.init_data = &ldo1->init_data;



	/*

	 * LDO1 can only be used to supply DCVDD so if it has no

	 * consumers then DCVDD is supplied externally.

	 */

	if (config.init_data->num_consumer_supplies == 0)

		arizona->external_dcvdd = true;



	ldo1->regulator = devm_regulator_register(&pdev->dev, desc, &config);

	if (IS_ERR(ldo1->regulator)) {

		ret = PTR_ERR(ldo1->regulator);