diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-19 12:41:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-19 12:41:24 -0400 |
| commit | 1e389a434aa9821330523002ee7b50d1147e0fef (patch) | |
| tree | 90f99dead0753beccd33b6efbc17d1e518dd96f7 /arch/arm | |
| parent | d0cc022820aef0d731840cfd42a22a4839c4d21d (diff) | |
| parent | 792919241b3d750cd5295dfe6dd1d0958b9be468 (diff) | |
| download | u-boot-1e389a434aa9821330523002ee7b50d1147e0fef.tar.gz | |
Merge tag 'u-boot-stm32-20200619' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- fix SD card cart detect on DHCOM and ST boards
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi index 3fedb6f1e1..e13dade463 100644 --- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi @@ -171,6 +171,8 @@ &sdmmc1 { u-boot,dm-spl; + broken-cd; + /delete-property/ cd-gpios; }; &sdmmc1_b4_pins_a { diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi index a07c585415..b16dc28d47 100644 --- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi @@ -167,6 +167,8 @@ &sdmmc1 { u-boot,dm-spl; + broken-cd; + /delete-property/ cd-gpios; }; &sdmmc1_b4_pins_a { diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi index 75d75266e8..df63ad4a24 100644 --- a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi +++ b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi @@ -273,6 +273,9 @@ &sdmmc1 { u-boot,dm-spl; + broken-cd; + /delete-property/ cd-gpios; + /delete-property/ disable-wp; }; &sdmmc1_b4_pins_a { |