diff options
author | Leilk Liu <leilk.liu@mediatek.com> | 2015-08-23 23:45:16 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-25 13:48:23 -0400 |
commit | 50f8fec2162db918540d0845481f3f6fffc5b033 (patch) | |
tree | 762993c24bd0569394150d7a12bad01e408bed60 /drivers/spi/spi-mt65xx.c | |
parent | dd69a0a69c9ee3e09da7f3771c1aa420e49464ce (diff) |
spi: mediatek: replace int with u32, delete TAB and define MTK_SPI_PAUSE_INT_STATUS marco
this patch replaces int with u32, deletes TAB, and defines
MTK_SPI_PAUSE_INT_STATUS marco.
Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-mt65xx.c')
-rw-r--r-- | drivers/spi/spi-mt65xx.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c index 46d14772c0cc..81b75b94145c 100644 --- a/drivers/spi/spi-mt65xx.c +++ b/drivers/spi/spi-mt65xx.c | |||
@@ -67,6 +67,8 @@ | |||
67 | 67 | ||
68 | #define MT8173_SPI_MAX_PAD_SEL 3 | 68 | #define MT8173_SPI_MAX_PAD_SEL 3 |
69 | 69 | ||
70 | #define MTK_SPI_PAUSE_INT_STATUS 0x2 | ||
71 | |||
70 | #define MTK_SPI_IDLE 0 | 72 | #define MTK_SPI_IDLE 0 |
71 | #define MTK_SPI_PAUSED 1 | 73 | #define MTK_SPI_PAUSED 1 |
72 | 74 | ||
@@ -179,7 +181,7 @@ static int mtk_spi_prepare_hardware(struct spi_master *master) | |||
179 | 181 | ||
180 | trans = list_first_entry(&msg->transfers, struct spi_transfer, | 182 | trans = list_first_entry(&msg->transfers, struct spi_transfer, |
181 | transfer_list); | 183 | transfer_list); |
182 | if (trans->cs_change == 0) { | 184 | if (!trans->cs_change) { |
183 | mdata->state = MTK_SPI_IDLE; | 185 | mdata->state = MTK_SPI_IDLE; |
184 | mtk_spi_reset(mdata); | 186 | mtk_spi_reset(mdata); |
185 | } | 187 | } |
@@ -269,11 +271,11 @@ static void mtk_spi_setup_packet(struct spi_master *master) | |||
269 | u32 packet_size, packet_loop, reg_val; | 271 | u32 packet_size, packet_loop, reg_val; |
270 | struct mtk_spi *mdata = spi_master_get_devdata(master); | 272 | struct mtk_spi *mdata = spi_master_get_devdata(master); |
271 | 273 | ||
272 | packet_size = min_t(unsigned, mdata->xfer_len, MTK_SPI_PACKET_SIZE); | 274 | packet_size = min_t(u32, mdata->xfer_len, MTK_SPI_PACKET_SIZE); |
273 | packet_loop = mdata->xfer_len / packet_size; | 275 | packet_loop = mdata->xfer_len / packet_size; |
274 | 276 | ||
275 | reg_val = readl(mdata->base + SPI_CFG1_REG); | 277 | reg_val = readl(mdata->base + SPI_CFG1_REG); |
276 | reg_val &= ~(SPI_CFG1_PACKET_LENGTH_MASK + SPI_CFG1_PACKET_LOOP_MASK); | 278 | reg_val &= ~(SPI_CFG1_PACKET_LENGTH_MASK | SPI_CFG1_PACKET_LOOP_MASK); |
277 | reg_val |= (packet_size - 1) << SPI_CFG1_PACKET_LENGTH_OFFSET; | 279 | reg_val |= (packet_size - 1) << SPI_CFG1_PACKET_LENGTH_OFFSET; |
278 | reg_val |= (packet_loop - 1) << SPI_CFG1_PACKET_LOOP_OFFSET; | 280 | reg_val |= (packet_loop - 1) << SPI_CFG1_PACKET_LOOP_OFFSET; |
279 | writel(reg_val, mdata->base + SPI_CFG1_REG); | 281 | writel(reg_val, mdata->base + SPI_CFG1_REG); |
@@ -281,7 +283,7 @@ static void mtk_spi_setup_packet(struct spi_master *master) | |||
281 | 283 | ||
282 | static void mtk_spi_enable_transfer(struct spi_master *master) | 284 | static void mtk_spi_enable_transfer(struct spi_master *master) |
283 | { | 285 | { |
284 | int cmd; | 286 | u32 cmd; |
285 | struct mtk_spi *mdata = spi_master_get_devdata(master); | 287 | struct mtk_spi *mdata = spi_master_get_devdata(master); |
286 | 288 | ||
287 | cmd = readl(mdata->base + SPI_CMD_REG); | 289 | cmd = readl(mdata->base + SPI_CMD_REG); |
@@ -292,9 +294,9 @@ static void mtk_spi_enable_transfer(struct spi_master *master) | |||
292 | writel(cmd, mdata->base + SPI_CMD_REG); | 294 | writel(cmd, mdata->base + SPI_CMD_REG); |
293 | } | 295 | } |
294 | 296 | ||
295 | static int mtk_spi_get_mult_delta(int xfer_len) | 297 | static int mtk_spi_get_mult_delta(u32 xfer_len) |
296 | { | 298 | { |
297 | int mult_delta; | 299 | u32 mult_delta; |
298 | 300 | ||
299 | if (xfer_len > MTK_SPI_PACKET_SIZE) | 301 | if (xfer_len > MTK_SPI_PACKET_SIZE) |
300 | mult_delta = xfer_len % MTK_SPI_PACKET_SIZE; | 302 | mult_delta = xfer_len % MTK_SPI_PACKET_SIZE; |
@@ -435,7 +437,7 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id) | |||
435 | struct spi_transfer *trans = mdata->cur_transfer; | 437 | struct spi_transfer *trans = mdata->cur_transfer; |
436 | 438 | ||
437 | reg_val = readl(mdata->base + SPI_STATUS0_REG); | 439 | reg_val = readl(mdata->base + SPI_STATUS0_REG); |
438 | if (reg_val & 0x2) | 440 | if (reg_val & MTK_SPI_PAUSE_INT_STATUS) |
439 | mdata->state = MTK_SPI_PAUSED; | 441 | mdata->state = MTK_SPI_PAUSED; |
440 | else | 442 | else |
441 | mdata->state = MTK_SPI_IDLE; | 443 | mdata->state = MTK_SPI_IDLE; |
@@ -498,7 +500,7 @@ static int mtk_spi_probe(struct platform_device *pdev) | |||
498 | struct mtk_spi *mdata; | 500 | struct mtk_spi *mdata; |
499 | const struct of_device_id *of_id; | 501 | const struct of_device_id *of_id; |
500 | struct resource *res; | 502 | struct resource *res; |
501 | int irq, ret; | 503 | int irq, ret; |
502 | 504 | ||
503 | master = spi_alloc_master(&pdev->dev, sizeof(*mdata)); | 505 | master = spi_alloc_master(&pdev->dev, sizeof(*mdata)); |
504 | if (!master) { | 506 | if (!master) { |