---

yaml --- r: 326767 b: refs/heads/master c: e30ba89 h: refs/heads/master i: 326765: 45be8bc 326763: f358a91 326759: a0aef7b 326751: 678dae0 v: v3
git-mirror · Sep 11, 2012 · 1660397 · 1660397
1 parent ac5cacb
commit 1660397
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 */