diff options
| -rw-r--r-- | arch/arm/include/asm/arch-tegra20/tegra20_sflash.h (renamed from arch/arm/include/asm/arch-tegra/tegra_spi.h) | 6 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra20/tegra20_slink.h (renamed from arch/arm/include/asm/arch-tegra/tegra_slink.h) | 6 | ||||
| -rw-r--r-- | board/nvidia/common/board.c | 2 | ||||
| -rw-r--r-- | drivers/spi/Makefile | 4 | ||||
| -rw-r--r-- | drivers/spi/tegra20_sflash.c (renamed from drivers/spi/tegra_spi.c) | 2 | ||||
| -rw-r--r-- | drivers/spi/tegra20_slink.c (renamed from drivers/spi/tegra_slink.c) | 2 | ||||
| -rw-r--r-- | include/configs/cardhu.h | 2 | ||||
| -rw-r--r-- | include/configs/trimslice.h | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/include/asm/arch-tegra/tegra_spi.h b/arch/arm/include/asm/arch-tegra20/tegra20_sflash.h index d53a93ff5..26a840251 100644 --- a/arch/arm/include/asm/arch-tegra/tegra_spi.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_ */ diff --git a/arch/arm/include/asm/arch-tegra/tegra_slink.h b/arch/arm/include/asm/arch-tegra20/tegra20_slink.h index 74804b546..afa9b3692 100644 --- a/arch/arm/include/asm/arch-tegra/tegra_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_ */ diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index b6e656668..87a418bc6 100644 --- 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 diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index b8264df3a..78e3d3d56 100644 --- 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) diff --git a/drivers/spi/tegra_spi.c b/drivers/spi/tegra20_sflash.c index 2662923ff..c6af30f0d 100644 --- a/drivers/spi/tegra_spi.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> diff --git a/drivers/spi/tegra_slink.c b/drivers/spi/tegra20_slink.c index 2c41fabe2..a6de4cec6 100644 --- a/drivers/spi/tegra_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> diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 55dc83da6..6a9917521 100644 --- 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 diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 0644f7a5b..b92531477 100644 --- 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 |