summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJagan Teki <jteki@openedev.com>2015-09-08 01:26:29 +0530
committerJagan Teki <jteki@openedev.com>2015-10-11 16:43:06 +0530
commitd5f60737dbaac82f3f7d49eb03ece443beb70fc8 (patch)
tree8cab7159ce8941f3c35b38fbf16277d1f20c8232
parent9a4c6e9abf5261f565cfbf1e80c6e17d26ad0b1e (diff)
downloadtalos-obmc-uboot-d5f60737dbaac82f3f7d49eb03ece443beb70fc8.tar.gz
talos-obmc-uboot-d5f60737dbaac82f3f7d49eb03ece443beb70fc8.zip
spi: xilinx_spi: Fix to configure CPOL, CPHA mask
priv->mode is initialized when .set_speed triggers with mode value, so checking mode for configuring CPOL, CPHA using priv->mode is invalid hence use mode from .set_speed argument, and at the end priv->mode will initialized with mode. This patch also replaces formatting string to use speed instead of mode in .set_speed ops. Signed-off-by: Jagan Teki <jteki@openedev.com>
-rw-r--r--drivers/spi/xilinx_spi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 6c21acda57..8ccc5780c9 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -247,7 +247,7 @@ static int xilinx_spi_set_speed(struct udevice *bus, uint speed)
priv->freq = speed;
- debug("xilinx_spi_set_speed: regs=%p, mode=%d\n", priv->regs,
+ debug("xilinx_spi_set_speed: regs=%p, speed=%d\n", priv->regs,
priv->freq);
return 0;
@@ -260,13 +260,13 @@ static int xilinx_spi_set_mode(struct udevice *bus, uint mode)
uint32_t spicr;
spicr = readl(&regs->spicr);
- if (priv->mode & SPI_LSB_FIRST)
+ if (mode & SPI_LSB_FIRST)
spicr |= SPICR_LSB_FIRST;
- if (priv->mode & SPI_CPHA)
+ if (mode & SPI_CPHA)
spicr |= SPICR_CPHA;
- if (priv->mode & SPI_CPOL)
+ if (mode & SPI_CPOL)
spicr |= SPICR_CPOL;
- if (priv->mode & SPI_LOOP)
+ if (mode & SPI_LOOP)
spicr |= SPICR_LOOP;
writel(spicr, &regs->spicr);
OpenPOWER on IntegriCloud