---

yaml --- r: 342504 b: refs/heads/master c: d792aeb h: refs/heads/master v: v3
git-mirror · Nov 6, 2012 · d45f830 · d45f830
1 parent 85ee4da
commit d45f830
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35c0c281ddb4abb966874ba92029c1aa2bab0679
+refs/heads/master: d792aebfa2daeb58ac6a669ce328ad05e9e4112c
diff --git a/trunk/arch/arm/mach-ux500/board-mop500-pins.c b/trunk/arch/arm/mach-ux500/board-mop500-pins.c
@@ -148,15 +148,10 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = {
 	 * The setting on GPIO31 conflicts with magnetometer use on hrefv60
 	 */
 	/* default state for UART2 */
-	DB8500_MUX("u2ctsrts_c_1", "u2", "uart2"),
-	DB8500_PIN("GPIO31_V3", in_pu, "uart2"), /* CTS */
-	DB8500_PIN("GPIO32_V2", out_hi, "uart2"), /* RTS */
 	DB8500_MUX("u2rxtx_c_1", "u2", "uart2"),
 	DB8500_PIN("GPIO29_W2", in_pu, "uart2"), /* RXD */
 	DB8500_PIN("GPIO30_W3", out_hi, "uart2"), /* TXD */
 	/* Sleep state for UART2 */
-	DB8500_PIN_SLEEP("GPIO31_V3", in_wkup_pdis, "uart2"),
-	DB8500_PIN_SLEEP("GPIO32_V2", out_hi_wkup_pdis, "uart2"),
 	DB8500_PIN_SLEEP("GPIO29_W2", in_wkup_pdis, "uart2"),
 	DB8500_PIN_SLEEP("GPIO30_W3", out_wkup_pdis, "uart2"),
 	/*