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>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
[trini: Migrate all other platforms as well]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 3e12969..dc4693d 100644 (file)
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -65,6 +65,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 fa97ec1..30577a6 100644 (file)
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -88,6 +88,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 abcc3e6..f1b9d6c 100644 (file)
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -79,6 +79,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_guardian_defconfig b/configs/am335x_guardian_defconfig
index 28ebe00..60e428d 100644 (file)
--- a/configs/am335x_guardian_defconfig
+++ b/configs/am335x_guardian_defconfig
@@ -110,6 +110,7 @@ CONFIG_PHY=y
 CONFIG_NOP_PHY=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
+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 b6fd86f..ca42596 100644 (file)
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_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/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig
index 1548317..c8df89b 100644 (file)
--- a/configs/am335x_hs_evm_uart_defconfig
+++ b/configs/am335x_hs_evm_uart_defconfig
@@ -74,6 +74,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_shc_defconfig b/configs/am335x_shc_defconfig
index 5953193..65cdc2a 100644 (file)
--- a/configs/am335x_shc_defconfig
+++ b/configs/am335x_shc_defconfig
@@ -70,4 +70,5 @@ CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PMIC_TPS65217=y
 CONFIG_LZO=y

diff --git a/configs/am335x_shc_ict_defconfig b/configs/am335x_shc_ict_defconfig
index 00442d8..a59ebf4 100644 (file)
--- a/configs/am335x_shc_ict_defconfig
+++ b/configs/am335x_shc_ict_defconfig
@@ -68,4 +68,5 @@ CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PMIC_TPS65217=y
 CONFIG_LZO=y

diff --git a/configs/am335x_shc_netboot_defconfig b/configs/am335x_shc_netboot_defconfig
index 37899df..3c291cf 100644 (file)
--- a/configs/am335x_shc_netboot_defconfig
+++ b/configs/am335x_shc_netboot_defconfig
@@ -71,4 +71,5 @@ CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PMIC_TPS65217=y
 CONFIG_LZO=y

diff --git a/configs/am335x_shc_sdboot_defconfig b/configs/am335x_shc_sdboot_defconfig
index c33c94f..8c4f14d 100644 (file)
--- a/configs/am335x_shc_sdboot_defconfig
+++ b/configs/am335x_shc_sdboot_defconfig
@@ -70,4 +70,5 @@ CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
+CONFIG_PMIC_TPS65217=y
 CONFIG_LZO=y

diff --git a/configs/am335x_sl50_defconfig b/configs/am335x_sl50_defconfig
index c71741c..41017de 100644 (file)
--- a/configs/am335x_sl50_defconfig
+++ b/configs/am335x_sl50_defconfig
@@ -68,6 +68,7 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_PHY_SMSC=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_PMIC_TPS65217=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y

diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index ac0fbd5..1c72c79 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -91,6 +91,9 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_PHY_NATSEMI=y
 CONFIG_DM_ETH=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_DM_PMIC is not set
+CONFIG_PMIC_TPS65217=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y

diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 9df5121..267cdf4 100644 (file)
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -100,6 +100,9 @@ CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_PHY_NATSEMI=y
 CONFIG_DM_ETH=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_DM_PMIC is not set
+CONFIG_PMIC_TPS65217=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y

diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index 11d7d7b..e39294f 100644 (file)
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -104,6 +104,9 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_NATSEMI=y
 CONFIG_DM_ETH=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_DM_PMIC is not set
+CONFIG_PMIC_TPS65217=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y

diff --git a/configs/brsmarc1_defconfig b/configs/brsmarc1_defconfig
index 771a42f..8e8f471 100644 (file)
--- a/configs/brsmarc1_defconfig
+++ b/configs/brsmarc1_defconfig
@@ -104,6 +104,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_NATSEMI=y
 CONFIG_DM_ETH=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_PMIC_TPS65217=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y

diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index 35b2b65..e1c81d1 100644 (file)
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -87,6 +87,7 @@ CONFIG_MISC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_ETH=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_PMIC_TPS65217=y
 CONFIG_DM_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y

diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig
index ae101da..1b03d83 100644 (file)
--- a/configs/chiliboard_defconfig
+++ b/configs/chiliboard_defconfig
@@ -66,6 +66,7 @@ CONFIG_PHY_SMSC=y
 CONFIG_DM_ETH=y
 CONFIG_MII=y
 CONFIG_DRIVER_TI_CPSW=y
+CONFIG_PMIC_TPS65217=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y

diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig
index ce0adb1..953c92e 100644 (file)
--- a/drivers/power/pmic/Kconfig
+++ b/drivers/power/pmic/Kconfig
@@ -369,6 +369,14 @@ config PMIC_TPS65941
 
 endif
 
+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 POWER_MC34VR500
        bool "Enable driver for Freescale MC34VR500 PMIC"
        depends on !DM_PMIC

diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 401cde3..584d6e0 100644 (file)
--- 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 748cbe3..cbb7b91 100644 (file)
--- 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_POWER_TPS65217
 #define CONFIG_POWER_TPS65910
 
 /* SPL */

diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h
index 608a22d..b927032 100644 (file)
--- a/include/configs/am335x_guardian.h
+++ b/include/configs/am335x_guardian.h
@@ -94,9 +94,6 @@
 #define CONFIG_SYS_NS16550_COM5                0x481a8000      /* UART4 */
 #define CONFIG_SYS_NS16550_COM6                0x481aa000      /* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_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 4c8df57..5964ccc 100644 (file)
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -145,7 +145,4 @@
 #define CONFIG_SYS_NS16550_COM5                0x481a8000      /* UART4 */
 #define CONFIG_SYS_NS16550_COM6                0x481aa000      /* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65217
-
 #endif /* ! __CONFIG_AM335X_SHC_H */

diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 0da9897..a57d551 100644 (file)
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -50,7 +50,6 @@
 #define CONFIG_SYS_NS16550_COM6                0x481aa000      /* UART5 */
 
 /* PMIC support */
-#define CONFIG_POWER_TPS65217
 #define CONFIG_POWER_TPS65910
 
 /* SPL */

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index d5458ed..769b3f0 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -22,8 +22,6 @@
 #define V_OSCK                         26000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
 
-#define CONFIG_POWER_TPS65217
-
 /*
  * When we have NAND flash we expect to be making use of mtdparts,
  * both for ease of use in U-Boot and for passing information on to

diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 9b2e8b5..5fc8ce6 100644 (file)
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -26,7 +26,6 @@
 /* Timer information */
 #define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 #define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
-#define CONFIG_POWER_TPS65217
 
 #include <asm/arch/omap.h>
 

diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
index ad1cd86..82acda5 100644 (file)
--- a/include/configs/chiliboard.h
+++ b/include/configs/chiliboard.h
@@ -106,9 +106,6 @@
 #define CONFIG_SYS_NS16550_COM5                0x481a8000      /* UART4 */
 #define CONFIG_SYS_NS16550_COM6                0x481aa000      /* UART5 */
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65217
-
 /* SPL */
 /* Bootcount using the RTC block */
 #define CONFIG_SYS_BOOTCOUNT_BE

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e4c5f74..12208c7 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -549,7 +549,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