* [U-Boot] [PATCH] spi: Add support SH Quad SPI driver
@ 2013-10-09 2:55 Nobuhiro Iwamatsu
2013-11-21 8:11 ` Nobuhiro Iwamatsu
0 siblings, 1 reply; 2+ messages in thread
From: Nobuhiro Iwamatsu @ 2013-10-09 2:55 UTC (permalink / raw)
To: u-boot
This patch adds a driver for Renesas SoC's Quad SPI bus.
This supports with 8 bits per transfer to use with SPI flash.
Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
Changes for v5:
- Add print abort when call ctrlc().
- Move source code in spi_xfer() which should be processed by
spi_cs_activate().
- Move source code in spi_xfer() which should be processed by
spi_cs_deactivate().
- Remove sh_qspi_xfer, move to spi_xfer().
Changes for v4:
- Added tabs
- Added comments
- Added sh_qspi_init()
Changes for v3:
- Change Queued to Quad.
- Remove path of file from file header.
- Use read* and write* directly instead of sh_qspi_write* sh_qspi_read*.
- Change driver format.
Changes for v2:
- "SH QSPI" to "SH QSPI (Queued SPI)".
- Remove magic number.
drivers/spi/Makefile | 1 +
drivers/spi/sh_qspi.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 245 insertions(+)
create mode 100644 drivers/spi/sh_qspi.c
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 91d24ce..c44f851 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -33,6 +33,7 @@ COBJS-$(CONFIG_OC_TINY_SPI) += oc_tiny_spi.o
COBJS-$(CONFIG_OMAP3_SPI) += omap3_spi.o
COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o
COBJS-$(CONFIG_SH_SPI) += sh_spi.o
+COBJS-$(CONFIG_SH_QSPI) += sh_qspi.o
COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o
COBJS-$(CONFIG_FDT_SPI) += fdt_spi.o
COBJS-$(CONFIG_TEGRA20_SFLASH) += tegra20_sflash.o
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
new file mode 100644
index 0000000..8f53552
--- /dev/null
+++ b/drivers/spi/sh_qspi.c
@@ -0,0 +1,244 @@
+/*
+ * SH QSPI (Quad SPI) driver
+ *
+ * Copyright (C) 2013 Renesas Electronics Corporation
+ * Copyright (C) 2013 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0
+ */
+
+#include <common.h>
+#include <malloc.h>
+#include <spi.h>
+#include <asm/io.h>
+
+/* SH QSPI register bit masks <REG>_<BIT> */
+#define SPCR_MSTR 0x08
+#define SPCR_SPE 0x40
+#define SPSR_SPRFF 0x80
+#define SPSR_SPTEF 0x20
+#define SPPCR_IO3FV 0x04
+#define SPPCR_IO2FV 0x02
+#define SPPCR_IO1FV 0x01
+#define SPBDCR_RXBC0 (1 << 0)
+#define SPCMD_SCKDEN (1 << 15)
+#define SPCMD_SLNDEN (1 << 14)
+#define SPCMD_SPNDEN (1 << 13)
+#define SPCMD_SSLKP (1 << 7)
+#define SPCMD_BRDV0 (1 << 2)
+#define SPCMD_INIT1 SPCMD_SCKDEN | SPCMD_SLNDEN | \
+ SPCMD_SPNDEN | SPCMD_SSLKP | \
+ SPCMD_BRDV0
+#define SPCMD_INIT2 SPCMD_SPNDEN | SPCMD_SSLKP | \
+ SPCMD_BRDV0
+#define SPBFCR_TXRST (1 << 7)
+#define SPBFCR_RXRST (1 << 6)
+
+/* SH QSPI register set */
+struct sh_qspi_regs {
+ unsigned char spcr;
+ unsigned char sslp;
+ unsigned char sppcr;
+ unsigned char spsr;
+ unsigned long spdr;
+ unsigned char spscr;
+ unsigned char spssr;
+ unsigned char spbr;
+ unsigned char spdcr;
+ unsigned char spckd;
+ unsigned char sslnd;
+ unsigned char spnd;
+ unsigned char dummy0;
+ unsigned short spcmd0;
+ unsigned short spcmd1;
+ unsigned short spcmd2;
+ unsigned short spcmd3;
+ unsigned char spbfcr;
+ unsigned char dummy1;
+ unsigned short spbdcr;
+ unsigned long spbmul0;
+ unsigned long spbmul1;
+ unsigned long spbmul2;
+ unsigned long spbmul3;
+};
+
+struct sh_qspi_slave {
+ struct spi_slave slave;
+ struct sh_qspi_regs *regs;
+};
+
+static inline struct sh_qspi_slave *to_sh_qspi(struct spi_slave *slave)
+{
+ return container_of(slave, struct sh_qspi_slave, slave);
+}
+
+static void sh_qspi_init(struct sh_qspi_slave *ss)
+{
+ /* QSPI initialize */
+ writeb(SPCR_MSTR, &ss->regs->spcr);
+ writeb(0x00, &ss->regs->sslp);
+ writeb(SPPCR_IO3FV|SPPCR_IO2FV, &ss->regs->sppcr);
+
+ /* Set bit rate. See 58.3.8 Quad Serial Peripheral Interface */
+ writeb(0x01, &ss->regs->spbr);
+
+ writeb(0x00, &ss->regs->spdcr);
+ writeb(0x00, &ss->regs->spckd);
+ writeb(0x00, &ss->regs->sslnd);
+ writeb(0x00, &ss->regs->spnd);
+ writew(SPCMD_INIT1, &ss->regs->spcmd0);
+ writew(SPCMD_INIT2, &ss->regs->spcmd0);
+ writeb(SPBFCR_TXRST|SPBFCR_RXRST, &ss->regs->spbfcr);
+ writeb(0x00, &ss->regs->spbfcr);
+ writeb(0x00, &ss->regs->spscr);
+ writeb(SPCR_SPE|SPCR_MSTR, &ss->regs->spcr);
+}
+
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+ return 1;
+}
+
+void spi_cs_activate(struct spi_slave *slave)
+{
+ struct sh_qspi_slave *ss = to_sh_qspi(slave);
+
+ writeb(SPCR_MSTR, &ss->regs->spcr);
+ writew(SPCMD_INIT1, &ss->regs->spcmd0);
+ writeb(SPBFCR_TXRST|SPBFCR_RXRST, &ss->regs->spbfcr);
+ writeb(0x00, &ss->regs->spbfcr);
+ writeb(0x00, &ss->regs->spscr);
+ writeb(SPCR_SPE|SPCR_MSTR, &ss->regs->spcr);
+}
+
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+ struct sh_qspi_slave *ss = to_sh_qspi(slave);
+
+ writeb(SPCR_MSTR, &ss->regs->spcr);
+}
+
+void spi_init(void)
+{
+ /* nothing to do */
+}
+
+struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
+ unsigned int max_hz, unsigned int mode)
+{
+ struct sh_qspi_slave *ss;
+
+ if (!spi_cs_is_valid(bus, cs))
+ return NULL;
+
+ ss = spi_alloc_slave(struct sh_qspi_slave, bus, cs);
+ if (!ss) {
+ printf("SPI_error: Fail to allocate sh_qspi_slave\n");
+ return NULL;
+ }
+
+ ss->regs = (struct sh_qspi_regs *)CONFIG_SH_QSPI_BASE;
+
+ /* Init SH QSPI */
+ sh_qspi_init(ss);
+
+ return &ss->slave;
+}
+
+void spi_free_slave(struct spi_slave *slave)
+{
+ struct sh_qspi_slave *spi = to_sh_qspi(slave);
+
+ free(spi);
+}
+
+int spi_claim_bus(struct spi_slave *slave)
+{
+ return 0;
+}
+
+void spi_release_bus(struct spi_slave *slave)
+{
+}
+
+int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
+ void *din, unsigned long flags)
+{
+ struct sh_qspi_slave *ss = to_sh_qspi(slave);
+ unsigned long nbyte;
+ int ret = 0;
+ unsigned char dtdata = 0, drdata;
+ unsigned char *tdata = &dtdata, *rdata = &drdata;
+ unsigned long *spbmul0 = &ss->regs->spbmul0;
+
+ if (dout == NULL && din == NULL) {
+ if (flags & SPI_XFER_END)
+ spi_cs_deactivate(slave);
+ return 0;
+ }
+
+ if (bitlen % 8) {
+ printf("%s: bitlen is not 8bit alined %d", __func__, bitlen);
+ return 1;
+ }
+
+ nbyte = bitlen / 8;
+
+ if (flags & SPI_XFER_BEGIN) {
+ spi_cs_activate(slave);
+
+ /* Set 1048576 byte */
+ writel(0x100000, spbmul0);
+ }
+
+ if (flags & SPI_XFER_END)
+ writel(nbyte, spbmul0);
+
+ if (dout != NULL)
+ tdata = (unsigned char *)dout;
+
+ if (din != NULL)
+ rdata = din;
+
+ while (nbyte > 0) {
+ while (!(readb(&ss->regs->spsr) & SPSR_SPTEF)) {
+ if (ctrlc()) {
+ puts("abort\n");
+ return 1;
+ }
+ udelay(10);
+ }
+
+ writeb(*tdata, (unsigned char *)(&ss->regs->spdr));
+
+ while ((readw(&ss->regs->spbdcr) != SPBDCR_RXBC0)) {
+ if (ctrlc()) {
+ puts("abort\n");
+ return 1;
+ }
+ udelay(1);
+ }
+
+ while (!(readb(&ss->regs->spsr) & SPSR_SPRFF)) {
+ if (ctrlc()) {
+ puts("abort\n");
+ return 1;
+ }
+ udelay(10);
+ }
+
+ *rdata = readb((unsigned char *)(&ss->regs->spdr));
+
+ if (dout != NULL)
+ tdata++;
+ if (din != NULL)
+ rdata++;
+
+ nbyte--;
+ }
+
+ if (flags & SPI_XFER_END)
+ spi_cs_deactivate(slave);
+
+ return ret;
+}
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] spi: Add support SH Quad SPI driver
2013-10-09 2:55 [U-Boot] [PATCH] spi: Add support SH Quad SPI driver Nobuhiro Iwamatsu
@ 2013-11-21 8:11 ` Nobuhiro Iwamatsu
0 siblings, 0 replies; 2+ messages in thread
From: Nobuhiro Iwamatsu @ 2013-11-21 8:11 UTC (permalink / raw)
To: u-boot
Hi, Jagannadha.
Do you have any comment about this patch?
If no problem, could you pickup your repository?
Best regards,
Nobuhiro
2013/10/9 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:
> This patch adds a driver for Renesas SoC's Quad SPI bus.
> This supports with 8 bits per transfer to use with SPI flash.
>
> Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
> Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
> ---
> Changes for v5:
> - Add print abort when call ctrlc().
> - Move source code in spi_xfer() which should be processed by
> spi_cs_activate().
> - Move source code in spi_xfer() which should be processed by
> spi_cs_deactivate().
> - Remove sh_qspi_xfer, move to spi_xfer().
> Changes for v4:
> - Added tabs
> - Added comments
> - Added sh_qspi_init()
> Changes for v3:
> - Change Queued to Quad.
> - Remove path of file from file header.
> - Use read* and write* directly instead of sh_qspi_write* sh_qspi_read*.
> - Change driver format.
> Changes for v2:
> - "SH QSPI" to "SH QSPI (Queued SPI)".
> - Remove magic number.
>
> drivers/spi/Makefile | 1 +
> drivers/spi/sh_qspi.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 245 insertions(+)
> create mode 100644 drivers/spi/sh_qspi.c
>
> diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
> index 91d24ce..c44f851 100644
> --- a/drivers/spi/Makefile
> +++ b/drivers/spi/Makefile
> @@ -33,6 +33,7 @@ COBJS-$(CONFIG_OC_TINY_SPI) += oc_tiny_spi.o
> COBJS-$(CONFIG_OMAP3_SPI) += omap3_spi.o
> COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o
> COBJS-$(CONFIG_SH_SPI) += sh_spi.o
> +COBJS-$(CONFIG_SH_QSPI) += sh_qspi.o
> COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o
> COBJS-$(CONFIG_FDT_SPI) += fdt_spi.o
> COBJS-$(CONFIG_TEGRA20_SFLASH) += tegra20_sflash.o
> diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
> new file mode 100644
> index 0000000..8f53552
> --- /dev/null
> +++ b/drivers/spi/sh_qspi.c
> @@ -0,0 +1,244 @@
> +/*
> + * SH QSPI (Quad SPI) driver
> + *
> + * Copyright (C) 2013 Renesas Electronics Corporation
> + * Copyright (C) 2013 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0
> + */
> +
> +#include <common.h>
> +#include <malloc.h>
> +#include <spi.h>
> +#include <asm/io.h>
> +
> +/* SH QSPI register bit masks <REG>_<BIT> */
> +#define SPCR_MSTR 0x08
> +#define SPCR_SPE 0x40
> +#define SPSR_SPRFF 0x80
> +#define SPSR_SPTEF 0x20
> +#define SPPCR_IO3FV 0x04
> +#define SPPCR_IO2FV 0x02
> +#define SPPCR_IO1FV 0x01
> +#define SPBDCR_RXBC0 (1 << 0)
> +#define SPCMD_SCKDEN (1 << 15)
> +#define SPCMD_SLNDEN (1 << 14)
> +#define SPCMD_SPNDEN (1 << 13)
> +#define SPCMD_SSLKP (1 << 7)
> +#define SPCMD_BRDV0 (1 << 2)
> +#define SPCMD_INIT1 SPCMD_SCKDEN | SPCMD_SLNDEN | \
> + SPCMD_SPNDEN | SPCMD_SSLKP | \
> + SPCMD_BRDV0
> +#define SPCMD_INIT2 SPCMD_SPNDEN | SPCMD_SSLKP | \
> + SPCMD_BRDV0
> +#define SPBFCR_TXRST (1 << 7)
> +#define SPBFCR_RXRST (1 << 6)
> +
> +/* SH QSPI register set */
> +struct sh_qspi_regs {
> + unsigned char spcr;
> + unsigned char sslp;
> + unsigned char sppcr;
> + unsigned char spsr;
> + unsigned long spdr;
> + unsigned char spscr;
> + unsigned char spssr;
> + unsigned char spbr;
> + unsigned char spdcr;
> + unsigned char spckd;
> + unsigned char sslnd;
> + unsigned char spnd;
> + unsigned char dummy0;
> + unsigned short spcmd0;
> + unsigned short spcmd1;
> + unsigned short spcmd2;
> + unsigned short spcmd3;
> + unsigned char spbfcr;
> + unsigned char dummy1;
> + unsigned short spbdcr;
> + unsigned long spbmul0;
> + unsigned long spbmul1;
> + unsigned long spbmul2;
> + unsigned long spbmul3;
> +};
> +
> +struct sh_qspi_slave {
> + struct spi_slave slave;
> + struct sh_qspi_regs *regs;
> +};
> +
> +static inline struct sh_qspi_slave *to_sh_qspi(struct spi_slave *slave)
> +{
> + return container_of(slave, struct sh_qspi_slave, slave);
> +}
> +
> +static void sh_qspi_init(struct sh_qspi_slave *ss)
> +{
> + /* QSPI initialize */
> + writeb(SPCR_MSTR, &ss->regs->spcr);
> + writeb(0x00, &ss->regs->sslp);
> + writeb(SPPCR_IO3FV|SPPCR_IO2FV, &ss->regs->sppcr);
> +
> + /* Set bit rate. See 58.3.8 Quad Serial Peripheral Interface */
> + writeb(0x01, &ss->regs->spbr);
> +
> + writeb(0x00, &ss->regs->spdcr);
> + writeb(0x00, &ss->regs->spckd);
> + writeb(0x00, &ss->regs->sslnd);
> + writeb(0x00, &ss->regs->spnd);
> + writew(SPCMD_INIT1, &ss->regs->spcmd0);
> + writew(SPCMD_INIT2, &ss->regs->spcmd0);
> + writeb(SPBFCR_TXRST|SPBFCR_RXRST, &ss->regs->spbfcr);
> + writeb(0x00, &ss->regs->spbfcr);
> + writeb(0x00, &ss->regs->spscr);
> + writeb(SPCR_SPE|SPCR_MSTR, &ss->regs->spcr);
> +}
> +
> +int spi_cs_is_valid(unsigned int bus, unsigned int cs)
> +{
> + return 1;
> +}
> +
> +void spi_cs_activate(struct spi_slave *slave)
> +{
> + struct sh_qspi_slave *ss = to_sh_qspi(slave);
> +
> + writeb(SPCR_MSTR, &ss->regs->spcr);
> + writew(SPCMD_INIT1, &ss->regs->spcmd0);
> + writeb(SPBFCR_TXRST|SPBFCR_RXRST, &ss->regs->spbfcr);
> + writeb(0x00, &ss->regs->spbfcr);
> + writeb(0x00, &ss->regs->spscr);
> + writeb(SPCR_SPE|SPCR_MSTR, &ss->regs->spcr);
> +}
> +
> +void spi_cs_deactivate(struct spi_slave *slave)
> +{
> + struct sh_qspi_slave *ss = to_sh_qspi(slave);
> +
> + writeb(SPCR_MSTR, &ss->regs->spcr);
> +}
> +
> +void spi_init(void)
> +{
> + /* nothing to do */
> +}
> +
> +struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
> + unsigned int max_hz, unsigned int mode)
> +{
> + struct sh_qspi_slave *ss;
> +
> + if (!spi_cs_is_valid(bus, cs))
> + return NULL;
> +
> + ss = spi_alloc_slave(struct sh_qspi_slave, bus, cs);
> + if (!ss) {
> + printf("SPI_error: Fail to allocate sh_qspi_slave\n");
> + return NULL;
> + }
> +
> + ss->regs = (struct sh_qspi_regs *)CONFIG_SH_QSPI_BASE;
> +
> + /* Init SH QSPI */
> + sh_qspi_init(ss);
> +
> + return &ss->slave;
> +}
> +
> +void spi_free_slave(struct spi_slave *slave)
> +{
> + struct sh_qspi_slave *spi = to_sh_qspi(slave);
> +
> + free(spi);
> +}
> +
> +int spi_claim_bus(struct spi_slave *slave)
> +{
> + return 0;
> +}
> +
> +void spi_release_bus(struct spi_slave *slave)
> +{
> +}
> +
> +int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
> + void *din, unsigned long flags)
> +{
> + struct sh_qspi_slave *ss = to_sh_qspi(slave);
> + unsigned long nbyte;
> + int ret = 0;
> + unsigned char dtdata = 0, drdata;
> + unsigned char *tdata = &dtdata, *rdata = &drdata;
> + unsigned long *spbmul0 = &ss->regs->spbmul0;
> +
> + if (dout == NULL && din == NULL) {
> + if (flags & SPI_XFER_END)
> + spi_cs_deactivate(slave);
> + return 0;
> + }
> +
> + if (bitlen % 8) {
> + printf("%s: bitlen is not 8bit alined %d", __func__, bitlen);
> + return 1;
> + }
> +
> + nbyte = bitlen / 8;
> +
> + if (flags & SPI_XFER_BEGIN) {
> + spi_cs_activate(slave);
> +
> + /* Set 1048576 byte */
> + writel(0x100000, spbmul0);
> + }
> +
> + if (flags & SPI_XFER_END)
> + writel(nbyte, spbmul0);
> +
> + if (dout != NULL)
> + tdata = (unsigned char *)dout;
> +
> + if (din != NULL)
> + rdata = din;
> +
> + while (nbyte > 0) {
> + while (!(readb(&ss->regs->spsr) & SPSR_SPTEF)) {
> + if (ctrlc()) {
> + puts("abort\n");
> + return 1;
> + }
> + udelay(10);
> + }
> +
> + writeb(*tdata, (unsigned char *)(&ss->regs->spdr));
> +
> + while ((readw(&ss->regs->spbdcr) != SPBDCR_RXBC0)) {
> + if (ctrlc()) {
> + puts("abort\n");
> + return 1;
> + }
> + udelay(1);
> + }
> +
> + while (!(readb(&ss->regs->spsr) & SPSR_SPRFF)) {
> + if (ctrlc()) {
> + puts("abort\n");
> + return 1;
> + }
> + udelay(10);
> + }
> +
> + *rdata = readb((unsigned char *)(&ss->regs->spdr));
> +
> + if (dout != NULL)
> + tdata++;
> + if (din != NULL)
> + rdata++;
> +
> + nbyte--;
> + }
> +
> + if (flags & SPI_XFER_END)
> + spi_cs_deactivate(slave);
> +
> + return ret;
> +}
> --
> 1.8.4.rc3
>
--
Nobuhiro Iwamatsu
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-21 8:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-09 2:55 [U-Boot] [PATCH] spi: Add support SH Quad SPI driver Nobuhiro Iwamatsu
2013-11-21 8:11 ` Nobuhiro Iwamatsu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.