]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
imx8mq: kontron: migrate PITX-IMX8M to DM PMIC framework
authorPeng Fan <peng.fan@nxp.com>
Tue, 21 Apr 2026 13:41:26 +0000 (21:41 +0800)
committerFabio Estevam <festevam@gmail.com>
Tue, 21 Apr 2026 23:49:40 +0000 (20:49 -0300)
Migrate the Kontron PITX-IMX8M board from the legacy power framework
to the DM PMIC infrastructure.

The SPL power initialization is converted to use DM_PMIC_PFUZE100,
dropping all legacy I2C, GPIO, pinmux, and MMC setup code that is
now handled through the device tree and driver model instead.

Key changes:
- Switch PFUZE100 access to DM PMIC APIs
- Enable SPL OF_CONTROL and mark required nodes with bootph*
- Remove legacy I2C and power configuration
- Enable SPL DM, pinctrl, regulator, and PMIC support
- Adjust SPL stack placement for DM usage

Signed-off-by: Peng Fan <peng.fan@nxp.com>
arch/arm/dts/imx8mq-kontron-pitx-imx8m-u-boot.dtsi
board/kontron/pitx_imx8m/spl.c
configs/kontron_pitx_imx8m_defconfig

index d361f3f559295fa37a168fc7ab923d68313fae99..7ab7706d7a7ac12fbf9488238badde657030e20e 100644 (file)
@@ -2,26 +2,90 @@
 
 #include "imx8mq-u-boot.dtsi"
 
+&aips1 {
+       bootph-all;
+};
+
+&gpio2 {
+       bootph-pre-ram;
+};
+
+&pinctrl_i2c1 {
+       bootph-all;
+};
+
+&i2c1 {
+       bootph-all;
+};
+
+&soc {
+       bootph-all;
+       bootph-pre-ram;
+};
+
+&{/soc@0/bus@30800000/i2c@30a20000/pmic@8} {
+       bootph-all;
+};
+
+&{/soc@0/bus@30800000/i2c@30a20000/pmic@8/regulators} {
+       bootph-all;
+};
+
+&pinctrl_uart1 {
+       bootph-pre-ram;
+};
+
+&uart1 {
+       bootph-pre-ram;
+};
+
 &usdhc1 {
+       bootph-pre-ram;
        mmc-hs400-1_8v;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc1>;
+};
+
+&pinctrl_usdhc1 {
+       bootph-pre-ram;
 };
 
 &usdhc2 {
+       bootph-pre-ram;
        sd-uhs-sdr104;
        sd-uhs-ddr50;
 };
 
+&pinctrl_usdhc2 {
+       bootph-pre-ram;
+};
+
+&pinctrl_usdhc2_gpio {
+       bootph-pre-ram;
+};
+
+&pinctrl_reg_usdhc2 {
+       bootph-pre-ram;
+};
+
+&reg_usdhc2_vmmc {
+       bootph-pre-ram;
+};
+
 &uart1 {
+       bootph-pre-ram;
        /delete-property/ assigned-clocks;
        /delete-property/ assigned-clock-parents;
 };
 
 &uart2 {
+       bootph-pre-ram;
        /delete-property/ assigned-clocks;
        /delete-property/ assigned-clock-parents;
 };
 
 &uart3 {
+       bootph-pre-ram;
        /delete-property/ assigned-clocks;
        /delete-property/ assigned-clock-parents;
 };
index b9e864d3f05cae20b2d07c39cc2153565fbd2bf1..0396967fe365ae0132f779d68c38133cf339b887 100644 (file)
@@ -2,21 +2,14 @@
 
 #include <config.h>
 #include <errno.h>
-#include <fsl_esdhc_imx.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
 #include <spl.h>
 #include <asm/arch/ddr.h>
-#include <asm/arch/imx8mq_pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
-#include <asm/io.h>
-#include <asm/mach-imx/iomux-v3.h>
-#include <asm/mach-imx/gpio.h>
-#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/sections.h>
-#include <linux/delay.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 
@@ -50,120 +43,6 @@ static void spl_dram_init(void)
        ddr_init(dram_timing);
 }
 
-#define I2C_PAD_CTRL   (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE)
-#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-static struct i2c_pads_info i2c_pad_info1 = {
-       .scl = {
-               .i2c_mode = IMX8MQ_PAD_I2C1_SCL__I2C1_SCL | PC,
-               .gpio_mode = IMX8MQ_PAD_I2C1_SCL__GPIO5_IO14 | PC,
-               .gp = IMX_GPIO_NR(5, 14),
-       },
-       .sda = {
-               .i2c_mode = IMX8MQ_PAD_I2C1_SDA__I2C1_SDA | PC,
-               .gpio_mode = IMX8MQ_PAD_I2C1_SDA__GPIO5_IO15 | PC,
-               .gp = IMX_GPIO_NR(5, 15),
-       },
-};
-
-#if CONFIG_IS_ENABLED(MMC)
-#define USDHC2_CD_GPIO IMX_GPIO_NR(2, 12)
-#define USDHC1_PWR_GPIO IMX_GPIO_NR(2, 10)
-#define USDHC2_PWR_GPIO IMX_GPIO_NR(2, 19)
-
-int board_mmc_getcd(struct mmc *mmc)
-{
-       struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
-
-       switch (cfg->esdhc_base) {
-       case USDHC1_BASE_ADDR:
-               /* the eMMC does not have a CD pin */
-               return 1;
-       case USDHC2_BASE_ADDR:
-               return !gpio_get_value(USDHC2_CD_GPIO);
-       }
-
-       return 0;
-}
-
-#define USDHC_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE | \
-                        PAD_CTL_FSEL2)
-#define USDHC_GPIO_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_DSE1)
-
-static iomux_v3_cfg_t const usdhc1_pads[] = {
-       IMX8MQ_PAD_SD1_CLK__USDHC1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_CMD__USDHC1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_DATA0__USDHC1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_DATA1__USDHC1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_DATA2__USDHC1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_DATA3__USDHC1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_DATA4__USDHC1_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_DATA5__USDHC1_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_DATA6__USDHC1_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_DATA7__USDHC1_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-       IMX8MQ_PAD_SD1_RESET_B__GPIO2_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const usdhc2_pads[] = {
-       IMX8MQ_PAD_SD2_CLK__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), /* 0xd6 */
-       IMX8MQ_PAD_SD2_CMD__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), /* 0xd6 */
-       IMX8MQ_PAD_SD2_DATA0__USDHC2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), /* 0xd6 */
-       IMX8MQ_PAD_SD2_DATA1__USDHC2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), /* 0xd6 */
-       IMX8MQ_PAD_SD2_DATA2__USDHC2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), /* 0x16 */
-       IMX8MQ_PAD_SD2_DATA3__USDHC2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), /* 0xd6 */
-       IMX8MQ_PAD_SD2_CD_B__GPIO2_IO12 | MUX_PAD_CTRL(USDHC_GPIO_PAD_CTRL),
-       IMX8MQ_PAD_SD2_RESET_B__GPIO2_IO19 | MUX_PAD_CTRL(USDHC_GPIO_PAD_CTRL),
-};
-
-static struct fsl_esdhc_cfg usdhc_cfg[2] = {
-       {USDHC1_BASE_ADDR, 0, 8},
-       {USDHC2_BASE_ADDR, 0, 4},
-};
-
-int board_mmc_init(struct bd_info *bis)
-{
-       int i, ret;
-       /*
-        * According to the board_mmc_init() the following map is done:
-        * (U-Boot device node)    (Physical Port)
-        * mmc0                    USDHC1
-        * mmc1                    USDHC2
-        */
-       for (i = 0; i < CFG_SYS_FSL_USDHC_NUM; i++) {
-               switch (i) {
-               case 0:
-                       init_clk_usdhc(0);
-                       usdhc_cfg[0].sdhc_clk = mxc_get_clock(USDHC1_CLK_ROOT);
-                       imx_iomux_v3_setup_multiple_pads(usdhc1_pads,
-                                                        ARRAY_SIZE(usdhc1_pads));
-                       gpio_request(USDHC1_PWR_GPIO, "usdhc1_reset");
-                       gpio_direction_output(USDHC1_PWR_GPIO, 0);
-                       udelay(500);
-                       gpio_direction_output(USDHC1_PWR_GPIO, 1);
-                       break;
-               case 1:
-                       init_clk_usdhc(1);
-                       usdhc_cfg[1].sdhc_clk = mxc_get_clock(USDHC2_CLK_ROOT);
-                       imx_iomux_v3_setup_multiple_pads(usdhc2_pads,
-                                                        ARRAY_SIZE(usdhc2_pads));
-                       gpio_request(USDHC2_PWR_GPIO, "usdhc2_reset");
-                       gpio_direction_output(USDHC2_PWR_GPIO, 0);
-                       udelay(500);
-                       gpio_direction_output(USDHC2_PWR_GPIO, 1);
-                       break;
-               default:
-                       printf("Warning: you configured more USDHC controllers "
-                               "(%d) than supported by the board\n", i + 1);
-                       return -EINVAL;
-               }
-
-               ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
-}
-
 const char *spl_board_loader_name(u32 boot_device)
 {
        switch (boot_device) {
@@ -175,18 +54,14 @@ const char *spl_board_loader_name(u32 boot_device)
                return NULL;
        }
 }
-#endif
-
-#if CONFIG_IS_ENABLED(POWER_LEGACY)
-#define I2C_PMIC       0
 
-static int pfuze_mode_init(struct pmic *p, u32 mode)
+static int pfuze_mode_init(struct udevice *dev, u32 mode)
 {
        unsigned char offset, i, switch_num;
        u32 id;
        int ret;
 
-       pmic_reg_read(p, PFUZE100_DEVICEID, &id);
+       id = pmic_reg_read(dev, PFUZE100_DEVICEID);
        id = id & 0xf;
 
        if (id == 0) {
@@ -200,14 +75,14 @@ static int pfuze_mode_init(struct pmic *p, u32 mode)
                return -EINVAL;
        }
 
-       ret = pmic_reg_write(p, PFUZE100_SW1ABMODE, mode);
+       ret = pmic_reg_write(dev, PFUZE100_SW1ABMODE, mode);
        if (ret < 0) {
                printf("Set SW1AB mode error!\n");
                return ret;
        }
 
        for (i = 0; i < switch_num - 1; i++) {
-               ret = pmic_reg_write(p, offset + i * SWITCH_SIZE, mode);
+               ret = pmic_reg_write(dev, offset + i * SWITCH_SIZE, mode);
                if (ret < 0) {
                        printf("Set switch 0x%x mode error!\n",
                               offset + i * SWITCH_SIZE);
@@ -220,44 +95,45 @@ static int pfuze_mode_init(struct pmic *p, u32 mode)
 
 int power_init_board(void)
 {
-       struct pmic *p;
+       struct udevice *dev;
+       int reg;
        int ret;
-       unsigned int reg;
 
-       ret = power_pfuze100_init(I2C_PMIC);
-       if (ret)
-               return -ENODEV;
-
-       p = pmic_get("PFUZE100");
-       ret = pmic_probe(p);
-       if (ret)
-               return -ENODEV;
+       ret = pmic_get("pmic@8", &dev);
+       if (ret == -ENODEV) {
+               puts("No pmic@8\n");
+               return 0;
+       }
+       if (ret < 0)
+               return ret;
 
-       pmic_reg_read(p, PFUZE100_SW3AVOL, &reg);
+       reg = pmic_reg_read(dev, PFUZE100_SW3AVOL);
        if ((reg & 0x3f) != 0x18) {
                reg &= ~0x3f;
                reg |= 0x18;
-               pmic_reg_write(p, PFUZE100_SW3AVOL, reg);
+               pmic_reg_write(dev, PFUZE100_SW3AVOL, reg);
        }
 
-       ret = pfuze_mode_init(p, APS_PFM);
+       ret = pfuze_mode_init(dev, APS_PFM);
        if (ret < 0)
                return ret;
 
        /* set SW3A standby mode to off */
-       pmic_reg_read(p, PFUZE100_SW3AMODE, &reg);
+       reg = pmic_reg_read(dev, PFUZE100_SW3AMODE);
        reg &= ~0xf;
        reg |= APS_OFF;
-       pmic_reg_write(p, PFUZE100_SW3AMODE, reg);
+       pmic_reg_write(dev, PFUZE100_SW3AMODE, reg);
 
        return 0;
 }
-#endif
 
 void board_init_f(ulong dummy)
 {
        int ret;
 
+       /* Clear the BSS. */
+       memset(__bss_start, 0, __bss_end - __bss_start);
+
        arch_cpu_init();
 
        init_uart_clk(2);
@@ -266,26 +142,22 @@ void board_init_f(ulong dummy)
 
        timer_init();
 
-       preloader_console_init();
-
-       /* Clear the BSS. */
-       memset(__bss_start, 0, __bss_end - __bss_start);
-
-       ret = spl_init();
+       ret = spl_early_init();
        if (ret) {
-               debug("spl_init() failed: %d\n", ret);
+               debug("spl_early_init() failed: %d\n", ret);
                hang();
        }
 
-       enable_tzc380();
+       preloader_console_init();
 
-       setup_i2c(0, 100000, 0x7f, &i2c_pad_info1);
+       enable_tzc380();
 
-#if CONFIG_IS_ENABLED(POWER_LEGACY)
        power_init_board();
-#endif
 
        spl_dram_init();
 
+       init_clk_usdhc(0);
+       init_clk_usdhc(1);
+
        board_init_r(NULL, 0);
 }
index 4c0eb48216e94a5328cc6b6c01533d49b98b07c1..39aeb7bf01c8168f78fa8a71020888c6055d0a2d 100644 (file)
@@ -7,9 +7,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_ENV_SIZE=0x4000
 CONFIG_ENV_OFFSET=0x300000
-CONFIG_SYS_I2C_MXC_I2C1=y
-CONFIG_SYS_I2C_MXC_I2C2=y
-CONFIG_SYS_I2C_MXC_I2C3=y
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="imx8mq-kontron-pitx-imx8m"
 CONFIG_TARGET_KONTRON_PITX_IMX8M=y
@@ -18,7 +15,7 @@ CONFIG_SYS_MONITOR_LEN=524288
 CONFIG_SPL_MMC=y
 CONFIG_SPL_SERIAL=y
 CONFIG_SPL_DRIVERS_MISC=y
-CONFIG_SPL_STACK=0x187ff0
+CONFIG_SPL_STACK=0x920000
 CONFIG_SPL_TEXT_BASE=0x7E1000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
 CONFIG_SPL_BSS_START_ADDR=0x180000
@@ -73,16 +70,17 @@ CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_HASH=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="FEC"
+CONFIG_SPL_DM=y
 CONFIG_SAVED_DRAM_TIMING_BASE=0x40000000
 CONFIG_DFU_MMC=y
 CONFIG_MXC_GPIO=y
 CONFIG_DM_I2C=y
-CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
@@ -94,15 +92,17 @@ CONFIG_MII=y
 CONFIG_PHY=y
 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_POWER_PFUZE100=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_SPL_DM_PMIC_PFUZE100=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
-CONFIG_SPL_POWER_I2C=y
+CONFIG_SPL_DM_REGULATOR_GPIO=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_RV8803=y
 CONFIG_DM_SERIAL=y