diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-27 09:11:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-27 09:11:25 -0400 |
| commit | 0d4823fbebae6ebbf558a9325d86b37c67d848d9 (patch) | |
| tree | 46c84c5039fc1d2ce0ff441e32603de406976db5 /arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | |
| parent | df59b7d23be71db03275e4c1b243e67397b50f9a (diff) | |
| parent | 65b3f56d42e5ddc9183843723cf735950f062410 (diff) | |
Merge tag 'u-boot-stm32-20210727' of https://source.denx.de/u-boot/custodians/u-boot-stm
- FIP Enable OP-TEE and TZC support in SPL for STM32MP15 SoC
- Add stm32mp15 missing SPI clock support
- Manage pull-up on gpio button STM32MP15 boards
- Correct STM32MP15 boot when TAMPER registers are invalid
- Fix EMMC pinmux on STM32MP15 Avenger96 board
Diffstat (limited to 'arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi')
| -rw-r--r-- | arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi index 46a43371bd..fc6066aab2 100644 --- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi @@ -16,8 +16,8 @@ u-boot,boot-led = "heartbeat"; u-boot,error-led = "error"; u-boot,mmc-env-partition = "ssbl"; - st,fastboot-gpios = <&gpioa 13 GPIO_ACTIVE_LOW>; - st,stm32prog-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>; + st,fastboot-gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + st,stm32prog-gpios = <&gpioa 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; }; firmware { |