[U-Boot] [PATCH v4 0/6] power: pmic: Add support for Palmas family of PMICs
The series adds support for Palmas family of PMICs. Implements functions to configure regulators. Enable/Disable Get/Set voltages of regulators.
Supports TPS659038, TPS65917, Palmas.
Tested on TPS659038, TPS65917 using DRA7XX-EVM and AM57XX-EVM.
Changes in v4:
Added Reviewed-by and a minor change from printf to debug.
Changes in v3:
Introduced u8 i2c read/write functions.
Keerthy (6): dm: i2c: Add u8 read/write i2c functions power: regulator: Add ctrl_reg and volt_reg fields for pmic power: pmic: Palmas: Add the base pmic support power: regulator: palmas: Add regulator support configs: dra7xx_evm_defconfig: Enable PALMAS options configs: am57xx_evm_defconfig: Enable PALMAS options
configs/am57xx_evm_defconfig | 3 + configs/dra7xx_evm_defconfig | 3 + drivers/i2c/i2c-uclass.c | 10 + drivers/power/pmic/Kconfig | 7 + drivers/power/pmic/Makefile | 1 + drivers/power/pmic/palmas.c | 77 +++++ drivers/power/regulator/Kconfig | 8 + drivers/power/regulator/Makefile | 1 + drivers/power/regulator/palmas_regulator.c | 457 +++++++++++++++++++++++++++++ include/i2c.h | 24 ++ include/power/palmas.h | 25 ++ include/power/regulator.h | 4 + 12 files changed, 620 insertions(+) create mode 100644 drivers/power/pmic/palmas.c create mode 100644 drivers/power/regulator/palmas_regulator.c create mode 100644 include/power/palmas.h
Add u8 i2c read/write hooks.
Signed-off-by: Keerthy j-keerthy@ti.com Reviewed-by: Tom Rini trini@konsulko.com --- drivers/i2c/i2c-uclass.c | 10 ++++++++++ include/i2c.h | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+)
diff --git a/drivers/i2c/i2c-uclass.c b/drivers/i2c/i2c-uclass.c index dbd3789..6ce5d9a 100644 --- a/drivers/i2c/i2c-uclass.c +++ b/drivers/i2c/i2c-uclass.c @@ -231,6 +231,16 @@ int dm_i2c_reg_write(struct udevice *dev, uint offset, uint value) return dm_i2c_write(dev, offset, &val, 1); }
+int dm_i2c_u8_read(struct udevice *dev, uint offset, u8 *val) +{ + return dm_i2c_read(dev, offset, val, 1); +} + +int dm_i2c_u8_write(struct udevice *dev, uint offset, u8 *val) +{ + return dm_i2c_write(dev, offset, val, 1); +} + /** * i2c_probe_chip() - probe for a chip on a bus * diff --git a/include/i2c.h b/include/i2c.h index d500445..c3059ad 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -191,6 +191,30 @@ int dm_i2c_reg_read(struct udevice *dev, uint offset); int dm_i2c_reg_write(struct udevice *dev, uint offset, unsigned int val);
/** + * dm_i2c_u8_read() - Read a byte value from an I2C register + * + * This reads a single value from the given address in an I2C chip + * + * @dev: Device to use for transfer + * @addr: Address to read from + * @val: Value read is stored in val + * @return 0 for success, -ve on error + */ +int dm_i2c_u8_read(struct udevice *dev, uint offset, u8 *val); + +/** + * dm_i2c_u8_write() - Write a byte value to an I2C register + * + * This writes a single value to the given address in an I2C chip + * + * @dev: Device to use for transfer + * @addr: Address to write to + * @val: Value to write + * @return 0 on success, -ve on error + */ +int dm_i2c_u8_write(struct udevice *dev, uint offset, u8 *val); + +/** * dm_i2c_xfer() - Transfer messages over I2C * * This transfers a raw message. It is best to use dm_i2c_reg_read/write()
On 25 September 2016 at 22:35, Keerthy j-keerthy@ti.com wrote:
Add u8 i2c read/write hooks.
Signed-off-by: Keerthy j-keerthy@ti.com Reviewed-by: Tom Rini trini@konsulko.com
drivers/i2c/i2c-uclass.c | 10 ++++++++++ include/i2c.h | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+)
Well, OK.
Reviewed-by: Simon Glass sjg@chromium.org
On Tuesday 27 September 2016 06:03 AM, Simon Glass wrote:
On 25 September 2016 at 22:35, Keerthy j-keerthy@ti.com wrote:
Add u8 i2c read/write hooks.
Signed-off-by: Keerthy j-keerthy@ti.com Reviewed-by: Tom Rini trini@konsulko.com
drivers/i2c/i2c-uclass.c | 10 ++++++++++ include/i2c.h | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+)
Well, OK.
Reviewed-by: Simon Glass sjg@chromium.org
Thanks Simon.
The ctrl reg contains bit fields to enable and disable regulators, and volt_reg has the bit fields to configure the voltage values. The registers are frequently accessed hence make them part of dm_regulator_uclass_platdata structure.
Signed-off-by: Keerthy j-keerthy@ti.com Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Simon Glass sjg@chromium.org --- include/power/regulator.h | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/include/power/regulator.h b/include/power/regulator.h index 9bcd728..2117f55 100644 --- a/include/power/regulator.h +++ b/include/power/regulator.h @@ -152,6 +152,8 @@ enum regulator_flag { * TODO(sjg@chromium.org): Consider putting the above two into @flags * @flags: - flags value (see REGULATOR_FLAG_...) * @name** - fdt regulator name - should be taken from the device tree + * ctrl_reg: - Control register offset used to enable/disable regulator + * volt_reg: - register offset for writing voltage vsel values * * Note: * * - set automatically on device probe by the uclass's '.pre_probe' method. @@ -171,6 +173,8 @@ struct dm_regulator_uclass_platdata { bool boot_on; const char *name; int flags; + u8 ctrl_reg; + u8 volt_reg; };
/* Regulator device operations */
Add support to bind the regulators/child nodes with the pmic.
Signed-off-by: Keerthy j-keerthy@ti.com Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com --- drivers/power/pmic/Kconfig | 7 +++++ drivers/power/pmic/Makefile | 1 + drivers/power/pmic/palmas.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ include/power/palmas.h | 25 +++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 drivers/power/pmic/palmas.c create mode 100644 include/power/palmas.h
diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig index 69f8d51..92931c5 100644 --- a/drivers/power/pmic/Kconfig +++ b/drivers/power/pmic/Kconfig @@ -135,3 +135,10 @@ config PMIC_TPS65090 FETs and a battery charger. This driver provides register access only, and you can enable the regulator/charger drivers separately if required. + +config PMIC_PALMAS + bool "Enable driver for Texas Instruments PALMAS PMIC" + depends on DM_PMIC + ---help--- + The PALMAS is a PMIC containing several LDOs, SMPS. + This driver binds the pmic children. diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile index 52b4f71..828c0cf 100644 --- a/drivers/power/pmic/Makefile +++ b/drivers/power/pmic/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_PMIC_PM8916) += pm8916.o obj-$(CONFIG_PMIC_RK808) += rk808.o obj-$(CONFIG_PMIC_TPS65090) += tps65090.o obj-$(CONFIG_PMIC_S5M8767) += s5m8767.o +obj-$(CONFIG_$(SPL_)PMIC_PALMAS) += palmas.o
obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o obj-$(CONFIG_POWER_MAX77696) += pmic_max77696.o diff --git a/drivers/power/pmic/palmas.c b/drivers/power/pmic/palmas.c new file mode 100644 index 0000000..05428d5 --- /dev/null +++ b/drivers/power/pmic/palmas.c @@ -0,0 +1,77 @@ +/* + * (C) Copyright 2016 Texas Instruments Incorporated, <www.ti.com> + * Keerthy j-keerthy@ti.com + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <fdtdec.h> +#include <errno.h> +#include <dm.h> +#include <i2c.h> +#include <power/pmic.h> +#include <power/regulator.h> +#include <power/palmas.h> +#include <dm/device.h> + +DECLARE_GLOBAL_DATA_PTR; + +static const struct pmic_child_info pmic_children_info[] = { + { .prefix = "ldo", .driver = PALMAS_LDO_DRIVER }, + { .prefix = "smps", .driver = PALMAS_SMPS_DRIVER }, + { }, +}; + +static int palmas_bind(struct udevice *dev) +{ + int pmic_node = -1, regulators_node; + const void *blob = gd->fdt_blob; + int children; + int node = dev->of_offset; + int subnode, len; + + fdt_for_each_subnode(blob, subnode, node) { + const char *name; + char *temp; + + name = fdt_get_name(blob, subnode, &len); + temp = strstr(name, "pmic"); + if (temp) { + pmic_node = subnode; + break; + } + } + + if (pmic_node <= 0) { + debug("%s: %s pmic subnode not found!", __func__, dev->name); + return -ENXIO; + } + + regulators_node = fdt_subnode_offset(blob, pmic_node, "regulators"); + + if (regulators_node <= 0) { + debug("%s: %s reg subnode not found!", __func__, dev->name); + return -ENXIO; + } + + children = pmic_bind_children(dev, regulators_node, pmic_children_info); + if (!children) + debug("%s: %s - no child found\n", __func__, dev->name); + + /* Always return success for this device */ + return 0; +} + +static const struct udevice_id palmas_ids[] = { + { .compatible = "ti,tps659038", .data = TPS659038 }, + { .compatible = "ti,tps65917" , .data = TPS65917 }, + { } +}; + +U_BOOT_DRIVER(pmic_palmas) = { + .name = "palmas_pmic", + .id = UCLASS_PMIC, + .of_match = palmas_ids, + .bind = palmas_bind, +}; diff --git a/include/power/palmas.h b/include/power/palmas.h new file mode 100644 index 0000000..bad5a35 --- /dev/null +++ b/include/power/palmas.h @@ -0,0 +1,25 @@ +#define PALMAS 0x0 +#define TPS659038 0x1 +#define TPS65917 0x2 + +/* I2C device address for pmic palmas */ +#define PALMAS_I2C_ADDR (0x12 >> 1) +#define PALMAS_LDO_NUM 11 +#define PALMAS_SMPS_NUM 8 + +/* Drivers name */ +#define PALMAS_LDO_DRIVER "palmas_ldo" +#define PALMAS_SMPS_DRIVER "palmas_smps" + +#define PALMAS_SMPS_VOLT_MASK 0x7F +#define PALMAS_SMPS_RANGE_MASK 0x80 +#define PALMAS_SMPS_VOLT_MAX_HEX 0x7F +#define PALMAS_SMPS_VOLT_MAX 3300000 +#define PALMAS_SMPS_MODE_MASK 0x3 +#define PALMAS_SMPS_STATUS_MASK 0x30 + +#define PALMAS_LDO_VOLT_MASK 0x3F +#define PALMAS_LDO_VOLT_MAX_HEX 0x3F +#define PALMAS_LDO_VOLT_MAX 3300000 +#define PALMAS_LDO_MODE_MASK 0x1 +#define PALMAS_LDO_STATUS_MASK 0x10
The driver provides regulator set/get voltage enable/disable functions for palmas family of PMICs.
Signed-off-by: Keerthy j-keerthy@ti.com Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com --- drivers/power/regulator/Kconfig | 8 + drivers/power/regulator/Makefile | 1 + drivers/power/regulator/palmas_regulator.c | 457 +++++++++++++++++++++++++++++ 3 files changed, 466 insertions(+) create mode 100644 drivers/power/regulator/palmas_regulator.c
diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index 17f22dd..adb710a 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -115,3 +115,11 @@ config REGULATOR_TPS65090 regulators, one for each FET. The standard regulator interface is supported, but it is only possible to turn the regulators on or off. There is no voltage/current control. + +config DM_REGULATOR_PALMAS + bool "Enable driver for PALMAS PMIC regulators" + depends on PMIC_PALMAS + ---help--- + This enables implementation of driver-model regulator uclass + features for REGULATOR PALMAS and the family of PALMAS PMICs. + The driver implements get/set api for: value and enable. diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile index 1590d85..75080d4 100644 --- a/drivers/power/regulator/Makefile +++ b/drivers/power/regulator/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_REGULATOR_RK808) += rk808.o obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o +obj-$(CONFIG_$(SPL_)DM_REGULATOR_PALMAS) += palmas_regulator.o diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c new file mode 100644 index 0000000..14bc701 --- /dev/null +++ b/drivers/power/regulator/palmas_regulator.c @@ -0,0 +1,457 @@ +/* + * (C) Copyright 2016 + * Texas Instruments Incorporated, <www.ti.com> + * + * Keerthy j-keerthy@ti.com + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <fdtdec.h> +#include <errno.h> +#include <dm.h> +#include <i2c.h> +#include <power/pmic.h> +#include <power/regulator.h> +#include <power/palmas.h> + +DECLARE_GLOBAL_DATA_PTR; + +#define REGULATOR_ON 0x1 +#define REGULATOR_OFF 0x0 + +#define SMPS_MODE_MASK 0x3 +#define SMPS_MODE_SHIFT 0x0 +#define LDO_MODE_MASK 0x1 +#define LDO_MODE_SHIFT 0x0 + +static const char palmas_smps_ctrl[][PALMAS_SMPS_NUM] = { + {0x20, 0x24, 0x28, 0x2c, 0x30, 0x34, 0x38, 0x3c}, + {0x20, 0x24, 0x28, 0x2c, 0x30, 0x34, 0x38}, + {0x20, 0x24, 0x2c, 0x30, 0x38}, +}; + +static const char palmas_smps_volt[][PALMAS_SMPS_NUM] = { + {0x23, 0x27, 0x2b, 0x2f, 0x33, 0x37, 0x3b, 0x3c}, + {0x23, 0x27, 0x2b, 0x2f, 0x33, 0x37, 0x3b}, + {0x23, 0x27, 0x2f, 0x33, 0x3B} +}; + +static const char palmas_ldo_ctrl[][PALMAS_LDO_NUM] = { + {0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x62, 0x64}, + {0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x62, 0x64}, + {0x50, 0x52, 0x54, 0x5e, 0x62} +}; + +static const char palmas_ldo_volt[][PALMAS_LDO_NUM] = { + {0x51, 0x53, 0x55, 0x57, 0x59, 0x5b, 0x5d, 0x5f, 0x61, 0x63, 0x65}, + {0x51, 0x53, 0x55, 0x57, 0x59, 0x5b, 0x5d, 0x5f, 0x61, 0x63, 0x65}, + {0x51, 0x53, 0x55, 0x5f, 0x63} +}; + +static int palmas_smps_enable(struct udevice *dev, int op, bool *enable) +{ + int ret; + uint8_t val; + unsigned int adr; + struct dm_regulator_uclass_platdata *uc_pdata; + + uc_pdata = dev_get_uclass_platdata(dev); + adr = uc_pdata->ctrl_reg; + + ret = dm_i2c_u8_read(dev->parent, adr, &val); + if (ret < 0) + return ret; + + if (op == PMIC_OP_GET) { + val &= PALMAS_SMPS_STATUS_MASK; + + if (val) + *enable = true; + else + *enable = false; + + return 0; + } else if (op == PMIC_OP_SET) { + if (*enable) + val |= PALMAS_SMPS_MODE_MASK; + else + val &= ~(PALMAS_SMPS_MODE_MASK); + + ret = dm_i2c_u8_write(dev->parent, adr, &val); + if (ret) + return ret; + } + + return 0; +} + +static int palmas_smps_volt2hex(int uV) +{ + if (uV > PALMAS_LDO_VOLT_MAX) + return -EINVAL; + + if (uV > 1650000) + return (uV - 1000000) / 20000 + 0x6; + + if (uV == 500000) + return 0x6; + else + return 0x6 + ((uV - 500000) / 10000); +} + +static int palmas_smps_hex2volt(int hex, bool range) +{ + unsigned int uV = 0; + + if (hex > PALMAS_SMPS_VOLT_MAX_HEX) + return -EINVAL; + + if (hex < 0x7) + uV = 500000; + else + uV = 500000 + (hex - 0x6) * 10000; + + if (range) + uV *= 2; + + return uV; +} + +static int palmas_smps_val(struct udevice *dev, int op, int *uV) +{ + unsigned int hex, adr; + u8 val; + int ret; + bool range; + struct dm_regulator_uclass_platdata *uc_pdata; + + uc_pdata = dev_get_uclass_platdata(dev); + + if (op == PMIC_OP_GET) + *uV = 0; + + adr = uc_pdata->volt_reg; + + ret = dm_i2c_u8_read(dev->parent, adr, &val); + if (ret) + return ret; + + if (op == PMIC_OP_GET) { + if (val & PALMAS_SMPS_RANGE_MASK) + range = true; + else + range = false; + + val &= PALMAS_SMPS_VOLT_MASK; + ret = palmas_smps_hex2volt(val, range); + if (ret < 0) + return ret; + *uV = ret; + + return 0; + } + + hex = palmas_smps_volt2hex(*uV); + if (hex < 0) + return hex; + + val &= ~PALMAS_SMPS_VOLT_MASK; + val |= hex; + if (*uV > 1650000) + val |= PALMAS_SMPS_RANGE_MASK; + + return dm_i2c_u8_write(dev->parent, adr, &val); +} + +static int palmas_ldo_enable(struct udevice *dev, int op, bool *enable) +{ + int ret; + uint8_t val; + unsigned int adr; + struct dm_regulator_uclass_platdata *uc_pdata; + + uc_pdata = dev_get_uclass_platdata(dev); + adr = uc_pdata->ctrl_reg; + + ret = dm_i2c_u8_read(dev->parent, adr, &val); + if (ret) + return ret; + + if (op == PMIC_OP_GET) { + val &= PALMAS_LDO_STATUS_MASK; + + if (val) + *enable = true; + else + *enable = false; + + return 0; + } else if (op == PMIC_OP_SET) { + if (*enable) + val |= PALMAS_LDO_MODE_MASK; + else + val &= ~(PALMAS_LDO_MODE_MASK); + + ret = dm_i2c_u8_write(dev->parent, adr, &val); + if (ret) + return ret; + } + + return 0; +} + +static int palmas_ldo_volt2hex(int uV) +{ + if (uV > PALMAS_LDO_VOLT_MAX) + return -EINVAL; + + return (uV - 850000) / 50000; +} + +static int palmas_ldo_hex2volt(int hex) +{ + if (hex > PALMAS_LDO_VOLT_MAX_HEX) + return -EINVAL; + + if (!hex) + return 0; + + return (hex * 50000) + 850000; +} + +static int palmas_ldo_val(struct udevice *dev, int op, int *uV) +{ + unsigned int hex, adr; + u8 val; + int ret; + + struct dm_regulator_uclass_platdata *uc_pdata; + + if (op == PMIC_OP_GET) + *uV = 0; + + uc_pdata = dev_get_uclass_platdata(dev); + + adr = uc_pdata->volt_reg; + + ret = dm_i2c_u8_read(dev->parent, adr, &val); + if (ret) + return ret; + + if (op == PMIC_OP_GET) { + val &= PALMAS_LDO_VOLT_MASK; + ret = palmas_ldo_hex2volt(val); + if (ret < 0) + return ret; + *uV = ret; + return 0; + } + + hex = palmas_ldo_volt2hex(*uV); + if (hex < 0) + return hex; + + val &= ~PALMAS_LDO_VOLT_MASK; + val |= hex; + if (*uV > 1650000) + val |= 0x80; + + return dm_i2c_u8_write(dev->parent, adr, &val); +} + +static int palmas_ldo_probe(struct udevice *dev) +{ + struct dm_regulator_uclass_platdata *uc_pdata; + struct udevice *parent; + + uc_pdata = dev_get_uclass_platdata(dev); + + parent = dev_get_parent(dev); + int type = dev_get_driver_data(parent); + + uc_pdata->type = REGULATOR_TYPE_LDO; + + if (dev->driver_data) { + u8 idx = dev->driver_data - 1; + uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][idx]; + uc_pdata->volt_reg = palmas_ldo_volt[type][idx]; + } else { + /* check for ldoln and ldousb cases */ + if (!strcmp("ldoln", dev->name)) { + uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][9]; + uc_pdata->volt_reg = palmas_ldo_volt[type][9]; + } else if (!strcmp("ldousb", dev->name)) { + uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][10]; + uc_pdata->volt_reg = palmas_ldo_volt[type][10]; + } + } + + return 0; +} + +static int ldo_get_value(struct udevice *dev) +{ + int uV; + int ret; + + ret = palmas_ldo_val(dev, PMIC_OP_GET, &uV); + if (ret) + return ret; + + return uV; +} + +static int ldo_set_value(struct udevice *dev, int uV) +{ + return palmas_ldo_val(dev, PMIC_OP_SET, &uV); +} + +static bool ldo_get_enable(struct udevice *dev) +{ + bool enable = false; + int ret; + + ret = palmas_ldo_enable(dev, PMIC_OP_GET, &enable); + if (ret) + return ret; + + return enable; +} + +static int ldo_set_enable(struct udevice *dev, bool enable) +{ + return palmas_ldo_enable(dev, PMIC_OP_SET, &enable); +} + +static int palmas_smps_probe(struct udevice *dev) +{ + struct dm_regulator_uclass_platdata *uc_pdata; + struct udevice *parent; + int idx; + + uc_pdata = dev_get_uclass_platdata(dev); + + parent = dev_get_parent(dev); + int type = dev_get_driver_data(parent); + + uc_pdata->type = REGULATOR_TYPE_BUCK; + + switch (type) { + case PALMAS: + case TPS659038: + switch (dev->driver_data) { + case 123: + case 12: + uc_pdata->ctrl_reg = palmas_smps_ctrl[type][0]; + uc_pdata->volt_reg = palmas_smps_volt[type][0]; + break; + case 3: + uc_pdata->ctrl_reg = palmas_smps_ctrl[type][1]; + uc_pdata->volt_reg = palmas_smps_volt[type][1]; + break; + case 45: + uc_pdata->ctrl_reg = palmas_smps_ctrl[type][2]; + uc_pdata->volt_reg = palmas_smps_volt[type][2]; + break; + case 6: + case 7: + case 8: + case 9: + case 10: + idx = dev->driver_data - 4; + uc_pdata->ctrl_reg = palmas_smps_ctrl[type][idx]; + uc_pdata->volt_reg = palmas_smps_volt[type][idx]; + break; + + default: + printf("Wrong ID for regulator\n"); + } + break; + + case TPS65917: + switch (dev->driver_data) { + case 1: + case 2: + case 3: + case 4: + case 5: + idx = dev->driver_data - 1; + uc_pdata->ctrl_reg = palmas_smps_ctrl[type][idx]; + uc_pdata->volt_reg = palmas_smps_volt[type][idx]; + break; + + default: + printf("Wrong ID for regulator\n"); + } + break; + + default: + printf("Invalid PMIC ID\n"); + } + + return 0; +} + +static int smps_get_value(struct udevice *dev) +{ + int uV; + int ret; + + ret = palmas_smps_val(dev, PMIC_OP_GET, &uV); + if (ret) + return ret; + + return uV; +} + +static int smps_set_value(struct udevice *dev, int uV) +{ + return palmas_smps_val(dev, PMIC_OP_SET, &uV); +} + +static bool smps_get_enable(struct udevice *dev) +{ + bool enable = false; + int ret; + + ret = palmas_smps_enable(dev, PMIC_OP_GET, &enable); + if (ret) + return ret; + + return enable; +} + +static int smps_set_enable(struct udevice *dev, bool enable) +{ + return palmas_smps_enable(dev, PMIC_OP_SET, &enable); +} + +static const struct dm_regulator_ops palmas_ldo_ops = { + .get_value = ldo_get_value, + .set_value = ldo_set_value, + .get_enable = ldo_get_enable, + .set_enable = ldo_set_enable, +}; + +U_BOOT_DRIVER(palmas_ldo) = { + .name = PALMAS_LDO_DRIVER, + .id = UCLASS_REGULATOR, + .ops = &palmas_ldo_ops, + .probe = palmas_ldo_probe, +}; + +static const struct dm_regulator_ops palmas_smps_ops = { + .get_value = smps_get_value, + .set_value = smps_set_value, + .get_enable = smps_get_enable, + .set_enable = smps_set_enable, +}; + +U_BOOT_DRIVER(palmas_smps) = { + .name = PALMAS_SMPS_DRIVER, + .id = UCLASS_REGULATOR, + .ops = &palmas_smps_ops, + .probe = palmas_smps_probe, +};
Simon,
On Monday 26 September 2016 10:05 AM, Keerthy wrote:
The driver provides regulator set/get voltage enable/disable functions for palmas family of PMICs.
Signed-off-by: Keerthy j-keerthy@ti.com Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com
drivers/power/regulator/Kconfig | 8 + drivers/power/regulator/Makefile | 1 + drivers/power/regulator/palmas_regulator.c | 457 +++++++++++++++++++++++++++++ 3 files changed, 466 insertions(+) create mode 100644 drivers/power/regulator/palmas_regulator.c
diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index 17f22dd..adb710a 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -115,3 +115,11 @@ config REGULATOR_TPS65090 regulators, one for each FET. The standard regulator interface is supported, but it is only possible to turn the regulators on or off. There is no voltage/current control.
+config DM_REGULATOR_PALMAS
- bool "Enable driver for PALMAS PMIC regulators"
depends on PMIC_PALMAS- ---help---
- This enables implementation of driver-model regulator uclass
- features for REGULATOR PALMAS and the family of PALMAS PMICs.
- The driver implements get/set api for: value and enable.
diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile index 1590d85..75080d4 100644 --- a/drivers/power/regulator/Makefile +++ b/drivers/power/regulator/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_REGULATOR_RK808) += rk808.o obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o +obj-$(CONFIG_$(SPL_)DM_REGULATOR_PALMAS) += palmas_regulator.o diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c new file mode 100644 index 0000000..14bc701 --- /dev/null +++ b/drivers/power/regulator/palmas_regulator.c @@ -0,0 +1,457 @@ +/*
- (C) Copyright 2016
- Texas Instruments Incorporated, <www.ti.com>
- Keerthy j-keerthy@ti.com
- SPDX-License-Identifier: GPL-2.0+
- */
+#include <common.h> +#include <fdtdec.h> +#include <errno.h> +#include <dm.h> +#include <i2c.h> +#include <power/pmic.h> +#include <power/regulator.h> +#include <power/palmas.h>
+DECLARE_GLOBAL_DATA_PTR;
+#define REGULATOR_ON 0x1 +#define REGULATOR_OFF 0x0
+#define SMPS_MODE_MASK 0x3 +#define SMPS_MODE_SHIFT 0x0 +#define LDO_MODE_MASK 0x1 +#define LDO_MODE_SHIFT 0x0
+static const char palmas_smps_ctrl[][PALMAS_SMPS_NUM] = {
- {0x20, 0x24, 0x28, 0x2c, 0x30, 0x34, 0x38, 0x3c},
- {0x20, 0x24, 0x28, 0x2c, 0x30, 0x34, 0x38},
- {0x20, 0x24, 0x2c, 0x30, 0x38},
+};
+static const char palmas_smps_volt[][PALMAS_SMPS_NUM] = {
- {0x23, 0x27, 0x2b, 0x2f, 0x33, 0x37, 0x3b, 0x3c},
- {0x23, 0x27, 0x2b, 0x2f, 0x33, 0x37, 0x3b},
- {0x23, 0x27, 0x2f, 0x33, 0x3B}
+};
+static const char palmas_ldo_ctrl[][PALMAS_LDO_NUM] = {
- {0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x62, 0x64},
- {0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x62, 0x64},
- {0x50, 0x52, 0x54, 0x5e, 0x62}
+};
+static const char palmas_ldo_volt[][PALMAS_LDO_NUM] = {
- {0x51, 0x53, 0x55, 0x57, 0x59, 0x5b, 0x5d, 0x5f, 0x61, 0x63, 0x65},
- {0x51, 0x53, 0x55, 0x57, 0x59, 0x5b, 0x5d, 0x5f, 0x61, 0x63, 0x65},
- {0x51, 0x53, 0x55, 0x5f, 0x63}
+};
+static int palmas_smps_enable(struct udevice *dev, int op, bool *enable) +{
- int ret;
- uint8_t val;
- unsigned int adr;
- struct dm_regulator_uclass_platdata *uc_pdata;
- uc_pdata = dev_get_uclass_platdata(dev);
- adr = uc_pdata->ctrl_reg;
- ret = dm_i2c_u8_read(dev->parent, adr, &val);
if (ret < 0)return ret;- if (op == PMIC_OP_GET) {
val &= PALMAS_SMPS_STATUS_MASK;if (val)*enable = true;else*enable = false;return 0;- } else if (op == PMIC_OP_SET) {
if (*enable)val |= PALMAS_SMPS_MODE_MASK;elseval &= ~(PALMAS_SMPS_MODE_MASK);ret = dm_i2c_u8_write(dev->parent, adr, &val);if (ret)return ret;- }
- return 0;
+}
+static int palmas_smps_volt2hex(int uV) +{
- if (uV > PALMAS_LDO_VOLT_MAX)
return -EINVAL;- if (uV > 1650000)
return (uV - 1000000) / 20000 + 0x6;- if (uV == 500000)
return 0x6;- else
return 0x6 + ((uV - 500000) / 10000);+}
+static int palmas_smps_hex2volt(int hex, bool range) +{
- unsigned int uV = 0;
- if (hex > PALMAS_SMPS_VOLT_MAX_HEX)
return -EINVAL;- if (hex < 0x7)
uV = 500000;- else
uV = 500000 + (hex - 0x6) * 10000;- if (range)
uV *= 2;- return uV;
+}
+static int palmas_smps_val(struct udevice *dev, int op, int *uV) +{
- unsigned int hex, adr;
- u8 val;
- int ret;
- bool range;
- struct dm_regulator_uclass_platdata *uc_pdata;
- uc_pdata = dev_get_uclass_platdata(dev);
- if (op == PMIC_OP_GET)
*uV = 0;- adr = uc_pdata->volt_reg;
- ret = dm_i2c_u8_read(dev->parent, adr, &val);
- if (ret)
return ret;- if (op == PMIC_OP_GET) {
if (val & PALMAS_SMPS_RANGE_MASK)range = true;elserange = false;val &= PALMAS_SMPS_VOLT_MASK;ret = palmas_smps_hex2volt(val, range);if (ret < 0)return ret;*uV = ret;return 0;- }
- hex = palmas_smps_volt2hex(*uV);
- if (hex < 0)
return hex;- val &= ~PALMAS_SMPS_VOLT_MASK;
- val |= hex;
- if (*uV > 1650000)
val |= PALMAS_SMPS_RANGE_MASK;- return dm_i2c_u8_write(dev->parent, adr, &val);
+}
+static int palmas_ldo_enable(struct udevice *dev, int op, bool *enable) +{
- int ret;
- uint8_t val;
- unsigned int adr;
- struct dm_regulator_uclass_platdata *uc_pdata;
- uc_pdata = dev_get_uclass_platdata(dev);
- adr = uc_pdata->ctrl_reg;
- ret = dm_i2c_u8_read(dev->parent, adr, &val);
if (ret)return ret;- if (op == PMIC_OP_GET) {
val &= PALMAS_LDO_STATUS_MASK;if (val)*enable = true;else*enable = false;return 0;- } else if (op == PMIC_OP_SET) {
if (*enable)val |= PALMAS_LDO_MODE_MASK;elseval &= ~(PALMAS_LDO_MODE_MASK);ret = dm_i2c_u8_write(dev->parent, adr, &val);if (ret)return ret;- }
- return 0;
+}
+static int palmas_ldo_volt2hex(int uV) +{
- if (uV > PALMAS_LDO_VOLT_MAX)
return -EINVAL;- return (uV - 850000) / 50000;
+}
+static int palmas_ldo_hex2volt(int hex) +{
- if (hex > PALMAS_LDO_VOLT_MAX_HEX)
return -EINVAL;- if (!hex)
return 0;- return (hex * 50000) + 850000;
+}
+static int palmas_ldo_val(struct udevice *dev, int op, int *uV) +{
- unsigned int hex, adr;
- u8 val;
- int ret;
- struct dm_regulator_uclass_platdata *uc_pdata;
- if (op == PMIC_OP_GET)
*uV = 0;- uc_pdata = dev_get_uclass_platdata(dev);
- adr = uc_pdata->volt_reg;
- ret = dm_i2c_u8_read(dev->parent, adr, &val);
- if (ret)
return ret;- if (op == PMIC_OP_GET) {
val &= PALMAS_LDO_VOLT_MASK;ret = palmas_ldo_hex2volt(val);if (ret < 0)return ret;*uV = ret;return 0;- }
- hex = palmas_ldo_volt2hex(*uV);
- if (hex < 0)
return hex;- val &= ~PALMAS_LDO_VOLT_MASK;
- val |= hex;
- if (*uV > 1650000)
val |= 0x80;- return dm_i2c_u8_write(dev->parent, adr, &val);
I guess this and other direct i2c calls are unacceptable even from here. So i will rework this as well. Based on the feedback given on lp873x regulator driver.
+}
+static int palmas_ldo_probe(struct udevice *dev) +{
- struct dm_regulator_uclass_platdata *uc_pdata;
- struct udevice *parent;
- uc_pdata = dev_get_uclass_platdata(dev);
- parent = dev_get_parent(dev);
- int type = dev_get_driver_data(parent);
- uc_pdata->type = REGULATOR_TYPE_LDO;
- if (dev->driver_data) {
u8 idx = dev->driver_data - 1;uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][idx];uc_pdata->volt_reg = palmas_ldo_volt[type][idx];- } else {
/* check for ldoln and ldousb cases */if (!strcmp("ldoln", dev->name)) {uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][9];uc_pdata->volt_reg = palmas_ldo_volt[type][9];} else if (!strcmp("ldousb", dev->name)) {uc_pdata->ctrl_reg = palmas_ldo_ctrl[type][10];uc_pdata->volt_reg = palmas_ldo_volt[type][10];}- }
- return 0;
+}
+static int ldo_get_value(struct udevice *dev) +{
- int uV;
- int ret;
- ret = palmas_ldo_val(dev, PMIC_OP_GET, &uV);
- if (ret)
return ret;- return uV;
+}
+static int ldo_set_value(struct udevice *dev, int uV) +{
- return palmas_ldo_val(dev, PMIC_OP_SET, &uV);
+}
+static bool ldo_get_enable(struct udevice *dev) +{
- bool enable = false;
- int ret;
- ret = palmas_ldo_enable(dev, PMIC_OP_GET, &enable);
- if (ret)
return ret;- return enable;
+}
+static int ldo_set_enable(struct udevice *dev, bool enable) +{
- return palmas_ldo_enable(dev, PMIC_OP_SET, &enable);
+}
+static int palmas_smps_probe(struct udevice *dev) +{
- struct dm_regulator_uclass_platdata *uc_pdata;
- struct udevice *parent;
- int idx;
- uc_pdata = dev_get_uclass_platdata(dev);
- parent = dev_get_parent(dev);
- int type = dev_get_driver_data(parent);
- uc_pdata->type = REGULATOR_TYPE_BUCK;
- switch (type) {
- case PALMAS:
- case TPS659038:
switch (dev->driver_data) {case 123:case 12:uc_pdata->ctrl_reg = palmas_smps_ctrl[type][0];uc_pdata->volt_reg = palmas_smps_volt[type][0];break;case 3:uc_pdata->ctrl_reg = palmas_smps_ctrl[type][1];uc_pdata->volt_reg = palmas_smps_volt[type][1];break;case 45:uc_pdata->ctrl_reg = palmas_smps_ctrl[type][2];uc_pdata->volt_reg = palmas_smps_volt[type][2];break;case 6:case 7:case 8:case 9:case 10:idx = dev->driver_data - 4;uc_pdata->ctrl_reg = palmas_smps_ctrl[type][idx];uc_pdata->volt_reg = palmas_smps_volt[type][idx];break;default:printf("Wrong ID for regulator\n");}break;- case TPS65917:
switch (dev->driver_data) {case 1:case 2:case 3:case 4:case 5:idx = dev->driver_data - 1;uc_pdata->ctrl_reg = palmas_smps_ctrl[type][idx];uc_pdata->volt_reg = palmas_smps_volt[type][idx];break;default:printf("Wrong ID for regulator\n");}break;- default:
printf("Invalid PMIC ID\n");- }
- return 0;
+}
+static int smps_get_value(struct udevice *dev) +{
- int uV;
- int ret;
- ret = palmas_smps_val(dev, PMIC_OP_GET, &uV);
- if (ret)
return ret;- return uV;
+}
+static int smps_set_value(struct udevice *dev, int uV) +{
- return palmas_smps_val(dev, PMIC_OP_SET, &uV);
+}
+static bool smps_get_enable(struct udevice *dev) +{
- bool enable = false;
- int ret;
- ret = palmas_smps_enable(dev, PMIC_OP_GET, &enable);
- if (ret)
return ret;- return enable;
+}
+static int smps_set_enable(struct udevice *dev, bool enable) +{
- return palmas_smps_enable(dev, PMIC_OP_SET, &enable);
+}
+static const struct dm_regulator_ops palmas_ldo_ops = {
- .get_value = ldo_get_value,
- .set_value = ldo_set_value,
- .get_enable = ldo_get_enable,
- .set_enable = ldo_set_enable,
+};
+U_BOOT_DRIVER(palmas_ldo) = {
- .name = PALMAS_LDO_DRIVER,
- .id = UCLASS_REGULATOR,
- .ops = &palmas_ldo_ops,
- .probe = palmas_ldo_probe,
+};
+static const struct dm_regulator_ops palmas_smps_ops = {
- .get_value = smps_get_value,
- .set_value = smps_set_value,
- .get_enable = smps_get_enable,
- .set_enable = smps_set_enable,
+};
+U_BOOT_DRIVER(palmas_smps) = {
- .name = PALMAS_SMPS_DRIVER,
- .id = UCLASS_REGULATOR,
- .ops = &palmas_smps_ops,
- .probe = palmas_smps_probe,
+};
Enable palmas PMIC config options.
Signed-off-by: Keerthy j-keerthy@ti.com Reviewed-by: Tom Rini trini@konsulko.com --- configs/dra7xx_evm_defconfig | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 64df490..16798b5 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -47,8 +47,11 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_DM_ETH=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_PALMAS=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_PALMAS=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y
Enable palmas PMIC config options.
Signed-off-by: Keerthy j-keerthy@ti.com Reviewed-by: Tom Rini trini@konsulko.com --- configs/am57xx_evm_defconfig | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 27ea472..6c60d9b 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -43,6 +43,9 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_PALMAS=y +CONFIG_DM_REGULATOR_PALMAS=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y
participants (3)
-
Keerthy -
Keerthy -
Simon Glass