summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChe-Liang Chiou <clchiou@chromium.org>2011-11-10 16:00:02 +0800
committerGerrit <chrome-bot@google.com>2011-11-13 18:48:37 -0800
commit21f54150d1500cff386f9429735f274d0a066943 (patch)
treef90ba01ca8720d87852e0fcb69235474915138b7 /drivers
parentb09086595e7844d068994476bd64737dc37a072b (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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/Makefile4
-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
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index b6911c29f61..866a742fd65 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 5fcfeeacd8f..c69a63915c6 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 6f03df27be8..6053f143f21 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)