Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2025fef0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

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
parents 5148408a f61e6431

arch/m68k/coldfire/device.c

+10 −2
Original line number Diff line number Diff line
@@ -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 */