summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/am43xx_evm.h2
-rw-r--r--include/configs/cl-som-imx7.h2
-rw-r--r--include/configs/cm_t43.h2
-rw-r--r--include/configs/el6x_common.h2
-rw-r--r--include/configs/gw_ventana.h2
-rw-r--r--include/configs/hikey.h2
-rw-r--r--include/configs/imx8mp_evk.h2
-rw-r--r--include/configs/imx8mq_evk.h2
-rw-r--r--include/configs/imx8mq_phanbell.h2
-rw-r--r--include/configs/ls1046ardb.h4
-rw-r--r--include/configs/mx51evk.h2
-rw-r--r--include/configs/mx53loco.h2
-rw-r--r--include/configs/mx6sabreauto.h2
-rw-r--r--include/configs/mx6sabresd.h2
-rw-r--r--include/configs/novena.h2
-rw-r--r--include/configs/phycore_imx8mp.h2
-rw-r--r--include/configs/pico-imx7d.h2
-rw-r--r--include/configs/pico-imx8mq.h2
-rw-r--r--include/configs/tqma6.h2
-rw-r--r--include/configs/udoo_neo.h2
-rw-r--r--include/configs/vining_2000.h2
-rw-r--r--include/configs/warp.h2
-rw-r--r--include/power/max77686_pmic.h2
-rw-r--r--include/power/pmic.h15
24 files changed, 34 insertions, 29 deletions
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 83fc00de31f..ac735f87221 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -24,7 +24,7 @@
/* Power */
#if !CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#endif
#define CONFIG_POWER_TPS65218
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 7c7ddadbf5c..0692653a9ff 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -22,7 +22,7 @@
#define IMX_FEC_BASE ENET_IPS_BASE_ADDR
/* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE3000
#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 80db84162ff..32d2581764f 100644
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -50,7 +50,7 @@
#define CONFIG_AM437X_USB2PHY2_HOST
/* Power */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_TPS65218
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 3f71db3219a..f8af7c427bc 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -23,7 +23,7 @@
#define CONFIG_SYS_FSL_USDHC_NUM 2
/* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index dbe36989aa9..615cc0b2e05 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -65,7 +65,7 @@
/*
* PMIC
*/
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index eee342e7748..f6685a928a6 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -13,7 +13,7 @@
#include <linux/sizes.h>
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_HI6553
#define CONFIG_REMAKE_ELF
diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 9dd4bf7b241..16417926c94 100644
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -31,7 +31,7 @@
#undef CONFIG_DM_MMC
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PCA9450
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index e0666c9adda..d694379fddb 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -44,7 +44,7 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 2fd1302bcfd..ff8a1682881 100644
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -41,7 +41,7 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#endif
diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 40c045a97f3..b40a6969164 100644
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -124,8 +124,8 @@
#define I2C_RETIMER_ADDR 0x18
/* PMIC */
-#define CONFIG_POWER
-#ifdef CONFIG_POWER
+#define CONFIG_POWER_LEGACY
+#ifdef CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#endif
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 0022c334839..bd2d0e5ee79 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -30,7 +30,7 @@
#define CONFIG_MXC_UART_BASE UART1_BASE
/* PMIC Controller */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_SPI
#define CONFIG_POWER_FSL
#define CONFIG_FSL_PMIC_BUS 0
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 479ffdf02fc..a546e9620c2 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -33,7 +33,7 @@
#define CONFIG_MXC_USB_FLAGS 0
/* PMIC Controller */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_DIALOG_POWER
#define CONFIG_POWER_FSL
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index f854ddd87b2..ccf631dedd4 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -59,7 +59,7 @@
/* DMA stuff, needed for GPMI/MXS NAND support */
/* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 73f48c6dae5..ee75ada5a71 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -38,7 +38,7 @@
#endif
/* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 1a175f13150..e39191fa1a9 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -68,7 +68,7 @@
#endif
/* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 3f3b175df72..f9686e14a8f 100644
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -29,7 +29,7 @@
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PCA9450
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index a1cf8fc7d89..a0e782dbd34 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -122,7 +122,7 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE3000
#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 09e0f44872b..c67264da174 100644
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -41,7 +41,7 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#endif
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 97113b03432..11ad2f7cc2f 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -42,7 +42,7 @@
#define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS 20
#if !defined(CONFIG_DM_PMIC)
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index cf47e3fbe94..d51a25dd2e4 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -68,7 +68,7 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE3000
#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index ade0537f871..4c34bec2924 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -40,7 +40,7 @@
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR
/* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
diff --git a/include/configs/warp.h b/include/configs/warp.h
index d3921dabf6a..29f69bb7dcd 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -52,7 +52,7 @@
/* I2C Configs */
/* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h
index 82fe3509a0b..95ba61d9530 100644
--- a/include/power/max77686_pmic.h
+++ b/include/power/max77686_pmic.h
@@ -154,7 +154,7 @@ enum {
OPMODE_ON,
};
-#ifdef CONFIG_POWER
+#ifdef CONFIG_POWER_LEGACY
int max77686_set_ldo_voltage(struct pmic *p, int ldo, ulong uV);
int max77686_set_ldo_mode(struct pmic *p, int ldo, char opmode);
int max77686_set_buck_voltage(struct pmic *p, int buck, ulong uV);
diff --git a/include/power/pmic.h b/include/power/pmic.h
index be9de6b4de7..a10e1735007 100644
--- a/include/power/pmic.h
+++ b/include/power/pmic.h
@@ -17,7 +17,8 @@
enum { PMIC_I2C, PMIC_SPI, PMIC_NONE};
-#ifdef CONFIG_POWER
+/* TODO: Change to !CONFIG_IS_ENABLED(DM_PMIC) when SPL_DM_PMIC exists */
+#ifdef CONFIG_POWER_LEGACY
enum { I2C_PMIC, I2C_NUM, };
enum { PMIC_READ, PMIC_WRITE, };
enum { PMIC_SENSOR_BYTE_ORDER_LITTLE, PMIC_SENSOR_BYTE_ORDER_BIG, };
@@ -82,8 +83,9 @@ struct pmic {
struct pmic *parent;
struct list_head list;
};
-#endif /* CONFIG_POWER */
+#endif /* CONFIG_POWER_LEGACY */
+/* TODO: Change to CONFIG_IS_ENABLED(DM_PMIC) when SPL_DM_PMIC exists */
#ifdef CONFIG_DM_PMIC
/**
* U-Boot PMIC Framework
@@ -306,9 +308,12 @@ struct uc_pmic_priv {
uint trans_len;
};
-#endif /* CONFIG_DM_PMIC */
+#endif /* DM_PMIC */
-#ifdef CONFIG_POWER
+/* TODO: Change to CONFIG_IS_ENABLED(DM_PMIC) when SPL_DM_PMIC exists */
+#ifdef CONFIG_POWER_LEGACY
+
+/* Legacy API, do not use */
int pmic_init(unsigned char bus);
int power_init_board(void);
int pmic_dialog_init(unsigned char bus);
@@ -319,7 +324,7 @@ int pmic_probe(struct pmic *p);
int pmic_reg_read(struct pmic *p, u32 reg, u32 *val);
int pmic_reg_write(struct pmic *p, u32 reg, u32 val);
int pmic_set_output(struct pmic *p, u32 reg, int ldo, int on);
-#endif
+#endif /* CONFIG_POWER_LEGACY */
#define pmic_i2c_addr (p->hw.i2c.addr)
#define pmic_i2c_tx_num (p->hw.i2c.tx_num)
generated by cgit v1.2.3 (git 2.0.4) at 2025-08-03 19:13:52 +0000