Merge remote-tracking branches 'regulator/topic/tps65217',... (ad21edcd) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/regulator/core.c

+56 −7

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ static int _regulator_disable(struct regulator_dev *rdev);
		static int _regulator_get_voltage(struct regulator_dev *rdev);
		static int _regulator_get_current_limit(struct regulator_dev *rdev);
		static unsigned int _regulator_get_mode(struct regulator_dev *rdev);
		static void _notifier_call_chain(struct regulator_dev *rdev,
		static int _notifier_call_chain(struct regulator_dev *rdev,
		unsigned long event, void *data);
		static int _regulator_do_set_voltage(struct regulator_dev *rdev,
		int min_uV, int max_uV);
		@@ -2406,6 +2406,55 @@ int regulator_is_supported_voltage(struct regulator *regulator,
		}
		EXPORT_SYMBOL_GPL(regulator_is_supported_voltage);

		static int _regulator_call_set_voltage(struct regulator_dev *rdev,
		int min_uV, int max_uV,
		unsigned *selector)
		{
		struct pre_voltage_change_data data;
		int ret;

		data.old_uV = _regulator_get_voltage(rdev);
		data.min_uV = min_uV;
		data.max_uV = max_uV;
		ret = _notifier_call_chain(rdev, REGULATOR_EVENT_PRE_VOLTAGE_CHANGE,
		&data);
		if (ret & NOTIFY_STOP_MASK)
		return -EINVAL;

		ret = rdev->desc->ops->set_voltage(rdev, min_uV, max_uV, selector);
		if (ret >= 0)
		return ret;

		_notifier_call_chain(rdev, REGULATOR_EVENT_ABORT_VOLTAGE_CHANGE,
		(void *)data.old_uV);

		return ret;
		}

		static int _regulator_call_set_voltage_sel(struct regulator_dev *rdev,
		int uV, unsigned selector)
		{
		struct pre_voltage_change_data data;
		int ret;

		data.old_uV = _regulator_get_voltage(rdev);
		data.min_uV = uV;
		data.max_uV = uV;
		ret = _notifier_call_chain(rdev, REGULATOR_EVENT_PRE_VOLTAGE_CHANGE,
		&data);
		if (ret & NOTIFY_STOP_MASK)
		return -EINVAL;

		ret = rdev->desc->ops->set_voltage_sel(rdev, selector);
		if (ret >= 0)
		return ret;

		_notifier_call_chain(rdev, REGULATOR_EVENT_ABORT_VOLTAGE_CHANGE,
		(void *)data.old_uV);

		return ret;
		}

		static int _regulator_do_set_voltage(struct regulator_dev *rdev,
		int min_uV, int max_uV)
		{
		@@ -2433,7 +2482,7 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
		}

		if (rdev->desc->ops->set_voltage) {
		ret = rdev->desc->ops->set_voltage(rdev, min_uV, max_uV,
		ret = _regulator_call_set_voltage(rdev, min_uV, max_uV,
		&selector);

		if (ret >= 0) {
		@@ -2469,8 +2518,8 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev,
		if (old_selector == selector)
		ret = 0;
		else
		ret = rdev->desc->ops->set_voltage_sel(
		rdev, ret);
		ret = _regulator_call_set_voltage_sel(
		rdev, best_val, selector);
		} else {
		ret = -EINVAL;
		}
		@@ -3116,11 +3165,11 @@ EXPORT_SYMBOL_GPL(regulator_unregister_notifier);
		/* notify regulator consumers and downstream regulator consumers.
		* Note mutex must be held by caller.
		*/
		static void _notifier_call_chain(struct regulator_dev *rdev,
		static int _notifier_call_chain(struct regulator_dev *rdev,
		unsigned long event, void *data)
		{
		/* call rdev chain first */
		blocking_notifier_call_chain(&rdev->notifier, event, data);
		return blocking_notifier_call_chain(&rdev->notifier, event, data);
		}

		/**

drivers/regulator/tps65217-regulator.c

+31 −83

Original line number	Diff line number	Diff line
		@@ -27,10 +27,13 @@
		#include <linux/regulator/machine.h>
		#include <linux/mfd/tps65217.h>

		#define TPS65217_REGULATOR(_name, _id, _ops, _n, _vr, _vm, _em, _t, _lr, _nlr) \
		#define TPS65217_REGULATOR(_name, _id, _of_match, _ops, _n, _vr, _vm, _em, \
		_t, _lr, _nlr) \
		{ \
		.name = _name, \
		.id = _id, \
		.of_match = of_match_ptr(_of_match), \
		.regulators_node= of_match_ptr("regulators"), \
		.ops = &_ops, \
		.n_voltages = _n, \
		.type = REGULATOR_VOLTAGE, \
		@@ -138,87 +141,40 @@ static struct regulator_ops tps65217_pmic_ldo1_ops = {
		};

		static const struct regulator_desc regulators[] = {
		TPS65217_REGULATOR("DCDC1", TPS65217_DCDC_1, tps65217_pmic_ops, 64,
		TPS65217_REG_DEFDCDC1, TPS65217_DEFDCDCX_DCDC_MASK,
		TPS65217_ENABLE_DC1_EN, NULL, tps65217_uv1_ranges,
		2), /* DCDC1 voltage range: 900000 ~ 1800000 */
		TPS65217_REGULATOR("DCDC2", TPS65217_DCDC_2, tps65217_pmic_ops, 64,
		TPS65217_REG_DEFDCDC2, TPS65217_DEFDCDCX_DCDC_MASK,
		TPS65217_ENABLE_DC2_EN, NULL, tps65217_uv1_ranges,
		TPS65217_REGULATOR("DCDC1", TPS65217_DCDC_1, "dcdc1",
		tps65217_pmic_ops, 64, TPS65217_REG_DEFDCDC1,
		TPS65217_DEFDCDCX_DCDC_MASK, TPS65217_ENABLE_DC1_EN,
		NULL, tps65217_uv1_ranges, 2),
		TPS65217_REGULATOR("DCDC2", TPS65217_DCDC_2, "dcdc2",
		tps65217_pmic_ops, 64, TPS65217_REG_DEFDCDC2,
		TPS65217_DEFDCDCX_DCDC_MASK, TPS65217_ENABLE_DC2_EN,
		NULL, tps65217_uv1_ranges,
		ARRAY_SIZE(tps65217_uv1_ranges)),
		TPS65217_REGULATOR("DCDC3", TPS65217_DCDC_3, tps65217_pmic_ops, 64,
		TPS65217_REG_DEFDCDC3, TPS65217_DEFDCDCX_DCDC_MASK,
		TPS65217_ENABLE_DC3_EN, NULL, tps65217_uv1_ranges,
		1), /* DCDC3 voltage range: 900000 ~ 1500000 */
		TPS65217_REGULATOR("LDO1", TPS65217_LDO_1, tps65217_pmic_ldo1_ops, 16,
		TPS65217_REG_DEFLDO1, TPS65217_DEFLDO1_LDO1_MASK,
		TPS65217_ENABLE_LDO1_EN, LDO1_VSEL_table, NULL, 0),
		TPS65217_REGULATOR("LDO2", TPS65217_LDO_2, tps65217_pmic_ops, 64,
		TPS65217_REG_DEFLDO2, TPS65217_DEFLDO2_LDO2_MASK,
		TPS65217_ENABLE_LDO2_EN, NULL, tps65217_uv1_ranges,
		TPS65217_REGULATOR("DCDC3", TPS65217_DCDC_3, "dcdc3",
		tps65217_pmic_ops, 64, TPS65217_REG_DEFDCDC3,
		TPS65217_DEFDCDCX_DCDC_MASK, TPS65217_ENABLE_DC3_EN,
		NULL, tps65217_uv1_ranges, 1),
		TPS65217_REGULATOR("LDO1", TPS65217_LDO_1, "ldo1",
		tps65217_pmic_ldo1_ops, 16, TPS65217_REG_DEFLDO1,
		TPS65217_DEFLDO1_LDO1_MASK, TPS65217_ENABLE_LDO1_EN,
		LDO1_VSEL_table, NULL, 0),
		TPS65217_REGULATOR("LDO2", TPS65217_LDO_2, "ldo2", tps65217_pmic_ops,
		64, TPS65217_REG_DEFLDO2,
		TPS65217_DEFLDO2_LDO2_MASK, TPS65217_ENABLE_LDO2_EN,
		NULL, tps65217_uv1_ranges,
		ARRAY_SIZE(tps65217_uv1_ranges)),
		TPS65217_REGULATOR("LDO3", TPS65217_LDO_3, tps65217_pmic_ops, 32,
		TPS65217_REG_DEFLS1, TPS65217_DEFLDO3_LDO3_MASK,
		TPS65217_REGULATOR("LDO3", TPS65217_LDO_3, "ldo3", tps65217_pmic_ops,
		32, TPS65217_REG_DEFLS1, TPS65217_DEFLDO3_LDO3_MASK,
		TPS65217_ENABLE_LS1_EN \| TPS65217_DEFLDO3_LDO3_EN,
		NULL, tps65217_uv2_ranges,
		ARRAY_SIZE(tps65217_uv2_ranges)),
		TPS65217_REGULATOR("LDO4", TPS65217_LDO_4, tps65217_pmic_ops, 32,
		TPS65217_REG_DEFLS2, TPS65217_DEFLDO4_LDO4_MASK,
		TPS65217_REGULATOR("LDO4", TPS65217_LDO_4, "ldo4", tps65217_pmic_ops,
		32, TPS65217_REG_DEFLS2, TPS65217_DEFLDO4_LDO4_MASK,
		TPS65217_ENABLE_LS2_EN \| TPS65217_DEFLDO4_LDO4_EN,
		NULL, tps65217_uv2_ranges,
		ARRAY_SIZE(tps65217_uv2_ranges)),
		};

		#ifdef CONFIG_OF
		static struct of_regulator_match reg_matches[] = {
		{ .name = "dcdc1", .driver_data = (void *)TPS65217_DCDC_1 },
		{ .name = "dcdc2", .driver_data = (void *)TPS65217_DCDC_2 },
		{ .name = "dcdc3", .driver_data = (void *)TPS65217_DCDC_3 },
		{ .name = "ldo1", .driver_data = (void *)TPS65217_LDO_1 },
		{ .name = "ldo2", .driver_data = (void *)TPS65217_LDO_2 },
		{ .name = "ldo3", .driver_data = (void *)TPS65217_LDO_3 },
		{ .name = "ldo4", .driver_data = (void *)TPS65217_LDO_4 },
		};

		static struct tps65217_board tps65217_parse_dt(struct platform_device pdev)
		{
		struct tps65217 *tps = dev_get_drvdata(pdev->dev.parent);
		struct device_node *node = tps->dev->of_node;
		struct tps65217_board *pdata;
		struct device_node *regs;
		int i, count;

		regs = of_get_child_by_name(node, "regulators");
		if (!regs)
		return NULL;

		count = of_regulator_match(&pdev->dev, regs, reg_matches,
		TPS65217_NUM_REGULATOR);
		of_node_put(regs);
		if ((count < 0) \|\| (count > TPS65217_NUM_REGULATOR))
		return NULL;

		pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
		if (!pdata)
		return NULL;

		for (i = 0; i < count; i++) {
		if (!reg_matches[i].of_node)
		continue;

		pdata->tps65217_init_data[i] = reg_matches[i].init_data;
		pdata->of_node[i] = reg_matches[i].of_node;
		}

		return pdata;
		}
		#else
		static struct tps65217_board tps65217_parse_dt(struct platform_device pdev)
		{
		return NULL;
		}
		#endif

		static int tps65217_regulator_probe(struct platform_device *pdev)
		{
		struct tps65217 *tps = dev_get_drvdata(pdev->dev.parent);
		@@ -227,14 +183,6 @@ static int tps65217_regulator_probe(struct platform_device *pdev)
		struct regulator_config config = { };
		int i;

		if (tps->dev->of_node)
		pdata = tps65217_parse_dt(pdev);

		if (!pdata) {
		dev_err(&pdev->dev, "Platform data not found\n");
		return -EINVAL;
		}

		if (tps65217_chip_id(tps) != TPS65217) {
		dev_err(&pdev->dev, "Invalid tps chip version\n");
		return -ENODEV;
		@@ -245,11 +193,10 @@ static int tps65217_regulator_probe(struct platform_device *pdev)
		for (i = 0; i < TPS65217_NUM_REGULATOR; i++) {
		/* Register the regulators */
		config.dev = tps->dev;
		if (pdata)
		config.init_data = pdata->tps65217_init_data[i];
		config.driver_data = tps;
		config.regmap = tps->regmap;
		if (tps->dev->of_node)
		config.of_node = pdata->of_node[i];

		rdev = devm_regulator_register(&pdev->dev, &regulators[i],
		&config);
		@@ -259,6 +206,7 @@ static int tps65217_regulator_probe(struct platform_device *pdev)
		return PTR_ERR(rdev);
		}
		}

		return 0;
		}

drivers/regulator/tps65910-regulator.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -1047,7 +1047,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
		*tps65910_reg_matches = matches;

		for (idx = 0; idx < count; idx++) {
		if (!matches[idx].init_data \|\| !matches[idx].of_node)
		if (!matches[idx].of_node)
		continue;

		pmic_plat_data->tps65910_pmic_init_data[idx] =
		@@ -1077,7 +1077,6 @@ static int tps65910_probe(struct platform_device *pdev)
		struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
		struct regulator_config config = { };
		struct tps_info *info;
		struct regulator_init_data *reg_data;
		struct regulator_dev *rdev;
		struct tps65910_reg *pmic;
		struct tps65910_board *pmic_plat_data;
		@@ -1140,14 +1139,6 @@ static int tps65910_probe(struct platform_device *pdev)

		for (i = 0; i < pmic->num_regulators && i < TPS65910_NUM_REGS;
		i++, info++) {

		reg_data = pmic_plat_data->tps65910_pmic_init_data[i];

		/* Regulator API handles empty constraints but not NULL
		* constraints */
		if (!reg_data)
		continue;

		/* Register the regulators */
		pmic->info[i] = info;

		@@ -1199,7 +1190,7 @@ static int tps65910_probe(struct platform_device *pdev)
		pmic->desc[i].enable_mask = TPS65910_SUPPLY_STATE_ENABLED;

		config.dev = tps65910->dev;
		config.init_data = reg_data;
		config.init_data = pmic_plat_data->tps65910_pmic_init_data[i];
		config.driver_data = pmic;
		config.regmap = tps65910->regmap;

include/linux/regulator/consumer.h

+20 −0

Original line number	Diff line number	Diff line
		@@ -93,7 +93,12 @@ struct regmap;
		* OVER_TEMP Regulator over temp.
		* FORCE_DISABLE Regulator forcibly shut down by software.
		* VOLTAGE_CHANGE Regulator voltage changed.
		* Data passed is old voltage cast to (void *).
		* DISABLE Regulator was disabled.
		* PRE_VOLTAGE_CHANGE Regulator is about to have voltage changed.
		* Data passed is "struct pre_voltage_change_data"
		* ABORT_VOLTAGE_CHANGE Regulator voltage change failed for some reason.
		* Data passed is old voltage cast to (void *).
		*
		* NOTE: These events can be OR'ed together when passed into handler.
		*/
		@@ -106,6 +111,21 @@ struct regmap;
		#define REGULATOR_EVENT_FORCE_DISABLE 0x20
		#define REGULATOR_EVENT_VOLTAGE_CHANGE 0x40
		#define REGULATOR_EVENT_DISABLE 0x80
		#define REGULATOR_EVENT_PRE_VOLTAGE_CHANGE 0x100
		#define REGULATOR_EVENT_ABORT_VOLTAGE_CHANGE 0x200

		/**
		* struct pre_voltage_change_data - Data sent with PRE_VOLTAGE_CHANGE event
		*
		* @old_uV: Current voltage before change.
		* @min_uV: Min voltage we'll change to.
		* @max_uV: Max voltage we'll change to.
		*/
		struct pre_voltage_change_data {
		unsigned long old_uV;
		unsigned long min_uV;
		unsigned long max_uV;
		};

		struct regulator;