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>

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index f54f30633417bfb38dd38fbaeec41840ac0b1116..868f7b98a637fe790d2144b8ab33bd2e64c754fd 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -40,8 +40,6 @@
                spi2 = &spi_2;
                spi3 = &spi_3;
                spi4 = &spi_4;
-               mshc0 = &mshc_0;
-               mshc2 = &mshc_2;
        };
 
        chosen {
@@ -952,6 +950,7 @@
 
 &mshc_0 {
        status = "okay";
+       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
        mmc-hs400-1_8v;
        cap-mmc-highspeed;

diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
index f3f4a6ab4b495f6f25f846ce7c54fb2d36a25032..35d949099166402c06d3cf7bcbb133f73ec3475b 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
@@ -18,8 +18,6 @@
 
        aliases {
                serial0 = &serial_2;
-               mshc0 = &mmc_0;
-               mshc2 = &mmc_2;
        };
 
        chosen {
@@ -362,6 +360,7 @@
 &mmc_0 {
        status = "okay";
        cap-mmc-highspeed;
+       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
        non-removable;
        card-detect-delay = <200>;