arm64: zynqmp: Fix mmc node names to be in sync with kernel

This patches renames sd nodes in dts to be in line with
kernel. This patch also modifies the references for the same
in code.
It checks mmc first to have no time penalty for new DT node names based
on left-to-right expression evaluation.

Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 96c53193f6e17d364f7e7c11fdf21fcefcab7656..9a035b227a9aac2bffb8f5633752db358e5db4d5 100644 (file)
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -884,7 +884,7 @@
                        /* dma-coherent; */
                };
 
-               sdhci0: sdhci@ff160000 {
+               sdhci0: mmc@ff160000 {
                        u-boot,dm-pre-reloc;
                        compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
                        status = "disabled";
@@ -900,7 +900,7 @@
                        nvmem-cell-names = "soc_revision";
                };
 
-               sdhci1: sdhci@ff170000 {
+               sdhci1: mmc@ff170000 {
                        u-boot,dm-pre-reloc;
                        compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
                        status = "disabled";

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 3356098cbbcd4dbd6bb34bf8e509fbb4b322a706..df2ccff95537afa28fc9c247a652d48b7fc81005 100644 (file)
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -588,6 +588,8 @@ int board_late_init(void)
        case SD_MODE:
                puts("SD_MODE\n");
                if (uclass_get_device_by_name(UCLASS_MMC,
+                                             "mmc@ff160000", &dev) &&
+                   uclass_get_device_by_name(UCLASS_MMC,
                                              "sdhci@ff160000", &dev)) {
                        puts("Boot from SD0 but without SD0 enabled!\n");
                        return -1;
@@ -604,6 +606,8 @@ int board_late_init(void)
        case SD_MODE1:
                puts("SD_MODE1\n");
                if (uclass_get_device_by_name(UCLASS_MMC,
+                                             "mmc@ff170000", &dev) &&
+                   uclass_get_device_by_name(UCLASS_MMC,
                                              "sdhci@ff170000", &dev)) {
                        puts("Boot from SD1 but without SD1 enabled!\n");
                        return -1;