Skip to content

Commit cb34ae4

Browse files
danieldegrassedleach02
authored andcommitted
boards: use zephyr,sdhc-spi-slot over zephyr,mmc-spi-slot
switch all in tree usage of zephyr,mmc-spi-slot to zephyr,sdhc-spi-slot. This will change all boards to use the new SD subsystem instead of the SDMMC SPI driver Signed-off-by: Daniel DeGrasse <[email protected]>
1 parent c91d473 commit cb34ae4

File tree

6 files changed

+40
-10
lines changed

6 files changed

+40
-10
lines changed

boards/arm/bl5340_dvk/bl5340_dvk_cpuapp_common.dts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,16 @@
190190
pinctrl-1 = <&spi3_sleep>;
191191
pinctrl-names = "default", "sleep";
192192
sdhc@0 {
193-
compatible = "zephyr,mmc-spi-slot";
194193
reg = <0>;
194+
compatible = "zephyr,sdhc-spi-slot";
195195
status = "okay";
196-
label = "SDHC";
196+
label = "SDHC_0";
197197
spi-max-frequency = <8000000>;
198+
mmc {
199+
compatible = "zephyr,sdmmc-disk";
200+
status = "okay";
201+
label = "SDMMC_0";
202+
};
198203
};
199204
};
200205

boards/arm/olimexino_stm32/olimexino_stm32.dts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,16 @@ uext_serial: &usart1 {};
125125
cs-gpios = <&gpiod 2 GPIO_ACTIVE_HIGH>;
126126

127127
sdhc0: sdhc@0 {
128-
compatible = "zephyr,mmc-spi-slot";
128+
compatible = "zephyr,sdhc-spi-slot";
129129
reg = <0>;
130130
status = "okay";
131-
label = "SDHC0";
131+
label = "SDHC_0";
132132
spi-max-frequency = <24000000>;
133+
mmc {
134+
compatible = "zephyr,sdmmc-disk";
135+
status = "okay";
136+
label = "SDMMC_0";
137+
};
133138
};
134139
};
135140

boards/shields/adafruit_2_8_tft_touch_v2/dts/adafruit_2_8_tft_touch_v2.dtsi

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,16 @@
3737
};
3838

3939
sdhc0: sdhc@1 {
40-
compatible = "zephyr,mmc-spi-slot";
40+
compatible = "zephyr,sdhc-spi-slot";
4141
reg = <1>;
4242
status = "okay";
43-
label = "SDHC0";
43+
label = "SDHC_0";
4444
spi-max-frequency = <24000000>;
45+
mmc {
46+
compatible = "zephyr,sdmmc-disk";
47+
status = "okay";
48+
label = "SDMMC_0";
49+
};
4550
};
4651
};
4752

boards/shields/v2c_daplink/v2c_daplink.overlay

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,14 @@
3737
status = "okay";
3838

3939
sdhc0: sdhc@0 {
40-
compatible = "zephyr,mmc-spi-slot";
40+
compatible = "zephyr,sdhc-spi-slot";
4141
reg = <0>;
4242
label = "SDHC_0";
4343
spi-max-frequency = <25000000>;
44+
mmc {
45+
compatible = "zephyr,sdmmc-disk";
46+
status = "okay";
47+
label = "SDMMC_0";
48+
};
4449
};
4550
};

boards/shields/v2c_daplink/v2c_daplink_cfg.overlay

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,14 @@
2828
status = "okay";
2929

3030
sdhc0: sdhc@0 {
31-
compatible = "zephyr,mmc-spi-slot";
31+
compatible = "zephyr,sdhc-spi-slot";
3232
reg = <0>;
3333
label = "SDHC_0";
3434
spi-max-frequency = <25000000>;
35+
mmc {
36+
compatible = "zephyr,sdmmc-disk";
37+
status = "okay";
38+
label = "SDMMC_0";
39+
};
3540
};
3641
};

boards/shields/waveshare_epaper/dts/waveshare_epaper_common.dtsi

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,15 @@
1010
<&arduino_header 12 GPIO_ACTIVE_LOW>; /* D04 */
1111

1212
sdhc0: sdhc@1 {
13-
compatible = "zephyr,mmc-spi-slot";
13+
compatible = "zephyr,sdhc-spi-slot";
1414
reg = <1>;
1515
status = "okay";
16-
label = "SDHC0";
16+
label = "SDHC_0";
1717
spi-max-frequency = <24000000>;
18+
mmc {
19+
compatible = "zephyr,sdmmc-disk";
20+
status = "okay";
21+
label = "SDMMC_0";
22+
};
1823
};
1924
};

0 commit comments

Comments
 (0)