From 16603978b3656a1f7e5f4f20cc5e705d4ae54300 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Sat, 11 Aug 2012 12:33:51 +0800
Subject: [PATCH] --- yaml --- r: 326767 b: refs/heads/master c:
 e30ba89fdf3891c3ff32d25a73fbffd37e893572 h: refs/heads/master i:   326765:
 45be8bc0b4086e96126caf6743b620d6191374bf   326763:
 f358a91cfbb1f018c1f35403ed7687fc0c52375c   326759:
 a0aef7b33be166146aea6d54a7d97db15d494292   326751:
 678dae0858b04317d13df3ff892400ae364e1e23 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/boot/dts/imx6q-sabrelite.dts | 2 +-
 trunk/arch/arm/boot/dts/imx6q.dtsi          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 701bdda1f736..495069492dda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44a509fc4794c8a072c83be030579024beb037c9
+refs/heads/master: e30ba89fdf3891c3ff32d25a73fbffd37e893572
diff --git a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts b/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts
index 505235fcfd58..dc1933c73067 100644
--- a/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/trunk/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -99,7 +99,7 @@
 			uart2: serial@021e8000 {
 				status = "okay";
 				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_serial2_1>;
+				pinctrl-0 = <&pinctrl_uart2_1>;
 			};
 
 			i2c@021a0000 { /* I2C1 */
diff --git a/trunk/arch/arm/boot/dts/imx6q.dtsi b/trunk/arch/arm/boot/dts/imx6q.dtsi
index e12c27f93795..d5ced4614016 100644
--- a/trunk/arch/arm/boot/dts/imx6q.dtsi
+++ b/trunk/arch/arm/boot/dts/imx6q.dtsi
@@ -557,8 +557,8 @@
 					};
 				};
 
-				serial2 {
-					pinctrl_serial2_1: serial2grp-1 {
+				uart2 {
+					pinctrl_uart2_1: uart2grp-1 {
 						fsl,pins = <
 							183 0x1b0b1	/* MX6Q_PAD_EIM_D26__UART2_TXD */
 							191 0x1b0b1	/* MX6Q_PAD_EIM_D27__UART2_RXD */