mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 06:00:43 +00:00
spi: pl022: Rename flush into pl022_spi_flush
Rename the flush function into pl022_spi_flush to avoid conflicting types with previous declaration of the function in stdio.h header. Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
parent
ad77009d22
commit
47c32734a6
1 changed files with 3 additions and 3 deletions
|
@ -107,7 +107,7 @@ static int pl022_spi_probe(struct udevice *bus)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void flush(struct pl022_spi_slave *ps)
|
static void pl022_spi_flush(struct pl022_spi_slave *ps)
|
||||||
{
|
{
|
||||||
do {
|
do {
|
||||||
while (readw(ps->base + SSP_SR) & SSP_SR_MASK_RNE)
|
while (readw(ps->base + SSP_SR) & SSP_SR_MASK_RNE)
|
||||||
|
@ -126,7 +126,7 @@ static int pl022_spi_claim_bus(struct udevice *dev)
|
||||||
reg |= SSP_CR1_MASK_SSE;
|
reg |= SSP_CR1_MASK_SSE;
|
||||||
writew(reg, ps->base + SSP_CR1);
|
writew(reg, ps->base + SSP_CR1);
|
||||||
|
|
||||||
flush(ps);
|
pl022_spi_flush(ps);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -137,7 +137,7 @@ static int pl022_spi_release_bus(struct udevice *dev)
|
||||||
struct pl022_spi_slave *ps = dev_get_priv(bus);
|
struct pl022_spi_slave *ps = dev_get_priv(bus);
|
||||||
u16 reg;
|
u16 reg;
|
||||||
|
|
||||||
flush(ps);
|
pl022_spi_flush(ps);
|
||||||
|
|
||||||
/* Disable the SPI hardware */
|
/* Disable the SPI hardware */
|
||||||
reg = readw(ps->base + SSP_CR1);
|
reg = readw(ps->base + SSP_CR1);
|
||||||
|
|
Loading…
Reference in a new issue