arm64: dts: renesas: condor: Switch eMMC bus to 1V8

The eMMC card has two supplies, VCC and VCCQ. The VCC supplies the NAND
array and the VCCQ supplies the bus. On Condor, the VCC is connected to
3.3V rail, while the VCCQ is connected to 1.8V rail. Adjust the pinmux
to match the bus, which is always operating in 1.8V mode.

While at it, deduplicate the pinmux entries, which are now the same for
both default and UHS modes. We still need the two pinctrl entries to
match the bindings though.

Thanks to Marek Vasut for this description from commit 5f65328df3f5cd25
("arm64: dts: renesas: Switch eMMC bus to 1V8 on Salvator-X and ULCB").

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20210419143858.39401-1-wsa+renesas@sang-engineering.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
index 04d47c0c9bb993d7954b7cccf072d2f775995826..7bde0a549c09884f045a50a82cd2b26bcdbe0599 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
@@ -210,7 +210,7 @@
 
 &mmc0 {
        pinctrl-0 = <&mmc_pins>;
-       pinctrl-1 = <&mmc_pins_uhs>;
+       pinctrl-1 = <&mmc_pins>;
        pinctrl-names = "default", "state_uhs";
 
        vmmc-supply = <&d3_3v>;
@@ -253,12 +253,6 @@
        };
 
        mmc_pins: mmc {
-               groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
-               function = "mmc";
-               power-source = <3300>;
-       };
-
-       mmc_pins_uhs: mmc_uhs {
                groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
                function = "mmc";
                power-source = <1800>;