arm: tegra: Clean up SOC conditionals

Change SOC conditionals to make them more forward-looking.

Change-Id: Ib60db4e690c2f396afdec962616d735548b5a8a9
Reviewed-on: http://git-master/r/32706
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>

30 files changed, 91 insertions, 100 deletions

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 3be587273598..5e4856b26e2b 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -79,7 +79,13 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
 	{ "pll_p_out1",	"pll_p",	28800000,	true },
 	{ "pll_p_out2",	"pll_p",	48000000,	true },
 	{ "pll_p_out3",	"pll_p",	72000000,	true },
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
+	{ "pll_m",	"clk_m",	600000000,	true },
+	{ "pll_m_out1",	"pll_m",	120000000,	true },
+	{ "sclk",	"pll_m_out1",	40000000,	true },
+	{ "hclk",	"sclk",		40000000,	true },
+	{ "pclk",	"hclk",		40000000,	true },
+#else
 	{ "pll_m_out1",	"pll_m",	275000000,	true },
 	{ "pll_c",	NULL,		ULONG_MAX,	false },
 	{ "pll_c_out1",	"pll_c",	208000000,	false },
@@ -87,12 +93,6 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
 	{ "sclk",	"pll_p_out4",	108000000,	true },
 	{ "hclk",	"sclk",		108000000,	true },
 	{ "pclk",	"hclk",		54000000,	true },
-#else
-	{ "pll_m",	"clk_m",	600000000,	true },
-	{ "pll_m_out1",	"pll_m",	120000000,	true },
-	{ "sclk",	"pll_m_out1",	40000000,	true },
-	{ "hclk",	"sclk",		40000000,	true },
-	{ "pclk",	"hclk",		40000000,	true },
 #endif
 	{ "pll_x",	NULL,		0,		true },
 	{ "cpu",	NULL,		0,		true },
@@ -107,7 +107,7 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
 	{ "sdmmc1",	"pll_c",	48000000,	false},
 	{ "sdmmc3",	"pll_p",	48000000,	false},
 	{ "sdmmc4",	"pll_p",	48000000,	false},
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	{ "vde",	"pll_c",	ULONG_MAX,	false },
 	{ "host1x",	"pll_c",	0,		false },
 	{ "mpe",	"pll_c",	0,		false },
@@ -133,7 +133,7 @@ void __init tegra_init_cache(void)
             When called form Normal we obtain an abort.
             Instructions that must be called in Secure :
                - Tag and Data RAM Latency Control Registers (0x108 & 0x10C) must be written in Secure.
-        
+
    The following section of code has been regrouped in the implementation of "l2x0_init".
    The "l2x0_init" will in fact call an SMC intruction to switch from Normal context to Secure context.
    The configuration and activation will be done in Secure.
@@ -174,8 +174,7 @@ static void __init tegra_init_power(void)
 {
 	tegra_powergate_power_off(TEGRA_POWERGATE_MPE);
 	tegra_powergate_power_off(TEGRA_POWERGATE_3D);
-#ifndef CONFIG_ARCH_TEGRA_3x_SOC
-	/* for TEGRA_3x_SOC it will be handled seperately */
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 	tegra_powergate_power_off(TEGRA_POWERGATE_PCIE);
 #endif
 }
diff --git a/arch/arm/mach-tegra/cortex-a9.S b/arch/arm/mach-tegra/cortex-a9.S
index 07bddbb8ff86..ea04074147df 100644
--- a/arch/arm/mach-tegra/cortex-a9.S
+++ b/arch/arm/mach-tegra/cortex-a9.S
@@ -448,7 +448,7 @@ ENTRY(__cortex_a9_restore)
 	orrne	r3, r3, #(2<<8)		@ set MAXCLKLATENCY to 2 on LP
 #endif
 #ifndef CONFIG_TRUSTED_FOUNDATIONS
-	//TL : moved to secure 
+	//TL : moved to secure
 	mcr	p15, 0, r3, c15, c0, 0	@ pctlr
 #endif
 
@@ -555,7 +555,7 @@ ENTRY(__cortex_a9_restore)
 	mcr	p15, 0, lr, c1, c0, 2	@ cpacr (loaded before VFP)
 
 #ifndef CONFIG_TRUSTED_FOUNDATIONS
-	//TL : moved to secure 
+	//TL : moved to secure
 	ldr	r9, [r8, #CTX_DIAGNOSTIC]
 	mcr	p15, 0, r9, c15, c0, 1	@ diag
 #endif
@@ -610,7 +610,7 @@ ENTRY(__cortex_a9_l2x0_restart)
 	mov32	r9, (TEGRA_ARM_PL310_BASE-IO_CPU_PHYS+IO_CPU_VIRT)
 	add	r10, r8, #CTX_L2_CTRL
 	ldmia	r10, {r3-r7}
-#ifdef  CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef  CONFIG_ARCH_TEGRA_2x_SOC
 #ifndef CONFIG_TEGRA_FPGA_PLATFORM
 	mov32	r5, (TEGRA_FLOW_CTRL_BASE-IO_PPSB_PHYS+IO_PPSB_VIRT)
 	ldr	r5, [r5, #0x2C]		@ FLOW_CTRL_CLUSTER_CONTROL
@@ -649,7 +649,7 @@ __reenable_l2x0:
 #else
 	cmp r3, #0        @ only call SMC if L2 was enable
 	beq l2_done
-	
+
 	cmp	r0, #0      @ if invalidate, call SMC with R1=1, else R1=4
 	moveq r1, #4
 	movne r1, #1
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c
index 4ea50378650d..8d8af50d9fb1 100644
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
@@ -70,7 +70,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,
@@ -84,7 +84,7 @@ static struct resource i2c_resource4[] = {
 	},
 };
 
-#elif defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#else
 static struct resource i2c_resource4[] = {
 	[0] = {
 		.start  = INT_I2C4,
@@ -152,7 +152,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,
@@ -215,7 +215,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,
@@ -282,7 +282,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,
@@ -343,7 +343,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,
@@ -596,7 +596,7 @@ struct platform_device tegra_otg_device = {
 	.num_resources	= ARRAY_SIZE(tegra_otg_resources),
 };
 
-#if defined(CONFIG_ARCH_TEGRA_2x_SOC)
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 static struct resource i2s_resource1[] = {
 	[0] = {
 		.start	= INT_I2S1,
@@ -665,7 +665,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,
@@ -856,7 +856,7 @@ static struct resource 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,
@@ -877,7 +877,7 @@ struct platform_device pmu_device = {
 	.resource	= pmu_resources,
 };
 
-#if defined(CONFIG_ARCH_TEGRA_2x_SOC)
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 #define CLK_RESET_RST_SOURCE	0x0
 static struct resource tegra_wdt_resources[] = {
 	[0] = {
@@ -896,7 +896,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,
diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h
index 6baf7c21ab0b..afe2249ba1ef 100644
--- a/arch/arm/mach-tegra/devices.h
+++ b/arch/arm/mach-tegra/devices.h
@@ -34,7 +34,7 @@ extern struct platform_device tegra_i2c_device2;
 extern struct platform_device tegra_i2c_device3;
 extern struct platform_device tegra_i2c_device4;
 extern struct platform_device tegra_kbc_device;
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 extern struct platform_device tegra_i2c_device5;
 #endif
 extern struct platform_device tegra_spi_device1;
@@ -45,7 +45,7 @@ extern struct platform_device tegra_spi_slave_device1;
 extern struct platform_device tegra_spi_slave_device2;
 extern struct platform_device tegra_spi_slave_device3;
 extern struct platform_device tegra_spi_slave_device4;
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 extern struct platform_device tegra_spi_device5;
 extern struct platform_device tegra_spi_device6;
 extern struct platform_device tegra_spi_slave_device5;
@@ -58,7 +58,7 @@ extern struct platform_device tegra_ehci2_device;
 extern struct platform_device tegra_ehci3_device;
 extern struct platform_device tegra_i2s_device1;
 extern struct platform_device tegra_i2s_device2;
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 extern struct platform_device tegra_i2s_device0;
 extern struct platform_device tegra_i2s_device3;
 extern struct platform_device tegra_i2s_device4;
diff --git a/arch/arm/mach-tegra/dma.c b/arch/arm/mach-tegra/dma.c
index a124b5d68701..a46dd0b3001d 100644
--- a/arch/arm/mach-tegra/dma.c
+++ b/arch/arm/mach-tegra/dma.c
@@ -938,7 +938,7 @@ int __init tegra_dma_init(void)
 		spin_lock_init(&ch->lock);
 		INIT_LIST_HEAD(&ch->list);
 
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 		if (i >= 16)
 			irq = INT_APB_DMA_CH16 + i - 16;
 		else
diff --git a/arch/arm/mach-tegra/fuse.c b/arch/arm/mach-tegra/fuse.c
index 5ef69f2d0340..5b2499a859f3 100644
--- a/arch/arm/mach-tegra/fuse.c
+++ b/arch/arm/mach-tegra/fuse.c
@@ -33,7 +33,7 @@
 #define FUSE_UID_LOW		0x108
 #define FUSE_UID_HIGH		0x10c
 #define FUSE_SPARE_BIT		0x200
-#elif defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#else
 #define FUSE_VENDOR_CODE	0x200
 #define FUSE_VENDOR_CODE_MASK	0xf
 #define FUSE_FAB_CODE		0x204
diff --git a/arch/arm/mach-tegra/fuse.h b/arch/arm/mach-tegra/fuse.h
index 367308b21098..80c6082d768c 100644
--- a/arch/arm/mach-tegra/fuse.h
+++ b/arch/arm/mach-tegra/fuse.h
@@ -20,7 +20,7 @@
 
 enum tegra_revision {
 	TEGRA_REVISION_UNKNOWN = 0,
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#if !defined(CONFIG_ARCH_TEGRA_2x_SOC)
 	TEGRA_REVISION_A01,
 #endif
 	TEGRA_REVISION_A02,
diff --git a/arch/arm/mach-tegra/gpio.c b/arch/arm/mach-tegra/gpio.c
index 25d1eaa31de1..f3dfd6fba748 100644
--- a/arch/arm/mach-tegra/gpio.c
+++ b/arch/arm/mach-tegra/gpio.c
@@ -96,7 +96,7 @@ static struct tegra_gpio_bank tegra_gpio_banks[] = {
 	{.bank = 4, .irq = INT_GPIO5},
 	{.bank = 5, .irq = INT_GPIO6},
 	{.bank = 6, .irq = INT_GPIO7},
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	{.bank = 7, .irq = INT_GPIO8},
 #endif
 };
diff --git a/arch/arm/mach-tegra/include/mach/audio.h b/arch/arm/mach-tegra/include/mach/audio.h
index 2210d8ab0ea2..816361fc6897 100644
--- a/arch/arm/mach-tegra/include/mach/audio.h
+++ b/arch/arm/mach-tegra/include/mach/audio.h
@@ -94,7 +94,7 @@
 #define AUDIO_FIFO_32     3
 #define AUDIO_FIFO_PACKED 7
 
-#elif defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#else
 
 #define AUDIO_BIT_SIZE_4		0
 #define AUDIO_BIT_SIZE_8		1
diff --git a/arch/arm/mach-tegra/include/mach/iomap.h b/arch/arm/mach-tegra/include/mach/iomap.h
index ed8a028c79dc..4a21863c2e52 100644
--- a/arch/arm/mach-tegra/include/mach/iomap.h
+++ b/arch/arm/mach-tegra/include/mach/iomap.h
@@ -81,9 +81,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
@@ -113,7 +111,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
@@ -135,7 +133,7 @@
 #define TEGRA_TMR4_BASE			0x60005058
 #define TEGRA_TMR4_SIZE			8
 
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 
 #define TEGRA_TMR5_BASE			0x60005060
 #define TEGRA_TMR5_SIZE			8
@@ -195,9 +193,7 @@
 #define TEGRA_AVP_CACHE_BASE		0x6000C000
 #define TEGRA_AVP_CACHE_SIZE		4
 
-#endif
-
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#else
 
 #define TEGRA_AHB_ARB_BASE		0x6000C000
 #define TEGRA_AHB_ARB_SIZE		768	/* Overlaps with GISMO */
@@ -347,7 +343,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
@@ -390,7 +386,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
@@ -447,7 +443,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 e2a500ef5ae0..d8bdd5daf2d8 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 PHYS_OFFSET		UL(0)
-#elif defined(CONFIG_ARCH_TEGRA_3x_SOC)
-#define PHYS_OFFSET		UL(0x80000000)
 #else
-#error "Invalid Tegra SoC family selection"
+#define 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 83b420403e78..8420199d88a9 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,
diff --git a/arch/arm/mach-tegra/iovmm-smmu.c b/arch/arm/mach-tegra/iovmm-smmu.c
index 1b68ad104da4..4bf516638364 100644
--- a/arch/arm/mach-tegra/iovmm-smmu.c
+++ b/arch/arm/mach-tegra/iovmm-smmu.c
@@ -49,7 +49,7 @@
 #define SMMU_VERBOSE 0
 #endif
 
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 /*
  * ALL-CAP macros copied from armc.h
  */
diff --git a/arch/arm/mach-tegra/mc.c b/arch/arm/mach-tegra/mc.c
index 53074ce3dc06..57b2f6f4e223 100644
--- a/arch/arm/mach-tegra/mc.c
+++ b/arch/arm/mach-tegra/mc.c
@@ -42,6 +42,6 @@ void tegra_mc_set_priority(unsigned long client, unsigned long prio)
 	spin_unlock_irqrestore(&tegra_mc_lock, flags);
 
 }
-#elif defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#else
 	/* !!!FIXME!!! IMPLEMENT ME */
 #endif
diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c
index e3727e3375b9..ed2c79abd77b 100644
--- a/arch/arm/mach-tegra/pinmux.c
+++ b/arch/arm/mach-tegra/pinmux.c
@@ -96,7 +96,7 @@ static char *tegra_mux_names[TEGRA_MAX_MUX] = {
 	[TEGRA_MUX_VI] = "VI",
 	[TEGRA_MUX_VI_SENSOR_CLK] = "VI_SENSOR_CLK",
 	[TEGRA_MUX_XIO] = "XIO",
-#if defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	[TEGRA_MUX_BLINK] = "BLINK",
 	[TEGRA_MUX_CEC] = "CEC",
 	[TEGRA_MUX_CLK12] = "CLK12",
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index a62470468802..a208041ba966 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -439,7 +439,7 @@ static unsigned int available_cpus(void)
 
 	if (ncores == 0) {
 		ncores = scu_get_core_count(scu_base);
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 		if (ncores > 1) {
 			u32 fuse_sku = readl(FUSE_SKU_DIRECT_CONFIG);
 			ncores -= FUSE_SKU_NUM_DISABLED_CPUS(fuse_sku);
diff --git a/arch/arm/mach-tegra/spi_tegra_slave.c b/arch/arm/mach-tegra/spi_tegra_slave.c
index 6086c5598860..a25813241c42 100644
--- a/arch/arm/mach-tegra/spi_tegra_slave.c
+++ b/arch/arm/mach-tegra/spi_tegra_slave.c
@@ -145,7 +145,7 @@ static const unsigned long spi_tegra_req_sels[] = {
 	TEGRA_DMA_REQ_SEL_SL2B2,
 	TEGRA_DMA_REQ_SEL_SL2B3,
 	TEGRA_DMA_REQ_SEL_SL2B4,
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	TEGRA_DMA_REQ_SEL_SL2B5,
 	TEGRA_DMA_REQ_SEL_SL2B6,
 #endif
diff --git a/arch/arm/mach-tegra/suspend.c b/arch/arm/mach-tegra/suspend.c
index 8a1810b9a0db..6c35402666cc 100644
--- a/arch/arm/mach-tegra/suspend.c
+++ b/arch/arm/mach-tegra/suspend.c
@@ -164,7 +164,7 @@ unsigned long tegra_wfi_fail_count[CONFIG_NR_CPUS];
 #define FLOW_CTRL_BITMAP_CPU0	(1<<8)	/* CPU0 WFI bitmap */
 #endif
 
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 #define PMC_SCRATCH4_WAKE_CLUSTER_MASK	(1<<31)
 #endif
 
@@ -664,7 +664,7 @@ void tegra_suspend_dram(bool do_lp0)
 	if (!do_lp0)
 		tegra_cpu_lp1_map = 1;
 	else {
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 		reg = readl(pmc + PMC_SCRATCH4);
 		if (is_lp_cluster())
 			reg |= PMC_SCRATCH4_WAKE_CLUSTER_MASK;
diff --git a/arch/arm/mach-tegra/usb_phy.c b/arch/arm/mach-tegra/usb_phy.c
index 683ebe9a1cc8..9490aadfb91c 100644
--- a/arch/arm/mach-tegra/usb_phy.c
+++ b/arch/arm/mach-tegra/usb_phy.c
@@ -188,7 +188,7 @@
 #define   UHSIC_CONNECT_DETECT			(1 << 0)
 
 
-#else	/* T30 definitions */
+#else
 
 #define USB_USBCMD		0x130
 #define   USB_USBCMD_RS		(1 << 0)
@@ -882,7 +882,7 @@ static void utmi_phy_power_off(struct tegra_usb_phy *phy, bool is_dpd)
 	       UTMIP_FORCE_PDDR_POWERDOWN;
 	writel(val, base + UTMIP_XCVR_CFG1);
 
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	val = readl(base + UTMIP_BIAS_CFG1);
 	val |= UTMIP_BIAS_PDTRK_COUNT(0x5);
 	writel(val, base + UTMIP_BIAS_CFG1);
@@ -983,7 +983,7 @@ static void utmi_phy_restore_end(struct tegra_usb_phy *phy)
 
 static void ulpi_set_tristate(bool enable)
 {
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	int tristate = (enable)? TEGRA_TRI_TRISTATE : TEGRA_TRI_NORMAL;
 
 	tegra_pinmux_set_tristate(TEGRA_PINGROUP_ULPI_DATA0, tristate);
@@ -1005,7 +1005,7 @@ static void ulpi_phy_reset(void __iomem *base)
 {
 	unsigned long val;
 
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	tegra_pinmux_set_tristate(TEGRA_PINGROUP_ULPI_CLK, TEGRA_TRI_TRISTATE);
 #endif
 	val = readl(base + USB_SUSP_CTRL);
@@ -1572,7 +1572,7 @@ struct tegra_usb_phy *tegra_usb_phy_open(int instance, void __iomem *regs,
 		phy->ulpi = otg_ulpi_create(&ulpi_viewport_access_ops, 0);
 		phy->ulpi->io_priv = regs + ULPI_VIEWPORT;
 	}
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	else if (phy->usb_phy_type == TEGRA_USB_PHY_TYPE_HSIC) {
 		ulpi_config = config;
 		gpio_request(ulpi_config->enable_gpio,
@@ -1613,7 +1613,7 @@ struct tegra_usb_phy *tegra_usb_phy_open(int instance, void __iomem *regs,
 		}
 	}
 
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	/* Power-up the VBUS detector for UTMIP PHY */
 	if (phy->usb_phy_type == TEGRA_USB_PHY_TYPE_UTMIP) {
 		writel(readl((IO_ADDRESS(TEGRA_PMC_BASE) + TEGRA_PMC_USB_AO)) &
@@ -1782,7 +1782,7 @@ int tegra_usb_phy_bus_connect(struct tegra_usb_phy *phy)
 	void __iomem *base = phy->regs;
 
 	if (phy->usb_phy_type == TEGRA_USB_PHY_TYPE_HSIC) {
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 		/* Change the USB controller PHY type to HSIC */
 		val = readl(base + HOSTPC1_DEVLC);
 		val &= ~HOSTPC1_DEVLC_PTS(HOSTPC1_DEVLC_PTS_MASK);
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index bed414b4f5b8..994e54874fd8 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -39,7 +39,7 @@
 #define SDHCI_TEGRA_MIN_CONTROLLER_CLOCK	12000000
 #define SDHCI_VENDOR_CLOCK_CNTRL       0x100
 
-#if defined (CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 #define SDHCI_VENDOR_CLOCK_CNTRL_SDR50_TUNING_OVERRIDE	0x20
 #define SDHCI_VENDOR_CLOCK_CNTRL_SDMMC_CLK_ENABLE	0x1
 #define SDHCI_VENDOR_CLOCK_CNTRL_INPUT_IO_CLOCK_INTERNAL	0x2
@@ -111,7 +111,7 @@ static int tegra_sdhci_enable_dma(struct sdhci_host *host)
 	return 0;
 }
 
-#if defined (CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 static void tegra_sdhci_configure_tap_value(struct sdhci_host *sdhci, unsigned int tap_delay)
 {
 	u32 ctrl;
@@ -127,7 +127,7 @@ static void tegra_sdhci_configure_tap_value(struct sdhci_host *sdhci, unsigned i
 
 static void tegra_sdhci_configure_capabilities(struct sdhci_host *sdhci)
 {
-#if defined (CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	u32 ctrl;
 	struct tegra_sdhci_host *host = sdhci_priv(sdhci);
 
@@ -196,9 +196,6 @@ static void tegra_sdhci_set_signalling_voltage(struct sdhci_host *sdhci,
 	struct tegra_sdhci_host *host = sdhci_priv(sdhci);
 	unsigned int minV = 3280000;
 	unsigned int maxV = 3320000;
-#if defined (CONFIG_ARCH_TEGRA_3x_SOC)
-	unsigned int val;
-#endif
 	unsigned int rc;
 
 	if (signalling_voltage == MMC_1_8_VOLT_SIGNALLING) {
@@ -211,8 +208,9 @@ static void tegra_sdhci_set_signalling_voltage(struct sdhci_host *sdhci,
 		printk(KERN_ERR "%s switching to %dV failed %d\n",
 			mmc_hostname(sdhci->mmc), (maxV/1000000), rc);
 	else {
-#if defined (CONFIG_ARCH_TEGRA_3x_SOC)
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 		if (signalling_voltage == MMC_1_8_VOLT_SIGNALLING) {
+			unsigned int val;
 			/* Do Auto Calibration */
 			val = sdhci_readl(sdhci, SDMMC_AUTO_CAL_CONFIG);
 			val |= SDMMC_AUTO_CAL_CONFIG_AUTO_CAL_ENABLE;
@@ -367,7 +365,7 @@ static int __devinit tegra_sdhci_probe(struct platform_device *pdev)
 			SDHCI_QUIRK_NO_HISPD_BIT |
 			SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC |
 			SDHCI_QUIRK_RUNTIME_DISABLE;
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	sdhci->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
 #endif
 
diff --git a/drivers/serial/tegra_hsuart.c b/drivers/serial/tegra_hsuart.c
index c45833547bb6..0315a152beca 100644
--- a/drivers/serial/tegra_hsuart.c
+++ b/drivers/serial/tegra_hsuart.c
@@ -362,7 +362,10 @@ static void wait_sym_time(struct tegra_uart_port *t, unsigned int syms)
 static void tegra_fifo_reset(struct tegra_uart_port *t, u8 fcr_bits)
 {
 	unsigned char fcr = t->fcr_shadow;
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
+	fcr |= fcr_bits & (UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
+	uart_writeb(t, fcr, UART_FCR);
+#else
 	/*Hw issue: Resetting tx fifo with non-fifo
 	mode to avoid any extra character to be sent*/
 	fcr &= ~UART_FCR_ENABLE_FIFO;
@@ -372,9 +375,6 @@ static void tegra_fifo_reset(struct tegra_uart_port *t, u8 fcr_bits)
 	uart_writeb(t, fcr, UART_FCR);
 	fcr |= UART_FCR_ENABLE_FIFO;
 	uart_writeb(t, fcr, UART_FCR);
-#else
-	fcr |= fcr_bits & (UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
-	uart_writeb(t, fcr, UART_FCR);
 #endif
 	uart_readb(t, UART_SCR); /* Dummy read to ensure the write is posted */
 	wait_sym_time(t, 1); /* Wait for the flush to propagate. */
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
diff --git a/drivers/spi/spi_tegra.c b/drivers/spi/spi_tegra.c
index bb169ca4dd61..d75d2de8b03a 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/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 57f47de3eed0..c96322f3544c 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -2068,7 +2068,7 @@ static irqreturn_t fsl_udc_irq(int irq, void *_udc)
 		spin_unlock_irqrestore(&udc->lock, flags);
 		return IRQ_NONE;
 	}
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 	{
 		u32 temp = fsl_readl(&usb_sys_regs->vbus_sensors);
 		udc->vbus_active = (temp & USB_SYS_VBUS_ASESSION) ? true : false;
@@ -2343,12 +2343,12 @@ static int fsl_proc_read(char *page, char **start, off_t off, int count,
 	next += t;
 
 	tmp_reg = fsl_readl(&dr_regs->portsc1);
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
+	tmp_reg2 = tmp_reg;
+#else
 	/* In Tegra3 the Phy Type Select(PTS) and Port Speed fields are specified in
 	 * hostpc1devlc register instead of portsc1 register. */
 	tmp_reg2 = fsl_readl(&dr_regs->hostpc1devlc);
-#else
-	tmp_reg2 = tmp_reg;
 #endif
 	t = scnprintf(next, size,
 		"USB Port Status&Control Reg:\n"
@@ -2702,10 +2702,10 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
 	}
 #endif
 
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
-	control_reg = &dr_regs->hostpc1devlc;
-#else
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 	control_reg = &dr_regs->portsc1;
+#else
+	control_reg = &dr_regs->hostpc1devlc;
 #endif
 #if !defined(CONFIG_ARCH_MXC) && !defined(CONFIG_ARCH_TEGRA)
 	usb_sys_regs = (struct usb_sys_interface *)
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h
index 025d906b1fdf..717d89c986e2 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/fsl_usb2_udc.h
@@ -9,7 +9,7 @@
 #define USB_MAX_CTRL_PAYLOAD		64
 #define USB_DR_SYS_OFFSET		0x400
 
-#if !defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
  /* USB DR device mode registers (Little Endian) */
 struct usb_dr_device {
 	/* Capability register */
@@ -171,7 +171,7 @@ struct usb_dr_host {
 	u32 endptcomplete;	/* Endpoint Complete Register */
 	u32 endptctrl[6];	/* Endpoint Control Registers */
 };
-#endif // if !defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#endif // ifdef CONFIG_ARCH_TEGRA_2x_SOC
 
  /* non-EHCI USB system interface registers (Big Endian) */
 #ifdef CONFIG_ARCH_TEGRA
@@ -299,7 +299,7 @@ struct usb_sys_interface {
 #define  PORTSCX_WAKE_ON_OVER_CURRENT         0x00400000
 #define  PORTSCX_PHY_LOW_POWER_SPD            0x00800000
 
-#if !defined(CONFIG_ARCH_TEGRA_3x_SOC)
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 #define  PORTSCX_PORT_FORCE_FULL_SPEED        0x01000000
 #define  PORTSCX_PORT_SPEED_MASK              0x0C000000
 #define  PORTSCX_PORT_WIDTH                   0x10000000
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index e29355240c46..ca2626e2ea0c 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -256,7 +256,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
 			changed = 1;
 		}
 	}
-#ifndef CONFIG_ARCH_TEGRA_3x_SOC
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 	if (changed && ehci->has_hostpc) {
 		spin_unlock_irq(&ehci->lock);
 		msleep(5);	/* 5 ms for HCD to enter low-power mode */
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index f1ca9fafbef8..b3bfac9b52e0 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -211,7 +211,7 @@ struct tdms_config {
 	u32 drive_current;
 };
 
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
 const struct tdms_config tdms_config[] = {
 	{ /* 480p modes */
 	.pclk = 27000000,
diff --git a/drivers/video/tegra/host/nvhost_3dctx.c b/drivers/video/tegra/host/nvhost_3dctx.c
index 62caea51cf37..fc19de987a03 100644
--- a/drivers/video/tegra/host/nvhost_3dctx.c
+++ b/drivers/video/tegra/host/nvhost_3dctx.c
@@ -27,12 +27,12 @@
 
 #define NV_WAR_789194 1
 
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
-static bool s_is_v1 = true;
-static int s_nr_gpus = 2;
-#else
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 static bool s_is_v1 = false;
 static int s_nr_gpus = 1;
+#else
+static bool s_is_v1 = true;
+static int s_nr_gpus = 2;
 #endif
 
 const struct hwctx_reginfo ctxsave_regs_3d_global[] = {
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c
index 021278083a74..46ce4a50fa11 100644
--- a/drivers/video/tegra/host/nvhost_acm.c
+++ b/drivers/video/tegra/host/nvhost_acm.c
@@ -107,13 +107,13 @@ static const char *get_module_clk_id(const char *module, int index)
 			return "emc";
 	}
 	if (strcmp(module, "gr3d") == 0) {
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 		if (index == 1)
-			return "gr3d2";
-		if (index == 2)
 			return "emc";
 #else
 		if (index == 1)
+			return "gr3d2";
+		if (index == 2)
 			return "emc";
 #endif
 	}