mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 00:39:48 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branches 'regulator/topic/doc' and 'regulator/topic/sc2731' into regulator-next

Browse source
This commit is contained in:
Mark Brown 2018-01-26 17:57:02 +00:00
commit cf1ba3bb9b
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
6 changed files with 324 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Documentation/devicetree/bindings/regulator/sprd,sc2731-regulator.txt Normal file
View file

@ -0,0 +1,43 @@
Spreadtrum SC2731 Voltage regulators
The SC2731 integrates low-voltage and low quiescent current DCDC/LDO.
14 LDO and 3 DCDCs are designed for external use. All DCDCs/LDOs have
their own bypass (power-down) control signals. External tantalum or MLCC
ceramic capacitors are recommended to use with these LDOs.
Required properties:
- compatible: should be "sprd,sc27xx-regulator".
List of regulators provided by this controller. It is named according to
its regulator type, BUCK_<name> and LDO_<name>. The definition for each
of these nodes is defined using the standard binding for regulators at
Documentation/devicetree/bindings/regulator/regulator.txt.
The valid names for regulators are:
BUCK:
BUCK_CPU0, BUCK_CPU1, BUCK_RF
LDO:
LDO_CAMA0, LDO_CAMA1, LDO_CAMMOT, LDO_VLDO, LDO_EMMCCORE, LDO_SDCORE,
LDO_SDIO, LDO_WIFIPA, LDO_USB33, LDO_CAMD0, LDO_CAMD1, LDO_CON,
LDO_CAMIO, LDO_SRAM
Example:
regulators {
compatible = "sprd,sc27xx-regulator";
vddarm0: BUCK_CPU0 {
regulator-name = "vddarm0";
regulator-min-microvolt = <400000>;
regulator-max-microvolt = <1996875>;
regulator-ramp-delay = <25000>;
regulator-always-on;
};
vddcama0: LDO_CAMA0 {
regulator-name = "vddcama0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <3750000>;
regulator-enable-ramp-delay = <100>;
};
...
};

36
Documentation/power/regulator/machine.txt
View file

@ -23,16 +23,12 @@ struct regulator_consumer_supply {
e.g. for the machine above
static struct regulator_consumer_supply regulator1_consumers[] = {
{
.dev_name = "dev_name(consumer B)",
.supply = "Vcc",
},};
REGULATOR_SUPPLY("Vcc", "consumer B"),
};
static struct regulator_consumer_supply regulator2_consumers[] = {
{
.dev = "dev_name(consumer A"),
.supply = "Vcc",
},};
REGULATOR_SUPPLY("Vcc", "consumer A"),
};
This maps Regulator-1 to the 'Vcc' supply for Consumer B and maps Regulator-2
to the 'Vcc' supply for Consumer A.
@ -78,20 +74,20 @@ static struct regulator_init_data regulator2_data = {
Finally the regulator devices must be registered in the usual manner.
static struct platform_device regulator_devices[] = {
{
.name = "regulator",
.id = DCDC_1,
.dev = {
.platform_data = &regulator1_data,
{
.name = "regulator",
.id = DCDC_1,
.dev = {
.platform_data = &regulator1_data,
},
},
},
{
.name = "regulator",
.id = DCDC_2,
.dev = {
.platform_data = &regulator2_data,
{
.name = "regulator",
.id = DCDC_2,
.dev = {
.platform_data = &regulator2_data,
},
},
},
};
/* register regulator 1 device */
platform_device_register(&regulator_devices[0]);

1
MAINTAINERS
View file

@ -14648,6 +14648,7 @@ W: http://www.slimlogic.co.uk/?p=48
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
S: Supported
F: Documentation/devicetree/bindings/regulator/
F: Documentation/power/regulator/
F: drivers/regulator/
F: include/dt-bindings/regulator/
F: include/linux/regulator/

7
drivers/regulator/Kconfig
View file

@ -744,6 +744,13 @@ config REGULATOR_S5M8767
via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and
supports DVS mode with 8bits of output voltage control.
config REGULATOR_SC2731
tristate "Spreadtrum SC2731 power regulator driver"
depends on MFD_SC27XX_PMIC || COMPILE_TEST
help
This driver provides support for the voltage regulators on the
SC2731 PMIC.
config REGULATOR_SKY81452
tristate "Skyworks Solutions SKY81452 voltage regulator"
depends on MFD_SKY81452

1
drivers/regulator/Makefile
View file

@ -95,6 +95,7 @@ obj-$(CONFIG_REGULATOR_RT5033) += rt5033-regulator.o
obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o
obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
obj-$(CONFIG_REGULATOR_SC2731) += sc2731-regulator.o
obj-$(CONFIG_REGULATOR_SKY81452) += sky81452-regulator.o
obj-$(CONFIG_REGULATOR_STM32_VREFBUF) += stm32-vrefbuf.o
obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o

256
drivers/regulator/sc2731-regulator.c Normal file
View file

@ -0,0 +1,256 @@
//SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2017 Spreadtrum Communications Inc.
*/
#include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/regmap.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/of_regulator.h>
/*
* SC2731 regulator lock register
*/
#define SC2731_PWR_WR_PROT 0xf0c
#define SC2731_WR_UNLOCK_VALUE 0x6e7f
/*
* SC2731 enable register
*/
#define SC2731_POWER_PD_SW 0xc28
#define SC2731_LDO_CAMA0_PD 0xcfc
#define SC2731_LDO_CAMA1_PD 0xd04
#define SC2731_LDO_CAMMOT_PD 0xd0c
#define SC2731_LDO_VLDO_PD 0xd6c
#define SC2731_LDO_EMMCCORE_PD 0xd2c
#define SC2731_LDO_SDCORE_PD 0xd74
#define SC2731_LDO_SDIO_PD 0xd70
#define SC2731_LDO_WIFIPA_PD 0xd4c
#define SC2731_LDO_USB33_PD 0xd5c
#define SC2731_LDO_CAMD0_PD 0xd7c
#define SC2731_LDO_CAMD1_PD 0xd84
#define SC2731_LDO_CON_PD 0xd8c
#define SC2731_LDO_CAMIO_PD 0xd94
#define SC2731_LDO_SRAM_PD 0xd78
/*
* SC2731 enable mask
*/
#define SC2731_DCDC_CPU0_PD_MASK BIT(4)
#define SC2731_DCDC_CPU1_PD_MASK BIT(3)
#define SC2731_DCDC_RF_PD_MASK BIT(11)
#define SC2731_LDO_CAMA0_PD_MASK BIT(0)
#define SC2731_LDO_CAMA1_PD_MASK BIT(0)
#define SC2731_LDO_CAMMOT_PD_MASK BIT(0)
#define SC2731_LDO_VLDO_PD_MASK BIT(0)
#define SC2731_LDO_EMMCCORE_PD_MASK BIT(0)
#define SC2731_LDO_SDCORE_PD_MASK BIT(0)
#define SC2731_LDO_SDIO_PD_MASK BIT(0)
#define SC2731_LDO_WIFIPA_PD_MASK BIT(0)
#define SC2731_LDO_USB33_PD_MASK BIT(0)
#define SC2731_LDO_CAMD0_PD_MASK BIT(0)
#define SC2731_LDO_CAMD1_PD_MASK BIT(0)
#define SC2731_LDO_CON_PD_MASK BIT(0)
#define SC2731_LDO_CAMIO_PD_MASK BIT(0)
#define SC2731_LDO_SRAM_PD_MASK BIT(0)
/*
* SC2731 vsel register
*/
#define SC2731_DCDC_CPU0_VOL 0xc54
#define SC2731_DCDC_CPU1_VOL 0xc64
#define SC2731_DCDC_RF_VOL 0xcb8
#define SC2731_LDO_CAMA0_VOL 0xd00
#define SC2731_LDO_CAMA1_VOL 0xd08
#define SC2731_LDO_CAMMOT_VOL 0xd10
#define SC2731_LDO_VLDO_VOL 0xd28
#define SC2731_LDO_EMMCCORE_VOL 0xd30
#define SC2731_LDO_SDCORE_VOL 0xd38
#define SC2731_LDO_SDIO_VOL 0xd40
#define SC2731_LDO_WIFIPA_VOL 0xd50
#define SC2731_LDO_USB33_VOL 0xd60
#define SC2731_LDO_CAMD0_VOL 0xd80
#define SC2731_LDO_CAMD1_VOL 0xd88
#define SC2731_LDO_CON_VOL 0xd90
#define SC2731_LDO_CAMIO_VOL 0xd98
#define SC2731_LDO_SRAM_VOL 0xdB0
/*
* SC2731 vsel register mask
*/
#define SC2731_DCDC_CPU0_VOL_MASK GENMASK(8, 0)
#define SC2731_DCDC_CPU1_VOL_MASK GENMASK(8, 0)
#define SC2731_DCDC_RF_VOL_MASK GENMASK(8, 0)
#define SC2731_LDO_CAMA0_VOL_MASK GENMASK(7, 0)
#define SC2731_LDO_CAMA1_VOL_MASK GENMASK(7, 0)
#define SC2731_LDO_CAMMOT_VOL_MASK GENMASK(7, 0)
#define SC2731_LDO_VLDO_VOL_MASK GENMASK(7, 0)
#define SC2731_LDO_EMMCCORE_VOL_MASK GENMASK(7, 0)
#define SC2731_LDO_SDCORE_VOL_MASK GENMASK(7, 0)
#define SC2731_LDO_SDIO_VOL_MASK GENMASK(7, 0)
#define SC2731_LDO_WIFIPA_VOL_MASK GENMASK(7, 0)
#define SC2731_LDO_USB33_VOL_MASK GENMASK(7, 0)
#define SC2731_LDO_CAMD0_VOL_MASK GENMASK(6, 0)
#define SC2731_LDO_CAMD1_VOL_MASK GENMASK(6, 0)
#define SC2731_LDO_CON_VOL_MASK GENMASK(6, 0)
#define SC2731_LDO_CAMIO_VOL_MASK GENMASK(6, 0)
#define SC2731_LDO_SRAM_VOL_MASK GENMASK(6, 0)
enum sc2731_regulator_id {
SC2731_BUCK_CPU0,
SC2731_BUCK_CPU1,
SC2731_BUCK_RF,
SC2731_LDO_CAMA0,
SC2731_LDO_CAMA1,
SC2731_LDO_CAMMOT,
SC2731_LDO_VLDO,
SC2731_LDO_EMMCCORE,
SC2731_LDO_SDCORE,
SC2731_LDO_SDIO,
SC2731_LDO_WIFIPA,
SC2731_LDO_USB33,
SC2731_LDO_CAMD0,
SC2731_LDO_CAMD1,
SC2731_LDO_CON,
SC2731_LDO_CAMIO,
SC2731_LDO_SRAM,
};
static const struct regulator_ops sc2731_regu_linear_ops = {
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
.is_enabled = regulator_is_enabled_regmap,
.list_voltage = regulator_list_voltage_linear,
.get_voltage_sel = regulator_get_voltage_sel_regmap,
.set_voltage_sel = regulator_set_voltage_sel_regmap,
};
#define SC2731_REGU_LINEAR(_id, en_reg, en_mask, vreg, vmask, \
vstep, vmin, vmax) { \
.name = #_id, \
.of_match = of_match_ptr(#_id), \
.ops = &sc2731_regu_linear_ops, \
.type = REGULATOR_VOLTAGE, \
.id = SC2731_##_id, \
.owner = THIS_MODULE, \
.min_uV = vmin, \
.n_voltages = ((vmax) - (vmin)) / (vstep) + 1, \
.uV_step = vstep, \
.enable_is_inverted = true, \
.enable_val = 0, \
.enable_reg = en_reg, \
.enable_mask = en_mask, \
.vsel_reg = vreg, \
.vsel_mask = vmask, \
}
static struct regulator_desc regulators[] = {
SC2731_REGU_LINEAR(BUCK_CPU0, SC2731_POWER_PD_SW,
SC2731_DCDC_CPU0_PD_MASK, SC2731_DCDC_CPU0_VOL,
SC2731_DCDC_CPU0_VOL_MASK, 3125, 400000, 1996875),
SC2731_REGU_LINEAR(BUCK_CPU1, SC2731_POWER_PD_SW,
SC2731_DCDC_CPU1_PD_MASK, SC2731_DCDC_CPU1_VOL,
SC2731_DCDC_CPU1_VOL_MASK, 3125, 400000, 1996875),
SC2731_REGU_LINEAR(BUCK_RF, SC2731_POWER_PD_SW, SC2731_DCDC_RF_PD_MASK,
SC2731_DCDC_RF_VOL, SC2731_DCDC_RF_VOL_MASK,
3125, 600000, 2196875),
SC2731_REGU_LINEAR(LDO_CAMA0, SC2731_LDO_CAMA0_PD,
SC2731_LDO_CAMA0_PD_MASK, SC2731_LDO_CAMA0_VOL,
SC2731_LDO_CAMA0_VOL_MASK, 10000, 1200000, 3750000),
SC2731_REGU_LINEAR(LDO_CAMA1, SC2731_LDO_CAMA1_PD,
SC2731_LDO_CAMA1_PD_MASK, SC2731_LDO_CAMA1_VOL,
SC2731_LDO_CAMA1_VOL_MASK, 10000, 1200000, 3750000),
SC2731_REGU_LINEAR(LDO_CAMMOT, SC2731_LDO_CAMMOT_PD,
SC2731_LDO_CAMMOT_PD_MASK, SC2731_LDO_CAMMOT_VOL,
SC2731_LDO_CAMMOT_VOL_MASK, 10000, 1200000, 3750000),
SC2731_REGU_LINEAR(LDO_VLDO, SC2731_LDO_VLDO_PD,
SC2731_LDO_VLDO_PD_MASK, SC2731_LDO_VLDO_VOL,
SC2731_LDO_VLDO_VOL_MASK, 10000, 1200000, 3750000),
SC2731_REGU_LINEAR(LDO_EMMCCORE, SC2731_LDO_EMMCCORE_PD,
SC2731_LDO_EMMCCORE_PD_MASK, SC2731_LDO_EMMCCORE_VOL,
SC2731_LDO_EMMCCORE_VOL_MASK, 10000, 1200000,
3750000),
SC2731_REGU_LINEAR(LDO_SDCORE, SC2731_LDO_SDCORE_PD,
SC2731_LDO_SDCORE_PD_MASK, SC2731_LDO_SDCORE_VOL,
SC2731_LDO_SDCORE_VOL_MASK, 10000, 1200000, 3750000),
SC2731_REGU_LINEAR(LDO_SDIO, SC2731_LDO_SDIO_PD,
SC2731_LDO_SDIO_PD_MASK, SC2731_LDO_SDIO_VOL,
SC2731_LDO_SDIO_VOL_MASK, 10000, 1200000, 3750000),
SC2731_REGU_LINEAR(LDO_WIFIPA, SC2731_LDO_WIFIPA_PD,
SC2731_LDO_WIFIPA_PD_MASK, SC2731_LDO_WIFIPA_VOL,
SC2731_LDO_WIFIPA_VOL_MASK, 10000, 1200000, 3750000),
SC2731_REGU_LINEAR(LDO_USB33, SC2731_LDO_USB33_PD,
SC2731_LDO_USB33_PD_MASK, SC2731_LDO_USB33_VOL,
SC2731_LDO_USB33_VOL_MASK, 10000, 1200000, 3750000),
SC2731_REGU_LINEAR(LDO_CAMD0, SC2731_LDO_CAMD0_PD,
SC2731_LDO_CAMD0_PD_MASK, SC2731_LDO_CAMD0_VOL,
SC2731_LDO_CAMD0_VOL_MASK, 6250, 1000000, 1793750),
SC2731_REGU_LINEAR(LDO_CAMD1, SC2731_LDO_CAMD1_PD,
SC2731_LDO_CAMD1_PD_MASK, SC2731_LDO_CAMD1_VOL,
SC2731_LDO_CAMD1_VOL_MASK, 6250, 1000000, 1793750),
SC2731_REGU_LINEAR(LDO_CON, SC2731_LDO_CON_PD,
SC2731_LDO_CON_PD_MASK, SC2731_LDO_CON_VOL,
SC2731_LDO_CON_VOL_MASK, 6250, 1000000, 1793750),
SC2731_REGU_LINEAR(LDO_CAMIO, SC2731_LDO_CAMIO_PD,
SC2731_LDO_CAMIO_PD_MASK, SC2731_LDO_CAMIO_VOL,
SC2731_LDO_CAMIO_VOL_MASK, 6250, 1000000, 1793750),
SC2731_REGU_LINEAR(LDO_SRAM, SC2731_LDO_SRAM_PD,
SC2731_LDO_SRAM_PD_MASK, SC2731_LDO_SRAM_VOL,
SC2731_LDO_SRAM_VOL_MASK, 6250, 1000000, 1793750),
};
static int sc2731_regulator_unlock(struct regmap *regmap)
{
return regmap_write(regmap, SC2731_PWR_WR_PROT,
SC2731_WR_UNLOCK_VALUE);
}
static int sc2731_regulator_probe(struct platform_device *pdev)
{
int i, ret;
struct regmap *regmap;
struct regulator_config config = { };
struct regulator_dev *rdev;
regmap = dev_get_regmap(pdev->dev.parent, NULL);
if (!regmap) {
dev_err(&pdev->dev, "failed to get regmap.\n");
return -ENODEV;
}
ret = sc2731_regulator_unlock(regmap);
if (ret) {
dev_err(&pdev->dev, "failed to release regulator lock\n");
return ret;
}
config.dev = &pdev->dev;
config.regmap = regmap;
for (i = 0; i < ARRAY_SIZE(regulators); i++) {
rdev = devm_regulator_register(&pdev->dev, &regulators[i],
&config);
if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "failed to register regulator %s\n",
regulators[i].name);
return PTR_ERR(rdev);
}
}
return 0;
}
static struct platform_driver sc2731_regulator_driver = {
.driver = {
.name = "sc27xx-regulator",
},
.probe = sc2731_regulator_probe,
};
module_platform_driver(sc2731_regulator_driver);
MODULE_AUTHOR("Chen Junhui <erick.chen@spreadtrum.com>");
MODULE_DESCRIPTION("Spreadtrum SC2731 regulator driver");
MODULE_LICENSE("GPL v2");