Patchwork [U-Boot,v3,04/10] SPI: Add Orion SPI driver

login
register
mail settings
Submitter Sebastian Hesselbarth
Date Jan. 16, 2013, 7:25 p.m.
Message ID <1358364328-14904-5-git-send-email-sebastian.hesselbarth@gmail.com>
Download mbox | patch
Permalink /patch/213027/
State Superseded
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Comments

Sebastian Hesselbarth - Jan. 16, 2013, 7:25 p.m.
This adds an SPI driver found on Marvell Orion SoCs. This driver is
taken from kirkwood_spi but removes mpp configuration as dove has
dedicated spi pins. To have a common driver for orion5x, kirkwood,
and dove, mpp configuration should be handled in some cpu/board-specific
setup.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: u-boot@lists.denx.de
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Rabeeh Khoury <rabeeh@solid-run.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Andy Fleming <afleming@gmail.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Cc: Daniel Stodden <daniel.stodden@gmail.com>
Cc: Luka Perkov <luka@openwrt.org>
---
 drivers/spi/Makefile    |    1 +
 drivers/spi/orion_spi.c |  217 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 218 insertions(+)
 create mode 100644 drivers/spi/orion_spi.c
Prafulla Wadaskar - Feb. 11, 2013, 3:39 a.m.
> -----Original Message-----
> From: Sebastian Hesselbarth [mailto:sebastian.hesselbarth@gmail.com]
> Sent: 17 January 2013 00:55
> To: Sebastian Hesselbarth
> Cc: u-boot@lists.denx.de; Rabeeh Khoury; Albert Aribaud; Prafulla
> Wadaskar; Andy Fleming; Joe Hershberger; Daniel Stodden; Luka Perkov
> Subject: [PATCH v3 04/10] SPI: Add Orion SPI driver
> 
> This adds an SPI driver found on Marvell Orion SoCs. This driver is
> taken from kirkwood_spi but removes mpp configuration as dove has
> dedicated spi pins. To have a common driver for orion5x, kirkwood,
> and dove, mpp configuration should be handled in some cpu/board-
> specific

the proposal of having common driver will be greatly appreciated.
Pls go ahead and do it if possible for you

I think adding orion_spi.c to enable dove support doesn't sound good.

Regards...
Prafulla . . .
Jagannadha Sutradharudu Teki - June 2, 2013, 7:14 p.m.
Hi,

Does this tested on hw, please re-base the tree and send the next version patch.
Let me know if it ok to review under current tree.

--
Thanks,
Jagan.

On Mon, Feb 11, 2013 at 9:09 AM, Prafulla Wadaskar <prafulla@marvell.com> wrote:
>
>
>> -----Original Message-----
>> From: Sebastian Hesselbarth [mailto:sebastian.hesselbarth@gmail.com]
>> Sent: 17 January 2013 00:55
>> To: Sebastian Hesselbarth
>> Cc: u-boot@lists.denx.de; Rabeeh Khoury; Albert Aribaud; Prafulla
>> Wadaskar; Andy Fleming; Joe Hershberger; Daniel Stodden; Luka Perkov
>> Subject: [PATCH v3 04/10] SPI: Add Orion SPI driver
>>
>> This adds an SPI driver found on Marvell Orion SoCs. This driver is
>> taken from kirkwood_spi but removes mpp configuration as dove has
>> dedicated spi pins. To have a common driver for orion5x, kirkwood,
>> and dove, mpp configuration should be handled in some cpu/board-
>> specific
>
> the proposal of having common driver will be greatly appreciated.
> Pls go ahead and do it if possible for you
>
> I think adding orion_spi.c to enable dove support doesn't sound good.
>
> Regards...
> Prafulla . . .
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
Sascha Silbe - June 3, 2013, 5:31 p.m.
Dear Jagan,

Jagan Teki <jagannadh.teki@gmail.com> writes:

> Does this tested on hw, please re-base the tree and send the next version patch.
> Let me know if it ok to review under current tree.

I'd appreciate a review of the latest patch [1,2]. There have been no
changes in master to the files touched by the patch since I sent
it. After rebasing the entire series on today's master (d6639d1) I've
successfully verified SPI flash functionality on CuBox Pro.

Sascha

[1] mid:1369593423-19763-6-git-send-email-t-uboot@infra-silbe.de
[2] http://patchwork.ozlabs.org/patch/246468/
Jagannadha Sutradharudu Teki - June 3, 2013, 5:35 p.m.
On Mon, Jun 3, 2013 at 11:01 PM, Sascha Silbe <t-uboot@infra-silbe.de> wrote:
> Dear Jagan,
>
> Jagan Teki <jagannadh.teki@gmail.com> writes:
>
>> Does this tested on hw, please re-base the tree and send the next version patch.
>> Let me know if it ok to review under current tree.
>
> I'd appreciate a review of the latest patch [1,2]. There have been no
> changes in master to the files touched by the patch since I sent
> it. After rebasing the entire series on today's master (d6639d1) I've
> successfully verified SPI flash functionality on CuBox Pro.
>
> Sascha
>
> [1] mid:1369593423-19763-6-git-send-email-t-uboot@infra-silbe.de
> [2] http://patchwork.ozlabs.org/patch/246468/

Thank you, means this v4 is the latest one?
http://patchwork.ozlabs.org/patch/246468/

--
Thanks,
Jagan.
Sascha Silbe - June 3, 2013, 6:03 p.m.
Dear Jagan,

Jagan Teki <jagannadh.teki@gmail.com> writes:

>> I'd appreciate a review of the latest patch [1,2]. [...]
>> [1] mid:1369593423-19763-6-git-send-email-t-uboot@infra-silbe.de
>> [2] http://patchwork.ozlabs.org/patch/246468/
>
> Thank you, means this v4 is the latest one?
> http://patchwork.ozlabs.org/patch/246468/

Yes, it is.

Sascha
Sebastian Hesselbarth - June 3, 2013, 7:46 p.m.
On 06/03/2013 07:31 PM, Sascha Silbe wrote:
> From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>
> This adds an SPI driver for Marvell Dove SoCs. This driver is taken
> from kirkwood_spi but removes mpp configuration as dove has dedicated
> spi pins.
>
> As a future clean-up step, the code for orion5x, kirkwood and dove
> could be merged, with MPP configuration being be handled as part of
> cpu/board-specific setup.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Signed-off-by: Sascha Silbe <t-uboot@infra-silbe.de>
> ---
>  v3->v4: renamed to dove, adjusted description, removed unused
>          variable, made checkpatch clean

Sascha,

renaming it to dove_spi to obfuscate it is actually a copy of
kirkwood_spi that will also work for orion5x and mv78x00 does _not_
match my intention when I posted this driver. Feel free to pick up the
patches but it should remain generic for all Orion SoCs.

kirkwood_spi has mpp stuff inside that is totally wrong there, move it
to board setup and just rename kirkwood_spi to something more generic.

Sebastian

Patch

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 824d357..624bb72 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -35,6 +35,7 @@  COBJS-$(CONFIG_CF_SPI) += cf_spi.o
 COBJS-$(CONFIG_CF_QSPI) += cf_qspi.o
 COBJS-$(CONFIG_DAVINCI_SPI) += davinci_spi.o
 COBJS-$(CONFIG_EXYNOS_SPI) += exynos_spi.o
+COBJS-$(CONFIG_ORION_SPI) += orion_spi.o
 COBJS-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o
 COBJS-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o
 COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
diff --git a/drivers/spi/orion_spi.c b/drivers/spi/orion_spi.c
new file mode 100644
index 0000000..8a50531
--- /dev/null
+++ b/drivers/spi/orion_spi.c
@@ -0,0 +1,217 @@ 
+/*
+ * Marvell Orion SoCs common spi driver
+ *
+ * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+ * based on kirkwood_spi.c written by
+ *  Prafulla Wadaskar <prafulla@marvell.com>
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <common.h>
+#include <malloc.h>
+#include <spi.h>
+#include <asm/io.h>
+#include <asm/arch/config.h>
+
+/* SPI Registers on orion SOC */
+struct orionspi_registers {
+	u32 ctrl;	/* 0x00 */
+	u32 cfg;	/* 0x04 */
+	u32 dout;	/* 0x08 */
+	u32 din;	/* 0x0c */
+	u32 irq_cause;	/* 0x10 */
+	u32 irq_mask;	/* 0x14 */
+};
+
+#define ORIONSPI_CLKPRESCL_MASK	0x1f
+#define ORIONSPI_CLKPRESCL_MIN	0x12
+#define ORIONSPI_CSN_ACT	1 /* Activates serial memory interface */
+#define ORIONSPI_SMEMRDY	(1 << 1) /* SerMem Data xfer ready */
+#define ORIONSPI_IRQUNMASK	1 /* unmask SPI interrupt */
+#define ORIONSPI_IRQMASK	0 /* mask SPI interrupt */
+#define ORIONSPI_SMEMRDIRQ	1 /* SerMem data xfer ready irq */
+#define ORIONSPI_XFERLEN_1BYTE	0
+#define ORIONSPI_XFERLEN_2BYTE	(1 << 5)
+#define ORIONSPI_XFERLEN_MASK	(1 << 5)
+#define ORIONSPI_ADRLEN_1BYTE	0
+#define ORIONSPI_ADRLEN_2BYTE	(1 << 8)
+#define ORIONSPI_ADRLEN_3BYTE	(2 << 8)
+#define ORIONSPI_ADRLEN_4BYTE	(3 << 8)
+#define ORIONSPI_ADRLEN_MASK	(3 << 8)
+#define ORIONSPI_TIMEOUT	10000
+
+static struct orionspi_registers *spireg =
+	(struct orionspi_registers *)ORION_SPI_BASE;
+
+struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
+				unsigned int max_hz, unsigned int mode)
+{
+	struct spi_slave *slave;
+	u32 data;
+	u32 kwspi_mpp_config[] = { 0, 0 };
+
+	if (!spi_cs_is_valid(bus, cs))
+		return NULL;
+
+	slave = malloc(sizeof(struct spi_slave));
+	if (!slave)
+		return NULL;
+
+	slave->bus = bus;
+	slave->cs = cs;
+
+	writel(~ORIONSPI_CSN_ACT | ORIONSPI_SMEMRDY, &spireg->ctrl);
+
+	/* calculate spi clock prescaller using max_hz */
+	data = ((CONFIG_SYS_TCLK / 2) / max_hz) + 0x10;
+	data = data < ORIONSPI_CLKPRESCL_MIN ? ORIONSPI_CLKPRESCL_MIN : data;
+	data = data > ORIONSPI_CLKPRESCL_MASK ? ORIONSPI_CLKPRESCL_MASK : data;
+
+	/* program spi clock prescaller using max_hz */
+	writel(ORIONSPI_ADRLEN_3BYTE | data, &spireg->cfg);
+	debug("data = 0x%08x\n", data);
+
+	writel(ORIONSPI_SMEMRDIRQ, &spireg->irq_cause);
+	writel(ORIONSPI_IRQMASK, &spireg->irq_mask);
+
+	return slave;
+}
+
+void spi_free_slave(struct spi_slave *slave)
+{
+	free(slave);
+}
+
+#if defined(CONFIG_SYS_KW_SPI_MPP)
+u32 spi_mpp_backup[4];
+#endif
+
+__attribute__((weak)) int board_spi_claim_bus(struct spi_slave *slave)
+{
+	return 0;
+}
+
+int spi_claim_bus(struct spi_slave *slave)
+{
+	return board_spi_claim_bus(slave);
+}
+
+__attribute__((weak)) void board_spi_release_bus(struct spi_slave *slave)
+{
+}
+
+void spi_release_bus(struct spi_slave *slave)
+{
+	board_spi_release_bus(slave);
+}
+
+#ifndef CONFIG_SPI_CS_IS_VALID
+/*
+ * you can define this function board specific
+ * define above CONFIG in board specific config file and
+ * provide the function in board specific src file
+ */
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+	return (bus == 0 && (cs == 0 || cs == 1));
+}
+#endif
+
+void spi_init(void)
+{
+}
+
+void spi_cs_activate(struct spi_slave *slave)
+{
+	writel(readl(&spireg->ctrl) | ORIONSPI_IRQUNMASK, &spireg->ctrl);
+}
+
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+	writel(readl(&spireg->ctrl) & ORIONSPI_IRQMASK, &spireg->ctrl);
+}
+
+int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
+	     void *din, unsigned long flags)
+{
+	unsigned int tmpdout, tmpdin;
+	int tm, isread = 0;
+
+	debug("spi_xfer: slave %u:%u dout %p din %p bitlen %u\n",
+	      slave->bus, slave->cs, dout, din, bitlen);
+
+	if (flags & SPI_XFER_BEGIN)
+		spi_cs_activate(slave);
+
+	/*
+	 * handle data in 8-bit chunks
+	 * TBD: 2byte xfer mode to be enabled
+	 */
+	writel(((readl(&spireg->cfg) & ~ORIONSPI_XFERLEN_MASK) |
+		ORIONSPI_XFERLEN_1BYTE), &spireg->cfg);
+
+	while (bitlen > 4) {
+		debug("loopstart bitlen %d\n", bitlen);
+		tmpdout = 0;
+
+		/* Shift data so it's msb-justified */
+		if (dout)
+			tmpdout = *(u32 *) dout & 0x0ff;
+
+		writel(~ORIONSPI_SMEMRDIRQ, &spireg->irq_cause);
+		writel(tmpdout, &spireg->dout);	/* Write the data out */
+		debug("*** spi_xfer: ... %08x written, bitlen %d\n",
+		      tmpdout, bitlen);
+
+		/*
+		 * Wait for SPI transmit to get out
+		 * or time out (1 second = 1000 ms)
+		 * The NE event must be read and cleared first
+		 */
+		for (tm = 0, isread = 0; tm < ORIONSPI_TIMEOUT; ++tm) {
+			if (readl(&spireg->irq_cause) & ORIONSPI_SMEMRDIRQ) {
+				isread = 1;
+				tmpdin = readl(&spireg->din);
+				debug
+					("spi_xfer: din %p..%08x read\n",
+					din, tmpdin);
+
+				if (din) {
+					*((u8 *) din) = (u8) tmpdin;
+					din += 1;
+				}
+				if (dout)
+					dout += 1;
+				bitlen -= 8;
+			}
+			if (isread)
+				break;
+		}
+		if (tm >= ORIONSPI_TIMEOUT)
+			printf("*** spi_xfer: Time out during SPI transfer\n");
+
+		debug("loopend bitlen %d\n", bitlen);
+	}
+
+	if (flags & SPI_XFER_END)
+		spi_cs_deactivate(slave);
+
+	return 0;
+}