From: Alejandro Sierra <b18039@freescale.com>
Date: Sat, 31 Mar 2012 02:08:21 +0000 (-0600)
Subject: ENGR00178582 Remove uart2 early parameter
X-Git-Tag: v3.0.35-fsl~1253
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=93adb4720289012feea96f47d332f32fac7933fe;p=karo-tx-linux.git

ENGR00178582 Remove uart2 early parameter

UART2 and CAN interface do not have pins in common.
Therefore uart2 early parameter is not required.

Signed-off-by: Alejandro Sierra <b18039@freescale.com>
---

diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c
index 56ebaa6af568..7ca00f3b475b 100644
--- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c
@@ -135,16 +135,8 @@
 static int mma8451_position = 3;
 static struct clk *sata_clk;
 static int mipi_sensor;
-static int uart2_en;
 static int can0_enable;
 
-static int __init uart2_enable(char *p)
-{
-	uart2_en = 1;
-	return 0;
-}
-early_param("uart2", uart2_enable);
-
 enum sd_pad_mode {
 	SD_PAD_MODE_LOW_SPEED,
 	SD_PAD_MODE_MED_SPEED,
@@ -1287,15 +1279,14 @@ static void __init mx6_board_init(void)
 	BUG_ON(!i2c3_pads);
 	mxc_iomux_v3_setup_multiple_pads(i2c3_pads, i2c3_pads_cnt);
 
-	if (!uart2_en) {
-		if (can0_enable) {
-			BUG_ON(!can0_pads);
-			mxc_iomux_v3_setup_multiple_pads(can0_pads,
-							can0_pads_cnt);
-		}
-		BUG_ON(!can1_pads);
-		mxc_iomux_v3_setup_multiple_pads(can1_pads, can1_pads_cnt);
+	if (can0_enable) {
+		BUG_ON(!can0_pads);
+		mxc_iomux_v3_setup_multiple_pads(can0_pads,
+						can0_pads_cnt);
 	}
+	BUG_ON(!can1_pads);
+	mxc_iomux_v3_setup_multiple_pads(can1_pads, can1_pads_cnt);
+
 
 	/* assert i2c-rst  */
 	gpio_request(SABREAUTO_I2C_EXP_RST, "i2c-rst");