Applied "spi: pxa2xx: Allow 64-bit DMA" to the spi tree

Commit Message

Mark Brown April 24, 2018, 3:28 p.m. UTC

The patch

   spi: pxa2xx: Allow 64-bit DMA

has been applied to the spi tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From efc4a13724b852ddaa3358402a8dec024ffbcb17 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <[e-mail]>
Date: Thu, 19 Apr 2018 19:53:32 +0300
Subject: [PATCH] spi: pxa2xx: Allow 64-bit DMA

Currently the 32-bit device address only is supported for DMA. However,
starting from Intel Sunrisepoint PCH the DMA address of the device FIFO
can be 64-bit.

Change the respective variable to be compatible with DMA engine
expectations, i.e. to phys_addr_t.

Fixes: 34cadd9c1bcb ("spi: pxa2xx: Add support for Intel Sunrisepoint")
Signed-off-by: Andy Shevchenko <[e-mail]>
Signed-off-by: Mark Brown <[e-mail]>
Cc: [e-mail]
---
 drivers/spi/spi-pxa2xx.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andy Shevchenko May 2, 2018, 1:04 p.m. UTC | #1

On Tue, Apr 24, 2018 at 6:28 PM, Mark Brown <[e-mail]> wrote:
> The patch
>
>    spi: pxa2xx: Allow 64-bit DMA
>
> has been applied to the spi tree at
>
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

Sorry to bother you again, though I don't see it yet in Linus'. Now we
have same patch twice in next and zero in Linus'.
What did I miss?

Mark Brown May 3, 2018, 1:21 a.m. UTC | #2

On Wed, May 02, 2018 at 04:04:10PM +0300, Andy Shevchenko wrote:

> Sorry to bother you again, though I don't see it yet in Linus'. Now we
> have same patch twice in next and zero in Linus'.
> What did I miss?

Linus will only merge patches when I send him a pull request.  I had to
duplicate the patch since I stopped using topic branches after Linus got
angry about it so I can't just move the topic to a fix.

Andy Shevchenko May 5, 2018, 10:13 a.m. UTC | #3

On Thu, May 3, 2018 at 4:21 AM, Mark Brown <[e-mail]> wrote:
> On Wed, May 02, 2018 at 04:04:10PM +0300, Andy Shevchenko wrote:
>
>> Sorry to bother you again, though I don't see it yet in Linus'. Now we
>> have same patch twice in next and zero in Linus'.
>> What did I miss?
>
> Linus will only merge patches when I send him a pull request.

Are you going to send one for this rc?

> I had to
> duplicate the patch since I stopped using topic branches after Linus got
> angry about it so I can't just move the topic to a fix.

Understood.

Mark Brown May 9, 2018, 8:19 a.m. UTC | #4

On Sat, May 05, 2018 at 01:13:56PM +0300, Andy Shevchenko wrote:
> On Thu, May 3, 2018 at 4:21 AM, Mark Brown <[e-mail]> wrote:

> > Linus will only merge patches when I send him a pull request.

> Are you going to send one for this rc?

Probably, I'll certainly send one before the next release.  I'm on
holiday right now so a bit intermittent.

Patch

diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h
index 513ec6c6e25b..0ae7defd3492 100644
--- a/drivers/spi/spi-pxa2xx.h
+++ b/drivers/spi/spi-pxa2xx.h
@@ -38,7 +38,7 @@  struct driver_data {
 
 	/* SSP register addresses */
 	void __iomem *ioaddr;
-	u32 ssdr_physical;
+	phys_addr_t ssdr_physical;
 
 	/* SSP masks*/
 	u32 dma_cr1;