Merge branch 'regulator-5.4' into regulator-linus (c642e870) · Commits · 戴 / test

drivers/regulator/bd70528-regulator.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -286,3 +286,4 @@ module_platform_driver(bd70528_regulator);
		MODULE_AUTHOR("Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>");
		MODULE_DESCRIPTION("BD70528 voltage regulator driver");
		MODULE_LICENSE("GPL");
		MODULE_ALIAS("platform:bd70528-pmic");

+7 −2

Original line number	Diff line number	Diff line
		@@ -1844,6 +1844,7 @@ struct regulator _regulator_get(struct device dev, const char *id,
		struct regulator_dev *rdev;
		struct regulator *regulator;
		const char *devname = dev ? dev_name(dev) : "deviceless";
		struct device_link *link;
		int ret;

		if (get_type >= MAX_GET_TYPE) {
		@@ -1951,7 +1952,9 @@ struct regulator _regulator_get(struct device dev, const char *id,
		rdev->use_count = 0;
		}

		device_link_add(dev, &rdev->dev, DL_FLAG_STATELESS);
		link = device_link_add(dev, &rdev->dev, DL_FLAG_STATELESS);
		if (!IS_ERR_OR_NULL(link))
		regulator->device_link = true;

		return regulator;
		}
		@@ -2046,6 +2049,7 @@ static void _regulator_put(struct regulator *regulator)
		debugfs_remove_recursive(regulator->debugfs);

		if (regulator->dev) {
		if (regulator->device_link)
		device_link_remove(regulator->dev, &rdev->dev);

		/* remove any sysfs entries */
		@@ -5198,6 +5202,7 @@ unset_supplies:
		regulator_remove_coupling(rdev);
		mutex_unlock(&regulator_list_mutex);
		wash:
		kfree(rdev->coupling_desc.coupled_rdevs);
		kfree(rdev->constraints);
		mutex_lock(&regulator_list_mutex);
		regulator_ena_gpio_free(rdev);

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ struct regulator {
		struct list_head list;
		unsigned int always_on:1;
		unsigned int bypass:1;
		unsigned int device_link:1;
		int uA_load;
		unsigned int enable_count;
		unsigned int deferred_disables;

+1 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ static const struct regulator_desc rc5t619_regulators[] = {
		REG(LDO7, LDOEN1, BIT(6), LDO7DAC, 0x7f, 900000, 3500000, 25000),
		REG(LDO8, LDOEN1, BIT(7), LDO8DAC, 0x7f, 900000, 3500000, 25000),
		REG(LDO9, LDOEN2, BIT(0), LDO9DAC, 0x7f, 900000, 3500000, 25000),
		REG(LDO10, LDOEN2, BIT(0), LDO10DAC, 0x7f, 900000, 3500000, 25000),
		REG(LDO10, LDOEN2, BIT(1), LDO10DAC, 0x7f, 900000, 3500000, 25000),
		/* LDO RTC */
		REG(LDORTC1, LDOEN2, BIT(4), LDORTCDAC, 0x7f, 1700000, 3500000, 25000),
		REG(LDORTC2, LDOEN2, BIT(5), LDORTC2DAC, 0x7f, 900000, 3500000, 25000),