tegra114 SPI driver
Subsystems (5)
cover tegra114 SPI driver
This series pulls fdt functionality from the existing tegra20 and tegra30 SPI drivers into a new common fdt SPI driver front end, then adds a new tegra114 SPI driver as an additional client of the fdt SPI driver.
Allen Martin (14):
tegra: spi: rename tegra SPI drivers
tegra: spi: remove non fdt support
tegra: spi: pull register structs out of headers
tegra20: spi: move fdt probe to spi_init
spi: add common fdt SPI driver interface
sf: winbond: add W25Q32DW
tegra114: dalmore: add SPI pinmux config
tegra114: fdt: add compatible string for tegra114 SPI ctrl
tegra114: fdt: add CAR block
tegra114: fdt: add apbdma block
tegra114: fdt: add SPI blocks
tegra114: dalmore: fdt: enable dalmore SPI controller
tegra114: add SPI driver
tegra114: dalmore: config: enable SPI
arch/arm/dts/tegra114.dtsi | 115 +++++++ arch/arm/include/asm/arch-tegra/tegra_slink.h | 84 ----- arch/arm/include/asm/arch-tegra/tegra_spi.h | 75 ----- arch/arm/include/asm/arch-tegra114/tegra114_spi.h | 91 ++++++ arch/arm/include/asm/arch-tegra20/tegra20_spi.h | 73 +++++ arch/arm/include/asm/arch-tegra30/tegra30_spi.h | 77 +++++ board/nvidia/common/board.c | 2 +- board/nvidia/common/uart-spi-switch.c | 2 +- board/nvidia/dalmore/pinmux-config-dalmore.h | 9 +- board/nvidia/dts/tegra114-dalmore.dts | 5 + drivers/mtd/spi/winbond.c | 5 + drivers/spi/Makefile | 6 +- drivers/spi/fdt_spi.c | 187 +++++++++++ drivers/spi/tegra114_spi.c | 355 +++++++++++++++++++++ drivers/spi/tegra20_spi.c | 350 ++++++++++++++++++++ drivers/spi/tegra30_spi.c | 325 +++++++++++++++++++ drivers/spi/tegra_slink.c | 343 -------------------- drivers/spi/tegra_spi.c | 330 ------------------- include/configs/cardhu.h | 4 +- include/configs/dalmore.h | 11 + include/configs/tegra-common-post.h | 4 + include/configs/trimslice.h | 2 +- include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 24 files changed, 1615 insertions(+), 842 deletions(-) delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_slink.h delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_spi.h create mode 100644 arch/arm/include/asm/arch-tegra114/tegra114_spi.h create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_spi.h create mode 100644 arch/arm/include/asm/arch-tegra30/tegra30_spi.h create mode 100644 drivers/spi/fdt_spi.c create mode 100644 drivers/spi/tegra114_spi.c create mode 100644 drivers/spi/tegra20_spi.c create mode 100644 drivers/spi/tegra30_spi.c delete mode 100644 drivers/spi/tegra_slink.c delete mode 100644 drivers/spi/tegra_spi.c
Signature · 1 line
1.7.10.4
PATCH 1/14 tegra: spi: rename tegra SPI drivers
Rename tegra SPI drivers to tegra20_spi and tegra30_spi in preparation for commonization and addition of tegra114_spi.
--- arch/arm/include/asm/arch-tegra/tegra_slink.h | 84 ------ arch/arm/include/asm/arch-tegra/tegra_spi.h | 75 ----- arch/arm/include/asm/arch-tegra20/tegra20_spi.h | 75 +++++ arch/arm/include/asm/arch-tegra30/tegra30_spi.h | 84 ++++++ board/nvidia/common/board.c | 2 +- board/nvidia/common/uart-spi-switch.c | 2 +- drivers/spi/Makefile | 4 +- drivers/spi/tegra20_spi.c | 330 ++++++++++++++++++++++ drivers/spi/tegra30_spi.c | 343 +++++++++++++++++++++++ drivers/spi/tegra_slink.c | 343 ----------------------- drivers/spi/tegra_spi.c | 330 ---------------------- include/configs/cardhu.h | 2 +- include/configs/trimslice.h | 2 +- 13 files changed, 838 insertions(+), 838 deletions(-) delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_slink.h delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_spi.h create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_spi.h create mode 100644 arch/arm/include/asm/arch-tegra30/tegra30_spi.h create mode 100644 drivers/spi/tegra20_spi.c create mode 100644 drivers/spi/tegra30_spi.c delete mode 100644 drivers/spi/tegra_slink.c delete mode 100644 drivers/spi/tegra_spi.c
arch/arm/include/asm/arch-tegra/tegra_slink.h deleted +0 -84
@@ -1,84 +0,0 @@ -/* -* NVIDIA Tegra SPI-SLINK controller -* -* Copyright 2010-2013 NVIDIA Corporation -* -* This software may be used and distributed according to the -* terms of the GNU Public License, Version 2, incorporated -* herein by reference. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* Version 2 as published by the Free Software Foundation. -* -* 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 -*/ - -#ifndef _TEGRA_SLINK_H_ -#define _TEGRA_SLINK_H_ - -#include <asm/types.h> - -struct slink_tegra { -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 */ -}; - -/* 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 - -#endif /* _TEGRA_SLINK_H_ */
arch/arm/include/asm/arch-tegra/tegra_spi.h deleted +0 -75
75 lines not on this page · raw message
arch/arm/include/asm/arch-tegra20/tegra20_spi.h new file +75 -0
75 lines not on this page · raw message
arch/arm/include/asm/arch-tegra30/tegra30_spi.h new file +84 -0
84 lines not on this page · raw message
board/nvidia/common/board.c +1 -1
@@ -131,7 +131,7 @@ int board_init(void)#ifdef CONFIG_SPI_UART_SWITCH gpio_config_uart ();#endif -#if defined(CONFIG_TEGRA_SPI ) || defined(CONFIG_TEGRA_SLINK ) +#if defined(CONFIG_TEGRA20_SPI ) || defined(CONFIG_TEGRA30_SPI )pin_mux_spi ();spi_init ();#endif
board/nvidia/common/uart-spi-switch.c +1 -1
@@ -25,7 +25,7 @@#include <asm/arch/pinmux.h> #include <asm/arch/uart-spi-switch.h> #include <asm/arch/tegra.h> -#include <asm/arch-tegra/tegra_spi.h> +#include <asm/arch-tegra20/tegra20_spi.h> #include <asm/arch-tegra/board.h> /* position of the UART/SPI select switch */
drivers/spi/Makefile +2 -2
@@ -45,8 +45,8 @@ 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_TEGRA20_SPI) += tegra20_spi.o +COBJS-$(CONFIG_TEGRA30_SPI) += tegra30_spi.o COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o COBJS := $(COBJS-y)
drivers/spi/tegra20_spi.c new file +330 -0
330 lines not on this page · raw message
drivers/spi/tegra30_spi.c new file +343 -0
343 lines not on this page · raw message
drivers/spi/tegra_slink.c deleted +0 -343
343 lines not on this page · raw message
drivers/spi/tegra_spi.c deleted +0 -330
330 lines not on this page · raw message
include/configs/cardhu.h +1 -1
@@ -50,7 +50,7 @@#define CONFIG_ENV_IS_NOWHERE /* SPI */ -#define CONFIG_TEGRA_SLINK +#define CONFIG_TEGRA30_SPI #define CONFIG_TEGRA_SLINK_CTRLS 6#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND
include/configs/trimslice.h +1 -1
@@ -46,7 +46,7 @@#define CONFIG_BOARD_EARLY_INIT_F /* SPI */ -#define CONFIG_TEGRA_SPI +#define CONFIG_TEGRA20_SPI #define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
Signature · 1 line
1.7.10.4
PATCH 1/14 tegra: spi: rename tegra SPI drivers
Quoted 2 lines · Allen Martin
Rename tegra SPI drivers to
tegra20_spiandtegra30_spiin preparation for commonization and addition oftegra114_spi.
This isn't logically quite right. Both types (sflash, slink) of SPI controller actually exist on Tegra20, so it isn't right to name them after the different chips. It is true that only one is kept for Tegra30 (slink). As such, it might make sense to simply drop this patch.
Quoted 14 lines
arch/arm/include/asm/arch-tegra/tegra_slink.h | 84 ------ arch/arm/include/asm/arch-tegra/tegra_spi.h | 75 ----- arch/arm/include/asm/arch-tegra20/tegra20_spi.h | 75 +++++ arch/arm/include/asm/arch-tegra30/tegra30_spi.h | 84 ++++++ board/nvidia/common/board.c | 2 +- board/nvidia/common/uart-spi-switch.c | 2 +- drivers/spi/Makefile | 4 +- drivers/spi/tegra20_spi.c | 330 ++++++++++++++++++++++ drivers/spi/tegra30_spi.c | 343 +++++++++++++++++++++++ drivers/spi/tegra_slink.c | 343 ----------------------- drivers/spi/tegra_spi.c | 330 ---------------------- include/configs/cardhu.h | 2 +- include/configs/trimslice.h | 2 +- 13 files changed, 838 insertions(+), 838 deletions(-)
Quoted 8 lines
delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_slink.h delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_spi.h create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_spi.h create mode 100644 arch/arm/include/asm/arch-tegra30/tegra30_spi.h create mode 100644 drivers/spi/tegra20_spi.c create mode 100644 drivers/spi/tegra30_spi.c delete mode 100644 drivers/spi/tegra_slink.c delete mode 100644 drivers/spi/tegra_spi.c
"git format-patch -M" might have made this easier to spot the changes during the renames, assuming there weren't too many edits to make it worthwhile.
I didn't actually review the diffs, since I assume it was just a simple rename.
PATCH 1/14 tegra: spi: rename tegra SPI drivers
Quoted 8 lines · Stephen Warren
Quoted 2 lines · Allen Martin
Rename tegra SPI drivers to
tegra20_spiandtegra30_spiin preparation for commonization and addition oftegra114_spi.This isn't logically quite right. Both types (sflash, slink) of SPI controller actually exist on Tegra20, so it isn't right to name them after the different chips. It is true that only one is kept for Tegra30 (slink). As such, it might make sense to simply drop this patch.
Mostly my intention here was to try to make the SPI driver naming less confusing and to make room for the "new" tegra114 SPI driver. What do you think of the following:
tegra_sflash: tegra20 sflash drivertegra_slink: tegra20 and tegra30 slink drivertegra_spi: tegra114 and later spi driver
Quoted 24 lines
Quoted 15 lines
arch/arm/include/asm/arch-tegra/tegra_slink.h | 84 ------ arch/arm/include/asm/arch-tegra/tegra_spi.h | 75 ----- arch/arm/include/asm/arch-tegra20/tegra20_spi.h | 75 +++++ arch/arm/include/asm/arch-tegra30/tegra30_spi.h | 84 ++++++ board/nvidia/common/board.c | 2 +- board/nvidia/common/uart-spi-switch.c | 2 +- drivers/spi/Makefile | 4 +- drivers/spi/tegra20_spi.c | 330 ++++++++++++++++++++++ drivers/spi/tegra30_spi.c | 343 +++++++++++++++++++++++ drivers/spi/tegra_slink.c | 343 ----------------------- drivers/spi/tegra_spi.c | 330 ---------------------- include/configs/cardhu.h | 2 +- include/configs/trimslice.h | 2 +- 13 files changed, 838 insertions(+), 838 deletions(-)Quoted 8 lines
delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_slink.h delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_spi.h create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_spi.h create mode 100644 arch/arm/include/asm/arch-tegra30/tegra30_spi.h create mode 100644 drivers/spi/tegra20_spi.c create mode 100644 drivers/spi/tegra30_spi.c delete mode 100644 drivers/spi/tegra_slink.c delete mode 100644 drivers/spi/tegra_spi.c
Quoted 3 lines
"git format-patch -M" might have made this easier to spot the changes during the renames, assuming there weren't too many edits to make it worthwhile.
Yes, sorry, I'll fix for next round.
Quoted 3 lines
I didn't actually review the diffs, since I assume it was just a simple rename.
-Allen
Signature · 1 line
nvpublic
PATCH 1/14 tegra: spi: rename tegra SPI drivers
Quoted 10 lines · Allen Martin
Quoted 8 lines · Stephen Warren
Quoted 2 lines · Allen Martin
Rename tegra SPI drivers to
tegra20_spiandtegra30_spiin preparation for commonization and addition oftegra114_spi.This isn't logically quite right. Both types (sflash, slink) of SPI controller actually exist on Tegra20, so it isn't right to name them after the different chips. It is true that only one is kept for Tegra30 (slink). As such, it might make sense to simply drop this patch.
Quoted 6 lines
Mostly my intention here was to try to make the SPI driver naming less confusing and to make room for the "new" tegra114 SPI driver. What do you think of the following:
tegra_sflash: tegra20 sflash drivertegra_slink: tegra20 and tegra30 slink driver
I'd suggest naming those tegra20_*.
Quoted 1 line
tegra_spi: tegra114 and later spi driver
... and that tegra114_spi. That way, it's obvious when those IP blocks were introduced, which will help people know which driver they care about.
Looking closer at the Tegra114 TRM, it looks like they did declare "slink" a deprecated name, so the Tegra114 block really should be called "SPI" as you have it. So, disregard my comments about the compatible value; nvidia,tegra114-spi looks like the correct choice now.
PATCH 1/14 tegra: spi: rename tegra SPI drivers
In reply to Allen MartinQuoted 4 lines · Allen Martin
Rename tegra SPI drivers to
tegra20_spiandtegra30_spiin preparation for commonization and addition oftegra114_spi.board/nvidia/common/uart-spi-switch.c | 2 +-
I tend to think we should just rip out the UART/SPI switch cruft; it's just not that useful.
PATCH 1/14 tegra: spi: rename tegra SPI drivers
Quoted 8 lines · Stephen Warren
Quoted 4 lines · Allen Martin
Rename tegra SPI drivers to
tegra20_spiandtegra30_spiin preparation for commonization and addition oftegra114_spi.board/nvidia/common/uart-spi-switch.c | 2 +-I tend to think we should just rip out the UART/SPI switch cruft; it's just not that useful.
Ok
Signature · 1 line
nvpublic
PATCH 2/14 tegra: spi: remove non fdt support
In reply to Allen MartinRemove non fdt support from tegra20 and tegra30 SPI drivers in preparation of new common fdt based SPI driver front end.
--- drivers/spi/tegra20_spi.c | 12 ++++-------- drivers/spi/tegra30_spi.c | 29 ----------------------------- 2 files changed, 4 insertions(+), 37 deletions(-)
drivers/spi/tegra20_spi.c +4 -8
@@ -68,6 +68,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, unsigned int max_hz, unsigned int mode) {struct tegra_spi_slave *spi; +int node;if (!spi_cs_is_valid (bus, cs)) { printf("SPI error: unsupported bus %d / chip select %d\n",
@@ -88,9 +89,9 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, } spi->slave.bus = bus; spi->slave.cs = cs; -#ifdef CONFIG_OF_CONTROL -int node =fdtdec_next_compatible (gd->fdt_blob,0 , -COMPAT_NVIDIA_TEGRA20_SFLASH ); + + 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 ;
@@ -115,11 +116,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,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) {debug ("%s: limiting frequency from %u to %u\n" , __func__, spi->freq, max_hz);
drivers/spi/tegra30_spi.c +0 -29
@@ -116,7 +116,6 @@ void spi_init(void) {struct tegra_spi_ctrl *ctrl;int i; -#ifdef CONFIG_OF_CONTROL int node =0 ;int count;int node_list[CONFIG_TEGRA_SLINK_CTRLS ];
@@ -152,34 +151,6 @@ void spi_init(void)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 }int spi_claim_bus (struct spi_slave *slave)
Signature · 1 line
1.7.10.4
PATCH 3/14 tegra: spi: pull register structs out of headers
In reply to Allen MartinMove register structs from headers into .c files and use common name. This is in preparation of making common fdt front end for SPI drivers.
--- arch/arm/include/asm/arch-tegra20/tegra20_spi.h | 13 --------- arch/arm/include/asm/arch-tegra30/tegra30_spi.h | 18 ------------- drivers/spi/tegra20_spi.c | 21 ++++++++++++--- drivers/spi/tegra30_spi.c | 32 ++++++++++++++++++----- 4 files changed, 42 insertions(+), 42 deletions(-)
arch/arm/include/asm/arch-tegra20/tegra20_spi.h +0 -13
@@ -27,16 +27,6 @@#include <asm/types.h> -struct spi_tegra { -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 */ -}; -#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)
@@ -69,7 +59,4 @@ struct spi_tegra {#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 -#endif /* _TEGRA20_SPI_H_ */
arch/arm/include/asm/arch-tegra30/tegra30_spi.h +0 -18
@@ -27,21 +27,6 @@#include <asm/types.h> -struct slink_tegra { -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 */ -}; -/* COMMAND */ #define SLINK_CMD_ENB (1 << 31)#define SLINK_CMD_GO (1 << 30)
@@ -78,7 +63,4 @@ struct slink_tegra {#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 -#endif /* _TEGRA30_SPI_H_ */
drivers/spi/tegra20_spi.c +17 -4
@@ -36,15 +36,28 @@DECLARE_GLOBAL_DATA_PTR ; +#define SPI_TIMEOUT 1000 +#define TEGRA_SPI_MAX_FREQ 52000000 +#if defined(CONFIG_SPI_CORRUPTS_UART )#define corrupt_delay () udelay(CONFIG_SPI_CORRUPTS_UART_DLY);#else #define corrupt_delay ()#endif +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_slave {struct spi_slave slave; -struct spi_tegra *regs; +struct spi_regs *regs;unsigned int freq;unsigned int mode;int periph_id;
@@ -100,7 +113,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,debug ("%s: sflash is disabled\n" , __func__);return NULL ; } - spi->regs = (struct spi_tegra *)fdtdec_get_addr (gd->fdt_blob, + spi->regs = (struct spi_regs *)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__);
@@ -143,7 +156,7 @@ void spi_init(void)int 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->regs;u32 reg;/* Change SPI clock to correct frequency, PLLP_OUT0 source */
@@ -222,7 +235,7 @@ int 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->regs;u32 reg, tmpdout, tmpdin =0 ;const u8 *dout = data_out;u8 *din = data_in;
drivers/spi/tegra30_spi.c +25 -7
@@ -33,8 +33,26 @@DECLARE_GLOBAL_DATA_PTR ; +#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;
@@ -128,8 +146,8 @@ void spi_init(void) 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 ;
@@ -156,7 +174,7 @@ void spi_init(void)int 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 */
@@ -185,7 +203,7 @@ void spi_release_bus(struct spi_slave *slave)void 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 );
@@ -194,7 +212,7 @@ void spi_cs_activate(struct spi_slave *slave)void 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 );
@@ -204,7 +222,7 @@ int 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;
Signature · 1 line
1.7.10.4
PATCH 3/14 tegra: spi: pull register structs out of headers
Quoted 3 lines · Allen Martin
Move register structs from headers into .c files and use common name. This is in preparation of making common fdt front end for SPI drivers.
Why not move all the register defines too?
PATCH 3/14 tegra: spi: pull register structs out of headers
Quoted 6 lines · Stephen Warren
Quoted 3 lines · Allen Martin
Move register structs from headers into .c files and use common name. This is in preparation of making common fdt front end for SPI drivers.
Why not move all the register defines too?
Sure, makes sense.
-Allen
Signature · 1 line
nvpublic
PATCH 4/14 tegra20: spi: move fdt probe to spi_init
In reply to Allen MartinMake the tegra20 SPI driver similar to the tegra30 (and soon to be tegra114) SPI drivers in preparation of common fdt SPI driver front end.
--- drivers/spi/tegra20_spi.c | 110 +++++++++++++++++++++++++++------------------ 1 file changed, 67 insertions(+), 43 deletions(-)
drivers/spi/tegra20_spi.c +67 -43
@@ -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 *
@@ -55,14 +55,22 @@ struct spi_regs {u32 rx_fifo;/* SPI_RX_FIFO_0 register */ }; -struct tegra_spi_slave { -struct spi_slave slave; +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);
@@ -81,7 +89,6 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, unsigned int max_hz, unsigned int mode) {struct tegra_spi_slave *spi; -int node;if (!spi_cs_is_valid (bus, cs)) { printf("SPI error: unsupported bus %d / chip select %d\n",
@@ -102,41 +109,19 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, } spi->slave.bus = bus; spi->slave.cs = cs; - - 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_regs *)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->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 ; - } -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; }
@@ -150,17 +135,54 @@ void spi_free_slave(struct spi_slave *slave)void spi_init (void ) { -/* do nothing */ +struct tegra_spi_ctrl *ctrl; +int i; +int node =0 ; +int count; +int node_list[1 ]; + + count =fdtdec_find_aliases_for_id (gd->fdt_blob,"spi" , +COMPAT_NVIDIA_TEGRA20_SFLASH , + node_list, +1 ); +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 ; + +debug ("%s: found controller at %p, freq = %u, periph_id = %d\n" , + __func__, ctrl->regs, ctrl->freq, ctrl->periph_id); + } }int spi_claim_bus (struct spi_slave *slave) {struct tegra_spi_slave *spi =to_tegra_spi (slave); -struct spi_regs *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 | \
@@ -171,8 +193,8 @@ int spi_claim_bus(struct spi_slave *slave)/* * 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);
@@ -210,11 +232,12 @@ void spi_release_bus(struct spi_slave *slave)void spi_cs_activate (struct spi_slave *slave) {struct tegra_spi_slave *spi =to_tegra_spi (slave); +struct spi_regs *regs = spi->ctrl->regs;pinmux_select_spi ();/* CS is negated on Tegra, so drive a 1 to get a 0 */ -setbits_le32 (&spi->regs->command,SPI_CMD_CS_VAL ); +setbits_le32 (®s->command,SPI_CMD_CS_VAL );corrupt_delay ();/* Let UART settle */ }
@@ -222,11 +245,12 @@ void spi_cs_activate(struct spi_slave *slave)void spi_cs_deactivate (struct spi_slave *slave) {struct tegra_spi_slave *spi =to_tegra_spi (slave); +struct spi_regs *regs = spi->ctrl->regs;pinmux_select_uart ();/* CS is negated on Tegra, so drive a 0 to get a 1 */ -clrbits_le32 (&spi->regs->command,SPI_CMD_CS_VAL ); +clrbits_le32 (®s->command,SPI_CMD_CS_VAL );corrupt_delay ();/* Let SPI settle */ }
@@ -235,7 +259,7 @@ int 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->regs; +struct spi_regs *regs = spi->ctrl->regs;u32 reg, tmpdout, tmpdin =0 ;const u8 *dout = data_out;u8 *din = data_in;
Signature · 1 line
1.7.10.4
PATCH 5/14 spi: add common fdt SPI driver interface
In reply to Allen MartinAdd a common interface to fdt based SPI drivers. Each driver is represented by a table entry in fdt_spi_drivers[]. If there are multiple SPI drivers in the table, the first driver to return success from spi_init() will be registered as the SPI driver.
--- arch/arm/include/asm/arch-tegra20/tegra20_spi.h | 11 ++ arch/arm/include/asm/arch-tegra30/tegra30_spi.h | 11 ++ board/nvidia/common/board.c | 2 +- drivers/spi/Makefile | 1 + drivers/spi/fdt_spi.c | 172 +++++++++++++++++++++++ drivers/spi/tegra20_spi.c | 41 ++---- drivers/spi/tegra30_spi.c | 33 ++--- include/configs/cardhu.h | 2 +- include/configs/tegra-common-post.h | 4 + 9 files changed, 228 insertions(+), 49 deletions(-) create mode 100644 drivers/spi/fdt_spi.c
arch/arm/include/asm/arch-tegra20/tegra20_spi.h +11 -0
@@ -59,4 +59,15 @@#define SPI_STAT_SEL_TXRX_N (1 << 16)#define SPI_STAT_CUR_BLKCNT (1 << 15) +int tegra20_spi_cs_is_valid (unsigned int bus,unsigned int cs); +struct spi_slave *tegra20_spi_setup_slave (unsigned int bus,unsigned int cs, +unsigned int max_hz,unsigned int mode); +void tegra20_spi_free_slave (struct spi_slave *slave); +int tegra20_spi_init (int *node_list,int count); +int tegra20_spi_claim_bus (struct spi_slave *slave); +void tegra20_spi_cs_activate (struct spi_slave *slave); +void tegra20_spi_cs_deactivate (struct spi_slave *slave); +int tegra20_spi_xfer (struct spi_slave *slave,unsigned int bitlen, +const void *data_out,void *data_in,unsigned long flags); +#endif /* _TEGRA20_SPI_H_ */
arch/arm/include/asm/arch-tegra30/tegra30_spi.h +11 -0
@@ -63,4 +63,15 @@#define SLINK_STAT2_RXF_FULL_CNT (1 << 16)#define SLINK_STAT2_TXF_FULL_CNT (1 << 0) +int tegra30_spi_init (int *node_list,int count); +int tegra30_spi_cs_is_valid (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); +void tegra30_spi_free_slave (struct spi_slave *slave); +int tegra30_spi_claim_bus (struct spi_slave *slave); +void tegra30_spi_cs_activate (struct spi_slave *slave); +void tegra30_spi_cs_deactivate (struct spi_slave *slave); +int tegra30_spi_xfer (struct spi_slave *slave,unsigned int bitlen, +const void *data_out,void *data_in,unsigned long flags); +#endif /* _TEGRA30_SPI_H_ */
board/nvidia/common/board.c +1 -1
@@ -131,7 +131,7 @@ int board_init(void)#ifdef CONFIG_SPI_UART_SWITCH gpio_config_uart ();#endif -#if defined(CONFIG_TEGRA20_SPI ) || defined(CONFIG_TEGRA30_SPI ) +#ifdef CONFIG_FDT_SPI pin_mux_spi ();spi_init ();#endif
drivers/spi/Makefile +1 -0
@@ -45,6 +45,7 @@ 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_FDT_SPI) += fdt_spi.o COBJS-$(CONFIG_TEGRA20_SPI) += tegra20_spi.o COBJS-$(CONFIG_TEGRA30_SPI) += tegra30_spi.o COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o
drivers/spi/fdt_spi.c new file +172 -0
172 lines not on this page · raw message
drivers/spi/tegra20_spi.c +14 -27
112 lines not on this page · raw message
drivers/spi/tegra30_spi.c +13 -20
@@ -64,22 +64,22 @@ struct tegra_spi_slave {struct tegra_spi_ctrl *ctrl; }; -static struct tegra_spi_ctrl spi_ctrls[CONFIG_TEGRA_SLINK_CTRLS ]; +static struct tegra_spi_ctrl spi_ctrls[CONFIG_TEGRA30_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 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) +if (bus >=CONFIG_TEGRA30_SPI_CTRLS || cs >3 || !spi_ctrls[bus].valid)return 0 ;else 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;
@@ -123,25 +123,20 @@ 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;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];
@@ -165,13 +160,15 @@ 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); } +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 spi_regs *regs = spi->ctrl->regs;
@@ -196,11 +193,7 @@ 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 spi_regs *regs = spi->ctrl->regs;
@@ -209,7 +202,7 @@ void spi_cs_activate(struct spi_slave *slave)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 spi_regs *regs = spi->ctrl->regs;
@@ -218,7 +211,7 @@ void spi_cs_deactivate(struct spi_slave *slave)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);
include/configs/cardhu.h +1 -1
@@ -51,7 +51,7 @@/* SPI */ #define CONFIG_TEGRA30_SPI -#define CONFIG_TEGRA_SLINK_CTRLS 6 +#define CONFIG_TEGRA30_SPI_CTRLS 6#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
include/configs/tegra-common-post.h +4 -0
@@ -150,6 +150,10 @@MEM_LAYOUT_ENV_SETTINGS \ BOOTCMDS_COMMON +#if defined(CONFIG_TEGRA20_SPI ) || defined(CONFIG_TEGRA30_SPI ) +#define CONFIG_FDT_SPI +#endif +/* overrides for SPL build here */ #ifdef CONFIG_SPL_BUILD
Signature · 1 line
1.7.10.4
PATCH 5/14 spi: add common fdt SPI driver interface
Quoted 4 lines · Allen Martin
Add a common interface to fdt based SPI drivers. Each driver is represented by a table entry in fdt_spi_drivers[]. If there are multiple SPI drivers in the table, the first driver to return success from
spi_init()will be registered as the SPI driver.
I don't think there should be a global concept of "the" SPI driver; instances of both SPI blocks exist on Tegra20, so they should be able to co-exist, using the SFLASH driver for 1 SPI port, and the SLINK driver for the other 4 ports.
How does this patch interact with any SPI-related device manager work?
drivers/spi/fdt_spi.c line 127
Quoted 5 lines
drivers/spi/fdt_spi.c new file +5
-0+void spi_init (void ) +{ +int i; +int num_drivers =sizeof (fdt_spi_drivers) / +sizeof (struct fdt_spi_driver );
U-Boot doesn't have an ARSIZE/ARRAY_SIZE macro?
include/configs/cardhu.h line 54
Quoted 6 lines
include/configs/cardhu.h +1
-1/* SPI */ #define CONFIG_TEGRA30_SPI -#define CONFIG_TEGRA_SLINK_CTRLS 6 +#define CONFIG_TEGRA30_SPI_CTRLS 6
Should that be in one of the other patches?
PATCH 5/14 spi: add common fdt SPI driver interface
Quoted 10 lines · Stephen Warren
Quoted 4 lines · Allen Martin
Add a common interface to fdt based SPI drivers. Each driver is represented by a table entry in fdt_spi_drivers[]. If there are multiple SPI drivers in the table, the first driver to return success from
spi_init()will be registered as the SPI driver.I don't think there should be a global concept of "the" SPI driver; instances of both SPI blocks exist on Tegra20, so they should be able to co-exist, using the SFLASH driver for 1 SPI port, and the SLINK driver for the other 4 ports.
I agree, but that's probably beyond the scope of this series, as that's a more global problem. Other drivers call directly into the SPI driver by use of well known function names, so that would need to be abstracted to fix.
Quoted 2 lines
How does this patch interact with any SPI-related device manager work?
I'm not sure what device manager is in the context of u-boot. Is that the same as the unified driver model that's being documented in doc/driver-model? If so I think this fits in really well with that. The "struct ops" described there is almost identical to the callbacks I added in "struct fdt_spi_driver"
Quoted 8 lines
drivers/spi/fdt_spi.c line 127
Quoted 6 lines
drivers/spi/fdt_spi.c new file +5
-0+void spi_init (void ) +{ +int i; +int num_drivers =sizeof (fdt_spi_drivers) / +sizeof (struct fdt_spi_driver );U-Boot doesn't have an ARSIZE/ARRAY_SIZE macro?
Will fix.
Quoted 9 lines
include/configs/cardhu.h line 54
Quoted 7 lines
include/configs/cardhu.h +1
-1/* SPI */ #define CONFIG_TEGRA30_SPI -#define CONFIG_TEGRA_SLINK_CTRLS 6 +#define CONFIG_TEGRA30_SPI_CTRLS 6Should that be in one of the other patches?
Yes, probably the renaming patch if we decide to keep it.
Signature · 1 line
nvpublic
PATCH 5/14 spi: add common fdt SPI driver interface
Quoted 12 lines · Allen Martin
Quoted 10 lines · Stephen Warren
Quoted 4 lines · Allen Martin
Add a common interface to fdt based SPI drivers. Each driver is represented by a table entry in fdt_spi_drivers[]. If there are multiple SPI drivers in the table, the first driver to return success from
spi_init()will be registered as the SPI driver.I don't think there should be a global concept of "the" SPI driver; instances of both SPI blocks exist on Tegra20, so they should be able to co-exist, using the SFLASH driver for 1 SPI port, and the SLINK driver for the other 4 ports.
Quoted 4 lines
I agree, but that's probably beyond the scope of this series, as that's a more global problem. Other drivers call directly into the SPI driver by use of well known function names, so that would need to be abstracted to fix.
It should be simple to fix; you already have a table of all known (DT-based) SPI drivers; simply iterate over all entries in the table always, rather than stopping when you hit the first one. Also, don't store /a/ pointer to the driver, but store a pointer per instance. I think the modifications to your patch series to solve this shouldn't be large at all.
Quoted 5 lines
Quoted 1 line
How does this patch interact with any SPI-related device manager work?
I'm not sure what device manager is in the context of u-boot. Is that the same as the unified driver model that's being documented in doc/driver-model?
Yes.
Quoted 3 lines
If so I think this fits in really well with that.
The "struct ops" described there is almost identical to the callbacks I added in "structfdt_spi_driver"
The code certainly looks like a move in the right direction. I was thinking more along the lines of: Is anyone actively working on this right now, so your patches will conflict.
PATCH 5/14 spi: add common fdt SPI driver interface
Quoted 18 lines · Stephen Warren
Quoted 12 lines · Allen Martin
Quoted 10 lines · Stephen Warren
Quoted 4 lines · Allen Martin
Add a common interface to fdt based SPI drivers. Each driver is represented by a table entry in fdt_spi_drivers[]. If there are multiple SPI drivers in the table, the first driver to return success from
spi_init()will be registered as the SPI driver.I don't think there should be a global concept of "the" SPI driver; instances of both SPI blocks exist on Tegra20, so they should be able to co-exist, using the SFLASH driver for 1 SPI port, and the SLINK driver for the other 4 ports.
Quoted 4 lines
I agree, but that's probably beyond the scope of this series, as that's a more global problem. Other drivers call directly into the SPI driver by use of well known function names, so that would need to be abstracted to fix.
Quoted 7 lines
It should be simple to fix; you already have a table of all known (DT-based) SPI drivers; simply iterate over all entries in the table always, rather than stopping when you hit the first one. Also, don't store /a/ pointer to the driver, but store a pointer per instance. I think the modifications to your patch series to solve this shouldn't be large at all.
I don't think it will be that easy. The different drivers would have to coordinate on bus numbering, or there would have to be a new "adapter number" addressing to differentiate the drivers, which would be hard to do without impacting all the other non-fdt drivers as well.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
How does this patch interact with any SPI-related device manager work?
I'm not sure what device manager is in the context of u-boot. Is that the same as the unified driver model that's being documented in doc/driver-model?
Yes.
Quoted 7 lines
Quoted 3 lines
If so I think this fits in really well with that.
The "struct ops" described there is almost identical to the callbacks I added in "structfdt_spi_driver"The code certainly looks like a move in the right direction. I was thinking more along the lines of: Is anyone actively working on this right now, so your patches will conflict.
I haven't seen any, but I haven't been looking out for those patches either, I'll look through the list archives and see if anyting turns up.
-Allen
Signature · 1 line
nvpublic
PATCH 6/14 sf: winbond: add W25Q32DW
In reply to Allen MartinAdd support for Winbond W25Q32DW 32Mbit part
--- drivers/mtd/spi/winbond.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/mtd/spi/winbond.c +5 -0
@@ -67,6 +67,11 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { .nr_blocks = 128, .name = "W25Q80", }, + { + .id = 0x6016, + .nr_blocks = 512, + .name = "W25Q32DW", + }, };struct spi_flash *spi_flash_probe_winbond (struct spi_slave *spi,u8 *idcode)
Signature · 1 line
1.7.10.4
PATCH 7/14 tegra114: dalmore: add SPI pinmux config
In reply to Allen MartinConfigure pinmux for SPI4 controller.
--- board/nvidia/dalmore/pinmux-config-dalmore.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
board/nvidia/dalmore/pinmux-config-dalmore.h +6 -3
@@ -225,6 +225,12 @@ static struct pingroup_config tegra114_pinmux_common[] = {DEFAULT_PINMUX (SPI2_SCK ,GMI ,NORMAL ,NORMAL ,INPUT ),DEFAULT_PINMUX (GPIO_PBB4 ,VGP4 ,NORMAL ,NORMAL ,INPUT ),DEFAULT_PINMUX (KB_ROW8 ,KBC ,UP ,NORMAL ,INPUT ), + +/* SPI */ +DEFAULT_PINMUX (GMI_AD5 ,SPI4 ,NORMAL ,NORMAL ,OUTPUT ), +DEFAULT_PINMUX (GMI_AD6 ,SPI4 ,NORMAL ,NORMAL ,OUTPUT ), +DEFAULT_PINMUX (GMI_AD7 ,SPI4 ,NORMAL ,NORMAL ,INPUT ), + DEFAULT_PINMUX(GMI_CS6_N, SPI4, NORMAL, NORMAL, OUTPUT), }; static struct pingroup_config unused_pins_lowpower[] = {
@@ -237,9 +243,6 @@ static struct pingroup_config unused_pins_lowpower[] = {DEFAULT_PINMUX (GMI_AD2 ,NAND ,NORMAL ,TRISTATE ,INPUT ),DEFAULT_PINMUX (GMI_AD3 ,NAND ,NORMAL ,TRISTATE ,INPUT ),DEFAULT_PINMUX (GMI_AD4 ,NAND ,NORMAL ,TRISTATE ,INPUT ), -DEFAULT_PINMUX (GMI_AD5 ,NAND ,NORMAL ,TRISTATE ,INPUT ), -DEFAULT_PINMUX (GMI_AD6 ,NAND ,NORMAL ,TRISTATE ,INPUT ), -DEFAULT_PINMUX (GMI_AD7 ,NAND ,NORMAL ,TRISTATE ,INPUT ),DEFAULT_PINMUX (GMI_AD9 ,PWM1 ,NORMAL ,TRISTATE ,OUTPUT ),DEFAULT_PINMUX (GMI_AD11 ,NAND ,NORMAL ,TRISTATE ,OUTPUT ), DEFAULT_PINMUX(GMI_AD13, NAND, UP, NORMAL, INPUT),
Signature · 1 line
1.7.10.4
PATCH 8/14 tegra114: fdt: add compatible string for tegra114 SPI ctrl
In reply to Allen MartinAdd "nvidia,tegra114-spi" to represent t114 SPI controller hardware.
--- include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 2 files changed, 2 insertions(+)
include/fdtdec.h +1 -0
@@ -72,6 +72,7 @@ enum fdt_compat_id {COMPAT_NVIDIA_TEGRA20_DC ,/* Tegra 2 Display controller */ COMPAT_NVIDIA_TEGRA20_SFLASH ,/* Tegra 2 SPI flash controller */ COMPAT_NVIDIA_TEGRA20_SLINK ,/* Tegra 2 SPI SLINK controller */ +COMPAT_NVIDIA_TEGRA114_SPI ,/* Tegra 114 SPI controller */ COMPAT_SMSC_LAN9215 ,/* SMSC 10/100 Ethernet LAN9215 */ COMPAT_SAMSUNG_EXYNOS5_SROMC ,/* Exynos5 SROMC */ COMPAT_SAMSUNG_S3C2440_I2C, /* Exynos I2C Controller */
lib/fdtdec.c +1 -0
@@ -47,6 +47,7 @@ static const char * const compat_names[COMPAT_COUNT] = {COMPAT (NVIDIA_TEGRA20_DC ,"nvidia,tegra20-dc" ),COMPAT (NVIDIA_TEGRA20_SFLASH ,"nvidia,tegra20-sflash" ),COMPAT (NVIDIA_TEGRA20_SLINK ,"nvidia,tegra20-slink" ), +COMPAT (NVIDIA_TEGRA114_SPI ,"nvidia,tegra114-spi" ),COMPAT (SMSC_LAN9215 ,"smsc,lan9215" ),COMPAT (SAMSUNG_EXYNOS5_SROMC ,"samsung,exynos-sromc" ), COMPAT(SAMSUNG_S3C2440_I2C, "samsung,s3c2440-i2c"),
Signature · 1 line
1.7.10.4
PATCH 8/14 tegra114: fdt: add compatible string for tegra114 SPI ctrl
include/fdtdec.h enum fdt_compat_id { · line 75
Quoted 3 lines · Allen Martin
Add "nvidia,tegra114-spi" to represent t114 SPI controller hardware.
include/fdtdec.h +1
-0+ COMPAT_NVIDIA_TEGRA114_SPI, /* Tegra 114 SPI controller */
Should probably be called TEGRA114_SLINK to match the actual value.
lib/fdtdec.c static const char * const compat_names[COMPAT_COUNT] = { · line 50
Quoted 1 line
lib/fdtdec.c +1
-0+ COMPAT(NVIDIA_TEGRA114_SPI, "nvidia,tegra114-spi"),
The value is nvidia,tegra114-slink.
PATCH 9/14 tegra114: fdt: add CAR block
In reply to Allen MartinAdd node for clock and reset controller hardware.
--- arch/arm/dts/tegra114.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/dts/tegra114.dtsi +6 -0
@@ -2,4 +2,10 @@ / { compatible = "nvidia,tegra114"; + + tegra_car: clock at 60006000 { + compatible = "nvidia,tegra114-car", "nvidia,tegra30-car", "nvidia,tegra20-car"; + reg = <0x60006000 0x1000>; + #clock-cells = <1>; + }; };
Signature · 1 line
1.7.10.4
PATCH 9/14 tegra114: fdt: add CAR block
arch/arm/dts/tegra114.dtsi line 7
Quoted 6 lines · Allen Martin
Add node for clock and reset controller hardware.
arch/arm/dts/tegra114.dtsi +2
-0+ tegra_car: clock at 60006000 { + compatible = "nvidia,tegra114-car", "nvidia,tegra30-car", "nvidia,tegra20-car";
The Tegra114 CAR isn't 100% backwards-compatible with either the Tegra20 nor Tegra30 CAR, so shouldn't include those compatible values.
PATCH 10/14 tegra114: fdt: add apbdma block
In reply to Allen MartinAdd node for apbdma controller hardware.
--- arch/arm/dts/tegra114.dtsi | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
arch/arm/dts/tegra114.dtsi +37 -0
@@ -8,4 +8,41 @@ reg = <0x60006000 0x1000>; #clock-cells = <1>; }; + + apbdma: dma { + compatible = "nvidia,tegra114-apbdma", "nvidia,tegra30-apbdma", "nvidia,tegra20-apbdma"; + reg = <0x6000a000 0x1400>; + interrupts = <0 104 0x04 + 0 105 0x04 + 0 106 0x04 + 0 107 0x04 + 0 108 0x04 + 0 109 0x04 + 0 110 0x04 + 0 111 0x04 + 0 112 0x04 + 0 113 0x04 + 0 114 0x04 + 0 115 0x04 + 0 116 0x04 + 0 117 0x04 + 0 118 0x04 + 0 119 0x04 + 0 128 0x04 + 0 129 0x04 + 0 130 0x04 + 0 131 0x04 + 0 132 0x04 + 0 133 0x04 + 0 134 0x04 + 0 135 0x04 + 0 136 0x04 + 0 137 0x04 + 0 138 0x04 + 0 139 0x04 + 0 140 0x04 + 0 141 0x04 + 0 142 0x04 + 0 143 0x04>; + }; };
Signature · 1 line
1.7.10.4
PATCH 10/14 tegra114: fdt: add apbdma block
arch/arm/dts/tegra114.dtsi line 13
Quoted 6 lines · Allen Martin
Add node for apbdma controller hardware.
arch/arm/dts/tegra114.dtsi +2
-0+ apbdma: dma { + compatible = "nvidia,tegra114-apbdma", "nvidia,tegra30-apbdma", "nvidia,tegra20-apbdma";
Sam here; the HW isn't 100% backwards-compatible with any previous generation, so only include the Tegra114 compatible value.
PATCH 11/14 tegra114: fdt: add SPI blocks
In reply to Allen MartinAdd nodes for t114 SPI controller hardware
--- arch/arm/dts/tegra114.dtsi | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+)
arch/arm/dts/tegra114.dtsi +72 -0
@@ -45,4 +45,76 @@ 0 142 0x04 0 143 0x04>; }; + + spi at 7000d400 { + compatible = "nvidia,tegra114-spi"; + reg = <0x7000d400 0x200>; + interrupts = <0 59 0x04>; + nvidia,dma-request-selector = <&apbdma 15>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + /* PERIPH_ID_SBC1, PLLP_OUT0 */ + clocks = <&tegra_car 41>; + }; + + spi at 7000d600 { + compatible = "nvidia,tegra114-spi"; + reg = <0x7000d600 0x200>; + interrupts = <0 82 0x04>; + nvidia,dma-request-selector = <&apbdma 16>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + /* PERIPH_ID_SBC2, PLLP_OUT0 */ + clocks = <&tegra_car 44>; + }; + + spi at 7000d800 { + compatible = "nvidia,tegra114-spi"; + reg = <0x7000d480 0x200>; + interrupts = <0 83 0x04>; + nvidia,dma-request-selector = <&apbdma 17>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + /* PERIPH_ID_SBC3, PLLP_OUT0 */ + clocks = <&tegra_car 46>; + }; + + spi at 7000da00 { + compatible = "nvidia,tegra114-spi"; + reg = <0x7000da00 0x200>; + interrupts = <0 93 0x04>; + nvidia,dma-request-selector = <&apbdma 18>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + /* PERIPH_ID_SBC4, PLLP_OUT0 */ + clocks = <&tegra_car 68>; + }; + + spi at 7000dc00 { + compatible = "nvidia,tegra114-spi"; + reg = <0x7000dc00 0x200>; + interrupts = <0 94 0x04>; + nvidia,dma-request-selector = <&apbdma 27>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + /* PERIPH_ID_SBC5, PLLP_OUT0 */ + clocks = <&tegra_car 104>; + }; + + spi at 7000de00 { + compatible = "nvidia,tegra114-spi"; + reg = <0x7000de00 0x200>; + interrupts = <0 79 0x04>; + nvidia,dma-request-selector = <&apbdma 28>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + /* PERIPH_ID_SBC6, PLLP_OUT0 */ + clocks = <&tegra_car 105>; + }; };
Signature · 1 line
1.7.10.4
PATCH 11/14 tegra114: fdt: add SPI blocks
Quoted 1 line · Allen Martin
Add nodes for t114 SPI controller hardware
s/t114/Tegra114/. Similar in patch 8/14 subject.
arch/arm/dts/tegra114.dtsi line 59
Quoted 13 lines
arch/arm/dts/tegra114.dtsi +11
-0+ spi at 7000d400 { + compatible = "nvidia,tegra114-spi"; + reg = <0x7000d400 0x200>; + interrupts = <0 59 0x04>; + nvidia,dma-request-selector = <&apbdma 15>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + /* PERIPH_ID_SBC1, PLLP_OUT0 */ + clocks = <&tegra_car 41>; + };
The status property should be last to match the kernel's device tree.
PATCH 12/14 tegra114: dalmore: fdt: enable dalmore SPI controller
In reply to Allen MartinDalmore has a SPI flash part attached to controller 4, so enable controller 4 and set to 25MHz.
--- board/nvidia/dts/tegra114-dalmore.dts | 5 +++++ 1 file changed, 5 insertions(+)
board/nvidia/dts/tegra114-dalmore.dts +5 -0
@@ -10,4 +10,9 @@ device_type = "memory"; reg = <0x80000000 0x80000000>; }; + + spi at 7000da00 { + status = "okay"; + spi-max-frequency = <25000000>; + }; };
Signature · 1 line
1.7.10.4
PATCH 13/14 tegra114: add SPI driver
In reply to Allen MartinAdd driver for tegra114 SPI controller. This controller is not compatible with either the tegra20 or tegra30 controllers, so it requires a new driver.
--- arch/arm/include/asm/arch-tegra114/tegra114_spi.h | 91 ++++++ drivers/spi/Makefile | 1 + drivers/spi/fdt_spi.c | 15 + drivers/spi/tegra114_spi.c | 355 +++++++++++++++++++++ include/configs/tegra-common-post.h | 2 +- 5 files changed, 463 insertions(+), 1 deletion(-) create mode 100644 arch/arm/include/asm/arch-tegra114/tegra114_spi.h create mode 100644 drivers/spi/tegra114_spi.c
arch/arm/include/asm/arch-tegra114/tegra114_spi.h new file +91 -0
@@ -0,0 +1,91 @@ +/* +* NVIDIA Tegra SPI controller +* +* Copyright 2010-2013 NVIDIA Corporation +* +* This software may be used and distributed according to the +* terms of the GNU Public License, Version 2, incorporated +* herein by reference. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* Version 2 as published by the Free Software Foundation. +* +* 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 +*/ + +#ifndef _TEGRA114_SPI_H_ +#define _TEGRA114_SPI_H_ + +#include <asm/types.h> + +/* 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) + +int tegra114_spi_init (int *node_list,int count); +int tegra114_spi_cs_is_valid (unsigned int bus,unsigned int cs); +struct spi_slave *tegra114_spi_setup_slave (unsigned int bus,unsigned int cs, +unsigned int max_hz,unsigned int mode); +void tegra114_spi_free_slave (struct spi_slave *slave); +int tegra114_spi_claim_bus (struct spi_slave *slave); +void tegra114_spi_cs_activate (struct spi_slave *slave); +void tegra114_spi_cs_deactivate (struct spi_slave *slave); +int tegra114_spi_xfer (struct spi_slave *slave,unsigned int bitlen, +const void *data_out,void *data_in,unsigned long flags); + +#endif /* _TEGRA114_SPI_H_ */
drivers/spi/Makefile +1 -0
@@ -48,6 +48,7 @@ COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o COBJS-$(CONFIG_FDT_SPI) += fdt_spi.o COBJS-$(CONFIG_TEGRA20_SPI) += tegra20_spi.o COBJS-$(CONFIG_TEGRA30_SPI) += tegra30_spi.o +COBJS-$(CONFIG_TEGRA114_SPI) += tegra114_spi.o COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o COBJS := $(COBJS-y)
drivers/spi/fdt_spi.c +15 -0
@@ -29,6 +29,7 @@#include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra20/tegra20_spi.h> #include <asm/arch-tegra30/tegra30_spi.h> +#include <asm/arch-tegra114/tegra114_spi.h> #include <spi.h> #include <fdtdec.h>
@@ -79,6 +80,20 @@ static struct fdt_spi_driver fdt_spi_drivers[] = { .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;
drivers/spi/tegra114_spi.c new file +355 -0
355 lines not on this page · raw message
include/configs/tegra-common-post.h +1 -1
@@ -150,7 +150,7 @@MEM_LAYOUT_ENV_SETTINGS \ BOOTCMDS_COMMON -#if defined(CONFIG_TEGRA20_SPI ) || defined(CONFIG_TEGRA30_SPI ) +#if defined(CONFIG_TEGRA20_SPI ) || defined(CONFIG_TEGRA30_SPI ) || defined(CONFIG_TEGRA114_SPI )#define CONFIG_FDT_SPI #endif
Signature · 1 line
1.7.10.4
PATCH 13/14 tegra114: add SPI driver
Quoted 1 line · Allen Martin
Subject: tegra114: add SPI driver
This really touches the SPI sub-system more than Tegra, and the Tegra subsystem is just (and all of) Tegra not Tegra114-specific, so I'd re-title this:
spi: tegra: add Tegra114 SPI driver
similar s/tegra114:/tegra:/ in other patch subjects, many of which probably should be "ARM: tegra: ...".
PATCH 13/14 tegra114: add SPI driver
Hi Allen,
Quoted 11 lines · Stephen Warren
Quoted 1 line · Allen Martin
Subject: tegra114: add SPI driver
This really touches the SPI sub-system more than Tegra, and the Tegra subsystem is just (and all of) Tegra not Tegra114-specific, so I'd re-title this:
spi: tegra: add Tegra114 SPI driver
similar s/tegra114:/tegra:/ in other patch subjects, many of which probably should be "ARM: tegra: ...".
This driver seems to add a lot of duplication. What prevents using common code? Is it the register layout, differences in algorithm or something else?
Regards,
Simon
PATCH 13/14 tegra114: add SPI driver
Quoted 10 lines · Simon Glass
Hi Allen,
Quoted 7 lines · Stephen Warren
Quoted 1 line · Allen Martin
Subject: tegra114: add SPI driver
This really touches the SPI sub-system more than Tegra, and the Tegra subsystem is just (and all of) Tegra not Tegra114-specific, so I'd re-title this:
Quoted 8 lines
Quoted 4 lines
spi: tegra: add Tegra114 SPI driver
similar s/tegra114:/tegra:/ in other patch subjects, many of which probably should be "ARM: tegra: ...".
This driver seems to add a lot of duplication. What prevents using common code? Is it the register layout, differences in algorithm or something else?
Yes, unfortunately there really are three different SPI controller hardware blocks. There's "sflash" which is a tegra20 only block, "slink" which is present in tegra20 and tegra30, and tegra114 has a new SPI controller which is functionally equivalent to slink, but the register interface is different.
The programming model is quite similar, but not exactly the same between each. For example, the same function may be one register write on one chip and two or more register writes on another. It could be possible to hide some of those differences in macros or inline functions, but I'm not sure if that's more or less messy.
-Allen
Signature · 1 line
nvpublic
PATCH 14/14 tegra114: dalmore: config: enable SPI
In reply to Allen MartinTurn on SPI in dalmore config file
--- include/configs/dalmore.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/configs/dalmore.h +11 -0
@@ -45,6 +45,17 @@#define MACH_TYPE_DALMORE 4304/* not yet in mach-types.h */ +/* SPI */ +#define CONFIG_TEGRA114_SPI +#define CONFIG_TEGRA114_SPI_CTRLS 6 +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_WINBOND +#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 +#define CONFIG_SF_DEFAULT_SPEED 24000000 +#define CONFIG_CMD_SPI +#define CONFIG_CMD_SF +#define CONFIG_SPI_FLASH_SIZE (4 << 20) +#include "tegra-common-post.h" #endif /* __CONFIG_H */
Signature · 1 line
1.7.10.4