All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: barebox@lists.infradead.org,  Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: Re: [PATCH v2 13/14] mci: arasan-sdhci: add HS200 tuning support on ZynqMP
Date: Fri, 15 Mar 2024 13:41:23 +0100	[thread overview]
Message-ID: <87v85nu0p8.fsf@pengutronix.de> (raw)
In-Reply-To: <ZfQ8nZLimv4L5jPy@pengutronix.de> (Sascha Hauer's message of "Fri, 15 Mar 2024 13:18:37 +0100")


Hi,

On 2024-03-15 at 13:18 +01, Sascha Hauer <s.hauer@pengutronix.de> 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    |



  reply	other threads:[~2024-03-15 12:42 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-14 18:47 [PATCH v2 00/14] mci: add HS200 support for eMMCs Steffen Trumtrar
2024-03-14 18:47 ` [PATCH v2 01/14] ARM: zynqmp: add sd_dll_reset call Steffen Trumtrar
2024-03-14 18:47 ` [PATCH v2 02/14] zynqmp: firmware: add functions to set tap delay Steffen Trumtrar
2024-03-14 18:47 ` [PATCH v2 03/14] mci: arasan: implement 25MHz quirk for zynqmp Steffen Trumtrar
2024-03-14 18:47 ` [PATCH v2 04/14] include: mci: sync mci_timing with linux Steffen Trumtrar
2024-03-14 18:47 ` [PATCH v2 05/14] mci: arasan: read clk phases from DT Steffen Trumtrar
2024-03-14 18:47 ` [PATCH v2 06/14] mci: core: save the set clock as actual_clock Steffen Trumtrar
2024-03-15 11:47   ` Ahmad Fatoum
2024-03-14 18:47 ` [PATCH v2 07/14] mci: arasan: register sdcard/sampleclk Steffen Trumtrar
2024-03-15 11:47   ` Ahmad Fatoum
2024-03-14 18:47 ` [PATCH v2 08/14] include: mci: add more EXT_CSD_CARD_TYPE_* Steffen Trumtrar
2024-03-14 18:47 ` [PATCH v2 09/14] mci: core: parse more host capabilities from DT Steffen Trumtrar
2024-03-15 11:48   ` Ahmad Fatoum
2024-03-14 18:47 ` [PATCH v2 10/14] mci: mci-core: add HS200 support Steffen Trumtrar
2024-03-15 12:00   ` Ahmad Fatoum
2024-03-14 18:47 ` [PATCH v2 11/14] mci: mci-core: replace value with define Steffen Trumtrar
2024-03-15 11:55   ` Ahmad Fatoum
2024-03-14 18:47 ` [PATCH v2 12/14] mci: sdhci: add tuning support Steffen Trumtrar
2024-03-15 11:58   ` Ahmad Fatoum
2024-03-14 18:47 ` [PATCH v2 13/14] mci: arasan-sdhci: add HS200 tuning support on ZynqMP Steffen Trumtrar
2024-03-15 12:18   ` Sascha Hauer
2024-03-15 12:41     ` Steffen Trumtrar [this message]
2024-03-14 18:47 ` [PATCH v2 14/14] mci: sdhci: replace sdhci_wait_idle Steffen Trumtrar
2024-03-15 11:56   ` Ahmad Fatoum
2024-03-15 12:09 ` [PATCH v2 00/14] mci: add HS200 support for eMMCs Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87v85nu0p8.fsf@pengutronix.de \
    --to=s.trumtrar@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.