tegra2: Implement SPI flash and saved environment
Subsystems (3)
v3 cover tegra2: Implement SPI flash and saved environment
Enable SPI flash on the Tegra2 Seaboard along with a saved 8KB environment. This involves a few pieces:
- Tegra2 SPI driver
- Seaboard config changes
- a SPI / UART switch to handle switching between SPI and console UART
This series applies cleanly on top of Stephen Warren's latest patch series
http://patchwork.ozlabs.org/project/uboot/list/?submitter=Stephen+Warren&state=*&q=v7
(the first patch of which is already applied)
and also requires Stephen's GPIO fix.
http://patchwork.ozlabs.org/patch/118184/
Still to come are the NS16550 driver changes to cope with the pins disappearing from under it. This patch series has been NAKed, the XON/XOFF series won't really help and it isn't clear exactly what to do here. I will return to this another day.
http://patchwork.ozlabs.org/patch/120013/
This patch series has been tested on Seaboard and other Tegra2 hardware.
Changes in v2:
- Update to support SPI mode and frequency
- Tidy driver according to comments, and tidy a little more
- Add CONFIG_SPI_FLASH_SIZE to define flash size
- Add config for SPI environment mode/speed
- Fix up GPIO selection to use gpio_request() first
- Rename uart-spi-fix to uart-spi-switch
- Rename uart/spi_enable() to pinmux_select_uart/spi()
- Add pinmux logic to SPI driver
Changes in v3:
- Remove the replaced bus/cs check function
- Change (bitlen & 7) to (bitlen % 8)
- Remove unneeded #includes and header file guard
Simon Glass (7):
tegra2: Tidy UART selection
tegra2: Add UARTB support
tegra2: config: Enable SPI flash on Seaboard
tegra2: Enable SPI environment on Seaboard
tegra2: Implement SPI / UART GPIO switch
tegra2: spi: Support SPI / UART switch
tegra2: Plumb in SPI/UART switch code
Tom Warren (1):
tegra2: spi: Add SPI driver for Tegra2 SOC
arch/arm/include/asm/arch-tegra2/tegra2.h | 1 + arch/arm/include/asm/arch-tegra2/tegra2_spi.h | 76 ++++++ arch/arm/include/asm/arch-tegra2/uart-spi-switch.h | 46 ++++ board/nvidia/common/Makefile | 47 ++++ board/nvidia/common/board.c | 79 ++++-- board/nvidia/common/board.h | 1 + board/nvidia/common/uart-spi-switch.c | 138 ++++++++++ board/nvidia/seaboard/Makefile | 1 - board/nvidia/seaboard/seaboard.c | 3 + drivers/spi/Makefile | 1 + drivers/spi/tegra2_spi.c | 274 ++++++++++++++++++++ include/configs/harmony.h | 3 + include/configs/seaboard.h | 20 ++ include/configs/tegra2-common.h | 3 +- 14 files changed, 667 insertions(+), 26 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2_spi.h create mode 100644 arch/arm/include/asm/arch-tegra2/uart-spi-switch.h create mode 100644 board/nvidia/common/Makefile create mode 100644 board/nvidia/common/uart-spi-switch.c create mode 100644 drivers/spi/tegra2_spi.c
Signature · 1 line
1.7.3.1
PATCH v3 1/8 tegra2: Tidy UART selection
UART selection is done with a lot of #ifdefs. This cleans things up a little.
---
board/nvidia/common/board.c | 57 +++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 23 deletions(-)
board/nvidia/common/board.c +34 -23
@@ -35,6 +35,12 @@DECLARE_GLOBAL_DATA_PTR ; +enum { +/* UARTs which we can enable */ +UARTA =1 <<0 , +UARTD =1 <<3 , +}; +const struct tegra2_sysinfo sysinfo = {CONFIG_TEGRA2_BOARD_STRING };
@@ -64,36 +70,32 @@ static void enable_uart(enum periph_id pid)/* * Routine: clock_init_uart -* Description: init the PLL and clock for the UART(s) +* Description: init clock for the UART(s) */ -static void clock_init_uart (void ) +static void clock_init_uart (int uart_ids) { -#if defined(CONFIG_TEGRA2_ENABLE_UARTA ) -enable_uart (PERIPH_ID_UART1 ); -#endif /* CONFIG_TEGRA2_ENABLE_UARTA */ -#if defined(CONFIG_TEGRA2_ENABLE_UARTD ) -enable_uart (PERIPH_ID_UART4 ); -#endif /* CONFIG_TEGRA2_ENABLE_UARTD */ +if (uart_ids &UARTA ) +enable_uart (PERIPH_ID_UART1 ); +if (uart_ids &UARTD ) +enable_uart (PERIPH_ID_UART4 ); }/* * Routine: pin_mux_uart * Description: setup the pin muxes/tristate values for the UART(s) */ -static void pin_mux_uart (void ) +static void pin_mux_uart (int uart_ids) { -#if defined(CONFIG_TEGRA2_ENABLE_UARTA ) -pinmux_set_func (PINGRP_IRRX ,PMUX_FUNC_UARTA ); -pinmux_set_func (PINGRP_IRTX ,PMUX_FUNC_UARTA ); - -pinmux_tristate_disable (PINGRP_IRRX ); -pinmux_tristate_disable (PINGRP_IRTX ); -#endif /* CONFIG_TEGRA2_ENABLE_UARTA */ -#if defined(CONFIG_TEGRA2_ENABLE_UARTD ) -pinmux_set_func (PINGRP_GMC ,PMUX_FUNC_UARTD ); - -pinmux_tristate_disable (PINGRP_GMC ); -#endif /* CONFIG_TEGRA2_ENABLE_UARTD */ +if (uart_ids &UARTA ) { +pinmux_set_func (PINGRP_IRRX ,PMUX_FUNC_UARTA ); +pinmux_set_func (PINGRP_IRTX ,PMUX_FUNC_UARTA ); +pinmux_tristate_disable (PINGRP_IRRX ); +pinmux_tristate_disable (PINGRP_IRTX ); + } +if (uart_ids &UARTD ) { +pinmux_set_func (PINGRP_GMC ,PMUX_FUNC_UARTD ); +pinmux_tristate_disable (PINGRP_GMC ); + } }/*
@@ -114,14 +116,23 @@ int board_init(void)#ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f (void ) { +int uart_ids =0 ;/* bit mask of which UART ids to enable */ + +#ifdef CONFIG_TEGRA2_ENABLE_UARTA + uart_ids |=UARTA ; +#endif +#ifdef CONFIG_TEGRA2_ENABLE_UARTD + uart_ids |=UARTD ; +#endif +/* Initialize essential common plls */ clock_early_init ();/* Initialize UART clocks */ -clock_init_uart (); +clock_init_uart (uart_ids);/* Initialize periph pinmuxes */ -pin_mux_uart (); +pin_mux_uart (uart_ids);/* Initialize periph GPIOs */ gpio_config_uart ();
Signature · 1 line
1.7.3.1
PATCH v3 2/8 tegra2: Add UARTB support
In reply to Simon GlassUARTB is used on some boards, so support it here.
---
board/nvidia/common/board.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
board/nvidia/common/board.c +10 -0
@@ -38,6 +38,7 @@ DECLARE_GLOBAL_DATA_PTR;enum {/* UARTs which we can enable */ UARTA =1 <<0 , +UARTB =1 <<1 ,UARTD =1 <<3 , };
@@ -76,6 +77,8 @@ static void clock_init_uart(int uart_ids) {if (uart_ids &UARTA )enable_uart (PERIPH_ID_UART1 ); +if (uart_ids &UARTB ) +enable_uart (PERIPH_ID_UART2 );if (uart_ids &UARTD )enable_uart (PERIPH_ID_UART4 ); }
@@ -92,6 +95,10 @@ static void pin_mux_uart(int uart_ids)pinmux_tristate_disable (PINGRP_IRRX );pinmux_tristate_disable (PINGRP_IRTX ); } +if (uart_ids &UARTB ) { +pinmux_set_func (PINGRP_UAD ,PMUX_FUNC_IRDA ); +pinmux_tristate_disable (PINGRP_UAD ); + }if (uart_ids &UARTD ) {pinmux_set_func (PINGRP_GMC ,PMUX_FUNC_UARTD );pinmux_tristate_disable (PINGRP_GMC );
@@ -121,6 +128,9 @@ int board_early_init_f(void)#ifdef CONFIG_TEGRA2_ENABLE_UARTA uart_ids |=UARTA ;#endif +#ifdef CONFIG_TEGRA2_ENABLE_UARTB + uart_ids |=UARTB ; +#endif #ifdef CONFIG_TEGRA2_ENABLE_UARTD uart_ids |=UARTD ;#endif
Signature · 1 line
1.7.3.1
PATCH v3 3/8 tegra2: spi: Add SPI driver for Tegra2 SOC
In reply to Simon GlassFrom: Tom Warren <[email protected]>
This driver supports SPI on Tegra2, running at 48MHz.
---
Changes in v2:
- Update to support SPI mode and frequency
- Tidy driver according to comments, and tidy a little more
Changes in v3:
- Remove the replaced bus/cs check function
- Change (bitlen & 7) to (bitlen % 8)
arch/arm/include/asm/arch-tegra2/tegra2.h | 1 + arch/arm/include/asm/arch-tegra2/tegra2_spi.h | 76 +++++++ board/nvidia/common/board.c | 4 + drivers/spi/Makefile | 1 + drivers/spi/tegra2_spi.c | 260 +++++++++++++++++++++++++ 5 files changed, 342 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2_spi.h create mode 100644 drivers/spi/tegra2_spi.c
arch/arm/include/asm/arch-tegra2/tegra2.h +1 -0
@@ -38,6 +38,7 @@#define NV_PA_APB_UARTC_BASE (NV_PA_APB_MISC_BASE + 0x6200)#define NV_PA_APB_UARTD_BASE (NV_PA_APB_MISC_BASE + 0x6300)#define NV_PA_APB_UARTE_BASE (NV_PA_APB_MISC_BASE + 0x6400) +#define TEGRA2_SPI_BASE (NV_PA_APB_MISC_BASE + 0xC380)#define NV_PA_PMC_BASE 0x7000E400#define NV_PA_CSITE_BASE 0x70040000
arch/arm/include/asm/arch-tegra2/tegra2_spi.h new file +76 -0
76 lines not on this page · raw message
board/nvidia/common/board.c +4 -0
@@ -31,6 +31,7 @@#include <asm/arch/clock.h> #include <asm/arch/pinmux.h> #include <asm/arch/uart.h> +#include <spi.h> #include "board.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -114,6 +115,9 @@ int board_init(void)clock_init ();clock_verify (); +#ifdef CONFIG_TEGRA2_SPI +spi_init (); +#endif /* boot param addr */ gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE +0x100 );
drivers/spi/Makefile +1 -0
@@ -42,6 +42,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_TEGRA2_SPI) += tegra2_spi.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/spi/tegra2_spi.c new file +260 -0
260 lines not on this page · raw message
Signature · 1 line
1.7.3.1
PATCH v3 4/8 tegra2: config: Enable SPI flash on Seaboard
In reply to Simon GlassThe Seaboard includes a Winbond 4MB flash part.
---
include/configs/seaboard.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
include/configs/seaboard.h +11 -0
@@ -37,11 +37,22 @@#define CONFIG_TEGRA2_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE +/* On Seaboard: GPIO_PI3 = Port I = 8, bit = 3 */ +#define CONFIG_UART_DISABLE_GPIO GPIO_PI3 +#define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD#define CONFIG_SYS_BOARD_ODMDATA 0x300d8011/* lp1, 1GB */ #define CONFIG_BOARD_EARLY_INIT_F +/* SPI */ +#define CONFIG_TEGRA2_SPI +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_WINBOND +#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 +#define CONFIG_CMD_SPI +#define CONFIG_CMD_SF +/* SD/MMC */ #define CONFIG_MMC #define CONFIG_GENERIC_MMC
Signature · 1 line
1.7.3.1
PATCH v3 5/8 tegra2: Enable SPI environment on Seaboard
In reply to Simon GlassThis uses the SPI flash on Seaboard to store an 8KB environment.
---
Changes in v2:
- Add CONFIG_SPI_FLASH_SIZE to define flash size
- Add config for SPI environment mode/speed
include/configs/harmony.h | 3 +++ include/configs/seaboard.h | 9 +++++++++ include/configs/tegra2-common.h | 3 +-- 3 files changed, 13 insertions(+), 2 deletions(-)
include/configs/harmony.h +3 -0
@@ -58,4 +58,7 @@#define CONFIG_EFI_PARTITION #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT + +/* Environment not stored */ +#define CONFIG_ENV_IS_NOWHERE #endif /* __CONFIG_H */
include/configs/seaboard.h +9 -0
@@ -52,6 +52,7 @@#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0#define CONFIG_CMD_SPI #define CONFIG_CMD_SF +#define CONFIG_SPI_FLASH_SIZE (4 << 20)/* SD/MMC */ #define CONFIG_MMC
@@ -63,4 +64,12 @@#define CONFIG_EFI_PARTITION #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT + +/* Environment in SPI */ +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_SPI_MAX_HZ 48000000 +#define CONFIG_ENV_SPI_MODE SPI_MODE_0 + +#define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE +#define CONFIG_ENV_OFFSET (CONFIG_SPI_FLASH_SIZE - CONFIG_ENV_SECT_SIZE)#endif /* __CONFIG_H */
include/configs/tegra2-common.h +1 -2
@@ -52,8 +52,7 @@#define CONFIG_OF_LIBFDT /* enable passing of devicetree */ /* Environment */ -#define CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_SIZE 0x20000/* Total Size Environment */ +#define CONFIG_ENV_SIZE 0x2000/* Total Size Environment */ /* * Size of malloc() pool
Signature · 1 line
1.7.3.1
PATCH v3 6/8 tegra2: Implement SPI / UART GPIO switch
In reply to Simon GlassThe Tegra2 Seaboard has the unfortunate feature that SPI and the console UART are multiplexed on the same pins. We need to switch between one and the other during SPI and console activity.
This new file implements a switch and keeps track of which peripheral owns the pins. It also flips over the controlling GPIO as needed
Since we are adding a second file to board/nvidia/common, we create a proper Makefile there and remove the direct board.o include from board/nvidia/seaboard/Makefile
---
Changes in v2:
- Fix up GPIO selection to use gpio_request() first
- Rename uart-spi-fix to uart-spi-switch
- Rename uart/spi_enable() to pinmux_select_uart/spi()
Changes in v3:
- Remove unneeded #includes and header file guard
arch/arm/include/asm/arch-tegra2/uart-spi-switch.h | 46 +++++++ board/nvidia/common/Makefile | 47 +++++++ board/nvidia/common/uart-spi-switch.c | 138 ++++++++++++++++++++ board/nvidia/seaboard/Makefile | 1 - 4 files changed, 231 insertions(+), 1 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra2/uart-spi-switch.h create mode 100644 board/nvidia/common/Makefile create mode 100644 board/nvidia/common/uart-spi-switch.c
arch/arm/include/asm/arch-tegra2/uart-spi-switch.h new file +46 -0
@@ -0,0 +1,46 @@ +/* +* Copyright (c) 2011 The Chromium OS Authors. +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* 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 _UART_SPI_SWITCH_H +#define _UART_SPI_SWITCH_H + +#if defined(CONFIG_SPI_UART_SWITCH ) +/* +* Signal that we are about to use the UART. This unfortunate hack is +* required by Seaboard, which cannot use its console and SPI at the same +* time! If the board file provides this, the board config will declare it. +* Let this be a lesson for others. +*/ +void pinmux_select_uart (NS16550_t regs); + +/* +* Signal that we are about the use the SPI bus. +*/ +void pinmux_select_spi (void ); + +#else /* not CONFIG_SPI_UART_SWITCH */ + +static inline void pinmux_select_uart (NS16550_t regs) {} +static inline void pinmux_select_spi (void ) {} + +#endif + +#endif
board/nvidia/common/Makefile new file +47 -0
47 lines not on this page · raw message
board/nvidia/common/uart-spi-switch.c new file +138 -0
138 lines not on this page · raw message
board/nvidia/seaboard/Makefile +0 -1
@@ -31,7 +31,6 @@ endif LIB = $(obj)lib$(BOARD).o COBJS := $(BOARD).o -COBJS += ../common/board.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
Signature · 1 line
1.7.3.1
PATCH v3 7/8 tegra2: spi: Support SPI / UART switch
In reply to Simon GlassAdd the SPI / UART switch logic into the Tegra2 SPI driver so that it can co-exist with the NS16550 UART.
We need the ns16550.h header for NS16550_t for now.
---
Changes in v2:
- Add pinmux logic to SPI driver
- Rename uart/spi_enable() to pinmux_select_uart/spi()
drivers/spi/tegra2_spi.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
drivers/spi/tegra2_spi.c +14 -0
@@ -28,9 +28,11 @@#include <spi.h> #include <asm/io.h> #include <asm/gpio.h> +#include <ns16550.h> #include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/pinmux.h> +#include <asm/arch/uart-spi-switch.h> #include <asm/arch/tegra2_spi.h> struct tegra_spi_slave {
@@ -123,6 +125,16 @@ int spi_claim_bus(struct spi_slave *slave)*/ pinmux_set_func (PINGRP_GMD ,PMUX_FUNC_SFLASH );pinmux_tristate_disable (PINGRP_LSPI ); + +#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 ; }
@@ -140,6 +152,8 @@ 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 ); }
Signature · 1 line
1.7.3.1
PATCH v3 8/8 tegra2: Plumb in SPI/UART switch code
In reply to Simon GlassOn Seaboard the UART and SPI interfere with each other. This causes the UART to receive spurious zero bytes after SPI transactions and also means that SPI can corrupt a few output characters when it starts up if they are still in the UART buffer.
This updates the board to use the SPI/UART switch to avoid the problem.
For now this feature is turned off since it needs changes to the NS16550 UART to operate.
---
board/nvidia/common/board.c | 8 ++++++++ board/nvidia/common/board.h | 1 + board/nvidia/seaboard/seaboard.c | 3 +++ 3 files changed, 12 insertions(+), 0 deletions(-)
board/nvidia/common/board.c +8 -0
@@ -112,9 +112,13 @@ static void pin_mux_uart(int uart_ids)*/ int board_init (void ) { +/* Do clocks and UART first so that printf() works */ clock_init ();clock_verify (); +#ifdef CONFIG_SPI_UART_SWITCH +gpio_config_uart (); +#endif #ifdef CONFIG_TEGRA2_SPI spi_init ();#endif
@@ -149,7 +153,11 @@ int board_early_init_f(void)pin_mux_uart (uart_ids);/* Initialize periph GPIOs */ +#ifdef CONFIG_SPI_UART_SWITCH +gpio_early_init_uart (); +#else gpio_config_uart (); +#endif /* Init UART, scratch regs, and start CPU */ tegra2_start ();
board/nvidia/common/board.h +1 -0
@@ -27,5 +27,6 @@void tegra2_start (void );void gpio_config_uart (void );int tegra2_mmc_init (int dev_index,int bus_width,int pwr_gpio,int cd_gpio); +void gpio_early_init_uart (void );#endif /* BOARD_H */
board/nvidia/seaboard/seaboard.c +3 -0
@@ -31,6 +31,8 @@#endif #include "../common/board.h" +/* TODO: Remove this code when the SPI switch is working */ +#ifndef CONFIG_SPI_UART_SWITCH /* * Routine: gpio_config_uart_seaboard * Description: Force GPIO_PI3 low on Seaboard so UART4 works.
@@ -48,6 +50,7 @@ void gpio_config_uart(void)return ; gpio_config_uart_seaboard(); } +#endif #ifdef CONFIG_TEGRA2_MMC /*
Signature · 1 line
1.7.3.1