Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 08:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

spi: tegra2: rename tegra2_spi.* to tegra_spi.*

Browse source 
In anticipation of Tegra3 support, start removing/renaming
Tegra2-specific files. No functional changes (yet).
Also updated copyright to 2012.

Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Tom Warren 2012-05-22 07:33:47 +00:00 committed by Albert ARIBAUD
parent 616887016d
commit edffa63d3d
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/include/asm/arch-tegra2/tegra2_spi.h → arch/arm/include/asm/arch-tegra2/tegra_spi.h
View file

@ -1,7 +1,7 @@
/* /*
* NVIDIA Tegra2 SPI-FLASH controller * NVIDIA Tegra2 SPI-FLASH controller
* *
* Copyright 2010-2011 NVIDIA Corporation * Copyright 2010-2012 NVIDIA Corporation
* *
* This software may be used and distributed according to the * This software may be used and distributed according to the
* terms of the GNU Public License, Version 2, incorporated * terms of the GNU Public License, Version 2, incorporated
@ -22,8 +22,8 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _TEGRA2_SPI_H_ #ifndef _TEGRA_SPI_H_
#define _TEGRA2_SPI_H_ #define _TEGRA_SPI_H_
#include <asm/types.h> #include <asm/types.h>
@ -72,5 +72,4 @@ struct spi_tegra {
#define SPI_TIMEOUT 1000 #define SPI_TIMEOUT 1000
#define TEGRA2_SPI_MAX_FREQ 52000000 #define TEGRA2_SPI_MAX_FREQ 52000000
#endif /* _TEGRA_SPI_H_ */
#endif /* _TEGRA2_SPI_H_ */

2
board/nvidia/common/uart-spi-switch.c
View file

@ -25,7 +25,7 @@
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/uart-spi-switch.h> #include <asm/arch/uart-spi-switch.h>
#include <asm/arch/tegra2.h> #include <asm/arch/tegra2.h>
#include <asm/arch/tegra2_spi.h> #include <asm/arch/tegra_spi.h>
/* position of the UART/SPI select switch */ /* position of the UART/SPI select switch */

2
drivers/spi/Makefile
View file

@ -43,7 +43,7 @@ COBJS-$(CONFIG_OMAP3_SPI) += omap3_spi.o
COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o
COBJS-$(CONFIG_SH_SPI) += sh_spi.o COBJS-$(CONFIG_SH_SPI) += sh_spi.o
COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o
COBJS-$(CONFIG_TEGRA2_SPI) += tegra2_spi.o COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)

4
drivers/spi/tegra2_spi.c → drivers/spi/tegra_spi.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010-2011 NVIDIA Corporation * Copyright (c) 2010-2012 NVIDIA Corporation
* With help from the mpc8xxx SPI driver * With help from the mpc8xxx SPI driver
* With more help from omap3_spi SPI driver * With more help from omap3_spi SPI driver
* *
@ -32,7 +32,7 @@
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/uart-spi-switch.h> #include <asm/arch/uart-spi-switch.h>
#include <asm/arch/tegra2_spi.h> #include <asm/arch/tegra_spi.h>
#if defined(CONFIG_SPI_CORRUPTS_UART) #if defined(CONFIG_SPI_CORRUPTS_UART)
#define corrupt_delay() udelay(CONFIG_SPI_CORRUPTS_UART_DLY); #define corrupt_delay() udelay(CONFIG_SPI_CORRUPTS_UART_DLY);

2
include/configs/seaboard.h
View file

@ -67,7 +67,7 @@
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
/* SPI */ /* SPI */
#define CONFIG_TEGRA2_SPI #define CONFIG_TEGRA_SPI
#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_WINBOND
#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0