Commit 97782149 authored Jan 20, 2010 by Paul Mundt Committed by Grant Likely Jan 20, 2010

spi: xilinx_spi: Fix up I/O routine wrapping bogosity.

xilinx_spi presently makes some fairly questionable assumptions about I/O
routines, and attempts to assign ioread32/iowrite32 and friends directly
to its own internal function pointers. On many platforms these I/O
routines are macros or wrappers and not actual functions on their own,
resulting in things like:

ERROR: "ioread32be" [drivers/spi/xilinx_spi.ko] undefined!
ERROR: "iowrite32be" [drivers/spi/xilinx_spi.ko] undefined!
ERROR: "iowrite32" [drivers/spi/xilinx_spi.ko] undefined!
ERROR: "ioread32" [drivers/spi/xilinx_spi.ko] undefined!

If xilinx_spi wants to do this sort of casting, it needs to provide its
own wrappers for these, or change how it does accesses completely.

I've opted for the first approach, and the attached silly patch does
that. If someone with the hardware available wants to give the second
option a try that's ok too. In any event, the current code is broken for
at least: arm, avr32, blackfin, microblaze, mn10300, and sh.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Richard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

parent f4d4ecfe

drivers/spi/xilinx_spi.c

+24 −4

Original line number	Diff line number	Diff line
		@@ -93,6 +93,26 @@ struct xilinx_spi {
		void (rx_fn) (struct xilinx_spi );
		};

		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 xspi_tx8(struct xilinx_spi *xspi)
		{
		xspi->write_fn(*xspi->tx_ptr, xspi->regs + XSPI_TXD_OFFSET);
		@@ -374,11 +394,11 @@ struct spi_master xilinx_spi_init(struct device dev, struct resource *mem,
		xspi->mem = *mem;
		xspi->irq = irq;
		if (pdata->little_endian) {
		xspi->read_fn = ioread32;
		xspi->write_fn = iowrite32;
		xspi->read_fn = xspi_read32;
		xspi->write_fn = xspi_write32;
		} else {
		xspi->read_fn = ioread32be;
		xspi->write_fn = iowrite32be;
		xspi->read_fn = xspi_read32_be;
		xspi->write_fn = xspi_write32_be;
		}
		xspi->bits_per_word = pdata->bits_per_word;
		if (xspi->bits_per_word == 8) {

Admin message