From: Simon Glass Date: Fri, 22 Jan 2016 02:44:04 +0000 (-0700) Subject: rockchip: spi: Correct the bus init code X-Git-Tag: v2016.03-rc1~196 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2b9fe111ec47750d9d7912246d983a7f9e096df6;p=u-boot 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 --- 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;