On 05/07/2019 14:05, Vinod Koul wrote: > On 05-07-19, 10:15, Jon Hunter wrote: >> From: Jonathan Hunter <jonathanh@xxxxxxxxxx> >> >> The Tegra210 ADMA supports two modes for transferring data to a FIFO >> which are ... >> >> 1. Transfer data to/from the FIFO as soon as a single burst can be >> transferred. >> 2. Transfer data to/from the FIFO based upon FIFO thresholds, where >> the FIFO threshold is specified in terms on multiple bursts. >> >> Currently, the ADMA driver programs the FIFO threshold values in the >> FIFO_CTRL register, but never enables the transfer mode that uses >> these threshold values. Given that these have never been used so far, >> simplify the ADMA driver by removing the programming of these threshold >> values. >> >> Signed-off-by: Jonathan Hunter <jonathanh@xxxxxxxxxx> >> Acked-by: Thierry Reding <treding@xxxxxxxxxx> >> --- >> >> Resending the patch rebased on top next-20190704. I have added Thierry's >> ACK as well. > > Thanks but this fails as well. I had applied few tegra patches so I > suspect that is causing issues now. It would have been nice to have them > in series. > > Would you rebase on > git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma.git next (yeah > this is different location, i dont see to push to infradead today) So this patch should apply cleanly on top of the fixes series I sent for v5.2 [0] which you merged and is now in mainline. So if I rebase on the above, I wondering if it is then going to conflict with mainline? Looks like the above branch is based upon v5.2-rc1 and hence the conflict. Cheers Jon [0] https://patchwork.kernel.org/cover/10946849/ -- nvpublic
