diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-22 11:36:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-22 11:36:23 -0400 |
| commit | 58c8c0963b1c720802c46ac4288c897e5f9cd296 (patch) | |
| tree | 08458bac1c2339713a4e0721ff857bcf123aecd6 /drivers/spi | |
| parent | a6c1309782e7a4a6b18e9514ca927487b5727232 (diff) | |
| parent | e0027f089bb64f6b84742c580f966bf9c97c900e (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/zynq_spi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index 09ae1be7e9..7a176a2cd6 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -92,7 +92,8 @@ static void zynq_spi_init_hw(struct zynq_spi_priv *priv) u32 confr; /* Disable SPI */ - writel(~ZYNQ_SPI_ENR_SPI_EN_MASK, ®s->enr); + confr = ZYNQ_SPI_ENR_SPI_EN_MASK; + writel(~confr, ®s->enr); /* Disable Interrupts */ writel(ZYNQ_SPI_IXR_ALL_MASK, ®s->idr); @@ -173,8 +174,10 @@ static int zynq_spi_release_bus(struct udevice *dev) struct udevice *bus = dev->parent; struct zynq_spi_priv *priv = dev_get_priv(bus); struct zynq_spi_regs *regs = priv->regs; + u32 confr; - writel(~ZYNQ_SPI_ENR_SPI_EN_MASK, ®s->enr); + confr = ZYNQ_SPI_ENR_SPI_EN_MASK; + writel(~confr, ®s->enr); return 0; } |