92 lines
3.0 KiB
Diff
92 lines
3.0 KiB
Diff
From ea95370bf05dcc38e0b1df21a172840c232d4b21 Mon Sep 17 00:00:00 2001
|
|
From: Romuald JEANNE <romuald.jeanne@st.com>
|
|
Date: Thu, 3 Nov 2022 11:14:30 +0100
|
|
Subject: [PATCH 7/9] ARM v2021.10-stm32mp-r2 BOARD
|
|
|
|
Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
|
|
---
|
|
board/st/common/stpmic1.c | 14 --------------
|
|
board/st/stm32mp1/stm32mp1.c | 15 +++++----------
|
|
2 files changed, 5 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/board/st/common/stpmic1.c b/board/st/common/stpmic1.c
|
|
index 5fb1be2fd3d..d52dce4f657 100644
|
|
--- a/board/st/common/stpmic1.c
|
|
+++ b/board/st/common/stpmic1.c
|
|
@@ -202,18 +202,4 @@ void stpmic1_init(u32 voltage_mv)
|
|
STPMIC1_BUCKS_MRST_CR,
|
|
STPMIC1_MRST_BUCK(STPMIC1_BUCK3),
|
|
STPMIC1_MRST_BUCK(STPMIC1_BUCK3));
|
|
-
|
|
- /* Check if debug is enabled to program PMIC according to the bit */
|
|
- if (readl(TAMP_BOOT_CONTEXT) & TAMP_BOOT_DEBUG_ON) {
|
|
- log_info("Keep debug unit ON\n");
|
|
-
|
|
- pmic_clrsetbits(dev, STPMIC1_BUCKS_MRST_CR,
|
|
- STPMIC1_MRST_BUCK_DEBUG,
|
|
- STPMIC1_MRST_BUCK_DEBUG);
|
|
-
|
|
- if (STPMIC1_MRST_LDO_DEBUG)
|
|
- pmic_clrsetbits(dev, STPMIC1_LDOS_MRST_CR,
|
|
- STPMIC1_MRST_LDO_DEBUG,
|
|
- STPMIC1_MRST_LDO_DEBUG);
|
|
- }
|
|
}
|
|
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
|
|
index c9b21a76eb7..05f41737e6d 100644
|
|
--- a/board/st/stm32mp1/stm32mp1.c
|
|
+++ b/board/st/stm32mp1/stm32mp1.c
|
|
@@ -506,7 +506,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);
|
|
@@ -567,9 +567,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)) {
|
|
@@ -621,8 +618,7 @@ error:
|
|
static bool board_is_stm32mp13x_dk(void)
|
|
{
|
|
if (CONFIG_IS_ENABLED(TARGET_ST_STM32MP13x) &&
|
|
- (of_machine_is_compatible("st,stm32mp135d-dk") ||
|
|
- of_machine_is_compatible("st,stm32mp135f-dk")))
|
|
+ of_machine_is_compatible("st,stm32mp135f-dk"))
|
|
return true;
|
|
|
|
return false;
|
|
@@ -860,8 +856,7 @@ int board_init(void)
|
|
|
|
board_key_check();
|
|
|
|
- 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
|
|
@@ -1438,8 +1433,8 @@ void fdt_update_panel_dsi(void *new_blob)
|
|
int ft_board_setup(void *blob, struct bd_info *bd)
|
|
{
|
|
static const struct node_info nodes[] = {
|
|
- { "st,stm32f469-qspi", MTD_DEV_TYPE_NOR, },
|
|
- { "st,stm32f469-qspi", MTD_DEV_TYPE_SPINAND},
|
|
+ { "jedec,spi-nor", MTD_DEV_TYPE_NOR, },
|
|
+ { "spi-nand", MTD_DEV_TYPE_SPINAND},
|
|
{ "st,stm32mp15-fmc2", MTD_DEV_TYPE_NAND, },
|
|
{ "st,stm32mp1-fmc2-nfc", MTD_DEV_TYPE_NAND, },
|
|
};
|
|
--
|
|
2.17.1
|
|
|