diff options
| author | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-21 14:53:13 -0700 |
| commit | 495dbd72dd1172de866ba323263a5b62cf454972 (patch) | |
| tree | 3ecfb8ae44c871055115941890fd93f175f8761d /drivers/spi/tegra_spi.c | |
| parent | 50d924b45911b24eeb7623bed11b9297d99b840a (diff) | |
| parent | d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/spi/tegra_spi.c')
| -rw-r--r-- | drivers/spi/tegra_spi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/tegra_spi.c b/drivers/spi/tegra_spi.c index 2355e022b02..18b00b2cae9 100644 --- a/drivers/spi/tegra_spi.c +++ b/drivers/spi/tegra_spi.c @@ -72,9 +72,9 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; } - if (max_hz > TEGRA20_SPI_MAX_FREQ) { + if (max_hz > TEGRA_SPI_MAX_FREQ) { printf("SPI error: unsupported frequency %d Hz. Max frequency" - " is %d Hz\n", max_hz, TEGRA20_SPI_MAX_FREQ); + " is %d Hz\n", max_hz, TEGRA_SPI_MAX_FREQ); return NULL; } @@ -86,7 +86,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, spi->slave.bus = bus; spi->slave.cs = cs; spi->freq = max_hz; - spi->regs = (struct spi_tegra *)TEGRA20_SPI_BASE; + spi->regs = (struct spi_tegra *)NV_PA_SPI_BASE; spi->mode = mode; return &spi->slave; |