arm: tegra: Clean up SOC conditionals
Scott Williams [Tue, 24 May 2011 05:08:42 +0000 (22:08 -0700)]
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

drivers/spi/spi-tegra.c
drivers/spi/spi_slave_tegra.c

index ae87620..11efbe5 100644 (file)
@@ -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);
index c95c852..05bbc6e 100644 (file)
@@ -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