mirror of
https://xff.cz/git/u-boot/
synced 2025-10-03 00:11:30 +02:00
Merge tag 'u-boot-stm32-20231004' of https://source.denx.de/u-boot/custodians/u-boot-stm
STM32 MCU: _ alignment with kernel DT v6.5 for stm32f429 and stm32f746 _ rework way of displaying ST logo for stm32f746-disco and stm32f769-disco STM32 MPU: _ alignment with kernel DT v6.6-rc1 _ add RNG support for stm32mp13 _ add USB, USB boot and stm32prog command support for stm32mp13 _ add support of USART1 clock for stm32mp1 _ only print RAM and board code with SPL_DISPLAY_PRINT flag for stm32mp1 _ rename update_sf to dh_update_sd_to_sf and add dh_update_sd_to_emmc for stm32mp15xx DHCOR [ Fix merge conflict at board/st/common/stm32mp_dfu.c ] Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
|
||||
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics 2018 - All Rights Reserved
|
||||
* Author: Gabriel Fernandez <gabriel.fernandez@st.com> for STMicroelectronics.
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-3-Clause */
|
||||
/* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics 2020 - All Rights Reserved
|
||||
* Author: Gabriel Fernandez <gabriel.fernandez@foss.st.com> for STMicroelectronics.
|
||||
|
@@ -64,6 +64,7 @@
|
||||
#define STM32F7_RCC_APB1_TIM14 8
|
||||
#define STM32F7_RCC_APB1_LPTIM1 9
|
||||
#define STM32F7_RCC_APB1_WWDG 11
|
||||
#define STM32F7_RCC_APB1_CAN3 13
|
||||
#define STM32F7_RCC_APB1_SPI2 14
|
||||
#define STM32F7_RCC_APB1_SPI3 15
|
||||
#define STM32F7_RCC_APB1_SPDIFRX 16
|
||||
|
42
include/dt-bindings/regulator/st,stm32mp13-regulator.h
Normal file
42
include/dt-bindings/regulator/st,stm32mp13-regulator.h
Normal file
@@ -0,0 +1,42 @@
|
||||
/* SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) */
|
||||
/*
|
||||
* Copyright (C) 2022, STMicroelectronics - All Rights Reserved
|
||||
*/
|
||||
|
||||
#ifndef __DT_BINDINGS_REGULATOR_ST_STM32MP13_REGULATOR_H
|
||||
#define __DT_BINDINGS_REGULATOR_ST_STM32MP13_REGULATOR_H
|
||||
|
||||
/* SCMI voltage domains identifiers */
|
||||
|
||||
/* SOC Internal regulators */
|
||||
#define VOLTD_SCMI_REG11 0
|
||||
#define VOLTD_SCMI_REG18 1
|
||||
#define VOLTD_SCMI_USB33 2
|
||||
#define VOLTD_SCMI_SDMMC1_IO 3
|
||||
#define VOLTD_SCMI_SDMMC2_IO 4
|
||||
#define VOLTD_SCMI_VREFBUF 5
|
||||
|
||||
/* STPMIC1 regulators */
|
||||
#define VOLTD_SCMI_STPMIC1_BUCK1 6
|
||||
#define VOLTD_SCMI_STPMIC1_BUCK2 7
|
||||
#define VOLTD_SCMI_STPMIC1_BUCK3 8
|
||||
#define VOLTD_SCMI_STPMIC1_BUCK4 9
|
||||
#define VOLTD_SCMI_STPMIC1_LDO1 10
|
||||
#define VOLTD_SCMI_STPMIC1_LDO2 11
|
||||
#define VOLTD_SCMI_STPMIC1_LDO3 12
|
||||
#define VOLTD_SCMI_STPMIC1_LDO4 13
|
||||
#define VOLTD_SCMI_STPMIC1_LDO5 14
|
||||
#define VOLTD_SCMI_STPMIC1_LDO6 15
|
||||
#define VOLTD_SCMI_STPMIC1_VREFDDR 16
|
||||
#define VOLTD_SCMI_STPMIC1_BOOST 17
|
||||
#define VOLTD_SCMI_STPMIC1_PWR_SW1 18
|
||||
#define VOLTD_SCMI_STPMIC1_PWR_SW2 19
|
||||
|
||||
/* External regulators */
|
||||
#define VOLTD_SCMI_REGU0 20
|
||||
#define VOLTD_SCMI_REGU1 21
|
||||
#define VOLTD_SCMI_REGU2 22
|
||||
#define VOLTD_SCMI_REGU3 23
|
||||
#define VOLTD_SCMI_REGU4 24
|
||||
|
||||
#endif /*__DT_BINDINGS_REGULATOR_ST_STM32MP13_REGULATOR_H */
|
@@ -1,4 +1,4 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
|
||||
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics 2018 - All Rights Reserved
|
||||
* Author: Gabriel Fernandez <gabriel.fernandez@st.com> for STMicroelectronics.
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later or BSD-3-Clause */
|
||||
/* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics 2018 - All Rights Reserved
|
||||
* Author: Gabriel Fernandez <gabriel.fernandez@foss.st.com> for STMicroelectronics.
|
||||
|
Reference in New Issue
Block a user