From 0cf2d59841618f1002e3247ccc062602fdd170ca Mon Sep 17 00:00:00 2001 From: Francois Ramu Date: Fri, 25 Apr 2025 14:58:43 +0200 Subject: [PATCH 1/2] dts: bindings: mmc stm32 sdmmc has a mandatory disk-name This PR makes the property disk-name required for the st,stm32-sdmmc compatible Signed-off-by: Francois Ramu --- dts/bindings/mmc/st,stm32-sdmmc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/dts/bindings/mmc/st,stm32-sdmmc.yaml b/dts/bindings/mmc/st,stm32-sdmmc.yaml index f8c77f992ad8..552e8d06682e 100644 --- a/dts/bindings/mmc/st,stm32-sdmmc.yaml +++ b/dts/bindings/mmc/st,stm32-sdmmc.yaml @@ -7,6 +7,7 @@ include: [mmc.yaml, pinctrl-device.yaml, reset-device.yaml] properties: disk-name: type: string + required: true description: | Disk name. From 7c5e938e49a9c53a78271af64ca802a4791e3f11 Mon Sep 17 00:00:00 2001 From: Francois Ramu Date: Fri, 25 Apr 2025 12:59:56 +0200 Subject: [PATCH 2/2] boards: st: stm32 add the SD disk name to boards with sdmmc node Add a disk name to the SDMMC node, as done for all other SD card compatibles in tree. Signed-off-by: Francois Ramu --- boards/st/nucleo_f722ze/nucleo_f722ze.dts | 1 + boards/st/sensortile_box_pro/sensortile_box_pro.dts | 1 + boards/st/steval_stwinbx1/steval_stwinbx1.dts | 1 + boards/st/stm32f469i_disco/stm32f469i_disco.dts | 1 + boards/st/stm32f746g_disco/stm32f746g_disco.dts | 1 + boards/st/stm32f7508_dk/stm32f7508_dk.dts | 1 + boards/st/stm32f769i_disco/stm32f769i_disco.dts | 1 + boards/st/stm32h573i_dk/stm32h573i_dk.dts | 1 + boards/st/stm32h735g_disco/stm32h735g_disco.dts | 1 + boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.dts | 1 + boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts | 1 + boards/st/stm32l496g_disco/stm32l496g_disco.dts | 1 + boards/st/stm32l4r9i_disco/stm32l4r9i_disco.dts | 1 + boards/st/stm32l562e_dk/stm32l562e_dk_common.dtsi | 2 +- boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi | 1 + boards/st/stm32u5a9j_dk/stm32u5a9j_dk.dts | 1 + boards/vcc-gnd/yd_stm32h750vb/yd_stm32h750vb.dts | 1 + boards/weact/mini_stm32h743/mini_stm32h743.dts | 1 + boards/weact/mini_stm32h7b0/mini_stm32h7b0.dts | 1 + boards/weact/stm32f405_core/weact_stm32f405_core.dts | 1 + boards/weact/stm32h5_core/weact_stm32h5_core.dts | 1 + boards/witte/linum/linum.dts | 1 + samples/subsys/fs/littlefs/boards/nucleo_h743zi.overlay | 2 ++ .../stm32_common_devices/boards/f4_sdmmc48_pll.overlay | 1 + 24 files changed, 25 insertions(+), 1 deletion(-) diff --git a/boards/st/nucleo_f722ze/nucleo_f722ze.dts b/boards/st/nucleo_f722ze/nucleo_f722ze.dts index 00faeae1dbc2..377d32c9ae12 100644 --- a/boards/st/nucleo_f722ze/nucleo_f722ze.dts +++ b/boards/st/nucleo_f722ze/nucleo_f722ze.dts @@ -97,6 +97,7 @@ &sdmmc1_d3_pc11 &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpioi 15 GPIO_ACTIVE_LOW>; + disk-name = "SD"; }; &adc1 { diff --git a/boards/st/sensortile_box_pro/sensortile_box_pro.dts b/boards/st/sensortile_box_pro/sensortile_box_pro.dts index 85f01ab2a08b..99a85f6e32c2 100644 --- a/boards/st/sensortile_box_pro/sensortile_box_pro.dts +++ b/boards/st/sensortile_box_pro/sensortile_box_pro.dts @@ -320,6 +320,7 @@ zephyr_udc0: &usbotg_fs { pwr-gpios = <&gpioh 10 GPIO_ACTIVE_LOW>; bus-width = <4>; clk-div = <4>; + disk-name = "SD"; }; &flash0 { diff --git a/boards/st/steval_stwinbx1/steval_stwinbx1.dts b/boards/st/steval_stwinbx1/steval_stwinbx1.dts index c9ef1b4299bc..5ab30c62f02a 100644 --- a/boards/st/steval_stwinbx1/steval_stwinbx1.dts +++ b/boards/st/steval_stwinbx1/steval_stwinbx1.dts @@ -294,6 +294,7 @@ zephyr_udc0: &usbotg_fs { cd-gpios = <&gpiog 1 GPIO_ACTIVE_LOW>; bus-width = <4>; clk-div = <4>; + disk-name = "SD"; }; &flash0 { diff --git a/boards/st/stm32f469i_disco/stm32f469i_disco.dts b/boards/st/stm32f469i_disco/stm32f469i_disco.dts index 7311417c3ce5..c096dad9a86c 100644 --- a/boards/st/stm32f469i_disco/stm32f469i_disco.dts +++ b/boards/st/stm32f469i_disco/stm32f469i_disco.dts @@ -137,4 +137,5 @@ zephyr_udc0: &usbotg_fs { &sdio_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpiog 2 GPIO_ACTIVE_LOW>; + disk-name = "SD"; }; diff --git a/boards/st/stm32f746g_disco/stm32f746g_disco.dts b/boards/st/stm32f746g_disco/stm32f746g_disco.dts index eafd8bd6be22..e73decc90995 100644 --- a/boards/st/stm32f746g_disco/stm32f746g_disco.dts +++ b/boards/st/stm32f746g_disco/stm32f746g_disco.dts @@ -173,6 +173,7 @@ zephyr_udc0: &usbotg_fs { &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpioc 13 GPIO_ACTIVE_LOW>; + disk-name = "SD"; }; &mac { diff --git a/boards/st/stm32f7508_dk/stm32f7508_dk.dts b/boards/st/stm32f7508_dk/stm32f7508_dk.dts index 2add12eb8ec4..c23629063b8b 100644 --- a/boards/st/stm32f7508_dk/stm32f7508_dk.dts +++ b/boards/st/stm32f7508_dk/stm32f7508_dk.dts @@ -160,6 +160,7 @@ zephyr_udc0: &usbotg_fs { &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpioc 13 GPIO_ACTIVE_LOW>; + disk-name = "SD"; }; &mac { diff --git a/boards/st/stm32f769i_disco/stm32f769i_disco.dts b/boards/st/stm32f769i_disco/stm32f769i_disco.dts index ba6837339c82..2a1c263c5c23 100644 --- a/boards/st/stm32f769i_disco/stm32f769i_disco.dts +++ b/boards/st/stm32f769i_disco/stm32f769i_disco.dts @@ -181,6 +181,7 @@ arduino_serial: &usart6 {}; &sdmmc2_ck_pd6 &sdmmc2_cmd_pd7>; pinctrl-names = "default"; cd-gpios = <&gpioi 15 GPIO_ACTIVE_LOW>; + disk-name = "SD"; }; &quadspi { diff --git a/boards/st/stm32h573i_dk/stm32h573i_dk.dts b/boards/st/stm32h573i_dk/stm32h573i_dk.dts index 896da6606d2b..057423631743 100644 --- a/boards/st/stm32h573i_dk/stm32h573i_dk.dts +++ b/boards/st/stm32h573i_dk/stm32h573i_dk.dts @@ -301,6 +301,7 @@ &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpioh 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + disk-name = "SD"; status = "okay"; }; diff --git a/boards/st/stm32h735g_disco/stm32h735g_disco.dts b/boards/st/stm32h735g_disco/stm32h735g_disco.dts index 06afe9fb6450..764d07b419c4 100644 --- a/boards/st/stm32h735g_disco/stm32h735g_disco.dts +++ b/boards/st/stm32h735g_disco/stm32h735g_disco.dts @@ -163,6 +163,7 @@ &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpiof 5 GPIO_ACTIVE_LOW>; + disk-name = "SD"; }; &octospi1 { diff --git a/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.dts b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.dts index 4640468048c5..645c166db3ce 100644 --- a/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.dts +++ b/boards/st/stm32h757i_eval/stm32h757i_eval_stm32h757xx_m7.dts @@ -255,6 +255,7 @@ zephyr_udc0: &usbotg_hs { &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpioi 8 GPIO_ACTIVE_LOW>; + disk-name = "SD"; }; &quadspi { diff --git a/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts index c76f7b7f238f..c3c8efb55bbb 100644 --- a/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts +++ b/boards/st/stm32h7b3i_dk/stm32h7b3i_dk.dts @@ -231,6 +231,7 @@ &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpioi 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + disk-name = "SD"; status = "okay"; }; diff --git a/boards/st/stm32l496g_disco/stm32l496g_disco.dts b/boards/st/stm32l496g_disco/stm32l496g_disco.dts index 4a942a5ab066..7fd2f89ab9a3 100644 --- a/boards/st/stm32l496g_disco/stm32l496g_disco.dts +++ b/boards/st/stm32l496g_disco/stm32l496g_disco.dts @@ -158,6 +158,7 @@ &sdmmc1_d2_pc10 &sdmmc1_d3_pc11 &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; + disk-name = "SD"; status = "okay"; }; diff --git a/boards/st/stm32l4r9i_disco/stm32l4r9i_disco.dts b/boards/st/stm32l4r9i_disco/stm32l4r9i_disco.dts index 2e6175dd171e..94b46040ef75 100644 --- a/boards/st/stm32l4r9i_disco/stm32l4r9i_disco.dts +++ b/boards/st/stm32l4r9i_disco/stm32l4r9i_disco.dts @@ -220,6 +220,7 @@ &sdmmc1_d2_pc10 &sdmmc1_d3_pc11 &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; + disk-name = "SD"; }; &adc1 { diff --git a/boards/st/stm32l562e_dk/stm32l562e_dk_common.dtsi b/boards/st/stm32l562e_dk/stm32l562e_dk_common.dtsi index 47c678db786e..3991e360bab5 100644 --- a/boards/st/stm32l562e_dk/stm32l562e_dk_common.dtsi +++ b/boards/st/stm32l562e_dk/stm32l562e_dk_common.dtsi @@ -314,7 +314,7 @@ zephyr_udc0: &usb { &sdmmc1 { status = "okay"; - + disk-name = "SD"; pinctrl-0 = <&sdmmc1_d0_pc8 &sdmmc1_d1_pc9 &sdmmc1_d2_pc10 diff --git a/boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi b/boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi index 48ee7e4a22aa..9acf019f84f6 100644 --- a/boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi +++ b/boards/st/stm32n6570_dk/stm32n6570_dk_common.dtsi @@ -202,6 +202,7 @@ bus-width = <4>; cd-gpios = <&gpion 12 GPIO_ACTIVE_HIGH>; pwr-gpios = <&gpioq 7 GPIO_ACTIVE_HIGH>; + disk-name = "SD"; }; &spi5 { diff --git a/boards/st/stm32u5a9j_dk/stm32u5a9j_dk.dts b/boards/st/stm32u5a9j_dk/stm32u5a9j_dk.dts index 5696253f93cf..96726131f641 100644 --- a/boards/st/stm32u5a9j_dk/stm32u5a9j_dk.dts +++ b/boards/st/stm32u5a9j_dk/stm32u5a9j_dk.dts @@ -198,6 +198,7 @@ uart0: &usart3 { &sdmmc1_d6_pc6 &sdmmc1_d7_pc7 &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; + disk-name = "SD"; status = "okay"; }; diff --git a/boards/vcc-gnd/yd_stm32h750vb/yd_stm32h750vb.dts b/boards/vcc-gnd/yd_stm32h750vb/yd_stm32h750vb.dts index 926f1f564544..4562d3435f09 100644 --- a/boards/vcc-gnd/yd_stm32h750vb/yd_stm32h750vb.dts +++ b/boards/vcc-gnd/yd_stm32h750vb/yd_stm32h750vb.dts @@ -103,6 +103,7 @@ &sdmmc1_d2_pc10 &sdmmc1_d3_pc11 &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; cd-gpios = <&gpioa 8 GPIO_ACTIVE_LOW>; + disk-name = "SD"; status = "okay"; }; diff --git a/boards/weact/mini_stm32h743/mini_stm32h743.dts b/boards/weact/mini_stm32h743/mini_stm32h743.dts index abec39683d40..28957875b044 100644 --- a/boards/weact/mini_stm32h743/mini_stm32h743.dts +++ b/boards/weact/mini_stm32h743/mini_stm32h743.dts @@ -146,6 +146,7 @@ &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpiod 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + disk-name = "SD"; status = "okay"; }; diff --git a/boards/weact/mini_stm32h7b0/mini_stm32h7b0.dts b/boards/weact/mini_stm32h7b0/mini_stm32h7b0.dts index cce16f72fc30..f5de87d704e8 100644 --- a/boards/weact/mini_stm32h7b0/mini_stm32h7b0.dts +++ b/boards/weact/mini_stm32h7b0/mini_stm32h7b0.dts @@ -123,6 +123,7 @@ &sdmmc1_ck_pc12 &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpiod 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + disk-name = "SD"; status = "okay"; }; diff --git a/boards/weact/stm32f405_core/weact_stm32f405_core.dts b/boards/weact/stm32f405_core/weact_stm32f405_core.dts index ba9090bf3549..0906fcc01c25 100644 --- a/boards/weact/stm32f405_core/weact_stm32f405_core.dts +++ b/boards/weact/stm32f405_core/weact_stm32f405_core.dts @@ -112,6 +112,7 @@ &sdio_ck_pc12 &sdio_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + disk-name = "SD"; }; &rtc { diff --git a/boards/weact/stm32h5_core/weact_stm32h5_core.dts b/boards/weact/stm32h5_core/weact_stm32h5_core.dts index 1d39eea4c201..7c38a553f535 100644 --- a/boards/weact/stm32h5_core/weact_stm32h5_core.dts +++ b/boards/weact/stm32h5_core/weact_stm32h5_core.dts @@ -54,6 +54,7 @@ cd-gpios = <&gpioa 8 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; cd-gpios = <&gpioa 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; + disk-name = "SD"; status = "okay"; }; diff --git a/boards/witte/linum/linum.dts b/boards/witte/linum/linum.dts index 0453b7ab568f..a6b9bf85b7f4 100644 --- a/boards/witte/linum/linum.dts +++ b/boards/witte/linum/linum.dts @@ -345,6 +345,7 @@ zephyr_udc0: &usbotg_fs { &sdmmc1_cmd_pd2>; pinctrl-names = "default"; cd-gpios = <&gpiog 7 GPIO_ACTIVE_LOW>; + disk-name = "SD"; status = "okay"; disk { diff --git a/samples/subsys/fs/littlefs/boards/nucleo_h743zi.overlay b/samples/subsys/fs/littlefs/boards/nucleo_h743zi.overlay index 32d6ff2b814f..6c8608591870 100644 --- a/samples/subsys/fs/littlefs/boards/nucleo_h743zi.overlay +++ b/samples/subsys/fs/littlefs/boards/nucleo_h743zi.overlay @@ -13,6 +13,8 @@ &sdmmc1_cmd_pd2>; pinctrl-names = "default"; + + disk-name = "SD"; }; / { diff --git a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/boards/f4_sdmmc48_pll.overlay b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/boards/f4_sdmmc48_pll.overlay index 26223d97ef5d..1efaf4793264 100644 --- a/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/boards/f4_sdmmc48_pll.overlay +++ b/tests/drivers/clock_control/stm32_clock_configuration/stm32_common_devices/boards/f4_sdmmc48_pll.overlay @@ -31,4 +31,5 @@ &sdio_d2_pc10 &sdio_d3_pc11>; pinctrl-names = "default"; status = "okay"; + disk-name = "SD"; };