From 3c2e2a1a79608c5e046313a8c47586d9a734e2a3 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 18 Jun 2020 20:35:17 +0200 Subject: [PATCH 1/2] ARM: dts: stm32: Reinstate card detect behavior on DHSOM The cd-gpios with (GPIO_ACTIVE_LOW | GPIO_PULL_UP) gpio is thus far unsupported, reinstate the old cd-gpios behavior until this handling is fully implemented. This permits the DHSOM to boot from SD again, without this patch the card detect fails. Signed-off-by: Marek Vasut Cc: Patrick Delaunay Cc: Patrice Chotard Reviewed-by: Patrick Delaunay --- arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi index 75d75266e85..df63ad4a241 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 { From 792919241b3d750cd5295dfe6dd1d0958b9be468 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Fri, 19 Jun 2020 11:19:45 +0200 Subject: [PATCH 2/2] ARM: dts: stm32: Reinstate card detect behavior on ST boards The cd-gpios with (GPIO_ACTIVE_LOW | GPIO_PULL_UP) gpio is thus far unsupported, reinstate the old cd-gpios behavior until this handling is fully implemented. This avoid potential issue for SDCard boot: the card detect fails with floating gpio. Signed-off-by: Patrick Delaunay Reviewed-by: Patrice Chotard --- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 2 ++ arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi index 3fedb6f1e1d..e13dade4633 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 a07c5854154..b16dc28d47a 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 {