ARM: tegra: remove TEGRA_11x SoC supports from T124 platform

Tegra11x support was added on the T124 platform to support the T114
interposer.

Now there is no need of interposer and hence removing the support for
T114 from T124's platform.

Change-Id: If2cdf50b66e352efe62855fc7d5c01576a8fdba0
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/265403

9 files changed, 1 insertions, 494 deletions

diff --git a/arch/arm/mach-tegra/board-ardbeg-kbc.c b/arch/arm/mach-tegra/board-ardbeg-kbc.c
index 205e6ec5ef36..2a95509bcd31 100644
--- a/arch/arm/mach-tegra/board-ardbeg-kbc.c
+++ b/arch/arm/mach-tegra/board-ardbeg-kbc.c
@@ -33,11 +33,7 @@
 #include "board-ardbeg.h"
 #include "devices.h"
 #include "iomap.h"
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#include "wakeups-t11x.h"
-#else
 #include "wakeups-t12x.h"
-#endif
 
 
 #define GPIO_KEY(_id, _gpio, _iswake)           \
diff --git a/arch/arm/mach-tegra/board-ardbeg-panel.c b/arch/arm/mach-tegra/board-ardbeg-panel.c
index 3ec644bdc2df..0a578c478dac 100644
--- a/arch/arm/mach-tegra/board-ardbeg-panel.c
+++ b/arch/arm/mach-tegra/board-ardbeg-panel.c
@@ -39,12 +39,7 @@
 #include "board-panel.h"
 #include "common.h"
 #include "iomap.h"
-
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#include "tegra11_host1x_devices.h"
-#else
 #include "tegra12_host1x_devices.h"
-#endif
 
 
 struct platform_device * __init ardbeg_host1x_init(void)
@@ -52,15 +47,7 @@ struct platform_device * __init ardbeg_host1x_init(void)
 	struct platform_device *pdev = NULL;
 
 #ifdef CONFIG_TEGRA_GRHOST
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	if (!of_have_populated_dt())
-		pdev = tegra11_register_host1x_devices();
-	else
-		pdev = to_platform_device(bus_find_device_by_name(
-				&platform_bus_type, NULL, "host1x"));
-#else
 	pdev = tegra12_register_host1x_devices();
-#endif
 
 	if (!pdev) {
 		pr_err("host1x devices registration failed\n");
diff --git a/arch/arm/mach-tegra/board-ardbeg-pinmux.c b/arch/arm/mach-tegra/board-ardbeg-pinmux.c
index 2ae8bbb82e52..e6fc8046c5ef 100644
--- a/arch/arm/mach-tegra/board-ardbeg-pinmux.c
+++ b/arch/arm/mach-tegra/board-ardbeg-pinmux.c
@@ -25,197 +25,10 @@
 #include "devices.h"
 #include "gpio-names.h"
 
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#include <mach/pinmux-t11.h>
-#else
 #include <mach/pinmux-t12.h>
-#endif
-
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#define DEFAULT_DRIVE(_name)					\
-	{							\
-		.pingroup = TEGRA_DRIVE_PINGROUP_##_name,	\
-		.hsm = TEGRA_HSM_DISABLE,			\
-		.schmitt = TEGRA_SCHMITT_ENABLE,		\
-		.drive = TEGRA_DRIVE_DIV_1,			\
-		.pull_down = TEGRA_PULL_31,			\
-		.pull_up = TEGRA_PULL_31,			\
-		.slew_rising = TEGRA_SLEW_SLOWEST,		\
-		.slew_falling = TEGRA_SLEW_SLOWEST,		\
-	}
-/* Setting the drive strength of pins
- * hsm: Enable High speed mode (ENABLE/DISABLE)
- * Schimit: Enable/disable schimit (ENABLE/DISABLE)
- * drive: low power mode (DIV_1, DIV_2, DIV_4, DIV_8)
- * pulldn_drive - drive down (falling edge) - Driver Output Pull-Down drive
- *                strength code. Value from 0 to 31.
- * pullup_drive - drive up (rising edge)  - Driver Output Pull-Up drive
- *                strength code. Value from 0 to 31.
- * pulldn_slew -  Driver Output Pull-Up slew control code  - 2bit code
- *                code 11 is least slewing of signal. code 00 is highest
- *                slewing of the signal.
- *                Value - FASTEST, FAST, SLOW, SLOWEST
- * pullup_slew -  Driver Output Pull-Down slew control code -
- *                code 11 is least slewing of signal. code 00 is highest
- *                slewing of the signal.
- *                Value - FASTEST, FAST, SLOW, SLOWEST
- */
-#define SET_DRIVE(_name, _hsm, _schmitt, _drive, _pulldn_drive,\
-		_pullup_drive,_pulldn_slew, _pullup_slew) \
-	{                                               \
-		.pingroup = TEGRA_DRIVE_PINGROUP_##_name,   \
-		.hsm = TEGRA_HSM_##_hsm,                    \
-		.schmitt = TEGRA_SCHMITT_##_schmitt,        \
-		.drive = TEGRA_DRIVE_##_drive,              \
-		.pull_down = TEGRA_PULL_##_pulldn_drive,    \
-		.pull_up = TEGRA_PULL_##_pullup_drive,		\
-		.slew_rising = TEGRA_SLEW_##_pulldn_slew,   \
-		.slew_falling = TEGRA_SLEW_##_pullup_slew,	\
-	}
-
-/* Setting the drive strength of pins
- * hsm: Enable High speed mode (ENABLE/DISABLE)
- * Schimit: Enable/disable schimit (ENABLE/DISABLE)
- * drive: low power mode (DIV_1, DIV_2, DIV_4, DIV_8)
- * pulldn_drive - drive down (falling edge) - Driver Output Pull-Down drive
- *                strength code. Value from 0 to 31.
- * pullup_drive - drive up (rising edge)  - Driver Output Pull-Up drive
- *                strength code. Value from 0 to 31.
- * pulldn_slew -  Driver Output Pull-Up slew control code  - 2bit code
- *                code 11 is least slewing of signal. code 00 is highest
- *                slewing of the signal.
- *                Value - FASTEST, FAST, SLOW, SLOWEST
- * pullup_slew -  Driver Output Pull-Down slew control code -
- *                code 11 is least slewing of signal. code 00 is highest
- *                slewing of the signal.
- *                Value - FASTEST, FAST, SLOW, SLOWEST
- * drive_type - Drive type to be used depending on the resistors.
- */
-
-#define SET_DRIVE_WITH_TYPE(_name, _hsm, _schmitt, _drive, _pulldn_drive,\
-		_pullup_drive, _pulldn_slew, _pullup_slew, _drive_type)	\
-	{								\
-		.pingroup = TEGRA_DRIVE_PINGROUP_##_name,		\
-		.hsm = TEGRA_HSM_##_hsm,				\
-		.schmitt = TEGRA_SCHMITT_##_schmitt,			\
-		.drive = TEGRA_DRIVE_##_drive,				\
-		.pull_down = TEGRA_PULL_##_pulldn_drive,		\
-		.pull_up = TEGRA_PULL_##_pullup_drive,			\
-		.slew_rising = TEGRA_SLEW_##_pulldn_slew,		\
-		.slew_falling = TEGRA_SLEW_##_pullup_slew,		\
-		.drive_type = TEGRA_DRIVE_TYPE_##_drive_type,		\
-	}
-
-#define DEFAULT_PINMUX(_pingroup, _mux, _pupd, _tri, _io)	\
-	{							\
-		.pingroup	= TEGRA_PINGROUP_##_pingroup,	\
-		.func		= TEGRA_MUX_##_mux,		\
-		.pupd		= TEGRA_PUPD_##_pupd,		\
-		.tristate	= TEGRA_TRI_##_tri,		\
-		.io		= TEGRA_PIN_##_io,		\
-		.lock		= TEGRA_PIN_LOCK_DEFAULT,	\
-		.od		= TEGRA_PIN_OD_DEFAULT,		\
-		.ioreset	= TEGRA_PIN_IO_RESET_DEFAULT,	\
-	}
-
-#define I2C_PINMUX(_pingroup, _mux, _pupd, _tri, _io, _lock, _od) \
-	{							\
-		.pingroup	= TEGRA_PINGROUP_##_pingroup,	\
-		.func		= TEGRA_MUX_##_mux,		\
-		.pupd		= TEGRA_PUPD_##_pupd,		\
-		.tristate	= TEGRA_TRI_##_tri,		\
-		.io		= TEGRA_PIN_##_io,		\
-		.lock		= TEGRA_PIN_LOCK_##_lock,	\
-		.od		= TEGRA_PIN_OD_##_od,		\
-		.ioreset	= TEGRA_PIN_IO_RESET_DEFAULT,	\
-	}
-
-#define DDC_PINMUX(_pingroup, _mux, _pupd, _tri, _io, _lock, _rcv_sel) \
-	{							\
-		.pingroup	= TEGRA_PINGROUP_##_pingroup,	\
-		.func		= TEGRA_MUX_##_mux,		\
-		.pupd		= TEGRA_PUPD_##_pupd,		\
-		.tristate	= TEGRA_TRI_##_tri,		\
-		.io		= TEGRA_PIN_##_io,		\
-		.lock		= TEGRA_PIN_LOCK_##_lock,	\
-		.rcv_sel	= TEGRA_PIN_RCV_SEL_##_rcv_sel,		\
-		.ioreset	= TEGRA_PIN_IO_RESET_DEFAULT,	\
-	}
-
-#define VI_PINMUX(_pingroup, _mux, _pupd, _tri, _io, _lock, _ioreset) \
-	{							\
-		.pingroup	= TEGRA_PINGROUP_##_pingroup,	\
-		.func		= TEGRA_MUX_##_mux,		\
-		.pupd		= TEGRA_PUPD_##_pupd,		\
-		.tristate	= TEGRA_TRI_##_tri,		\
-		.io		= TEGRA_PIN_##_io,		\
-		.lock		= TEGRA_PIN_LOCK_##_lock,	\
-		.od		= TEGRA_PIN_OD_DEFAULT,		\
-		.ioreset	= TEGRA_PIN_IO_RESET_##_ioreset	\
-	}
-
-#define CEC_PINMUX(_pingroup, _mux, _pupd, _tri, _io, _lock, _od)   \
-	{                                                               \
-		.pingroup   = TEGRA_PINGROUP_##_pingroup,                   \
-		.func       = TEGRA_MUX_##_mux,                             \
-		.pupd       = TEGRA_PUPD_##_pupd,                           \
-		.tristate   = TEGRA_TRI_##_tri,                             \
-		.io         = TEGRA_PIN_##_io,                              \
-		.lock       = TEGRA_PIN_LOCK_##_lock,                       \
-		.od         = TEGRA_PIN_OD_##_od,                           \
-		.ioreset    = TEGRA_PIN_IO_RESET_DEFAULT,                   \
-	}
-
-#define USB_PINMUX CEC_PINMUX
+#include "board-ardbeg-pinmux-t12x.h"
 
-#define GPIO_INIT_PIN_MODE(_gpio, _is_input, _value)	\
-	{					\
-		.gpio_nr	= _gpio,	\
-		.is_input	= _is_input,	\
-		.value		= _value,	\
-	}
-#define GPIO_PINMUX(_pingroup, _pupd, _tri, _io, _od)   \
-	{                                                   \
-		.pingroup   = TEGRA_PINGROUP_##_pingroup,       \
-		.func       = TEGRA_MUX_SAFE,                   \
-		.pupd       = TEGRA_PUPD_##_pupd,               \
-		.tristate   = TEGRA_TRI_##_tri,                 \
-		.io         = TEGRA_PIN_##_io,                  \
-		.lock       = TEGRA_PIN_LOCK_DEFAULT,           \
-		.od         = TEGRA_PIN_OD_##_od,               \
-		.ioreset    = TEGRA_PIN_IO_RESET_DEFAULT,       \
-	}
-#define UNUSED_PINMUX(_pingroup)                    \
-	{                                               \
-		.pingroup   = TEGRA_PINGROUP_##_pingroup,   \
-		.func       = TEGRA_MUX_SAFE,               \
-		.pupd       = TEGRA_PUPD_PULL_DOWN,         \
-		.tristate   = TEGRA_TRI_TRISTATE,           \
-		.io         = TEGRA_PIN_OUTPUT,             \
-		.lock       = TEGRA_PIN_LOCK_DEFAULT,       \
-		.od         = TEGRA_PIN_OD_DEFAULT,         \
-		.ioreset    = TEGRA_PIN_IO_RESET_DEFAULT,   \
-	}
-#else
-/* All the above macros are defined in pinmux-t12.h */
-#endif
 static __initdata struct tegra_drive_pingroup_config ardbeg_drive_pinmux[] = {
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	/* DEFAULT_DRIVE(<pin_group>), */
-
-	/*Set DAP2 drive (required for Codec Master Mode)*/
-	SET_DRIVE(DAP2, DISABLE, ENABLE, DIV_1, 51, 51, FASTEST, FASTEST),
-
-	/* SDMMC1 */
-	SET_DRIVE(SDIO1, ENABLE, DISABLE, DIV_1, 36, 20, SLOW, SLOW),
-
-	/* SDMMC3 */
-	SET_DRIVE(SDIO3, ENABLE, DISABLE, DIV_1, 22, 36, FASTEST, FASTEST),
-
-	/* SDMMC4 */
-	SET_DRIVE_WITH_TYPE(GMA, ENABLE, DISABLE, DIV_1, 2, 1, FASTEST,
-								FASTEST, 1),
-#else
 	/*Set DAP2 drive (required for Codec Master Mode)*/
 	SET_DRIVE(DAP2, DISABLE, ENABLE, DIV_1, 51, 51, FASTEST, FASTEST),
 
@@ -228,84 +41,7 @@ static __initdata struct tegra_drive_pingroup_config ardbeg_drive_pinmux[] = {
 	/* SDMMC4 */
 	SET_DRIVE_WITH_TYPE(GMA, ENABLE, DISABLE, DIV_1, 1, 2, FASTEST,
 								FASTEST, 1),
-#endif
-};
-
-/* Initially setting all used GPIO's to non-TRISTATE */
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-static __initdata struct tegra_pingroup_config ardbeg_pinmux_set_nontristate[] = {
-	DEFAULT_PINMUX(GPIO_X4_AUD,     RSVD,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_X5_AUD,     RSVD,   PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_X6_AUD,     RSVD3,  PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_X7_AUD,     RSVD,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_W2_AUD,     RSVD1,  PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_W3_AUD,     SPI6,   PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_X1_AUD,     RSVD3,  PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_X3_AUD,     RSVD3,  PULL_UP,      NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(DAP3_FS,         I2S2,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(DAP3_DIN,        I2S2,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(DAP3_DOUT,       I2S2,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(DAP3_SCLK,       I2S2,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PV0,        RSVD3,  NORMAL,       NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_PV1,        RSVD,   NORMAL,       NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(GPIO_PBB3,       RSVD3,  PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PBB5,       RSVD3,  PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PBB6,       RSVD3,  PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PBB7,       RSVD3,  PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PCC1,       RSVD3,  PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_PCC2,       RSVD3,  PULL_DOWN,    NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(GMI_AD0,         GMI,    NORMAL,       NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD1,         GMI,    NORMAL,       NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD10,        GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD11,        GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD12,        GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_AD13,        GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD2,         GMI,    NORMAL,       NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_AD3,         GMI,    NORMAL,       NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_AD8,         GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_ADV_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_CLK,         GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_CS0_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_CS2_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_CS3_N,       GMI,    PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_CS4_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_CS7_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_DQS_P,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_IORDY,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_WP_N,        GMI,    PULL_UP,      NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(SDMMC1_WP_N,     SPI4,   PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(CLK2_REQ,        RSVD3,  NORMAL,       NORMAL,    OUTPUT),
-
-	DEFAULT_PINMUX(KB_COL3,         KBC,    PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(KB_COL5,         KBC,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_COL6,         KBC,    PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(KB_COL7,         KBC,    PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(KB_ROW3,         KBC,    PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_ROW4,         KBC,    PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_ROW6,         KBC,    PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_ROW7,         KBC,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_ROW8,         KBC,    PULL_UP,      NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(CLK3_REQ,        RSVD3,  NORMAL,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PU4,        PWM1,  NORMAL,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PU5,        PWM2,  NORMAL,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_PU6,        PWM3,  NORMAL,      NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(HDMI_INT,        RSVD,   PULL_DOWN,    NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(GMI_AD9,         PWM1,   NORMAL,    NORMAL,     OUTPUT),
 };
-#endif
-
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#include "board-ardbeg-pinmux-t11x.h"
-#else
-#include "board-ardbeg-pinmux-t12x.h"
-#endif
 
 static void __init ardbeg_gpio_init_configure(void)
 {
@@ -325,10 +61,6 @@ static void __init ardbeg_gpio_init_configure(void)
 
 int __init ardbeg_pinmux_init(void)
 {
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	tegra_pinmux_config_table(ardbeg_pinmux_set_nontristate,
-					ARRAY_SIZE(ardbeg_pinmux_set_nontristate));
-#endif
 	ardbeg_gpio_init_configure();
 
 	tegra_pinmux_config_table(ardbeg_pinmux_common, ARRAY_SIZE(ardbeg_pinmux_common));
diff --git a/arch/arm/mach-tegra/board-ardbeg-power.c b/arch/arm/mach-tegra/board-ardbeg-power.c
index cc792e50e73e..b899aacea0dd 100644
--- a/arch/arm/mach-tegra/board-ardbeg-power.c
+++ b/arch/arm/mach-tegra/board-ardbeg-power.c
@@ -444,13 +444,6 @@ static struct regulator_consumer_supply palmas_ti913_regen1_supply[] = {
 	REGULATOR_SUPPLY("vdd", "0-0048"),
 	REGULATOR_SUPPLY("vdd", "0-000c"),
 	REGULATOR_SUPPLY("vdd", "0-0077"),
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-udc.0"),
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-ehci.0"),
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-ehci.1"),
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-ehci.2"),
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-xhci"),
-#endif
 };
 
 PALMAS_PDATA_INIT(ti913_smps123, 700, 1400, NULL, 1, 1, 1, NORMAL);
@@ -896,15 +889,9 @@ FIXED_REG(11,	tca6408_p2,	tca6408_p2,
 	AS3722_SUPPLY(sd5),	0,	0,	PMU_TCA6416_GPIO(2),
 	false,	true,	0,	1200, 0);
 
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-FIXED_REG(12,	vdd_hdmi_5v0,	vdd_hdmi_5v0,
-	NULL,	0,	0,
-	TEGRA_GPIO_PH7,	false,	true,	0,	5000,	5000);
-#else
 FIXED_REG(12,	vdd_hdmi_5v0,	vdd_hdmi_5v0,
 	NULL,	0,	0,
 	TEGRA_GPIO_PK6,	false,	true,	0,	5000,	5000);
-#endif
 
 FIXED_REG(13,	tca6408_p6,	tca6408_p6,
 	AS3722_SUPPLY(sd5),	0,	0,	PMU_TCA6416_GPIO(6),
diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c
index 9977be90aa3f..15c96601bfc4 100644
--- a/arch/arm/mach-tegra/board-ardbeg.c
+++ b/arch/arm/mach-tegra/board-ardbeg.c
@@ -437,9 +437,6 @@ static struct platform_device *ardbeg_devices[] __initdata = {
 #ifdef CONFIG_ARCH_TEGRA_12x_SOC
 	&tegra12_se_device,
 #endif
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	&tegra11_se_device,
-#endif
 #endif
 /*use board file for T12x*/
 #if defined(CONFIG_ARCH_TEGRA_12x_SOC) || !defined(CONFIG_USE_OF)
@@ -666,18 +663,6 @@ static void ardbeg_usb_init(void)
 }
 
 static struct tegra_xusb_board_data xusb_bdata = {
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	.portmap = TEGRA_XUSB_SS_P0 | TEGRA_XUSB_USB2_P0 | TEGRA_XUSB_USB2_P1,
-	.supply = {
-		.s5p0v = "usb_vbus0",
-		.s5p0v1 = "usb_vbus1",
-		.s5p0v2 = "usb_vbus2",
-		.s3p3v = "hvdd_usb",
-		.s1p8v = "avdd_usb_pll",
-		.s1p2v = "vddio_hsic",
-		.s1p05v = "avddio_usb",
-	},
-#else
 	.portmap = TEGRA_XUSB_SS_P0 | TEGRA_XUSB_USB2_P0 | TEGRA_XUSB_SS_P1 |
 			TEGRA_XUSB_USB2_P1 | TEGRA_XUSB_USB2_P2,
 	.supply = {
@@ -700,7 +685,6 @@ static struct tegra_xusb_board_data xusb_bdata = {
 		.auto_term_en = true,
 		.strb_trim_val = 0x22,
 	},
-#endif
 	.uses_external_pmic = false,
 	.uses_different_vbus_per_port = true,
 };
@@ -889,19 +873,6 @@ static void __init ardbeg_spi_init(void)
 
 #ifdef CONFIG_USE_OF
 struct of_dev_auxdata ardbeg_auxdata_lookup[] __initdata = {
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	/* sdhci and i2c dt support not planned for bringup */
-	OF_DEV_AUXDATA("nvidia,tegra114-sdhci", 0x78000600, "sdhci-tegra.3",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra114-sdhci", 0x78000400, "sdhci-tegra.2",
-				NULL),
-#if 0
-	OF_DEV_AUXDATA("nvidia,tegra114-sdhci", 0x78000000, "sdhci-tegra.0",
-				&ardbeg_tegra_sdhci_platform_data0),
-#endif
-	OF_DEV_AUXDATA("nvidia,tegra114-camera", 0x0, "tegra_camera",
-				NULL),
-#endif
 	OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d400, "spi-tegra114.0",
 				NULL),
 	OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000d600, "spi-tegra114.1",
@@ -914,30 +885,6 @@ struct of_dev_auxdata ardbeg_auxdata_lookup[] __initdata = {
 				NULL),
 	OF_DEV_AUXDATA("nvidia,tegra114-spi", 0x7000de00, "spi-tegra114.5",
 				NULL),
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	OF_DEV_AUXDATA("nvidia,tegra30-ahub", 0x70080000, "tegra30-ahub",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra-audio-rt5645", 0x0, "tegra-snd-rt5645",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra-audio-rt5639", 0x0, "tegra-snd-rt5639",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra114-apbdma", 0x6000a000, "tegra-apbdma",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra114-host1x", TEGRA_HOST1X_BASE, "host1x",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra114-gr3d", TEGRA_GR3D_BASE, "gr3d",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra114-gr2d", TEGRA_GR2D_BASE, "gr2d",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra114-msenc", TEGRA_MSENC_BASE, "msenc",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra114-vi", TEGRA_VI_BASE, "vi",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra114-isp", TEGRA_ISP_BASE, "isp",
-				NULL),
-	OF_DEV_AUXDATA("nvidia,tegra114-tsec", TEGRA_TSEC_BASE, "tsec",
-				NULL),
-#else
 	OF_DEV_AUXDATA("nvidia,tegra124-apbdma", 0x60020000, "tegra-apbdma",
 				NULL),
 	OF_DEV_AUXDATA("nvidia,tegra124-host1x", TEGRA_HOST1X_BASE, "host1x",
@@ -949,7 +896,6 @@ struct of_dev_auxdata ardbeg_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("nvidia,tegra124-vi", TEGRA_VI_BASE, "vi", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra124-isp", TEGRA_ISP_BASE, "isp", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra124-tsec", TEGRA_TSEC_BASE, "tsec", NULL),
-#endif
 	OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006000, "serial-tegra.0",
 				NULL),
 	OF_DEV_AUXDATA("nvidia,tegra114-hsuart", 0x70006040, "serial-tegra.1",
diff --git a/arch/arm/mach-tegra/board-ardbeg.h b/arch/arm/mach-tegra/board-ardbeg.h
index 0c148a3e3ab9..c1fd872dd963 100644
--- a/arch/arm/mach-tegra/board-ardbeg.h
+++ b/arch/arm/mach-tegra/board-ardbeg.h
@@ -94,17 +94,10 @@ enum tegra_bb_type {
 #define HSIC2_PORT_OWNER_XUSB   0x8
 
 /* Touchscreen definitions */
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
 #define TOUCH_GPIO_IRQ_RAYDIUM_SPI	TEGRA_GPIO_PK2
 #define TOUCH_GPIO_RST_RAYDIUM_SPI	TEGRA_GPIO_PK4
 #define TOUCH_SPI_ID			0	/*SPI 1 on ardbeg_interposer*/
 #define TOUCH_SPI_CS			0	/*CS  0 on ardbeg_interposer*/
-#else
-#define TOUCH_GPIO_IRQ_RAYDIUM_SPI	TEGRA_GPIO_PK2
-#define TOUCH_GPIO_RST_RAYDIUM_SPI	TEGRA_GPIO_PK4
-#define TOUCH_SPI_ID			0	/*SPI 1 on ardbeg_interposer*/
-#define TOUCH_SPI_CS			0	/*CS  0 on ardbeg_interposer*/
-#endif
 
 /* Audio-related GPIOs */
 /*Same GPIO's used for T114(Interposer) and T124*/
@@ -119,20 +112,11 @@ GPIO, also the GPIO is same for T114 interposer and T124*/
 #define TEGRA_GPIO_LDO_EN	TEGRA_GPIO_PR2
 
 /*GPIOs used by board panel file */
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
 #define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3
 #define DSI_PANEL_BL_PWM_GPIO   TEGRA_GPIO_PH1
-#else
-#define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3
-#define DSI_PANEL_BL_PWM_GPIO   TEGRA_GPIO_PH1
-#endif
 
 /* HDMI Hotplug detection pin */
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
 #define ardbeg_hdmi_hpd	TEGRA_GPIO_PN7
-#else
-#define ardbeg_hdmi_hpd	TEGRA_GPIO_PN7
-#endif
 
 /* I2C related GPIOs */
 /* Same for interposer and t124 */
@@ -154,7 +138,6 @@ int laguna_regulator_init(void);
 int laguna_pm358_pmon_init(void);
 
 /* AUO Display related GPIO */
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
 #define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3 /* GMI_AD11 */
 #define LCD_RST_L               TEGRA_GPIO_PH5 /* GMI_AD13 */
 #define LCD_LR                  TEGRA_GPIO_PH6 /* GMI_AD14 */
@@ -164,17 +147,6 @@ int laguna_pm358_pmon_init(void);
 #define lvds_en         TEGRA_GPIO_PI0 /* GMI_WR_N */
 #define refclk_en       TEGRA_GPIO_PG4 /* GMI_AD4 */
 
-#else
-#define DSI_PANEL_RST_GPIO      TEGRA_GPIO_PH3 /* GMI_AD11 */
-#define LCD_RST_L               TEGRA_GPIO_PH5 /* GMI_AD13 */
-#define LCD_LR                  TEGRA_GPIO_PH6 /* GMI_AD14 */
-#define LCD_TE                  TEGRA_GPIO_PI4 /* GMI_RST_N */
-#define DSI_PANEL_BL_PWM        TEGRA_GPIO_PH1 /*GMI_AD9 */
-#define en_vdd_bl       TEGRA_GPIO_PP2 /* DAP3_DOUT */
-#define lvds_en         TEGRA_GPIO_PI0 /* GMI_WR_N */
-#define refclk_en       TEGRA_GPIO_PG4 /* GMI_AD4 */
-#endif
-
 /* HID keyboard and trackpad irq same for interposer and t124 */
 #define I2C_KB_IRQ	TEGRA_GPIO_PC7
 #define I2C_TP_IRQ	TEGRA_GPIO_PW3
diff --git a/arch/arm/mach-tegra/board-laguna-pinmux.c b/arch/arm/mach-tegra/board-laguna-pinmux.c
index e406919129db..467d7ccc3272 100644
--- a/arch/arm/mach-tegra/board-laguna-pinmux.c
+++ b/arch/arm/mach-tegra/board-laguna-pinmux.c
@@ -25,11 +25,7 @@
 #include "devices.h"
 #include "gpio-names.h"
 
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#include <mach/pinmux-t11.h>
-#else
 #include <mach/pinmux-t12.h>
-#endif
 
 #define DEFAULT_DRIVE(_name)					\
 	{							\
@@ -197,22 +193,6 @@
 	}
 
 static __initdata struct tegra_drive_pingroup_config laguna_drive_pinmux[] = {
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	/* DEFAULT_DRIVE(<pin_group>), */
-
-	/*Set DAP2 drive (required for Codec Master Mode)*/
-	SET_DRIVE(DAP2, DISABLE, ENABLE, DIV_1, 51, 51, FASTEST, FASTEST),
-
-	/* SDMMC1 */
-	SET_DRIVE(SDIO1, ENABLE, DISABLE, DIV_1, 36, 20, SLOW, SLOW),
-
-	/* SDMMC3 */
-	SET_DRIVE(SDIO3, ENABLE, DISABLE, DIV_1, 22, 36, FASTEST, FASTEST),
-
-	/* SDMMC4 */
-	SET_DRIVE_WITH_TYPE(GMA, ENABLE, DISABLE, DIV_1, 2, 1, FASTEST,
-								FASTEST, 1),
-#else
 	/*Set DAP2 drive (required for Codec Master Mode)*/
 	SET_DRIVE(DAP2, DISABLE, ENABLE, DIV_1, 51, 51, FASTEST, FASTEST),
 
@@ -225,87 +205,9 @@ static __initdata struct tegra_drive_pingroup_config laguna_drive_pinmux[] = {
 	/* SDMMC4 */
 	SET_DRIVE_WITH_TYPE(GMA, ENABLE, DISABLE, DIV_1, 2, 1, FASTEST,
 								FASTEST, 1),
-#endif
-};
-#if 0
-/* Initially setting all used GPIO's to non-TRISTATE */
-static __initdata struct tegra_pingroup_config laguna_pinmux_set_nontristate[] = {
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	DEFAULT_PINMUX(GPIO_X4_AUD,     RSVD,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_X5_AUD,     RSVD,   PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_X6_AUD,     RSVD3,  PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_X7_AUD,     RSVD,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_W2_AUD,     RSVD1,  PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_W3_AUD,     SPI6,   PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_X1_AUD,     RSVD3,  PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_X3_AUD,     RSVD3,  PULL_UP,      NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(DAP3_FS,         I2S2,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(DAP3_DIN,        I2S2,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(DAP3_DOUT,       I2S2,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(DAP3_SCLK,       I2S2,   PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PV0,        RSVD3,  NORMAL,       NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_PV1,        RSVD,   NORMAL,       NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(GPIO_PBB3,       RSVD3,  PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PBB5,       RSVD3,  PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PBB6,       RSVD3,  PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PBB7,       RSVD3,  PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PCC1,       RSVD3,  PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_PCC2,       RSVD3,  PULL_DOWN,    NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(GMI_AD0,         GMI,    NORMAL,       NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD1,         GMI,    NORMAL,       NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD10,        GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD11,        GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD12,        GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_AD13,        GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_AD2,         GMI,    NORMAL,       NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_AD3,         GMI,    NORMAL,       NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_AD8,         GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_ADV_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_CLK,         GMI,    PULL_DOWN,    NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_CS0_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_CS2_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_CS3_N,       GMI,    PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GMI_CS4_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_CS7_N,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_DQS_P,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_IORDY,       GMI,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GMI_WP_N,        GMI,    PULL_UP,      NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(SDMMC1_WP_N,     SPI4,   PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(CLK2_REQ,        RSVD3,  NORMAL,       NORMAL,    OUTPUT),
-
-	DEFAULT_PINMUX(KB_COL3,         KBC,    PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(KB_COL5,         KBC,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_COL6,         KBC,    PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(KB_COL7,         KBC,    PULL_UP,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(KB_ROW3,         KBC,    PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_ROW4,         KBC,    PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_ROW6,         KBC,    PULL_DOWN,    NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_ROW7,         KBC,    PULL_UP,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(KB_ROW8,         KBC,    PULL_UP,      NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(CLK3_REQ,        RSVD3,  NORMAL,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PU4,        PWM1,  NORMAL,      NORMAL,    OUTPUT),
-	DEFAULT_PINMUX(GPIO_PU5,        PWM2,  NORMAL,      NORMAL,    INPUT),
-	DEFAULT_PINMUX(GPIO_PU6,        PWM3,  NORMAL,      NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(HDMI_INT,        RSVD,   PULL_DOWN,    NORMAL,    INPUT),
-
-	DEFAULT_PINMUX(GMI_AD9,         PWM1,   NORMAL,    NORMAL,     OUTPUT),
-#else
-	/* TODO: update for t124 laguna */
-#endif
 };
-#endif
 
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#include "board-laguna-pinmux-t11x.h"
-#else
 #include "board-laguna-pinmux-t12x.h"
-#endif
 
 static void __init laguna_gpio_init_configure(void)
 {
@@ -325,10 +227,6 @@ static void __init laguna_gpio_init_configure(void)
 
 int __init laguna_pinmux_init(void)
 {
-#if 0
-	tegra_pinmux_config_table(laguna_pinmux_set_nontristate,
-					ARRAY_SIZE(laguna_pinmux_set_nontristate));
-#endif
 	laguna_gpio_init_configure();
 
 	tegra_pinmux_config_table(laguna_pinmux_common, ARRAY_SIZE(laguna_pinmux_common));
diff --git a/arch/arm/mach-tegra/board-laguna-power.c b/arch/arm/mach-tegra/board-laguna-power.c
index 35afb58f25ac..6875070672fb 100644
--- a/arch/arm/mach-tegra/board-laguna-power.c
+++ b/arch/arm/mach-tegra/board-laguna-power.c
@@ -600,13 +600,6 @@ static struct regulator_consumer_supply fixed_reg_as3722_gpio2_supply[] = {
 	REGULATOR_SUPPLY("avdd_usb", "tegra-ehci.1"),
 	REGULATOR_SUPPLY("avdd_usb", "tegra-ehci.2"),
 	REGULATOR_SUPPLY("hvdd_usb", "tegra-xhci"),
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-udc.0"),
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-ehci.0"),
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-ehci.1"),
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-ehci.2"),
-	REGULATOR_SUPPLY("avdd_usb_pll", "tegra-xhci"),
-#endif
 	REGULATOR_SUPPLY("vddio_sdmmc", "sdhci-tegra.0"),
 	REGULATOR_SUPPLY("pwrdet_sdmmc1", NULL),
 	REGULATOR_SUPPLY("vddio_hv", "tegradc.1"),
diff --git a/arch/arm/mach-tegra/board-loki-kbc.c b/arch/arm/mach-tegra/board-loki-kbc.c
index 54c73710da97..17fbccd84365 100644
--- a/arch/arm/mach-tegra/board-loki-kbc.c
+++ b/arch/arm/mach-tegra/board-loki-kbc.c
@@ -33,11 +33,7 @@
 #include "board-loki.h"
 #include "devices.h"
 #include "iomap.h"
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
-#include "wakeups-t11x.h"
-#else
 #include "wakeups-t12x.h"
-#endif
 
 
 #define GPIO_KEY(_id, _gpio, _iswake)           \