ENGR00118576 MX25: Support Smc911x ethernet

1. Add imx cspi support for cpld access.
2. Add smc911x ethernet support from cpld.

Signed-off-by: Sammy He <r62914@freescale.com>

8 files changed, 387 insertions, 6 deletions

diff --git a/drivers/mtd/spi/imx_spi_nor_atmel.c b/drivers/mtd/spi/imx_spi_nor_atmel.c
index 24d446a..b6180a5 100644
--- a/drivers/mtd/spi/imx_spi_nor_atmel.c
+++ b/drivers/mtd/spi/imx_spi_nor_atmel.c
@@ -28,7 +28,7 @@
 #include <linux/types.h>
 #include <malloc.h>
 
-#include <asm/arch/imx_spi.h>
+#include <imx_spi.h>
 #include <asm/arch/imx_spi_nor.h>
 
 static u8 g_tx_buf[256];
diff --git a/drivers/mtd/spi/imx_spi_nor_sst.c b/drivers/mtd/spi/imx_spi_nor_sst.c
index bd10ca4..2d2b4a0 100644
--- a/drivers/mtd/spi/imx_spi_nor_sst.c
+++ b/drivers/mtd/spi/imx_spi_nor_sst.c
@@ -28,7 +28,7 @@
 #include <linux/types.h>
 #include <malloc.h>
 
-#include <asm/arch/imx_spi.h>
+#include <imx_spi.h>
 #include <asm/arch/imx_spi_nor.h>
 
 static u8 g_tx_buf[256];
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 05e007c..02c33b3 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -30,7 +30,8 @@
 #define DRIVERNAME "smc911x"
 
 #if defined (CONFIG_SMC911X_32_BIT) && \
-	defined (CONFIG_SMC911X_16_BIT)
+	defined (CONFIG_SMC911X_16_BIT) && \
+	defined(CONFIG_SMC911X_CPLD)
 #error "SMC911X: Only one of CONFIG_SMC911X_32_BIT and \
 	CONFIG_SMC911X_16_BIT shall be set"
 #endif
@@ -62,6 +63,19 @@ static inline void smc911x_reg_write(struct eth_device *dev,
 	*(volatile u16 *)(dev->iobase + offset) = (u16)val;
 	*(volatile u16 *)(dev->iobase + offset + 2) = (u16)(val >> 16);
 }
+#elif defined(CONFIG_SMC911X_CPLD)
+#include <asm/arch/imx_spi_cpld.h>
+static inline u32 smc911x_reg_read(struct eth_device *dev, u32 offset)
+{
+	return cpld_reg_xfer(offset, 0x0, 1) | \
+		(cpld_reg_xfer(offset + 0x2, 0x0, 1) << 16);
+}
+static void smc911x_reg_write(struct eth_device *dev,
+			u32 offset, u32 val)
+{
+	cpld_reg_xfer(offset, val, 0);
+	cpld_reg_xfer(offset + 0x2, (val >> 16), 0);
+}
 #else
 #error "SMC911X: undefined bus width"
 #endif /* CONFIG_SMC911X_16_BIT */
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 0e8bf26..d8a1675 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -34,8 +34,10 @@ COBJS-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o
 COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
 COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o
 COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o
-COBJS-$(CONFIG_IMX_SPI) += imx_spi.o
+COBJS-$(CONFIG_IMX_ECSPI) += imx_ecspi.o
+COBJS-$(CONFIG_IMX_CSPI) += imx_cspi.o
 COBJS-$(CONFIG_IMX_SPI_PMIC) += imx_spi_pmic.o
+COBJS-$(CONFIG_IMX_SPI_CPLD) += imx_spi_cpld.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
diff --git a/drivers/spi/imx_cspi.c b/drivers/spi/imx_cspi.c
new file mode 100644
index 0000000..51238eb
--- /dev/null
+++ b/drivers/spi/imx_cspi.c
@@ -0,0 +1,275 @@
+/*
+ * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <config.h>
+#include <common.h>
+#include <spi.h>
+#include <asm/errno.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include <malloc.h>
+
+#include <imx_spi.h>
+
+static inline struct imx_spi_dev_t *to_imx_spi_slave(struct spi_slave *slave)
+{
+	return container_of(slave, struct imx_spi_dev_t, slave);
+}
+
+static s32 spi_get_cfg(struct imx_spi_dev_t *dev)
+{
+	switch (dev->slave.cs) {
+	case 0:
+		/* cpld */
+		dev->base = CSPI1_BASE;
+		dev->freq = 25000000;
+		dev->ss_pol = IMX_SPI_ACTIVE_LOW;
+		dev->ss = 0;
+		dev->fifo_sz = 32;
+		dev->us_delay = 0;
+		break;
+	default:
+		printf("Invalid Bus ID! \n");
+		break;
+	}
+
+	return 0;
+}
+
+static s32 spi_reset(struct spi_slave *slave)
+{
+	u32 clk_src = mxc_get_clock(MXC_CSPI_CLK);
+	s32 div = 0, i, reg_ctrl;
+	struct imx_spi_dev_t *dev = to_imx_spi_slave(slave);
+	struct spi_reg_t *reg = &(dev->reg);
+	int lim = 0;
+	unsigned int baud_rate_div[] = { 4, 8, 16, 32, 64, 128, 256, 512 };
+
+	if (dev->freq == 0) {
+		printf("Error: desired clock is 0\n");
+		return 1;
+	}
+
+	reg_ctrl = readl(dev->base + SPI_CON_REG);
+	/* Reset spi */
+	writel(0, dev->base + SPI_CON_REG);
+	writel((reg_ctrl | SPI_CTRL_EN), dev->base + SPI_CON_REG);
+
+	lim = sizeof(baud_rate_div) / sizeof(unsigned int);
+	if (clk_src > dev->freq) {
+		div = clk_src / dev->freq;
+
+		for (i = 0; i < lim; i++) {
+			if (div <= baud_rate_div[i])
+				break;
+		}
+	}
+	debug("div = %d\n", baud_rate_div[i]);
+
+	reg_ctrl =
+	    (reg_ctrl & ~SPI_CTRL_SS_MASK) | (dev->ss << SPI_CTRL_SS_OFF);
+	reg_ctrl = (reg_ctrl & ~SPI_CTRL_DATA_MASK) | (i << SPI_CTRL_DATA_OFF);
+	reg_ctrl |= SPI_CTRL_MODE;	/* always set to master mode !!!! */
+	reg_ctrl &= ~SPI_CTRL_EN;	/* disable spi */
+
+	/* configuration register setup */
+	reg_ctrl =
+	    (reg_ctrl & ~SPI_CTRL_SSPOL) | (dev->ss_pol << SPI_CTRL_SSPOL_OFF);
+	reg_ctrl =
+	    (reg_ctrl & ~SPI_CTRL_SSCTL) | (dev->ssctl << SPI_CTRL_SSCTL_OFF);
+	reg_ctrl =
+	    (reg_ctrl & ~SPI_CTRL_SCLK_POL) | (dev->
+					       sclkpol <<
+					       SPI_CTRL_SCLK_POL_OFF);
+	reg_ctrl =
+	    (reg_ctrl & ~SPI_CTRL_SCLK_PHA) | (dev->
+					       sclkpha <<
+					       SPI_CTRL_SCLK_PHA_OFF);
+
+	debug("reg_ctrl = 0x%x\n", reg_ctrl);
+	writel(reg_ctrl, dev->base + SPI_CON_REG);
+	/* save control register */
+	reg->ctrl_reg = reg_ctrl;
+
+	/* clear interrupt reg */
+	writel(0, dev->base + SPI_INT_REG);
+	writel(SPI_INT_STAT_TC, dev->base + SPI_STAT_REG);
+
+	return 0;
+}
+
+void spi_init(void)
+{
+}
+
+struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
+				  unsigned int max_hz, unsigned int mode)
+{
+	struct imx_spi_dev_t *imx_spi_slave = NULL;
+
+	if (!spi_cs_is_valid(bus, cs))
+		return NULL;
+
+	imx_spi_slave =
+	    (struct imx_spi_dev_t *)malloc(sizeof(struct imx_spi_dev_t));
+	if (!imx_spi_slave)
+		return NULL;
+
+	imx_spi_slave->slave.bus = bus;
+	imx_spi_slave->slave.cs = cs;
+
+	spi_get_cfg(imx_spi_slave);
+
+	spi_io_init(imx_spi_slave);
+
+	spi_reset(&(imx_spi_slave->slave));
+
+	return &(imx_spi_slave->slave);
+}
+
+void spi_free_slave(struct spi_slave *slave)
+{
+	struct imx_spi_dev_t *imx_spi_slave;
+
+	if (slave) {
+		imx_spi_slave = to_imx_spi_slave(slave);
+		free(imx_spi_slave);
+	}
+}
+
+int spi_claim_bus(struct spi_slave *slave)
+{
+	return 0;
+}
+
+void spi_release_bus(struct spi_slave *slave)
+{
+
+}
+
+/*
+ * SPI transfer:
+ *
+ * See include/spi.h and http://www.altera.com/literature/ds/ds_nios_spi.pdf
+ * for more informations.
+ */
+int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
+	     void *din, unsigned long flags)
+{
+	s32 val = SPI_RETRY_TIMES;
+	u32 *p_buf;
+	u32 reg;
+	s32 len = 0, ret_val = 0;
+	s32 burst_bytes = bitlen >> 3;
+	struct imx_spi_dev_t *dev = to_imx_spi_slave(slave);
+	struct spi_reg_t *spi_reg = &(dev->reg);
+
+	if (!slave)
+		return -1;
+
+	if ((bitlen % 8) != 0)
+		burst_bytes++;
+
+	if (burst_bytes > (dev->fifo_sz)) {
+		printf("Error: maximum burst size is 0x%x bytes, asking 0x%x\n",
+		       dev->fifo_sz, burst_bytes);
+		return -1;
+	}
+
+	if (flags & SPI_XFER_BEGIN) {
+		spi_cs_activate(slave);
+
+		if (spi_reg->ctrl_reg == 0) {
+			printf
+			    ("Error: spi(base=0x%x) has not been initialized\n",
+			     dev->base);
+			return -1;
+		}
+
+		spi_reg->ctrl_reg = (spi_reg->ctrl_reg & ~SPI_CTRL_BURST_MASK) |
+		    ((bitlen - 1) << SPI_CTRL_BURST_OFF);
+		writel(spi_reg->ctrl_reg | SPI_CTRL_EN,
+		       dev->base + SPI_CON_REG);
+		debug("ctrl_reg=0x%x\n", readl(dev->base + SPI_CON_REG));
+
+		/* move data to the tx fifo */
+		if (dout) {
+			for (p_buf = (u32 *) dout, len = burst_bytes; len > 0;
+			     p_buf++, len -= 4)
+				writel(*p_buf, dev->base + SPI_TX_DATA);
+		}
+
+		reg = readl(dev->base + SPI_CON_REG);
+		reg |= SPI_CTRL_REG_XCH_BIT;	/* set xch bit */
+		debug("control reg = 0x%08x\n", reg);
+		writel(reg, dev->base + SPI_CON_REG);
+
+		/* poll on the TC bit (transfer complete) */
+		while ((val-- > 0) &&
+		       (((reg =
+			  readl(dev->base + SPI_STAT_REG)) & SPI_INT_STAT_TC) ==
+			0)) {
+			udelay(100);
+		}
+
+		/* clear the TC bit */
+		writel(reg | SPI_INT_STAT_TC, dev->base + SPI_STAT_REG);
+		if (val <= 0) {
+			printf
+			    ("Error: re-tried %d times without response. Give up\n",
+			     SPI_RETRY_TIMES);
+			ret_val = -1;
+			goto error;
+		}
+	}
+
+	/* move data in the rx buf */
+	if (flags & SPI_XFER_END) {
+		if (din) {
+			for (p_buf = (u32 *) din, len = burst_bytes; len > 0;
+			     p_buf++, len -= 4)
+				*p_buf = readl(dev->base + SPI_RX_DATA);
+		}
+	}
+error:
+	spi_cs_deactivate(slave);
+	return ret_val;
+}
+
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+	return 1;
+}
+
+void spi_cs_activate(struct spi_slave *slave)
+{
+	struct imx_spi_dev_t *dev = to_imx_spi_slave(slave);
+
+	spi_io_init(dev);
+}
+
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+	struct imx_spi_dev_t *dev = to_imx_spi_slave(slave);
+
+	writel(0, dev->base + SPI_CON_REG);
+}
diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_ecspi.c
index 6146da9..d9345da 100644
--- a/drivers/spi/imx_spi.c
+++ b/drivers/spi/imx_ecspi.c
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <malloc.h>
 
-#include <asm/arch/imx_spi.h>
+#include <imx_spi.h>
 
 #ifdef	DEBUG
 
diff --git a/drivers/spi/imx_spi_cpld.c b/drivers/spi/imx_spi_cpld.c
new file mode 100644
index 0000000..2e20b9c
--- /dev/null
+++ b/drivers/spi/imx_spi_cpld.c
@@ -0,0 +1,90 @@
+/*
+ * (C) Copyright 2009 Freescale Semiconductor, Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <config.h>
+#include <common.h>
+#include <spi.h>
+#include <asm/errno.h>
+#include <linux/types.h>
+
+#include <imx_spi.h>
+
+static struct spi_slave *cpld_slave;
+
+/*!
+ * To read/write to a CPLD register.
+ *
+ * @param   reg         register number inside the CPLD
+ * @param   val         data to be written to the register; don't care for read
+ * @param   read        0 for write; 1 for read
+ *
+ * @return              the actual data in the CPLD register
+ */
+unsigned int cpld_reg_xfer(unsigned int reg, unsigned int val,
+			   unsigned int read)
+{
+	unsigned int local_val1, local_val2;
+	unsigned int g_tx_buf[2], g_rx_buf[2];
+
+	reg >>= 1;
+
+	local_val1 = (read << 13) | ((reg & 0x0001FFFF) >> 5) | 0x00001000;
+	if (read)
+		local_val2 = (((reg & 0x0000001F) << 27) | 0x0200001f);
+	else
+		local_val2 =
+		    (((reg & 0x0000001F) << 27) | ((val & 0x0000FFFF) << 6) |
+		     0x03C00027);
+
+	*g_tx_buf = local_val1;
+	*(g_tx_buf + 1) = local_val2;
+
+	if (read) {
+		if (spi_xfer(cpld_slave, 46, (u8 *) g_tx_buf, (u8 *) g_rx_buf,
+			     SPI_XFER_BEGIN | SPI_XFER_END)) {
+			return -1;
+		}
+	} else {
+		if (spi_xfer(cpld_slave, 46, (u8 *) g_tx_buf, (u8 *) g_rx_buf,
+			     SPI_XFER_BEGIN)) {
+			return -1;
+		}
+	}
+	return ((*(g_rx_buf + 1)) >> 6) & 0xffff;
+}
+
+struct spi_slave *spi_cpld_probe()
+{
+	cpld_slave = spi_setup_slave(0, 0, 25000000, 0);
+	return cpld_slave;
+}
+
+void mxc_cpld_spi_init(void)
+{
+	spi_cpld_probe();
+}
+
+void spi_cpld_free(struct spi_slave *slave)
+{
+	if (slave)
+		spi_free_slave(slave);
+}
diff --git a/drivers/spi/imx_spi_pmic.c b/drivers/spi/imx_spi_pmic.c
index 678f0b4..ec32277 100644
--- a/drivers/spi/imx_spi_pmic.c
+++ b/drivers/spi/imx_spi_pmic.c
@@ -26,7 +26,7 @@
 #include <asm/errno.h>
 #include <linux/types.h>
 
-#include <asm/arch/imx_spi.h>
+#include <imx_spi.h>
 
 static u32 pmic_tx, pmic_rx;