diff mbox series

xilinx: versal: Fix sdhci node name as per DT

Message ID 9110ecdabcabcef63fffd4719095acf4326a26e4.1637236638.git.michal.simek@xilinx.com
State Accepted
Commit 5f4e1ff7f9b0a589a39359def30b5d2f11866449
Delegated to: Michal Simek
Headers show
Series xilinx: versal: Fix sdhci node name as per DT | expand

Commit Message

Michal Simek Nov. 18, 2021, 11:57 a.m. UTC 
From: T Karthik Reddy <t.karthik.reddy@xilinx.com>

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>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 board/xilinx/versal/board.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Michal Simek Nov. 29, 2021, 12:52 p.m. UTC | #1 
čt 18. 11. 2021 v 12:57 odesílatel Michal Simek
<michal.simek@xilinx.com> napsal:
>
> From: T Karthik Reddy <t.karthik.reddy@xilinx.com>
>
> 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>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  board/xilinx/versal/board.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
> index 6045eb2baa84..03604d730a0b 100644
> --- a/board/xilinx/versal/board.c
> +++ b/board/xilinx/versal/board.c
> @@ -151,6 +151,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;
> @@ -162,6 +164,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;
> @@ -177,6 +181,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;
> --
> 2.33.1
>

Applied.
M
diff mbox series

Patch

diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 6045eb2baa84..03604d730a0b 100644
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -151,6 +151,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;
@@ -162,6 +164,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;
@@ -177,6 +181,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;