From: Michael Schmitz Date: Mon, 31 Mar 2014 08:06:07 +0000 (+1300) Subject: m68k/atari - ataflop: use correct virt/phys translation for DMA buffer X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a4de73fbcf10c1d64bf4f66ca1c4bcb08e4fac87;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git m68k/atari - ataflop: use correct virt/phys translation for DMA buffer With the kernel running from FastRAM instead of ST-RAM, none of ST-RAM is mapped by mem_init, and DMA-addressable buffer must be mapped by ioremap. Use platform specific virt/phys translation helpers for this case. Signed-off-by: Michael Schmitz Cc: linux-kernel@vger.kernel.org Signed-off-by: Geert Uytterhoeven --- diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index 96b629e1f0c9..cfa64bdf01c9 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -1952,7 +1952,7 @@ static int __init atari_floppy_init (void) goto Enomem; } TrackBuffer = DMABuffer + 512; - PhysDMABuffer = virt_to_phys(DMABuffer); + PhysDMABuffer = atari_stram_to_phys(DMABuffer); PhysTrackBuffer = virt_to_phys(TrackBuffer); BufferDrive = BufferSide = BufferTrack = -1;