You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
Max8925 Voltage regulators
|
||||
|
||||
Required nodes:
|
||||
-nodes:
|
||||
- SDV1 for SDV SDV1
|
||||
- SDV2 for SDV SDV2
|
||||
- SDV3 for SDV SDV3
|
||||
- LDO1 for LDO LDO1
|
||||
- LDO2 for LDO LDO2
|
||||
- LDO3 for LDO LDO3
|
||||
- LDO4 for LDO LDO4
|
||||
- LDO5 for LDO LDO5
|
||||
- LDO6 for LDO LDO6
|
||||
- LDO7 for LDO LDO7
|
||||
- LDO8 for LDO LDO8
|
||||
- LDO9 for LDO LDO9
|
||||
- LDO10 for LDO LDO10
|
||||
- LDO11 for LDO LDO11
|
||||
- LDO12 for LDO LDO12
|
||||
- LDO13 for LDO LDO13
|
||||
- LDO14 for LDO LDO14
|
||||
- LDO15 for LDO LDO15
|
||||
- LDO16 for LDO LDO16
|
||||
- LDO17 for LDO LDO17
|
||||
- LDO18 for LDO LDO18
|
||||
- LDO19 for LDO LDO19
|
||||
- LDO20 for LDO LDO20
|
||||
|
||||
Optional properties:
|
||||
- Any optional property defined in bindings/regulator/regulator.txt
|
||||
|
||||
Example:
|
||||
|
||||
SDV1 {
|
||||
regulator-min-microvolt = <637500>;
|
||||
regulator-max-microvolt = <1425000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
Versatile Express voltage regulators
|
||||
------------------------------------
|
||||
|
||||
Requires node properties:
|
||||
- "compatible" value: "arm,vexpress-volt"
|
||||
- "arm,vexpress-sysreg,func" when controlled via vexpress-sysreg
|
||||
(see Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
|
||||
for more details)
|
||||
|
||||
Required regulator properties:
|
||||
- "regulator-name"
|
||||
- "regulator-always-on"
|
||||
|
||||
Optional regulator properties:
|
||||
- "regulator-min-microvolt"
|
||||
- "regulator-max-microvolt"
|
||||
|
||||
See Documentation/devicetree/bindings/regulator/regulator.txt
|
||||
for more details about the regulator properties.
|
||||
|
||||
When no "regulator-[min|max]-microvolt" properties are defined,
|
||||
the device is treated as fixed (or rather "read-only") regulator.
|
||||
|
||||
Example:
|
||||
volt@0 {
|
||||
compatible = "arm,vexpress-volt";
|
||||
arm,vexpress-sysreg,func = <2 0>;
|
||||
regulator-name = "Cores";
|
||||
regulator-min-microvolt = <800000>;
|
||||
regulator-max-microvolt = <1050000>;
|
||||
regulator-always-on;
|
||||
};
|
||||
@@ -201,7 +201,6 @@ config MFD_TPS6586X
|
||||
depends on I2C=y && GENERIC_HARDIRQS
|
||||
select MFD_CORE
|
||||
select REGMAP_I2C
|
||||
depends on REGULATOR
|
||||
help
|
||||
If you say yes here you get support for the TPS6586X series of
|
||||
Power Management chips.
|
||||
|
||||
+8
-68
@@ -24,8 +24,6 @@
|
||||
#include <linux/err.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/regulator/of_regulator.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
|
||||
#include <linux/mfd/core.h>
|
||||
#include <linux/mfd/tps6586x.h>
|
||||
@@ -98,6 +96,9 @@ static struct mfd_cell tps6586x_cell[] = {
|
||||
{
|
||||
.name = "tps6586x-gpio",
|
||||
},
|
||||
{
|
||||
.name = "tps6586x-pmic",
|
||||
},
|
||||
{
|
||||
.name = "tps6586x-rtc",
|
||||
},
|
||||
@@ -350,80 +351,19 @@ failed:
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static struct of_regulator_match tps6586x_matches[] = {
|
||||
{ .name = "sys", .driver_data = (void *)TPS6586X_ID_SYS },
|
||||
{ .name = "sm0", .driver_data = (void *)TPS6586X_ID_SM_0 },
|
||||
{ .name = "sm1", .driver_data = (void *)TPS6586X_ID_SM_1 },
|
||||
{ .name = "sm2", .driver_data = (void *)TPS6586X_ID_SM_2 },
|
||||
{ .name = "ldo0", .driver_data = (void *)TPS6586X_ID_LDO_0 },
|
||||
{ .name = "ldo1", .driver_data = (void *)TPS6586X_ID_LDO_1 },
|
||||
{ .name = "ldo2", .driver_data = (void *)TPS6586X_ID_LDO_2 },
|
||||
{ .name = "ldo3", .driver_data = (void *)TPS6586X_ID_LDO_3 },
|
||||
{ .name = "ldo4", .driver_data = (void *)TPS6586X_ID_LDO_4 },
|
||||
{ .name = "ldo5", .driver_data = (void *)TPS6586X_ID_LDO_5 },
|
||||
{ .name = "ldo6", .driver_data = (void *)TPS6586X_ID_LDO_6 },
|
||||
{ .name = "ldo7", .driver_data = (void *)TPS6586X_ID_LDO_7 },
|
||||
{ .name = "ldo8", .driver_data = (void *)TPS6586X_ID_LDO_8 },
|
||||
{ .name = "ldo9", .driver_data = (void *)TPS6586X_ID_LDO_9 },
|
||||
{ .name = "ldo_rtc", .driver_data = (void *)TPS6586X_ID_LDO_RTC },
|
||||
};
|
||||
|
||||
static struct tps6586x_platform_data *tps6586x_parse_dt(struct i2c_client *client)
|
||||
{
|
||||
const unsigned int num = ARRAY_SIZE(tps6586x_matches);
|
||||
struct device_node *np = client->dev.of_node;
|
||||
struct tps6586x_platform_data *pdata;
|
||||
struct tps6586x_subdev_info *devs;
|
||||
struct device_node *regs;
|
||||
const char *sys_rail_name = NULL;
|
||||
unsigned int count;
|
||||
unsigned int i, j;
|
||||
int err;
|
||||
|
||||
regs = of_find_node_by_name(np, "regulators");
|
||||
if (!regs)
|
||||
return NULL;
|
||||
|
||||
err = of_regulator_match(&client->dev, regs, tps6586x_matches, num);
|
||||
if (err < 0) {
|
||||
of_node_put(regs);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
of_node_put(regs);
|
||||
count = err;
|
||||
|
||||
devs = devm_kzalloc(&client->dev, count * sizeof(*devs), GFP_KERNEL);
|
||||
if (!devs)
|
||||
return NULL;
|
||||
|
||||
for (i = 0, j = 0; i < num && j < count; i++) {
|
||||
struct regulator_init_data *reg_idata;
|
||||
|
||||
if (!tps6586x_matches[i].init_data)
|
||||
continue;
|
||||
|
||||
reg_idata = tps6586x_matches[i].init_data;
|
||||
devs[j].name = "tps6586x-regulator";
|
||||
devs[j].platform_data = tps6586x_matches[i].init_data;
|
||||
devs[j].id = (int)tps6586x_matches[i].driver_data;
|
||||
if (devs[j].id == TPS6586X_ID_SYS)
|
||||
sys_rail_name = reg_idata->constraints.name;
|
||||
|
||||
if ((devs[j].id == TPS6586X_ID_LDO_5) ||
|
||||
(devs[j].id == TPS6586X_ID_LDO_RTC))
|
||||
reg_idata->supply_regulator = sys_rail_name;
|
||||
|
||||
devs[j].of_node = tps6586x_matches[i].of_node;
|
||||
j++;
|
||||
}
|
||||
|
||||
pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
|
||||
if (!pdata)
|
||||
if (!pdata) {
|
||||
dev_err(&client->dev, "Memory allocation failed\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pdata->num_subdevs = count;
|
||||
pdata->subdevs = devs;
|
||||
pdata->num_subdevs = 0;
|
||||
pdata->subdevs = NULL;
|
||||
pdata->gpio_base = -1;
|
||||
pdata->irq_base = -1;
|
||||
pdata->pm_off = of_property_read_bool(np, "ti,system-power-controller");
|
||||
|
||||
@@ -394,7 +394,7 @@ static int pm8607_regulator_dt_init(struct platform_device *pdev,
|
||||
#define pm8607_regulator_dt_init(x, y, z) (-1)
|
||||
#endif
|
||||
|
||||
static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
|
||||
static int pm8607_regulator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);
|
||||
struct pm8607_regulator_info *info = NULL;
|
||||
@@ -454,7 +454,7 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit pm8607_regulator_remove(struct platform_device *pdev)
|
||||
static int pm8607_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct pm8607_regulator_info *info = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -481,7 +481,7 @@ static struct platform_driver pm8607_regulator_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = pm8607_regulator_probe,
|
||||
.remove = __devexit_p(pm8607_regulator_remove),
|
||||
.remove = pm8607_regulator_remove,
|
||||
.id_table = pm8607_regulator_driver_ids,
|
||||
};
|
||||
|
||||
|
||||
@@ -345,6 +345,17 @@ config REGULATOR_PALMAS
|
||||
on the muxing. This is handled automatically in the driver by
|
||||
reading the mux info from OTP.
|
||||
|
||||
config REGULATOR_TPS51632
|
||||
tristate "TI TPS51632 Power Regulator"
|
||||
depends on I2C
|
||||
select REGMAP_I2C
|
||||
help
|
||||
This driver supports TPS51632 voltage regulator chip.
|
||||
The TPS51632 is 3-2-1 Phase D-Cap+ Step Down Driverless Controller
|
||||
with Serial VID control and DVFS.
|
||||
The voltage output can be configure through I2C interface or PWM
|
||||
interface.
|
||||
|
||||
config REGULATOR_TPS6105X
|
||||
tristate "TI TPS6105X Power regulators"
|
||||
depends on TPS6105X
|
||||
@@ -425,6 +436,15 @@ config REGULATOR_TPS65912
|
||||
help
|
||||
This driver supports TPS65912 voltage regulator chip.
|
||||
|
||||
config REGULATOR_TPS80031
|
||||
tristate "TI TPS80031/TPS80032 power regualtor driver"
|
||||
depends on MFD_TPS80031
|
||||
help
|
||||
TPS80031/ TPS80032 Fully Integrated Power Management with Power
|
||||
Path and Battery Charger. It has 5 configurable step-down
|
||||
converters, 11 general purpose LDOs, VBUS generator and digital
|
||||
output to control regulators.
|
||||
|
||||
config REGULATOR_TWL4030
|
||||
bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 PMIC"
|
||||
depends on TWL4030_CORE
|
||||
@@ -432,6 +452,13 @@ config REGULATOR_TWL4030
|
||||
This driver supports the voltage regulators provided by
|
||||
this family of companion chips.
|
||||
|
||||
config REGULATOR_VEXPRESS
|
||||
tristate "Versatile Express regulators"
|
||||
depends on VEXPRESS_CONFIG
|
||||
help
|
||||
This driver provides support for voltage regulators available
|
||||
on the ARM Ltd's Versatile Express platform.
|
||||
|
||||
config REGULATOR_WM831X
|
||||
tristate "Wolfson Microelectronics WM831x PMIC regulators"
|
||||
depends on MFD_WM831X
|
||||
|
||||
@@ -43,6 +43,7 @@ obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
|
||||
obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o
|
||||
@@ -58,7 +59,9 @@ obj-$(CONFIG_REGULATOR_TPS6524X) += tps6524x-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o
|
||||
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
|
||||
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
|
||||
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
|
||||
|
||||
@@ -187,7 +187,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit aat2870_regulator_remove(struct platform_device *pdev)
|
||||
static int aat2870_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct regulator_dev *rdev = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -201,7 +201,7 @@ static struct platform_driver aat2870_regulator_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = aat2870_regulator_probe,
|
||||
.remove = __devexit_p(aat2870_regulator_remove),
|
||||
.remove = aat2870_regulator_remove,
|
||||
};
|
||||
|
||||
static int __init aat2870_regulator_init(void)
|
||||
|
||||
@@ -494,7 +494,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {
|
||||
* for all the different regulators.
|
||||
*/
|
||||
|
||||
static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
|
||||
static int ab3100_regulators_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
|
||||
struct regulator_config config = { };
|
||||
@@ -571,7 +571,7 @@ static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit ab3100_regulators_remove(struct platform_device *pdev)
|
||||
static int ab3100_regulators_remove(struct platform_device *pdev)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -589,7 +589,7 @@ static struct platform_driver ab3100_regulators_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = ab3100_regulators_probe,
|
||||
.remove = __devexit_p(ab3100_regulators_remove),
|
||||
.remove = ab3100_regulators_remove,
|
||||
};
|
||||
|
||||
static __init int ab3100_regulators_init(void)
|
||||
|
||||
@@ -641,7 +641,7 @@ static struct ab8500_reg_init ab8500_reg_init[] = {
|
||||
REG_INIT(AB8500_REGUCTRLDISCH2, 0x04, 0x44, 0x16),
|
||||
};
|
||||
|
||||
static __devinit int
|
||||
static int
|
||||
ab8500_regulator_init_registers(struct platform_device *pdev, int id, int value)
|
||||
{
|
||||
int err;
|
||||
@@ -676,7 +676,7 @@ ab8500_regulator_init_registers(struct platform_device *pdev, int id, int value)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static __devinit int ab8500_regulator_register(struct platform_device *pdev,
|
||||
static int ab8500_regulator_register(struct platform_device *pdev,
|
||||
struct regulator_init_data *init_data,
|
||||
int id,
|
||||
struct device_node *np)
|
||||
@@ -735,7 +735,7 @@ static struct of_regulator_match ab8500_regulator_matches[] = {
|
||||
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, },
|
||||
};
|
||||
|
||||
static __devinit int
|
||||
static int
|
||||
ab8500_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
|
||||
{
|
||||
int err, i;
|
||||
@@ -751,7 +751,7 @@ ab8500_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
|
||||
static int ab8500_regulator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
|
||||
struct ab8500_platform_data *pdata;
|
||||
@@ -817,7 +817,7 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static __devexit int ab8500_regulator_remove(struct platform_device *pdev)
|
||||
static int ab8500_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -836,7 +836,7 @@ static __devexit int ab8500_regulator_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver ab8500_regulator_driver = {
|
||||
.probe = ab8500_regulator_probe,
|
||||
.remove = __devexit_p(ab8500_regulator_remove),
|
||||
.remove = ab8500_regulator_remove,
|
||||
.driver = {
|
||||
.name = "ab8500-regulator",
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@@ -211,7 +211,7 @@ static const struct i2c_device_id ad5398_id[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, ad5398_id);
|
||||
|
||||
static int __devinit ad5398_probe(struct i2c_client *client,
|
||||
static int ad5398_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct regulator_init_data *init_data = client->dev.platform_data;
|
||||
@@ -256,7 +256,7 @@ err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit ad5398_remove(struct i2c_client *client)
|
||||
static int ad5398_remove(struct i2c_client *client)
|
||||
{
|
||||
struct ad5398_chip_info *chip = i2c_get_clientdata(client);
|
||||
|
||||
@@ -266,7 +266,7 @@ static int __devexit ad5398_remove(struct i2c_client *client)
|
||||
|
||||
static struct i2c_driver ad5398_driver = {
|
||||
.probe = ad5398_probe,
|
||||
.remove = __devexit_p(ad5398_remove),
|
||||
.remove = ad5398_remove,
|
||||
.driver = {
|
||||
.name = "ad5398",
|
||||
},
|
||||
|
||||
@@ -87,7 +87,7 @@ static struct regulator_ops anatop_rops = {
|
||||
.map_voltage = regulator_map_voltage_linear,
|
||||
};
|
||||
|
||||
static int __devinit anatop_regulator_probe(struct platform_device *pdev)
|
||||
static int anatop_regulator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct device_node *np = dev->of_node;
|
||||
@@ -186,7 +186,7 @@ anatop_probe_end:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit anatop_regulator_remove(struct platform_device *pdev)
|
||||
static int anatop_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct regulator_dev *rdev = platform_get_drvdata(pdev);
|
||||
struct anatop_regulator *sreg = rdev_get_drvdata(rdev);
|
||||
@@ -210,7 +210,7 @@ static struct platform_driver anatop_regulator_driver = {
|
||||
.of_match_table = of_anatop_regulator_match_tbl,
|
||||
},
|
||||
.probe = anatop_regulator_probe,
|
||||
.remove = __devexit_p(anatop_regulator_remove),
|
||||
.remove = anatop_regulator_remove,
|
||||
};
|
||||
|
||||
static int __init anatop_regulator_init(void)
|
||||
|
||||
@@ -180,7 +180,7 @@ static const struct regulator_init_data arizona_ldo1_default = {
|
||||
.num_consumer_supplies = 1,
|
||||
};
|
||||
|
||||
static __devinit int arizona_ldo1_probe(struct platform_device *pdev)
|
||||
static int arizona_ldo1_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
|
||||
const struct regulator_desc *desc;
|
||||
@@ -239,7 +239,7 @@ static __devinit int arizona_ldo1_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static __devexit int arizona_ldo1_remove(struct platform_device *pdev)
|
||||
static int arizona_ldo1_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct arizona_ldo1 *ldo1 = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -250,7 +250,7 @@ static __devexit int arizona_ldo1_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver arizona_ldo1_driver = {
|
||||
.probe = arizona_ldo1_probe,
|
||||
.remove = __devexit_p(arizona_ldo1_remove),
|
||||
.remove = arizona_ldo1_remove,
|
||||
.driver = {
|
||||
.name = "arizona-ldo1",
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@@ -117,7 +117,7 @@ static const struct regulator_init_data arizona_micsupp_default = {
|
||||
.num_consumer_supplies = 1,
|
||||
};
|
||||
|
||||
static __devinit int arizona_micsupp_probe(struct platform_device *pdev)
|
||||
static int arizona_micsupp_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
|
||||
struct regulator_config config = { };
|
||||
@@ -168,7 +168,7 @@ static __devinit int arizona_micsupp_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static __devexit int arizona_micsupp_remove(struct platform_device *pdev)
|
||||
static int arizona_micsupp_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct arizona_micsupp *micsupp = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -179,7 +179,7 @@ static __devexit int arizona_micsupp_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver arizona_micsupp_driver = {
|
||||
.probe = arizona_micsupp_probe,
|
||||
.remove = __devexit_p(arizona_micsupp_remove),
|
||||
.remove = arizona_micsupp_remove,
|
||||
.driver = {
|
||||
.name = "arizona-micsupp",
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@@ -2007,6 +2007,11 @@ int regulator_is_supported_voltage(struct regulator *regulator,
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Any voltage within constrains range is fine? */
|
||||
if (rdev->desc->continuous_voltage_range)
|
||||
return min_uV >= rdev->constraints->min_uV &&
|
||||
max_uV <= rdev->constraints->max_uV;
|
||||
|
||||
ret = regulator_count_voltages(regulator);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
@@ -460,7 +460,7 @@ static inline struct da903x_regulator_info *find_regulator_info(int id)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int __devinit da903x_regulator_probe(struct platform_device *pdev)
|
||||
static int da903x_regulator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct da903x_regulator_info *ri = NULL;
|
||||
struct regulator_dev *rdev;
|
||||
@@ -499,7 +499,7 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit da903x_regulator_remove(struct platform_device *pdev)
|
||||
static int da903x_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct regulator_dev *rdev = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -513,7 +513,7 @@ static struct platform_driver da903x_regulator_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = da903x_regulator_probe,
|
||||
.remove = __devexit_p(da903x_regulator_remove),
|
||||
.remove = da903x_regulator_remove,
|
||||
};
|
||||
|
||||
static int __init da903x_regulator_init(void)
|
||||
|
||||
@@ -365,7 +365,7 @@ static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int __devinit da9052_regulator_probe(struct platform_device *pdev)
|
||||
static int da9052_regulator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct regulator_config config = { };
|
||||
struct da9052_regulator *regulator;
|
||||
@@ -430,7 +430,7 @@ static int __devinit da9052_regulator_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit da9052_regulator_remove(struct platform_device *pdev)
|
||||
static int da9052_regulator_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct da9052_regulator *regulator = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -440,7 +440,7 @@ static int __devexit da9052_regulator_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver da9052_regulator_driver = {
|
||||
.probe = da9052_regulator_probe,
|
||||
.remove = __devexit_p(da9052_regulator_remove),
|
||||
.remove = da9052_regulator_remove,
|
||||
.driver = {
|
||||
.name = "da9052-regulator",
|
||||
.owner = THIS_MODULE,
|
||||
|
||||
@@ -412,7 +412,7 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = {
|
||||
},
|
||||
};
|
||||
|
||||
static __devinit int db8500_regulator_register(struct platform_device *pdev,
|
||||
static int db8500_regulator_register(struct platform_device *pdev,
|
||||
struct regulator_init_data *init_data,
|
||||
int id,
|
||||
struct device_node *np)
|
||||
@@ -474,7 +474,7 @@ static struct of_regulator_match db8500_regulator_matches[] = {
|
||||
{ .name = "db8500_esram34_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, },
|
||||
};
|
||||
|
||||
static __devinit int
|
||||
static int
|
||||
db8500_regulator_of_probe(struct platform_device *pdev,
|
||||
struct device_node *np)
|
||||
{
|
||||
@@ -491,7 +491,7 @@ db8500_regulator_of_probe(struct platform_device *pdev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit db8500_regulator_probe(struct platform_device *pdev)
|
||||
static int db8500_regulator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct regulator_init_data *db8500_init_data =
|
||||
dev_get_platdata(&pdev->dev);
|
||||
|
||||
@@ -173,7 +173,7 @@ int __attribute__((weak)) dbx500_regulator_testcase(
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __devinit
|
||||
int
|
||||
ux500_regulator_debug_init(struct platform_device *pdev,
|
||||
struct dbx500_regulator_info *regulator_info,
|
||||
int num_regulators)
|
||||
@@ -230,7 +230,7 @@ exit_no_debugfs:
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
int __devexit ux500_regulator_debug_exit(void)
|
||||
int ux500_regulator_debug_exit(void)
|
||||
{
|
||||
debugfs_remove_recursive(rdebug.dir);
|
||||
kfree(rdebug.state_after_suspend);
|
||||
|
||||
@@ -37,7 +37,7 @@ static struct regulator_desc dummy_desc = {
|
||||
.ops = &dummy_ops,
|
||||
};
|
||||
|
||||
static int __devinit dummy_regulator_probe(struct platform_device *pdev)
|
||||
static int dummy_regulator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct regulator_config config = { };
|
||||
int ret;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user