board: stm32mp1: remove test on CONFIG_DM_REGULATOR
authorPatrick Delaunay <patrick.delaunay@foss.st.com>
Mon, 20 Jun 2022 10:36:10 +0000 (12:36 +0200)
committerPatrick Delaunay <patrick.delaunay@foss.st.com>
Tue, 6 Sep 2022 11:54:50 +0000 (13:54 +0200)
The tests on CONFIG_DM_REGULATOR, added to avoid compilation issues, can
now be removed, they are no more needed since the commit 16cc5ad0b439
("power: regulator: add dummy helper").

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
board/st/stm32mp1/stm32mp1.c

index 9496890..8c162b4 100644 (file)
@@ -494,7 +494,7 @@ static void sysconf_init(void)
        ret = uclass_get_device_by_driver(UCLASS_PMIC,
                                          DM_DRIVER_GET(stm32mp_pwr_pmic),
                                          &pwr_dev);
-       if (!ret && IS_ENABLED(CONFIG_DM_REGULATOR)) {
+       if (!ret) {
                ret = uclass_get_device_by_driver(UCLASS_MISC,
                                                  DM_DRIVER_GET(stm32mp_bsec),
                                                  &dev);
@@ -555,9 +555,6 @@ static int board_stm32mp15x_dk2_init(void)
        struct gpio_desc hdmi, audio;
        int ret = 0;
 
-       if (!IS_ENABLED(CONFIG_DM_REGULATOR))
-               return -ENODEV;
-
        /* Fix to make I2C1 usable on DK2 for touchscreen usage in kernel */
        node = ofnode_path("/soc/i2c@40012000/hdmi-transmitter@39");
        if (!ofnode_valid(node)) {
@@ -658,8 +655,7 @@ int board_init(void)
        if (board_is_stm32mp15x_dk2())
                board_stm32mp15x_dk2_init();
 
-       if (IS_ENABLED(CONFIG_DM_REGULATOR))
-               regulators_enable_boot_on(_DEBUG);
+       regulators_enable_boot_on(_DEBUG);
 
        /*
         * sysconf initialisation done only when U-Boot is running in secure