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/include/mach | |
| 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/include/mach')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/iomap.h | 16 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/mc.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/memory.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/pinmux.h | 4 |
4 files changed, 11 insertions, 15 deletions
diff --git a/arch/arm/mach-tegra/include/mach/iomap.h b/arch/arm/mach-tegra/include/mach/iomap.h index 449f6e1afda8..dd7b864f0e1b 100644 --- a/arch/arm/mach-tegra/include/mach/iomap.h +++ b/arch/arm/mach-tegra/include/mach/iomap.h @@ -77,9 +77,7 @@ #define TEGRA_GART_BASE 0x58000000 #define TEGRA_GART_SIZE SZ_32M -#endif - -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#else #define TEGRA_SMMU_BASE_A01 0xe0000000 #define TEGRA_SMMU_SIZE_A01 SZ_256M @@ -109,7 +107,7 @@ #define TEGRA_QUATERNARY_ICTLR_BASE 0x60004300 #define TEGRA_QUATERNARY_ICTLR_SIZE 64 -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC #define TEGRA_QUINARY_ICTLR_BASE 0x60004400 #define TEGRA_QUINARY_ICTLR_SIZE SZ_64 @@ -131,7 +129,7 @@ #define TEGRA_TMR4_BASE 0x60005058 #define TEGRA_TMR4_SIZE SZ_8 -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC #define TEGRA_TMR5_BASE 0x60005060 #define TEGRA_TMR5_SIZE 8 @@ -186,7 +184,7 @@ #define TEGRA_APB_DMA_CH0_BASE 0x6000B000 #define TEGRA_APB_DMA_CH0_SIZE 32 -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC #define TEGRA_AHB_ARB_BASE 0x6000C000 #define TEGRA_AHB_ARB_SIZE 768 /* Overlaps with GISMO */ @@ -336,7 +334,7 @@ #define TEGRA_SPI_BASE 0x7000C380 #define TEGRA_SPI_SIZE 48 -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) +#else #define TEGRA_DTV_BASE 0x7000C300 #define TEGRA_DTV_SIZE SZ_256 @@ -379,7 +377,7 @@ #define TEGRA_SPI4_BASE 0x7000DA00 #define TEGRA_SPI4_SIZE SZ_512 -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC #define TEGRA_SPI5_BASE 0x7000DC00 #define TEGRA_SPI5_SIZE SZ_512 @@ -436,7 +434,7 @@ #define TEGRA_SDMMC4_BASE 0xC8000600 #define TEGRA_SDMMC4_SIZE SZ_512 -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) +#else #define TEGRA_SATA_BASE 0x70020000 #define TEGRA_SATA_SIZE SZ_64K diff --git a/arch/arm/mach-tegra/include/mach/mc.h b/arch/arm/mach-tegra/include/mach/mc.h index 5b909a506f2f..c2b73bd2c8b4 100644 --- a/arch/arm/mach-tegra/include/mach/mc.h +++ b/arch/arm/mach-tegra/include/mach/mc.h @@ -98,7 +98,7 @@ void tegra_mc_set_priority(unsigned long client, unsigned long prio); -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) +#else /* !!!FIXME!!! IMPLEMENT ME */ #define tegra_mc_set_priority(client, prio) \ do { /* nothing for now */ } while (0) diff --git a/arch/arm/mach-tegra/include/mach/memory.h b/arch/arm/mach-tegra/include/mach/memory.h index 4f3a24d5de5e..e97f624f355a 100644 --- a/arch/arm/mach-tegra/include/mach/memory.h +++ b/arch/arm/mach-tegra/include/mach/memory.h @@ -24,10 +24,8 @@ /* physical offset of RAM */ #if defined(CONFIG_ARCH_TEGRA_2x_SOC) #define PLAT_PHYS_OFFSET UL(0) -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) -#define PLAT_PHYS_OFFSET UL(0x80000000) #else -#error "Invalid Tegra SoC family selection" +#define PLAT_PHYS_OFFSET UL(0x80000000) #endif /* diff --git a/arch/arm/mach-tegra/include/mach/pinmux.h b/arch/arm/mach-tegra/include/mach/pinmux.h index 93db69d40ae5..09af077d9f3d 100644 --- a/arch/arm/mach-tegra/include/mach/pinmux.h +++ b/arch/arm/mach-tegra/include/mach/pinmux.h @@ -99,7 +99,7 @@ enum tegra_mux_func { TEGRA_MUX_VI, TEGRA_MUX_VI_SENSOR_CLK, TEGRA_MUX_XIO, -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC TEGRA_MUX_BLINK, TEGRA_MUX_CEC, TEGRA_MUX_CLK12, @@ -192,7 +192,7 @@ enum tegra_vddio { TEGRA_VDDIO_SYS, TEGRA_VDDIO_AUDIO, TEGRA_VDDIO_SD, -#if defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifndef CONFIG_ARCH_TEGRA_2x_SOC TEGRA_VDDIO_CAM, TEGRA_VDDIO_GMI, TEGRA_VDDIO_PEXCTL, |