From 0a1a755636a94da71bd79860884bc97d64fba36b Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Mon, 20 Jun 2022 12:36:10 +0200 Subject: [PATCH] board: stm32mp1: remove test on CONFIG_DM_REGULATOR 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 Reviewed-by: Patrice Chotard --- board/st/stm32mp1/stm32mp1.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 9496890..8c162b4 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -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 -- 2.7.4