a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: Revert "spi/xilinx: Remove iowrite/ioread wrappers"

Browse Source 
This reverts commit 99082eab63 since it
breaks the build due to differing implementations of iowrite() and
ioread().

Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mark Brown 2015-01-30 13:42:00 +01:00
parent eb25f16c6f
commit 0635287a30
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/spi/spi-xilinx.c
View File

@ -95,6 +95,26 @@ struct xilinx_spi {
void (*write_fn)(u32, void __iomem *); void (*write_fn)(u32, void __iomem *);
}; };
static void xspi_write32(u32 val, void __iomem *addr)
{
iowrite32(val, addr);
}
static unsigned int xspi_read32(void __iomem *addr)
{
return ioread32(addr);
}
static void xspi_write32_be(u32 val, void __iomem *addr)
{
iowrite32be(val, addr);
}
static unsigned int xspi_read32_be(void __iomem *addr)
{
return ioread32be(addr);
}
static void xilinx_spi_tx(struct xilinx_spi *xspi) static void xilinx_spi_tx(struct xilinx_spi *xspi)
{ {
if (!xspi->tx_ptr) { if (!xspi->tx_ptr) {
@ -388,15 +408,15 @@ static int xilinx_spi_probe(struct platform_device *pdev)
* Setup little endian helper functions first and try to use them * Setup little endian helper functions first and try to use them
* and check if bit was correctly setup or not. * and check if bit was correctly setup or not.
*/ */
xspi->read_fn = ioread32; xspi->read_fn = xspi_read32;
xspi->write_fn = iowrite32; xspi->write_fn = xspi_write32;
xspi->write_fn(XSPI_CR_LOOP, xspi->regs + XSPI_CR_OFFSET); xspi->write_fn(XSPI_CR_LOOP, xspi->regs + XSPI_CR_OFFSET);
tmp = xspi->read_fn(xspi->regs + XSPI_CR_OFFSET); tmp = xspi->read_fn(xspi->regs + XSPI_CR_OFFSET);
tmp &= XSPI_CR_LOOP; tmp &= XSPI_CR_LOOP;
if (tmp != XSPI_CR_LOOP) { if (tmp != XSPI_CR_LOOP) {
xspi->read_fn = ioread32be; xspi->read_fn = xspi_read32_be;
xspi->write_fn = iowrite32be; xspi->write_fn = xspi_write32_be;
} }
master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word); master->bits_per_word_mask = SPI_BPW_MASK(bits_per_word);