Linux 2.6.31 Release for Digi ConnectCore Wi-i.MX boards2.6.31-digi-201102101717

3 files changed, 34 insertions, 10 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index e16915107c6b..736a12ff9045 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -261,6 +261,11 @@ config SPI_STMP3XXX
 	help
 	  SPI driver for Freescale STMP37xx/378x SoC SSP interface
 
+config SPI_MXS
+	tristate "Freescale MXS SPI/SSP controller"
+	depends on ARCH_MXS && SPI_MASTER
+	help
+	  SPI driver for Freescale MXS SoC SSP interface
 #
 # Add new SPI master controllers in alphabetical order above this line
 #
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index b7cfb6245c0b..b6dbdf064181 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_SPI_MXC)			+= mxc_spi.o
 obj-$(CONFIG_SPI_XILINX)		+= xilinx_spi.o
 obj-$(CONFIG_SPI_SH_SCI)		+= spi_sh_sci.o
 obj-$(CONFIG_SPI_STMP3XXX)		+= spi_stmp.o
+obj-$(CONFIG_SPI_MXS)			+= spi_mxs.o
 # 	... add above this line ...
 
 # SPI protocol drivers (device/link on bus)
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index cfe40a4526a7..5f4aa2e90392 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -657,7 +657,7 @@ void mxc_spi_chipselect(struct spi_device *spi, int is_active)
 		if (spi->mode & SPI_CPHA)
 			ctrl_reg |=
 			    spi_ver_def->mode_mask << spi_ver_def->pha_shift;
-		if (!(spi->mode & SPI_CPOL))
+		if (spi->mode & SPI_CPOL)
 			ctrl_reg |=
 			    spi_ver_def->mode_mask << spi_ver_def->
 			    low_pol_shift;
@@ -824,16 +824,23 @@ int mxc_spi_poll_transfer(struct spi_device *spi, struct spi_transfer *t)
 	master_drv_data->transfer.count = t->len;
 	fifo_size = master_drv_data->spi_ver_def->fifo_size;
 
-	count = (t->len > fifo_size) ? fifo_size : t->len;
-	spi_put_tx_data(master_drv_data->base, count, master_drv_data);
+	while (master_drv_data->transfer.count) {
+		count = (master_drv_data->transfer.count > fifo_size) ?
+			fifo_size : master_drv_data->transfer.count;
 
-	while ((((status = __raw_readl(master_drv_data->test_addr)) &
-		 master_drv_data->spi_ver_def->rx_cnt_mask) >> master_drv_data->
-		spi_ver_def->rx_cnt_off) != count);
+		spi_put_tx_data(master_drv_data->base, count, master_drv_data);
 
-	for (i = 0; i < count; i++) {
-		rx_tmp = __raw_readl(master_drv_data->base + MXC_CSPIRXDATA);
-		master_drv_data->transfer.rx_get(master_drv_data, rx_tmp);
+		while ((((status = __raw_readl(master_drv_data->test_addr)) &
+		  	 master_drv_data->spi_ver_def->rx_cnt_mask) >> master_drv_data->
+			spi_ver_def->rx_cnt_off) != count)
+			;
+
+		for (i = 0; i < count; i++) {
+			rx_tmp = __raw_readl(master_drv_data->base + MXC_CSPIRXDATA);
+			master_drv_data->transfer.rx_get(master_drv_data, rx_tmp);
+		}
+
+		master_drv_data->transfer.count -= count;
 	}
 
 	clk_disable(master_drv_data->clk);
@@ -864,8 +871,19 @@ int mxc_spi_transfer(struct spi_device *spi, struct spi_transfer *t)
 	int chipselect_status;
 	u32 fifo_size;
 
+#if defined(CONFIG_MODULE_CCXMX51)
+	/**
+	 * The ConnectCore i.MX51/Wi-i.MX51 use this bus to communicate with
+	 * the pmic, using poll transfers. Because that bus is also used to
+	 * communicate the cpu with other devices, use also poll transfers
+	 * to avoid conflicts.
+	 */
+	if (spi->master->bus_num == 1) {
+		mxc_spi_poll_transfer(spi, t);
+		return t->len;
+	}
+#endif
 	/* Get the master controller driver data from spi device's master */
-
 	master_drv_data = spi_master_get_devdata(spi->master);
 
 	chipselect_status = __raw_readl(MXC_CSPICONFIG +