]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
xilinx: versal: Fix sdhci node name as per DT
authorT Karthik Reddy <t.karthik.reddy@xilinx.com>
Tue, 2 Nov 2021 13:06:38 +0000 (07:06 -0600)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 2 Nov 2021 15:18:35 +0000 (16:18 +0100)
Fix the sdhci node name in versal board file as per the name in
device tree and also check for sdhci node as part of backward
compatibility.

Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
board/xilinx/versal/board.c

index d7bb43122dc4c12e315f7ca1cced445d670cdace..508564b586ebfd6585527aada4cbe852ce79c1de 100644 (file)
@@ -150,6 +150,8 @@ int board_late_init(void)
        case EMMC_MODE:
                puts("EMMC_MODE\n");
                if (uclass_get_device_by_name(UCLASS_MMC,
+                                             "mmc@f1050000", &dev) &&
+                   uclass_get_device_by_name(UCLASS_MMC,
                                              "sdhci@f1050000", &dev)) {
                        puts("Boot from EMMC but without SD1 enabled!\n");
                        return -1;
@@ -161,6 +163,8 @@ int board_late_init(void)
        case SD_MODE:
                puts("SD_MODE\n");
                if (uclass_get_device_by_name(UCLASS_MMC,
+                                             "mmc@f1040000", &dev) &&
+                   uclass_get_device_by_name(UCLASS_MMC,
                                              "sdhci@f1040000", &dev)) {
                        puts("Boot from SD0 but without SD0 enabled!\n");
                        return -1;
@@ -176,6 +180,8 @@ int board_late_init(void)
        case SD_MODE1:
                puts("SD_MODE1\n");
                if (uclass_get_device_by_name(UCLASS_MMC,
+                                             "mmc@f1050000", &dev) &&
+                   uclass_get_device_by_name(UCLASS_MMC,
                                              "sdhci@f1050000", &dev)) {
                        puts("Boot from SD1 but without SD1 enabled!\n");
                        return -1;