Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Apr 2018 16:15:46 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Apr 2018 16:15:46 +0000 (09:15 -0700)
Pull m68knommu update from Greg Ungerer:
 "Only a single fix to set the DMA masks in the ColdFire FEC platform
  data structure.

  This stops the warning from dma-mapping.h at boot time"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: set dma and coherent masks for platform FEC ethernets

arch/m68k/coldfire/device.c

index 84938fd..908d583 100644 (file)
@@ -135,7 +135,11 @@ static struct platform_device mcf_fec0 = {
        .id                     = 0,
        .num_resources          = ARRAY_SIZE(mcf_fec0_resources),
        .resource               = mcf_fec0_resources,
-       .dev.platform_data      = FEC_PDATA,
+       .dev = {
+               .dma_mask               = &mcf_fec0.dev.coherent_dma_mask,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+               .platform_data          = FEC_PDATA,
+       }
 };
 
 #ifdef MCFFEC_BASE1
@@ -167,7 +171,11 @@ static struct platform_device mcf_fec1 = {
        .id                     = 1,
        .num_resources          = ARRAY_SIZE(mcf_fec1_resources),
        .resource               = mcf_fec1_resources,
-       .dev.platform_data      = FEC_PDATA,
+       .dev = {
+               .dma_mask               = &mcf_fec1.dev.coherent_dma_mask,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
+               .platform_data          = FEC_PDATA,
+       }
 };
 #endif /* MCFFEC_BASE1 */
 #endif /* CONFIG_FEC */