diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-05-23 22:08:42 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:43:23 -0800 |
| commit | ef60e6f6d7658faeaf8e427ae95d3902db889896 (patch) | |
| tree | 1f59958107f4ad1ad1e29a48536cb5d49e507558 /drivers/spi | |
| parent | 6dc0b6f14e0486e66aa3df5b14d94010e07a52e5 (diff) | |
arm: tegra: Clean up SOC conditionals
Change SOC conditionals to make them more forward-looking.
Original-Change-Id: Ib60db4e690c2f396afdec962616d735548b5a8a9
Reviewed-on: http://git-master/r/32706
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>
Rebase-Id: Ra0885f203904e0bd4bdd06c23b6aa7e03e7ec3bc
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-tegra.c | 6 | ||||
| -rw-r--r-- | drivers/spi/spi_slave_tegra.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-tegra.c b/drivers/spi/spi-tegra.c index ae8762050f1f..11efbe536e29 100644 --- a/drivers/spi/spi-tegra.c +++ b/drivers/spi/spi-tegra.c @@ -151,7 +151,7 @@ static const unsigned long spi_tegra_req_sels[] = { TEGRA_DMA_REQ_SEL_SL2B2, TEGRA_DMA_REQ_SEL_SL2B3, TEGRA_DMA_REQ_SEL_SL2B4, -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC TEGRA_DMA_REQ_SEL_SL2B5, TEGRA_DMA_REQ_SEL_SL2B6, #endif @@ -579,7 +579,7 @@ static void spi_tegra_start_transfer(struct spi_device *spi, struct tegra_spi_device_controller_data *cdata = spi->controller_data; unsigned long command; unsigned long command2; -#if defined CONFIG_ARCH_TEGRA_3x_SOC +#ifndef CONFIG_ARCH_TEGRA_2x_SOC unsigned long status2; #endif int cs_setup_count; @@ -640,7 +640,7 @@ static void spi_tegra_start_transfer(struct spi_device *spi, command &= ~SLINK_CS_SW; command2 &= ~SLINK_SS_SETUP(3); command2 |= SLINK_SS_SETUP(cs_setup_count); -#if defined CONFIG_ARCH_TEGRA_3x_SOC +#ifndef CONFIG_ARCH_TEGRA_2x_SOC status2 = spi_tegra_readl(tspi, SLINK_STATUS2); status2 &= ~SLINK_SS_HOLD_TIME(0xF); status2 |= SLINK_SS_HOLD_TIME(cs_hold_count); diff --git a/drivers/spi/spi_slave_tegra.c b/drivers/spi/spi_slave_tegra.c index c95c852d94bb..05bbc6e9fa77 100644 --- a/drivers/spi/spi_slave_tegra.c +++ b/drivers/spi/spi_slave_tegra.c @@ -151,7 +151,7 @@ static const unsigned long spi_tegra_req_sels[] = { TEGRA_DMA_REQ_SEL_SL2B2, TEGRA_DMA_REQ_SEL_SL2B3, TEGRA_DMA_REQ_SEL_SL2B4, -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC TEGRA_DMA_REQ_SEL_SL2B5, TEGRA_DMA_REQ_SEL_SL2B6, #endif |