diff options
| author | Che-Liang Chiou <clchiou@chromium.org> | 2011-11-10 16:00:02 +0800 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2011-11-13 18:48:37 -0800 |
| commit | 21f54150d1500cff386f9429735f274d0a066943 (patch) | |
| tree | f90ba01ca8720d87852e0fcb69235474915138b7 | |
| parent | b09086595e7844d068994476bd64737dc37a072b (diff) | |
spi: rename tegra2_spi to tegra_spi in prep for tegra3
BUG=chromium-os:21033
TEST=build seaboard successfully
Change-Id: Idbfbdbf0bdb1070f4a2b5f8205c1caff6ef0c811
Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/11471
Reviewed-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/spi.h (renamed from arch/arm/include/asm/arch-tegra2/tegra2_spi.h) | 6 | ||||
| -rw-r--r-- | board/nvidia/common/board.c | 4 | ||||
| -rw-r--r-- | board/nvidia/common/uart-spi-fix.c | 2 | ||||
| -rw-r--r-- | drivers/spi/Makefile | 4 | ||||
| -rw-r--r-- | drivers/spi/tegra_spi.c (renamed from drivers/spi/tegra2_spi.c) | 2 | ||||
| -rw-r--r-- | drivers/spi/tegra_spi_new.c (renamed from drivers/spi/tegra2_spi_new.c) | 2 | ||||
| -rw-r--r-- | include/configs/seaboard.h | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h b/arch/arm/include/asm/arch-tegra/spi.h index 72dc868831..7f5035d818 100644 --- a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h +++ b/arch/arm/include/asm/arch-tegra/spi.h @@ -22,8 +22,8 @@ * MA 02111-1307 USA */ -#ifndef _TEGRA2_SPI_H_ -#define _TEGRA2_SPI_H_ +#ifndef _TEGRA_SPI_H_ /* Prepend _TEGRA_ to avoid conflict with spi.h */ +#define _TEGRA_SPI_H_ #include <asm/types.h> @@ -73,4 +73,4 @@ struct spi_tegra { #define SPI_TIMEOUT 1000 -#endif /* _TEGRA2_SPI_H_ */ +#endif /* _TEGRA_SPI_H_ */ diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 9dd1722eba..7d0f9c9236 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -46,7 +46,7 @@ #endif #include <asm/arch/tegra.h> -#ifdef CONFIG_TEGRA2_SPI +#ifdef CONFIG_TEGRA_SPI #include <spi.h> #endif #ifdef CONFIG_TEGRA_I2C @@ -289,7 +289,7 @@ int board_init(void) board_usb_init(gd->blob); #endif clock_verify(); -#ifdef CONFIG_TEGRA2_SPI +#ifdef CONFIG_TEGRA_SPI spi_init(); #endif power_det_init(); diff --git a/board/nvidia/common/uart-spi-fix.c b/board/nvidia/common/uart-spi-fix.c index 225d08f6b9..0f1854545a 100644 --- a/board/nvidia/common/uart-spi-fix.c +++ b/board/nvidia/common/uart-spi-fix.c @@ -27,10 +27,10 @@ #include <fdt_decode.h> #include <fdt_support.h> #include <asm/arch-tegra/bitfield.h> +#include <asm/arch-tegra/spi.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> #include <asm/arch/tegra.h> -#include <asm/arch/tegra2_spi.h> #include "uart-spi-fix.h" diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index b6911c29f6..866a742fd6 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -42,9 +42,9 @@ COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o COBJS-$(CONFIG_SH_SPI) += sh_spi.o COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o ifdef CONFIG_NEW_SPI_XFER -COBJS-$(CONFIG_TEGRA2_SPI) += tegra2_spi_new.o +COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi_new.o else -COBJS-$(CONFIG_TEGRA2_SPI) += tegra2_spi.o +COBJS-$(CONFIG_TEGRA_SPI) += tegra_spi.o endif COBJS := $(COBJS-y) diff --git a/drivers/spi/tegra2_spi.c b/drivers/spi/tegra_spi.c index 5fcfeeacd8..c69a63915c 100644 --- a/drivers/spi/tegra2_spi.c +++ b/drivers/spi/tegra_spi.c @@ -30,10 +30,10 @@ #include <asm/io.h> #include <asm/arch-tegra/bitfield.h> #include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/spi.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <asm/arch/tegra2_spi.h> #include "uart-spi-fix.h" int spi_cs_is_valid(unsigned int bus, unsigned int cs) diff --git a/drivers/spi/tegra2_spi_new.c b/drivers/spi/tegra_spi_new.c index 6f03df27be..6053f143f2 100644 --- a/drivers/spi/tegra2_spi_new.c +++ b/drivers/spi/tegra_spi_new.c @@ -30,10 +30,10 @@ #include <asm/io.h> #include <asm/arch-tegra/bitfield.h> #include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/spi.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <asm/arch/tegra2_spi.h> #include "uart-spi-fix.h" int spi_cs_is_valid(unsigned int bus, unsigned int cs) diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 4805fa07a2..cbb1d3b808 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -199,7 +199,7 @@ #define CONFIG_CMD_TEGRA_GPIO_INFO /* SPI */ -#define CONFIG_TEGRA2_SPI +#define CONFIG_TEGRA_SPI #define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_NEW_SPI_XFER |