tegra114 SPI driver
Subsystems (5)
v2 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.
Changes in v2:
- Added a patch to remove SPI/UART switch support, this was only useful for seaboard, which was never manufactured
- Renamed tegra_sflash and tegra_slink to tegra20_sflash and tegra20_slink
- Moved SPI register definitions from header files into SPI driver files, since those are the only users of those registers.
- Removed patch to add CAR node to dt, equivalent patch was already upstreamed.
Allen Martin (13):
tegra: remove support for UART SPI switch
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: fdt: add compatible string for tegra114 SPI ctrl
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 | 109 ++++++
arch/arm/include/asm/arch-tegra/board.h | 3 +-
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 | 41 ++
arch/arm/include/asm/arch-tegra20/tegra20_sflash.h | 41 ++
arch/arm/include/asm/arch-tegra20/tegra20_slink.h | 41 ++
.../arm/include/asm/arch-tegra20/uart-spi-switch.h | 46 ---
board/nvidia/common/board.c | 5 +-
board/nvidia/common/common.mk | 1 -
board/nvidia/common/uart-spi-switch.c | 125 ------
board/nvidia/dts/tegra114-dalmore.dts | 5 +
board/nvidia/seaboard/seaboard.c | 2 +-
drivers/mtd/spi/winbond.c | 5 +
drivers/spi/Makefile | 6 +-
drivers/spi/fdt_spi.c | 186 +++++++++
drivers/spi/tegra114_spi.c | 405 ++++++++++++++++++++
drivers/spi/{tegra_spi.c => tegra20_sflash.c} | 215 ++++++-----
drivers/spi/{tegra_slink.c => tegra20_slink.c} | 128 ++++---
include/configs/cardhu.h | 2 +-
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 +
25 files changed, 1054 insertions(+), 490 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_sflash.h
create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_slink.h
delete mode 100644 arch/arm/include/asm/arch-tegra20/uart-spi-switch.h
delete mode 100644 board/nvidia/common/uart-spi-switch.c
create mode 100644 drivers/spi/fdt_spi.c
create mode 100644 drivers/spi/tegra114_spi.c
rename drivers/spi/{tegra_spi.c => tegra20_sflash.c} (57%)
rename drivers/spi/{tegra_slink.c => tegra20_slink.c} (72%)Signature · 1 line
1.7.10.4
PATCH v2 1/13 tegra: remove support for UART SPI switch
This feature was only used for tegra20 seaboard that had a pinmux conflict on the SPI pins. These boards were never manufactured, so remove this support to clean up SPI driver.
--- arch/arm/include/asm/arch-tegra/board.h | 3 +- .../arm/include/asm/arch-tegra20/uart-spi-switch.h | 46 ------- board/nvidia/common/board.c | 3 - board/nvidia/common/common.mk | 1 - board/nvidia/common/uart-spi-switch.c | 125 -------------------- board/nvidia/seaboard/seaboard.c | 2 +- drivers/spi/tegra_spi.c | 25 +--- 7 files changed, 3 insertions(+), 202 deletions(-) delete mode 100644 arch/arm/include/asm/arch-tegra20/uart-spi-switch.h delete mode 100644 board/nvidia/common/uart-spi-switch.c
arch/arm/include/asm/arch-tegra/board.h +1 -2
@@ -25,8 +25,7 @@#define _TEGRA_BOARD_H_/* Set up pinmux to make UART usable */ -void gpio_config_uart (void );/* CONFIG_SPI_UART_SWITCH */ -void gpio_early_init_uart (void );/*!CONFIG_SPI_UART_SWITCH */ +void gpio_early_init_uart (void );/* Set up early UART output */ void board_init_uart_f (void );
arch/arm/include/asm/arch-tegra20/uart-spi-switch.h deleted +0 -46
46 lines not on this page · raw message
board/nvidia/common/board.c +0 -3
@@ -132,9 +132,6 @@ int board_init(void)clock_init ();clock_verify (); -#ifdef CONFIG_SPI_UART_SWITCH -gpio_config_uart (); -#endif #if defined(CONFIG_TEGRA_SPI ) || defined(CONFIG_TEGRA_SLINK )pin_mux_spi ();spi_init ();
board/nvidia/common/common.mk +0 -1
@@ -1,4 +1,3 @@ # common options for all tegra boards COBJS-y += ../../nvidia/common/board.o -COBJS-$(CONFIG_SPI_UART_SWITCH) += ../../nvidia/common/uart-spi-switch.o COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += ../../nvidia/common/emc.o
board/nvidia/common/uart-spi-switch.c deleted +0 -125
125 lines not on this page · raw message
board/nvidia/seaboard/seaboard.c +1 -1
@@ -31,7 +31,7 @@#include <asm/gpio.h> /* TODO: Remove this code when the SPI switch is working */ -#if !defined(CONFIG_SPI_UART_SWITCH ) && (CONFIG_MACH_TYPE !=MACH_TYPE_VENTANA ) +#if (CONFIG_MACH_TYPE !=MACH_TYPE_VENTANA )void gpio_early_init_uart (void ) {/* Enable UART via GPIO_PI3 (port 8, bit 3) so serial console works */
drivers/spi/tegra_spi.c +1 -24
@@ -28,7 +28,6 @@#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 <spi.h>
@@ -36,12 +35,6 @@DECLARE_GLOBAL_DATA_PTR ; -#if defined(CONFIG_SPI_CORRUPTS_UART ) -#define corrupt_delay () udelay(CONFIG_SPI_CORRUPTS_UART_DLY); -#else -#define corrupt_delay () -#endif -struct tegra_spi_slave {struct spi_slave slave;struct spi_tegra *regs;
@@ -175,16 +168,8 @@ 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 ; }
@@ -202,24 +187,16 @@ void spi_cs_activate(struct spi_slave *slave) {struct tegra_spi_slave *spi =to_tegra_spi (slave); -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 ); - -corrupt_delay ();/* Let UART settle */ }void spi_cs_deactivate (struct spi_slave *slave) {struct tegra_spi_slave *spi =to_tegra_spi (slave); -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 ); - -corrupt_delay ();/* Let SPI settle */ } int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
Signature · 1 line
1.7.10.4
PATCH v2 1/13 tegra: remove support for UART SPI switch
drivers/spi/tegra_spi.c int spi_claim_bus(struct spi_slave *slave) · line 171
Quoted 11 lines · Allen Martin
This feature was only used for tegra20 seaboard that had a pinmux conflict on the SPI pins. These boards were never manufactured, so remove this support to clean up SPI driver.
drivers/spi/tegra_spi.c +1
-0@@ -175,16 +168,8 @@ 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 );
As a note for future cleanup, all this pinmux stuff should be moved out of the SPI driver into the board file's initialization functions.
PATCH v2 1/13 tegra: remove support for UART SPI switch
In reply to Allen MartinHi Allen,
Quoted 5 lines · Allen Martin
This feature was only used for tegra20 seaboard that had a pinmux conflict on the SPI pins. These boards were never manufactured, so remove this support to clean up SPI driver.
Signed-off-by Allen Martin <[email protected]>
Quoted 11 lines
--- arch/arm/include/asm/arch-tegra/board.h | 3 +- .../arm/include/asm/arch-tegra20/uart-spi-switch.h | 46 ------- board/nvidia/common/board.c | 3 - board/nvidia/common/common.mk | 1 - board/nvidia/common/uart-spi-switch.c | 125 -------------------- board/nvidia/seaboard/seaboard.c | 2 +- drivers/spi/tegra_spi.c | 25 +--- 7 files changed, 3 insertions(+), 202 deletions(-) delete mode 100644 arch/arm/include/asm/arch-tegra20/uart-spi-switch.h delete mode 100644 board/nvidia/common/uart-spi-switch.c
OK, maybe I need to get the T114 booting and stop using the seaboard?
Regards,
Simon
PATCH v2 1/13 tegra: remove support for UART SPI switch
Quoted 20 lines · Simon Glass
Hi Allen,
Quoted 5 lines · Allen Martin
This feature was only used for tegra20 seaboard that had a pinmux conflict on the SPI pins. These boards were never manufactured, so remove this support to clean up SPI driver.
Signed-off-by Allen Martin <[email protected]>Quoted 11 lines
--- arch/arm/include/asm/arch-tegra/board.h | 3 +- .../arm/include/asm/arch-tegra20/uart-spi-switch.h | 46 ------- board/nvidia/common/board.c | 3 - board/nvidia/common/common.mk | 1 - board/nvidia/common/uart-spi-switch.c | 125 -------------------- board/nvidia/seaboard/seaboard.c | 2 +- drivers/spi/tegra_spi.c | 25 +--- 7 files changed, 3 insertions(+), 202 deletions(-) delete mode 100644 arch/arm/include/asm/arch-tegra20/uart-spi-switch.h delete mode 100644 board/nvidia/common/uart-spi-switch.c
Quoted 1 line
OK, maybe I need to get the T114 booting and stop using the seaboard?
Seaboard still works perfectly after this patch (or should; I assume Allen tested it!). The only issue is that you can't use SPI; the assumption being that you store the BCT/bootloader in eMMC rather than SPI and hence have no need to use SPI. SPI can be tested on other Tegra20 board designs, such as TrimSlice (or perhaps Kaen/Aebl if they're still around!)
PATCH v2 1/13 tegra: remove support for UART SPI switch
Hi Stephen,
Quoted 21 lines · Stephen Warren
Quoted 20 lines · Simon Glass
Hi Allen,
Quoted 16 lines · Allen Martin
This feature was only used for tegra20 seaboard that had a pinmux conflict on the SPI pins. These boards were never manufactured, so remove this support to clean up SPI driver.
Signed-off-by Allen Martin <[email protected]>--- arch/arm/include/asm/arch-tegra/board.h | 3 +- .../arm/include/asm/arch-tegra20/uart-spi-switch.h | 46 ------- board/nvidia/common/board.c | 3 - board/nvidia/common/common.mk | 1 - board/nvidia/common/uart-spi-switch.c | 125 -------------------- board/nvidia/seaboard/seaboard.c | 2 +- drivers/spi/tegra_spi.c | 25 +--- 7 files changed, 3 insertions(+), 202 deletions(-) delete mode 100644 arch/arm/include/asm/arch-tegra20/uart-spi-switch.h delete mode 100644 board/nvidia/common/uart-spi-switch.c
Quoted 8 lines
Quoted 1 line
OK, maybe I need to get the T114 booting and stop using the seaboard?
Seaboard still works perfectly after this patch (or should; I assume Allen tested it!). The only issue is that you can't use SPI; the assumption being that you store the BCT/bootloader in eMMC rather than SPI and hence have no need to use SPI. SPI can be tested on other Tegra20 board designs, such as TrimSlice (or perhaps Kaen/Aebl if they're still around!)
OK that's no problem I think.
Regards,
Simon
PATCH v2 2/13 tegra: spi: rename tegra SPI drivers
In reply to Allen MartinRename tegra SPI drivers to tegra20_flash and tegra20_slink in preparation for commonization and addition of tegra114_spi.
---
.../{arch-tegra/tegra_spi.h => arch-tegra20/tegra20_sflash.h} | 6 +++---
.../{arch-tegra/tegra_slink.h => arch-tegra20/tegra20_slink.h} | 6 +++---
board/nvidia/common/board.c | 2 +-
drivers/spi/Makefile | 4 ++--
drivers/spi/{tegra_spi.c => tegra20_sflash.c} | 2 +-
drivers/spi/{tegra_slink.c => tegra20_slink.c} | 2 +-
include/configs/cardhu.h | 2 +-
include/configs/trimslice.h | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
rename arch/arm/include/asm/{arch-tegra/tegra_spi.h => arch-tegra20/tegra20_sflash.h} (96%)
rename arch/arm/include/asm/{arch-tegra/tegra_slink.h => arch-tegra20/tegra20_slink.h} (97%)
rename drivers/spi/{tegra_spi.c => tegra20_sflash.c} (99%)
rename drivers/spi/{tegra_slink.c => tegra20_slink.c} (99%)arch/arm/include/asm/arch-tegra20/tegra20_sflash.h renamed from arch/arm/include/asm/arch-tegra/tegra_spi.h +3 -3
@@ -22,8 +22,8 @@* MA 02111-1307 USA */ -#ifndef _TEGRA_SPI_H_ -#define _TEGRA_SPI_H_ +#ifndef _TEGRA20_SPI_H_ +#define _TEGRA20_SPI_H_#include <asm/types.h>
@@ -72,4 +72,4 @@ struct spi_tegra {#define SPI_TIMEOUT 1000#define TEGRA_SPI_MAX_FREQ 52000000 -#endif /* _TEGRA_SPI_H_ */ +#endif /* _TEGRA20_SPI_H_ */
arch/arm/include/asm/arch-tegra20/tegra20_slink.h renamed from arch/arm/include/asm/arch-tegra/tegra_slink.h +3 -3
@@ -22,8 +22,8 @@* MA 02111-1307 USA */ -#ifndef _TEGRA_SLINK_H_ -#define _TEGRA_SLINK_H_ +#ifndef _TEGRA30_SPI_H_ +#define _TEGRA30_SPI_H_#include <asm/types.h>
@@ -81,4 +81,4 @@ struct slink_tegra {#define SPI_TIMEOUT 1000#define TEGRA_SPI_MAX_FREQ 52000000 -#endif /* _TEGRA_SLINK_H_ */ +#endif /* _TEGRA30_SPI_H_ */
board/nvidia/common/board.c +1 -1
@@ -132,7 +132,7 @@ int board_init(void)clock_init ();clock_verify (); -#if defined(CONFIG_TEGRA_SPI ) || defined(CONFIG_TEGRA_SLINK ) +#if defined(CONFIG_TEGRA20_SFLASH ) || defined(CONFIG_TEGRA20_SLINK )pin_mux_spi ();spi_init ();#endif
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_SFLASH) += tegra20_sflash.o +COBJS-$(CONFIG_TEGRA20_SLINK) += tegra20_slink.o COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o COBJS := $(COBJS-y)
drivers/spi/tegra20_sflash.c renamed from drivers/spi/tegra_spi.c +1 -1
@@ -29,7 +29,7 @@#include <asm/arch/clock.h> #include <asm/arch/pinmux.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>
drivers/spi/tegra20_slink.c renamed from drivers/spi/tegra_slink.c +1 -1
@@ -27,7 +27,7 @@#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>
include/configs/cardhu.h +1 -1
@@ -60,7 +60,7 @@#define CONFIG_SYS_MMC_ENV_PART 2/* SPI */ -#define CONFIG_TEGRA_SLINK +#define CONFIG_TEGRA20_SLINK #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_SFLASH #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 v2 3/13 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_sflash.c | 12 ++++-------- drivers/spi/tegra20_slink.c | 29 ----------------------------- 2 files changed, 4 insertions(+), 37 deletions(-)
drivers/spi/tegra20_sflash.c +4 -8
@@ -61,6 +61,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",
@@ -81,9 +82,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 ;
@@ -108,11 +109,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/tegra20_slink.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 v2 4/13 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_sflash.h | 45 ------------- arch/arm/include/asm/arch-tegra20/tegra20_slink.h | 54 ---------------- drivers/spi/tegra20_sflash.c | 53 +++++++++++++-- drivers/spi/tegra20_slink.c | 68 ++++++++++++++++++-- 4 files changed, 110 insertions(+), 110 deletions(-)
arch/arm/include/asm/arch-tegra20/tegra20_sflash.h +0 -45
@@ -27,49 +27,4 @@#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) -#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 - -#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 -#endif /* _TEGRA20_SPI_H_ */
arch/arm/include/asm/arch-tegra20/tegra20_slink.h +0 -54
58 lines not on this page · raw message
drivers/spi/tegra20_sflash.c +49 -4
79 lines not on this page · raw message
drivers/spi/tegra20_slink.c +61 -7
105 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH v2 5/13 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_sflash.c | 110 +++++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 43 deletions(-)
drivers/spi/tegra20_sflash.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 *
@@ -80,14 +80,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);
@@ -106,7 +114,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",
@@ -127,41 +134,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; }
@@ -175,17 +160,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 | \
@@ -196,8 +218,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);
@@ -227,24 +249,26 @@ 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;/* 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 ); }void spi_cs_deactivate (struct spi_slave *slave) {struct tegra_spi_slave *spi =to_tegra_spi (slave); +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 ); +clrbits_le32 (®s->command,SPI_CMD_CS_VAL ); }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 v2 6/13 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_sflash.h | 11 ++ arch/arm/include/asm/arch-tegra20/tegra20_slink.h | 11 ++ board/nvidia/common/board.c | 2 +- drivers/spi/Makefile | 1 + drivers/spi/fdt_spi.c | 171 ++++++++++++++++++++ drivers/spi/tegra20_sflash.c | 41 ++--- drivers/spi/tegra20_slink.c | 29 ++-- include/configs/tegra-common-post.h | 4 + 8 files changed, 224 insertions(+), 46 deletions(-) create mode 100644 drivers/spi/fdt_spi.c
arch/arm/include/asm/arch-tegra20/tegra20_sflash.h +11 -0
@@ -27,4 +27,15 @@#include <asm/types.h> +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-tegra20/tegra20_slink.h +11 -0
@@ -27,4 +27,15 @@#include <asm/types.h> +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
@@ -132,7 +132,7 @@ int board_init(void)clock_init ();clock_verify (); -#if defined(CONFIG_TEGRA20_SFLASH ) || defined(CONFIG_TEGRA20_SLINK ) +#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_SFLASH) += tegra20_sflash.o COBJS-$(CONFIG_TEGRA20_SLINK) += tegra20_slink.o COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o
drivers/spi/fdt_spi.c new file +171 -0
171 lines not on this page · raw message
drivers/spi/tegra20_sflash.c +14 -27
112 lines not on this page · raw message
drivers/spi/tegra20_slink.c +11 -18
@@ -107,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 ;
@@ -115,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;
@@ -159,25 +159,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];
@@ -201,13 +196,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;
@@ -232,11 +229,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;
@@ -245,7 +238,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;
@@ -254,7 +247,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/tegra-common-post.h +4 -0
@@ -150,6 +150,10 @@MEM_LAYOUT_ENV_SETTINGS \ BOOTCMDS_COMMON +#if defined(CONFIG_TEGRA20_SFLASH ) || defined(CONFIG_TEGRA20_SLINK ) +#define CONFIG_FDT_SPI +#endif +/* overrides for SPL build here */ #ifdef CONFIG_SPL_BUILD
Signature · 1 line
1.7.10.4
PATCH v2 6/13 spi: add common fdt SPI driver interface
Quoted 27 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.drivers/spi/fdt_spi.c +20
-0+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,
drivers/spi/fdt_spi.c line 82
Quoted 10 lines
drivers/spi/fdt_spi.c +10
-0+ .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 +};
In the future, it would be nice if we could build up that table automatically, with each driver providing its own struct inside the driver file, and using e.g. linker scripts to piece together the structs into one large table. That would avoid the need to list each one here, and to prototype all those functions in a header file.
It'd also be nice to allow multiple driver to be active at once.
Still, that's certainly all something that's quite suitable for follow-on patches later; not something that needs to be addressed in this series.
PATCH v2 6/13 spi: add common fdt SPI driver interface
Hi Stephen,
Quoted 45 lines · Stephen Warren
Quoted 27 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.drivers/spi/fdt_spi.c +20
-0+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,drivers/spi/fdt_spi.c line 82
Quoted 10 lines
drivers/spi/fdt_spi.c +10
-0+ .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 +};In the future, it would be nice if we could build up that table automatically, with each driver providing its own struct inside the driver file, and using e.g. linker scripts to piece together the structs into one large table. That would avoid the need to list each one here, and to prototype all those functions in a header file.
Quoted 5 lines
It'd also be nice to allow multiple driver to be active at once.
Still, that's certainly all something that's quite suitable for follow-on patches later; not something that needs to be addressed in this series.
Agreed. This fits more with the driver model work, where the above structure could be used as the SPI subsystem interface perhaps.
Regards,
Simon
PATCH v2 7/13 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
@@ -68,6 +68,11 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { .name = "W25Q80", }, { + .id = 0x6016, + .nr_blocks = 512, + .name = "W25Q32DW", + }, + { .id = 0x6017, .nr_blocks = 128, .name = "W25Q64DW",
Signature · 1 line
1.7.10.4
PATCH v2 7/13 sf: winbond: add W25Q32DW
Hi Allen,
Quoted 12 lines · Allen Martin
Add support for Winbond W25Q32DW 32Mbit part
Signed-off-by Allen Martin <[email protected]>--- drivers/mtd/spi/winbond.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/mtd/spi/winbond.c +0
-0
drivers/mtd/spi/winbond.c static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { · line 72
Quoted 5 lines
drivers/mtd/spi/winbond.c +2
-0@@ -68,6 +68,11 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { .name = "W25Q80", }, { + .id = 0x6016, + .nr_blocks = 512,
nr_blocks here should have 64 instead of 512. please let me know, I will add correction-patch for this.
Thanks,
Jagan.
Quoted 13 lines
drivers/mtd/spi/winbond.c +3
-1+ .name = "W25Q32DW", + }, + { .id = 0x6017, .nr_blocks = 128, .name = "W25Q64DW", --1.7.10.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH v2 7/13 sf: winbond: add W25Q32DW
Hi,
Any update on this.
Thanks,
Jagan.
Quoted 40 lines · Jagan Teki
Hi Allen,
Quoted 12 lines · Allen Martin
Add support for Winbond W25Q32DW 32Mbit part
Signed-off-by Allen Martin <[email protected]>--- drivers/mtd/spi/winbond.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/mtd/spi/winbond.c +0
-0drivers/mtd/spi/winbond.c static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { · line 72
Quoted 5 lines
drivers/mtd/spi/winbond.c +2
-0@@ -68,6 +68,11 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { .name = "W25Q80", }, { + .id = 0x6016, + .nr_blocks = 512,
nr_blockshere should have 64 instead of 512. please let me know, I will add correction-patch for this.Thanks,
Jagan.Quoted 13 lines
drivers/mtd/spi/winbond.c +3
-1+ .name = "W25Q32DW", + }, + { .id = 0x6017, .nr_blocks = 128, .name = "W25Q64DW", --1.7.10.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH v2 7/13 sf: winbond: add W25Q32DW
Quoted 31 lines · Jagan Teki
Hi,
Any update on this.
Thanks,
Jagan.Quoted 23 lines · Jagan Teki
Hi Allen,
Quoted 12 lines · Allen Martin
Add support for Winbond W25Q32DW 32Mbit part
Signed-off-by Allen Martin <[email protected]>--- drivers/mtd/spi/winbond.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/mtd/spi/winbond.c +0
-0drivers/mtd/spi/winbond.c static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { · line 72
Quoted 5 lines
drivers/mtd/spi/winbond.c +2
-0@@ -68,6 +68,11 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { .name = "W25Q80", }, { + .id = 0x6016, + .nr_blocks = 512,
nr_blockshere should have 64 instead of 512. please let me know, I will add correction-patch for this.
You're right, it's a 32Mbit part, so nr_blocks should be 64, thanks for finding this.
-Allen
Signature · 1 line
nvpublic
PATCH v2 7/13 sf: winbond: add W25Q32DW
Quoted 33 lines · Allen Martin
Quoted 31 lines · Jagan Teki
Hi,
Any update on this.
Thanks,
Jagan.Quoted 23 lines · Jagan Teki
Hi Allen,
Quoted 12 lines · Allen Martin
Add support for Winbond W25Q32DW 32Mbit part
Signed-off-by Allen Martin <[email protected]>--- drivers/mtd/spi/winbond.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/mtd/spi/winbond.c +0
-0drivers/mtd/spi/winbond.c static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { · line 72
Quoted 5 lines
drivers/mtd/spi/winbond.c +2
-0@@ -68,6 +68,11 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { .name = "W25Q80", }, { + .id = 0x6016, + .nr_blocks = 512,
nr_blockshere should have 64 instead of 512. please let me know, I will add correction-patch for this.
Quoted 2 lines
You're right, it's a 32Mbit part, so
nr_blocksshould be 64, thanks for finding this.
Thanks for your response.
I just updated on the patch http://patchwork.ozlabs.org/patch/246654/
Please let me know for any issues.
--
Thanks,
Jagan.
PATCH v2 8/13 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
@@ -75,6 +75,7 @@ enum fdt_compat_id {COMPAT_NVIDIA_TEGRA20_SDMMC ,/* Tegra20 SDMMC 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
@@ -50,6 +50,7 @@ static const char * const compat_names[COMPAT_COUNT] = {COMPAT (NVIDIA_TEGRA20_SDMMC ,"nvidia,tegra20-sdhci" ),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 v2 9/13 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
@@ -17,6 +17,43 @@ #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>; + }; + gpio: gpio { compatible = "nvidia,tegra114-gpio", "nvidia,tegra30-gpio"; reg = <0x6000d000 0x1000>;
Signature · 1 line
1.7.10.4
PATCH v2 10/13 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
@@ -120,4 +120,76 @@ clocks = <&tegra_car 47>; status = "disabled"; }; + + 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 v2 11/13 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
@@ -35,4 +35,9 @@ status = "okay"; clock-frequency = <400000>; }; + + spi at 7000da00 { + status = "okay"; + spi-max-frequency = <25000000>; + }; };
Signature · 1 line
1.7.10.4
PATCH v2 12/13 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 | 41 +++ drivers/spi/Makefile | 1 + drivers/spi/fdt_spi.c | 15 + drivers/spi/tegra114_spi.c | 405 +++++++++++++++++++++ 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 +41 -0
@@ -0,0 +1,41 @@ +/* +* 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> + +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_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)
drivers/spi/fdt_spi.c +15 -0
@@ -29,6 +29,7 @@#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>
@@ -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 +405 -0
405 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_SFLASH ) || defined(CONFIG_TEGRA20_SLINK ) +#if defined(CONFIG_TEGRA20_SFLASH ) || defined(CONFIG_TEGRA20_SLINK ) || defined(CONFIG_TEGRA114_SPI )#define CONFIG_FDT_SPI #endif
Signature · 1 line
1.7.10.4
PATCH v2 12/13 tegra114: add SPI driver
Hi Allen,
Quoted 5 lines · Allen Martin
Add driver for tegra114 SPI controller. This controller is not compatible with either the tegra20 or tegra30 controllers, so it requires a new driver.
Signed-off-by Allen Martin <[email protected]>
Quoted 10 lines
--- arch/arm/include/asm/arch-tegra114/tegra114_spi.h | 41 +++ drivers/spi/Makefile | 1 + drivers/spi/fdt_spi.c | 15 + drivers/spi/tegra114_spi.c | 405 +++++++++++++++++++++ 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
Assuming that my SPI patches are picked up you might want to look at:
http://patchwork.ozlabs.org/bundle/sjg/spi/
I've only had a brief look at this series, but it seems like a reasonable thing to do. Arguable we should be using something like driver model to implement this more generally, but that doesn't exist so...
Regards,
Simon
PATCH v2 13/13 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
@@ -54,6 +54,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
v2 cover tegra114 SPI driver
In reply to Allen MartinAllen,
Quoted 10 lines
-----Original Message-----
From: Allen Martin [mailto:amartin at nvidia.com]
Sent: Saturday, March 16, 2013 9:58 PM
To: Tom Warren; swarren at wwwdotorg.org; sjg at chromium.org
Cc: u-boot at lists.denx.de; Allen Martin
Subject: [PATCH v2 00/13] tegra114 SPI driverThis 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.
Applies cleanly to current u-boot-tegra/next. All Tegra boards build OK. Tested on Seaboard, Cardhu and Dalmore AOK (no more 'sf' or 'sspi' on Seaboard).
For the series:
I'll apply this to u-boot-tegra/next under the assumption that it won't require any more work.
Thanks,
Tom
Quoted 60 lines
Changes in v2:
- Added a patch to remove SPI/UART switch support, this was only useful for seaboard, which was never manufactured
- Renamedtegra_sflashandtegra_slinktotegra20_sflashandtegra20_slink
- Moved SPI register definitions from header files into SPI driver files, since those are the only users of those registers.
- Removed patch to add CAR node to dt, equivalent patch was already upstreamed.Allen Martin (13):
tegra: remove support for UART SPI switch
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 tospi_init
spi: add common fdt SPI driver interface
sf: winbond: add W25Q32DW
tegra114: fdt: add compatible string for tegra114 SPI ctrl
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 SPIarch/arm/dts/tegra114.dtsi | 109 ++++++ arch/arm/include/asm/arch-tegra/board.h | 3 +- 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 | 41 ++ arch/arm/include/asm/arch-tegra20/tegra20_sflash.h | 41 ++ arch/arm/include/asm/arch-tegra20/tegra20_slink.h | 41 ++ .../arm/include/asm/arch-tegra20/uart-spi-switch.h | 46 --- board/nvidia/common/board.c | 5 +- board/nvidia/common/common.mk | 1 - board/nvidia/common/uart-spi-switch.c | 125 ------ board/nvidia/dts/tegra114-dalmore.dts | 5 + board/nvidia/seaboard/seaboard.c | 2 +- drivers/mtd/spi/winbond.c | 5 + drivers/spi/Makefile | 6 +- drivers/spi/fdt_spi.c | 186 +++++++++ drivers/spi/tegra114_spi.c | 405 ++++++++++++++++++++ drivers/spi/{tegra_spi.c => tegra20_sflash.c} | 215 ++++++----- drivers/spi/{tegra_slink.c => tegra20_slink.c} | 128 ++++--- include/configs/cardhu.h | 2 +- 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 + 25 files changed, 1054 insertions(+), 490 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_sflash.h create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_slink.h delete mode 100644 arch/arm/include/asm/arch-tegra20/uart-spi-switch.h delete mode 100644 board/nvidia/common/uart-spi-switch.c create mode 100644 drivers/spi/fdt_spi.c create mode 100644
Quoted 6 lines
drivers/spi/tegra114_spi.crenamedrivers/spi/{tegra_spi.c=>tegra20_sflash.c} (57%) renamedrivers/spi/{tegra_slink.c=>tegra20_slink.c} (72%)--
1.7.10.4
-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------
v2 cover tegra114 SPI driver
In reply to Allen MartinQuoted 4 lines · Allen Martin
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.
The series,
There were quite a few places in commit descriptions and perhaps comments where we should s/{t,tegra}(\d+)/Tegra\1/i though.
v2 cover tegra114 SPI driver
Hi,
Quoted 6 lines · Stephen Warren
Quoted 4 lines · Allen Martin
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.
Quoted 6 lines
The series,
Reviewed-by Stephen Warren <[email protected]>There were quite a few places in commit descriptions and perhaps comments where we should s/{t,tegra}(\d+)/Tegra\1/i though.
Just one request - I submitted a series (now in mainline) which adds a function to allocate a new SPI controller. Could you please check that your patch applies on top of that? I got a conflict on tegra20_sflash.c I think.
Regards,
Simon