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

Unverified Commit 994bc7fa authored by Manuel Lauss's avatar Manuel Lauss Committed by Paul Burton
Browse files

MIPS: Alchemy: update dma masks for devboard devices 



Fix the DMA masks for sound and mmc devices.

Verified on DB1300 and DB1500.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Linux-MIPS <linux-mips@vger.kernel.org>
parent 7a3097be

arch/mips/alchemy/devboards/db1000.c

+11 −7
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ static int db1500_map_pci_irq(const struct pci_dev *d, u8 slot, u8 pin) 
	return -1;

}



static u64 au1xxx_all_dmamask = DMA_BIT_MASK(32);



static struct resource alchemy_pci_host_res[] = {

	[0] = {

		.start	= AU1500_PCI_PHYS_ADDR,
@@ -120,13 +122,11 @@ static struct resource au1100_lcd_resources[] = { 
	}

};



static u64 au1100_lcd_dmamask = DMA_BIT_MASK(32);



static struct platform_device au1100_lcd_device = {

	.name		= "au1100-lcd",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1100_lcd_dmamask,

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

	.num_resources	= ARRAY_SIZE(au1100_lcd_resources),
@@ -170,6 +170,10 @@ static struct platform_device db1x00_codec_dev = { 


static struct platform_device db1x00_audio_dev = {

	.name		= "db1000-audio",

	.dev = {

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



/******************************************************************************/
@@ -338,13 +342,11 @@ static struct resource au1100_mmc0_resources[] = { 
	}

};



static u64 au1xxx_mmc_dmamask =	 DMA_BIT_MASK(32);



static struct platform_device db1100_mmc0_dev = {

	.name		= "au1xxx-mmc",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1100_mmc_platdata[0],

	},
@@ -379,7 +381,7 @@ static struct platform_device db1100_mmc1_dev = { 
	.name		= "au1xxx-mmc",

	.id		= 1,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1100_mmc_platdata[1],

	},
@@ -416,6 +418,8 @@ static struct platform_device db1100_spi_dev = { 
	.id		= 0,

	.dev		= {

		.platform_data	= &db1100_spictl_pd,

		.dma_mask		= &au1xxx_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};

arch/mips/alchemy/devboards/db1200.c

+11 −13
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ int __init db1200_board_setup(void) 


/******************************************************************************/



static u64 au1200_all_dmamask = DMA_BIT_MASK(32);



static struct mtd_partition db1200_spiflash_parts[] = {

	{

		.name	= "spi_flash",
@@ -324,13 +326,11 @@ static struct resource db1200_ide_res[] = { 
	},

};



static u64 au1200_ide_dmamask = DMA_BIT_MASK(32);



static struct platform_device db1200_ide_dev = {

	.name		= "pata_platform",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1200_ide_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200_ide_info,

	},
@@ -566,13 +566,11 @@ static struct resource au1200_mmc0_resources[] = { 
	}

};



static u64 au1xxx_mmc_dmamask =	 DMA_BIT_MASK(32);



static struct platform_device db1200_mmc0_dev = {

	.name		= "au1xxx-mmc",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200_mmc_platdata[0],

	},
@@ -607,7 +605,7 @@ static struct platform_device pb1200_mmc1_dev = { 
	.name		= "au1xxx-mmc",

	.id		= 1,

	.dev = {

		.dma_mask		= &au1xxx_mmc_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200_mmc_platdata[1],

	},
@@ -657,13 +655,11 @@ static struct resource au1200_lcd_res[] = { 
	}

};



static u64 au1200_lcd_dmamask = DMA_BIT_MASK(32);



static struct platform_device au1200_lcd_dev = {

	.name		= "au1200-lcd",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1200_lcd_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200fb_pd,

	},
@@ -717,11 +713,9 @@ static struct au1550_spi_info db1200_spi_platdata = { 
	.activate_cs	= db1200_spi_cs_en,

};



static u64 spi_dmamask = DMA_BIT_MASK(32);



static struct platform_device db1200_spi_dev = {

	.dev	= {

		.dma_mask		= &spi_dmamask,

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1200_spi_platdata,

	},
@@ -766,6 +760,10 @@ static struct platform_device db1200_audio_dev = { 
static struct platform_device db1200_sound_dev = {

	/* name assigned later based on switch setting */

	.id		= 1,	/* PSC ID */

	.dev = {

		.dma_mask		= &au1200_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



static struct platform_device db1200_stac_dev = {

arch/mips/alchemy/devboards/db1300.c

+19 −4
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ static void __init db1300_gpio_config(void) 


/**********************************************************************/



static u64 au1300_all_dmamask = DMA_BIT_MASK(32);



static void au1300_nand_cmd_ctrl(struct nand_chip *this, int cmd,

				 unsigned int ctrl)

{
@@ -438,6 +440,8 @@ static struct resource db1300_ide_res[] = { 


static struct platform_device db1300_ide_dev = {

	.dev	= {

		.dma_mask		= &au1300_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data	= &db1300_ide_info,

	},

	.name		= "pata_platform",
@@ -560,6 +564,8 @@ static struct resource au1300_sd1_res[] = { 


static struct platform_device db1300_sd1_dev = {

	.dev = {

		.dma_mask		= &au1300_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1300_sd1_platdata,

	},

	.name		= "au1xxx-mmc",
@@ -625,6 +631,8 @@ static struct resource au1300_sd0_res[] = { 


static struct platform_device db1300_sd0_dev = {

	.dev = {

		.dma_mask		= &au1300_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1300_sd0_platdata,

	},

	.name		= "au1xxx-mmc",
@@ -652,10 +660,18 @@ static struct platform_device db1300_i2sdma_dev = { 


static struct platform_device db1300_sndac97_dev = {

	.name		= "db1300-ac97",

	.dev = {

		.dma_mask		= &au1300_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



static struct platform_device db1300_sndi2s_dev = {

	.name		= "db1300-i2s",

	.dev = {

		.dma_mask		= &au1300_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



/**********************************************************************/
@@ -700,13 +716,12 @@ static struct resource au1300_lcd_res[] = { 
	}

};



static u64 au1300_lcd_dmamask = DMA_BIT_MASK(32);



static struct platform_device db1300_lcd_dev = {

	.name		= "au1200-lcd",

	.id		= 0,

	.dev = {

		.dma_mask		= &au1300_lcd_dmamask,

		.dma_mask		= &au1300_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1300fb_pd,

	},

arch/mips/alchemy/devboards/db1550.c

+11 −2
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ int __init db1550_board_setup(void) 


/*****************************************************************************/



static u64 au1550_all_dmamask = DMA_BIT_MASK(32);



static struct mtd_partition db1550_spiflash_parts[] = {

	{

		.name	= "spi_flash",
@@ -269,11 +271,10 @@ static struct au1550_spi_info db1550_spi_platdata = { 
	.activate_cs	= db1550_spi_cs_en,

};



static u64 spi_dmamask = DMA_BIT_MASK(32);



static struct platform_device db1550_spi_dev = {

	.dev	= {

		.dma_mask		= &spi_dmamask,

		.dma_mask		= &au1550_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= &db1550_spi_platdata,

	},
@@ -397,10 +398,18 @@ static struct platform_device db1550_i2sdma_dev = { 


static struct platform_device db1550_sndac97_dev = {

	.name		= "db1550-ac97",

	.dev = {

		.dma_mask		= &au1550_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



static struct platform_device db1550_sndi2s_dev = {

	.name		= "db1550-i2s",

	.dev = {

		.dma_mask		= &au1550_all_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};



/**********************************************************************/