Unverified Commit d877cad6 authored by Mark Brown's avatar Mark Brown
Browse files

regulator: da9063: disable unused voltage monitors 

Merge series from Benjamin Bara <bbara93@gmail.com>:

Follow-up for my initial patch regarding the disabling of unused
voltage monitors. We use the PWR_OK functionality, which asserts GP_FB2
if every monitored voltage is in range. This patch should provide the
possibility to deactivate a voltage monitor from the DT if the regulator
might be disabled during run time. For this purpose, the regulator
notification support is used:
https://lore.kernel.org/all/cover.1622628333.git.matti.vaittinen@fi.rohmeurope.com/
parents c4a413e5 0271b61b

Documentation/devicetree/bindings/mfd/dlg,da9063.yaml

+15 −2
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ maintainers: 
description: |

  For device-tree bindings of other sub-modules refer to the binding documents

  under the respective sub-system directories.

  Using regulator-{uv,ov}-{warn,error,protection}-microvolt requires special

  handling: First, when GP_FB2 is used, it must be ensured that there is no

  moment where all voltage monitors are disabled. Next, as da9063 only supports

  UV *and* OV monitoring, both must be set to the same severity and value

  (0: disable, 1: enable).



properties:

  compatible:
@@ -121,11 +126,19 @@ examples: 
            regulator-max-microamp = <2000000>;

            regulator-boot-on;

          };

          ldo6 {

            /* UNUSED */

            regulator-name = "LDO_6";

            regulator-uv-protection-microvolt = <0>;

            regulator-ov-protection-microvolt = <0>;

          };

          ldo11 {

            regulator-name = "LDO_11";

            regulator-min-microvolt = <900000>;

            regulator-max-microvolt = <3600000>;

            regulator-boot-on;

            regulator-max-microvolt = <900000>;

            regulator-uv-protection-microvolt = <1>;

            regulator-ov-protection-microvolt = <1>;

            regulator-always-on;

          };

        };

      };

drivers/regulator/da9063-regulator.c

+119 −28
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ struct da9063_regulator_info { 


	/* DA9063 event detection bit */

	struct reg_field oc_event;



	/* DA9063 voltage monitor bit */

	struct reg_field vmon;

};



/* Macros for LDO */
@@ -148,6 +151,7 @@ struct da9063_regulator { 
	struct regmap_field			*suspend;

	struct regmap_field			*sleep;

	struct regmap_field			*suspend_sleep;

	struct regmap_field			*vmon;

};



/* Encapsulates all information for the regulators driver */
@@ -203,6 +207,24 @@ static const unsigned int da9063_bmem_bio_merged_limits[] = { 
	4600000, 4800000, 5000000, 5200000, 5400000, 5600000, 5800000, 6000000

};



static int da9063_set_xvp(struct regulator_dev *rdev, int lim_uV, int severity, bool enable)

{

	struct da9063_regulator *regl = rdev_get_drvdata(rdev);

	struct device *dev = regl->hw->dev;



	dev_dbg(dev, "%s: lim: %d, sev: %d, en: %d\n", regl->desc.name, lim_uV, severity, enable);



	/*

	 * only support enable and disable.

	 * the da9063 offers a GPIO (GP_FB2) which is unasserted if an XV happens.

	 * therefore ignore severity here, as there might be handlers in hardware.

	 */

	if (lim_uV)

		return -EINVAL;



	return regmap_field_write(regl->vmon, enable ? 1 : 0);

}



static int da9063_buck_set_mode(struct regulator_dev *rdev, unsigned int mode)

{

	struct da9063_regulator *regl = rdev_get_drvdata(rdev);
@@ -556,6 +578,8 @@ static const struct regulator_ops da9063_buck_ops = { 
	.set_suspend_enable		= da9063_suspend_enable,

	.set_suspend_disable		= da9063_suspend_disable,

	.set_suspend_mode		= da9063_buck_set_suspend_mode,

	.set_over_voltage_protection	= da9063_set_xvp,

	.set_under_voltage_protection	= da9063_set_xvp,

};



static const struct regulator_ops da9063_ldo_ops = {
@@ -572,6 +596,8 @@ static const struct regulator_ops da9063_ldo_ops = { 
	.set_suspend_enable		= da9063_suspend_enable,

	.set_suspend_disable		= da9063_suspend_disable,

	.set_suspend_mode		= da9063_ldo_set_suspend_mode,

	.set_over_voltage_protection	= da9063_set_xvp,

	.set_under_voltage_protection	= da9063_set_xvp,

};



/* Info of regulators for DA9063 */
@@ -581,36 +607,42 @@ static const struct da9063_regulator_info da9063_regulator_info[] = { 
			    da9063_buck_a_limits,

			    DA9063_REG_BUCK_ILIM_C, DA9063_BCORE1_ILIM_MASK),

		DA9063_BUCK_COMMON_FIELDS(BCORE1),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_4, DA9063_BCORE1_MON_EN),

	},

	{

		DA9063_BUCK(DA9063, BCORE2, 300, 10, 1570,

			    da9063_buck_a_limits,

			    DA9063_REG_BUCK_ILIM_C, DA9063_BCORE2_ILIM_MASK),

		DA9063_BUCK_COMMON_FIELDS(BCORE2),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_4, DA9063_BCORE2_MON_EN),

	},

	{

		DA9063_BUCK(DA9063, BPRO, 530, 10, 1800,

			    da9063_buck_a_limits,

			    DA9063_REG_BUCK_ILIM_B, DA9063_BPRO_ILIM_MASK),

		DA9063_BUCK_COMMON_FIELDS(BPRO),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_4, DA9063_BPRO_MON_EN),

	},

	{

		DA9063_BUCK(DA9063, BMEM, 800, 20, 3340,

			    da9063_buck_b_limits,

			    DA9063_REG_BUCK_ILIM_A, DA9063_BMEM_ILIM_MASK),

		DA9063_BUCK_COMMON_FIELDS(BMEM),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_4, DA9063_BMEM_MON_EN),

	},

	{

		DA9063_BUCK(DA9063, BIO, 800, 20, 3340,

			    da9063_buck_b_limits,

			    DA9063_REG_BUCK_ILIM_A, DA9063_BIO_ILIM_MASK),

		DA9063_BUCK_COMMON_FIELDS(BIO),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_4, DA9063_BIO_MON_EN),

	},

	{

		DA9063_BUCK(DA9063, BPERI, 800, 20, 3340,

			    da9063_buck_b_limits,

			    DA9063_REG_BUCK_ILIM_B, DA9063_BPERI_ILIM_MASK),

		DA9063_BUCK_COMMON_FIELDS(BPERI),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_4, DA9063_BPERI_MON_EN),

	},

	{

		DA9063_BUCK(DA9063, BCORES_MERGED, 300, 10, 1570,
@@ -618,6 +650,7 @@ static const struct da9063_regulator_info da9063_regulator_info[] = { 
			    DA9063_REG_BUCK_ILIM_C, DA9063_BCORE1_ILIM_MASK),

		/* BCORES_MERGED uses the same register fields as BCORE1 */

		DA9063_BUCK_COMMON_FIELDS(BCORE1),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_4, DA9063_BCORE1_MON_EN),

	},

	{

		DA9063_BUCK(DA9063, BMEM_BIO_MERGED, 800, 20, 3340,
@@ -625,47 +658,59 @@ static const struct da9063_regulator_info da9063_regulator_info[] = { 
			    DA9063_REG_BUCK_ILIM_A, DA9063_BMEM_ILIM_MASK),

		/* BMEM_BIO_MERGED uses the same register fields as BMEM */

		DA9063_BUCK_COMMON_FIELDS(BMEM),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_4, DA9063_BMEM_MON_EN),

	},

	{

		DA9063_LDO(DA9063, LDO3, 900, 20, 3440),

		.oc_event = BFIELD(DA9063_REG_STATUS_D, DA9063_LDO3_LIM),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_2, DA9063_LDO3_MON_EN),

	},

	{

		DA9063_LDO(DA9063, LDO7, 900, 50, 3600),

		.oc_event = BFIELD(DA9063_REG_STATUS_D, DA9063_LDO7_LIM),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_2, DA9063_LDO7_MON_EN),

	},

	{

		DA9063_LDO(DA9063, LDO8, 900, 50, 3600),

		.oc_event = BFIELD(DA9063_REG_STATUS_D, DA9063_LDO8_LIM),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_2, DA9063_LDO8_MON_EN),

	},

	{

		DA9063_LDO(DA9063, LDO9, 950, 50, 3600),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_3, DA9063_LDO9_MON_EN),

	},

	{

		DA9063_LDO(DA9063, LDO11, 900, 50, 3600),

		.oc_event = BFIELD(DA9063_REG_STATUS_D, DA9063_LDO11_LIM),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_3, DA9063_LDO11_MON_EN),

	},



	/* The following LDOs are present only on DA9063, not on DA9063L */

	{

		DA9063_LDO(DA9063, LDO1, 600, 20, 1860),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_2, DA9063_LDO1_MON_EN),

	},

	{

		DA9063_LDO(DA9063, LDO2, 600, 20, 1860),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_2, DA9063_LDO2_MON_EN),

	},

	{

		DA9063_LDO(DA9063, LDO4, 900, 20, 3440),

		.oc_event = BFIELD(DA9063_REG_STATUS_D, DA9063_LDO4_LIM),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_2, DA9063_LDO4_MON_EN),

	},

	{

		DA9063_LDO(DA9063, LDO5, 900, 50, 3600),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_2, DA9063_LDO5_MON_EN),

	},

	{

		DA9063_LDO(DA9063, LDO6, 900, 50, 3600),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_2, DA9063_LDO6_MON_EN),

	},



	{

		DA9063_LDO(DA9063, LDO10, 900, 50, 3600),

		.vmon = BFIELD(DA9063_BB_REG_MON_REG_3, DA9063_LDO10_MON_EN),

	},

};
@@ -726,6 +771,41 @@ static const struct regulator_init_data *da9063_get_regulator_initdata( 
	return NULL;

}



static int da9063_check_xvp_constraints(struct regulator_config *config)

{

	struct da9063_regulator *regl = config->driver_data;

	const struct regulation_constraints *constr = &config->init_data->constraints;

	const struct notification_limit *uv_l = &constr->under_voltage_limits;

	const struct notification_limit *ov_l = &constr->over_voltage_limits;



	/* make sure that only one severity is used to clarify if unchanged, enabled or disabled */

	if ((!!uv_l->prot + !!uv_l->err + !!uv_l->warn) > 1) {

		dev_err(config->dev, "%s: at most one voltage monitoring severity allowed!\n",

			regl->desc.name);

		return -EINVAL;

	}



	/* make sure that UV and OV monitoring is set to the same severity and value */

	if (uv_l->prot != ov_l->prot) {

		dev_err(config->dev,

			"%s: protection-microvolt: value must be equal for uv and ov!\n",

			regl->desc.name);

		return -EINVAL;

	}

	if (uv_l->err != ov_l->err) {

		dev_err(config->dev, "%s: error-microvolt: value must be equal for uv and ov!\n",

			regl->desc.name);

		return -EINVAL;

	}

	if (uv_l->warn != ov_l->warn) {

		dev_err(config->dev, "%s: warn-microvolt: value must be equal for uv and ov!\n",

			regl->desc.name);

		return -EINVAL;

	}



	return 0;

}



static struct of_regulator_match da9063_matches[] = {

	[DA9063_ID_BCORE1]           = { .name = "bcore1"           },

	[DA9063_ID_BCORE2]           = { .name = "bcore2"           },
@@ -932,6 +1012,12 @@ static int da9063_regulator_probe(struct platform_device *pdev) 
			if (IS_ERR(regl->suspend_sleep))

				return PTR_ERR(regl->suspend_sleep);

		}

		if (regl->info->vmon.reg) {

			regl->vmon = devm_regmap_field_alloc(&pdev->dev,

				da9063->regmap, regl->info->vmon);

			if (IS_ERR(regl->vmon))

				return PTR_ERR(regl->vmon);

		}



		/* Register regulator */

		memset(&config, 0, sizeof(config));
@@ -941,6 +1027,11 @@ static int da9063_regulator_probe(struct platform_device *pdev) 
		if (da9063_reg_matches)

			config.of_node = da9063_reg_matches[id].of_node;

		config.regmap = da9063->regmap;



		ret = da9063_check_xvp_constraints(&config);

		if (ret)

			return ret;



		regl->rdev = devm_regulator_register(&pdev->dev, &regl->desc,

						     &config);

		if (IS_ERR(regl->rdev)) {

include/linux/mfd/da9063/registers.h

+23 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,29 @@ 
/* DA9063_REG_CONFIG_J (addr=0x10F) */

#define DA9063_TWOWIRE_TO			0x40



/* DA9063_REG_MON_REG_2 (addr=0x115) */

#define DA9063_LDO1_MON_EN			0x01

#define DA9063_LDO2_MON_EN			0x02

#define DA9063_LDO3_MON_EN			0x04

#define DA9063_LDO4_MON_EN			0x08

#define DA9063_LDO5_MON_EN			0x10

#define DA9063_LDO6_MON_EN			0x20

#define DA9063_LDO7_MON_EN			0x40

#define DA9063_LDO8_MON_EN			0x80



/* DA9063_REG_MON_REG_3 (addr=0x116) */

#define DA9063_LDO9_MON_EN			0x01

#define DA9063_LDO10_MON_EN			0x02

#define DA9063_LDO11_MON_EN			0x04



/* DA9063_REG_MON_REG_4 (addr=0x117) */

#define DA9063_BCORE1_MON_EN			0x04

#define DA9063_BCORE2_MON_EN			0x08

#define DA9063_BPRO_MON_EN			0x10

#define DA9063_BIO_MON_EN			0x20

#define DA9063_BMEM_MON_EN			0x40

#define DA9063_BPERI_MON_EN			0x80



/* DA9063_REG_MON_REG_5 (addr=0x116) */

#define DA9063_MON_A8_IDX_MASK			0x07

#define		DA9063_MON_A8_IDX_NONE		0x00