[PATCH] xilinx: versal: Fix sdhci node name as per DT

[Michal Simek]

čt 18. 11. 2021 v 12:57 odesílatel Michal Simek
<michal.simek at xilinx.com> napsal:
>
> From: T Karthik Reddy <t.karthik.reddy at 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 at xilinx.com>
> Signed-off-by: Michal Simek <michal.simek at 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 at f1050000", &dev) &&
> +                   uclass_get_device_by_name(UCLASS_MMC,
>                                               "sdhci at 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 at f1040000", &dev) &&
> +                   uclass_get_device_by_name(UCLASS_MMC,
>                                               "sdhci at 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 at f1050000", &dev) &&
> +                   uclass_get_device_by_name(UCLASS_MMC,
>                                               "sdhci at f1050000", &dev)) {
>                         puts("Boot from SD1 but without SD1 enabled!\n");
>                         return -1;
> --
> 2.33.1
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs