tegra: spi: rename tegra SPI drivers

Rename tegra SPI drivers to tegra20_flash and tegra20_slink in preparation for commonization and addition of tegra114_spi. Signed-off-by: Allen Martin <amartin@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com> Reviewed-by: Stephen Warren <swarren@nvidia.com>
12 years ago · ff1da6fb5f
parent 9000652da0
commit ff1da6fb5f
8 changed files with 13 additions and 13 deletions
--- a/arch/arm/include/asm/arch-tegra20/tegra20_sflash.h
+++ b/arch/arm/include/asm/arch-tegra20/tegra20_sflash.h
@ -22,8 +22,8 @@
 * MA 02111-1307 USA
 */

-#ifndef _TEGRA_SPI_H_
-#define _TEGRA_SPI_H_
+#ifndef _TEGRA20_SPI_H_
+#define _TEGRA20_SPI_H_

 #include <asm/types.h>

@ -72,4 +72,4 @@ struct spi_tegra {
 #define SPI_TIMEOUT		1000
 #define TEGRA_SPI_MAX_FREQ	52000000

-#endif	/* _TEGRA_SPI_H_ */
+#endif	/* _TEGRA20_SPI_H_ */
--- a/arch/arm/include/asm/arch-tegra20/tegra20_slink.h
+++ b/arch/arm/include/asm/arch-tegra20/tegra20_slink.h
@ -22,8 +22,8 @@
 * MA 02111-1307 USA
 */

-#ifndef _TEGRA_SLINK_H_
-#define _TEGRA_SLINK_H_
+#ifndef _TEGRA30_SPI_H_
+#define _TEGRA30_SPI_H_

 #include <asm/types.h>

@ -81,4 +81,4 @@ struct slink_tegra {
 #define SPI_TIMEOUT		1000
 #define TEGRA_SPI_MAX_FREQ	52000000

-#endif	/* _TEGRA_SLINK_H_ */
+#endif	/* _TEGRA30_SPI_H_ */
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@ -132,7 +132,7 @@ int board_init(void)
 	clock_init();
 	clock_verify();

-#if defined(CONFIG_TEGRA_SPI) || defined(CONFIG_TEGRA_SLINK)
+#if defined(CONFIG_TEGRA20_SFLASH) || defined(CONFIG_TEGRA20_SLINK)
 	pin_mux_spi();
 	spi_init();
 #endif
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@ -46,8 +46,8 @@ 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_TEGRA_SPI) += tegra_spi.o
-COBJS-$(CONFIG_TEGRA_SLINK) += tegra_slink.o
+COBJS-$(CONFIG_TEGRA20_SFLASH) += tegra20_sflash.o
+COBJS-$(CONFIG_TEGRA20_SLINK) += tegra20_slink.o
 COBJS-$(CONFIG_XILINX_SPI) += xilinx_spi.o

 COBJS	:= $(COBJS-y)
--- a/drivers/spi/tegra20_sflash.c
+++ b/drivers/spi/tegra20_sflash.c
@ -29,7 +29,7 @@
 #include <asm/arch/clock.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/clk_rst.h>
-#include <asm/arch-tegra/tegra_spi.h>
+#include <asm/arch-tegra20/tegra20_sflash.h>
 #include <spi.h>
 #include <fdtdec.h>

--- a/drivers/spi/tegra20_slink.c
+++ b/drivers/spi/tegra20_slink.c
@ -27,7 +27,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
 #include <asm/arch-tegra/clk_rst.h>
-#include <asm/arch-tegra/tegra_slink.h>
+#include <asm/arch-tegra20/tegra20_slink.h>
 #include <spi.h>
 #include <fdtdec.h>

--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@ -60,7 +60,7 @@
 #define CONFIG_SYS_MMC_ENV_PART		2

 /* SPI */
-#define CONFIG_TEGRA_SLINK
+#define CONFIG_TEGRA20_SLINK
 #define CONFIG_TEGRA_SLINK_CTRLS       6
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@ -46,7 +46,7 @@
 #define CONFIG_BOARD_EARLY_INIT_F

 /* SPI */
-#define CONFIG_TEGRA_SPI
+#define CONFIG_TEGRA20_SFLASH
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_WINBOND
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0