diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/ihs_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/intel_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/misc/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/misc/atsha204a-i2c.c | 1 | ||||
| -rw-r--r-- | drivers/power/pmic/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/power/pmic/Makefile | 1 | ||||
| -rw-r--r-- | drivers/power/pmic/tps65219.c | 88 | ||||
| -rw-r--r-- | drivers/power/regulator/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/power/regulator/Makefile | 1 | ||||
| -rw-r--r-- | drivers/power/regulator/tps65219_regulator.c | 380 |
11 files changed, 501 insertions, 3 deletions
diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c index ecca90628e7..d715714638f 100644 --- a/drivers/i2c/ihs_i2c.c +++ b/drivers/i2c/ihs_i2c.c @@ -195,7 +195,7 @@ static int ihs_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) memset(&dummy, 0, sizeof(struct i2c_msg)); /* We expect either two messages (one with an offset and one with the - * actucal data) or one message (just data) + * actual data) or one message (just data) */ if (nmsgs > 2 || nmsgs == 0) { debug("%s: Only one or two messages are supported\n", __func__); diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c index dc26fa8c542..4fc6f1a11a7 100644 --- a/drivers/i2c/intel_i2c.c +++ b/drivers/i2c/intel_i2c.c @@ -213,7 +213,7 @@ static int intel_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) /* * We expect either two messages (one with an offset and one with the - * actucal data) or one message (just data) + * actual data) or one message (just data) */ if (nmsgs > 2 || nmsgs == 0) { debug("%s: Only one or two messages are supported", __func__); diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 9af806a20ae..85ae7f62e91 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -16,6 +16,7 @@ config MISC config SPL_MISC bool "Enable Driver Model for Misc drivers in SPL" depends on SPL_DM + default MISC help Enable driver model for miscellaneous devices. This class is used only for those do not fit other more general classes. A @@ -25,6 +26,17 @@ config SPL_MISC config TPL_MISC bool "Enable Driver Model for Misc drivers in TPL" depends on TPL_DM + default MISC + help + Enable driver model for miscellaneous devices. This class is + used only for those do not fit other more general classes. A + set of generic read, write and ioctl methods may be used to + access the device. + +config VPL_MISC + bool "Enable Driver Model for Misc drivers in VPL" + depends on VPL_DM + default MISC help Enable driver model for miscellaneous devices. This class is used only for those do not fit other more general classes. A diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 6150d01e884..7a6047f64f9 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -obj-$(CONFIG_MISC) += misc-uclass.o +obj-$(CONFIG_$(SPL_TPL_)MISC) += misc-uclass.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC) += cros_ec.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC_SANDBOX) += cros_ec_sandbox.o diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c index 5da8134f05c..aa6acf0f9a0 100644 --- a/drivers/misc/atsha204a-i2c.c +++ b/drivers/misc/atsha204a-i2c.c @@ -283,6 +283,7 @@ static int atsha204a_of_to_plat(struct udevice *dev) } static const struct udevice_id atsha204a_ids[] = { + { .compatible = "atmel,atsha204" }, { .compatible = "atmel,atsha204a" }, { } }; diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig index 953c92e2128..bb3960020dd 100644 --- a/drivers/power/pmic/Kconfig +++ b/drivers/power/pmic/Kconfig @@ -367,6 +367,12 @@ config PMIC_TPS65941 The TPS65941 is a PMIC containing a bunch of SMPS & LDOs. This driver binds the pmic children. +config PMIC_TPS65219 + bool "Enable driver for Texas Instruments TPS65219 PMIC" + depends on DM_PMIC + help + The TPS65219 is a PMIC containing a bunch of SMPS & LDOs. + This driver binds the pmic children. endif config PMIC_TPS65217 diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile index 584d6e0e78e..f73b3262559 100644 --- a/drivers/power/pmic/Makefile +++ b/drivers/power/pmic/Makefile @@ -43,3 +43,4 @@ obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o obj-$(CONFIG_POWER_HI6553) += pmic_hi6553.o obj-$(CONFIG_POWER_MC34VR500) += pmic_mc34vr500.o obj-$(CONFIG_PMIC_TPS65941) += tps65941.o +obj-$(CONFIG_PMIC_TPS65219) += tps65219.o diff --git a/drivers/power/pmic/tps65219.c b/drivers/power/pmic/tps65219.c new file mode 100644 index 00000000000..9462afee77f --- /dev/null +++ b/drivers/power/pmic/tps65219.c @@ -0,0 +1,88 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2022 BayLibre, SAS + * Author: Neil Armstrong <narmstrong@baylibre.com> + */ + +#include <common.h> +#include <fdtdec.h> +#include <errno.h> +#include <dm.h> +#include <i2c.h> +#include <log.h> +#include <power/pmic.h> +#include <power/regulator.h> +#include <power/tps65219.h> +#include <dm/device.h> + +static const struct pmic_child_info pmic_children_info[] = { + { .prefix = "ldo", .driver = TPS65219_LDO_DRIVER }, + { .prefix = "buck", .driver = TPS65219_BUCK_DRIVER }, + { }, +}; + +static int tps65219_reg_count(struct udevice *dev) +{ + return 0x41; +} + +static int tps65219_write(struct udevice *dev, uint reg, const uint8_t *buff, + int len) +{ + if (dm_i2c_write(dev, reg, buff, len)) { + pr_err("write error to device: %p register: %#x!\n", dev, reg); + return -EIO; + } + + return 0; +} + +static int tps65219_read(struct udevice *dev, uint reg, uint8_t *buff, int len) +{ + if (dm_i2c_read(dev, reg, buff, len)) { + pr_err("read error from device: %p register: %#x!\n", dev, reg); + return -EIO; + } + + return 0; +} + +static int tps65219_bind(struct udevice *dev) +{ + ofnode regulators_node; + int children; + + regulators_node = dev_read_subnode(dev, "regulators"); + if (!ofnode_valid(regulators_node)) { + debug("%s: %s regulators subnode not found!\n", __func__, + dev->name); + } + + debug("%s: '%s' - found regulators subnode\n", __func__, dev->name); + + children = pmic_bind_children(dev, regulators_node, pmic_children_info); + if (!children) + printf("%s: %s - no child found\n", __func__, dev->name); + + /* Probe all the child devices */ + return dm_scan_fdt_dev(dev); +} + +static struct dm_pmic_ops tps65219_ops = { + .reg_count = tps65219_reg_count, + .read = tps65219_read, + .write = tps65219_write, +}; + +static const struct udevice_id tps65219_ids[] = { + { .compatible = "ti,tps65219" }, + { } +}; + +U_BOOT_DRIVER(pmic_tps65219) = { + .name = "tps65219_pmic", + .id = UCLASS_PMIC, + .of_match = tps65219_ids, + .bind = tps65219_bind, + .ops = &tps65219_ops, +}; diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index cd253b95f2f..9145408b3c9 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -371,3 +371,12 @@ config DM_REGULATOR_SCMI help Enable this option if you want to support regulators exposed through the SCMI voltage domain protocol by a SCMI server. + +config DM_REGULATOR_TPS65219 + bool "Enable driver for TPS65219 PMIC regulators" + depends on PMIC_TPS65219 + help + This enables implementation of driver-model regulator uclass + features for REGULATOR TPS65219 and the family of TPS65219 PMICs. + TPS65219 series of PMICs have 3 single phase BUCKs & 4 LDOs. + The driver implements get/set api for value and enable. diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile index 4efb32a3228..b9883df9281 100644 --- a/drivers/power/regulator/Makefile +++ b/drivers/power/regulator/Makefile @@ -32,3 +32,4 @@ obj-$(CONFIG_$(SPL_)DM_REGULATOR_STPMIC1) += stpmic1.o obj-$(CONFIG_DM_REGULATOR_TPS65941) += tps65941_regulator.o obj-$(CONFIG_DM_REGULATOR_SCMI) += scmi_regulator.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_ANATOP) += anatop_regulator.o +obj-$(CONFIG_DM_REGULATOR_TPS65219) += tps65219_regulator.o diff --git a/drivers/power/regulator/tps65219_regulator.c b/drivers/power/regulator/tps65219_regulator.c new file mode 100644 index 00000000000..023cf211fc4 --- /dev/null +++ b/drivers/power/regulator/tps65219_regulator.c @@ -0,0 +1,380 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2022 BayLibre, SAS + * Author: Neil Armstrong <narmstrong@baylibre.com> + * + */ + +#include <common.h> +#include <fdtdec.h> +#include <errno.h> +#include <dm.h> +#include <i2c.h> +#include <log.h> +#include <linux/delay.h> +#include <power/pmic.h> +#include <power/regulator.h> +#include <power/tps65219.h> + +static const unsigned int tps65219_buck_vout[TPS65219_BUCK_NUM] = { + [0] = TPS65219_BUCK1_VOUT_REG, + [1] = TPS65219_BUCK2_VOUT_REG, + [2] = TPS65219_BUCK3_VOUT_REG +}; + +static const unsigned int tps65219_ldo_vout[TPS65219_LDO_NUM] = { + [0] = TPS65219_LDO1_VOUT_REG, + [1] = TPS65219_LDO2_VOUT_REG, + [2] = TPS65219_LDO3_VOUT_REG, + [3] = TPS65219_LDO4_VOUT_REG, +}; + +static int tps65219_reg_enable(struct udevice *dev, unsigned int adr, int idx, + int op, bool *enable) +{ + int ret; + + ret = pmic_reg_read(dev->parent, adr); + if (ret < 0) + return ret; + + if (op == PMIC_OP_GET) { + if (ret & BIT(idx)) + *enable = true; + else + *enable = false; + + return 0; + } else if (op == PMIC_OP_SET) { + if (*enable) + ret |= BIT(idx); + else + ret &= ~BIT(idx); + + ret = pmic_reg_write(dev->parent, adr, ret); + if (ret) + return ret; + } + + return 0; +} + +static int tps65219_buck_enable(struct udevice *dev, int op, bool *enable) +{ + unsigned int adr; + struct dm_regulator_uclass_plat *uc_pdata; + int idx; + + idx = dev->driver_data - 1; + uc_pdata = dev_get_uclass_plat(dev); + adr = uc_pdata->ctrl_reg; + + return tps65219_reg_enable(dev, adr, idx, op, enable); +} + +static int tps65219_buck_volt2val(int uV) +{ + if (uV > TPS65219_BUCK_VOLT_MAX) + return -EINVAL; + else if (uV >= 1400000) + return (uV - 1400000) / 100000 + 0x20; + else if (uV >= 600000) + return (uV - 600000) / 25000 + 0x00; + else + return -EINVAL; +} + +static int tps65219_buck_val2volt(int val) +{ + if (val > TPS65219_VOLT_MASK) + return -EINVAL; + else if (val > 0x34) + return TPS65219_BUCK_VOLT_MAX; + else if (val > 0x20) + return 1400000 + (val - 0x20) * 100000; + else if (val >= 0) + return 600000 + val * 25000; + else + return -EINVAL; +} + +static int tps65219_buck_val(struct udevice *dev, int op, int *uV) +{ + unsigned int adr; + int ret, val; + struct dm_regulator_uclass_plat *uc_pdata; + + uc_pdata = dev_get_uclass_plat(dev); + adr = uc_pdata->volt_reg; + + ret = pmic_reg_read(dev->parent, adr); + if (ret < 0) + return ret; + + if (op == PMIC_OP_GET) { + *uV = 0; + + ret &= TPS65219_VOLT_MASK; + ret = tps65219_buck_val2volt(ret); + if (ret < 0) + return ret; + + *uV = ret; + return 0; + } + + val = tps65219_buck_volt2val(*uV); + if (val < 0) + return val; + + ret &= ~TPS65219_VOLT_MASK; + ret |= val; + + ret = pmic_reg_write(dev->parent, adr, ret); + + udelay(100); + + return ret; +} + +static int tps65219_ldo_enable(struct udevice *dev, int op, bool *enable) +{ + unsigned int adr; + struct dm_regulator_uclass_plat *uc_pdata; + int idx; + + idx = TPS65219_BUCK_NUM + (dev->driver_data - 1); + uc_pdata = dev_get_uclass_plat(dev); + adr = uc_pdata->ctrl_reg; + + return tps65219_reg_enable(dev, adr, idx, op, enable); +} + +static int tps65219_ldo_volt2val(int idx, int uV) +{ + int base = TPS65219_LDO12_VOLT_MIN; + int max = TPS65219_LDO12_VOLT_MAX; + + if (idx > 1) { + base = TPS65219_LDO34_VOLT_MIN; + max = TPS65219_LDO34_VOLT_MAX; + } + + if (uV > max) + return -EINVAL; + else if (uV >= base) + return (uV - TPS65219_LDO12_VOLT_MIN) / 50000; + else + return -EINVAL; +} + +static int tps65219_ldo_val2volt(int idx, int val) +{ + int reg_base = TPS65219_LDO12_VOLT_REG_MIN; + int reg_max = TPS65219_LDO12_VOLT_REG_MAX; + int base = TPS65219_LDO12_VOLT_MIN; + int max = TPS65219_LDO12_VOLT_MAX; + + if (idx > 1) { + base = TPS65219_LDO34_VOLT_MIN; + max = TPS65219_LDO34_VOLT_MAX; + reg_base = TPS65219_LDO34_VOLT_REG_MIN; + reg_max = TPS65219_LDO34_VOLT_REG_MAX; + } + + if (val > TPS65219_VOLT_MASK || val < 0) + return -EINVAL; + else if (val >= reg_max) + return max; + else if (val <= reg_base) + return base; + else if (val >= 0) + return TPS65219_LDO12_VOLT_MIN + (50000 * val); + else + return -EINVAL; +} + +static int tps65219_ldo_val(struct udevice *dev, int op, int *uV) +{ + unsigned int adr; + int ret, val; + struct dm_regulator_uclass_plat *uc_pdata; + int idx; + + idx = dev->driver_data - 1; + uc_pdata = dev_get_uclass_plat(dev); + adr = uc_pdata->volt_reg; + + ret = pmic_reg_read(dev->parent, adr); + if (ret < 0) + return ret; + + if (op == PMIC_OP_GET) { + *uV = 0; + + ret &= TPS65219_VOLT_MASK; + ret = tps65219_ldo_val2volt(idx, ret); + if (ret < 0) + return ret; + + *uV = ret; + return 0; + } + + /* LDO1 & LDO2 in BYPASS mode only supports 1.5V max */ + if (idx < 2 && + (ret & BIT(TPS65219_LDO12_BYP_CONFIG)) && + *uV < TPS65219_LDO12_VOLT_BYP_MIN) + return -EINVAL; + + val = tps65219_ldo_volt2val(idx, *uV); + if (val < 0) + return val; + + ret &= ~TPS65219_VOLT_MASK; + ret |= val; + + ret = pmic_reg_write(dev->parent, adr, ret); + + udelay(100); + + return ret; +} + +static int tps65219_ldo_probe(struct udevice *dev) +{ + struct dm_regulator_uclass_plat *uc_pdata; + int idx; + + uc_pdata = dev_get_uclass_plat(dev); + uc_pdata->type = REGULATOR_TYPE_LDO; + + /* idx must be in 1..TPS65219_LDO_NUM */ + idx = dev->driver_data; + if (idx < 1 || idx > TPS65219_LDO_NUM) { + printf("Wrong ID for regulator\n"); + return -EINVAL; + } + + uc_pdata->ctrl_reg = TPS65219_ENABLE_CTRL_REG; + uc_pdata->volt_reg = tps65219_ldo_vout[idx - 1]; + + return 0; +} + +static int tps65219_buck_probe(struct udevice *dev) +{ + struct dm_regulator_uclass_plat *uc_pdata; + int idx; + + uc_pdata = dev_get_uclass_plat(dev); + uc_pdata->type = REGULATOR_TYPE_BUCK; + + /* idx must be in 1..TPS65219_BUCK_NUM */ + idx = dev->driver_data; + if (idx < 1 || idx > TPS65219_BUCK_NUM) { + printf("Wrong ID for regulator\n"); + return -EINVAL; + } + + uc_pdata->ctrl_reg = TPS65219_ENABLE_CTRL_REG; + uc_pdata->volt_reg = tps65219_buck_vout[idx - 1]; + + return 0; +} + +static int ldo_get_value(struct udevice *dev) +{ + int uV; + int ret; + + ret = tps65219_ldo_val(dev, PMIC_OP_GET, &uV); + if (ret) + return ret; + + return uV; +} + +static int ldo_set_value(struct udevice *dev, int uV) +{ + return tps65219_ldo_val(dev, PMIC_OP_SET, &uV); +} + +static int ldo_get_enable(struct udevice *dev) +{ + bool enable = false; + int ret; + + ret = tps65219_ldo_enable(dev, PMIC_OP_GET, &enable); + if (ret) + return ret; + + return enable; +} + +static int ldo_set_enable(struct udevice *dev, bool enable) +{ + return tps65219_ldo_enable(dev, PMIC_OP_SET, &enable); +} + +static int buck_get_value(struct udevice *dev) +{ + int uV; + int ret; + + ret = tps65219_buck_val(dev, PMIC_OP_GET, &uV); + if (ret) + return ret; + + return uV; +} + +static int buck_set_value(struct udevice *dev, int uV) +{ + return tps65219_buck_val(dev, PMIC_OP_SET, &uV); +} + +static int buck_get_enable(struct udevice *dev) +{ + bool enable = false; + int ret; + + ret = tps65219_buck_enable(dev, PMIC_OP_GET, &enable); + if (ret) + return ret; + + return enable; +} + +static int buck_set_enable(struct udevice *dev, bool enable) +{ + return tps65219_buck_enable(dev, PMIC_OP_SET, &enable); +} + +static const struct dm_regulator_ops tps65219_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(tps65219_ldo) = { + .name = TPS65219_LDO_DRIVER, + .id = UCLASS_REGULATOR, + .ops = &tps65219_ldo_ops, + .probe = tps65219_ldo_probe, +}; + +static const struct dm_regulator_ops tps65219_buck_ops = { + .get_value = buck_get_value, + .set_value = buck_set_value, + .get_enable = buck_get_enable, + .set_enable = buck_set_enable, +}; + +U_BOOT_DRIVER(tps65219_buck) = { + .name = TPS65219_BUCK_DRIVER, + .id = UCLASS_REGULATOR, + .ops = &tps65219_buck_ops, + .probe = tps65219_buck_probe, +}; |