[PATCH v2 1/3] power: Rename CONFIG_POWER_TPS65217 with CONFIG_PMIC_TPS65217
Up till now the CONFIG_POWER_TPS65217 has been defined in several header files for am335x SoC.
This patch renames it to CONFIG_PMIC_TPS65217, which better reflects the role of this IC circuit.
Moreover, new CONFIG_PMIC_TPS65217 has been introduced in Kconfig to be used with boards, which both support DM_PMIC and DM_I2C.
Signed-off-by: Lukasz Majewski lukma@denx.de ---
(no changes since v1)
drivers/power/pmic/Kconfig | 8 ++++++++ drivers/power/pmic/Makefile | 2 +- include/configs/am335x_evm.h | 2 +- include/configs/am335x_guardian.h | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/brppt1.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/chiliboard.h | 2 +- scripts/config_whitelist.txt | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig index ce0adb18a4..c7739228da 100644 --- a/drivers/power/pmic/Kconfig +++ b/drivers/power/pmic/Kconfig @@ -306,6 +306,14 @@ config PMIC_TPS65090 only, and you can enable the regulator/charger drivers separately if required.
+config PMIC_TPS65217 + bool "Enable driver for Texas Instruments TPS65217 PMIC" + ---help--- + The TPS65217 is a PMIC containing several LDOs, DC to DC convertors, + 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" ---help--- diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile index 401cde32cf..584d6e0e78 100644 --- a/drivers/power/pmic/Makefile +++ b/drivers/power/pmic/Makefile @@ -36,7 +36,7 @@ obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o obj-$(CONFIG_POWER_PCA9450) += pmic_pca9450.o obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o -obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o +obj-$(CONFIG_PMIC_TPS65217) += pmic_tps65217.o obj-$(CONFIG_POWER_TPS65218) += pmic_tps62362.o obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 9070845b7a..7b02d91e47 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -166,7 +166,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217 #define CONFIG_POWER_TPS65910
/* SPL */ diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h index 10a95a10a0..e6e7000529 100644 --- a/include/configs/am335x_guardian.h +++ b/include/configs/am335x_guardian.h @@ -95,7 +95,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
/* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_LE diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 5ed4eb3b3c..5ac46bf42b 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -156,7 +156,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
/* SPL */
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 0da98975ad..e8233c6cca 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -50,7 +50,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217 #define CONFIG_POWER_TPS65910
/* SPL */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index d5458edbdb..a9d4b84873 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -22,7 +22,7 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)
-#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
/* * When we have NAND flash we expect to be making use of mtdparts, diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 9b2e8b5c6e..129356b87f 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -26,7 +26,7 @@ /* Timer information */ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
#include <asm/arch/omap.h>
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index fe49627263..85e8edab23 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -107,7 +107,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
/* SPL */ /* Bootcount using the RTC block */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a6bc234f51..d3695f6720 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -640,6 +640,7 @@ CONFIG_PM CONFIG_PMC_BR_PRELIM CONFIG_PMC_OR_PRELIM CONFIG_PME_PLAT_CLK_DIV +CONFIG_PMIC_TPS65217 CONFIG_PMU CONFIG_PMW_BASE CONFIG_POST @@ -658,7 +659,6 @@ CONFIG_POWER_PFUZE3000_I2C_ADDR CONFIG_POWER_SPI CONFIG_POWER_TPS62362 CONFIG_POWER_TPS65090_EC -CONFIG_POWER_TPS65217 CONFIG_POWER_TPS65218 CONFIG_POWER_TPS65910 CONFIG_PPC_CLUSTER_START
The tps65217 PMIC driver is used with am335x SoC based designs.
It is used in the SPL (MLO) as well, so the DM conversion only is for u-boot proper.
This driver only allows simple reading/writing/dumping of the content of its registers and requires the DM_I2C for proper operation.
Signed-off-by: Lukasz Majewski lukma@denx.de ---
(no changes since v1)
drivers/power/pmic/pmic_tps65217.c | 82 ++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)
diff --git a/drivers/power/pmic/pmic_tps65217.c b/drivers/power/pmic/pmic_tps65217.c index c7f532df4d..ccbf223593 100644 --- a/drivers/power/pmic/pmic_tps65217.c +++ b/drivers/power/pmic/pmic_tps65217.c @@ -6,8 +6,13 @@
#include <common.h> #include <i2c.h> +#include <dm.h> +#include <errno.h> +#include <fdtdec.h> +#include <power/pmic.h> #include <power/tps65217.h>
+#if !CONFIG_IS_ENABLED(DM_PMIC) struct udevice *tps65217_dev __section(".data") = NULL;
/** @@ -148,3 +153,80 @@ int power_tps65217_init(unsigned char bus) #endif return 0; } +#else /* CONFIG_IS_ENABLED(DM_PMIC) */ +static const struct pmic_child_info pmic_children_info[] = { + { .prefix = "ldo", .driver = "tps65217_ldo" }, + { }, +}; + +static int tps65217_reg_count(struct udevice *dev) +{ + return TPS65217_PMIC_NUM_OF_REGS; +} + +static int tps65217_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 tps65217_read(struct udevice *dev, uint reg, uint8_t *buff, int len) +{ + int ret; + + ret = dm_i2c_read(dev, reg, buff, len); + if (ret) { + pr_err("read error %d from device: %p register: %#x!\n", ret, + dev, reg); + return -EIO; + } + + return 0; +} + +static int tps65217_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); + return -ENXIO; + } + + debug("%s: '%s' - found regulators subnode\n", __func__, dev->name); + + 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 struct dm_pmic_ops tps65217_ops = { + .reg_count = tps65217_reg_count, + .read = tps65217_read, + .write = tps65217_write, +}; + +static const struct udevice_id tps65217_ids[] = { + { .compatible = "ti,tps65217" }, + { } +}; + +U_BOOT_DRIVER(pmic_tps65217) = { + .name = "tps65217 pmic", + .id = UCLASS_PMIC, + .of_match = tps65217_ids, + .bind = tps65217_bind, + .ops = &tps65217_ops, +}; +#endif
On 3/12/22 16:11, Lukasz Majewski wrote:
The tps65217 PMIC driver is used with am335x SoC based designs.
It is used in the SPL (MLO) as well, so the DM conversion only is for u-boot proper.
This driver only allows simple reading/writing/dumping of the content of its registers and requires the DM_I2C for proper operation.
Signed-off-by: Lukasz Majewski lukma@denx.de
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
(no changes since v1)
drivers/power/pmic/pmic_tps65217.c | 82 ++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)
diff --git a/drivers/power/pmic/pmic_tps65217.c b/drivers/power/pmic/pmic_tps65217.c index c7f532df4d..ccbf223593 100644 --- a/drivers/power/pmic/pmic_tps65217.c +++ b/drivers/power/pmic/pmic_tps65217.c @@ -6,8 +6,13 @@
#include <common.h> #include <i2c.h> +#include <dm.h> +#include <errno.h> +#include <fdtdec.h> +#include <power/pmic.h> #include <power/tps65217.h>
+#if !CONFIG_IS_ENABLED(DM_PMIC) struct udevice *tps65217_dev __section(".data") = NULL;
/** @@ -148,3 +153,80 @@ int power_tps65217_init(unsigned char bus) #endif return 0; } +#else /* CONFIG_IS_ENABLED(DM_PMIC) */ +static const struct pmic_child_info pmic_children_info[] = {
- { .prefix = "ldo", .driver = "tps65217_ldo" },
- { },
+};
+static int tps65217_reg_count(struct udevice *dev) +{
- return TPS65217_PMIC_NUM_OF_REGS;
+}
+static int tps65217_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 tps65217_read(struct udevice *dev, uint reg, uint8_t *buff, int len) +{
- int ret;
- ret = dm_i2c_read(dev, reg, buff, len);
- if (ret) {
pr_err("read error %d from device: %p register: %#x!\n", ret,dev, reg);return -EIO;- }
- return 0;
+}
+static int tps65217_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);return -ENXIO;- }
- debug("%s: '%s' - found regulators subnode\n", __func__, dev->name);
- 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 struct dm_pmic_ops tps65217_ops = {
- .reg_count = tps65217_reg_count,
- .read = tps65217_read,
- .write = tps65217_write,
+};
+static const struct udevice_id tps65217_ids[] = {
- { .compatible = "ti,tps65217" },
- { }
+};
+U_BOOT_DRIVER(pmic_tps65217) = {
- .name = "tps65217 pmic",
- .id = UCLASS_PMIC,
- .of_match = tps65217_ids,
- .bind = tps65217_bind,
- .ops = &tps65217_ops,
+}; +#endif
On Sat, Mar 12, 2022 at 08:11:11AM +0100, Lukasz Majewski wrote:
The tps65217 PMIC driver is used with am335x SoC based designs.
It is used in the SPL (MLO) as well, so the DM conversion only is for u-boot proper.
This driver only allows simple reading/writing/dumping of the content of its registers and requires the DM_I2C for proper operation.
Signed-off-by: Lukasz Majewski lukma@denx.de Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Applied to u-boot/master, thanks!
As this board now supports DM_I2C, it is safe for it to also use the DM converted PMIC tps65217 driver.
Signed-off-by: Lukasz Majewski lukma@denx.de
---
Changes in v2: - Move the Kconfig definition for PMIC to patch, which adds support for DM
configs/am335x_boneblack_vboot_defconfig | 3 +++ configs/am335x_evm_defconfig | 3 +++ configs/am335x_evm_spiboot_defconfig | 3 +++ configs/am335x_hs_evm_defconfig | 3 +++ configs/am335x_hs_evm_uart_defconfig | 3 +++ include/configs/am335x_evm.h | 1 - 6 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index c79ffde91c..d46b2ac470 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -64,6 +64,9 @@ CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 33d0fb818f..7f7556971b 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -83,6 +83,9 @@ CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index f8acb7e1a9..f7be718b58 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -77,6 +77,9 @@ CONFIG_PHY_SMSC=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 993fbbcd39..fbb2d1f382 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -70,6 +70,9 @@ CONFIG_PHY_SMSC=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index ecb0526c33..b7008025de 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -72,6 +72,9 @@ CONFIG_PHY_SMSC=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7b02d91e47..42660f09d6 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -166,7 +166,6 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_PMIC_TPS65217 #define CONFIG_POWER_TPS65910
/* SPL */
On 3/12/22 16:11, Lukasz Majewski wrote:
As this board now supports DM_I2C, it is safe for it to also use the DM converted PMIC tps65217 driver.
Signed-off-by: Lukasz Majewski lukma@denx.de
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
Changes in v2:
- Move the Kconfig definition for PMIC to patch, which adds support for DM
configs/am335x_boneblack_vboot_defconfig | 3 +++ configs/am335x_evm_defconfig | 3 +++ configs/am335x_evm_spiboot_defconfig | 3 +++ configs/am335x_hs_evm_defconfig | 3 +++ configs/am335x_hs_evm_uart_defconfig | 3 +++ include/configs/am335x_evm.h | 1 - 6 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index c79ffde91c..d46b2ac470 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -64,6 +64,9 @@ CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 33d0fb818f..7f7556971b 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -83,6 +83,9 @@ CONFIG_DM_ETH=y CONFIG_PHY_GIGE=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index f8acb7e1a9..f7be718b58 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -77,6 +77,9 @@ CONFIG_PHY_SMSC=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 993fbbcd39..fbb2d1f382 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -70,6 +70,9 @@ CONFIG_PHY_SMSC=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index ecb0526c33..b7008025de 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -72,6 +72,9 @@ CONFIG_PHY_SMSC=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_CPSW=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_DM_PMIC is not set +CONFIG_PMIC_TPS65217=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7b02d91e47..42660f09d6 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -166,7 +166,6 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_PMIC_TPS65217 #define CONFIG_POWER_TPS65910
/* SPL */
On 3/12/22 16:11, Lukasz Majewski wrote:
Up till now the CONFIG_POWER_TPS65217 has been defined in several header files for am335x SoC.
This patch renames it to CONFIG_PMIC_TPS65217, which better reflects the role of this IC circuit.
Moreover, new CONFIG_PMIC_TPS65217 has been introduced in Kconfig to be used with boards, which both support DM_PMIC and DM_I2C.
Signed-off-by: Lukasz Majewski lukma@denx.de
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
(no changes since v1)
drivers/power/pmic/Kconfig | 8 ++++++++ drivers/power/pmic/Makefile | 2 +- include/configs/am335x_evm.h | 2 +- include/configs/am335x_guardian.h | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/brppt1.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/chiliboard.h | 2 +- scripts/config_whitelist.txt | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig index ce0adb18a4..c7739228da 100644 --- a/drivers/power/pmic/Kconfig +++ b/drivers/power/pmic/Kconfig @@ -306,6 +306,14 @@ config PMIC_TPS65090 only, and you can enable the regulator/charger drivers separately if required.
+config PMIC_TPS65217
- bool "Enable driver for Texas Instruments TPS65217 PMIC"
- ---help---
- The TPS65217 is a PMIC containing several LDOs, DC to DC convertors,
- 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" ---help--- diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile index 401cde32cf..584d6e0e78 100644 --- a/drivers/power/pmic/Makefile +++ b/drivers/power/pmic/Makefile @@ -36,7 +36,7 @@ obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o obj-$(CONFIG_POWER_PCA9450) += pmic_pca9450.o obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o -obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o +obj-$(CONFIG_PMIC_TPS65217) += pmic_tps65217.o obj-$(CONFIG_POWER_TPS65218) += pmic_tps62362.o obj-$(CONFIG_POWER_TPS65218) += pmic_tps65218.o obj-$(CONFIG_POWER_TPS65910) += pmic_tps65910.o diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 9070845b7a..7b02d91e47 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -166,7 +166,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217 #define CONFIG_POWER_TPS65910
/* SPL */ diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h index 10a95a10a0..e6e7000529 100644 --- a/include/configs/am335x_guardian.h +++ b/include/configs/am335x_guardian.h @@ -95,7 +95,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
/* Bootcount using the RTC block */ #define CONFIG_SYS_BOOTCOUNT_LE diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 5ed4eb3b3c..5ac46bf42b 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -156,7 +156,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
/* SPL */
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 0da98975ad..e8233c6cca 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -50,7 +50,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217 #define CONFIG_POWER_TPS65910
/* SPL */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index d5458edbdb..a9d4b84873 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -22,7 +22,7 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK)
-#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
/*
- When we have NAND flash we expect to be making use of mtdparts,
diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 9b2e8b5c6e..129356b87f 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -26,7 +26,7 @@ /* Timer information */ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
#include <asm/arch/omap.h>
diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index fe49627263..85e8edab23 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -107,7 +107,7 @@ #define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */
/* PMIC support */ -#define CONFIG_POWER_TPS65217 +#define CONFIG_PMIC_TPS65217
/* SPL */ /* Bootcount using the RTC block */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index a6bc234f51..d3695f6720 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -640,6 +640,7 @@ CONFIG_PM CONFIG_PMC_BR_PRELIM CONFIG_PMC_OR_PRELIM CONFIG_PME_PLAT_CLK_DIV +CONFIG_PMIC_TPS65217 CONFIG_PMU CONFIG_PMW_BASE CONFIG_POST @@ -658,7 +659,6 @@ CONFIG_POWER_PFUZE3000_I2C_ADDR CONFIG_POWER_SPI CONFIG_POWER_TPS62362 CONFIG_POWER_TPS65090_EC -CONFIG_POWER_TPS65217 CONFIG_POWER_TPS65218 CONFIG_POWER_TPS65910 CONFIG_PPC_CLUSTER_START
On Sat, Mar 12, 2022 at 08:11:10AM +0100, Lukasz Majewski wrote:
Up till now the CONFIG_POWER_TPS65217 has been defined in several header files for am335x SoC.
This patch renames it to CONFIG_PMIC_TPS65217, which better reflects the role of this IC circuit.
Moreover, new CONFIG_PMIC_TPS65217 has been introduced in Kconfig to be used with boards, which both support DM_PMIC and DM_I2C.
Signed-off-by: Lukasz Majewski lukma@denx.de Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
I had to rework this a bit to migrate all users to update their defconfig (so patch 3/3 is dropped) and in cases of platforms where DM_PMIC can just be enabled, I did that, but a few platforms could not, so the Kconfig option was moved outside of the DM_PMIC check. With that, applied to u-boot/master, thanks!
participants (3)
-
Jaehoon Chung -
Lukasz Majewski -
Tom Rini