diff options
| -rw-r--r-- | drivers/spi/spi-cadence.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c index 07481e12d8a3..8a0bd62a5088 100644 --- a/drivers/spi/spi-cadence.c +++ b/drivers/spi/spi-cadence.c | |||
| @@ -209,7 +209,8 @@ static void cdns_spi_config_clock_mode(struct spi_device *spi) | |||
| 209 | struct cdns_spi *xspi = spi_master_get_devdata(spi->master); | 209 | struct cdns_spi *xspi = spi_master_get_devdata(spi->master); |
| 210 | u32 ctrl_reg, new_ctrl_reg; | 210 | u32 ctrl_reg, new_ctrl_reg; |
| 211 | 211 | ||
| 212 | new_ctrl_reg = ctrl_reg = cdns_spi_read(xspi, CDNS_SPI_CR); | 212 | new_ctrl_reg = cdns_spi_read(xspi, CDNS_SPI_CR); |
| 213 | ctrl_reg = new_ctrl_reg; | ||
| 213 | 214 | ||
| 214 | /* Set the SPI clock phase and clock polarity */ | 215 | /* Set the SPI clock phase and clock polarity */ |
| 215 | new_ctrl_reg &= ~(CDNS_SPI_CR_CPHA | CDNS_SPI_CR_CPOL); | 216 | new_ctrl_reg &= ~(CDNS_SPI_CR_CPHA | CDNS_SPI_CR_CPOL); |
| @@ -246,7 +247,7 @@ static void cdns_spi_config_clock_mode(struct spi_device *spi) | |||
| 246 | * controller. | 247 | * controller. |
| 247 | */ | 248 | */ |
| 248 | static void cdns_spi_config_clock_freq(struct spi_device *spi, | 249 | static void cdns_spi_config_clock_freq(struct spi_device *spi, |
| 249 | struct spi_transfer *transfer) | 250 | struct spi_transfer *transfer) |
| 250 | { | 251 | { |
| 251 | struct cdns_spi *xspi = spi_master_get_devdata(spi->master); | 252 | struct cdns_spi *xspi = spi_master_get_devdata(spi->master); |
| 252 | u32 ctrl_reg, baud_rate_val; | 253 | u32 ctrl_reg, baud_rate_val; |
| @@ -380,6 +381,7 @@ static irqreturn_t cdns_spi_irq(int irq, void *dev_id) | |||
| 380 | 381 | ||
| 381 | return status; | 382 | return status; |
| 382 | } | 383 | } |
| 384 | |||
| 383 | static int cdns_prepare_message(struct spi_master *master, | 385 | static int cdns_prepare_message(struct spi_master *master, |
| 384 | struct spi_message *msg) | 386 | struct spi_message *msg) |
| 385 | { | 387 | { |
