From e26a6be71dd36659af343b9f0ec14ea981d23692 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 1 Sep 2011 13:37:27 -0700 Subject: tegra: Rename TEGRA2 to TEGRA Some constants are actually better of with generic Tegra family names. This also cleans up a few addresses which were in drivers rather than in the tegra.h header file. BUG=chromium-os:19004 TEST=build and boot on Seaboard Change-Id: I1cabb5191a2b36648a37268069beb3b43c12d0e1 Reviewed-on: http://gerrit.chromium.org/gerrit/7128 Reviewed-by: Simon Glass Tested-by: Simon Glass --- drivers/spi/tegra2_spi.c | 8 ++++---- drivers/spi/tegra2_spi_new.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/spi') diff --git a/drivers/spi/tegra2_spi.c b/drivers/spi/tegra2_spi.c index 7885a347d74..3c00928177c 100644 --- a/drivers/spi/tegra2_spi.c +++ b/drivers/spi/tegra2_spi.c @@ -76,7 +76,7 @@ void spi_free_slave(struct spi_slave *slave) void spi_init(void) { - struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE; + struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE; u32 reg; /* Change SPI clock to 48MHz, PLLP_OUT0 source */ @@ -131,7 +131,7 @@ void spi_release_bus(struct spi_slave *slave) void spi_cs_activate(struct spi_slave *slave) { - struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE; + struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE; u32 val; spi_enable(); @@ -143,7 +143,7 @@ void spi_cs_activate(struct spi_slave *slave) void spi_cs_deactivate(struct spi_slave *slave) { - struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE; + struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE; u32 val; /* CS is negated on Tegra, so drive a 0 to get a 1 */ @@ -154,7 +154,7 @@ void spi_cs_deactivate(struct spi_slave *slave) int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, void *din, unsigned long flags) { - struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE; + struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE; unsigned int status; int num_bytes = (bitlen + 7) / 8; int i, ret, tm, bytes, bits, isRead = 0; diff --git a/drivers/spi/tegra2_spi_new.c b/drivers/spi/tegra2_spi_new.c index f4d8d1ca6f0..191cef26d6f 100644 --- a/drivers/spi/tegra2_spi_new.c +++ b/drivers/spi/tegra2_spi_new.c @@ -76,7 +76,7 @@ void spi_free_slave(struct spi_slave *slave) void spi_init(void) { - struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE; + struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE; u32 reg; /* Change SPI clock to 24MHz, PLLP_OUT0 source */ @@ -131,7 +131,7 @@ void spi_release_bus(struct spi_slave *slave) void spi_cs_activate(struct spi_slave *slave) { - struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE; + struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE; u32 val; spi_enable(); @@ -143,7 +143,7 @@ void spi_cs_activate(struct spi_slave *slave) void spi_cs_deactivate(struct spi_slave *slave) { - struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE; + struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE; u32 val; /* CS is negated on Tegra, so drive a 0 to get a 1 */ @@ -199,7 +199,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bitsout, { int retval = 0; char *delayed_msg = NULL; - struct spi_tegra *spi = (struct spi_tegra *)TEGRA2_SPI_BASE; + struct spi_tegra *spi = (struct spi_tegra *)TEGRA_SPI_BASE; uint32_t status; uint32_t writecnt = (bitsout + 7) / 8; uint32_t readcnt = (bitsin + 7) / 8; -- cgit v1.2.3