On Mon, 2026-03-30 at 22:04 +0800, Peng Fan (OSS) wrote: > From: Peng Fan <[email protected]> > > Convert the board to use DM_PMIC instead of the legacy SPL I2C/PMIC > handling. > > Changes include: > - Enable DM_PMIC, DM_PMIC_PCA9450, and SPL_DM_PMIC_PCA9450 in defconfig. > - Drop legacy SPL I2C and PMIC options. > - Remove manual I2C1 pad setup and legacy power_pca9450_init() usage. > - Use DM-based pmic_get() with the DT node "pmic@25". > - Update PMIC register programming to use struct udevice API. > > Signed-off-by: Peng Fan <[email protected]>
Reviewed-by: Yannic Moog <[email protected]> Tested-by: Yannic Moog <[email protected]> > --- > arch/arm/dts/imx8mp-libra-rdk-fpsc-u-boot.dtsi | 22 ++++++++++-- > board/phytec/imx8mp-libra-fpsc/spl.c | 46 > ++++++++------------------ > configs/imx8mp-libra-fpsc_defconfig | 10 +++--- > 3 files changed, 38 insertions(+), 40 deletions(-) > > diff --git a/arch/arm/dts/imx8mp-libra-rdk-fpsc-u-boot.dtsi > b/arch/arm/dts/imx8mp-libra-rdk-fpsc- > u-boot.dtsi > index 1320f1540ed..f917b71be90 100644 > --- a/arch/arm/dts/imx8mp-libra-rdk-fpsc-u-boot.dtsi > +++ b/arch/arm/dts/imx8mp-libra-rdk-fpsc-u-boot.dtsi > @@ -33,6 +33,18 @@ > }; > }; > > +&pinctrl_i2c1 { > + bootph-all; > +}; > + > +&pinctrl_pmic { > + bootph-all; > +}; > + > +&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { > + bootph-all; > +}; > + > ®_usdhc2_vmmc { > bootph-pre-ram; > }; > @@ -78,11 +90,11 @@ > }; > > &i2c1 { > - bootph-pre-ram; > + bootph-all; > }; > > &pmic { > - bootph-pre-ram; > + bootph-all; > }; > > /* USB1 Type-C */ > @@ -120,6 +132,12 @@ > > &usdhc2 { > bootph-pre-ram; > + /* > + * LDO5 output depends on SD2_VSEL, but no way to read back SD2_VSEL > + * when using SDHC controller VSELECT to control SD2_VSEL. So drop > + * vqmmc-supply to avoid fsl_esdhc_imx read back wrong voltage. > + */ > + /delete-property/ vqmmc-supply; > }; > > &usdhc3 { > diff --git a/board/phytec/imx8mp-libra-fpsc/spl.c > b/board/phytec/imx8mp-libra-fpsc/spl.c > index 08111641aa6..aa22ad0030c 100644 > --- a/board/phytec/imx8mp-libra-fpsc/spl.c > +++ b/board/phytec/imx8mp-libra-fpsc/spl.c > @@ -9,9 +9,6 @@ > #include <asm/arch/imx8mp_pins.h> > #include <asm/arch/sys_proto.h> > #include <asm/mach-imx/boot_mode.h> > -#include <asm/mach-imx/gpio.h> > -#include <asm/mach-imx/mxc_i2c.h> > -#include <asm/mach-imx/iomux-v3.h> > #include <hang.h> > #include <init.h> > #include <log.h> > @@ -46,45 +43,32 @@ void spl_dram_init(void) > ddr_init(&dram_timing); > } > > -#define I2C_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PE) > -#define PC MUX_PAD_CTRL(I2C_PAD_CTRL) > -struct i2c_pads_info i2c_pad_info1 = { > - .scl = { > - .i2c_mode = MX8MP_PAD_I2C1_SCL__I2C1_SCL | PC, > - .gpio_mode = MX8MP_PAD_I2C1_SCL__GPIO5_IO14 | PC, > - .gp = IMX_GPIO_NR(5, 14), > - }, > - .sda = { > - .i2c_mode = MX8MP_PAD_I2C1_SDA__I2C1_SDA | PC, > - .gpio_mode = MX8MP_PAD_I2C1_SDA__GPIO5_IO15 | PC, > - .gp = IMX_GPIO_NR(5, 15), > - }, > -}; > - > int power_init_board(void) > { > - struct pmic *p; > + struct udevice *dev; > int ret; > > - ret = power_pca9450_init(0, 0x25); > - if (ret) > - printf("power init failed"); > - p = pmic_get("PCA9450"); > - pmic_probe(p); > + ret = pmic_get("pmic@25", &dev); > + if (ret == -ENODEV) { > + puts("No pmic@25\n"); > + return 0; > + } > + if (ret < 0) > + return ret; > > /* BUCKxOUT_DVS0/1 control BUCK123 output */ > - pmic_reg_write(p, PCA9450_BUCK123_DVS, 0x29); > + pmic_reg_write(dev, PCA9450_BUCK123_DVS, 0x29); > > /* Increase VDD_SOC and VDD_ARM to OD voltage 0.95V */ > - pmic_reg_write(p, PCA9450_BUCK1OUT_DVS0, 0x1C); > - pmic_reg_write(p, PCA9450_BUCK2OUT_DVS0, 0x1C); > + pmic_reg_write(dev, PCA9450_BUCK1OUT_DVS0, 0x1C); > + pmic_reg_write(dev, PCA9450_BUCK2OUT_DVS0, 0x1C); > > /* Set BUCK1 DVS1 to suspend controlled through PMIC_STBY_REQ */ > - pmic_reg_write(p, PCA9450_BUCK1OUT_DVS1, 0x14); > - pmic_reg_write(p, PCA9450_BUCK1CTRL, 0x59); > + pmic_reg_write(dev, PCA9450_BUCK1OUT_DVS1, 0x14); > + pmic_reg_write(dev, PCA9450_BUCK1CTRL, 0x59); > > /* Set WDOG_B_CFG to cold reset */ > - pmic_reg_write(p, PCA9450_RESET_CTRL, 0xA1); > + pmic_reg_write(dev, PCA9450_RESET_CTRL, 0xA1); > > return 0; > } > @@ -120,8 +104,6 @@ void board_init_f(ulong dummy) > > enable_tzc380(); > > - setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); > - > power_init_board(); > > /* DDR initialization */ > diff --git a/configs/imx8mp-libra-fpsc_defconfig > b/configs/imx8mp-libra-fpsc_defconfig > index a23e604425d..4a8938d3e43 100644 > --- a/configs/imx8mp-libra-fpsc_defconfig > +++ b/configs/imx8mp-libra-fpsc_defconfig > @@ -9,7 +9,6 @@ CONFIG_SF_DEFAULT_SPEED=80000000 > CONFIG_ENV_SIZE=0x10000 > CONFIG_ENV_OFFSET=0x3C0000 > CONFIG_ENV_SECT_SIZE=0x10000 > -CONFIG_SYS_I2C_MXC_I2C1=y > CONFIG_DM_GPIO=y > CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mp-libra-rdk-fpsc" > CONFIG_IMX8M_OPTEE_LOAD_ADDR=0x7e000000 > @@ -105,8 +104,6 @@ CONFIG_FASTBOOT_MMC_USER_SUPPORT=y > CONFIG_FASTBOOT_MMC_USER_NAME="mmc2" > CONFIG_MXC_GPIO=y > CONFIG_DM_I2C=y > -# CONFIG_SPL_DM_I2C is not set > -CONFIG_SPL_SYS_I2C_LEGACY=y > CONFIG_I2C_EEPROM=y > CONFIG_SYS_I2C_EEPROM_ADDR=0x51 > CONFIG_SUPPORT_EMMC_BOOT=y > @@ -138,15 +135,16 @@ CONFIG_PHY_IMX8MQ_USB=y > CONFIG_PINCTRL=y > CONFIG_SPL_PINCTRL=y > CONFIG_PINCTRL_IMX8M=y > -CONFIG_SPL_POWER_LEGACY=y > CONFIG_POWER_DOMAIN=y > CONFIG_IMX8M_POWER_DOMAIN=y > CONFIG_IMX8MP_HSIOMIX_BLKCTRL=y > -CONFIG_POWER_PCA9450=y > +CONFIG_DM_PMIC=y > +CONFIG_DM_PMIC_PCA9450=y > +CONFIG_SPL_DM_PMIC_PCA9450=y > CONFIG_DM_REGULATOR=y > +CONFIG_DM_REGULATOR_PCA9450=y > CONFIG_DM_REGULATOR_FIXED=y > CONFIG_DM_REGULATOR_GPIO=y > -CONFIG_SPL_POWER_I2C=y > CONFIG_DM_RNG=y > CONFIG_DM_SERIAL=y > CONFIG_MXC_UART=y
