Commit: 8de13a8b174d53904ba76a81499caf66f328ddac - uboot (git)

Commit MetaInfo

• Revision: 8de13a8b174d53904ba76a81499caf66f328ddac (tree)
• Time: 2016-06-01 00:07:11
• Author: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

sh: TAC T-SH7706LSR MMC support

Signed-off-by: Yoshinori Sato <[e-mail]>

Change Summary

• modified: board/shmin/shmin.c
• modified: drivers/spi/Makefile
• add: drivers/spi/tac_ssu.c
• modified: include/configs/shmin.h

Incremental Difference

--- a/board/shmin/shmin.c
+++ b/board/shmin/shmin.c
@@ -12,9 +12,14 @@
  */
 
 #include <common.h>
+#include <mmc.h>
+#include <spi.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 
+#define SCPCR (0xa4000116)
+#define SCPDR (0xa4000136)
+
 int board_early_init_f(void)
 {
 	writew(0x2980, BCR2);
@@ -29,3 +34,25 @@ int dram_init(void)
 	gd->bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
   	return 0;
 }
+
+int board_mmc_init(bd_t *bis)
+{
+	writeb(readb(SCPDR) | 0x02, SCPDR);
+	writew((readw(SCPCR) & ~0x0c) | 0x04, SCPCR);
+	return 0;
+}
+
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+	return bus == 0 && cs == 0;
+}
+
+void spi_cs_activate(struct spi_slave *slave)
+{
+	writeb(readb(SCPDR) & ~0x02, SCPDR);
+}
+
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+	writeb(readb(SCPDR) | 0x02, SCPDR);
+}

--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_ROCKCHIP_SPI) += rk_spi.o
 obj-$(CONFIG_SANDBOX_SPI) += sandbox_spi.o
 obj-$(CONFIG_SH_SPI) += sh_spi.o
 obj-$(CONFIG_SH_QSPI) += sh_qspi.o
+obj-$(CONFIG_TAC_SSU) += tac_ssu.o
 obj-$(CONFIG_TEGRA114_SPI) += tegra114_spi.o
 obj-$(CONFIG_TEGRA20_SFLASH) += tegra20_sflash.o
 obj-$(CONFIG_TEGRA20_SLINK) += tegra20_slink.o

--- /dev/null
+++ b/drivers/spi/tac_ssu.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016 Yoshinori Sato <[e-mail]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <spi.h>
+#include <asm/io.h>
+
+#define DR (0xb0008000)
+#define BR (0xb0008004)
+#define SR (0xb0008002)
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ssu_spi_slave {
+	struct spi_slave slave;
+};
+
+void spi_set_speed(struct spi_slave *slave, uint hz)
+{
+}
+
+int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
+		    const void *dout, void *din, unsigned long flags)
+{
+	const char *out = dout;
+	char *in = din;
+	unsigned int	j;
+   
+	if (flags & SPI_XFER_BEGIN)
+		spi_cs_activate(slave);
+
+	for (j = bitlen / 8; j > 0; j--) {
+		if (out) {
+			writeb(*out++, DR);
+			while(!(readb(SR) & 0x80));
+		}
+		if (in) {
+			while(!(readb(SR) & 0x80));
+			*in++ = readb(BR);
+		}
+	}
+	if (out)
+		readb(BR);
+		
+	if (flags & SPI_XFER_END)
+		spi_cs_deactivate(slave);
+
+	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 ssu_spi_slave *ss;
+	ss = spi_alloc_slave(struct ssu_spi_slave, bus, cs);
+	if (!ss)
+		return NULL;
+	return &ss->slave;
+}
+
+void spi_free_slave(struct spi_slave *slave)
+{
+}
+
+int spi_claim_bus(struct spi_slave *slave)
+{
+	return 0;
+}
+
+void spi_release_bus(struct spi_slave *slave)
+{
+	/* Nothing to do */
+}

--- a/include/configs/shmin.h
+++ b/include/configs/shmin.h
@@ -89,4 +89,11 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT	120000
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500
 
+#define CONFIG_MMC
+#define CONFIG_MMC_SPI
+#define CONFIG_CMD_MMC_SPI
+#define CONFIG_GENERIC_MMC
+#define CONFIG_DOS_PARTITION
+#define CONFIG_TAC_SSU
+
 #endif	/* __SHMIN_H */