Skip to content

Commit c04d7b2

Browse files
Grimler91krzk
authored andcommitted
arm64: dts: exynos: drop mshc aliases
Previously, the mshc0 alias has been necessary so that MMC_CAP_1_8V_DDR | MMC_CAP_8_BIT_DATA are set for mshc_0/mmc_0. However, these capabilities should be described in the device tree so that we do not have to rely on the alias. The property mmc-ddr-1_8v replaces MMC_CAP_1_8V_DDR, while bus_width = <8>, which is already set for all the mshc0/mmc0 nodes, replaces MMC_CAP_8_BIT_DATA. Also drop other mshc aliases as they are not needed. Signed-off-by: Henrik Grimler <henrik@grimler.se> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20230315212814.15908-2-henrik@grimler.se Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1 parent 35ade1e commit c04d7b2

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
spi2 = &spi_2;
4141
spi3 = &spi_3;
4242
spi4 = &spi_4;
43-
mshc0 = &mshc_0;
44-
mshc2 = &mshc_2;
4543
};
4644

4745
chosen {
@@ -952,6 +950,7 @@
952950

953951
&mshc_0 {
954952
status = "okay";
953+
mmc-ddr-1_8v;
955954
mmc-hs200-1_8v;
956955
mmc-hs400-1_8v;
957956
cap-mmc-highspeed;

arch/arm64/boot/dts/exynos/exynos7-espresso.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
aliases {
2020
serial0 = &serial_2;
21-
mshc0 = &mmc_0;
22-
mshc2 = &mmc_2;
2321
};
2422

2523
chosen {
@@ -362,6 +360,7 @@
362360
&mmc_0 {
363361
status = "okay";
364362
cap-mmc-highspeed;
363+
mmc-ddr-1_8v;
365364
mmc-hs200-1_8v;
366365
non-removable;
367366
card-detect-delay = <200>;

0 commit comments

Comments
 (0)