Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regulator-fix-v4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"Three changes here: two run of the mill driver specific fixes and a
change from Mark Rutland which reverts some new device specific ACPI
binding code which was added during the merge window as there are
concerns about this sending the wrong signal about usage of regulators
in ACPI systems"
* tag 'regulator-fix-v4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: fixed: Revert support for ACPI interface
regulator: axp20x: AXP806: Fix dcdcb being set instead of dcdce
regulator: twl6030: fix range comparison, allowing vsel = 59
+2
-48
+1
-1
drivers/regulator/axp20x-regulator.c
+1
-1
drivers/regulator/axp20x-regulator.c
···
272
272
64, AXP806_DCDCD_V_CTRL, 0x3f, AXP806_PWR_OUT_CTRL1,
273
273
BIT(3)),
274
274
AXP_DESC(AXP806, DCDCE, "dcdce", "vine", 1100, 3400, 100,
275
-
AXP806_DCDCB_V_CTRL, 0x1f, AXP806_PWR_OUT_CTRL1, BIT(4)),
275
+
AXP806_DCDCE_V_CTRL, 0x1f, AXP806_PWR_OUT_CTRL1, BIT(4)),
276
276
AXP_DESC(AXP806, ALDO1, "aldo1", "aldoin", 700, 3300, 100,
277
277
AXP806_ALDO1_V_CTRL, 0x1f, AXP806_PWR_OUT_CTRL1, BIT(5)),
278
278
AXP_DESC(AXP806, ALDO2, "aldo2", "aldoin", 700, 3400, 100,
-46
drivers/regulator/fixed.c
-46
drivers/regulator/fixed.c
···
30
30
#include <linux/of_gpio.h>
31
31
#include <linux/regulator/of_regulator.h>
32
32
#include <linux/regulator/machine.h>
33
-
#include <linux/acpi.h>
34
-
#include <linux/property.h>
35
-
#include <linux/gpio/consumer.h>
36
33
37
34
struct fixed_voltage_data {
38
35
struct regulator_desc desc;
···
94
97
return config;
95
98
}
96
99
97
-
/**
98
-
* acpi_get_fixed_voltage_config - extract fixed_voltage_config structure info
99
-
* @dev: device requesting for fixed_voltage_config
100
-
* @desc: regulator description
101
-
*
102
-
* Populates fixed_voltage_config structure by extracting data through ACPI
103
-
* interface, returns a pointer to the populated structure of NULL if memory
104
-
* alloc fails.
105
-
*/
106
-
static struct fixed_voltage_config *
107
-
acpi_get_fixed_voltage_config(struct device *dev,
108
-
const struct regulator_desc *desc)
109
-
{
110
-
struct fixed_voltage_config *config;
111
-
const char *supply_name;
112
-
struct gpio_desc *gpiod;
113
-
int ret;
114
-
115
-
config = devm_kzalloc(dev, sizeof(*config), GFP_KERNEL);
116
-
if (!config)
117
-
return ERR_PTR(-ENOMEM);
118
-
119
-
ret = device_property_read_string(dev, "supply-name", &supply_name);
120
-
if (!ret)
121
-
config->supply_name = supply_name;
122
-
123
-
gpiod = gpiod_get(dev, "gpio", GPIOD_ASIS);
124
-
if (IS_ERR(gpiod))
125
-
return ERR_PTR(-ENODEV);
126
-
127
-
config->gpio = desc_to_gpio(gpiod);
128
-
config->enable_high = device_property_read_bool(dev,
129
-
"enable-active-high");
130
-
gpiod_put(gpiod);
131
-
132
-
return config;
133
-
}
134
-
135
100
static struct regulator_ops fixed_voltage_ops = {
136
101
};
137
102
···
112
153
if (pdev->dev.of_node) {
113
154
config = of_get_fixed_voltage_config(&pdev->dev,
114
155
&drvdata->desc);
115
-
if (IS_ERR(config))
116
-
return PTR_ERR(config);
117
-
} else if (ACPI_HANDLE(&pdev->dev)) {
118
-
config = acpi_get_fixed_voltage_config(&pdev->dev,
119
-
&drvdata->desc);
120
156
if (IS_ERR(config))
121
157
return PTR_ERR(config);
122
158
} else {
+1
-1
drivers/regulator/twl6030-regulator.c
+1
-1
drivers/regulator/twl6030-regulator.c
···
452
452
vsel = 62;
453
453
else if ((min_uV > 1800000) && (min_uV <= 1900000))
454
454
vsel = 61;
455
-
else if ((min_uV > 1350000) && (min_uV <= 1800000))
455
+
else if ((min_uV > 1500000) && (min_uV <= 1800000))
456
456
vsel = 60;
457
457
else if ((min_uV > 1350000) && (min_uV <= 1500000))
458
458
vsel = 59;