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

Commit 42e182f8 authored by Trent Piepho's avatar Trent Piepho Committed by Mark Brown
Browse files

spi: spi-mxs: Use u32 instead of uint32_t 



It's consistent with all the other spi drivers that way.

Signed-off-by: default avatarTrent Piepho <tpiepho@gmail.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a560943e

drivers/spi/spi-mxs.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -119,9 +119,9 @@ static int mxs_spi_setup(struct spi_device *dev) 
	return 0;

	return 0;

}

}





static uint32_t mxs_spi_cs_to_reg(unsigned cs)

static u32 mxs_spi_cs_to_reg(unsigned cs)

{

{

	uint32_t select = 0;

	u32 select = 0;





	/*

	/*

	 * i.MX28 Datasheet: 17.10.1: HW_SSP_CTRL0

	 * i.MX28 Datasheet: 17.10.1: HW_SSP_CTRL0
@@ -143,7 +143,7 @@ static int mxs_ssp_wait(struct mxs_spi *spi, int offset, int mask, bool set) 
{

{

	const unsigned long timeout = jiffies + msecs_to_jiffies(SSP_TIMEOUT);

	const unsigned long timeout = jiffies + msecs_to_jiffies(SSP_TIMEOUT);

	struct mxs_ssp *ssp = &spi->ssp;

	struct mxs_ssp *ssp = &spi->ssp;

	uint32_t reg;

	u32 reg;





	do {

	do {

		reg = readl_relaxed(ssp->base + offset);

		reg = readl_relaxed(ssp->base + offset);
@@ -187,11 +187,11 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, 
	const int sgs = DIV_ROUND_UP(len, desc_len);

	const int sgs = DIV_ROUND_UP(len, desc_len);

	int sg_count;

	int sg_count;

	int min, ret;

	int min, ret;

	uint32_t ctrl0;

	u32 ctrl0;

	struct page *vm_page;

	struct page *vm_page;

	void *sg_buf;

	void *sg_buf;

	struct {

	struct {

		uint32_t		pio[4];

		u32			pio[4];

		struct scatterlist	sg;

		struct scatterlist	sg;

	} *dma_xfer;

	} *dma_xfer;