| Message ID | 1337708027-16093-1-git-send-email-twarren@nvidia.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, May 22, 2012 at 10:33 AM, Tom Warren <twarren.nvidia@gmail.com>wrote: > 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> > Acked-by: Simon Glass <sjg@chromium.org> > --- > .../asm/arch-tegra2/{tegra2_spi.h => tegra_spi.h} | 9 ++++----- > board/nvidia/common/uart-spi-switch.c | 2 +- > drivers/spi/Makefile | 2 +- > drivers/spi/{tegra2_spi.c => tegra_spi.c} | 4 ++-- > include/configs/seaboard.h | 2 +- > 5 files changed, 9 insertions(+), 10 deletions(-) > rename arch/arm/include/asm/arch-tegra2/{tegra2_spi.h => tegra_spi.h} > (95%) > rename drivers/spi/{tegra2_spi.c => tegra_spi.c} (98%) > > diff --git a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h > b/arch/arm/include/asm/arch-tegra2/tegra_spi.h > similarity index 95% > rename from arch/arm/include/asm/arch-tegra2/tegra2_spi.h > rename to arch/arm/include/asm/arch-tegra2/tegra_spi.h > index ceec428..892d90c 100644 > --- a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h > +++ b/arch/arm/include/asm/arch-tegra2/tegra_spi.h > @@ -1,7 +1,7 @@ > /* > * 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 > * terms of the GNU Public License, Version 2, incorporated > @@ -22,8 +22,8 @@ > * MA 02111-1307 USA > */ > > -#ifndef _TEGRA2_SPI_H_ > -#define _TEGRA2_SPI_H_ > +#ifndef _TEGRA_SPI_H_ > +#define _TEGRA_SPI_H_ > > #include <asm/types.h> > > @@ -72,5 +72,4 @@ struct spi_tegra { > #define SPI_TIMEOUT 1000 > #define TEGRA2_SPI_MAX_FREQ 52000000 > > - > -#endif /* _TEGRA2_SPI_H_ */ > +#endif /* _TEGRA_SPI_H_ */ > diff --git a/board/nvidia/common/uart-spi-switch.c > b/board/nvidia/common/uart-spi-switch.c > index 1ba1afd..307937a 100644 > --- a/board/nvidia/common/uart-spi-switch.c > +++ b/board/nvidia/common/uart-spi-switch.c > @@ -25,7 +25,7 @@ > #include <asm/arch/pinmux.h> > #include <asm/arch/uart-spi-switch.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 */ > diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile > index c967d87..c20f1f2 100644 > --- a/drivers/spi/Makefile > +++ b/drivers/spi/Makefile > @@ -43,7 +43,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-$(CONFIG_TEGRA_SPI) += tegra_spi.o > > COBJS := $(COBJS-y) > SRCS := $(COBJS:.o=.c) > diff --git a/drivers/spi/tegra2_spi.c b/drivers/spi/tegra_spi.c > similarity index 98% > rename from drivers/spi/tegra2_spi.c > rename to drivers/spi/tegra_spi.c > index fe7b405..4a3e799 100644 > --- a/drivers/spi/tegra2_spi.c > +++ b/drivers/spi/tegra_spi.c > @@ -1,5 +1,5 @@ > /* > - * Copyright (c) 2010-2011 NVIDIA Corporation > + * Copyright (c) 2010-2012 NVIDIA Corporation > * With help from the mpc8xxx SPI driver > * With more help from omap3_spi SPI driver > * > @@ -32,7 +32,7 @@ > #include <asm/arch/clock.h> > #include <asm/arch/pinmux.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) > #define corrupt_delay() udelay(CONFIG_SPI_CORRUPTS_UART_DLY); > diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h > index 643af81..6bbea30 100644 > --- a/include/configs/seaboard.h > +++ b/include/configs/seaboard.h > @@ -67,7 +67,7 @@ > #define CONFIG_BOARD_EARLY_INIT_F > > /* SPI */ > -#define CONFIG_TEGRA2_SPI > +#define CONFIG_TEGRA_SPI > #define CONFIG_SPI_FLASH > #define CONFIG_SPI_FLASH_WINBOND > #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 > -- > 1.7.0.4 > >
diff --git a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h b/arch/arm/include/asm/arch-tegra2/tegra_spi.h similarity index 95% rename from arch/arm/include/asm/arch-tegra2/tegra2_spi.h rename to arch/arm/include/asm/arch-tegra2/tegra_spi.h index ceec428..892d90c 100644 --- a/arch/arm/include/asm/arch-tegra2/tegra2_spi.h +++ b/arch/arm/include/asm/arch-tegra2/tegra_spi.h @@ -1,7 +1,7 @@ /* * 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 * terms of the GNU Public License, Version 2, incorporated @@ -22,8 +22,8 @@ * MA 02111-1307 USA */ -#ifndef _TEGRA2_SPI_H_ -#define _TEGRA2_SPI_H_ +#ifndef _TEGRA_SPI_H_ +#define _TEGRA_SPI_H_ #include <asm/types.h> @@ -72,5 +72,4 @@ struct spi_tegra { #define SPI_TIMEOUT 1000 #define TEGRA2_SPI_MAX_FREQ 52000000 - -#endif /* _TEGRA2_SPI_H_ */ +#endif /* _TEGRA_SPI_H_ */ diff --git a/board/nvidia/common/uart-spi-switch.c b/board/nvidia/common/uart-spi-switch.c index 1ba1afd..307937a 100644 --- a/board/nvidia/common/uart-spi-switch.c +++ b/board/nvidia/common/uart-spi-switch.c @@ -25,7 +25,7 @@ #include <asm/arch/pinmux.h> #include <asm/arch/uart-spi-switch.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 */ diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index c967d87..c20f1f2 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -43,7 +43,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-$(CONFIG_TEGRA_SPI) += tegra_spi.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/spi/tegra2_spi.c b/drivers/spi/tegra_spi.c similarity index 98% rename from drivers/spi/tegra2_spi.c rename to drivers/spi/tegra_spi.c index fe7b405..4a3e799 100644 --- a/drivers/spi/tegra2_spi.c +++ b/drivers/spi/tegra_spi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2011 NVIDIA Corporation + * Copyright (c) 2010-2012 NVIDIA Corporation * With help from the mpc8xxx SPI driver * With more help from omap3_spi SPI driver * @@ -32,7 +32,7 @@ #include <asm/arch/clock.h> #include <asm/arch/pinmux.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) #define corrupt_delay() udelay(CONFIG_SPI_CORRUPTS_UART_DLY); diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 643af81..6bbea30 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -67,7 +67,7 @@ #define CONFIG_BOARD_EARLY_INIT_F /* SPI */ -#define CONFIG_TEGRA2_SPI +#define CONFIG_TEGRA_SPI #define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
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> --- .../asm/arch-tegra2/{tegra2_spi.h => tegra_spi.h} | 9 ++++----- board/nvidia/common/uart-spi-switch.c | 2 +- drivers/spi/Makefile | 2 +- drivers/spi/{tegra2_spi.c => tegra_spi.c} | 4 ++-- include/configs/seaboard.h | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) rename arch/arm/include/asm/arch-tegra2/{tegra2_spi.h => tegra_spi.h} (95%) rename drivers/spi/{tegra2_spi.c => tegra_spi.c} (98%)