[PATCH] fix 2.6.25-rc2 compilation with CONFIG_SPI_MPC52xx_PSC

[EricDuj]

Hi all,

I am trying to cross compile the vanilla 2.6.25-rc2 kernel with the Denx 4.1
toolchain (gcc-4.0.0 based).
The build fails with the following error when CONFIG_SPI_MPC52xx_PSC is set:

  CC      drivers/spi/spi.o
  LD      drivers/spi/built-in.o
  CC [M]  drivers/spi/mpc52xx_psc_spi.o
drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_transfer_rxtx':
drivers/spi/mpc52xx_psc_spi.c:193: error: 'struct mpc52xx_psc' has no member
named 'rfalarm'
drivers/spi/mpc52xx_psc_spi.c:197: error: 'struct mpc52xx_psc' has no member
named 'rfnum'
drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_port_config':
drivers/spi/mpc52xx_psc_spi.c:349: error: 'struct mpc52xx_psc' has no member
named 'rfcntl'
make[2]: *** [drivers/spi/mpc52xx_psc_spi.o] Erreur 1
make[1]: *** [drivers/spi] Erreur 2
make: *** [drivers] Erreur 2

 
A quick look at the code shows  a mismatch between mpc52xx_psc.c and
mpc52xx_psc_spi.c.
Assuming mpc52xx_psc.c is right, here's my take at a patch (not tested on
real hardware, 
needs review !). At least it fixes the build.

Thanks for your attention,

Eric

===============================================================
--- drivers/spi/mpc52xx_psc_spi.c.orig	2008-02-19 13:47:54.000000000 +0100
+++ drivers/spi/mpc52xx_psc_spi.c	2008-02-19 13:47:58.000000000 +0100
@@ -134,11 +134,15 @@
 /* wake up when 80% fifo full */
 #define MPC52xx_PSC_RFALARM (MPC52xx_PSC_BUFSIZE * 20 / 100)
 
+#define FIFO_52xx_PSC(psc) ((struct mpc52xx_psc_fifo __iomem *)(psc+1))
+
 static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
 						struct spi_transfer *t)
 {
 	struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
 	struct mpc52xx_psc __iomem *psc = mps->psc;
+	struct mpc52xx_psc_fifo __iomem *fifo = FIFO_52xx_PSC(psc);
+
 	unsigned rb = 0;	/* number of bytes receieved */
 	unsigned sb = 0;	/* number of bytes sent */
 	unsigned char *rx_buf = (unsigned char *)t->rx_buf;
@@ -190,11 +194,11 @@
 			out_8(&psc->mode, 0);
 		} else {
 			out_8(&psc->mode, MPC52xx_PSC_MODE_FFULL);
-			out_be16(&psc->rfalarm, rfalarm);
+			out_be16(&fifo->rfalarm, rfalarm);
 		}
 		out_be16(&psc->mpc52xx_psc_imr, MPC52xx_PSC_IMR_RXRDY);
 		wait_for_completion(&mps->done);
-		recv_at_once = in_be16(&psc->rfnum);
+		recv_at_once = in_be16(&fifo->rfnum);
 		dev_dbg(&spi->dev, "%d bytes received\n", recv_at_once);
 
 		send_at_once = recv_at_once;
@@ -331,6 +335,8 @@
 static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi
*mps)
 {
 	struct mpc52xx_psc __iomem *psc = mps->psc;
+	struct mpc52xx_psc_fifo __iomem *fifo = FIFO_52xx_PSC(psc);
+
 	u32 mclken_div;
 	int ret = 0;
 
@@ -346,7 +352,7 @@
 	/* Disable interrupts, interrupts are based on alarm level */
 	out_be16(&psc->mpc52xx_psc_imr, 0);
 	out_8(&psc->command, MPC52xx_PSC_SEL_MODE_REG_1);
-	out_8(&psc->rfcntl, 0);
+	out_8(&fifo->rfcntl, 0);
 	out_8(&psc->mode, MPC52xx_PSC_MODE_FFULL);
 
 	/* Configure 8bit codec mode as a SPI master and use EOF flags */

---------------------------------------------

-- 
View this message in context: http://www.nabble.com/-PATCH--fix-2.6.25-rc2-compilation-with-CONFIG_SPI_MPC52xx_PSC-tp15560559p15560559.html
Sent from the linuxppc-dev mailing list archive at Nabble.com.