kernel: update 3.14 to 3.14.28

[openwrt.git] / target / linux / imx6 / patches-3.14 / 0002-ARM-dts-added-several-new-imx-pinmux-groups.patch

diff --git a/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch b/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch
index c93662a..f2d7f6c 100644 (file)
--- a/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch
+++ b/target/linux/imx6/patches-3.14/0002-ARM-dts-added-several-new-imx-pinmux-groups.patch
@@ -97,10 +97,11 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
                                };
  
                                uart4 {
-@@ -1107,6 +1158,15 @@
+@@ -1106,6 +1157,15 @@
+                                               >;
                                        };
                                };
- 
++
 +                              uart5 {
 +                                      pinctrl_uart5_1: uart5grp-1 {
 +                                              fsl,pins = <
@@ -109,7 +110,6 @@ Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
 +                                              >;
 +                                      };
 +                              };
-+
+ 
                                usbotg {
                                        pinctrl_usbotg_1: usbotggrp-1 {
-                                               fsl,pins = <