dts: bcm2712: update sdio1 on Pi 5

Switch to using card-detection via GPIO, and add missing emmc_cmd pin.
Also, "emmc_*" isn't the name of the respective function, but the name
of the pin. These pins are single-function, but need pulls set
accordingly.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts b/arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts
index 1a4a0e5..b5fcab1 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts
@@ -359,7 +359,7 @@ dpi_16bit_gpio2:        &rp1_dpi_16bit_gpio2        { };
        sd-uhs-sdr50;
        sd-uhs-ddr50;
        sd-uhs-sdr104;
-       //broken-cd;
+       cd-gpios = <&gio_aon 5 GPIO_ACTIVE_LOW>;
        //no-1-8-v;
        status = "okay";
 };
@@ -396,7 +396,7 @@ dpi_16bit_gpio2:        &rp1_dpi_16bit_gpio2        { };
        };
 
        emmc_sd_pulls: emmc_sd_pulls {
-               function = "emmc_dat0", "emmc_dat1", "emmc_dat2", "emmc_dat3";
+               pins = "emmc_cmd", "emmc_dat0", "emmc_dat1", "emmc_dat2", "emmc_dat3";
                bias-pull-up;
        };
 };