Re: [PATCH v2 13/14] mci: arasan-sdhci: add HS200 tuning support on ZynqMP

[Steffen Trumtrar <s.trumtrar@xxxxxxxxxxxxxx>]

Hi,

On 2024-03-15 at 13:18 +01, Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> wrote:
> Thist hunk conflicts with b80c0e1ec6 ("mci: arasan: add dma support"):
>
> <<<<<<< HEAD
> 	ret = sdhci_wait_for_done(&host->sdhci, SDHCI_INT_CMD_COMPLETE);
> =======
> 	/* CMD19/21 generate _only_ Buffer Read Ready interrupt */
> 	if (cmd->cmdidx == MMC_SEND_TUNING_BLOCK || cmd->cmdidx == MMC_SEND_TUNING_BLOCK_HS200)
> 		mask = SDHCI_INT_DATA_AVAIL;
>
> 	ret = sdhci_wait_for_done(&host->sdhci, mask);
> >>>>>>> for-next/mmc-hs200
>
> I am not sure how to resolve this just by looking at it. Please rebase
> your series on that patch.

meh, will do.

Thanks,
Steffen

--
Pengutronix e.K.                | Dipl.-Inform. Steffen Trumtrar |
Steuerwalder Str. 21            | https://www.pengutronix.de/    |
31137 Hildesheim, Germany       | Phone: +49-5121-206917-0       |
Amtsgericht Hildesheim, HRA 2686| Fax:   +49-5121-206917-5555    |