diff options
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/Makefile | 6 | ||||
| -rw-r--r-- | drivers/spi/fdt_spi.c | 186 | ||||
| -rw-r--r-- | drivers/spi/tegra114_spi.c | 405 | ||||
| -rw-r--r-- | drivers/spi/tegra20_sflash.c (renamed from drivers/spi/tegra_spi.c) | 217 | ||||
| -rw-r--r-- | drivers/spi/tegra20_slink.c (renamed from drivers/spi/tegra_slink.c) | 128 | 
5 files changed, 792 insertions, 150 deletions
| diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 42685955d..d08609eff 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -50,8 +50,10 @@ COBJS-$(CONFIG_OMAP3_SPI) += omap3_spi.o  COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o  COBJS-$(CONFIG_SH_SPI) += sh_spi.o  COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o -COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi.o -COBJS-$(CONFIG_TEGRA_SLINK) += tegra_slink.o +COBJS-$(CONFIG_FDT_SPI) += fdt_spi.o +COBJS-$(CONFIG_TEGRA20_SFLASH) += tegra20_sflash.o +COBJS-$(CONFIG_TEGRA20_SLINK) += tegra20_slink.o +COBJS-$(CONFIG_TEGRA114_SPI) += tegra114_spi.o  COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o  COBJS	:= $(COBJS-y) diff --git a/drivers/spi/fdt_spi.c b/drivers/spi/fdt_spi.c new file mode 100644 index 000000000..58f139a54 --- /dev/null +++ b/drivers/spi/fdt_spi.c @@ -0,0 +1,186 @@ +/* + * Common fdt based SPI driver front end + * + * Copyright (c) 2013 NVIDIA Corporation + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * 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 <common.h> +#include <malloc.h> +#include <asm/io.h> +#include <asm/gpio.h> +#include <asm/arch/clock.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra20/tegra20_sflash.h> +#include <asm/arch-tegra20/tegra20_slink.h> +#include <asm/arch-tegra114/tegra114_spi.h> +#include <spi.h> +#include <fdtdec.h> + +DECLARE_GLOBAL_DATA_PTR; + +struct fdt_spi_driver { +	int compat; +	int max_ctrls; +	int (*init)(int *node_list, int count); +	int (*claim_bus)(struct spi_slave *slave); +	int (*release_bus)(struct spi_slave *slave); +	int (*cs_is_valid)(unsigned int bus, unsigned int cs); +	struct spi_slave *(*setup_slave)(unsigned int bus, unsigned int cs, +					unsigned int max_hz, unsigned int mode); +	void (*free_slave)(struct spi_slave *slave); +	void (*cs_activate)(struct spi_slave *slave); +	void (*cs_deactivate)(struct spi_slave *slave); +	int (*xfer)(struct spi_slave *slave, unsigned int bitlen, +		    const void *data_out, void *data_in, unsigned long flags); +}; + +static struct fdt_spi_driver fdt_spi_drivers[] = { +#ifdef CONFIG_TEGRA20_SFLASH +	{ +		.compat		= COMPAT_NVIDIA_TEGRA20_SFLASH, +		.max_ctrls	= 1, +		.init		= tegra20_spi_init, +		.claim_bus	= tegra20_spi_claim_bus, +		.cs_is_valid	= tegra20_spi_cs_is_valid, +		.setup_slave	= tegra20_spi_setup_slave, +		.free_slave	= tegra20_spi_free_slave, +		.cs_activate	= tegra20_spi_cs_activate, +		.cs_deactivate	= tegra20_spi_cs_deactivate, +		.xfer		= tegra20_spi_xfer, +	}, +#endif +#ifdef CONFIG_TEGRA20_SLINK +	{ +		.compat		= COMPAT_NVIDIA_TEGRA20_SLINK, +		.max_ctrls	= CONFIG_TEGRA_SLINK_CTRLS, +		.init		= tegra30_spi_init, +		.claim_bus	= tegra30_spi_claim_bus, +		.cs_is_valid	= tegra30_spi_cs_is_valid, +		.setup_slave	= tegra30_spi_setup_slave, +		.free_slave	= tegra30_spi_free_slave, +		.cs_activate	= tegra30_spi_cs_activate, +		.cs_deactivate	= tegra30_spi_cs_deactivate, +		.xfer		= tegra30_spi_xfer, +	}, +#endif +#ifdef CONFIG_TEGRA114_SPI +	{ +		.compat		= COMPAT_NVIDIA_TEGRA114_SPI, +		.max_ctrls	= CONFIG_TEGRA114_SPI_CTRLS, +		.init		= tegra114_spi_init, +		.claim_bus	= tegra114_spi_claim_bus, +		.cs_is_valid	= tegra114_spi_cs_is_valid, +		.setup_slave	= tegra114_spi_setup_slave, +		.free_slave	= tegra114_spi_free_slave, +		.cs_activate	= tegra114_spi_cs_activate, +		.cs_deactivate	= tegra114_spi_cs_deactivate, +		.xfer		= tegra114_spi_xfer, +	}, +#endif +}; + +static struct fdt_spi_driver *driver; + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ +	if (!driver) +		return 0; +	else if (!driver->cs_is_valid) +		return 1; +	else +		return driver->cs_is_valid(bus, cs); +} + +struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, +		unsigned int max_hz, unsigned int mode) +{ +	if (!driver || !driver->setup_slave) +		return NULL; + +	return driver->setup_slave(bus, cs, max_hz, mode); +} + +void spi_free_slave(struct spi_slave *slave) +{ +	if (driver && driver->free_slave) +		return driver->free_slave(slave); +} + +static int spi_init_driver(struct fdt_spi_driver *driver) +{ +	int count; +	int node_list[driver->max_ctrls]; + +	count = fdtdec_find_aliases_for_id(gd->fdt_blob, "spi", +					   driver->compat, +					   node_list, +					   driver->max_ctrls); +	return driver->init(node_list, count); +} + +void spi_init(void) +{ +	int i; + +	for (i = 0; i < ARRAY_SIZE(fdt_spi_drivers); i++) { +		driver = &fdt_spi_drivers[i]; +		if (!spi_init_driver(driver)) +			break; +	} +	if (i == ARRAY_SIZE(fdt_spi_drivers)) +		driver = NULL; +} + +int spi_claim_bus(struct spi_slave *slave) +{ +	if (!driver) +		return 1; +	if (!driver->claim_bus) +		return 0; + +	return driver->claim_bus(slave); +} + +void spi_release_bus(struct spi_slave *slave) +{ +	if (driver && driver->release_bus) +		driver->release_bus(slave); +} + +void spi_cs_activate(struct spi_slave *slave) +{ +	if (driver && driver->cs_activate) +		driver->cs_activate(slave); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ +	if (driver && driver->cs_deactivate) +		driver->cs_deactivate(slave); +} + +int spi_xfer(struct spi_slave *slave, unsigned int bitlen, +	     const void *data_out, void *data_in, unsigned long flags) +{ +	if (!driver || !driver->xfer) +		return -1; + +	return driver->xfer(slave, bitlen, data_out, data_in, flags); +} diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c new file mode 100644 index 000000000..b11a0a1ff --- /dev/null +++ b/drivers/spi/tegra114_spi.c @@ -0,0 +1,405 @@ +/* + * NVIDIA Tegra SPI controller (T114 and later) + * + * Copyright (c) 2010-2013 NVIDIA Corporation + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * 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 <common.h> +#include <malloc.h> +#include <asm/io.h> +#include <asm/gpio.h> +#include <asm/arch/clock.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra114/tegra114_spi.h> +#include <spi.h> +#include <fdtdec.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* COMMAND1 */ +#define SPI_CMD1_GO			(1 << 31) +#define SPI_CMD1_M_S			(1 << 30) +#define SPI_CMD1_MODE_MASK		0x3 +#define SPI_CMD1_MODE_SHIFT		28 +#define SPI_CMD1_CS_SEL_MASK		0x3 +#define SPI_CMD1_CS_SEL_SHIFT		26 +#define SPI_CMD1_CS_POL_INACTIVE3	(1 << 25) +#define SPI_CMD1_CS_POL_INACTIVE2	(1 << 24) +#define SPI_CMD1_CS_POL_INACTIVE1	(1 << 23) +#define SPI_CMD1_CS_POL_INACTIVE0	(1 << 22) +#define SPI_CMD1_CS_SW_HW		(1 << 21) +#define SPI_CMD1_CS_SW_VAL		(1 << 20) +#define SPI_CMD1_IDLE_SDA_MASK		0x3 +#define SPI_CMD1_IDLE_SDA_SHIFT		18 +#define SPI_CMD1_BIDIR			(1 << 17) +#define SPI_CMD1_LSBI_FE		(1 << 16) +#define SPI_CMD1_LSBY_FE		(1 << 15) +#define SPI_CMD1_BOTH_EN_BIT		(1 << 14) +#define SPI_CMD1_BOTH_EN_BYTE		(1 << 13) +#define SPI_CMD1_RX_EN			(1 << 12) +#define SPI_CMD1_TX_EN			(1 << 11) +#define SPI_CMD1_PACKED			(1 << 5) +#define SPI_CMD1_BIT_LEN_MASK		0x1F +#define SPI_CMD1_BIT_LEN_SHIFT		0 + +/* COMMAND2 */ +#define SPI_CMD2_TX_CLK_TAP_DELAY	(1 << 6) +#define SPI_CMD2_TX_CLK_TAP_DELAY_MASK	(0x3F << 6) +#define SPI_CMD2_RX_CLK_TAP_DELAY	(1 << 0) +#define SPI_CMD2_RX_CLK_TAP_DELAY_MASK	(0x3F << 0) + +/* TRANSFER STATUS */ +#define SPI_XFER_STS_RDY		(1 << 30) + +/* FIFO STATUS */ +#define SPI_FIFO_STS_CS_INACTIVE	(1 << 31) +#define SPI_FIFO_STS_FRAME_END		(1 << 30) +#define SPI_FIFO_STS_RX_FIFO_FLUSH	(1 << 15) +#define SPI_FIFO_STS_TX_FIFO_FLUSH	(1 << 14) +#define SPI_FIFO_STS_ERR		(1 << 8) +#define SPI_FIFO_STS_TX_FIFO_OVF	(1 << 7) +#define SPI_FIFO_STS_TX_FIFO_UNR	(1 << 6) +#define SPI_FIFO_STS_RX_FIFO_OVF	(1 << 5) +#define SPI_FIFO_STS_RX_FIFO_UNR	(1 << 4) +#define SPI_FIFO_STS_TX_FIFO_FULL	(1 << 3) +#define SPI_FIFO_STS_TX_FIFO_EMPTY	(1 << 2) +#define SPI_FIFO_STS_RX_FIFO_FULL	(1 << 1) +#define SPI_FIFO_STS_RX_FIFO_EMPTY	(1 << 0) + +#define SPI_TIMEOUT		1000 +#define TEGRA_SPI_MAX_FREQ	52000000 + +struct spi_regs { +	u32 command1;	/* 000:SPI_COMMAND1 register */ +	u32 command2;	/* 004:SPI_COMMAND2 register */ +	u32 timing1;	/* 008:SPI_CS_TIM1 register */ +	u32 timing2;	/* 00c:SPI_CS_TIM2 register */ +	u32 xfer_status;/* 010:SPI_TRANS_STATUS register */ +	u32 fifo_status;/* 014:SPI_FIFO_STATUS register */ +	u32 tx_data;	/* 018:SPI_TX_DATA register */ +	u32 rx_data;	/* 01c:SPI_RX_DATA register */ +	u32 dma_ctl;	/* 020:SPI_DMA_CTL register */ +	u32 dma_blk;	/* 024:SPI_DMA_BLK register */ +	u32 rsvd[56];	/* 028-107 reserved */ +	u32 tx_fifo;	/* 108:SPI_FIFO1 register */ +	u32 rsvd2[31];	/* 10c-187 reserved */ +	u32 rx_fifo;	/* 188:SPI_FIFO2 register */ +	u32 spare_ctl;	/* 18c:SPI_SPARE_CTRL register */ +}; + +struct tegra_spi_ctrl { +	struct spi_regs *regs; +	unsigned int freq; +	unsigned int mode; +	int periph_id; +	int valid; +}; + +struct tegra_spi_slave { +	struct spi_slave slave; +	struct tegra_spi_ctrl *ctrl; +}; + +static struct tegra_spi_ctrl spi_ctrls[CONFIG_TEGRA114_SPI_CTRLS]; + +static inline struct tegra_spi_slave *to_tegra_spi(struct spi_slave *slave) +{ +	return container_of(slave, struct tegra_spi_slave, slave); +} + +int tegra114_spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ +	if (bus >= CONFIG_TEGRA114_SPI_CTRLS || cs > 3 || !spi_ctrls[bus].valid) +		return 0; +	else +		return 1; +} + +struct spi_slave *tegra114_spi_setup_slave(unsigned int bus, unsigned int cs, +		unsigned int max_hz, unsigned int mode) +{ +	struct tegra_spi_slave *spi; + +	debug("%s: bus: %u, cs: %u, max_hz: %u, mode: %u\n", __func__, +		bus, cs, max_hz, mode); + +	if (!spi_cs_is_valid(bus, cs)) { +		printf("SPI error: unsupported bus %d / chip select %d\n", +		       bus, cs); +		return NULL; +	} + +	if (max_hz > TEGRA_SPI_MAX_FREQ) { +		printf("SPI error: unsupported frequency %d Hz. Max frequency" +			" is %d Hz\n", max_hz, TEGRA_SPI_MAX_FREQ); +		return NULL; +	} + +	spi = malloc(sizeof(struct tegra_spi_slave)); +	if (!spi) { +		printf("SPI error: malloc of SPI structure failed\n"); +		return NULL; +	} +	spi->slave.bus = bus; +	spi->slave.cs = cs; +	spi->ctrl = &spi_ctrls[bus]; +	if (!spi->ctrl) { +		printf("SPI error: could not find controller for bus %d\n", +		       bus); +		return NULL; +	} + +	if (max_hz < spi->ctrl->freq) { +		debug("%s: limiting frequency from %u to %u\n", __func__, +		      spi->ctrl->freq, max_hz); +		spi->ctrl->freq = max_hz; +	} +	spi->ctrl->mode = mode; + +	return &spi->slave; +} + +void tegra114_spi_free_slave(struct spi_slave *slave) +{ +	struct tegra_spi_slave *spi = to_tegra_spi(slave); + +	free(spi); +} + +int tegra114_spi_init(int *node_list, int count) +{ +	struct tegra_spi_ctrl *ctrl; +	int i; +	int node = 0; +	int found = 0; + +	for (i = 0; i < count; i++) { +		ctrl = &spi_ctrls[i]; +		node = node_list[i]; + +		ctrl->regs = (struct spi_regs *)fdtdec_get_addr(gd->fdt_blob, +								 node, "reg"); +		if ((fdt_addr_t)ctrl->regs == FDT_ADDR_T_NONE) { +			debug("%s: no spi register found\n", __func__); +			continue; +		} +		ctrl->freq = fdtdec_get_int(gd->fdt_blob, node, +					    "spi-max-frequency", 0); +		if (!ctrl->freq) { +			debug("%s: no spi max frequency found\n", __func__); +			continue; +		} + +		ctrl->periph_id = clock_decode_periph_id(gd->fdt_blob, node); +		if (ctrl->periph_id == PERIPH_ID_NONE) { +			debug("%s: could not decode periph id\n", __func__); +			continue; +		} +		ctrl->valid = 1; +		found = 1; + +		debug("%s: found controller at %p, freq = %u, periph_id = %d\n", +		      __func__, ctrl->regs, ctrl->freq, ctrl->periph_id); +	} + +	return !found; +} + +int tegra114_spi_claim_bus(struct spi_slave *slave) +{ +	struct tegra_spi_slave *spi = to_tegra_spi(slave); +	struct spi_regs *regs = spi->ctrl->regs; + +	/* Change SPI clock to correct frequency, PLLP_OUT0 source */ +	clock_start_periph_pll(spi->ctrl->periph_id, CLOCK_ID_PERIPH, +			       spi->ctrl->freq); + +	/* Clear stale status here */ +	setbits_le32(®s->fifo_status, +		     SPI_FIFO_STS_ERR		| +		     SPI_FIFO_STS_TX_FIFO_OVF	| +		     SPI_FIFO_STS_TX_FIFO_UNR	| +		     SPI_FIFO_STS_RX_FIFO_OVF	| +		     SPI_FIFO_STS_RX_FIFO_UNR	| +		     SPI_FIFO_STS_TX_FIFO_FULL	| +		     SPI_FIFO_STS_TX_FIFO_EMPTY	| +		     SPI_FIFO_STS_RX_FIFO_FULL	| +		     SPI_FIFO_STS_RX_FIFO_EMPTY); +	debug("%s: FIFO STATUS = %08x\n", __func__, readl(®s->fifo_status)); + +	/* Set master mode and sw controlled CS */ +	setbits_le32(®s->command1, SPI_CMD1_M_S | SPI_CMD1_CS_SW_HW | +		     (spi->ctrl->mode << SPI_CMD1_MODE_SHIFT)); +	debug("%s: COMMAND1 = %08x\n", __func__, readl(®s->command1)); + +	return 0; +} + +void tegra114_spi_cs_activate(struct spi_slave *slave) +{ +	struct tegra_spi_slave *spi = to_tegra_spi(slave); +	struct spi_regs *regs = spi->ctrl->regs; + +	clrbits_le32(®s->command1, SPI_CMD1_CS_SW_VAL); +} + +void tegra114_spi_cs_deactivate(struct spi_slave *slave) +{ +	struct tegra_spi_slave *spi = to_tegra_spi(slave); +	struct spi_regs *regs = spi->ctrl->regs; + +	setbits_le32(®s->command1, SPI_CMD1_CS_SW_VAL); +} + +int tegra114_spi_xfer(struct spi_slave *slave, unsigned int bitlen, +		const void *data_out, void *data_in, unsigned long flags) +{ +	struct tegra_spi_slave *spi = to_tegra_spi(slave); +	struct spi_regs *regs = spi->ctrl->regs; +	u32 reg, tmpdout, tmpdin = 0; +	const u8 *dout = data_out; +	u8 *din = data_in; +	int num_bytes; +	int ret; + +	debug("%s: slave %u:%u dout %p din %p bitlen %u\n", +	      __func__, slave->bus, slave->cs, dout, din, bitlen); +	if (bitlen % 8) +		return -1; +	num_bytes = bitlen / 8; + +	ret = 0; + +	/* clear all error status bits */ +	reg = readl(®s->fifo_status); +	writel(reg, ®s->fifo_status); + +	/* clear ready bit */ +	setbits_le32(®s->xfer_status, SPI_XFER_STS_RDY); + +	clrsetbits_le32(®s->command1, SPI_CMD1_CS_SW_VAL, +			SPI_CMD1_RX_EN | SPI_CMD1_TX_EN | SPI_CMD1_LSBY_FE | +			(slave->cs << SPI_CMD1_CS_SEL_SHIFT)); + +	/* set xfer size to 1 block (32 bits) */ +	writel(0, ®s->dma_blk); + +	if (flags & SPI_XFER_BEGIN) +		spi_cs_activate(slave); + +	/* handle data in 32-bit chunks */ +	while (num_bytes > 0) { +		int bytes; +		int is_read = 0; +		int tm, i; + +		tmpdout = 0; +		bytes = (num_bytes > 4) ?  4 : num_bytes; + +		if (dout != NULL) { +			for (i = 0; i < bytes; ++i) +				tmpdout = (tmpdout << 8) | dout[i]; +			dout += bytes; +		} + +		num_bytes -= bytes; + +		clrsetbits_le32(®s->command1, +				SPI_CMD1_BIT_LEN_MASK << SPI_CMD1_BIT_LEN_SHIFT, +				(bytes * 8 - 1) << SPI_CMD1_BIT_LEN_SHIFT); +		writel(tmpdout, ®s->tx_fifo); +		setbits_le32(®s->command1, SPI_CMD1_GO); + +		/* +		 * Wait for SPI transmit FIFO to empty, or to time out. +		 * The RX FIFO status will be read and cleared last +		 */ +		for (tm = 0, is_read = 0; tm < SPI_TIMEOUT; ++tm) { +			u32 fifo_status, xfer_status; + +			fifo_status = readl(®s->fifo_status); + +			/* We can exit when we've had both RX and TX activity */ +			if (is_read && +			    (fifo_status & SPI_FIFO_STS_TX_FIFO_EMPTY)) +				break; + +			xfer_status = readl(®s->xfer_status); +			if (!(xfer_status & SPI_XFER_STS_RDY)) +				continue; + +			if (fifo_status & SPI_FIFO_STS_ERR) { +				debug("%s: got a fifo error: ", __func__); +				if (fifo_status & SPI_FIFO_STS_TX_FIFO_OVF) +					debug("tx FIFO overflow "); +				if (fifo_status & SPI_FIFO_STS_TX_FIFO_UNR) +					debug("tx FIFO underrun "); +				if (fifo_status & SPI_FIFO_STS_RX_FIFO_OVF) +					debug("rx FIFO overflow "); +				if (fifo_status & SPI_FIFO_STS_RX_FIFO_UNR) +					debug("rx FIFO underrun "); +				if (fifo_status & SPI_FIFO_STS_TX_FIFO_FULL) +					debug("tx FIFO full "); +				if (fifo_status & SPI_FIFO_STS_TX_FIFO_EMPTY) +					debug("tx FIFO empty "); +				if (fifo_status & SPI_FIFO_STS_RX_FIFO_FULL) +					debug("rx FIFO full "); +				if (fifo_status & SPI_FIFO_STS_RX_FIFO_EMPTY) +					debug("rx FIFO empty "); +				debug("\n"); +				break; +			} + +			if (!(fifo_status & SPI_FIFO_STS_RX_FIFO_EMPTY)) { +				tmpdin = readl(®s->rx_fifo); +				is_read = 1; + +				/* swap bytes read in */ +				if (din != NULL) { +					for (i = bytes - 1; i >= 0; --i) { +						din[i] = tmpdin & 0xff; +						tmpdin >>= 8; +					} +					din += bytes; +				} +			} +		} + +		if (tm >= SPI_TIMEOUT) +			ret = tm; + +		/* clear ACK RDY, etc. bits */ +		writel(readl(®s->fifo_status), ®s->fifo_status); +	} + +	if (flags & SPI_XFER_END) +		spi_cs_deactivate(slave); + +	debug("%s: transfer ended. Value=%08x, fifo_status = %08x\n", +	      __func__, tmpdin, readl(®s->fifo_status)); + +	if (ret) { +		printf("%s: timeout during SPI transfer, tm %d\n", +		       __func__, ret); +		return -1; +	} + +	return 0; +} diff --git a/drivers/spi/tegra_spi.c b/drivers/spi/tegra20_sflash.c index 05027af3b..9322ce7f6 100644 --- a/drivers/spi/tegra_spi.c +++ b/drivers/spi/tegra20_sflash.c @@ -1,5 +1,5 @@  /* - * Copyright (c) 2010-2012 NVIDIA Corporation + * Copyright (c) 2010-2013 NVIDIA Corporation   * With help from the mpc8xxx SPI driver   * With more help from omap3_spi SPI driver   * @@ -28,34 +28,80 @@  #include <asm/gpio.h>  #include <asm/arch/clock.h>  #include <asm/arch/pinmux.h> -#include <asm/arch/uart-spi-switch.h>  #include <asm/arch-tegra/clk_rst.h> -#include <asm/arch-tegra/tegra_spi.h> +#include <asm/arch-tegra20/tegra20_sflash.h>  #include <spi.h>  #include <fdtdec.h>  DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_SPI_CORRUPTS_UART) - #define corrupt_delay()	udelay(CONFIG_SPI_CORRUPTS_UART_DLY); -#else - #define corrupt_delay() -#endif +#define SPI_CMD_GO			(1 << 30) +#define SPI_CMD_ACTIVE_SCLK_SHIFT	26 +#define SPI_CMD_ACTIVE_SCLK_MASK	(3 << SPI_CMD_ACTIVE_SCLK_SHIFT) +#define SPI_CMD_CK_SDA			(1 << 21) +#define SPI_CMD_ACTIVE_SDA_SHIFT	18 +#define SPI_CMD_ACTIVE_SDA_MASK		(3 << SPI_CMD_ACTIVE_SDA_SHIFT) +#define SPI_CMD_CS_POL			(1 << 16) +#define SPI_CMD_TXEN			(1 << 15) +#define SPI_CMD_RXEN			(1 << 14) +#define SPI_CMD_CS_VAL			(1 << 13) +#define SPI_CMD_CS_SOFT			(1 << 12) +#define SPI_CMD_CS_DELAY		(1 << 9) +#define SPI_CMD_CS3_EN			(1 << 8) +#define SPI_CMD_CS2_EN			(1 << 7) +#define SPI_CMD_CS1_EN			(1 << 6) +#define SPI_CMD_CS0_EN			(1 << 5) +#define SPI_CMD_BIT_LENGTH		(1 << 4) +#define SPI_CMD_BIT_LENGTH_MASK		0x0000001F -struct tegra_spi_slave { -	struct spi_slave slave; -	struct spi_tegra *regs; +#define SPI_STAT_BSY			(1 << 31) +#define SPI_STAT_RDY			(1 << 30) +#define SPI_STAT_RXF_FLUSH		(1 << 29) +#define SPI_STAT_TXF_FLUSH		(1 << 28) +#define SPI_STAT_RXF_UNR		(1 << 27) +#define SPI_STAT_TXF_OVF		(1 << 26) +#define SPI_STAT_RXF_EMPTY		(1 << 25) +#define SPI_STAT_RXF_FULL		(1 << 24) +#define SPI_STAT_TXF_EMPTY		(1 << 23) +#define SPI_STAT_TXF_FULL		(1 << 22) +#define SPI_STAT_SEL_TXRX_N		(1 << 16) +#define SPI_STAT_CUR_BLKCNT		(1 << 15) + +#define SPI_TIMEOUT		1000 +#define TEGRA_SPI_MAX_FREQ	52000000 + +struct spi_regs { +	u32 command;	/* SPI_COMMAND_0 register  */ +	u32 status;	/* SPI_STATUS_0 register */ +	u32 rx_cmp;	/* SPI_RX_CMP_0 register  */ +	u32 dma_ctl;	/* SPI_DMA_CTL_0 register */ +	u32 tx_fifo;	/* SPI_TX_FIFO_0 register */ +	u32 rsvd[3];	/* offsets 0x14 to 0x1F reserved */ +	u32 rx_fifo;	/* SPI_RX_FIFO_0 register */ +}; + +struct tegra_spi_ctrl { +	struct spi_regs *regs;  	unsigned int freq;  	unsigned int mode;  	int periph_id; +	int valid; +}; + +struct tegra_spi_slave { +	struct spi_slave slave; +	struct tegra_spi_ctrl *ctrl;  }; +/* tegra20 only supports one SFLASH controller */ +static struct tegra_spi_ctrl spi_ctrls[1]; +  static inline struct tegra_spi_slave *to_tegra_spi(struct spi_slave *slave)  {  	return container_of(slave, struct tegra_spi_slave, slave);  } -int spi_cs_is_valid(unsigned int bus, unsigned int cs) +int tegra20_spi_cs_is_valid(unsigned int bus, unsigned int cs)  {  	/* Tegra20 SPI-Flash - only 1 device ('bus/cs') */  	if (bus != 0 || cs != 0) @@ -64,8 +110,8 @@ int spi_cs_is_valid(unsigned int bus, unsigned int cs)  		return 1;  } -struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, -		unsigned int max_hz, unsigned int mode) +struct spi_slave *tegra20_spi_setup_slave(unsigned int bus, unsigned int cs, +				  unsigned int max_hz, unsigned int mode)  {  	struct tegra_spi_slave *spi; @@ -86,86 +132,95 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,  		printf("SPI error: malloc of SPI structure failed\n");  		return NULL;  	} -#ifdef CONFIG_OF_CONTROL -	int node = fdtdec_next_compatible(gd->fdt_blob, 0, -					  COMPAT_NVIDIA_TEGRA20_SFLASH); -	if (node < 0) { -		debug("%s: cannot locate sflash node\n", __func__); -		return NULL; -	} -	if (!fdtdec_get_is_enabled(gd->fdt_blob, node)) { -		debug("%s: sflash is disabled\n", __func__); -		return NULL; -	} -	spi->regs = (struct spi_tegra *)fdtdec_get_addr(gd->fdt_blob, -							node, "reg"); -	if ((fdt_addr_t)spi->regs == FDT_ADDR_T_NONE) { -		debug("%s: no sflash register found\n", __func__); +	spi->slave.bus = bus; +	spi->slave.cs = cs; +	spi->ctrl = &spi_ctrls[bus]; +	if (!spi->ctrl) { +		printf("SPI error: could not find controller for bus %d\n", +		       bus);  		return NULL;  	} -	spi->freq = fdtdec_get_int(gd->fdt_blob, node, "spi-max-frequency", 0); -	if (!spi->freq) { -		debug("%s: no sflash max frequency found\n", __func__); -		return NULL; -	} -	spi->periph_id = clock_decode_periph_id(gd->fdt_blob, node); -	if (spi->periph_id == PERIPH_ID_NONE) { -		debug("%s: could not decode periph id\n", __func__); -		return NULL; -	} -#else -	spi->regs = (struct spi_tegra *)NV_PA_SPI_BASE; -	spi->freq = TEGRA_SPI_MAX_FREQ; -	spi->periph_id = PERIPH_ID_SPI1; -#endif -	if (max_hz < spi->freq) { + +	if (max_hz < spi->ctrl->freq) {  		debug("%s: limiting frequency from %u to %u\n", __func__, -		      spi->freq, max_hz); -		spi->freq = max_hz; +		      spi->ctrl->freq, max_hz); +		spi->ctrl->freq = max_hz;  	} -	debug("%s: controller initialized at %p, freq = %u, periph_id = %d\n", -	      __func__, spi->regs, spi->freq, spi->periph_id); -	spi->mode = mode; +	spi->ctrl->mode = mode;  	return &spi->slave;  } -void spi_free_slave(struct spi_slave *slave) +void tegra20_spi_free_slave(struct spi_slave *slave)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave);  	free(spi);  } -void spi_init(void) +int tegra20_spi_init(int *node_list, int count)  { -	/* do nothing */ +	struct tegra_spi_ctrl *ctrl; +	int i; +	int node = 0; +	int found = 0; + +	for (i = 0; i < count; i++) { +		ctrl = &spi_ctrls[i]; +		node = node_list[i]; + +		ctrl->regs = (struct spi_regs *)fdtdec_get_addr(gd->fdt_blob, +								node, "reg"); +		if ((fdt_addr_t)ctrl->regs == FDT_ADDR_T_NONE) { +			debug("%s: no slink register found\n", __func__); +			continue; +		} +		ctrl->freq = fdtdec_get_int(gd->fdt_blob, node, +					    "spi-max-frequency", 0); +		if (!ctrl->freq) { +			debug("%s: no slink max frequency found\n", __func__); +			continue; +		} + +		ctrl->periph_id = clock_decode_periph_id(gd->fdt_blob, node); +		if (ctrl->periph_id == PERIPH_ID_NONE) { +			debug("%s: could not decode periph id\n", __func__); +			continue; +		} +		ctrl->valid = 1; +		found = 1; + +		debug("%s: found controller at %p, freq = %u, periph_id = %d\n", +		      __func__, ctrl->regs, ctrl->freq, ctrl->periph_id); +	} +	return !found;  } -int spi_claim_bus(struct spi_slave *slave) +int tegra20_spi_claim_bus(struct spi_slave *slave)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave); -	struct spi_tegra *regs = spi->regs; +	struct spi_regs *regs = spi->ctrl->regs;  	u32 reg;  	/* Change SPI clock to correct frequency, PLLP_OUT0 source */ -	clock_start_periph_pll(spi->periph_id, CLOCK_ID_PERIPH, spi->freq); +	clock_start_periph_pll(spi->ctrl->periph_id, CLOCK_ID_PERIPH, +			       spi->ctrl->freq);  	/* Clear stale status here */  	reg = SPI_STAT_RDY | SPI_STAT_RXF_FLUSH | SPI_STAT_TXF_FLUSH | \  		SPI_STAT_RXF_UNR | SPI_STAT_TXF_OVF;  	writel(reg, ®s->status); -	debug("spi_init: STATUS = %08x\n", readl(®s->status)); +	debug("%s: STATUS = %08x\n", __func__, readl(®s->status));  	/*  	 * Use sw-controlled CS, so we can clock in data after ReadID, etc.  	 */ -	reg = (spi->mode & 1) << SPI_CMD_ACTIVE_SDA_SHIFT; -	if (spi->mode & 2) +	reg = (spi->ctrl->mode & 1) << SPI_CMD_ACTIVE_SDA_SHIFT; +	if (spi->ctrl->mode & 2)  		reg |= 1 << SPI_CMD_ACTIVE_SCLK_SHIFT;  	clrsetbits_le32(®s->command, SPI_CMD_ACTIVE_SCLK_MASK |  		SPI_CMD_ACTIVE_SDA_MASK, SPI_CMD_CS_SOFT | reg); -	debug("spi_init: COMMAND = %08x\n", readl(®s->command)); +	debug("%s: COMMAND = %08x\n", __func__, readl(®s->command));  	/*  	 * SPI pins on Tegra20 are muxed - change pinmux later due to UART @@ -173,58 +228,34 @@ int spi_claim_bus(struct spi_slave *slave)  	 */  	pinmux_set_func(PINGRP_GMD, PMUX_FUNC_SFLASH);  	pinmux_tristate_disable(PINGRP_LSPI); +	pinmux_set_func(PINGRP_GMC, PMUX_FUNC_SFLASH); -#ifndef CONFIG_SPI_UART_SWITCH -	/* -	 * NOTE: -	 * Only set PinMux bits 3:2 to SPI here on boards that don't have the -	 * SPI UART switch or subsequent UART data won't go out!  See -	 * spi_uart_switch(). -	 */ -	/* TODO: pinmux_set_func(PINGRP_GMC, PMUX_FUNC_SFLASH); */ -#endif  	return 0;  } -void spi_release_bus(struct spi_slave *slave) -{ -	/* -	 * We can't release UART_DISABLE and set pinmux to UART4 here since -	 * some code (e,g, spi_flash_probe) uses printf() while the SPI -	 * bus is held. That is arguably bad, but it has the advantage of -	 * already being in the source tree. -	 */ -} - -void spi_cs_activate(struct spi_slave *slave) +void tegra20_spi_cs_activate(struct spi_slave *slave)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave); - -	pinmux_select_spi(); +	struct spi_regs *regs = spi->ctrl->regs;  	/* CS is negated on Tegra, so drive a 1 to get a 0 */ -	setbits_le32(&spi->regs->command, SPI_CMD_CS_VAL); - -	corrupt_delay();		/* Let UART settle */ +	setbits_le32(®s->command, SPI_CMD_CS_VAL);  } -void spi_cs_deactivate(struct spi_slave *slave) +void tegra20_spi_cs_deactivate(struct spi_slave *slave)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave); - -	pinmux_select_uart(); +	struct spi_regs *regs = spi->ctrl->regs;  	/* CS is negated on Tegra, so drive a 0 to get a 1 */ -	clrbits_le32(&spi->regs->command, SPI_CMD_CS_VAL); - -	corrupt_delay();		/* Let SPI settle */ +	clrbits_le32(®s->command, SPI_CMD_CS_VAL);  } -int spi_xfer(struct spi_slave *slave, unsigned int bitlen, +int tegra20_spi_xfer(struct spi_slave *slave, unsigned int bitlen,  		const void *data_out, void *data_in, unsigned long flags)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave); -	struct spi_tegra *regs = spi->regs; +	struct spi_regs *regs = spi->ctrl->regs;  	u32 reg, tmpdout, tmpdin = 0;  	const u8 *dout = data_out;  	u8 *din = data_in; diff --git a/drivers/spi/tegra_slink.c b/drivers/spi/tegra20_slink.c index 9da58774d..664de6e91 100644 --- a/drivers/spi/tegra_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -27,14 +27,68 @@  #include <asm/gpio.h>  #include <asm/arch/clock.h>  #include <asm/arch-tegra/clk_rst.h> -#include <asm/arch-tegra/tegra_slink.h> +#include <asm/arch-tegra20/tegra20_slink.h>  #include <spi.h>  #include <fdtdec.h>  DECLARE_GLOBAL_DATA_PTR; +/* COMMAND */ +#define SLINK_CMD_ENB			(1 << 31) +#define SLINK_CMD_GO			(1 << 30) +#define SLINK_CMD_M_S			(1 << 28) +#define SLINK_CMD_CK_SDA		(1 << 21) +#define SLINK_CMD_CS_POL		(1 << 13) +#define SLINK_CMD_CS_VAL		(1 << 12) +#define SLINK_CMD_CS_SOFT		(1 << 11) +#define SLINK_CMD_BIT_LENGTH		(1 << 4) +#define SLINK_CMD_BIT_LENGTH_MASK	0x0000001F +/* COMMAND2 */ +#define SLINK_CMD2_TXEN			(1 << 30) +#define SLINK_CMD2_RXEN			(1 << 31) +#define SLINK_CMD2_SS_EN		(1 << 18) +#define SLINK_CMD2_SS_EN_SHIFT		18 +#define SLINK_CMD2_SS_EN_MASK		0x000C0000 +#define SLINK_CMD2_CS_ACTIVE_BETWEEN	(1 << 17) +/* STATUS */ +#define SLINK_STAT_BSY			(1 << 31) +#define SLINK_STAT_RDY			(1 << 30) +#define SLINK_STAT_ERR			(1 << 29) +#define SLINK_STAT_RXF_FLUSH		(1 << 27) +#define SLINK_STAT_TXF_FLUSH		(1 << 26) +#define SLINK_STAT_RXF_OVF		(1 << 25) +#define SLINK_STAT_TXF_UNR		(1 << 24) +#define SLINK_STAT_RXF_EMPTY		(1 << 23) +#define SLINK_STAT_RXF_FULL		(1 << 22) +#define SLINK_STAT_TXF_EMPTY		(1 << 21) +#define SLINK_STAT_TXF_FULL		(1 << 20) +#define SLINK_STAT_TXF_OVF		(1 << 19) +#define SLINK_STAT_RXF_UNR		(1 << 18) +#define SLINK_STAT_CUR_BLKCNT		(1 << 15) +/* STATUS2 */ +#define SLINK_STAT2_RXF_FULL_CNT	(1 << 16) +#define SLINK_STAT2_TXF_FULL_CNT	(1 << 0) + +#define SPI_TIMEOUT		1000 +#define TEGRA_SPI_MAX_FREQ	52000000 + +struct spi_regs { +	u32 command;	/* SLINK_COMMAND_0 register  */ +	u32 command2;	/* SLINK_COMMAND2_0 reg */ +	u32 status;	/* SLINK_STATUS_0 register */ +	u32 reserved;	/* Reserved offset 0C */ +	u32 mas_data;	/* SLINK_MAS_DATA_0 reg */ +	u32 slav_data;	/* SLINK_SLAVE_DATA_0 reg */ +	u32 dma_ctl;	/* SLINK_DMA_CTL_0 register */ +	u32 status2;	/* SLINK_STATUS2_0 reg */ +	u32 rsvd[56];	/* 0x20 to 0xFF reserved */ +	u32 tx_fifo;	/* SLINK_TX_FIFO_0 reg off 100h */ +	u32 rsvd2[31];	/* 0x104 to 0x17F reserved */ +	u32 rx_fifo;	/* SLINK_RX_FIFO_0 reg off 180h */ +}; +  struct tegra_spi_ctrl { -	struct slink_tegra *regs; +	struct spi_regs *regs;  	unsigned int freq;  	unsigned int mode;  	int periph_id; @@ -53,7 +107,7 @@ static inline struct tegra_spi_slave *to_tegra_spi(struct spi_slave *slave)  	return container_of(slave, struct tegra_spi_slave, slave);  } -int spi_cs_is_valid(unsigned int bus, unsigned int cs) +int tegra30_spi_cs_is_valid(unsigned int bus, unsigned int cs)  {  	if (bus >= CONFIG_TEGRA_SLINK_CTRLS || cs > 3 || !spi_ctrls[bus].valid)  		return 0; @@ -61,7 +115,7 @@ int spi_cs_is_valid(unsigned int bus, unsigned int cs)  		return 1;  } -struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, +struct spi_slave *tegra30_spi_setup_slave(unsigned int bus, unsigned int cs,  		unsigned int max_hz, unsigned int mode)  {  	struct tegra_spi_slave *spi; @@ -103,32 +157,26 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,  	return &spi->slave;  } -void spi_free_slave(struct spi_slave *slave) +void tegra30_spi_free_slave(struct spi_slave *slave)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave);  	free(spi);  } -void spi_init(void) +int tegra30_spi_init(int *node_list, int count)  {  	struct tegra_spi_ctrl *ctrl;  	int i; -#ifdef CONFIG_OF_CONTROL  	int node = 0; -	int count; -	int node_list[CONFIG_TEGRA_SLINK_CTRLS]; +	int found = 0; -	count = fdtdec_find_aliases_for_id(gd->fdt_blob, "spi", -					   COMPAT_NVIDIA_TEGRA20_SLINK, -					   node_list, -					   CONFIG_TEGRA_SLINK_CTRLS);  	for (i = 0; i < count; i++) {  		ctrl = &spi_ctrls[i];  		node = node_list[i]; -		ctrl->regs = (struct slink_tegra *)fdtdec_get_addr(gd->fdt_blob, -								   node, "reg"); +		ctrl->regs = (struct spi_regs *)fdtdec_get_addr(gd->fdt_blob, +								node, "reg");  		if ((fdt_addr_t)ctrl->regs == FDT_ADDR_T_NONE) {  			debug("%s: no slink register found\n", __func__);  			continue; @@ -146,44 +194,18 @@ void spi_init(void)  			continue;  		}  		ctrl->valid = 1; +		found = 1;  		debug("%s: found controller at %p, freq = %u, periph_id = %d\n",  		      __func__, ctrl->regs, ctrl->freq, ctrl->periph_id);  	} -#else -	for (i = 0; i < CONFIG_TEGRA_SLINK_CTRLS; i++) { -		ctrl = &spi_ctrls[i]; -		u32 base_regs[] = { -			NV_PA_SLINK1_BASE, -			NV_PA_SLINK2_BASE, -			NV_PA_SLINK3_BASE, -			NV_PA_SLINK4_BASE, -			NV_PA_SLINK5_BASE, -			NV_PA_SLINK6_BASE, -		}; -		int periph_ids[] = { -			PERIPH_ID_SBC1, -			PERIPH_ID_SBC2, -			PERIPH_ID_SBC3, -			PERIPH_ID_SBC4, -			PERIPH_ID_SBC5, -			PERIPH_ID_SBC6, -		}; -		ctrl->regs = (struct slink_tegra *)base_regs[i]; -		ctrl->freq = TEGRA_SPI_MAX_FREQ; -		ctrl->periph_id = periph_ids[i]; -		ctrl->valid = 1; - -		debug("%s: found controller at %p, freq = %u, periph_id = %d\n", -		      __func__, ctrl->regs, ctrl->freq, ctrl->periph_id); -	} -#endif +	return !found;  } -int spi_claim_bus(struct spi_slave *slave) +int tegra30_spi_claim_bus(struct spi_slave *slave)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave); -	struct slink_tegra *regs = spi->ctrl->regs; +	struct spi_regs *regs = spi->ctrl->regs;  	u32 reg;  	/* Change SPI clock to correct frequency, PLLP_OUT0 source */ @@ -205,33 +227,29 @@ int spi_claim_bus(struct spi_slave *slave)  	return 0;  } -void spi_release_bus(struct spi_slave *slave) -{ -} - -void spi_cs_activate(struct spi_slave *slave) +void tegra30_spi_cs_activate(struct spi_slave *slave)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave); -	struct slink_tegra *regs = spi->ctrl->regs; +	struct spi_regs *regs = spi->ctrl->regs;  	/* CS is negated on Tegra, so drive a 1 to get a 0 */  	setbits_le32(®s->command, SLINK_CMD_CS_VAL);  } -void spi_cs_deactivate(struct spi_slave *slave) +void tegra30_spi_cs_deactivate(struct spi_slave *slave)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave); -	struct slink_tegra *regs = spi->ctrl->regs; +	struct spi_regs *regs = spi->ctrl->regs;  	/* CS is negated on Tegra, so drive a 0 to get a 1 */  	clrbits_le32(®s->command, SLINK_CMD_CS_VAL);  } -int spi_xfer(struct spi_slave *slave, unsigned int bitlen, +int tegra30_spi_xfer(struct spi_slave *slave, unsigned int bitlen,  		const void *data_out, void *data_in, unsigned long flags)  {  	struct tegra_spi_slave *spi = to_tegra_spi(slave); -	struct slink_tegra *regs = spi->ctrl->regs; +	struct spi_regs *regs = spi->ctrl->regs;  	u32 reg, tmpdout, tmpdin = 0;  	const u8 *dout = data_out;  	u8 *din = data_in; |