summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-21 19:44:04 -0700
committerSimon Glass <sjg@chromium.org>2016-01-21 20:42:35 -0700
commit2b9fe111ec47750d9d7912246d983a7f9e096df6 (patch)
treebaae00f09b93e4f948904c9f2c6b9106da38b052 /drivers/spi
parent28a943c11018f7e2946f3a529de87102f268cedb (diff)
downloadblackbird-obmc-uboot-2b9fe111ec47750d9d7912246d983a7f9e096df6.tar.gz
blackbird-obmc-uboot-2b9fe111ec47750d9d7912246d983a7f9e096df6.zip
rockchip: spi: Correct the bus init code
Two of the init values are created locally so cannot be out of range. The masking is unnecessary and in one case is incorrect. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/rk_spi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c
index aaf139d823..3418f9b080 100644
--- a/drivers/spi/rk_spi.c
+++ b/drivers/spi/rk_spi.c
@@ -221,7 +221,7 @@ static int rockchip_spi_claim_bus(struct udevice *dev)
ctrlr0 = OMOD_MASTER << OMOD_SHIFT;
/* Data Frame Size */
- ctrlr0 |= spi_dfs & DFS_MASK << DFS_SHIFT;
+ ctrlr0 |= spi_dfs << DFS_SHIFT;
/* set SPI mode 0..3 */
if (priv->mode & SPI_CPOL)
@@ -242,7 +242,7 @@ static int rockchip_spi_claim_bus(struct udevice *dev)
ctrlr0 |= FBM_MSB << FBM_SHIFT;
/* Byte and Halfword Transform */
- ctrlr0 |= (spi_tf & HALF_WORD_MASK) << HALF_WORD_TX_SHIFT;
+ ctrlr0 |= spi_tf << HALF_WORD_TX_SHIFT;
/* Rxd Sample Delay */
ctrlr0 |= 0 << RXDSD_SHIFT;
OpenPOWER on IntegriCloud