Merge tag 'for-linus-5.14-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / renesas / r8a77980-condor.dts

diff --git a/arch/arm64/boot/dts/renesas/r8a77980-condor.dts b/arch/arm64/boot/dts/renesas/r8a77980-condor.dts
index 04d47c0..7bde0a5 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>;