aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrent Piepho <tpiepho@gmail.com>2013-10-01 16:15:54 -0400
committerMark Brown <broonie@linaro.org>2013-10-17 20:00:32 -0400
commit42e182f86222dee2679c19fb1ab5006354a3be62 (patch)
tree19641abd0c81ef18b35e1b45278894985f5669ab
parenta560943ead2cbded93c30c9b04886f3c743d7f00 (diff)
spi: spi-mxs: Use u32 instead of uint32_t
It's consistent with all the other spi drivers that way. Signed-off-by: Trent 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: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-mxs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 759de701f050..2a819f7b0241 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -119,9 +119,9 @@ static int mxs_spi_setup(struct spi_device *dev)
119 return 0; 119 return 0;
120} 120}
121 121
122static uint32_t mxs_spi_cs_to_reg(unsigned cs) 122static u32 mxs_spi_cs_to_reg(unsigned cs)
123{ 123{
124 uint32_t select = 0; 124 u32 select = 0;
125 125
126 /* 126 /*
127 * i.MX28 Datasheet: 17.10.1: HW_SSP_CTRL0 127 * 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)
143{ 143{
144 const unsigned long timeout = jiffies + msecs_to_jiffies(SSP_TIMEOUT); 144 const unsigned long timeout = jiffies + msecs_to_jiffies(SSP_TIMEOUT);
145 struct mxs_ssp *ssp = &spi->ssp; 145 struct mxs_ssp *ssp = &spi->ssp;
146 uint32_t reg; 146 u32 reg;
147 147
148 do { 148 do {
149 reg = readl_relaxed(ssp->base + offset); 149 reg = readl_relaxed(ssp->base + offset);
@@ -187,11 +187,11 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi,
187 const int sgs = DIV_ROUND_UP(len, desc_len); 187 const int sgs = DIV_ROUND_UP(len, desc_len);
188 int sg_count; 188 int sg_count;
189 int min, ret; 189 int min, ret;
190 uint32_t ctrl0; 190 u32 ctrl0;
191 struct page *vm_page; 191 struct page *vm_page;
192 void *sg_buf; 192 void *sg_buf;
193 struct { 193 struct {
194 uint32_t pio[4]; 194 u32 pio[4];
195 struct scatterlist sg; 195 struct scatterlist sg;
196 } *dma_xfer; 196 } *dma_xfer;
197 197