eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

power: Rename CONFIG_POWER to CONFIG_POWER_LEGACY

Browse Source 
This option is used in pre-driver model code and much of it has never
been converted to driver model.

We want to add a new option to enable power support, so we can use a
simple rule in the Makefile. Rename this one, which is really about
a particular implementation of power.

Also update the pmic.h header file so it either includes the legacy
API or the driver model one.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
This commit is contained in:
Simon Glass
2021-08-08 12:20:26 -06:00
committed by Tom Rini
parent 7abf178bb8
commit 29d7153ec3
34 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/configs/am43xx_evm.h
View File

@@ -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

2
include/configs/cl-som-imx7.h
View File

@@ -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

2
include/configs/cm_t43.h
View File

@@ -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

2
include/configs/el6x_common.h
View File

@@ -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

2
include/configs/gw_ventana.h
View File

@@ -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

2
include/configs/hikey.h
View File

@@ -13,7 +13,7 @@
#include <linux/sizes.h>
#define CONFIG_POWER
#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_HI6553
#define CONFIG_REMAKE_ELF

2
include/configs/imx8mp_evk.h
View File

@@ -31,7 +31,7 @@
#undef CONFIG_DM_MMC
#define CONFIG_POWER
#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_POWER_PCA9450

2
include/configs/imx8mq_evk.h
View File

@@ -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

2
include/configs/imx8mq_phanbell.h
View File

@@ -41,7 +41,7 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_POWER
#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#endif

4
include/configs/ls1046ardb.h
View File

@@ -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

2
include/configs/mx51evk.h
View File

@@ -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

2
include/configs/mx53loco.h
View File

@@ -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

2
include/configs/mx6sabreauto.h
View File

@@ -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

2
include/configs/mx6sabresd.h
View File

@@ -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

2
include/configs/novena.h
View File

@@ -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

2
include/configs/phycore_imx8mp.h
View File

@@ -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

2
include/configs/pico-imx7d.h
View File

@@ -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

2
include/configs/pico-imx8mq.h
View File

@@ -41,7 +41,7 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_POWER
#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#endif

2
include/configs/tqma6.h
View File

@@ -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

2
include/configs/udoo_neo.h
View File

@@ -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

2
include/configs/vining_2000.h
View File

@@ -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

2
include/configs/warp.h
View File

@@ -52,7 +52,7 @@
/* I2C Configs */
/* PMIC */
#define CONFIG_POWER
#define CONFIG_POWER_LEGACY
#define CONFIG_POWER_I2C
#define CONFIG_EXTRA_ENV_SETTINGS \

2
include/power/max77686_pmic.h
View File

@@ -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);

15
include/power/pmic.h
View File

@@ -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)