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

Commit 3d348aaf authored by Sudhakar Rajashekhara's avatar Sudhakar Rajashekhara Committed by Linus Torvalds
Browse files

mmc: davinci: modify data types of EDMA related variables 



Currently DaVinci EDMA driver supports multiple EDMA channel controller
instances.  edma_alloc_channel() api returns a 32 bit value which has the
channel controller number in MSB and the EDMA channel number in LSB.  The
variables which store the value returned by edma_alloc_channel() have to
be 32 bit wide now.

Signed-off-by: default avatarSudhakar Rajashekhara <sudhakar.raj@ti.com>
Acked-by: default avatarVipin Bhandari <vipin.bhandari@ti.com>
Cc: Purshotam Kumar <purushotam@ti.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4cff454

drivers/mmc/host/davinci_mmc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -178,7 +178,7 @@ struct mmc_davinci_host { 
	u32 buffer_bytes_left;

	u32 buffer_bytes_left;

	u32 bytes_left;

	u32 bytes_left;





	u8 rxdma, txdma;

	u32 rxdma, txdma;

	bool use_dma;

	bool use_dma;

	bool do_dma;

	bool do_dma;
@@ -190,7 +190,7 @@ struct mmc_davinci_host { 
	struct edmacc_param	tx_template;

	struct edmacc_param	tx_template;

	struct edmacc_param	rx_template;

	struct edmacc_param	rx_template;

	unsigned		n_link;

	unsigned		n_link;

	u8			links[NR_SG - 1];

	u32			links[NR_SG - 1];





	/* For PIO we walk scatterlists one segment at a time. */

	/* For PIO we walk scatterlists one segment at a time. */

	unsigned int		sg_len;

	unsigned int		sg_len;