spi: xilinx_spi: Fix to configure CPOL, CPHA mask
Subsystems (2)
PATCH 1/3 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.
--- drivers/spi/xilinx_spi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/spi/xilinx_spi.c +5 -5
@@ -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 (®s->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, ®s->spicr);
Signature · 1 line
1.9.1
PATCH 2/3 spi: zynq_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.
--- drivers/spi/zynq_spi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/spi/zynq_spi.c +4 -3
@@ -278,7 +278,8 @@ static int zynq_spi_set_speed(struct udevice *bus, uint speed)writel (confr, ®s->cr); priv->freq = speed; -debug ("zynq_spi_set_speed: regs=%p, mode=%d\n" , priv->regs, priv->freq); +debug ("zynq_spi_set_speed: regs=%p, speed=%d\n" , + priv->regs, priv->freq);return 0 ; }
@@ -293,9 +294,9 @@ static int zynq_spi_set_mode(struct udevice *bus, uint mode) confr =readl (®s->cr); confr &= ~(ZYNQ_SPI_CR_CPHA_MASK |ZYNQ_SPI_CR_CPOL_MASK ); -if (priv->mode &SPI_CPHA ) +if (mode &SPI_CPHA ) confr |=ZYNQ_SPI_CR_CPHA_MASK ; -if (priv->mode &SPI_CPOL ) +if (mode &SPI_CPOL ) confr |=ZYNQ_SPI_CR_CPOL_MASK ;writel (confr, ®s->cr);
Signature · 1 line
1.9.1
PATCH 3/3 spi: zynq_qspi: Fix to configure CPOL, CPHA mask
In reply to Jagan Tekipriv->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.
--- drivers/spi/zynq_qspi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/spi/zynq_qspi.c +4 -3
@@ -569,7 +569,8 @@ static int zynq_qspi_set_speed(struct udevice *bus, uint speed)writel (confr, ®s->cr); priv->freq = speed; -debug ("zynq_spi_set_speed: regs=%p, mode=%d\n" , priv->regs, priv->freq); +debug ("zynq_spi_set_speed: regs=%p, speed=%d\n" , + priv->regs, priv->freq);return 0 ; }
@@ -584,9 +585,9 @@ static int zynq_qspi_set_mode(struct udevice *bus, uint mode) confr =readl (®s->cr); confr &= ~(ZYNQ_QSPI_CR_CPHA_MASK |ZYNQ_QSPI_CR_CPOL_MASK ); -if (priv->mode &SPI_CPHA ) +if (mode &SPI_CPHA ) confr |=ZYNQ_QSPI_CR_CPHA_MASK ; -if (priv->mode &SPI_CPOL ) +if (mode &SPI_CPOL ) confr |=ZYNQ_QSPI_CR_CPOL_MASK ;writel (confr, ®s->cr);
Signature · 1 line
1.9.1