Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 07:31:15 +00:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
board/compulab/cl-som-imx7/cl-som-imx7.c
View file

@ -267,7 +267,7 @@ int board_init(void)
return 0;
}
#ifdef CONFIG_POWER
#ifdef CONFIG_POWER_LEGACY
#define I2C_PMIC 0
int power_init_board(void)
{
@ -293,7 +293,7 @@ int power_init_board(void)
return 0;
}
#endif /* CONFIG_POWER */
#endif /* CONFIG_POWER_LEGACY */
/*
* cl_som_imx7_setup_wdog() - watchdog configuration.

2
board/freescale/imx8mp_evk/spl.c
View file

@ -63,7 +63,7 @@ struct i2c_pads_info i2c_pad_info1 = {
},
};
#ifdef CONFIG_POWER
#ifdef CONFIG_POWER_LEGACY
#define I2C_PMIC 0
int power_init_board(void)
{

2
board/freescale/imx8mq_evk/spl.c
View file

@ -156,7 +156,7 @@ int board_mmc_init(struct bd_info *bis)
return 0;
}
#ifdef CONFIG_POWER
#ifdef CONFIG_POWER_LEGACY
#define I2C_PMIC 0
int power_init_board(void)
{

2
board/samsung/common/board.c
View file

@ -185,7 +185,7 @@ int board_early_init_f(void)
}
#endif
#if defined(CONFIG_POWER) || defined(CONFIG_DM_PMIC)
#if defined(CONFIG_POWER_LEGACY) || defined(CONFIG_DM_PMIC)
int power_init_board(void)
{
set_ps_hold_ctrl();

2
board/technexion/pico-imx7d/pico-imx7d.c
View file

@ -60,7 +60,7 @@ int dram_init(void)
return 0;
}
#ifdef CONFIG_POWER
#ifdef CONFIG_POWER_LEGACY
#define I2C_PMIC 3
int power_init_board(void)
{

2
board/tqc/tqma6/tqma6.c
View file

@ -247,7 +247,7 @@ static const char *tqma6_get_boardname(void)
};
}
#ifdef CONFIG_POWER
#ifdef CONFIG_POWER_LEGACY
/* setup board specific PMIC */
int power_init_board(void)
{

2
board/udoo/neo/neo.c
View file

@ -96,7 +96,7 @@ static struct i2c_pads_info i2c_pad_info1 = {
};
#endif
#ifdef CONFIG_POWER
#ifdef CONFIG_POWER_LEGACY
int power_init_board(void)
{
struct pmic *p;

2
drivers/power/Makefile
View file

@ -16,7 +16,7 @@ obj-$(CONFIG_TPS6586X_POWER) += tps6586x.o
obj-$(CONFIG_TWL4030_POWER) += twl4030.o
obj-$(CONFIG_TWL6030_POWER) += twl6030.o
obj-$(CONFIG_PALMAS_POWER) += palmas.o
obj-$(CONFIG_POWER) += power_core.o
obj-$(CONFIG_POWER_LEGACY) += power_core.o
obj-$(CONFIG_DIALOG_POWER) += power_dialog.o
obj-$(CONFIG_POWER_FSL) += power_fsl.o
obj-$(CONFIG_POWER_I2C) += power_i2c.o

2
drivers/power/regulator/Makefile
View file

@ -16,7 +16,7 @@ obj-$(CONFIG_$(SPL_)DM_REGULATOR_FAN53555) += fan53555.o
obj-$(CONFIG_$(SPL_)DM_REGULATOR_COMMON) += regulator_common.o
obj-$(CONFIG_$(SPL_)DM_REGULATOR_FIXED) += fixed.o
obj-$(CONFIG_$(SPL_)DM_REGULATOR_GPIO) += gpio-regulator.o
obj-$(CONFIG_REGULATOR_RK8XX) += rk8xx.o
obj-$(CONFIG_$(SPL_TPL_)REGULATOR_RK8XX) += rk8xx.o
obj-$(CONFIG_DM_REGULATOR_S2MPS11) += s2mps11_regulator.o
obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o

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)

2
scripts/config_whitelist.txt
View file

@ -1032,11 +1032,11 @@ CONFIG_POST_EXTERNAL_WORD_FUNCS
CONFIG_POST_SKIP_ENV_FLAGS
CONFIG_POST_UART
CONFIG_POST_WATCHDOG
CONFIG_POWER
CONFIG_POWER_FSL
CONFIG_POWER_FSL_MC13892
CONFIG_POWER_HI6553
CONFIG_POWER_I2C
CONFIG_POWER_LEGACY
CONFIG_POWER_LTC3676
CONFIG_POWER_LTC3676_I2C_ADDR
CONFIG_POWER_MAX77696_I2C_ADDR