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:42:43 -0800 |
| commit | 07fc331f7ca9eb8b6c4958cafb302b0e9def78bd (patch) | |
| tree | 19c95e9b0bd000a69b737068afc372116d79faf3 /arch/arm/mach-tegra/devices.c | |
| parent | d3b4e36da94f5fe2d69beab2e3f9ade8b5ab68bb (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: R77c675a1995116098b58f1f775bc7c3cc8722998
Diffstat (limited to 'arch/arm/mach-tegra/devices.c')
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index dbc7f297e1a5..8df74f5db407 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -72,7 +72,7 @@ static struct resource i2c_resource3[] = { }, }; -#if defined(CONFIG_ARCH_TEGRA_2x_SOC) +#ifdef CONFIG_ARCH_TEGRA_2x_SOC static struct resource i2c_resource4[] = { [0] = { .start = INT_DVC, @@ -86,7 +86,7 @@ static struct resource i2c_resource4[] = { }, }; -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) +#else static struct resource i2c_resource4[] = { [0] = { .start = INT_I2C4, @@ -170,7 +170,7 @@ struct platform_device tegra_i2c_device4 = { }, }; -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#ifndef CONFIG_ARCH_TEGRA_2x_SOC struct platform_device tegra_i2c_device5 = { .name = "tegra-i2c", .id = 4, @@ -233,7 +233,7 @@ static struct resource spi_resource4[] = { .flags = IORESOURCE_MEM, }, }; -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC static struct resource spi_resource5[] = { [0] = { .start = INT_SPI_5, @@ -300,7 +300,7 @@ struct platform_device tegra_spi_device4 = { .coherent_dma_mask = 0xffffffff, }, }; -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC struct platform_device tegra_spi_device5 = { .name = "spi_tegra", .id = 4, @@ -361,7 +361,7 @@ struct platform_device tegra_spi_slave_device4 = { .coherent_dma_mask = 0xffffffff, }, }; -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC struct platform_device tegra_spi_slave_device5 = { .name = "spi_slave_tegra", .id = 4, @@ -578,7 +578,7 @@ static struct resource tegra_pmu_resources[] = { .end = INT_CPU1_PMU_INTR, .flags = IORESOURCE_IRQ, }, -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC [2] = { .start = INT_CPU2_PMU_INTR, .end = INT_CPU2_PMU_INTR, @@ -714,7 +714,7 @@ struct platform_device tegra_uarte_device = { }, }; -#if defined(CONFIG_ARCH_TEGRA_2x_SOC) +#ifdef CONFIG_ARCH_TEGRA_2x_SOC static struct resource i2s_resource1[] = { [0] = { .start = INT_I2S1, @@ -789,7 +789,7 @@ static struct resource spdif_resource[] = { } }; -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) +#else static struct resource audio_resource[] = { [0] = { .start = TEGRA_AUDIO_CLUSTER_BASE, @@ -1052,7 +1052,7 @@ static struct resource tegra_wdt_resources[] = { .flags = IORESOURCE_IRQ, }, }; -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) +#else static struct resource tegra_wdt_resources[] = { [0] = { .start = TEGRA_WDT0_BASE, |